From 524401973f1d0ac5403cd0fbb3ea82a63962a45a Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Wed, 23 Jun 2021 19:58:10 +0200
Subject: [PATCH 01/95] Add timeouts and setup enforcement for custom plugins
 statuses (#77965)

---
 ...ugin-core-server.statusservicesetup.set.md |  2 +
 packages/kbn-pm/dist/index.js                 |  1 +
 packages/kbn-pm/src/config.ts                 |  1 +
 src/core/server/server.test.ts                |  2 +
 src/core/server/server.ts                     |  2 +-
 src/core/server/status/plugins_status.test.ts | 93 ++++++++++++++++++-
 src/core/server/status/plugins_status.ts      | 46 +++++++--
 src/core/server/status/status_service.ts      |  6 +-
 src/core/server/status/types.ts               |  3 +
 src/dev/typescript/projects.ts                |  3 +
 .../test_suites/core_plugins/status.ts        | 71 ++++++++++++++
 test/scripts/test/server_integration.sh       |  7 ++
 .../plugins/status_plugin_a/kibana.json       |  7 ++
 .../plugins/status_plugin_a/package.json      | 14 +++
 .../plugins/status_plugin_a/server/index.ts   | 11 +++
 .../plugins/status_plugin_a/server/plugin.ts  | 56 +++++++++++
 .../plugins/status_plugin_a/tsconfig.json     | 17 ++++
 .../plugins/status_plugin_b/kibana.json       |  8 ++
 .../plugins/status_plugin_b/package.json      | 14 +++
 .../plugins/status_plugin_b/server/index.ts   | 11 +++
 .../plugins/status_plugin_b/server/plugin.ts  | 15 +++
 .../plugins/status_plugin_b/tsconfig.json     | 17 ++++
 .../http/platform/config.status.ts            | 58 ++++++++++++
 .../http/platform/status.ts                   | 69 ++++++++++++++
 test/tsconfig.json                            |  9 +-
 25 files changed, 529 insertions(+), 14 deletions(-)
 create mode 100644 test/plugin_functional/test_suites/core_plugins/status.ts
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_a/kibana.json
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_a/package.json
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_a/server/index.ts
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_b/kibana.json
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_b/package.json
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_b/server/index.ts
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
 create mode 100644 test/server_integration/__fixtures__/plugins/status_plugin_b/tsconfig.json
 create mode 100644 test/server_integration/http/platform/config.status.ts
 create mode 100644 test/server_integration/http/platform/status.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
index 143cd397c40ae..bf08ca1682f3b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
@@ -24,5 +24,7 @@ set(status$: Observable<ServiceStatus>): void;
 
 ## Remarks
 
+The first emission from this Observable should occur within 30s, else this plugin's status will fallback to `unavailable` until the first emission.
+
 See the [StatusServiceSetup.derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md) API for leveraging the default status calculation that is provided by Core.
 
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index e455f487d1384..5be9dff630ed5 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -63827,6 +63827,7 @@ function getProjectPaths({
 
   projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/plugin_functional/plugins/*'));
   projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/interpreter_functional/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/server_integration/__fixtures__/plugins/*'));
   projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
 
   if (!ossOnly) {
diff --git a/packages/kbn-pm/src/config.ts b/packages/kbn-pm/src/config.ts
index a11b2ad9c72c3..666a2fed7a33c 100644
--- a/packages/kbn-pm/src/config.ts
+++ b/packages/kbn-pm/src/config.ts
@@ -31,6 +31,7 @@ export function getProjectPaths({ rootPath, ossOnly, skipKibanaPlugins }: Option
   // correct and the expect behavior.
   projectPaths.push(resolve(rootPath, 'test/plugin_functional/plugins/*'));
   projectPaths.push(resolve(rootPath, 'test/interpreter_functional/plugins/*'));
+  projectPaths.push(resolve(rootPath, 'test/server_integration/__fixtures__/plugins/*'));
   projectPaths.push(resolve(rootPath, 'examples/*'));
 
   if (!ossOnly) {
diff --git a/src/core/server/server.test.ts b/src/core/server/server.test.ts
index 534d7df9d9466..e1986c5bf1d92 100644
--- a/src/core/server/server.test.ts
+++ b/src/core/server/server.test.ts
@@ -114,6 +114,7 @@ test('runs services on "start"', async () => {
   expect(mockSavedObjectsService.start).not.toHaveBeenCalled();
   expect(mockUiSettingsService.start).not.toHaveBeenCalled();
   expect(mockMetricsService.start).not.toHaveBeenCalled();
+  expect(mockStatusService.start).not.toHaveBeenCalled();
 
   await server.start();
 
@@ -121,6 +122,7 @@ test('runs services on "start"', async () => {
   expect(mockSavedObjectsService.start).toHaveBeenCalledTimes(1);
   expect(mockUiSettingsService.start).toHaveBeenCalledTimes(1);
   expect(mockMetricsService.start).toHaveBeenCalledTimes(1);
+  expect(mockStatusService.start).toHaveBeenCalledTimes(1);
 });
 
 test('does not fail on "setup" if there are unused paths detected', async () => {
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index adf794c390338..3f553dd90678e 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -248,6 +248,7 @@ export class Server {
       savedObjects: savedObjectsStart,
       exposedConfigsToUsage: this.plugins.getExposedPluginConfigsToUsage(),
     });
+    this.status.start();
 
     this.coreStart = {
       capabilities: capabilitiesStart,
@@ -261,7 +262,6 @@ export class Server {
 
     await this.plugins.start(this.coreStart);
 
-    this.status.start();
     await this.http.start();
 
     startTransaction?.end();
diff --git a/src/core/server/status/plugins_status.test.ts b/src/core/server/status/plugins_status.test.ts
index b0d9e47876940..9dc1ddcddca3e 100644
--- a/src/core/server/status/plugins_status.test.ts
+++ b/src/core/server/status/plugins_status.test.ts
@@ -8,7 +8,7 @@
 
 import { PluginName } from '../plugins';
 import { PluginsStatusService } from './plugins_status';
-import { of, Observable, BehaviorSubject } from 'rxjs';
+import { of, Observable, BehaviorSubject, ReplaySubject } from 'rxjs';
 import { ServiceStatusLevels, CoreStatus, ServiceStatus } from './types';
 import { first } from 'rxjs/operators';
 import { ServiceStatusLevelSnapshotSerializer } from './test_utils';
@@ -34,6 +34,28 @@ describe('PluginStatusService', () => {
     ['c', ['a', 'b']],
   ]);
 
+  describe('set', () => {
+    it('throws an exception if called after registrations are blocked', () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies,
+      });
+
+      service.blockNewRegistrations();
+      expect(() => {
+        service.set(
+          'a',
+          of({
+            level: ServiceStatusLevels.available,
+            summary: 'fail!',
+          })
+        );
+      }).toThrowErrorMatchingInlineSnapshot(
+        `"Custom statuses cannot be registered after setup, plugin [a] attempted"`
+      );
+    });
+  });
+
   describe('getDerivedStatus$', () => {
     it(`defaults to core's most severe status`, async () => {
       const serviceAvailable = new PluginsStatusService({
@@ -231,6 +253,75 @@ describe('PluginStatusService', () => {
         { a: { level: ServiceStatusLevels.available, summary: 'a available' } },
       ]);
     });
+
+    it('updates when a plugin status observable emits', async () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies: new Map([['a', []]]),
+      });
+      const statusUpdates: Array<Record<PluginName, ServiceStatus>> = [];
+      const subscription = service
+        .getAll$()
+        .subscribe((pluginStatuses) => statusUpdates.push(pluginStatuses));
+
+      const aStatus$ = new BehaviorSubject<ServiceStatus>({
+        level: ServiceStatusLevels.degraded,
+        summary: 'a degraded',
+      });
+      service.set('a', aStatus$);
+      aStatus$.next({ level: ServiceStatusLevels.unavailable, summary: 'a unavailable' });
+      aStatus$.next({ level: ServiceStatusLevels.available, summary: 'a available' });
+      subscription.unsubscribe();
+
+      expect(statusUpdates).toEqual([
+        { a: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' } },
+        { a: { level: ServiceStatusLevels.degraded, summary: 'a degraded' } },
+        { a: { level: ServiceStatusLevels.unavailable, summary: 'a unavailable' } },
+        { a: { level: ServiceStatusLevels.available, summary: 'a available' } },
+      ]);
+    });
+
+    it('emits an unavailable status if first emission times out, then continues future emissions', async () => {
+      jest.useFakeTimers();
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies: new Map([
+          ['a', []],
+          ['b', ['a']],
+        ]),
+      });
+
+      const pluginA$ = new ReplaySubject<ServiceStatus>(1);
+      service.set('a', pluginA$);
+      const firstEmission = service.getAll$().pipe(first()).toPromise();
+      jest.runAllTimers();
+
+      expect(await firstEmission).toEqual({
+        a: { level: ServiceStatusLevels.unavailable, summary: 'Status check timed out after 30s' },
+        b: {
+          level: ServiceStatusLevels.unavailable,
+          summary: '[a]: Status check timed out after 30s',
+          detail: 'See the status page for more information',
+          meta: {
+            affectedServices: {
+              a: {
+                level: ServiceStatusLevels.unavailable,
+                summary: 'Status check timed out after 30s',
+              },
+            },
+          },
+        },
+      });
+
+      pluginA$.next({ level: ServiceStatusLevels.available, summary: 'a available' });
+      const secondEmission = service.getAll$().pipe(first()).toPromise();
+      jest.runAllTimers();
+      expect(await secondEmission).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'a available' },
+        b: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+      });
+      jest.useRealTimers();
+    });
   });
 
   describe('getDependenciesStatus$', () => {
diff --git a/src/core/server/status/plugins_status.ts b/src/core/server/status/plugins_status.ts
index 1aacbf3be56db..6a8ef1081e165 100644
--- a/src/core/server/status/plugins_status.ts
+++ b/src/core/server/status/plugins_status.ts
@@ -7,13 +7,22 @@
  */
 
 import { BehaviorSubject, Observable, combineLatest, of } from 'rxjs';
-import { map, distinctUntilChanged, switchMap, debounceTime } from 'rxjs/operators';
+import {
+  map,
+  distinctUntilChanged,
+  switchMap,
+  debounceTime,
+  timeoutWith,
+  startWith,
+} from 'rxjs/operators';
 import { isDeepStrictEqual } from 'util';
 
 import { PluginName } from '../plugins';
-import { ServiceStatus, CoreStatus } from './types';
+import { ServiceStatus, CoreStatus, ServiceStatusLevels } from './types';
 import { getSummaryStatus } from './get_summary_status';
 
+const STATUS_TIMEOUT_MS = 30 * 1000; // 30 seconds
+
 interface Deps {
   core$: Observable<CoreStatus>;
   pluginDependencies: ReadonlyMap<PluginName, PluginName[]>;
@@ -23,6 +32,7 @@ export class PluginsStatusService {
   private readonly pluginStatuses = new Map<PluginName, Observable<ServiceStatus>>();
   private readonly update$ = new BehaviorSubject(true);
   private readonly defaultInheritedStatus$: Observable<ServiceStatus>;
+  private newRegistrationsAllowed = true;
 
   constructor(private readonly deps: Deps) {
     this.defaultInheritedStatus$ = this.deps.core$.pipe(
@@ -35,10 +45,19 @@ export class PluginsStatusService {
   }
 
   public set(plugin: PluginName, status$: Observable<ServiceStatus>) {
+    if (!this.newRegistrationsAllowed) {
+      throw new Error(
+        `Custom statuses cannot be registered after setup, plugin [${plugin}] attempted`
+      );
+    }
     this.pluginStatuses.set(plugin, status$);
     this.update$.next(true); // trigger all existing Observables to update from the new source Observable
   }
 
+  public blockNewRegistrations() {
+    this.newRegistrationsAllowed = false;
+  }
+
   public getAll$(): Observable<Record<PluginName, ServiceStatus>> {
     return this.getPluginStatuses$([...this.deps.pluginDependencies.keys()]);
   }
@@ -86,13 +105,22 @@ export class PluginsStatusService {
     return this.update$.pipe(
       switchMap(() => {
         const pluginStatuses = plugins
-          .map(
-            (depName) =>
-              [depName, this.pluginStatuses.get(depName) ?? this.getDerivedStatus$(depName)] as [
-                PluginName,
-                Observable<ServiceStatus>
-              ]
-          )
+          .map((depName) => {
+            const pluginStatus = this.pluginStatuses.get(depName)
+              ? this.pluginStatuses.get(depName)!.pipe(
+                  timeoutWith(
+                    STATUS_TIMEOUT_MS,
+                    this.pluginStatuses.get(depName)!.pipe(
+                      startWith({
+                        level: ServiceStatusLevels.unavailable,
+                        summary: `Status check timed out after ${STATUS_TIMEOUT_MS / 1000}s`,
+                      })
+                    )
+                  )
+                )
+              : this.getDerivedStatus$(depName);
+            return [depName, pluginStatus] as [PluginName, Observable<ServiceStatus>];
+          })
           .map(([pName, status$]) =>
             status$.pipe(map((status) => [pName, status] as [PluginName, ServiceStatus]))
           );
diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts
index b8c19508a5d61..d4dc8ed3d4d72 100644
--- a/src/core/server/status/status_service.ts
+++ b/src/core/server/status/status_service.ts
@@ -135,9 +135,11 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
   }
 
   public start() {
-    if (!this.overall$) {
-      throw new Error('cannot call `start` before `setup`');
+    if (!this.pluginsStatus || !this.overall$) {
+      throw new Error(`StatusService#setup must be called before #start`);
     }
+    this.pluginsStatus.blockNewRegistrations();
+
     getOverallStatusChanges(this.overall$, this.stop$).subscribe((message) => {
       this.logger.info(message);
     });
diff --git a/src/core/server/status/types.ts b/src/core/server/status/types.ts
index 411b942c8eb33..bfca4c74d9365 100644
--- a/src/core/server/status/types.ts
+++ b/src/core/server/status/types.ts
@@ -196,6 +196,9 @@ export interface StatusServiceSetup {
    * Completely overrides the default inherited status.
    *
    * @remarks
+   * The first emission from this Observable should occur within 30s, else this plugin's status will fallback to
+   * `unavailable` until the first emission.
+   *
    * See the {@link StatusServiceSetup.derivedStatus$} API for leveraging the default status
    * calculation that is provided by Core.
    */
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index f372cf052d368..2c54bb8dba179 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -58,6 +58,9 @@ export const PROJECTS = [
   ...glob
     .sync('test/interpreter_functional/plugins/*/tsconfig.json', { cwd: REPO_ROOT })
     .map((path) => new Project(resolve(REPO_ROOT, path))),
+  ...glob
+    .sync('test/server_integration/__fixtures__/plugins/*/tsconfig.json', { cwd: REPO_ROOT })
+    .map((path) => new Project(resolve(REPO_ROOT, path))),
 ];
 
 export function filterProjectsByFlag(projectFlag?: string) {
diff --git a/test/plugin_functional/test_suites/core_plugins/status.ts b/test/plugin_functional/test_suites/core_plugins/status.ts
new file mode 100644
index 0000000000000..2b0f15cb39273
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/status.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { ServiceStatusLevels } from '../../../../src/core/server';
+import { PluginFunctionalProviderContext } from '../../services';
+
+export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const supertest = getService('supertest');
+  const log = getService('log');
+
+  const delay = (ms: number) => new Promise((r) => setTimeout(r, ms));
+  const getStatus = async (pluginName?: string) => {
+    const resp = await supertest.get('/api/status?v8format=true');
+
+    if (pluginName) {
+      return resp.body.status.plugins[pluginName];
+    } else {
+      return resp.body.status.overall;
+    }
+  };
+
+  const setStatus = async <T extends keyof typeof ServiceStatusLevels>(level: T) =>
+    supertest
+      .post(`/internal/core_plugin_a/status/set?level=${level}`)
+      .set('kbn-xsrf', 'xxx')
+      .expect(200);
+
+  describe('status service', () => {
+    // This test must comes first because the timeout only applies to the initial emission
+    it("returns a timeout for status check that doesn't emit after 30s", async () => {
+      let aStatus = await getStatus('corePluginA');
+      expect(aStatus.level).to.eql('unavailable');
+
+      // Status will remain in unavailable due to core services until custom status timesout
+      // Keep polling until that condition ends, up to a timeout
+      const start = Date.now();
+      while ('elasticsearch' in (aStatus.meta?.affectedServices ?? {})) {
+        aStatus = await getStatus('corePluginA');
+        expect(aStatus.level).to.eql('unavailable');
+
+        // If it's been more than 40s, break out of this loop
+        if (Date.now() - start >= 40_000) {
+          throw new Error(`Timed out waiting for status timeout after 40s`);
+        }
+
+        log.info('Waiting for status check to timeout...');
+        await delay(2000);
+      }
+
+      expect(aStatus.summary).to.eql('Status check timed out after 30s');
+    });
+
+    it('propagates status issues to dependencies', async () => {
+      await setStatus('degraded');
+      await delay(1000);
+      expect((await getStatus('corePluginA')).level).to.eql('degraded');
+      expect((await getStatus('corePluginB')).level).to.eql('degraded');
+
+      await setStatus('available');
+      await delay(1000);
+      expect((await getStatus('corePluginA')).level).to.eql('available');
+      expect((await getStatus('corePluginB')).level).to.eql('available');
+    });
+  });
+}
diff --git a/test/scripts/test/server_integration.sh b/test/scripts/test/server_integration.sh
index 1ff4a772bb6e0..6ec08c7727e20 100755
--- a/test/scripts/test/server_integration.sh
+++ b/test/scripts/test/server_integration.sh
@@ -12,3 +12,10 @@ checks-reporter-with-killswitch "Server Integration Tests" \
     --bail \
     --debug \
     --kibana-install-dir $KIBANA_INSTALL_DIR
+
+# Tests that must be run against source in order to build test plugins
+checks-reporter-with-killswitch "Status Integration Tests" \
+  node scripts/functional_tests \
+    --config test/server_integration/http/platform/config.status.ts \
+    --bail \
+    --debug \
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/kibana.json b/test/server_integration/__fixtures__/plugins/status_plugin_a/kibana.json
new file mode 100644
index 0000000000000..36981d446c9f9
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "statusPluginA",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false
+}
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/package.json b/test/server_integration/__fixtures__/plugins/status_plugin_a/package.json
new file mode 100644
index 0000000000000..5c73bca024f4e
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "status_plugin_a",
+  "version": "1.0.0",
+  "main": "target/test/server_integration/__fixtures__/plugins/status_plugin_a",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "scripts": {
+    "kbn": "node ../../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../../../node_modules/.bin/tsc"
+  }
+}
\ No newline at end of file
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/index.ts b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/index.ts
new file mode 100644
index 0000000000000..cf221c00e32b0
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/index.ts
@@ -0,0 +1,11 @@
+/*
+ * 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 { StatusPluginAPlugin } from './plugin';
+
+export const plugin = () => new StatusPluginAPlugin();
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
new file mode 100644
index 0000000000000..b2e4f0dd322c4
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { Subject } from 'rxjs';
+import {
+  Plugin,
+  CoreSetup,
+  ServiceStatus,
+  ServiceStatusLevels,
+} from '../../../../../../src/core/server';
+
+export class StatusPluginAPlugin implements Plugin {
+  private status$ = new Subject<ServiceStatus>();
+
+  public setup(core: CoreSetup, deps: {}) {
+    // Set a custom status that will not emit immediately to force a timeout
+    core.status.set(this.status$);
+
+    const router = core.http.createRouter();
+
+    router.post(
+      {
+        path: '/internal/status_plugin_a/status/set',
+        validate: {
+          query: schema.object({
+            level: schema.oneOf([
+              schema.literal('available'),
+              schema.literal('degraded'),
+              schema.literal('unavailable'),
+              schema.literal('critical'),
+            ]),
+          }),
+        },
+      },
+      (context, req, res) => {
+        const { level } = req.query;
+
+        this.status$.next({
+          level: ServiceStatusLevels[level],
+          summary: `statusPluginA is ${level}`,
+        });
+
+        return res.ok();
+      }
+    );
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json b/test/server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json
new file mode 100644
index 0000000000000..5069db62589c7
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true,
+    "composite": true
+  },
+  "include": [
+    "index.ts",
+    "server/**/*.ts",
+    "../../../../../../typings/**/*",
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../../../src/core/tsconfig.json" }
+  ]
+}
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/kibana.json b/test/server_integration/__fixtures__/plugins/status_plugin_b/kibana.json
new file mode 100644
index 0000000000000..fa02f42d500af
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "statusPluginB",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false,
+  "requiredPlugins": ["statusPluginA"]
+}
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/package.json b/test/server_integration/__fixtures__/plugins/status_plugin_b/package.json
new file mode 100644
index 0000000000000..3799d5d470754
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "status_plugin_b",
+  "version": "1.0.0",
+  "main": "target/test/server_integration/__fixtures__/plugins/status_plugin_b",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "scripts": {
+    "kbn": "node ../../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../../../node_modules/.bin/tsc"
+  }
+}
\ No newline at end of file
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/index.ts b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/index.ts
new file mode 100644
index 0000000000000..2002d234827b9
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/index.ts
@@ -0,0 +1,11 @@
+/*
+ * 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 { StatusPluginBPlugin } from './plugin';
+
+export const plugin = () => new StatusPluginBPlugin();
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
new file mode 100644
index 0000000000000..191e8135f69a9
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { Plugin } from 'kibana/server';
+
+export class StatusPluginBPlugin implements Plugin {
+  public setup() {}
+  public start() {}
+  public stop() {}
+}
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/tsconfig.json b/test/server_integration/__fixtures__/plugins/status_plugin_b/tsconfig.json
new file mode 100644
index 0000000000000..224aa42ef68d2
--- /dev/null
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true,
+    "composite": true
+  },
+  "include": [
+    "index.ts",
+    "server/**/*.ts",
+    "../../../../../typings/**/*",
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../../../src/core/tsconfig.json" }
+  ]
+}
diff --git a/test/server_integration/http/platform/config.status.ts b/test/server_integration/http/platform/config.status.ts
new file mode 100644
index 0000000000000..8cc76c901f47c
--- /dev/null
+++ b/test/server_integration/http/platform/config.status.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 fs from 'fs';
+import path from 'path';
+import { FtrConfigProviderContext } from '@kbn/test';
+
+/*
+ * These tests exist in a separate configuration because:
+ * 1) It must run as the first test after Kibana launches to clear the unavailable status. A separate config makes this
+ *    easier to manage and prevent from breaking.
+ * 2) The other server_integration tests run against a built distributable, however the FTR does not support building
+ *    and installing plugins against built Kibana. This test must be run against source only in order to build the
+ *    fixture plugins
+ */
+// eslint-disable-next-line import/no-default-export
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const httpConfig = await readConfigFile(require.resolve('../../config'));
+
+  // Find all folders in __fixtures__/plugins since we treat all them as plugin folder
+  const allFiles = fs.readdirSync(path.resolve(__dirname, '../../__fixtures__/plugins'));
+  const plugins = allFiles.filter((file) =>
+    fs.statSync(path.resolve(__dirname, '../../__fixtures__/plugins', file)).isDirectory()
+  );
+
+  return {
+    testFiles: [
+      // Status test should be first to resolve manually created "unavailable" plugin
+      require.resolve('./status'),
+    ],
+    services: httpConfig.get('services'),
+    servers: httpConfig.get('servers'),
+    junit: {
+      reportName: 'Kibana Platform Status Integration Tests',
+    },
+    esTestCluster: httpConfig.get('esTestCluster'),
+    kbnTestServer: {
+      ...httpConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...httpConfig.get('kbnTestServer.serverArgs'),
+        ...plugins.map(
+          (pluginDir) =>
+            `--plugin-path=${path.resolve(__dirname, '../../__fixtures__/plugins', pluginDir)}`
+        ),
+      ],
+      runOptions: {
+        ...httpConfig.get('kbnTestServer.runOptions'),
+        // Don't wait for Kibana to be completely ready so that we can test the status timeouts
+        wait: /\[Kibana\]\[http\] http server running/,
+      },
+    },
+  };
+}
diff --git a/test/server_integration/http/platform/status.ts b/test/server_integration/http/platform/status.ts
new file mode 100644
index 0000000000000..0dcf82c9bea9e
--- /dev/null
+++ b/test/server_integration/http/platform/status.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 expect from '@kbn/expect';
+import type { ServiceStatus, ServiceStatusLevels } from '../../../../src/core/server';
+import { FtrProviderContext } from '../../services/types';
+
+type ServiceStatusSerialized = Omit<ServiceStatus, 'level'> & { level: string };
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const retry = getService('retry');
+
+  const getStatus = async (pluginName: string): Promise<ServiceStatusSerialized> => {
+    const resp = await supertest.get('/api/status?v8format=true');
+
+    return resp.body.status.plugins[pluginName];
+  };
+
+  const setStatus = async <T extends keyof typeof ServiceStatusLevels>(level: T) =>
+    supertest
+      .post(`/internal/status_plugin_a/status/set?level=${level}`)
+      .set('kbn-xsrf', 'xxx')
+      .expect(200);
+
+  describe('status service', () => {
+    // This test must comes first because the timeout only applies to the initial emission
+    it("returns a timeout for status check that doesn't emit after 30s", async () => {
+      let aStatus = await getStatus('statusPluginA');
+      expect(aStatus.level).to.eql('unavailable');
+
+      // Status will remain in unavailable until the custom status check times out
+      // Keep polling until that condition ends, up to a timeout
+      await retry.waitForWithTimeout(`Status check to timeout`, 40_000, async () => {
+        aStatus = await getStatus('statusPluginA');
+        return aStatus.summary === 'Status check timed out after 30s';
+      });
+
+      expect(aStatus.level).to.eql('unavailable');
+      expect(aStatus.summary).to.eql('Status check timed out after 30s');
+    });
+
+    it('propagates status issues to dependencies', async () => {
+      await setStatus('degraded');
+      await retry.waitForWithTimeout(
+        `statusPluginA status to update`,
+        5_000,
+        async () => (await getStatus('statusPluginA')).level === 'degraded'
+      );
+      expect((await getStatus('statusPluginA')).level).to.eql('degraded');
+      expect((await getStatus('statusPluginB')).level).to.eql('degraded');
+
+      await setStatus('available');
+      await retry.waitForWithTimeout(
+        `statusPluginA status to update`,
+        5_000,
+        async () => (await getStatus('statusPluginA')).level === 'available'
+      );
+      expect((await getStatus('statusPluginA')).level).to.eql('available');
+      expect((await getStatus('statusPluginB')).level).to.eql('available');
+    });
+  });
+}
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 3e02283946080..8cf33d93a4067 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -17,7 +17,12 @@
     "api_integration/apis/telemetry/fixtures/*.json",
     "api_integration/apis/telemetry/fixtures/*.json",
   ],
-  "exclude": ["target/**/*", "plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"],
+  "exclude": [
+    "target/**/*",
+    "interpreter_functional/plugins/**/*",
+    "plugin_functional/plugins/**/*",
+    "server_integration/__fixtures__/plugins/**/*",
+  ],
   "references": [
     { "path": "../src/core/tsconfig.json" },
     { "path": "../src/plugins/telemetry_management_section/tsconfig.json" },
@@ -52,5 +57,7 @@
     { "path": "../src/plugins/visualize/tsconfig.json" },
     { "path": "plugin_functional/plugins/core_app_status/tsconfig.json" },
     { "path": "plugin_functional/plugins/core_provider_plugin/tsconfig.json" },
+    { "path": "server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json" },
+    { "path": "server_integration/__fixtures__/plugins/status_plugin_b/tsconfig.json" },
   ]
 }

From 4d514c6db61dfd7d84d2792362f24ec906506700 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Wed, 23 Jun 2021 14:20:50 -0400
Subject: [PATCH 02/95] [Lens] Escape field names in formula (#102588)

* [Lens] Escape field names in formula

* Fix handling of partially typed fields with invalid chars

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 packages/kbn-tinymath/grammar/grammar.peggy   |  4 +--
 packages/kbn-tinymath/test/library.test.js    |  3 ++
 .../formula/editor/formula_editor.tsx         | 12 +++++--
 .../formula/editor/math_completion.test.ts    | 31 ++++++++++++++++
 .../formula/editor/math_completion.ts         | 30 ++++++++++++----
 .../definitions/formula/generate.ts           |  4 +++
 .../operations/definitions/formula/util.ts    |  2 ++
 x-pack/test/functional/apps/lens/formula.ts   | 36 +++++++++++++++++++
 8 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/packages/kbn-tinymath/grammar/grammar.peggy b/packages/kbn-tinymath/grammar/grammar.peggy
index 1c6f8c3334c23..414bc2fa11cb7 100644
--- a/packages/kbn-tinymath/grammar/grammar.peggy
+++ b/packages/kbn-tinymath/grammar/grammar.peggy
@@ -43,7 +43,7 @@ Literal "literal"
 // Quoted variables are interpreted as strings
 // but unquoted variables are more restrictive
 Variable
-  = _ [\'] chars:(ValidChar / Space / [\"])* [\'] _ {
+  = _ '"' chars:("\\\"" { return "\""; } / [^"])* '"' _ {
     return {
       type: 'variable',
       value: chars.join(''),
@@ -51,7 +51,7 @@ Variable
       text: text()
     };
   }
-  / _ [\"] chars:(ValidChar / Space / [\'])* [\"] _ {
+  / _ "'" chars:("\\\'" { return "\'"; } / [^'])* "'" _ {
       return {
       type: 'variable',
       value: chars.join(''),
diff --git a/packages/kbn-tinymath/test/library.test.js b/packages/kbn-tinymath/test/library.test.js
index bbc8503684fd4..9d87919c4f1ac 100644
--- a/packages/kbn-tinymath/test/library.test.js
+++ b/packages/kbn-tinymath/test/library.test.js
@@ -92,6 +92,7 @@ describe('Parser', () => {
       expect(parse('@foo0')).toEqual(variableEqual('@foo0'));
       expect(parse('.foo0')).toEqual(variableEqual('.foo0'));
       expect(parse('-foo0')).toEqual(variableEqual('-foo0'));
+      expect(() => parse(`foo😀\t')`)).toThrow('Failed to parse');
     });
   });
 
@@ -103,6 +104,7 @@ describe('Parser', () => {
       expect(parse('"foo bar fizz buzz"')).toEqual(variableEqual('foo bar fizz buzz'));
       expect(parse('"foo   bar   baby"')).toEqual(variableEqual('foo   bar   baby'));
       expect(parse(`"f'oo"`)).toEqual(variableEqual(`f'oo`));
+      expect(parse(`"foo😀\t"`)).toEqual(variableEqual(`foo😀\t`));
     });
 
     it('strings with single quotes', () => {
@@ -119,6 +121,7 @@ describe('Parser', () => {
       expect(parse("'foo bar '")).toEqual(variableEqual("foo bar "));
       expect(parse("'0foo'")).toEqual(variableEqual("0foo"));
       expect(parse(`'f"oo'`)).toEqual(variableEqual(`f"oo`));
+      expect(parse(`'foo😀\t'`)).toEqual(variableEqual(`foo😀\t`));
       /* eslint-enable prettier/prettier */
     });
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
index 654a93374703d..d1b0ec8876feb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
@@ -29,7 +29,7 @@ import { ParamEditorProps } from '../../index';
 import { getManagedColumnsFrom } from '../../../layer_helpers';
 import { ErrorWrapper, runASTValidation, tryToParse } from '../validation';
 import {
-  LensMathSuggestion,
+  LensMathSuggestions,
   SUGGESTION_TYPE,
   suggest,
   getSuggestion,
@@ -329,7 +329,7 @@ export function FormulaEditor({
       context: monaco.languages.CompletionContext
     ) => {
       const innerText = model.getValue();
-      let aSuggestions: { list: LensMathSuggestion[]; type: SUGGESTION_TYPE } = {
+      let aSuggestions: LensMathSuggestions = {
         list: [],
         type: SUGGESTION_TYPE.FIELD,
       };
@@ -367,7 +367,13 @@ export function FormulaEditor({
 
       return {
         suggestions: aSuggestions.list.map((s) =>
-          getSuggestion(s, aSuggestions.type, visibleOperationsMap, context.triggerCharacter)
+          getSuggestion(
+            s,
+            aSuggestions.type,
+            visibleOperationsMap,
+            context.triggerCharacter,
+            aSuggestions.range
+          )
         ),
       };
     },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
index 9cd748f5759c9..c55f22dd682d0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
@@ -18,6 +18,7 @@ import {
   getHover,
   suggest,
   monacoPositionToOffset,
+  offsetToRowColumn,
   getInfoAtZeroIndexedPosition,
 } from './math_completion';
 
@@ -363,6 +364,36 @@ describe('math completion', () => {
     });
   });
 
+  describe('offsetToRowColumn', () => {
+    it('should work with single-line strings', () => {
+      const input = `0123456`;
+      expect(offsetToRowColumn(input, 5)).toEqual(
+        expect.objectContaining({
+          lineNumber: 1,
+          column: 6,
+        })
+      );
+    });
+
+    it('should work with multi-line strings accounting for newline characters', () => {
+      const input = `012
+456
+89')`;
+      expect(offsetToRowColumn(input, 0)).toEqual(
+        expect.objectContaining({
+          lineNumber: 1,
+          column: 1,
+        })
+      );
+      expect(offsetToRowColumn(input, 9)).toEqual(
+        expect.objectContaining({
+          lineNumber: 3,
+          column: 2,
+        })
+      );
+    });
+  });
+
   describe('monacoPositionToOffset', () => {
     it('should work with multi-line strings accounting for newline characters', () => {
       const input = `012
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
index 815df943cdba3..28e762e7dff0f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
@@ -13,6 +13,7 @@ import {
   TinymathLocation,
   TinymathAST,
   TinymathFunction,
+  TinymathVariable,
   TinymathNamedArgument,
 } from '@kbn/tinymath';
 import type {
@@ -21,7 +22,7 @@ import type {
 } from '../../../../../../../../../src/plugins/data/public';
 import { IndexPattern } from '../../../../types';
 import { memoizedGetAvailableOperationsByMetadata } from '../../../operations';
-import { tinymathFunctions, groupArgsByType } from '../util';
+import { tinymathFunctions, groupArgsByType, unquotedStringRegex } from '../util';
 import type { GenericOperationDefinition } from '../..';
 import { getFunctionSignatureLabel, getHelpTextContent } from './formula_help';
 import { hasFunctionFieldArgument } from '../validation';
@@ -47,6 +48,7 @@ export type LensMathSuggestion =
 export interface LensMathSuggestions {
   list: LensMathSuggestion[];
   type: SUGGESTION_TYPE;
+  range?: monaco.IRange;
 }
 
 function inLocation(cursorPosition: number, location: TinymathLocation) {
@@ -92,7 +94,7 @@ export function offsetToRowColumn(expression: string, offset: number): monaco.Po
   let lineNumber = 1;
   for (const line of lines) {
     if (line.length >= remainingChars) {
-      return new monaco.Position(lineNumber, remainingChars);
+      return new monaco.Position(lineNumber, remainingChars + 1);
     }
     remainingChars -= line.length + 1;
     lineNumber++;
@@ -128,7 +130,7 @@ export async function suggest({
   operationDefinitionMap: Record<string, GenericOperationDefinition>;
   data: DataPublicPluginStart;
   dateHistogramInterval?: number;
-}): Promise<{ list: LensMathSuggestion[]; type: SUGGESTION_TYPE }> {
+}): Promise<LensMathSuggestions> {
   const text =
     expression.substr(0, zeroIndexedOffset) + MARKER + expression.substr(zeroIndexedOffset);
   try {
@@ -154,6 +156,7 @@ export async function suggest({
       return getArgumentSuggestions(
         tokenInfo.parent,
         tokenInfo.parent.args.findIndex((a) => a === tokenAst),
+        text,
         indexPattern,
         operationDefinitionMap
       );
@@ -210,6 +213,7 @@ function getFunctionSuggestions(
 function getArgumentSuggestions(
   ast: TinymathFunction,
   position: number,
+  expression: string,
   indexPattern: IndexPattern,
   operationDefinitionMap: Record<string, GenericOperationDefinition>
 ) {
@@ -280,7 +284,16 @@ function getArgumentSuggestions(
         .filter((op) => op.operationType === operation.type)
         .map((op) => ('field' in op ? op.field : undefined))
         .filter((field) => field);
-      return { list: fields as string[], type: SUGGESTION_TYPE.FIELD };
+      const fieldArg = ast.args[0];
+      const location = typeof fieldArg !== 'string' && (fieldArg as TinymathVariable).location;
+      let range: monaco.IRange | undefined;
+      if (location) {
+        const start = offsetToRowColumn(expression, location.min);
+        // This accounts for any characters that the user has already typed
+        const end = offsetToRowColumn(expression, location.max - MARKER.length);
+        range = monaco.Range.fromPositions(start, end);
+      }
+      return { list: fields as string[], type: SUGGESTION_TYPE.FIELD, range };
     } else {
       return { list: [], type: SUGGESTION_TYPE.FIELD };
     }
@@ -375,7 +388,8 @@ export function getSuggestion(
   suggestion: LensMathSuggestion,
   type: SUGGESTION_TYPE,
   operationDefinitionMap: Record<string, GenericOperationDefinition>,
-  triggerChar: string | undefined
+  triggerChar: string | undefined,
+  range?: monaco.IRange
 ): monaco.languages.CompletionItem {
   let kind: monaco.languages.CompletionItemKind = monaco.languages.CompletionItemKind.Method;
   let label: string =
@@ -397,6 +411,10 @@ export function getSuggestion(
       break;
     case SUGGESTION_TYPE.FIELD:
       kind = monaco.languages.CompletionItemKind.Value;
+      // Look for unsafe characters
+      if (unquotedStringRegex.test(label)) {
+        insertText = `'${label.replaceAll(`'`, "\\'")}'`;
+      }
       break;
     case SUGGESTION_TYPE.FUNCTIONS:
       insertText = `${label}($0)`;
@@ -450,7 +468,7 @@ export function getSuggestion(
     command,
     additionalTextEdits: [],
     // @ts-expect-error Monaco says this type is required, but provides a default value
-    range: undefined,
+    range,
     sortText,
     filterText,
   };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
index a5c19c537acee..589f547434b91 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
@@ -13,6 +13,7 @@ import {
 } from '../index';
 import { ReferenceBasedIndexPatternColumn } from '../column_types';
 import { IndexPatternLayer } from '../../../types';
+import { unquotedStringRegex } from './util';
 
 // Just handle two levels for now
 type OperationParams = Record<string, string | number | Record<string, string | number>>;
@@ -25,6 +26,9 @@ export function getSafeFieldName({
   if (!fieldName || operationType === 'count') {
     return '';
   }
+  if (unquotedStringRegex.test(fieldName)) {
+    return `'${fieldName.replaceAll(`'`, "\\'")}'`;
+  }
   return fieldName;
 }
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
index d29682eafa329..9806cdaad637e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
@@ -16,6 +16,8 @@ import type {
 import type { OperationDefinition, IndexPatternColumn, GenericOperationDefinition } from '../index';
 import type { GroupedNodes } from './types';
 
+export const unquotedStringRegex = /[^0-9A-Za-z._@\[\]/]/;
+
 export function groupArgsByType(args: TinymathAST[]) {
   const { namedArgument, variable, function: functions } = groupBy<TinymathAST>(
     args,
diff --git a/x-pack/test/functional/apps/lens/formula.ts b/x-pack/test/functional/apps/lens/formula.ts
index e9e5051c006f0..38d1f63e946d4 100644
--- a/x-pack/test/functional/apps/lens/formula.ts
+++ b/x-pack/test/functional/apps/lens/formula.ts
@@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const listingTable = getService('listingTable');
   const browser = getService('browser');
   const testSubjects = getService('testSubjects');
+  const fieldEditor = getService('fieldEditor');
 
   describe('lens formula', () => {
     it('should transition from count to formula', async () => {
@@ -88,6 +89,41 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await element.getVisibleText()).to.equal(`count(kql='Men\\'s Clothing')`);
     });
 
+    it('should insert single quotes and escape when needed to create valid field name', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.switchToVisualization('lnsDatatable');
+      await PageObjects.lens.clickAddField();
+      await fieldEditor.setName(`*' "'`);
+      await fieldEditor.enableValue();
+      await fieldEditor.typeScript("emit('abc')");
+      await fieldEditor.save();
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsDatatable_metrics > lns-empty-dimension',
+        operation: 'unique_count',
+        field: `*`,
+        keepOpen: true,
+      });
+
+      await PageObjects.lens.switchToFormula();
+      let element = await find.byCssSelector('.monaco-editor');
+      expect(await element.getVisibleText()).to.equal(`unique_count('*\\' "\\'')`);
+
+      const input = await find.activeElement();
+      await input.clearValueWithKeyboard({ charByChar: true });
+      await input.type('unique_count(');
+      await PageObjects.common.sleep(100);
+      await input.type('*');
+      await input.pressKeys(browser.keys.ENTER);
+
+      await PageObjects.common.sleep(100);
+
+      element = await find.byCssSelector('.monaco-editor');
+      expect(await element.getVisibleText()).to.equal(`unique_count('*\\' "\\'')`);
+    });
+
     it('should persist a broken formula on close', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVisType('lens');

From 391d0eca27704f8884d77224f49b1632724f5a9d Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 23 Jun 2021 11:30:36 -0700
Subject: [PATCH 03/95] [App Search] Remove external "Launch App Search" button
 (#100815)

* Remove markup

* Remove i18n translations

* Remove telemetry metric
---
 .../components/engines/components/index.ts    |  1 -
 .../components/launch_as_button.test.tsx      | 27 ------------
 .../engines/components/launch_as_button.tsx   | 41 -------------------
 .../components/engines/engines_overview.tsx   |  7 +---
 .../collectors/app_search/telemetry.test.ts   |  7 +---
 .../server/collectors/app_search/telemetry.ts |  4 --
 .../schema/xpack_plugins.json                 |  3 --
 .../translations/translations/ja-JP.json      |  1 -
 .../translations/translations/zh-CN.json      |  1 -
 9 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.test.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/index.ts
index 1d8e578e0edf2..63235f8a992f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/index.ts
@@ -5,6 +5,5 @@
  * 2.0.
  */
 
-export { LaunchAppSearchButton } from './launch_as_button';
 export { EmptyState } from './empty_state';
 export { EmptyMetaEnginesState } from './empty_meta_engines_state';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.test.tsx
deleted file mode 100644
index 93c91cc3830f4..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.test.tsx
+++ /dev/null
@@ -1,27 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import '../../../../__mocks__/enterprise_search_url.mock';
-import { mockTelemetryActions } from '../../../../__mocks__/kea_logic';
-
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { LaunchAppSearchButton } from './';
-
-describe('LaunchAppSearchButton', () => {
-  it('renders a launch app search button that sends telemetry on click', () => {
-    const button = shallow(<LaunchAppSearchButton />);
-
-    expect(button.prop('href')).toBe('http://localhost:3002/as');
-    expect(button.prop('isDisabled')).toBeFalsy();
-
-    button.simulate('click');
-    expect(mockTelemetryActions.sendAppSearchTelemetry).toHaveBeenCalled();
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.tsx
deleted file mode 100644
index 41102cb4fba2e..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/launch_as_button.tsx
+++ /dev/null
@@ -1,41 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { useActions } from 'kea';
-
-import { EuiButton } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import { getAppSearchUrl } from '../../../../shared/enterprise_search_url';
-import { TelemetryLogic } from '../../../../shared/telemetry';
-
-export const LaunchAppSearchButton: React.FC = () => {
-  const { sendAppSearchTelemetry } = useActions(TelemetryLogic);
-
-  return (
-    // eslint-disable-next-line @elastic/eui/href-or-on-click
-    <EuiButton
-      size="s"
-      iconType="popout"
-      href={getAppSearchUrl()}
-      target="_blank"
-      onClick={() =>
-        sendAppSearchTelemetry({
-          action: 'clicked',
-          metric: 'header_launch_button',
-        })
-      }
-      data-test-subj="launchButton"
-    >
-      {i18n.translate('xpack.enterpriseSearch.appSearch.productCta', {
-        defaultMessage: 'Launch App Search',
-      })}
-    </EuiButton>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
index 4dff246052138..d1dd5514757d7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.tsx
@@ -20,7 +20,7 @@ import { ENGINE_CREATION_PATH, META_ENGINE_CREATION_PATH } from '../../routes';
 import { DataPanel } from '../data_panel';
 import { AppSearchPageTemplate } from '../layout';
 
-import { LaunchAppSearchButton, EmptyState, EmptyMetaEnginesState } from './components';
+import { EmptyState, EmptyMetaEnginesState } from './components';
 import { EnginesTable } from './components/tables/engines_table';
 import { MetaEnginesTable } from './components/tables/meta_engines_table';
 import {
@@ -65,10 +65,7 @@ export const EnginesOverview: React.FC = () => {
     <AppSearchPageTemplate
       pageViewTelemetry="engines_overview"
       pageChrome={[ENGINES_TITLE]}
-      pageHeader={{
-        pageTitle: ENGINES_OVERVIEW_TITLE,
-        rightSideItems: [<LaunchAppSearchButton />],
-      }}
+      pageHeader={{ pageTitle: ENGINES_OVERVIEW_TITLE }}
       isLoading={dataLoading}
       isEmptyState={!engines.length}
       emptyState={<EmptyState />}
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
index 350c27fa43cd3..5580c3dac5996 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
@@ -25,8 +25,7 @@ describe('App Search Telemetry Usage Collector', () => {
         'ui_error.cannot_connect': 3,
         'ui_error.not_found': 7,
         'ui_clicked.create_first_engine_button': 40,
-        'ui_clicked.header_launch_button': 50,
-        'ui_clicked.engine_table_link': 60,
+        'ui_clicked.engine_table_link': 50,
       },
     }),
     incrementCounter: jest.fn(),
@@ -66,8 +65,7 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_clicked: {
           create_first_engine_button: 40,
-          header_launch_button: 50,
-          engine_table_link: 60,
+          engine_table_link: 50,
         },
       });
     });
@@ -93,7 +91,6 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_clicked: {
           create_first_engine_button: 0,
-          header_launch_button: 0,
           engine_table_link: 0,
         },
       });
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
index 36ba2976f929a..4dca6ed58e0c5 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
@@ -23,7 +23,6 @@ interface Telemetry {
   };
   ui_clicked: {
     create_first_engine_button: number;
-    header_launch_button: number;
     engine_table_link: number;
   };
 }
@@ -54,7 +53,6 @@ export const registerTelemetryUsageCollector = (
       },
       ui_clicked: {
         create_first_engine_button: { type: 'long' },
-        header_launch_button: { type: 'long' },
         engine_table_link: { type: 'long' },
       },
     },
@@ -85,7 +83,6 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
     },
     ui_clicked: {
       create_first_engine_button: 0,
-      header_launch_button: 0,
       engine_table_link: 0,
     },
   };
@@ -110,7 +107,6 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
         'ui_clicked.create_first_engine_button',
         0
       ),
-      header_launch_button: get(savedObjectAttributes, 'ui_clicked.header_launch_button', 0),
       engine_table_link: get(savedObjectAttributes, 'ui_clicked.engine_table_link', 0),
     },
   } as Telemetry;
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index fa387ddc151fc..9230b4d829853 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -1924,9 +1924,6 @@
             "create_first_engine_button": {
               "type": "long"
             },
-            "header_launch_button": {
-              "type": "long"
-            },
             "engine_table_link": {
               "type": "long"
             }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index c6716a1fa77d4..e246cd0681053 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7857,7 +7857,6 @@
     "xpack.enterpriseSearch.appSearch.multiInputRows.removeValueButtonLabel": "値を削除",
     "xpack.enterpriseSearch.appSearch.ownerRoleTypeDescription": "所有者はすべての操作を実行できます。アカウントには複数の所有者がいる場合がありますが、一度に少なくとも1人の所有者が必要です。",
     "xpack.enterpriseSearch.appSearch.productCardDescription": "Elastic App Search には、強力な検索を設計し、Web サイトや Web/モバイルアプリケーションにデプロイするための使いやすいツールがあります。",
-    "xpack.enterpriseSearch.appSearch.productCta": "App Searchの起動",
     "xpack.enterpriseSearch.appSearch.productDescription": "ダッシュボード、分析、APIを活用し、高度なアプリケーション検索をシンプルにします。",
     "xpack.enterpriseSearch.appSearch.productName": "App Search",
     "xpack.enterpriseSearch.appSearch.result.documentDetailLink": "ドキュメントの詳細を表示",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 8b654a821d4dc..6a96769e2da1e 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7924,7 +7924,6 @@
     "xpack.enterpriseSearch.appSearch.multiInputRows.removeValueButtonLabel": "删除值",
     "xpack.enterpriseSearch.appSearch.ownerRoleTypeDescription": "所有者可以执行任何操作。该帐户可以有很多所有者，但任何时候必须至少有一个所有者。",
     "xpack.enterpriseSearch.appSearch.productCardDescription": "Elastic App Search 提供用户友好的工具，用于设计强大的搜索功能，并将其部署到您的网站或 Web/移动应用程序。",
-    "xpack.enterpriseSearch.appSearch.productCta": "启动 App Search",
     "xpack.enterpriseSearch.appSearch.productDescription": "利用仪表板、分析和 API 执行高级应用程序搜索简单易行。",
     "xpack.enterpriseSearch.appSearch.productName": "App Search",
     "xpack.enterpriseSearch.appSearch.result.documentDetailLink": "访问文档详情",

From 73382cebafabe60e50d3f66841fcb7c61934b844 Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Wed, 23 Jun 2021 13:36:26 -0500
Subject: [PATCH 04/95] [ML] Add Index Pattern Management to Index Data
 Visualizer (#101316)

* [ML] Add index pattern editor flyout

* [ML] Add indexPatternField editor plugin as opt dependency

* [ML] Remove lens from ML's dependency

* [ML] Fix custom display name cause field to be missing

* [ML] Add delete option

* [ML] Fix aggregatableFields logic

* [ML] Add functional tests

* [ML] Fix labels & consolidate addRuntimeFields

* [ML] Add tooltip to show or hide distributions

* Consolidate refreshPage

* [ML] Fix tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../components/field_editor/field_editor.tsx  |   6 +-
 x-pack/plugins/data_visualizer/kibana.json    |   3 +-
 .../date_picker_wrapper.tsx                   |   4 +-
 .../field_data_row/action_menu/actions.ts     |  84 +++++-
 .../data_visualizer_stats_table.tsx           |  57 ++--
 .../stats_table/types/field_vis_config.ts     |   3 +
 .../index_data_visualizer_view.tsx            |  86 ++++--
 .../index_pattern_management/index.ts         |   8 +
 .../index_pattern_management.tsx              | 128 ++++++++
 .../data_loader/data_loader.ts                |   4 +-
 .../index_data_visualizer.tsx                 |  12 +-
 .../services/timefilter_refresh_service.ts    |   3 +-
 .../public/application/kibana_context.ts      |   3 +-
 .../plugins/data_visualizer/public/plugin.ts  |   2 +
 x-pack/plugins/ml/kibana.json                 |   1 -
 .../ml/public/__mocks__/ml_start_deps.ts      |   2 -
 x-pack/plugins/ml/public/application/app.tsx  |   1 -
 .../contexts/kibana/kibana_context.ts         |   2 -
 x-pack/plugins/ml/public/plugin.ts            |   3 -
 x-pack/plugins/ml/tsconfig.json               |   3 +-
 .../data_visualizer/file_data_visualizer.ts   |   1 +
 .../apps/ml/data_visualizer/index.ts          |   1 +
 ...ata_visualizer_index_pattern_management.ts | 274 ++++++++++++++++++
 ...ata_visualizer_index_pattern_management.ts | 118 ++++++++
 .../services/ml/data_visualizer_table.ts      | 144 ++++++++-
 x-pack/test/functional/services/ml/index.ts   |   6 +
 26 files changed, 886 insertions(+), 73 deletions(-)
 create mode 100644 x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index.ts
 create mode 100644 x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
 create mode 100644 x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
 create mode 100644 x-pack/test/functional/services/ml/data_visualizer_index_pattern_management.ts

diff --git a/src/plugins/index_pattern_field_editor/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_field_editor/public/components/field_editor/field_editor.tsx
index fc25879b128ec..77ef0903bc6fc 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_editor/field_editor.tsx
@@ -216,7 +216,11 @@ const FieldEditorComponent = ({
     Boolean(field?.type) && field?.type !== (updatedType && updatedType[0].value);
 
   return (
-    <Form form={form} className="indexPatternFieldEditor__form">
+    <Form
+      form={form}
+      className="indexPatternFieldEditor__form"
+      data-test-subj={'indexPatternFieldEditorForm'}
+    >
       <EuiFlexGroup>
         {/* Name */}
         <EuiFlexItem>
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index b024a52e64721..00eb3d7bf142c 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -16,7 +16,8 @@
     "security",
     "maps",
     "home",
-    "lens"
+    "lens",
+    "indexPatternFieldEditor"
   ],
   "requiredBundles": [
     "home",
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
index f6f53f40d6b9e..52ae5e685316d 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
@@ -18,7 +18,7 @@ import {
 
 import { useUrlState } from '../../util/url_state';
 import { useDataVisualizerKibana } from '../../../kibana_context';
-import { dataVisualizerTimefilterRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service';
+import { dataVisualizerRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service';
 
 interface TimePickerQuickRange {
   from: string;
@@ -50,7 +50,7 @@ function getRecentlyUsedRangesFactory(timeHistory: TimeHistoryContract) {
 }
 
 function updateLastRefresh(timeRange: OnRefreshProps) {
-  dataVisualizerTimefilterRefresh$.next({ lastRefresh: Date.now(), timeRange });
+  dataVisualizerRefresh$.next({ lastRefresh: Date.now(), timeRange });
 }
 
 export const DatePickerWrapper: FC = () => {
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
index 414c72c33f057..a77ca1d589349 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
@@ -7,19 +7,37 @@
 
 import { i18n } from '@kbn/i18n';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
+import { MutableRefObject } from 'react';
 import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
 import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
 import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { FieldVisConfig } from '../../stats_table/types';
-import { LensPublicStart } from '../../../../../../../lens/public';
+import { DataVisualizerKibanaReactContextValue } from '../../../../kibana_context';
+import {
+  dataVisualizerRefresh$,
+  Refresh,
+} from '../../../../index_data_visualizer/services/timefilter_refresh_service';
+
 export function getActions(
   indexPattern: IndexPattern,
-  lensPlugin: LensPublicStart,
-  combinedQuery: CombinedQuery
+  services: DataVisualizerKibanaReactContextValue['services'],
+  combinedQuery: CombinedQuery,
+  actionFlyoutRef: MutableRefObject<(() => void | undefined) | undefined>
 ): Array<Action<FieldVisConfig>> {
-  const canUseLensEditor = lensPlugin.canUseEditor();
-  return [
-    {
+  const { lens: lensPlugin, indexPatternFieldEditor } = services;
+
+  const actions: Array<Action<FieldVisConfig>> = [];
+
+  const refreshPage = () => {
+    const refresh: Refresh = {
+      lastRefresh: Date.now(),
+    };
+    dataVisualizerRefresh$.next(refresh);
+  };
+  // Navigate to Lens with prefilled chart for data field
+  if (lensPlugin !== undefined) {
+    const canUseLensEditor = lensPlugin?.canUseEditor();
+    actions.push({
       name: i18n.translate('xpack.dataVisualizer.index.dataGrid.exploreInLensTitle', {
         defaultMessage: 'Explore in Lens',
       }),
@@ -40,6 +58,56 @@ export function getActions(
         }
       },
       'data-test-subj': 'dataVisualizerActionViewInLensButton',
-    },
-  ];
+    });
+  }
+
+  // Allow to edit index pattern field
+  if (indexPatternFieldEditor?.userPermissions.editIndexPattern()) {
+    actions.push({
+      name: i18n.translate('xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldTitle', {
+        defaultMessage: 'Edit index pattern field',
+      }),
+      description: i18n.translate(
+        'xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldDescription',
+        {
+          defaultMessage: 'Edit index pattern field',
+        }
+      ),
+      type: 'icon',
+      icon: 'indexEdit',
+      onClick: (item: FieldVisConfig) => {
+        actionFlyoutRef.current = indexPatternFieldEditor?.openEditor({
+          ctx: { indexPattern },
+          fieldName: item.fieldName,
+          onSave: refreshPage,
+        });
+      },
+      'data-test-subj': 'dataVisualizerActionEditIndexPatternFieldButton',
+    });
+    actions.push({
+      name: i18n.translate('xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldTitle', {
+        defaultMessage: 'Delete index pattern field',
+      }),
+      description: i18n.translate(
+        'xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription',
+        {
+          defaultMessage: 'Delete index pattern field',
+        }
+      ),
+      type: 'icon',
+      icon: 'trash',
+      available: (item: FieldVisConfig) => {
+        return item.deletable === true;
+      },
+      onClick: (item: FieldVisConfig) => {
+        actionFlyoutRef.current = indexPatternFieldEditor?.openDeleteModal({
+          ctx: { indexPattern },
+          fieldName: item.fieldName!,
+          onDelete: refreshPage,
+        });
+      },
+      'data-test-subj': 'dataVisualizerActionDeleteIndexPatternFieldButton',
+    });
+  }
+  return actions;
 }
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx
index afadc5c5ae4a4..02e4e29dcc05e 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx
@@ -15,6 +15,7 @@ import {
   EuiIcon,
   EuiInMemoryTable,
   EuiText,
+  EuiToolTip,
   HorizontalAlignment,
   LEFT_ALIGNMENT,
   RIGHT_ALIGNMENT,
@@ -111,6 +112,7 @@ export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
       width: '40px',
       isExpander: true,
       render: (item: DataVisualizerTableItem) => {
+        const displayName = item.displayName ?? item.fieldName;
         if (item.fieldName === undefined) return null;
         const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown';
         return (
@@ -121,11 +123,11 @@ export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
               expandedRowItemIds.includes(item.fieldName)
                 ? i18n.translate('xpack.dataVisualizer.dataGrid.rowCollapse', {
                     defaultMessage: 'Hide details for {fieldName}',
-                    values: { fieldName: item.fieldName },
+                    values: { fieldName: displayName },
                   })
                 : i18n.translate('xpack.dataVisualizer.dataGrid.rowExpand', {
                     defaultMessage: 'Show details for {fieldName}',
-                    values: { fieldName: item.fieldName },
+                    values: { fieldName: displayName },
                   })
             }
             iconType={direction}
@@ -157,11 +159,15 @@ export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
         }),
         sortable: true,
         truncateText: true,
-        render: (fieldName: string) => (
-          <EuiText size="s">
-            <b>{fieldName}</b>
-          </EuiText>
-        ),
+        render: (fieldName: string, item: DataVisualizerTableItem) => {
+          const displayName = item.displayName ?? item.fieldName;
+
+          return (
+            <EuiText size="s">
+              <b data-test-subj={`dataVisualizerDisplayName-${item.fieldName}`}>{displayName}</b>
+            </EuiText>
+          );
+        },
         align: LEFT_ALIGNMENT as HorizontalAlignment,
         'data-test-subj': 'dataVisualizerTableColumnName',
       },
@@ -194,18 +200,33 @@ export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
             {i18n.translate('xpack.dataVisualizer.dataGrid.distributionsColumnName', {
               defaultMessage: 'Distributions',
             })}
-            <EuiButtonIcon
-              style={{ marginLeft: 4 }}
-              size={'s'}
-              iconType={showDistributions ? 'eye' : 'eyeClosed'}
-              onClick={() => toggleShowDistribution()}
-              aria-label={i18n.translate(
-                'xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel',
-                {
-                  defaultMessage: 'Show distributions',
+            <EuiToolTip
+              content={
+                !showDistributions
+                  ? i18n.translate('xpack.dataVisualizer.dataGrid.showDistributionsTooltip', {
+                      defaultMessage: 'Show distributions',
+                    })
+                  : i18n.translate('xpack.dataVisualizer.dataGrid.hideDistributionsTooltip', {
+                      defaultMessage: 'Hide distributions',
+                    })
+              }
+            >
+              <EuiButtonIcon
+                style={{ marginLeft: 4 }}
+                size={'s'}
+                iconType={showDistributions ? 'eye' : 'eyeClosed'}
+                onClick={() => toggleShowDistribution()}
+                aria-label={
+                  !showDistributions
+                    ? i18n.translate('xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel', {
+                        defaultMessage: 'Show distributions',
+                      })
+                    : i18n.translate('xpack.dataVisualizer.dataGrid.hideDistributionsAriaLabel', {
+                        defaultMessage: 'Hide distributions',
+                      })
                 }
-              )}
-            />
+              />
+            </EuiToolTip>
           </div>
         ),
         render: (item: DataVisualizerTableItem) => {
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts
index d58497f6cd7cc..eeb9fe12692fd 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts
@@ -24,17 +24,20 @@ export interface MetricFieldVisStats {
 export interface FieldVisConfig {
   type: JobFieldType;
   fieldName?: string;
+  displayName?: string;
   existsInDocs: boolean;
   aggregatable: boolean;
   loading: boolean;
   stats?: FieldVisStats;
   fieldFormat?: any;
   isUnsupportedType?: boolean;
+  deletable?: boolean;
 }
 
 export interface FileBasedFieldVisConfig {
   type: JobFieldType;
   fieldName?: string;
+  displayName?: string;
   stats?: FieldVisStats;
   format?: string;
 }
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
index 12441bcfbbb23..b116b25670ad2 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { FC, Fragment, useEffect, useMemo, useState, useCallback } from 'react';
+import React, { FC, Fragment, useEffect, useMemo, useState, useCallback, useRef } from 'react';
 import { merge } from 'rxjs';
 import {
   EuiFlexGroup,
@@ -62,10 +62,11 @@ import { kbnTypeToJobType } from '../../../common/util/field_types_utils';
 import { SearchPanel } from '../search_panel';
 import { ActionsPanel } from '../actions_panel';
 import { DatePickerWrapper } from '../../../common/components/date_picker_wrapper';
-import { dataVisualizerTimefilterRefresh$ } from '../../services/timefilter_refresh_service';
+import { dataVisualizerRefresh$ } from '../../services/timefilter_refresh_service';
 import { HelpMenu } from '../../../common/components/help_menu';
 import { TimeBuckets } from '../../services/time_buckets';
 import { extractSearchData } from '../../utils/saved_search_utils';
+import { DataVisualizerIndexPatternManagement } from '../index_pattern_management';
 
 interface DataVisualizerPageState {
   overallStats: OverallStats;
@@ -123,9 +124,8 @@ export interface IndexDataVisualizerViewProps {
 const restorableDefaults = getDefaultDataVisualizerListState();
 
 export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVisualizerProps) => {
-  const {
-    services: { lens: lensPlugin, docLinks, notifications, uiSettings },
-  } = useDataVisualizerKibana();
+  const { services } = useDataVisualizerKibana();
+  const { docLinks, notifications, uiSettings } = services;
   const { toasts } = notifications;
 
   const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState(
@@ -299,7 +299,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
   useEffect(() => {
     const timeUpdateSubscription = merge(
       timefilter.getTimeUpdate$(),
-      dataVisualizerTimefilterRefresh$
+      dataVisualizerRefresh$
     ).subscribe(() => {
       setGlobalState({
         time: timefilter.getTime(),
@@ -533,7 +533,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
     });
     const metricExistsFields = allMetricFields.filter((f) => {
       return aggregatableExistsFields.find((existsF) => {
-        return existsF.fieldName === f.displayName;
+        return existsF.fieldName === f.spec.name;
       });
     });
 
@@ -562,7 +562,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
 
     metricFieldsToShow.forEach((field) => {
       const fieldData = aggregatableFields.find((f) => {
-        return f.fieldName === field.displayName;
+        return f.fieldName === field.spec.name;
       });
 
       const metricConfig: FieldVisConfig = {
@@ -571,7 +571,11 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
         type: JOB_FIELD_TYPES.NUMBER,
         loading: true,
         aggregatable: true,
+        deletable: field.runtimeField !== undefined,
       };
+      if (field.displayName !== metricConfig.fieldName) {
+        metricConfig.displayName = field.displayName;
+      }
 
       configs.push(metricConfig);
     });
@@ -607,7 +611,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
 
     allNonMetricFields.forEach((f) => {
       const checkAggregatableField = aggregatableExistsFields.find(
-        (existsField) => existsField.fieldName === f.displayName
+        (existsField) => existsField.fieldName === f.spec.name
       );
 
       if (checkAggregatableField !== undefined) {
@@ -615,7 +619,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
         nonMetricFieldData.push(checkAggregatableField);
       } else {
         const checkNonAggregatableField = nonAggregatableExistsFields.find(
-          (existsField) => existsField.fieldName === f.displayName
+          (existsField) => existsField.fieldName === f.spec.name
         );
 
         if (checkNonAggregatableField !== undefined) {
@@ -643,7 +647,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
     const configs: FieldVisConfig[] = [];
 
     nonMetricFieldsToShow.forEach((field) => {
-      const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName);
+      const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.spec.name);
 
       const nonMetricConfig = {
         ...fieldData,
@@ -651,6 +655,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
         aggregatable: field.aggregatable,
         scripted: field.scripted,
         loading: fieldData.existsInDocs,
+        deletable: field.runtimeField !== undefined,
       };
 
       // Map the field type from the Kibana index pattern to the field type
@@ -665,6 +670,10 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
         nonMetricConfig.isUnsupportedType = true;
       }
 
+      if (field.displayName !== nonMetricConfig.fieldName) {
+        nonMetricConfig.displayName = field.displayName;
+      }
+
       configs.push(nonMetricConfig);
     });
 
@@ -735,13 +744,33 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
     [currentIndexPattern, searchQueryLanguage, searchString]
   );
 
+  // Some actions open up fly-out or popup
+  // This variable is used to keep track of them and clean up when unmounting
+  const actionFlyoutRef = useRef<() => void | undefined>();
+  useEffect(() => {
+    const ref = actionFlyoutRef;
+    return () => {
+      // Clean up any of the flyout/editor opened from the actions
+      if (ref.current) {
+        ref.current();
+      }
+    };
+  }, []);
+
   // Inject custom action column for the index based visualizer
+  // Hide the column completely if no access to any of the plugins
   const extendedColumns = useMemo(() => {
-    if (lensPlugin === undefined) {
-      // eslint-disable-next-line no-console
-      console.error('Lens plugin not available');
-      return;
-    }
+    const actions = getActions(
+      currentIndexPattern,
+      services,
+      {
+        searchQueryLanguage,
+        searchString,
+      },
+      actionFlyoutRef
+    );
+    if (!Array.isArray(actions) || actions.length < 1) return;
+
     const actionColumn: EuiTableActionsColumnType<FieldVisConfig> = {
       name: (
         <FormattedMessage
@@ -749,14 +778,15 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
           defaultMessage="Actions"
         />
       ),
-      actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }),
+      actions,
       width: '100px',
     };
 
     return [actionColumn];
-  }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]);
+  }, [currentIndexPattern, services, searchQueryLanguage, searchString]);
 
   const helpLink = docLinks.links.ml.guide;
+
   return (
     <Fragment>
       <EuiPage data-test-subj="dataVisualizerIndexPage">
@@ -765,10 +795,24 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
             <EuiFlexItem>
               <EuiPageContentHeader>
                 <EuiPageContentHeaderSection>
-                  <EuiTitle size="l">
-                    <h1>{currentIndexPattern.title}</h1>
-                  </EuiTitle>
+                  <div
+                    style={{
+                      display: 'flex',
+                      flexDirection: 'row',
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                    }}
+                  >
+                    <EuiTitle size="l">
+                      <h1>{currentIndexPattern.title}</h1>
+                    </EuiTitle>
+                    <DataVisualizerIndexPatternManagement
+                      currentIndexPattern={currentIndexPattern}
+                      useNewFieldsApi={true}
+                    />
+                  </div>
                 </EuiPageContentHeaderSection>
+
                 <EuiPageContentHeaderSection data-test-subj="dataVisualizerTimeRangeSelectorSection">
                   <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
                     {currentIndexPattern.timeFieldName !== undefined && (
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index.ts
new file mode 100644
index 0000000000000..c26f84a4c22fc
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index.ts
@@ -0,0 +1,8 @@
+/*
+ * 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 { DataVisualizerIndexPatternManagement } from './index_pattern_management';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
new file mode 100644
index 0000000000000..cb81640f328c5
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
@@ -0,0 +1,128 @@
+/*
+ * 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 React, { useEffect, useRef, useState } from 'react';
+import { EuiButtonIcon, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+import { dataVisualizerRefresh$, Refresh } from '../../services/timefilter_refresh_service';
+
+export interface DataVisualizerIndexPatternManagementProps {
+  /**
+   * Currently selected index pattern
+   */
+  currentIndexPattern?: IndexPattern;
+  /**
+   * Read from the Fields API
+   */
+  useNewFieldsApi?: boolean;
+}
+
+export function DataVisualizerIndexPatternManagement(
+  props: DataVisualizerIndexPatternManagementProps
+) {
+  const {
+    services: { indexPatternFieldEditor, application },
+  } = useDataVisualizerKibana();
+
+  const { useNewFieldsApi, currentIndexPattern } = props;
+  const indexPatternFieldEditPermission = indexPatternFieldEditor?.userPermissions.editIndexPattern();
+  const canEditIndexPatternField = !!indexPatternFieldEditPermission && useNewFieldsApi;
+  const [isAddIndexPatternFieldPopoverOpen, setIsAddIndexPatternFieldPopoverOpen] = useState(false);
+
+  const closeFieldEditor = useRef<() => void | undefined>();
+  useEffect(() => {
+    return () => {
+      // Make sure to close the editor when unmounting
+      if (closeFieldEditor.current) {
+        closeFieldEditor.current();
+      }
+    };
+  }, []);
+
+  if (indexPatternFieldEditor === undefined || !currentIndexPattern || !canEditIndexPatternField) {
+    return null;
+  }
+
+  const addField = () => {
+    closeFieldEditor.current = indexPatternFieldEditor.openEditor({
+      ctx: {
+        indexPattern: currentIndexPattern,
+      },
+      onSave: () => {
+        const refresh: Refresh = {
+          lastRefresh: Date.now(),
+        };
+        dataVisualizerRefresh$.next(refresh);
+      },
+    });
+  };
+
+  return (
+    <EuiPopover
+      panelPaddingSize="s"
+      isOpen={isAddIndexPatternFieldPopoverOpen}
+      closePopover={() => {
+        setIsAddIndexPatternFieldPopoverOpen(false);
+      }}
+      ownFocus
+      data-test-subj="dataVisualizerIndexPatternManagementPopover"
+      button={
+        <EuiButtonIcon
+          color="text"
+          iconType="boxesHorizontal"
+          data-test-subj="dataVisualizerIndexPatternManagementButton"
+          aria-label={i18n.translate(
+            'xpack.dataVisualizer.index.indexPatternManagement.actionsPopoverLabel',
+            {
+              defaultMessage: 'Index pattern settings',
+            }
+          )}
+          onClick={() => {
+            setIsAddIndexPatternFieldPopoverOpen(!isAddIndexPatternFieldPopoverOpen);
+          }}
+        />
+      }
+    >
+      <EuiContextMenuPanel
+        data-test-subj="dataVisualizerIndexPatternManagementMenu"
+        size="s"
+        items={[
+          <EuiContextMenuItem
+            key="add"
+            icon="indexOpen"
+            data-test-subj="dataVisualizerAddIndexPatternFieldAction"
+            onClick={() => {
+              setIsAddIndexPatternFieldPopoverOpen(false);
+              addField();
+            }}
+          >
+            {i18n.translate('xpack.dataVisualizer.index.indexPatternManagement.addFieldButton', {
+              defaultMessage: 'Add field to index pattern',
+            })}
+          </EuiContextMenuItem>,
+          <EuiContextMenuItem
+            key="manage"
+            icon="indexSettings"
+            data-test-subj="dataVisualizerManageIndexPatternAction"
+            onClick={() => {
+              setIsAddIndexPatternFieldPopoverOpen(false);
+              application.navigateToApp('management', {
+                path: `/kibana/indexPatterns/patterns/${props.currentIndexPattern?.id}`,
+              });
+            }}
+          >
+            {i18n.translate('xpack.dataVisualizer.index.indexPatternManagement.manageFieldButton', {
+              defaultMessage: 'Manage index pattern fields',
+            })}
+          </EuiContextMenuItem>,
+        ]}
+      />
+    </EuiPopover>
+  );
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
index 3cb0d4d672f48..468bd3a2bd7ee 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
@@ -50,9 +50,9 @@ export class DataLoader {
       const fieldName = field.displayName !== undefined ? field.displayName : field.name;
       if (this.isDisplayField(fieldName) === true) {
         if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) {
-          aggregatableFields.push(fieldName);
+          aggregatableFields.push(field.name);
         } else {
-          nonAggregatableFields.push(fieldName);
+          nonAggregatableFields.push(field.name);
         }
       }
     });
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
index 82a9b93b31a71..f9e9aece48a06 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -178,7 +178,16 @@ export const DataVisualizerUrlStateContextProvider: FC<DataVisualizerUrlStateCon
 
 export const IndexDataVisualizer: FC = () => {
   const coreStart = getCoreStart();
-  const { data, maps, embeddable, share, security, fileUpload, lens } = getPluginsStart();
+  const {
+    data,
+    maps,
+    embeddable,
+    share,
+    security,
+    fileUpload,
+    lens,
+    indexPatternFieldEditor,
+  } = getPluginsStart();
   const services = {
     data,
     maps,
@@ -187,6 +196,7 @@ export const IndexDataVisualizer: FC = () => {
     security,
     fileUpload,
     lens,
+    indexPatternFieldEditor,
     ...coreStart,
   };
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts
index 49ef9107c3ece..11f286e781219 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts
@@ -6,11 +6,10 @@
  */
 
 import { Subject } from 'rxjs';
-import { Required } from 'utility-types';
 
 export interface Refresh {
   lastRefresh: number;
   timeRange?: { start: string; end: string };
 }
 
-export const dataVisualizerTimefilterRefresh$ = new Subject<Required<Refresh>>();
+export const dataVisualizerRefresh$ = new Subject<Refresh>();
diff --git a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
index f7ce13d2fd48d..58d0ac021ff22 100644
--- a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
+++ b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
@@ -6,8 +6,9 @@
  */
 
 import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaReactContextValue, useKibana } from '../../../../../src/plugins/kibana_react/public';
 import type { DataVisualizerStartDependencies } from '../plugin';
 
 export type StartServices = CoreStart & DataVisualizerStartDependencies;
+export type DataVisualizerKibanaReactContextValue = KibanaReactContextValue<StartServices>;
 export const useDataVisualizerKibana = () => useKibana<StartServices>();
diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts
index 66109de1b1463..4b71b08e9cf27 100644
--- a/x-pack/plugins/data_visualizer/public/plugin.ts
+++ b/x-pack/plugins/data_visualizer/public/plugin.ts
@@ -17,6 +17,7 @@ import type { FileUploadPluginStart } from '../../file_upload/public';
 import type { MapsStartApi } from '../../maps/public';
 import type { SecurityPluginSetup } from '../../security/public';
 import type { LensPublicStart } from '../../lens/public';
+import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/index_pattern_field_editor/public';
 import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api';
 import { getMaxBytesFormatted } from './application/common/util/get_max_bytes';
 import { registerHomeAddData, registerHomeFeatureCatalogue } from './register_home';
@@ -32,6 +33,7 @@ export interface DataVisualizerStartDependencies {
   security?: SecurityPluginSetup;
   share: SharePluginStart;
   lens?: LensPublicStart;
+  indexPatternFieldEditor?: IndexPatternFieldEditorStart;
 }
 
 export type DataVisualizerPluginSetup = ReturnType<DataVisualizerPlugin['setup']>;
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index e3bcf307e6f00..7b3f457106033 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -27,7 +27,6 @@
     "management",
     "licenseManagement",
     "maps",
-    "lens",
     "usageCollection"
   ],
   "server": true,
diff --git a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
index 0907cce832bf8..f16ba27524670 100644
--- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
+++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
@@ -9,7 +9,6 @@ import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/publi
 import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
 import { kibanaLegacyPluginMock } from '../../../../../src/plugins/kibana_legacy/public/mocks';
 import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
-import { lensPluginMock } from '../../../lens/public/mocks';
 import { triggersActionsUiMock } from '../../../triggers_actions_ui/public/mocks';
 
 export const createMlStartDepsMock = () => ({
@@ -22,7 +21,6 @@ export const createMlStartDepsMock = () => ({
   spaces: jest.fn(),
   embeddable: embeddablePluginMock.createStartContract(),
   maps: jest.fn(),
-  lens: lensPluginMock.createStartContract(),
   triggersActionsUi: triggersActionsUiMock.createStart(),
   dataVisualizer: jest.fn(),
 });
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 8be513f372e56..222d23acb40a7 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -77,7 +77,6 @@ const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
     data: deps.data,
     security: deps.security,
     licenseManagement: deps.licenseManagement,
-    lens: deps.lens,
     storage: localStorage,
     embeddable: deps.embeddable,
     maps: deps.maps,
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 841f0d03fa21c..1ade617fa60a5 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -19,7 +19,6 @@ import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/p
 import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
 import type { MapsStartApi } from '../../../../../maps/public';
 import type { DataVisualizerPluginStart } from '../../../../../data_visualizer/public';
-import type { LensPublicStart } from '../../../../../lens/public';
 import { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public';
 
 interface StartPlugins {
@@ -29,7 +28,6 @@ interface StartPlugins {
   share: SharePluginStart;
   embeddable: EmbeddableStart;
   maps?: MapsStartApi;
-  lens?: LensPublicStart;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginStart;
   dataVisualizer?: DataVisualizerPluginStart;
 }
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index e3a4a8348ebc1..917619a67fea9 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -44,7 +44,6 @@ import { registerFeature } from './register_feature';
 // Not importing from `ml_url_generator/index` here to avoid importing unnecessary code
 import { registerUrlGenerator } from './ml_url_generator/ml_url_generator';
 import type { MapsStartApi } from '../../maps/public';
-import { LensPublicStart } from '../../lens/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
@@ -62,7 +61,6 @@ export interface MlStartDependencies {
   spaces?: SpacesPluginStart;
   embeddable: EmbeddableStart;
   maps?: MapsStartApi;
-  lens?: LensPublicStart;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginStart;
   dataVisualizer: DataVisualizerPluginStart;
 }
@@ -119,7 +117,6 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
             embeddable: { ...pluginsSetup.embeddable, ...pluginsStart.embeddable },
             maps: pluginsStart.maps,
             uiActions: pluginsStart.uiActions,
-            lens: pluginsStart.lens,
             kibanaVersion,
             triggersActionsUi: pluginsStart.triggersActionsUi,
             dataVisualizer: pluginsStart.dataVisualizer,
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index 221718d423383..8e859c35e3f85 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -16,7 +16,7 @@
     "../../../typings/**/*",
     // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
     "public/**/*.json",
-    "server/**/*.json",
+    "server/**/*.json"
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },
@@ -28,7 +28,6 @@
     { "path": "../license_management/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../maps/tsconfig.json" },
-    { "path": "../lens/tsconfig.json" },
     { "path": "../security/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
     { "path": "../alerting/tsconfig.json" },
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
index a8fed205a9e56..3867ed6f7dfea 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
@@ -223,6 +223,7 @@ export default function ({ getService }: FtrProviderContext) {
               fieldRow.docCountFormatted,
               fieldRow.topValuesCount,
               false,
+              false,
               false
             );
           }
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index.ts b/x-pack/test/functional/apps/ml/data_visualizer/index.ts
index 65f7033b5bd66..3e6b644a0b494 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index.ts
@@ -13,6 +13,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./index_data_visualizer'));
     loadTestFile(require.resolve('./index_data_visualizer_actions_panel'));
+    loadTestFile(require.resolve('./index_data_visualizer_index_pattern_management'));
     loadTestFile(require.resolve('./file_data_visualizer'));
   });
 }
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
new file mode 100644
index 0000000000000..0d9163a872043
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
@@ -0,0 +1,274 @@
+/*
+ * 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 { FtrProviderContext } from '../../../ftr_provider_context';
+import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
+import { FieldVisConfig } from '../../../../../plugins/data_visualizer/public/application/common/components/stats_table/types';
+
+interface MetricFieldVisConfig extends FieldVisConfig {
+  statsMaxDecimalPlaces: number;
+  docCountFormatted: string;
+  topValuesCount: number;
+  viewableInLens: boolean;
+  hasActionMenu: boolean;
+}
+
+interface NonMetricFieldVisConfig extends FieldVisConfig {
+  docCountFormatted: string;
+  exampleCount: number;
+  viewableInLens: boolean;
+  hasActionMenu: boolean;
+}
+
+interface TestData {
+  suiteTitle: string;
+  sourceIndexOrSavedSearch: string;
+  rowsPerPage?: 10 | 25 | 50;
+  newFields?: Array<{ fieldName: string; type: string; script: string }>;
+  fieldsToRename?: Array<{ originalName: string; newName: string }>;
+  expected: {
+    totalDocCountFormatted: string;
+    metricFields?: MetricFieldVisConfig[];
+    nonMetricFields?: NonMetricFieldVisConfig[];
+    visibleMetricFieldsCount: number;
+    totalMetricFieldsCount: number;
+    populatedFieldsCount: number;
+    totalFieldsCount: number;
+  };
+}
+
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+
+  const originalTestData: TestData = {
+    suiteTitle: 'original index pattern',
+    sourceIndexOrSavedSearch: 'ft_farequote',
+    expected: {
+      totalDocCountFormatted: '86,274',
+      metricFields: [],
+      nonMetricFields: [],
+      visibleMetricFieldsCount: 1,
+      totalMetricFieldsCount: 1,
+      populatedFieldsCount: 7,
+      totalFieldsCount: 8,
+    },
+  };
+  const addDeleteFieldTestData: TestData = {
+    suiteTitle: 'add field',
+    sourceIndexOrSavedSearch: 'ft_farequote',
+    newFields: [
+      {
+        fieldName: 'rt_airline_lowercase',
+        type: 'Keyword',
+        script: 'emit(params._source.airline.toLowerCase())',
+      },
+    ],
+    expected: {
+      totalDocCountFormatted: '86,274',
+      metricFields: [],
+      nonMetricFields: [
+        {
+          fieldName: 'rt_airline_lowercase',
+          type: ML_JOB_FIELD_TYPES.KEYWORD,
+          existsInDocs: true,
+          aggregatable: true,
+          loading: false,
+          exampleCount: 10,
+          docCountFormatted: '5000 (100%)',
+          viewableInLens: true,
+          hasActionMenu: true,
+        },
+      ],
+      visibleMetricFieldsCount: 2,
+      totalMetricFieldsCount: 2,
+      populatedFieldsCount: 9,
+      totalFieldsCount: 10,
+    },
+  };
+  const customLabelTestData: TestData = {
+    suiteTitle: 'custom label',
+    sourceIndexOrSavedSearch: 'ft_farequote',
+    fieldsToRename: [
+      {
+        originalName: 'responsetime',
+        newName: 'new_responsetime',
+      },
+    ],
+    expected: {
+      totalDocCountFormatted: '86,274',
+      metricFields: [
+        {
+          fieldName: 'new_responsetime',
+          type: ML_JOB_FIELD_TYPES.NUMBER,
+          existsInDocs: true,
+          aggregatable: true,
+          loading: false,
+          docCountFormatted: '5000 (100%)',
+          statsMaxDecimalPlaces: 3,
+          topValuesCount: 10,
+          viewableInLens: true,
+          hasActionMenu: false,
+        },
+      ],
+      nonMetricFields: [],
+      visibleMetricFieldsCount: 1,
+      totalMetricFieldsCount: 1,
+      populatedFieldsCount: 7,
+      totalFieldsCount: 8,
+    },
+  };
+
+  async function navigateToIndexDataVisualizer(testData: TestData) {
+    // Start navigation from the base of the ML app.
+    await ml.testExecution.logTestStep(
+      `${testData.suiteTitle} loads the data visualizer selector page`
+    );
+    await ml.navigation.navigateToMl();
+    await ml.navigation.navigateToDataVisualizer();
+
+    await ml.testExecution.logTestStep(
+      `${testData.suiteTitle} loads the saved search selection page`
+    );
+    await ml.dataVisualizer.navigateToIndexPatternSelection();
+
+    await ml.testExecution.logTestStep(
+      `${testData.suiteTitle} loads the index data visualizer page`
+    );
+    await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(
+      testData.sourceIndexOrSavedSearch
+    );
+
+    await ml.testExecution.logTestStep(`${testData.suiteTitle} displays the time range step`);
+    await ml.dataVisualizerIndexBased.assertTimeRangeSelectorSectionExists();
+
+    await ml.testExecution.logTestStep(`${testData.suiteTitle} loads data for full time range`);
+    await ml.dataVisualizerIndexBased.clickUseFullDataButton(
+      testData.expected.totalDocCountFormatted
+    );
+  }
+
+  async function checkPageDetails(testData: TestData) {
+    await ml.testExecution.logTestStep(
+      `${testData.suiteTitle} displays elements in the doc count panel correctly`
+    );
+    await ml.dataVisualizerIndexBased.assertTotalDocCountHeaderExist();
+    await ml.dataVisualizerIndexBased.assertTotalDocCountChartExist();
+
+    await ml.testExecution.logTestStep(
+      `${testData.suiteTitle} displays elements in the data visualizer table correctly`
+    );
+    await ml.dataVisualizerIndexBased.assertDataVisualizerTableExist();
+
+    if (testData.rowsPerPage) {
+      await ml.dataVisualizerTable.ensureNumRowsPerPage(testData.rowsPerPage);
+    }
+
+    await ml.dataVisualizerTable.assertSearchPanelExist();
+    await ml.dataVisualizerTable.assertSampleSizeInputExists();
+    await ml.dataVisualizerTable.assertFieldTypeInputExists();
+    await ml.dataVisualizerTable.assertFieldNameInputExists();
+
+    await ml.dataVisualizerIndexBased.assertFieldCountPanelExist();
+    await ml.dataVisualizerIndexBased.assertMetricFieldsSummaryExist();
+    await ml.dataVisualizerIndexBased.assertFieldsSummaryExist();
+    await ml.dataVisualizerIndexBased.assertVisibleMetricFieldsCount(
+      testData.expected.visibleMetricFieldsCount
+    );
+    await ml.dataVisualizerIndexBased.assertTotalMetricFieldsCount(
+      testData.expected.totalMetricFieldsCount
+    );
+    await ml.dataVisualizerIndexBased.assertVisibleFieldsCount(
+      testData.expected.populatedFieldsCount
+    );
+    await ml.dataVisualizerIndexBased.assertTotalFieldsCount(testData.expected.totalFieldsCount);
+  }
+
+  describe('index pattern management', function () {
+    this.tags(['mlqa']);
+    const indexPatternTitle = 'ft_farequote';
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+
+      await ml.testResources.setKibanaTimeZoneToUTC();
+      await ml.securityUI.loginAsMlPowerUser();
+    });
+
+    beforeEach(async () => {
+      await ml.testResources.createIndexPatternIfNeeded(indexPatternTitle, '@timestamp');
+      await navigateToIndexDataVisualizer(originalTestData);
+    });
+
+    afterEach(async () => {
+      await ml.testResources.deleteIndexPatternByTitle(indexPatternTitle);
+    });
+
+    it(`adds new field`, async () => {
+      await ml.testExecution.logTestStep('adds new runtime fields');
+      for (const newField of addDeleteFieldTestData.newFields!) {
+        await ml.dataVisualizerIndexPatternManagement.addRuntimeField(
+          newField.fieldName,
+          newField.script,
+          newField.type
+        );
+      }
+
+      await ml.testExecution.logTestStep('displays details for added runtime metric fields');
+      for (const fieldRow of addDeleteFieldTestData.expected.metricFields as Array<
+        Required<MetricFieldVisConfig>
+      >) {
+        await ml.dataVisualizerTable.assertNumberFieldContents(
+          fieldRow.fieldName,
+          fieldRow.docCountFormatted,
+          fieldRow.topValuesCount,
+          fieldRow.viewableInLens,
+          fieldRow.hasActionMenu
+        );
+      }
+      await ml.testExecution.logTestStep('displays details for added runtime non metric fields');
+      for (const fieldRow of addDeleteFieldTestData.expected.nonMetricFields!) {
+        await ml.dataVisualizerTable.assertNonMetricFieldContents(
+          fieldRow.type,
+          fieldRow.fieldName!,
+          fieldRow.docCountFormatted,
+          fieldRow.exampleCount,
+          fieldRow.viewableInLens,
+          fieldRow.hasActionMenu
+        );
+      }
+      await checkPageDetails(addDeleteFieldTestData);
+    });
+
+    it(`sets custom label for existing field`, async () => {
+      for (const field of customLabelTestData.fieldsToRename!) {
+        await ml.dataVisualizerIndexPatternManagement.renameField(
+          field.originalName,
+          field.newName
+        );
+        await ml.dataVisualizerTable.assertDisplayName(field.originalName, field.newName);
+      }
+    });
+
+    it(`deletes existing field`, async () => {
+      await ml.testExecution.logTestStep('adds new runtime fields');
+      for (const newField of addDeleteFieldTestData.newFields!) {
+        await ml.dataVisualizerIndexPatternManagement.addRuntimeField(
+          newField.fieldName,
+          newField.script,
+          newField.type
+        );
+      }
+      await ml.testExecution.logTestStep('deletes newly added runtime fields');
+      for (const fieldToDelete of addDeleteFieldTestData.newFields!) {
+        await ml.dataVisualizerIndexPatternManagement.deleteField(fieldToDelete.fieldName);
+      }
+
+      await ml.testExecution.logTestStep('displays page details without the deleted fields');
+      await checkPageDetails(originalTestData);
+    });
+  });
+}
diff --git a/x-pack/test/functional/services/ml/data_visualizer_index_pattern_management.ts b/x-pack/test/functional/services/ml/data_visualizer_index_pattern_management.ts
new file mode 100644
index 0000000000000..e5d884b22514b
--- /dev/null
+++ b/x-pack/test/functional/services/ml/data_visualizer_index_pattern_management.ts
@@ -0,0 +1,118 @@
+/*
+ * 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';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { MlDataVisualizerTable } from './data_visualizer_table';
+
+export function MachineLearningDataVisualizerIndexPatternManagementProvider(
+  { getService }: FtrProviderContext,
+  dataVisualizerTable: MlDataVisualizerTable
+) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const fieldEditor = getService('fieldEditor');
+  const comboBox = getService('comboBox');
+
+  return {
+    async assertIndexPatternManagementButtonExists() {
+      await testSubjects.existOrFail('dataVisualizerIndexPatternManagementButton');
+    },
+    async assertIndexPatternManagementMenuExists() {
+      await testSubjects.existOrFail('dataVisualizerIndexPatternManagementMenu');
+    },
+    async assertIndexPatternFieldEditorExists() {
+      await testSubjects.existOrFail('indexPatternFieldEditorForm');
+    },
+
+    async assertIndexPatternFieldEditorNotExist() {
+      await testSubjects.missingOrFail('indexPatternFieldEditorForm');
+    },
+
+    async clickIndexPatternManagementButton() {
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.clickWhenNotDisabled('dataVisualizerIndexPatternManagementButton');
+        await this.assertIndexPatternManagementMenuExists();
+      });
+    },
+    async clickAddIndexPatternFieldAction() {
+      await retry.tryForTime(5000, async () => {
+        await this.assertIndexPatternManagementMenuExists();
+        await testSubjects.clickWhenNotDisabled('dataVisualizerAddIndexPatternFieldAction');
+        await this.assertIndexPatternFieldEditorExists();
+      });
+    },
+
+    async clickManageIndexPatternAction() {
+      await retry.tryForTime(5000, async () => {
+        await this.assertIndexPatternManagementMenuExists();
+        await testSubjects.clickWhenNotDisabled('dataVisualizerManageIndexPatternAction');
+        await testSubjects.existOrFail('editIndexPattern');
+      });
+    },
+
+    async assertIndexPatternFieldEditorFieldType(expectedIdentifier: string) {
+      await retry.tryForTime(2000, async () => {
+        const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+          'typeField > comboBoxInput'
+        );
+        expect(comboBoxSelectedOptions).to.eql(
+          expectedIdentifier === '' ? [] : [expectedIdentifier],
+          `Expected type field to be '${expectedIdentifier}' (got '${comboBoxSelectedOptions}')`
+        );
+      });
+    },
+
+    async setIndexPatternFieldEditorFieldType(type: string) {
+      await comboBox.set('typeField > comboBoxInput', type);
+
+      await this.assertIndexPatternFieldEditorFieldType(type);
+    },
+
+    async addRuntimeField(name: string, script: string, fieldType: string) {
+      await retry.tryForTime(5000, async () => {
+        await this.clickIndexPatternManagementButton();
+        await this.clickAddIndexPatternFieldAction();
+
+        await this.assertIndexPatternFieldEditorExists();
+        await fieldEditor.setName(name);
+        await fieldEditor.enableValue();
+        await fieldEditor.typeScript(script);
+        await this.setIndexPatternFieldEditorFieldType(fieldType);
+
+        await fieldEditor.save();
+        await this.assertIndexPatternFieldEditorNotExist();
+      });
+    },
+
+    async renameField(originalName: string, newName: string) {
+      await retry.tryForTime(5000, async () => {
+        await dataVisualizerTable.clickEditIndexPatternFieldButton(originalName);
+        await this.assertIndexPatternFieldEditorExists();
+        await fieldEditor.enableCustomLabel();
+        await fieldEditor.setCustomLabel(newName);
+        await fieldEditor.save();
+        await this.assertIndexPatternFieldEditorNotExist();
+      });
+    },
+
+    async confirmDeleteField() {
+      await testSubjects.existOrFail('deleteModalConfirmText');
+      await testSubjects.setValue('deleteModalConfirmText', 'remove');
+      await testSubjects.click('confirmModalConfirmButton');
+      await testSubjects.missingOrFail('deleteModalConfirmText');
+    },
+
+    async deleteField(fieldName: string) {
+      await retry.tryForTime(5000, async () => {
+        await dataVisualizerTable.clickActionMenuDeleteIndexPatternFieldButton(fieldName);
+        await this.confirmDeleteField();
+        await dataVisualizerTable.assertRowNotExists(fieldName);
+      });
+    },
+  };
+}
diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts
index 1eb0edbe01c8e..2f67a9b75e3d6 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_table.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts
@@ -18,6 +18,8 @@ export function MachineLearningDataVisualizerTableProvider(
 ) {
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
+  const find = getService('find');
+  const browser = getService('browser');
 
   return new (class DataVisualizerTable {
     public async parseDataVisualizerTable() {
@@ -79,6 +81,25 @@ export function MachineLearningDataVisualizerTableProvider(
       await testSubjects.existOrFail(this.rowSelector(fieldName));
     }
 
+    public async assertRowNotExists(fieldName: string) {
+      await retry.tryForTime(1000, async () => {
+        await testSubjects.missingOrFail(this.rowSelector(fieldName));
+      });
+    }
+
+    public async assertDisplayName(fieldName: string, expectedDisplayName: string) {
+      await retry.tryForTime(10000, async () => {
+        const subj = await testSubjects.find(
+          this.rowSelector(fieldName, `dataVisualizerDisplayName-${fieldName}`)
+        );
+        const displayName = await subj.getVisibleText();
+        expect(displayName).to.eql(
+          expectedDisplayName,
+          `Expected display name of ${fieldName} to be '${expectedDisplayName}' (got '${displayName}')`
+        );
+      });
+    }
+
     public detailsSelector(fieldName: string, subSelector?: string) {
       const row = `~dataVisualizerTable > ~dataVisualizerFieldExpandedRow-${fieldName}`;
       return !subSelector ? row : `${row} > ${subSelector}`;
@@ -133,10 +154,85 @@ export function MachineLearningDataVisualizerTableProvider(
       );
     }
 
-    public async assertViewInLensActionEnabled(fieldName: string) {
+    public async ensureAllMenuPopoversClosed() {
+      await retry.tryForTime(5000, async () => {
+        await browser.pressKeys(browser.keys.ESCAPE);
+        const popoverExists = await find.existsByCssSelector('euiContextMenuPanel');
+        expect(popoverExists).to.eql(false, 'All popovers should be closed');
+      });
+    }
+
+    public async ensureActionsMenuOpen(fieldName: string) {
+      await retry.tryForTime(30 * 1000, async () => {
+        await this.ensureAllMenuPopoversClosed();
+        await testSubjects.click(this.rowSelector(fieldName, 'euiCollapsedItemActionsButton'));
+        await find.existsByCssSelector('euiContextMenuPanel');
+      });
+    }
+
+    public async assertActionsMenuClosed(fieldName: string, action: string) {
+      await retry.tryForTime(30 * 1000, async () => {
+        await testSubjects.missingOrFail(action, { timeout: 5000 });
+      });
+    }
+
+    public async assertActionMenuViewInLensEnabled(fieldName: string, expectedValue: boolean) {
+      await retry.tryForTime(30 * 1000, async () => {
+        await this.ensureActionsMenuOpen(fieldName);
+        const actionMenuViewInLensButton = await find.byCssSelector(
+          '[data-test-subj="dataVisualizerActionViewInLensButton"][class="euiContextMenuItem"]'
+        );
+        const isEnabled = await actionMenuViewInLensButton.isEnabled();
+        expect(isEnabled).to.eql(
+          expectedValue,
+          `Expected "Explore in lens" action menu button for '${fieldName}' to be '${
+            expectedValue ? 'enabled' : 'disabled'
+          }' (got '${isEnabled ? 'enabled' : 'disabled'}')`
+        );
+      });
+    }
+
+    public async assertActionMenuDeleteIndexPatternFieldButtonEnabled(
+      fieldName: string,
+      expectedValue: boolean
+    ) {
+      await this.ensureActionsMenuOpen(fieldName);
+      const actionMenuViewInLensButton = await find.byCssSelector(
+        '[data-test-subj="dataVisualizerActionDeleteIndexPatternFieldButton"][class="euiContextMenuItem"]'
+      );
+      const isEnabled = await actionMenuViewInLensButton.isEnabled();
+      expect(isEnabled).to.eql(
+        expectedValue,
+        `Expected "Delete index pattern field" action menu button for '${fieldName}' to be '${
+          expectedValue ? 'enabled' : 'disabled'
+        }' (got '${isEnabled ? 'enabled' : 'disabled'}')`
+      );
+    }
+
+    public async clickActionMenuDeleteIndexPatternFieldButton(fieldName: string) {
+      const testSubj = 'dataVisualizerActionDeleteIndexPatternFieldButton';
+      await retry.tryForTime(5000, async () => {
+        await this.ensureActionsMenuOpen(fieldName);
+
+        const button = await find.byCssSelector(
+          `[data-test-subj="${testSubj}"][class="euiContextMenuItem"]`
+        );
+        await button.click();
+        await this.assertActionsMenuClosed(fieldName, testSubj);
+        await testSubjects.existOrFail('runtimeFieldDeleteConfirmModal');
+      });
+    }
+
+    public async assertViewInLensActionEnabled(fieldName: string, expectedValue: boolean) {
       const actionButton = this.rowSelector(fieldName, 'dataVisualizerActionViewInLensButton');
       await testSubjects.existOrFail(actionButton);
-      await testSubjects.isEnabled(actionButton);
+      const isEnabled = await testSubjects.isEnabled(actionButton);
+      expect(isEnabled).to.eql(
+        expectedValue,
+        `Expected "Explore in lens" button for '${fieldName}' to be '${
+          expectedValue ? 'enabled' : 'disabled'
+        }' (got '${isEnabled ? 'enabled' : 'disabled'}')`
+      );
     }
 
     public async assertViewInLensActionNotExists(fieldName: string) {
@@ -144,6 +240,34 @@ export function MachineLearningDataVisualizerTableProvider(
       await testSubjects.missingOrFail(actionButton);
     }
 
+    public async assertEditIndexPatternFieldButtonEnabled(
+      fieldName: string,
+      expectedValue: boolean
+    ) {
+      const selector = this.rowSelector(
+        fieldName,
+        'dataVisualizerActionEditIndexPatternFieldButton'
+      );
+      await testSubjects.existOrFail(selector);
+      const isEnabled = await testSubjects.isEnabled(selector);
+      expect(isEnabled).to.eql(
+        expectedValue,
+        `Expected "Edit index pattern" button for '${fieldName}' to be '${
+          expectedValue ? 'enabled' : 'disabled'
+        }' (got '${isEnabled ? 'enabled' : 'disabled'}')`
+      );
+    }
+
+    public async clickEditIndexPatternFieldButton(fieldName: string) {
+      await retry.tryForTime(5000, async () => {
+        await this.assertEditIndexPatternFieldButtonEnabled(fieldName, true);
+        await testSubjects.click(
+          this.rowSelector(fieldName, 'dataVisualizerActionEditIndexPatternFieldButton')
+        );
+        await testSubjects.existOrFail('indexPatternFieldEditorForm');
+      });
+    }
+
     public async assertFieldDistinctValuesExist(fieldName: string) {
       const selector = this.rowSelector(fieldName, 'dataVisualizerTableColumnDistinctValues');
       await testSubjects.existOrFail(selector);
@@ -263,6 +387,7 @@ export function MachineLearningDataVisualizerTableProvider(
       docCountFormatted: string,
       topValuesCount: number,
       viewableInLens: boolean,
+      hasActionMenu = false,
       checkDistributionPreviewExist = true
     ) {
       await this.assertRowExists(fieldName);
@@ -282,7 +407,11 @@ export function MachineLearningDataVisualizerTableProvider(
         await this.assertDistributionPreviewExist(fieldName);
       }
       if (viewableInLens) {
-        await this.assertViewInLensActionEnabled(fieldName);
+        if (hasActionMenu) {
+          await this.assertActionMenuViewInLensEnabled(fieldName, true);
+        } else {
+          await this.assertViewInLensActionEnabled(fieldName, true);
+        }
       } else {
         await this.assertViewInLensActionNotExists(fieldName);
       }
@@ -378,7 +507,8 @@ export function MachineLearningDataVisualizerTableProvider(
       fieldName: string,
       docCountFormatted: string,
       exampleCount: number,
-      viewableInLens: boolean
+      viewableInLens: boolean,
+      hasActionMenu?: boolean
     ) {
       // Currently the data used in the data visualizer tests only contains these field types.
       if (fieldType === ML_JOB_FIELD_TYPES.DATE) {
@@ -394,7 +524,11 @@ export function MachineLearningDataVisualizerTableProvider(
       }
 
       if (viewableInLens) {
-        await this.assertViewInLensActionEnabled(fieldName);
+        if (hasActionMenu) {
+          await this.assertActionMenuViewInLensEnabled(fieldName, true);
+        } else {
+          await this.assertViewInLensActionEnabled(fieldName, true);
+        }
       } else {
         await this.assertViewInLensActionNotExists(fieldName);
       }
diff --git a/x-pack/test/functional/services/ml/index.ts b/x-pack/test/functional/services/ml/index.ts
index 64298bbdedd63..2cc9a3afa442b 100644
--- a/x-pack/test/functional/services/ml/index.ts
+++ b/x-pack/test/functional/services/ml/index.ts
@@ -23,6 +23,7 @@ import { MachineLearningDataFrameAnalyticsTableProvider } from './data_frame_ana
 import { MachineLearningDataVisualizerProvider } from './data_visualizer';
 import { MachineLearningDataVisualizerFileBasedProvider } from './data_visualizer_file_based';
 import { MachineLearningDataVisualizerIndexBasedProvider } from './data_visualizer_index_based';
+import { MachineLearningDataVisualizerIndexPatternManagementProvider } from './data_visualizer_index_pattern_management';
 import { MachineLearningJobManagementProvider } from './job_management';
 import { MachineLearningJobSelectionProvider } from './job_selection';
 import { MachineLearningJobSourceSelectionProvider } from './job_source_selection';
@@ -86,6 +87,10 @@ export function MachineLearningProvider(context: FtrProviderContext) {
 
   const dataVisualizerFileBased = MachineLearningDataVisualizerFileBasedProvider(context, commonUI);
   const dataVisualizerIndexBased = MachineLearningDataVisualizerIndexBasedProvider(context);
+  const dataVisualizerIndexPatternManagement = MachineLearningDataVisualizerIndexPatternManagementProvider(
+    context,
+    dataVisualizerTable
+  );
 
   const jobManagement = MachineLearningJobManagementProvider(context, api);
   const jobSelection = MachineLearningJobSelectionProvider(context);
@@ -131,6 +136,7 @@ export function MachineLearningProvider(context: FtrProviderContext) {
     dataVisualizer,
     dataVisualizerFileBased,
     dataVisualizerIndexBased,
+    dataVisualizerIndexPatternManagement,
     dataVisualizerTable,
     jobManagement,
     jobSelection,

From 874dfc62f41e604369ba906f82036342c9b7ddfe Mon Sep 17 00:00:00 2001
From: ymao1 <ying.mao@elastic.co>
Date: Wed, 23 Jun 2021 14:37:31 -0400
Subject: [PATCH 05/95] [Actions] Rename `tls.*` configs to `ssl.*` (#102902)

* Changing tls to ssl

* Changing tls to ssl

* Updating docs

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/settings/alert-action-settings.asciidoc  | 34 ++++++++---------
 .../resources/base/bin/kibana-docker          |  4 +-
 .../actions/server/actions_client.test.ts     |  2 +-
 .../actions/server/actions_config.mock.ts     |  2 +-
 .../actions/server/actions_config.test.ts     | 38 +++++++++----------
 .../plugins/actions/server/actions_config.ts  | 14 +++----
 .../server/builtin_action_types/email.test.ts |  4 +-
 .../lib/axios_utils.test.ts                   | 12 +++---
 .../lib/axios_utils_connection.test.ts        | 22 +++++------
 .../lib/get_custom_agents.test.ts             | 38 +++++++++----------
 .../lib/get_custom_agents.ts                  | 38 +++++++++----------
 ...s.test.ts => get_node_ssl_options.test.ts} | 28 +++++++-------
 ...tls_options.ts => get_node_ssl_options.ts} |  8 ++--
 .../lib/send_email.test.ts                    | 18 ++++-----
 .../builtin_action_types/lib/send_email.ts    | 24 ++++++------
 .../server/builtin_action_types/slack.test.ts | 10 ++---
 .../server/builtin_action_types/teams.test.ts |  4 +-
 .../builtin_action_types/webhook.test.ts      |  4 +-
 x-pack/plugins/actions/server/config.test.ts  |  6 +--
 x-pack/plugins/actions/server/config.ts       |  8 ++--
 x-pack/plugins/actions/server/index.ts        | 10 ++---
 .../server/lib/custom_host_settings.test.ts   | 26 ++++++-------
 .../server/lib/custom_host_settings.ts        | 14 +++----
 x-pack/plugins/actions/server/types.ts        |  4 +-
 .../alerting_api_integration/common/config.ts | 22 +++++------
 .../tests/actions/get_all.ts                  | 24 ++++++------
 .../spaces_only/config.ts                     |  2 +-
 .../actions/builtin_action_types/webhook.ts   | 16 ++++----
 .../spaces_only/tests/actions/get_all.ts      | 24 ++++++------
 .../spaces_only_legacy/config.ts              |  2 +-
 .../actions/builtin_action_types/webhook.ts   | 16 ++++----
 31 files changed, 239 insertions(+), 239 deletions(-)
 rename x-pack/plugins/actions/server/builtin_action_types/lib/{get_node_tls_options.test.ts => get_node_ssl_options.test.ts} (67%)
 rename x-pack/plugins/actions/server/builtin_action_types/lib/{get_node_tls_options.ts => get_node_ssl_options.ts} (92%)

diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index 71f141d1ed5d6..d1d283ca60fbb 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -69,7 +69,7 @@ You can configure the following settings in the `kibana.yml` file.
 --
 xpack.actions.customHostSettings:
   - url: smtp://mail.example.com:465
-    tls: 
+    ssl: 
       verificationMode: 'full'
       certificateAuthoritiesFiles: [ 'one.crt' ]
       certificateAuthoritiesData: |
@@ -79,7 +79,7 @@ xpack.actions.customHostSettings:
     smtp:
       requireTLS: true
   - url: https://webhook.example.com
-    tls: 
+    ssl: 
       // legacy
       rejectUnauthorized: false
       verificationMode: 'none'
@@ -97,8 +97,8 @@ xpack.actions.customHostSettings:
   server, and the `https` URLs are used for actions which use `https` to
   connect to services. +
   +
-  Entries with `https` URLs can use the `tls` options, and entries with `smtp`
-  URLs can use both the `tls` and `smtp` options. +
+  Entries with `https` URLs can use the `ssl` options, and entries with `smtp`
+  URLs can use both the `ssl` and `smtp` options. +
   +
   No other URL values should be part of this URL, including paths,
   query strings, and authentication information.  When an http or smtp request
@@ -117,24 +117,24 @@ xpack.actions.customHostSettings:
   The options `smtp.ignoreTLS` and `smtp.requireTLS` can not both be set to true.
 
 | `xpack.actions.customHostSettings[n]`
-`.tls.rejectUnauthorized` {ess-icon}
-  | Deprecated. Use <<action-config-custom-host-verification-mode,`xpack.actions.customHostSettings.tls.verificationMode`>> instead. A boolean value indicating whether to bypass server certificate validation.
+`.ssl.rejectUnauthorized` {ess-icon}
+  | Deprecated. Use <<action-config-custom-host-verification-mode,`xpack.actions.customHostSettings.ssl.verificationMode`>> instead. A boolean value indicating whether to bypass server certificate validation.
   Overrides the general `xpack.actions.rejectUnauthorized` configuration
   for requests made for this hostname/port.
 
 |[[action-config-custom-host-verification-mode]] `xpack.actions.customHostSettings[n]`
-`.tls.verificationMode`
+`.ssl.verificationMode`
   | Controls the verification of the server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection to the host server. Valid values are `full`, `certificate`, and `none`. 
- Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>. Overrides the general `xpack.actions.tls.verificationMode` configuration
+ Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>. Overrides the general `xpack.actions.ssl.verificationMode` configuration
   for requests made for this hostname/port.
 
 | `xpack.actions.customHostSettings[n]`
-`.tls.certificateAuthoritiesFiles`
+`.ssl.certificateAuthoritiesFiles`
   | A file name or list of file names of PEM-encoded certificate files to use
   to validate the server.
 
 | `xpack.actions.customHostSettings[n]`
-`.tls.certificateAuthoritiesData` {ess-icon}
+`.ssl.certificateAuthoritiesData` {ess-icon}
   | The contents of a PEM-encoded certificate file, or multiple files appended
   into a single string.  This configuration can be used for environments where
   the files cannot be made available.  
@@ -165,28 +165,28 @@ xpack.actions.customHostSettings:
 
 a|`xpack.actions.`
 `proxyRejectUnauthorizedCertificates` {ess-icon}
-  | Deprecated. Use <<action-config-proxy-verification-mode,`xpack.actions.tls.proxyVerificationMode`>> instead. Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Default: `true`.
+  | Deprecated. Use <<action-config-proxy-verification-mode,`xpack.actions.ssl.proxyVerificationMode`>> instead. Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Default: `true`.
 
 |[[action-config-proxy-verification-mode]]
 `xpack.actions[n]`
-`.tls.proxyVerificationMode` {ess-icon}
+`.ssl.proxyVerificationMode` {ess-icon}
 | Controls the verification for the proxy server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection to the proxy server. Valid values are `full`, `certificate`, and `none`. 
 Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>.
 
 | `xpack.actions.rejectUnauthorized` {ess-icon}
-  | Deprecated. Use <<action-config-verification-mode,`xpack.actions.tls.verificationMode`>> instead. Set to `false` to bypass certificate validation for actions. Default: `true`. +
+  | Deprecated. Use <<action-config-verification-mode,`xpack.actions.ssl.verificationMode`>> instead. Set to `false` to bypass certificate validation for actions. Default: `true`. +
   +
   As an alternative to setting `xpack.actions.rejectUnauthorized`, you can use the setting
-  `xpack.actions.customHostSettings` to set TLS options for specific servers.
+  `xpack.actions.customHostSettings` to set SSL options for specific servers.
 
 |[[action-config-verification-mode]]
 `xpack.actions[n]`
-`.tls.verificationMode` {ess-icon}
+`.ssl.verificationMode` {ess-icon}
 | Controls the verification for the server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection for actions. Valid values are `full`, `certificate`, and `none`. 
   Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>. +
   +
-  As an alternative to setting `xpack.actions.tls.verificationMode`, you can use the setting
-  `xpack.actions.customHostSettings` to set TLS options for specific servers.
+  As an alternative to setting `xpack.actions.ssl.verificationMode`, you can use the setting
+  `xpack.actions.customHostSettings` to set SSL options for specific servers.
 
 
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 9ea6e8960e373..d109a824ca81d 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -203,8 +203,8 @@ kibana_vars=(
     xpack.actions.proxyUrl
     xpack.actions.rejectUnauthorized
     xpack.actions.responseTimeout
-    xpack.actions.tls.proxyVerificationMode
-    xpack.actions.tls.verificationMode
+    xpack.actions.ssl.proxyVerificationMode
+    xpack.actions.ssl.verificationMode
     xpack.alerting.healthCheck.interval
     xpack.alerting.invalidateApiKeysTask.interval
     xpack.alerting.invalidateApiKeysTask.removalDelay
diff --git a/x-pack/plugins/actions/server/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client.test.ts
index 16388b2faf52e..012cd1a58de7e 100644
--- a/x-pack/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client.test.ts
@@ -429,7 +429,7 @@ describe('create()', () => {
         idleInterval: schema.duration().validate('1h'),
         pageSize: 100,
       },
-      tls: {
+      ssl: {
         verificationMode: 'full',
         proxyVerificationMode: 'full',
       },
diff --git a/x-pack/plugins/actions/server/actions_config.mock.ts b/x-pack/plugins/actions/server/actions_config.mock.ts
index 19a43951377b6..36298d84acabc 100644
--- a/x-pack/plugins/actions/server/actions_config.mock.ts
+++ b/x-pack/plugins/actions/server/actions_config.mock.ts
@@ -15,7 +15,7 @@ const createActionsConfigMock = () => {
     ensureHostnameAllowed: jest.fn().mockReturnValue({}),
     ensureUriAllowed: jest.fn().mockReturnValue({}),
     ensureActionTypeEnabled: jest.fn().mockReturnValue({}),
-    getTLSSettings: jest.fn().mockReturnValue({
+    getSSLSettings: jest.fn().mockReturnValue({
       verificationMode: 'full',
     }),
     getProxySettings: jest.fn().mockReturnValue(undefined),
diff --git a/x-pack/plugins/actions/server/actions_config.test.ts b/x-pack/plugins/actions/server/actions_config.test.ts
index 93dad226e0c99..51cd9e5599472 100644
--- a/x-pack/plugins/actions/server/actions_config.test.ts
+++ b/x-pack/plugins/actions/server/actions_config.test.ts
@@ -37,7 +37,7 @@ const defaultActionsConfig: ActionsConfig = {
     idleInterval: schema.duration().validate('1h'),
     pageSize: 100,
   },
-  tls: {
+  ssl: {
     proxyVerificationMode: 'full',
     verificationMode: 'full',
   },
@@ -316,38 +316,38 @@ describe('getProxySettings', () => {
       proxyRejectUnauthorizedCertificates: true,
     };
     let proxySettings = getActionsConfigurationUtilities(configTrue).getProxySettings();
-    expect(proxySettings?.proxyTLSSettings.verificationMode).toBe('full');
+    expect(proxySettings?.proxySSLSettings.verificationMode).toBe('full');
 
     const configFalse: ActionsConfig = {
       ...defaultActionsConfig,
       proxyUrl: 'https://proxy.elastic.co',
       proxyRejectUnauthorizedCertificates: false,
-      tls: {},
+      ssl: {},
     };
     proxySettings = getActionsConfigurationUtilities(configFalse).getProxySettings();
-    expect(proxySettings?.proxyTLSSettings.verificationMode).toBe('none');
+    expect(proxySettings?.proxySSLSettings.verificationMode).toBe('none');
   });
 
-  test('returns proper verificationMode value, based on the TLS proxy configuration', () => {
+  test('returns proper verificationMode value, based on the SSL proxy configuration', () => {
     const configTrue: ActionsConfig = {
       ...defaultActionsConfig,
       proxyUrl: 'https://proxy.elastic.co',
-      tls: {
+      ssl: {
         proxyVerificationMode: 'full',
       },
     };
     let proxySettings = getActionsConfigurationUtilities(configTrue).getProxySettings();
-    expect(proxySettings?.proxyTLSSettings.verificationMode).toBe('full');
+    expect(proxySettings?.proxySSLSettings.verificationMode).toBe('full');
 
     const configFalse: ActionsConfig = {
       ...defaultActionsConfig,
       proxyUrl: 'https://proxy.elastic.co',
-      tls: {
+      ssl: {
         proxyVerificationMode: 'none',
       },
     };
     proxySettings = getActionsConfigurationUtilities(configFalse).getProxySettings();
-    expect(proxySettings?.proxyTLSSettings.verificationMode).toBe('none');
+    expect(proxySettings?.proxySSLSettings.verificationMode).toBe('none');
   });
 
   test('returns proxy headers', () => {
@@ -432,13 +432,13 @@ describe('getProxySettings', () => {
       customHostSettings: [
         {
           url: 'https://elastic.co',
-          tls: {
+          ssl: {
             verificationMode: 'full',
           },
         },
         {
           url: 'smtp://elastic.co:123',
-          tls: {
+          ssl: {
             verificationMode: 'none',
           },
           smtp: {
@@ -465,24 +465,24 @@ describe('getProxySettings', () => {
   });
 });
 
-describe('getTLSSettings', () => {
-  test('returns proper verificationMode value, based on the TLS proxy configuration', () => {
+describe('getSSLSettings', () => {
+  test('returns proper verificationMode value, based on the SSL proxy configuration', () => {
     const configTrue: ActionsConfig = {
       ...defaultActionsConfig,
-      tls: {
+      ssl: {
         verificationMode: 'full',
       },
     };
-    let tlsSettings = getActionsConfigurationUtilities(configTrue).getTLSSettings();
-    expect(tlsSettings.verificationMode).toBe('full');
+    let sslSettings = getActionsConfigurationUtilities(configTrue).getSSLSettings();
+    expect(sslSettings.verificationMode).toBe('full');
 
     const configFalse: ActionsConfig = {
       ...defaultActionsConfig,
-      tls: {
+      ssl: {
         verificationMode: 'none',
       },
     };
-    tlsSettings = getActionsConfigurationUtilities(configFalse).getTLSSettings();
-    expect(tlsSettings.verificationMode).toBe('none');
+    sslSettings = getActionsConfigurationUtilities(configFalse).getSSLSettings();
+    expect(sslSettings.verificationMode).toBe('none');
   });
 });
diff --git a/x-pack/plugins/actions/server/actions_config.ts b/x-pack/plugins/actions/server/actions_config.ts
index d25101f8279f8..9ce9439b726d4 100644
--- a/x-pack/plugins/actions/server/actions_config.ts
+++ b/x-pack/plugins/actions/server/actions_config.ts
@@ -14,8 +14,8 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { ActionsConfig, AllowedHosts, EnabledActionTypes, CustomHostSettings } from './config';
 import { getCanonicalCustomHostUrl } from './lib/custom_host_settings';
 import { ActionTypeDisabledError } from './lib';
-import { ProxySettings, ResponseSettings, TLSSettings } from './types';
-import { getTLSSettingsFromConfig } from './builtin_action_types/lib/get_node_tls_options';
+import { ProxySettings, ResponseSettings, SSLSettings } from './types';
+import { getSSLSettingsFromConfig } from './builtin_action_types/lib/get_node_ssl_options';
 
 export { AllowedHosts, EnabledActionTypes } from './config';
 
@@ -31,7 +31,7 @@ export interface ActionsConfigurationUtilities {
   ensureHostnameAllowed: (hostname: string) => void;
   ensureUriAllowed: (uri: string) => void;
   ensureActionTypeEnabled: (actionType: string) => void;
-  getTLSSettings: () => TLSSettings;
+  getSSLSettings: () => SSLSettings;
   getProxySettings: () => undefined | ProxySettings;
   getResponseSettings: () => ResponseSettings;
   getCustomHostSettings: (targetUrl: string) => CustomHostSettings | undefined;
@@ -94,8 +94,8 @@ function getProxySettingsFromConfig(config: ActionsConfig): undefined | ProxySet
     proxyBypassHosts: arrayAsSet(config.proxyBypassHosts),
     proxyOnlyHosts: arrayAsSet(config.proxyOnlyHosts),
     proxyHeaders: config.proxyHeaders,
-    proxyTLSSettings: getTLSSettingsFromConfig(
-      config.tls?.proxyVerificationMode,
+    proxySSLSettings: getSSLSettingsFromConfig(
+      config.ssl?.proxyVerificationMode,
       config.proxyRejectUnauthorizedCertificates
     ),
   };
@@ -146,8 +146,8 @@ export function getActionsConfigurationUtilities(
     isActionTypeEnabled,
     getProxySettings: () => getProxySettingsFromConfig(config),
     getResponseSettings: () => getResponseSettingsFromConfig(config),
-    getTLSSettings: () =>
-      getTLSSettingsFromConfig(config.tls?.verificationMode, config.rejectUnauthorized),
+    getSSLSettings: () =>
+      getSSLSettingsFromConfig(config.ssl?.verificationMode, config.rejectUnauthorized),
     ensureUriAllowed(uri: string) {
       if (!isUriAllowed(uri)) {
         throw new Error(allowListErrorMessage(AllowListingField.URL, uri));
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 98ea436b17f3e..8e9ea1c5e4aa9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -285,7 +285,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
@@ -346,7 +346,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
index ccd5a044971df..292471aaf9b6d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
@@ -75,7 +75,7 @@ describe('request', () => {
 
   test('it have been called with proper proxy agent for a valid url', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'full',
       },
       proxyUrl: 'https://localhost:1212',
@@ -110,7 +110,7 @@ describe('request', () => {
   test('it have been called with proper proxy agent for an invalid url', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: ':nope:',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -141,7 +141,7 @@ describe('request', () => {
 
   test('it bypasses with proxyBypassHosts when expected', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'full',
       },
       proxyUrl: 'https://elastic.proxy.co',
@@ -164,7 +164,7 @@ describe('request', () => {
 
   test('it does not bypass with proxyBypassHosts when expected', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'full',
       },
       proxyUrl: 'https://elastic.proxy.co',
@@ -187,7 +187,7 @@ describe('request', () => {
 
   test('it proxies with proxyOnlyHosts when expected', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'full',
       },
       proxyUrl: 'https://elastic.proxy.co',
@@ -210,7 +210,7 @@ describe('request', () => {
 
   test('it does not proxy with proxyOnlyHosts when expected', async () => {
     configurationUtilities.getProxySettings.mockReturnValue({
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'full',
       },
       proxyUrl: 'https://elastic.proxy.co',
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
index 235fca005e225..4ed9485e923a7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
@@ -86,7 +86,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        tls: {
+        ssl: {
           verificationMode: 'none',
         },
       });
@@ -99,7 +99,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url, tls: { verificationMode: 'none' } }],
+        customHostSettings: [{ url, ssl: { verificationMode: 'none' } }],
       });
       const res = await request({ axios, url, logger, configurationUtilities });
       expect(res.status).toBe(200);
@@ -110,7 +110,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url, tls: { certificateAuthoritiesData: CA } }],
+        customHostSettings: [{ url, ssl: { certificateAuthoritiesData: CA } }],
       });
       const res = await request({ axios, url, logger, configurationUtilities });
       expect(res.status).toBe(200);
@@ -121,7 +121,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url, tls: { certificateAuthoritiesData: KIBANA_CRT } }],
+        customHostSettings: [{ url, ssl: { certificateAuthoritiesData: KIBANA_CRT } }],
       });
       const fn = async () => await request({ axios, url, logger, configurationUtilities });
       await expect(fn()).rejects.toThrow('certificate');
@@ -135,7 +135,7 @@ describe('axios connections', () => {
         customHostSettings: [
           {
             url,
-            tls: {
+            ssl: {
               certificateAuthoritiesData: CA,
               verificationMode: 'none',
             },
@@ -151,13 +151,13 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        tls: {
+        ssl: {
           verificationMode: 'none',
         },
         customHostSettings: [
           {
             url,
-            tls: {
+            ssl: {
               certificateAuthoritiesData: CA,
             },
           },
@@ -173,7 +173,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url: otherUrl, tls: { verificationMode: 'none' } }],
+        customHostSettings: [{ url: otherUrl, ssl: { verificationMode: 'none' } }],
       });
       const fn = async () => await request({ axios, url, logger, configurationUtilities });
       await expect(fn()).rejects.toThrow('certificate');
@@ -184,7 +184,7 @@ describe('axios connections', () => {
       testServer = server;
 
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url, tls: { certificateAuthoritiesData: 'garbage' } }],
+        customHostSettings: [{ url, ssl: { certificateAuthoritiesData: 'garbage' } }],
       });
       const fn = async () => await request({ axios, url, logger, configurationUtilities });
       await expect(fn()).rejects.toThrow('certificate');
@@ -196,7 +196,7 @@ describe('axios connections', () => {
 
       const ca = '-----BEGIN CERTIFICATE-----\ngarbage\n-----END CERTIFICATE-----\n';
       const configurationUtilities = getACUfromConfig({
-        customHostSettings: [{ url, tls: { certificateAuthoritiesData: ca } }],
+        customHostSettings: [{ url, ssl: { certificateAuthoritiesData: ca } }],
       });
       const fn = async () => await request({ axios, url, logger, configurationUtilities });
       await expect(fn()).rejects.toThrow('certificate');
@@ -255,7 +255,7 @@ const BaseActionsConfig: ActionsConfig = {
   proxyUrl: undefined,
   proxyHeaders: undefined,
   proxyRejectUnauthorizedCertificates: true,
-  tls: {
+  ssl: {
     proxyVerificationMode: 'full',
     verificationMode: 'full',
   },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
index 8b4abe86e271a..0c1112da5909f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
@@ -30,7 +30,7 @@ describe('getCustomAgents', () => {
   test('get agents for valid proxy URL', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -44,7 +44,7 @@ describe('getCustomAgents', () => {
   test('return default agents for invalid proxy URL', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: ':nope: not a valid URL',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -64,7 +64,7 @@ describe('getCustomAgents', () => {
   test('returns non-proxy agents for matching proxyBypassHosts', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: new Set([targetHost]),
@@ -78,7 +78,7 @@ describe('getCustomAgents', () => {
   test('returns proxy agents for non-matching proxyBypassHosts', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: new Set([targetHost]),
@@ -96,7 +96,7 @@ describe('getCustomAgents', () => {
   test('returns proxy agents for matching proxyOnlyHosts', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -110,7 +110,7 @@ describe('getCustomAgents', () => {
   test('returns non-proxy agents for non-matching proxyOnlyHosts', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -128,7 +128,7 @@ describe('getCustomAgents', () => {
   test('handles custom host settings', () => {
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'none',
         certificateAuthoritiesData: 'ca data here',
       },
@@ -141,7 +141,7 @@ describe('getCustomAgents', () => {
   test('handles custom host settings with proxy', () => {
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -149,7 +149,7 @@ describe('getCustomAgents', () => {
     });
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'none',
         certificateAuthoritiesData: 'ca data here',
       },
@@ -163,12 +163,12 @@ describe('getCustomAgents', () => {
   });
 
   test('handles overriding global verificationMode "none"', () => {
-    configurationUtilities.getTLSSettings.mockReturnValue({
+    configurationUtilities.getSSLSettings.mockReturnValue({
       verificationMode: 'none',
     });
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'certificate',
       },
     });
@@ -181,12 +181,12 @@ describe('getCustomAgents', () => {
   });
 
   test('handles overriding global verificationMode "full"', () => {
-    configurationUtilities.getTLSSettings.mockReturnValue({
+    configurationUtilities.getSSLSettings.mockReturnValue({
       verificationMode: 'full',
     });
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'none',
       },
     });
@@ -199,12 +199,12 @@ describe('getCustomAgents', () => {
   });
 
   test('handles overriding global verificationMode "none" with a proxy', () => {
-    configurationUtilities.getTLSSettings.mockReturnValue({
+    configurationUtilities.getSSLSettings.mockReturnValue({
       verificationMode: 'none',
     });
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'full',
       },
     });
@@ -212,7 +212,7 @@ describe('getCustomAgents', () => {
       proxyUrl: 'https://someproxyhost',
       // note: this setting doesn't come into play, it's for the connection to
       // the proxy, not the target url
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -226,12 +226,12 @@ describe('getCustomAgents', () => {
   });
 
   test('handles overriding global verificationMode "full" with a proxy', () => {
-    configurationUtilities.getTLSSettings.mockReturnValue({
+    configurationUtilities.getSSLSettings.mockReturnValue({
       verificationMode: 'full',
     });
     configurationUtilities.getCustomHostSettings.mockReturnValue({
       url: targetUrlCanonical,
-      tls: {
+      ssl: {
         verificationMode: 'none',
       },
     });
@@ -239,7 +239,7 @@ describe('getCustomAgents', () => {
       proxyUrl: 'https://someproxyhost',
       // note: this setting doesn't come into play, it's for the connection to
       // the proxy, not the target url
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
index a327ee3ffe931..83d31ae1355d3 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
@@ -11,7 +11,7 @@ import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { Logger } from '../../../../../../src/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { getNodeTLSOptions, getTLSSettingsFromConfig } from './get_node_tls_options';
+import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
 
 interface GetCustomAgentsResponse {
   httpAgent: HttpAgent | undefined;
@@ -23,14 +23,14 @@ export function getCustomAgents(
   logger: Logger,
   url: string
 ): GetCustomAgentsResponse {
-  const generalTLSSettings = configurationUtilities.getTLSSettings();
-  const agentTLSOptions = getNodeTLSOptions(logger, generalTLSSettings.verificationMode);
+  const generalSSLSettings = configurationUtilities.getSSLSettings();
+  const agentSSLOptions = getNodeSSLOptions(logger, generalSSLSettings.verificationMode);
   // the default for rejectUnauthorized is the global setting, which can
   // be overridden (below) with a custom host setting
   const defaultAgents = {
     httpAgent: undefined,
     httpsAgent: new HttpsAgent({
-      ...agentTLSOptions,
+      ...agentSSLOptions,
     }),
   };
 
@@ -43,28 +43,28 @@ export function getCustomAgents(
   }
 
   // update the defaultAgents.httpsAgent if configured
-  const tlsSettings = customHostSettings?.tls;
+  const sslSettings = customHostSettings?.ssl;
   let agentOptions: AgentOptions | undefined;
-  if (tlsSettings) {
+  if (sslSettings) {
     logger.debug(`Creating customized connection settings for: ${url}`);
     agentOptions = defaultAgents.httpsAgent.options;
 
-    if (tlsSettings.certificateAuthoritiesData) {
-      agentOptions.ca = tlsSettings.certificateAuthoritiesData;
+    if (sslSettings.certificateAuthoritiesData) {
+      agentOptions.ca = sslSettings.certificateAuthoritiesData;
     }
 
-    const tlsSettingsFromConfig = getTLSSettingsFromConfig(
-      tlsSettings.verificationMode,
-      tlsSettings.rejectUnauthorized
+    const sslSettingsFromConfig = getSSLSettingsFromConfig(
+      sslSettings.verificationMode,
+      sslSettings.rejectUnauthorized
     );
     // see: src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
     // This is where the global rejectUnauthorized is overridden by a custom host
-    const customHostNodeTLSOptions = getNodeTLSOptions(
+    const customHostNodeSSLOptions = getNodeSSLOptions(
       logger,
-      tlsSettingsFromConfig.verificationMode
+      sslSettingsFromConfig.verificationMode
     );
-    if (customHostNodeTLSOptions.rejectUnauthorized !== undefined) {
-      agentOptions.rejectUnauthorized = customHostNodeTLSOptions.rejectUnauthorized;
+    if (customHostNodeSSLOptions.rejectUnauthorized !== undefined) {
+      agentOptions.rejectUnauthorized = customHostNodeSSLOptions.rejectUnauthorized;
     }
   }
 
@@ -107,12 +107,12 @@ export function getCustomAgents(
     return defaultAgents;
   }
 
-  const proxyNodeTLSOptions = getNodeTLSOptions(
+  const proxyNodeSSLOptions = getNodeSSLOptions(
     logger,
-    proxySettings.proxyTLSSettings.verificationMode
+    proxySettings.proxySSLSettings.verificationMode
   );
   // At this point, we are going to use a proxy, so we need new agents.
-  // We will though, copy over the calculated tls options from above, into
+  // We will though, copy over the calculated ssl options from above, into
   // the https agent.
   const httpAgent = new HttpProxyAgent(proxySettings.proxyUrl);
   const httpsAgent = (new HttpsProxyAgent({
@@ -121,7 +121,7 @@ export function getCustomAgents(
     protocol: proxyUrl.protocol,
     headers: proxySettings.proxyHeaders,
     // do not fail on invalid certs if value is false
-    ...proxyNodeTLSOptions,
+    ...proxyNodeSSLOptions,
   }) as unknown) as HttpsAgent;
   // vsCode wasn't convinced HttpsProxyAgent is an https.Agent, so we convinced it
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
similarity index 67%
rename from x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.test.ts
rename to x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
index 7d131985053f1..893191b2ca2b4 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
@@ -4,35 +4,35 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getNodeTLSOptions, getTLSSettingsFromConfig } from './get_node_tls_options';
+import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
 import { Logger } from '../../../../../../src/core/server';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
 
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
-describe('getNodeTLSOptions', () => {
-  test('get node.js TLS options: rejectUnauthorized eql true for the verification mode "full"', () => {
-    const nodeOption = getNodeTLSOptions(logger, 'full');
+describe('getNodeSSLOptions', () => {
+  test('get node.js SSL options: rejectUnauthorized eql true for the verification mode "full"', () => {
+    const nodeOption = getNodeSSLOptions(logger, 'full');
     expect(nodeOption).toMatchObject({
       rejectUnauthorized: true,
     });
   });
 
-  test('get node.js TLS options: rejectUnauthorized eql true for the verification mode "certificate"', () => {
-    const nodeOption = getNodeTLSOptions(logger, 'certificate');
+  test('get node.js SSL options: rejectUnauthorized eql true for the verification mode "certificate"', () => {
+    const nodeOption = getNodeSSLOptions(logger, 'certificate');
     expect(nodeOption.checkServerIdentity).not.toBeNull();
     expect(nodeOption.rejectUnauthorized).toBeTruthy();
   });
 
-  test('get node.js TLS options: rejectUnauthorized eql false for the verification mode "none"', () => {
-    const nodeOption = getNodeTLSOptions(logger, 'none');
+  test('get node.js SSL options: rejectUnauthorized eql false for the verification mode "none"', () => {
+    const nodeOption = getNodeSSLOptions(logger, 'none');
     expect(nodeOption).toMatchObject({
       rejectUnauthorized: false,
     });
   });
 
-  test('get node.js TLS options: rejectUnauthorized eql true for the verification mode value which does not exist, the logger called with the proper warning message', () => {
-    const nodeOption = getNodeTLSOptions(logger, 'notexist');
+  test('get node.js SSL options: rejectUnauthorized eql true for the verification mode value which does not exist, the logger called with the proper warning message', () => {
+    const nodeOption = getNodeSSLOptions(logger, 'notexist');
     expect(loggingSystemMock.collect(logger).warn).toMatchInlineSnapshot(`
     Array [
       Array [
@@ -46,23 +46,23 @@ describe('getNodeTLSOptions', () => {
   });
 });
 
-describe('getTLSSettingsFromConfig', () => {
+describe('getSSLSettingsFromConfig', () => {
   test('get verificationMode eql "none" if legacy rejectUnauthorized eql false', () => {
-    const nodeOption = getTLSSettingsFromConfig(undefined, false);
+    const nodeOption = getSSLSettingsFromConfig(undefined, false);
     expect(nodeOption).toMatchObject({
       verificationMode: 'none',
     });
   });
 
   test('get verificationMode eql "none" if legacy rejectUnauthorized eql true', () => {
-    const nodeOption = getTLSSettingsFromConfig(undefined, true);
+    const nodeOption = getSSLSettingsFromConfig(undefined, true);
     expect(nodeOption).toMatchObject({
       verificationMode: 'full',
     });
   });
 
   test('get verificationMode eql "certificate", ignore rejectUnauthorized', () => {
-    const nodeOption = getTLSSettingsFromConfig('certificate', false);
+    const nodeOption = getSSLSettingsFromConfig('certificate', false);
     expect(nodeOption).toMatchObject({
       verificationMode: 'certificate',
     });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
similarity index 92%
rename from x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts
rename to x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
index 423e9756b13f8..46e90ec3be697 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
@@ -6,10 +6,10 @@
  */
 
 import { PeerCertificate } from 'tls';
-import { TLSSettings } from '../../types';
+import { SSLSettings } from '../../types';
 import { Logger } from '../../../../../../src/core/server';
 
-export function getNodeTLSOptions(
+export function getNodeSSLOptions(
   logger: Logger,
   verificationMode?: string
 ): {
@@ -44,10 +44,10 @@ export function getNodeTLSOptions(
   return agentOptions;
 }
 
-export function getTLSSettingsFromConfig(
+export function getSSLSettingsFromConfig(
   verificationMode?: 'none' | 'certificate' | 'full',
   rejectUnauthorized?: boolean
-): TLSSettings {
+): SSLSettings {
   if (verificationMode) {
     return { verificationMode };
   } else if (rejectUnauthorized !== undefined) {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
index 9bdb2d9481142..3719dd8cd737c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
@@ -76,7 +76,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://example.com',
-        proxyTLSSettings: {
+        proxySSLSettings: {
           verificationMode: 'none',
         },
         proxyBypassHosts: undefined,
@@ -238,7 +238,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://proxy.com',
-        proxyTLSSettings: {
+        proxySSLSettings: {
           verificationMode: 'none',
         },
         proxyBypassHosts: new Set(['example.com']),
@@ -272,7 +272,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://proxy.com',
-        proxyTLSSettings: {
+        proxySSLSettings: {
           verificationMode: 'none',
         },
         proxyBypassHosts: new Set(['not-example.com']),
@@ -308,7 +308,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://proxy.com',
-        proxyTLSSettings: {
+        proxySSLSettings: {
           verificationMode: 'none',
         },
         proxyBypassHosts: undefined,
@@ -344,7 +344,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://proxy.com',
-        proxyTLSSettings: {},
+        proxySSLSettings: {},
         proxyBypassHosts: undefined,
         proxyOnlyHosts: new Set(['not-example.com']),
       }
@@ -377,7 +377,7 @@ describe('send_email module', () => {
       undefined,
       {
         url: 'smtp://example.com:1025',
-        tls: {
+        ssl: {
           certificateAuthoritiesData: 'ca cert data goes here',
         },
         smtp: {
@@ -419,7 +419,7 @@ describe('send_email module', () => {
       undefined,
       {
         url: 'smtp://example.com:1025',
-        tls: {
+        ssl: {
           certificateAuthoritiesData: 'ca cert data goes here',
           rejectUnauthorized: true,
         },
@@ -461,13 +461,13 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://proxy.com',
-        proxyTLSSettings: {},
+        proxySSLSettings: {},
         proxyBypassHosts: undefined,
         proxyOnlyHosts: undefined,
       },
       {
         url: 'smtp://example.com:1025',
-        tls: {
+        ssl: {
           certificateAuthoritiesData: 'ca cert data goes here',
           rejectUnauthorized: true,
         },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
index 9f601840bc982..b32ea7d74f025 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
@@ -12,7 +12,7 @@ import { default as MarkdownIt } from 'markdown-it';
 import { Logger } from '../../../../../../src/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { CustomHostSettings } from '../../config';
-import { getNodeTLSOptions, getTLSSettingsFromConfig } from './get_node_tls_options';
+import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
 
 // an email "service" which doesn't actually send, just returns what it would send
 export const JSON_TRANSPORT_SERVICE = '__json';
@@ -59,7 +59,7 @@ export async function sendEmail(logger: Logger, options: SendEmailOptions): Prom
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const transportConfig: Record<string, any> = {};
   const proxySettings = configurationUtilities.getProxySettings();
-  const generalTLSSettings = configurationUtilities.getTLSSettings();
+  const generalSSLSettings = configurationUtilities.getSSLSettings();
 
   if (hasAuth && user != null && password != null) {
     transportConfig.auth = {
@@ -92,9 +92,9 @@ export async function sendEmail(logger: Logger, options: SendEmailOptions): Prom
     customHostSettings = configurationUtilities.getCustomHostSettings(`smtp://${host}:${port}`);
 
     if (proxySettings && useProxy) {
-      transportConfig.tls = getNodeTLSOptions(
+      transportConfig.tls = getNodeSSLOptions(
         logger,
-        proxySettings?.proxyTLSSettings.verificationMode
+        proxySettings?.proxySSLSettings.verificationMode
       );
       transportConfig.proxy = proxySettings.proxyUrl;
       transportConfig.headers = proxySettings.proxyHeaders;
@@ -104,25 +104,25 @@ export async function sendEmail(logger: Logger, options: SendEmailOptions): Prom
       // authenticate rarely have valid certs; eg cloud proxy, and npm maildev
       transportConfig.tls = { rejectUnauthorized: false };
     } else {
-      transportConfig.tls = getNodeTLSOptions(logger, generalTLSSettings.verificationMode);
+      transportConfig.tls = getNodeSSLOptions(logger, generalSSLSettings.verificationMode);
     }
 
     // finally, allow customHostSettings to override some of the settings
     // see: https://nodemailer.com/smtp/
     if (customHostSettings) {
       const tlsConfig: Record<string, unknown> = {};
-      const tlsSettings = customHostSettings.tls;
+      const sslSettings = customHostSettings.ssl;
       const smtpSettings = customHostSettings.smtp;
 
-      if (tlsSettings?.certificateAuthoritiesData) {
-        tlsConfig.ca = tlsSettings?.certificateAuthoritiesData;
+      if (sslSettings?.certificateAuthoritiesData) {
+        tlsConfig.ca = sslSettings?.certificateAuthoritiesData;
       }
 
-      const tlsSettingsFromConfig = getTLSSettingsFromConfig(
-        tlsSettings?.verificationMode,
-        tlsSettings?.rejectUnauthorized
+      const sslSettingsFromConfig = getSSLSettingsFromConfig(
+        sslSettings?.verificationMode,
+        sslSettings?.rejectUnauthorized
       );
-      const nodeTLSOptions = getNodeTLSOptions(logger, tlsSettingsFromConfig.verificationMode);
+      const nodeTLSOptions = getNodeSSLOptions(logger, sslSettingsFromConfig.verificationMode);
       if (!transportConfig.tls) {
         transportConfig.tls = { ...tlsConfig, ...nodeTLSOptions };
       } else {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 4108424e26ac4..7953f0ab365e8 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -194,7 +194,7 @@ describe('execute()', () => {
     const configurationUtilities = actionsConfigMock.create();
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -221,7 +221,7 @@ describe('execute()', () => {
     const configurationUtilities = actionsConfigMock.create();
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: new Set(['example.com']),
@@ -248,7 +248,7 @@ describe('execute()', () => {
     const configurationUtilities = actionsConfigMock.create();
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: new Set(['not-example.com']),
@@ -275,7 +275,7 @@ describe('execute()', () => {
     const configurationUtilities = actionsConfigMock.create();
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
@@ -302,7 +302,7 @@ describe('execute()', () => {
     const configurationUtilities = actionsConfigMock.create();
     configurationUtilities.getProxySettings.mockReturnValue({
       proxyUrl: 'https://someproxyhost',
-      proxyTLSSettings: {
+      proxySSLSettings: {
         verificationMode: 'none',
       },
       proxyBypassHosts: undefined,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
index bf34789e03fae..497300b86bdea 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
@@ -170,7 +170,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
@@ -234,7 +234,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
index b2c865c2f5374..c04c79075abdc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -293,7 +293,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
@@ -386,7 +386,7 @@ describe('execute()', () => {
           "getCustomHostSettings": [MockFunction],
           "getProxySettings": [MockFunction],
           "getResponseSettings": [MockFunction],
-          "getTLSSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
           "isActionTypeEnabled": [MockFunction],
           "isHostnameAllowed": [MockFunction],
           "isUriAllowed": [MockFunction],
diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts
index 9774bfb05d4ff..d99b9349e977b 100644
--- a/x-pack/plugins/actions/server/config.test.ts
+++ b/x-pack/plugins/actions/server/config.test.ts
@@ -178,9 +178,9 @@ describe('config validation', () => {
     );
   });
 
-  test('action with tls configuration', () => {
+  test('action with ssl configuration', () => {
     const config: Record<string, unknown> = {
-      tls: {
+      ssl: {
         verificationMode: 'none',
         proxyVerificationMode: 'none',
       },
@@ -208,7 +208,7 @@ describe('config validation', () => {
         "proxyRejectUnauthorizedCertificates": true,
         "rejectUnauthorized": true,
         "responseTimeout": "PT1M",
-        "tls": Object {
+        "ssl": Object {
           "proxyVerificationMode": "none",
           "verificationMode": "none",
         },
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
index 8859a2d8881a2..1ae196c25a756 100644
--- a/x-pack/plugins/actions/server/config.ts
+++ b/x-pack/plugins/actions/server/config.ts
@@ -31,7 +31,7 @@ const customHostSettingsSchema = schema.object({
       requireTLS: schema.maybe(schema.boolean()),
     })
   ),
-  tls: schema.maybe(
+  ssl: schema.maybe(
     schema.object({
       /**
        * @deprecated in favor of `verificationMode`
@@ -78,16 +78,16 @@ export const configSchema = schema.object({
   proxyUrl: schema.maybe(schema.string()),
   proxyHeaders: schema.maybe(schema.recordOf(schema.string(), schema.string())),
   /**
-   * @deprecated in favor of `tls.proxyVerificationMode`
+   * @deprecated in favor of `ssl.proxyVerificationMode`
    **/
   proxyRejectUnauthorizedCertificates: schema.boolean({ defaultValue: true }),
   proxyBypassHosts: schema.maybe(schema.arrayOf(schema.string({ hostname: true }))),
   proxyOnlyHosts: schema.maybe(schema.arrayOf(schema.string({ hostname: true }))),
   /**
-   * @deprecated in favor of `tls.verificationMode`
+   * @deprecated in favor of `ssl.verificationMode`
    **/
   rejectUnauthorized: schema.boolean({ defaultValue: true }),
-  tls: schema.maybe(
+  ssl: schema.maybe(
     schema.object({
       verificationMode: schema.maybe(
         schema.oneOf(
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index 692ff6fa0a508..bcfc91d673bcc 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -64,19 +64,19 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       if (
         customHostSettings.find(
           (customHostSchema: CustomHostSettings) =>
-            !!customHostSchema.tls && !!customHostSchema.tls.rejectUnauthorized
+            !!customHostSchema.ssl && !!customHostSchema.ssl.rejectUnauthorized
         )
       ) {
         addDeprecation({
           message:
-            `"xpack.actions.customHostSettings[<index>].tls.rejectUnauthorized" is deprecated.` +
-            `Use "xpack.actions.customHostSettings[<index>].tls.verificationMode" instead, ` +
+            `"xpack.actions.customHostSettings[<index>].ssl.rejectUnauthorized" is deprecated.` +
+            `Use "xpack.actions.customHostSettings[<index>].ssl.verificationMode" instead, ` +
             `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
             `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
           correctiveActions: {
             manualSteps: [
-              `Remove "xpack.actions.customHostSettings[<index>].tls.rejectUnauthorized" from your kibana configs.`,
-              `Use "xpack.actions.customHostSettings[<index>].tls.verificationMode" ` +
+              `Remove "xpack.actions.customHostSettings[<index>].ssl.rejectUnauthorized" from your kibana configs.`,
+              `Use "xpack.actions.customHostSettings[<index>].ssl.verificationMode" ` +
                 `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
                 `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
             ],
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
index ad07ea21d7917..ec7b46e545112 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
@@ -112,14 +112,14 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://elastic.co:443',
-            tls: {
+            ssl: {
               certificateAuthoritiesData: 'xyz',
               rejectUnauthorized: false,
             },
           },
           {
             url: 'smtp://mail.elastic.com:25',
-            tls: {
+            ssl: {
               certificateAuthoritiesData: 'abc',
               rejectUnauthorized: true,
             },
@@ -338,7 +338,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com/',
-            tls: {
+            ssl: {
               certificateAuthoritiesFiles: 'this-file-does-not-exist',
             },
           },
@@ -350,7 +350,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com:443',
-            tls: {
+            ssl: {
               certificateAuthoritiesFiles: 'this-file-does-not-exist',
             },
           },
@@ -371,7 +371,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com/',
-            tls: {
+            ssl: {
               certificateAuthoritiesFiles: CA_FILE1,
             },
           },
@@ -380,7 +380,7 @@ describe('custom_host_settings', () => {
       const resConfig = resolveCustomHosts(mockLogger, config);
 
       // not checking the full structure anymore, just ca bits
-      expect(resConfig?.customHostSettings?.[0].tls?.certificateAuthoritiesData).toBe(CA_CONTENTS1);
+      expect(resConfig?.customHostSettings?.[0].ssl?.certificateAuthoritiesData).toBe(CA_CONTENTS1);
       expect(warningLogs()).toEqual([]);
     });
 
@@ -390,7 +390,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com/',
-            tls: {
+            ssl: {
               certificateAuthoritiesFiles: [CA_FILE1, CA_FILE2],
             },
           },
@@ -399,7 +399,7 @@ describe('custom_host_settings', () => {
       const resConfig = resolveCustomHosts(mockLogger, config);
 
       // not checking the full structure anymore, just ca bits
-      expect(resConfig?.customHostSettings?.[0].tls?.certificateAuthoritiesData).toBe(
+      expect(resConfig?.customHostSettings?.[0].ssl?.certificateAuthoritiesData).toBe(
         `${CA_CONTENTS1}\n${CA_CONTENTS2}`
       );
       expect(warningLogs()).toEqual([]);
@@ -411,7 +411,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com/',
-            tls: {
+            ssl: {
               certificateAuthoritiesFiles: [CA_FILE2],
               certificateAuthoritiesData: CA_CONTENTS1,
             },
@@ -421,7 +421,7 @@ describe('custom_host_settings', () => {
       const resConfig = resolveCustomHosts(mockLogger, config);
 
       // not checking the full structure anymore, just ca bits
-      expect(resConfig?.customHostSettings?.[0].tls?.certificateAuthoritiesData).toBe(
+      expect(resConfig?.customHostSettings?.[0].ssl?.certificateAuthoritiesData).toBe(
         `${CA_CONTENTS1}\n${CA_CONTENTS2}`
       );
       expect(warningLogs()).toEqual([]);
@@ -468,13 +468,13 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com/',
-            tls: {
+            ssl: {
               rejectUnauthorized: true,
             },
           },
           {
             url: 'https://almost.purrfect.com:443',
-            tls: {
+            ssl: {
               rejectUnauthorized: false,
             },
           },
@@ -486,7 +486,7 @@ describe('custom_host_settings', () => {
         customHostSettings: [
           {
             url: 'https://almost.purrfect.com:443',
-            tls: {
+            ssl: {
               rejectUnauthorized: true,
             },
           },
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
index bfc8dad48aab6..0ff8624d42cfe 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
@@ -86,8 +86,8 @@ export function resolveCustomHosts(logger: Logger, config: ActionsConfig): Actio
     }
 
     // read the specified ca files, add their content to certificateAuthoritiesData
-    if (customHostSetting.tls) {
-      let files = customHostSetting.tls?.certificateAuthoritiesFiles || [];
+    if (customHostSetting.ssl) {
+      let files = customHostSetting.ssl?.certificateAuthoritiesFiles || [];
       if (typeof files === 'string') {
         files = [files];
       }
@@ -134,12 +134,12 @@ export function resolveCustomHosts(logger: Logger, config: ActionsConfig): Actio
 }
 
 function appendToCertificateAuthoritiesData(customHost: CustomHostSettingsWriteable, cert: string) {
-  const tls = customHost.tls;
-  if (tls) {
-    if (!tls.certificateAuthoritiesData) {
-      tls.certificateAuthoritiesData = cert;
+  const ssl = customHost.ssl;
+  if (ssl) {
+    if (!ssl.certificateAuthoritiesData) {
+      ssl.certificateAuthoritiesData = cert;
     } else {
-      tls.certificateAuthoritiesData += '\n' + cert;
+      ssl.certificateAuthoritiesData += '\n' + cert;
     }
   }
 }
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index c8c9967afca1a..a191728a20489 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -142,7 +142,7 @@ export interface ProxySettings {
   proxyBypassHosts: Set<string> | undefined;
   proxyOnlyHosts: Set<string> | undefined;
   proxyHeaders?: Record<string, string>;
-  proxyTLSSettings: TLSSettings;
+  proxySSLSettings: SSLSettings;
 }
 
 export interface ResponseSettings {
@@ -150,6 +150,6 @@ export interface ResponseSettings {
   timeout: number;
 }
 
-export interface TLSSettings {
+export interface SSLSettings {
   verificationMode?: 'none' | 'certificate' | 'full';
 }
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 7ee6e146b2a50..61b452fc11835 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -22,7 +22,7 @@ interface CreateTestConfigOptions {
   verificationMode?: 'full' | 'none' | 'certificate';
   publicBaseUrl?: boolean;
   preconfiguredAlertHistoryEsIndex?: boolean;
-  customizeLocalHostTls?: boolean;
+  customizeLocalHostSsl?: boolean;
   rejectUnauthorized?: boolean; // legacy
 }
 
@@ -52,7 +52,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     ssl = false,
     verificationMode = 'full',
     preconfiguredAlertHistoryEsIndex = false,
-    customizeLocalHostTls = false,
+    customizeLocalHostSsl = false,
     rejectUnauthorized = true, // legacy
   } = options;
 
@@ -102,25 +102,25 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     const customHostSettingsValue = [
       {
         url: tlsWebhookServers.rejectUnauthorizedFalse,
-        tls: {
+        ssl: {
           verificationMode: 'none',
         },
       },
       {
         url: tlsWebhookServers.rejectUnauthorizedTrue,
-        tls: {
+        ssl: {
           verificationMode: 'full',
         },
       },
       {
         url: tlsWebhookServers.caFile,
-        tls: {
+        ssl: {
           verificationMode: 'certificate',
           certificateAuthoritiesFiles: [CA_CERT_PATH],
         },
       },
     ];
-    const customHostSettings = customizeLocalHostTls
+    const customHostSettings = customizeLocalHostSsl
       ? [`--xpack.actions.customHostSettings=${JSON.stringify(customHostSettingsValue)}`]
       : [];
 
@@ -153,7 +153,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           '--xpack.alerting.healthCheck.interval="1s"',
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           `--xpack.actions.rejectUnauthorized=${rejectUnauthorized}`,
-          `--xpack.actions.tls.verificationMode=${verificationMode}`,
+          `--xpack.actions.ssl.verificationMode=${verificationMode}`,
           ...actionsProxyUrl,
           ...customHostSettings,
           '--xpack.eventLog.logEntries=true',
@@ -198,28 +198,28 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
                 encrypted: 'this-is-also-ignored-and-also-required',
               },
             },
-            'custom.tls.noCustom': {
+            'custom.ssl.noCustom': {
               actionTypeId: '.webhook',
               name: `${tlsWebhookServers.noCustom}`,
               config: {
                 url: tlsWebhookServers.noCustom,
               },
             },
-            'custom.tls.rejectUnauthorizedFalse': {
+            'custom.ssl.rejectUnauthorizedFalse': {
               actionTypeId: '.webhook',
               name: `${tlsWebhookServers.rejectUnauthorizedFalse}`,
               config: {
                 url: tlsWebhookServers.rejectUnauthorizedFalse,
               },
             },
-            'custom.tls.rejectUnauthorizedTrue': {
+            'custom.ssl.rejectUnauthorizedTrue': {
               actionTypeId: '.webhook',
               name: `${tlsWebhookServers.rejectUnauthorizedTrue}`,
               config: {
                 url: tlsWebhookServers.rejectUnauthorizedTrue,
               },
             },
-            'custom.tls.caFile': {
+            'custom.ssl.caFile': {
               actionTypeId: '.webhook',
               name: `${tlsWebhookServers.caFile}`,
               config: {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/get_all.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/get_all.ts
index 9a3a78342c5aa..a88a394863dbf 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/get_all.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/get_all.ts
@@ -61,12 +61,12 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
             case 'space_1_all_with_restricted_fixture at space1':
               expect(response.statusCode).to.eql(200);
 
-              // the custom tls connectors have dynamic ports, so remove them before
+              // the custom ssl connectors have dynamic ports, so remove them before
               // comparing to what we expect
-              const nonCustomTlsConnectors = response.body.filter(
-                (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+              const nonCustomSslConnectors = response.body.filter(
+                (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
               );
-              expect(nonCustomTlsConnectors).to.eql([
+              expect(nonCustomSslConnectors).to.eql([
                 {
                   id: createdAction.id,
                   is_preconfigured: false,
@@ -175,12 +175,12 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
             case 'space_1_all_with_restricted_fixture at space1':
               expect(response.statusCode).to.eql(200);
 
-              // the custom tls connectors have dynamic ports, so remove them before
+              // the custom ssl connectors have dynamic ports, so remove them before
               // comparing to what we expect
-              const nonCustomTlsConnectors = response.body.filter(
-                (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+              const nonCustomSslConnectors = response.body.filter(
+                (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
               );
-              expect(nonCustomTlsConnectors).to.eql([
+              expect(nonCustomSslConnectors).to.eql([
                 {
                   id: createdAction.id,
                   is_preconfigured: false,
@@ -265,12 +265,12 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
             case 'superuser at space1':
               expect(response.statusCode).to.eql(200);
 
-              // the custom tls connectors have dynamic ports, so remove them before
+              // the custom ssl connectors have dynamic ports, so remove them before
               // comparing to what we expect
-              const nonCustomTlsConnectors = response.body.filter(
-                (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+              const nonCustomSslConnectors = response.body.filter(
+                (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
               );
-              expect(nonCustomTlsConnectors).to.eql([
+              expect(nonCustomSslConnectors).to.eql([
                 {
                   id: 'preconfigured-es-index-action',
                   is_preconfigured: true,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/config.ts b/x-pack/test/alerting_api_integration/spaces_only/config.ts
index 788d9d0698a19..204f5b27da9d5 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/config.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/config.ts
@@ -13,6 +13,6 @@ export default createTestConfig('spaces_only', {
   license: 'trial',
   enableActionsProxy: false,
   verificationMode: 'none',
-  customizeLocalHostTls: true,
+  customizeLocalHostSsl: true,
   preconfiguredAlertHistoryEsIndex: true,
 });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
index 4af33136cd42c..9822254db444a 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
@@ -123,9 +123,9 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('tls customization', () => {
+    describe('ssl customization', () => {
       it('should handle the xpack.actions.rejectUnauthorized: false', async () => {
-        const connectorId = 'custom.tls.noCustom';
+        const connectorId = 'custom.ssl.noCustom';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
@@ -143,11 +143,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized rejectUnauthorized: false', async () => {
-        const connectorId = 'custom.tls.rejectUnauthorizedFalse';
+        const connectorId = 'custom.ssl.rejectUnauthorizedFalse';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.rejectUnauthorizedFalse/_execute`)
+          .post(`/api/actions/connector/custom.ssl.rejectUnauthorizedFalse/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {
@@ -161,11 +161,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized rejectUnauthorized: true', async () => {
-        const connectorId = 'custom.tls.rejectUnauthorizedTrue';
+        const connectorId = 'custom.ssl.rejectUnauthorizedTrue';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.rejectUnauthorizedTrue/_execute`)
+          .post(`/api/actions/connector/custom.ssl.rejectUnauthorizedTrue/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {
@@ -180,11 +180,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized ca file', async () => {
-        const connectorId = 'custom.tls.caFile';
+        const connectorId = 'custom.ssl.caFile';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.caFile/_execute`)
+          .post(`/api/actions/connector/custom.ssl.caFile/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/get_all.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/get_all.ts
index e7f500f2771e3..a965b1716a671 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/get_all.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/get_all.ts
@@ -40,13 +40,13 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
         .get(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connectors`)
         .expect(200);
 
-      // the custom tls connectors have dynamic ports, so remove them before
+      // the custom ssl connectors have dynamic ports, so remove them before
       // comparing to what we expect
-      const nonCustomTlsConnectors = connectors.filter(
-        (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+      const nonCustomSslConnectors = connectors.filter(
+        (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
       );
 
-      expect(nonCustomTlsConnectors).to.eql([
+      expect(nonCustomSslConnectors).to.eql([
         {
           id: 'preconfigured-alert-history-es-index',
           name: 'Alert history Elasticsearch index',
@@ -117,13 +117,13 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
         .get(`${getUrlPrefix(Spaces.other.id)}/api/actions/connectors`)
         .expect(200);
 
-      // the custom tls connectors have dynamic ports, so remove them before
+      // the custom ssl connectors have dynamic ports, so remove them before
       // comparing to what we expect
-      const nonCustomTlsConnectors = connectors.filter(
-        (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+      const nonCustomSslConnectors = connectors.filter(
+        (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
       );
 
-      expect(nonCustomTlsConnectors).to.eql([
+      expect(nonCustomSslConnectors).to.eql([
         {
           id: 'preconfigured-alert-history-es-index',
           name: 'Alert history Elasticsearch index',
@@ -184,13 +184,13 @@ export default function getAllActionTests({ getService }: FtrProviderContext) {
           .get(`${getUrlPrefix(Spaces.space1.id)}/api/actions`)
           .expect(200);
 
-        // the custom tls connectors have dynamic ports, so remove them before
+        // the custom ssl connectors have dynamic ports, so remove them before
         // comparing to what we expect
-        const nonCustomTlsConnectors = connectors.filter(
-          (conn: { id: string }) => !conn.id.startsWith('custom.tls.')
+        const nonCustomSslConnectors = connectors.filter(
+          (conn: { id: string }) => !conn.id.startsWith('custom.ssl.')
         );
 
-        expect(nonCustomTlsConnectors).to.eql([
+        expect(nonCustomSslConnectors).to.eql([
           {
             id: 'preconfigured-alert-history-es-index',
             name: 'Alert history Elasticsearch index',
diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
index 511e97b96e35d..b322b8dffbf95 100644
--- a/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
@@ -14,6 +14,6 @@ export default createTestConfig('spaces_only', {
   enableActionsProxy: false,
   rejectUnauthorized: false,
   verificationMode: undefined,
-  customizeLocalHostTls: true,
+  customizeLocalHostSsl: true,
   preconfiguredAlertHistoryEsIndex: true,
 });
diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/actions/builtin_action_types/webhook.ts
index 4af33136cd42c..9822254db444a 100644
--- a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/actions/builtin_action_types/webhook.ts
@@ -123,9 +123,9 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('tls customization', () => {
+    describe('ssl customization', () => {
       it('should handle the xpack.actions.rejectUnauthorized: false', async () => {
-        const connectorId = 'custom.tls.noCustom';
+        const connectorId = 'custom.ssl.noCustom';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
@@ -143,11 +143,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized rejectUnauthorized: false', async () => {
-        const connectorId = 'custom.tls.rejectUnauthorizedFalse';
+        const connectorId = 'custom.ssl.rejectUnauthorizedFalse';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.rejectUnauthorizedFalse/_execute`)
+          .post(`/api/actions/connector/custom.ssl.rejectUnauthorizedFalse/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {
@@ -161,11 +161,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized rejectUnauthorized: true', async () => {
-        const connectorId = 'custom.tls.rejectUnauthorizedTrue';
+        const connectorId = 'custom.ssl.rejectUnauthorizedTrue';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.rejectUnauthorizedTrue/_execute`)
+          .post(`/api/actions/connector/custom.ssl.rejectUnauthorizedTrue/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {
@@ -180,11 +180,11 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
 
       it('should handle the customized ca file', async () => {
-        const connectorId = 'custom.tls.caFile';
+        const connectorId = 'custom.ssl.caFile';
         const port = await getPortOfConnector(connectorId);
         const server = await createTlsWebhookServer(port);
         const { status, body } = await supertest
-          .post(`/api/actions/connector/custom.tls.caFile/_execute`)
+          .post(`/api/actions/connector/custom.ssl.caFile/_execute`)
           .set('kbn-xsrf', 'test')
           .send({
             params: {

From bb7bff5c960bab77b30c42d399c1121faf5e1eae Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Wed, 23 Jun 2021 14:46:04 -0400
Subject: [PATCH 06/95] [Fleet] Add UI and mappings for agent policy
 unenroll_timeout (#102970)

## Summary

closes https://github.com/elastic/kibana/issues/100617

UI and mappings related to ephemeral agents

- [x] Adds mapping/type/schema definition for the new field in agent policy saved object
- [x] Shows input field labelled `Unenrollment timeout` in agent policy settings that reads/writes to the new field
- [x] Same input in `Advanced options` section of create agent flyout
- [x] `unenroll_timeout` can be set using preconfigured agent policies defined in `kibana.yml`
- [x] `unenroll_timeout` can be populated if the user has a preconfigured policy that _does not_ have this field initially, but then updates their `kibana.yml` later to include it

<details><summary>Screenshot - editing an existing agent policy</summary>

<img width="1251" alt="Screen Shot 2021-06-22 at 1 42 50 PM" src="https://user-images.githubusercontent.com/57655/122974924-d479b800-d360-11eb-8d37-306a6860f140.png">

</details>


<details><summary>Screenshots - adding a new agent policy</summary>
<img width="1258" alt="Screen Shot 2021-06-22 at 1 45 01 PM" src="https://user-images.githubusercontent.com/57655/122975141-0be86480-d361-11eb-9ccb-dde0cc44e438.png">
<img width="1257" alt="Screen Shot 2021-06-22 at 1 45 35 PM" src="https://user-images.githubusercontent.com/57655/122975139-0be86480-d361-11eb-90ae-3541dbbd68e6.png">
<img width="1258" alt="Screen Shot 2021-06-22 at 1 45 44 PM" src="https://user-images.githubusercontent.com/57655/122975138-0b4fce00-d361-11eb-8347-d6f0cb43ab91.png">
<img width="1254" alt="Screen Shot 2021-06-22 at 1 45 56 PM" src="https://user-images.githubusercontent.com/57655/122975136-0b4fce00-d361-11eb-9c51-ec7a9e52ea2b.png">
</details>

<details><summary>Using <code>kibana.dev.yml</code></summary>

<h3>No <code>unenroll_timeout</code></h3>

```yml
xpack.fleet.agentPolicies:
  - name: Preconfigured Policy From Config
    description: From kibana.dev.yml (no timeout given)
    id: 1
    namespace: test
    package_policies:
      - package:
          name: system
        name: System Integration
        inputs:
          - type: system/metrics
            enabled: true
            vars:
              - name: system.hostfs
                value: home/test
            streams:
              - data_stream:
                  dataset: system.core
                enabled: true
                vars:
                  - name: period
                    value: 20s
          - type: winlog
            enabled: false
```

<h4>UI (saved object)</h4>
<img width="1072" alt="Screen Shot 2021-06-23 at 10 28 03 AM" src="https://user-images.githubusercontent.com/57655/123117442-bf0f9700-d40f-11eb-8e8f-685fee3ccb4b.png">

<h4><code>fleet-policies</code>index</h4>
<img width="1690" alt="Screen Shot 2021-06-23 at 10 52 39 AM" src="https://user-images.githubusercontent.com/57655/123119430-883a8080-d411-11eb-990f-4953845a76b5.png">


<h4>Updated <code>kibana.dev.yml</code> to include <code>unenroll_timeout</code></h4>

```yml
xpack.fleet.agentPolicies:
  - name: Preconfigured Policy From Config
    description: From kibana.dev.yml (updated with timeout)
    id: 1
    namespace: test
    unenroll_timeout: 234
    package_policies:
      - package:
          name: system
        name: System Integration
        inputs:
          - type: system/metrics
            enabled: true
            vars:
              - name: system.hostfs
                value: home/test
            streams:
              - data_stream:
                  dataset: system.core
                enabled: true
                vars:
                  - name: period
                    value: 20s
          - type: winlog
            enabled: false
```

<h4>UI (saved object)</h4>
<img width="1073" alt="Screen Shot 2021-06-23 at 10 35 17 AM" src="https://user-images.githubusercontent.com/57655/123117444-bfa82d80-d40f-11eb-94a9-99d4ca4bed2a.png">

<h4><code>fleet-policies</code>index</h4>
<img width="1690" alt="Screen Shot 2021-06-23 at 10 35 41 AM" src="https://user-images.githubusercontent.com/57655/123117446-bfa82d80-d40f-11eb-9563-1add80f43f0e.png">

</details>

### Checklist
- [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 x-pack/plugins/fleet/common/constants/epm.ts  |  3 +++
 .../common/constants/preconfiguration.ts      |  5 ++--
 .../plugins/fleet/common/constants/routes.ts  |  2 +-
 .../fleet/common/types/models/agent_policy.ts |  9 +++++--
 .../plugins/fleet/common/types/models/epm.ts  |  3 ++-
 .../components/agent_policy_form.tsx          | 26 +++++++++++++++++++
 .../components/settings/index.tsx             |  3 ++-
 .../server/routes/preconfiguration/index.ts   |  6 ++---
 .../fleet/server/saved_objects/index.ts       |  1 +
 .../fleet/server/services/agent_policy.ts     |  1 +
 .../fleet/server/services/preconfiguration.ts |  2 +-
 .../fleet/server/types/models/agent_policy.ts |  1 +
 .../apis/preconfiguration/preconfiguration.ts |  2 +-
 13 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/fleet/common/constants/epm.ts b/x-pack/plugins/fleet/common/constants/epm.ts
index e9dd968d3f048..81ea2a630d3db 100644
--- a/x-pack/plugins/fleet/common/constants/epm.ts
+++ b/x-pack/plugins/fleet/common/constants/epm.ts
@@ -48,6 +48,9 @@ export const dataTypes = {
   Metrics: 'metrics',
 } as const;
 
+// currently identical but may be a subset or otherwise different some day
+export const monitoringTypes = Object.values(dataTypes);
+
 export const installationStatuses = {
   Installed: 'installed',
   NotInstalled: 'not_installed',
diff --git a/x-pack/plugins/fleet/common/constants/preconfiguration.ts b/x-pack/plugins/fleet/common/constants/preconfiguration.ts
index 937c08b7e8cb5..2ec67393df76b 100644
--- a/x-pack/plugins/fleet/common/constants/preconfiguration.ts
+++ b/x-pack/plugins/fleet/common/constants/preconfiguration.ts
@@ -12,6 +12,7 @@ import {
   FLEET_SYSTEM_PACKAGE,
   FLEET_SERVER_PACKAGE,
   autoUpdatePackages,
+  monitoringTypes,
 } from './epm';
 
 export const PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE =
@@ -40,7 +41,7 @@ export const DEFAULT_AGENT_POLICY: PreconfiguredAgentPolicyWithDefaultInputs = {
   ],
   is_default: true,
   is_managed: false,
-  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
+  monitoring_enabled: monitoringTypes,
 };
 
 export const DEFAULT_FLEET_SERVER_AGENT_POLICY: PreconfiguredAgentPolicyWithDefaultInputs = {
@@ -58,7 +59,7 @@ export const DEFAULT_FLEET_SERVER_AGENT_POLICY: PreconfiguredAgentPolicyWithDefa
   is_default: false,
   is_default_fleet_server: true,
   is_managed: false,
-  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
+  monitoring_enabled: monitoringTypes,
 };
 
 export const DEFAULT_PACKAGES = defaultPackages.map((name) => ({
diff --git a/x-pack/plugins/fleet/common/constants/routes.ts b/x-pack/plugins/fleet/common/constants/routes.ts
index 037c0ee506a05..0b892bacf53a7 100644
--- a/x-pack/plugins/fleet/common/constants/routes.ts
+++ b/x-pack/plugins/fleet/common/constants/routes.ts
@@ -117,5 +117,5 @@ export const INSTALL_SCRIPT_API_ROUTES = `${API_ROOT}/install/{osType}`;
 
 // Policy preconfig API routes
 export const PRECONFIGURATION_API_ROUTES = {
-  PUT_PRECONFIG: `${API_ROOT}/setup/preconfiguration`,
+  UPDATE_PATTERN: `${API_ROOT}/setup/preconfiguration`,
 };
diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
index a9393abcc57ef..f64467ca674fb 100644
--- a/x-pack/plugins/fleet/common/types/models/agent_policy.ts
+++ b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -6,7 +6,7 @@
  */
 
 import type { agentPolicyStatuses } from '../../constants';
-import type { DataType, ValueOf } from '../../types';
+import type { MonitoringType, ValueOf } from '../../types';
 
 import type { PackagePolicy, PackagePolicyPackage } from './package_policy';
 import type { Output } from './output';
@@ -20,7 +20,8 @@ export interface NewAgentPolicy {
   is_default?: boolean;
   is_default_fleet_server?: boolean; // Optional when creating a policy
   is_managed?: boolean; // Optional when creating a policy
-  monitoring_enabled?: Array<ValueOf<DataType>>;
+  monitoring_enabled?: MonitoringType;
+  unenroll_timeout?: number;
   is_preconfigured?: boolean;
 }
 
@@ -138,4 +139,8 @@ export interface FleetServerPolicy {
    * True when this policy is the default policy to start Fleet Server
    */
   default_fleet_server: boolean;
+  /**
+   * Auto unenroll any Elastic Agents which have not checked in for this many seconds
+   */
+  unenroll_timeout?: number;
 }
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index c4441fb6e0d95..36554b8409364 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -14,6 +14,7 @@ import type {
   ASSETS_SAVED_OBJECT_TYPE,
   agentAssetTypes,
   dataTypes,
+  monitoringTypes,
   installationStatuses,
 } from '../../constants';
 import type { ValueOf } from '../../types';
@@ -92,7 +93,7 @@ export enum ElasticsearchAssetType {
 }
 
 export type DataType = typeof dataTypes;
-
+export type MonitoringType = typeof monitoringTypes;
 export type InstallablePackage = RegistryPackage | ArchivePackage;
 
 export type ArchivePackage = PackageSpecManifest &
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
index 25a0993242822..633f8a2c57409 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
@@ -21,6 +21,7 @@ import {
   EuiCheckboxGroup,
   EuiButton,
   EuiLink,
+  EuiFieldNumber,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -158,6 +159,10 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
       </EuiFormRow>
     );
   });
+  const unenrollmentTimeoutText = i18n.translate(
+    'xpack.fleet.agentPolicyForm.unenrollmentTimeoutLabel',
+    { defaultMessage: 'Unenrollment timeout' }
+  );
 
   const advancedOptionsContent = (
     <>
@@ -297,6 +302,27 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
           }}
         />
       </EuiDescribedFormGroup>
+      <EuiDescribedFormGroup
+        title={<h4>{unenrollmentTimeoutText}</h4>}
+        description={
+          <FormattedMessage
+            id="xpack.fleet.agentPolicyForm.unenrollmentTimeoutDescription"
+            defaultMessage="An optional timeout in seconds. If provided, an agent will automatically unenroll after being gone for this period of time."
+          />
+        }
+      >
+        <EuiFormRow fullWidth>
+          <EuiFieldNumber
+            fullWidth
+            value={agentPolicy.unenroll_timeout}
+            min={1}
+            onChange={(e) => updateAgentPolicy({ unenroll_timeout: Number(e.target.value) })}
+            isInvalid={Boolean(touchedFields.unenroll_timeout && validation.unenroll_timeout)}
+            onBlur={() => setTouchedFields({ ...touchedFields, unenroll_timeout: true })}
+            placeholder={unenrollmentTimeoutText}
+          />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
       {isEditing &&
       'id' in agentPolicy &&
       !agentPolicy.is_managed &&
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
index 1ea1a7de53b95..0c6451e3f34a2 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
@@ -65,12 +65,13 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
       setIsLoading(true);
       try {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { name, description, namespace, monitoring_enabled } = agentPolicy;
+        const { name, description, namespace, monitoring_enabled, unenroll_timeout } = agentPolicy;
         const { data, error } = await sendUpdateAgentPolicy(agentPolicy.id, {
           name,
           description,
           namespace,
           monitoring_enabled,
+          unenroll_timeout,
         });
         if (data) {
           notifications.toasts.addSuccess(
diff --git a/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts b/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
index 77fe74fda54d9..d6c483ffe30d9 100644
--- a/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
+++ b/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
@@ -15,7 +15,7 @@ import { PutPreconfigurationSchema } from '../../types';
 import { defaultIngestErrorHandler } from '../../errors';
 import { ensurePreconfiguredPackagesAndPolicies, outputService } from '../../services';
 
-export const putPreconfigurationHandler: RequestHandler<
+export const updatePreconfigurationHandler: RequestHandler<
   undefined,
   undefined,
   TypeOf<typeof PutPreconfigurationSchema.body>
@@ -43,10 +43,10 @@ export const putPreconfigurationHandler: RequestHandler<
 export const registerRoutes = (router: IRouter) => {
   router.put(
     {
-      path: PRECONFIGURATION_API_ROUTES.PUT_PRECONFIG,
+      path: PRECONFIGURATION_API_ROUTES.UPDATE_PATTERN,
       validate: PutPreconfigurationSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    putPreconfigurationHandler
+    updatePreconfigurationHandler
   );
 };
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
index bd7bb98eb7c07..fe8771115a217 100644
--- a/x-pack/plugins/fleet/server/saved_objects/index.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -149,6 +149,7 @@ const getSavedObjectTypes = (
         is_managed: { type: 'boolean' },
         status: { type: 'keyword' },
         package_policies: { type: 'keyword' },
+        unenroll_timeout: { type: 'integer' },
         updated_at: { type: 'date' },
         updated_by: { type: 'keyword' },
         revision: { type: 'integer' },
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index 2a6036d99281e..465075cca7a0b 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -642,6 +642,7 @@ class AgentPolicyService {
       data: (fullPolicy as unknown) as FleetServerPolicy['data'],
       policy_id: fullPolicy.id,
       default_fleet_server: policy.is_default_fleet_server === true,
+      unenroll_timeout: policy.unenroll_timeout,
     };
 
     await esClient.create({
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index a8be94ca61c0a..e016fafe5459d 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -108,7 +108,7 @@ export async function ensurePreconfiguredPackagesAndPolicies(
     policies.map(async (preconfiguredAgentPolicy) => {
       if (preconfiguredAgentPolicy.id) {
         // Check to see if a preconfigured policy with the same preconfiguration id was already deleted by the user
-        const preconfigurationId = String(preconfiguredAgentPolicy.id);
+        const preconfigurationId = preconfiguredAgentPolicy.id.toString();
         const searchParams = {
           searchFields: ['id'],
           search: escapeSearchQueryPhrase(preconfigurationId),
diff --git a/x-pack/plugins/fleet/server/types/models/agent_policy.ts b/x-pack/plugins/fleet/server/types/models/agent_policy.ts
index db551b25e9ebb..48aea1b5cbcc4 100644
--- a/x-pack/plugins/fleet/server/types/models/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/types/models/agent_policy.ts
@@ -16,6 +16,7 @@ export const AgentPolicyBaseSchema = {
   namespace: NamespaceSchema,
   description: schema.maybe(schema.string()),
   is_managed: schema.maybe(schema.boolean()),
+  unenroll_timeout: schema.maybe(schema.number({ min: 1 })),
   monitoring_enabled: schema.maybe(
     schema.arrayOf(
       schema.oneOf([schema.literal(dataTypes.Logs), schema.literal(dataTypes.Metrics)])
diff --git a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
index 7fc784ee11af1..7c5c7d7f3f804 100644
--- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
+++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
@@ -37,7 +37,7 @@ export default function (providerContext: FtrProviderContext) {
     // Basic health check for the API; functionality is covered by the unit tests
     it('should succeed with an empty payload', async () => {
       const { body } = await supertest
-        .put(PRECONFIGURATION_API_ROUTES.PUT_PRECONFIG)
+        .put(PRECONFIGURATION_API_ROUTES.UPDATE_PATTERN)
         .set('kbn-xsrf', 'xxxx')
         .send({})
         .expect(200);

From eb7e0fa5f18ecbadddf9d7273ef0c4536553f50f Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Wed, 23 Jun 2021 12:06:23 -0700
Subject: [PATCH 07/95] Reporting: Check for pending jobs scheduled with
 ESQueue (#101447)

* Reporting: Check for pending jobs scheduled with ESQueue

* Update x-pack/plugins/reporting/server/lib/tasks/execute_report.ts

Co-authored-by: Vadim Dalecky <streamich@gmail.com>

* update test assertions, use more explicit types

* update comment

* Update x-pack/plugins/reporting/server/lib/store/store.ts

Co-authored-by: Vadim Dalecky <streamich@gmail.com>

* fix field mapping

* Update x-pack/plugins/reporting/server/lib/store/store.ts

Co-authored-by: Jean-Louis Leysens <jloleysens@gmail.com>

* Report also implements ReportDocumentHead

* the actual ID of the task is prefixed with `task:`

* remove pointless update to the report instance after failing

* comment clarification

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Vadim Dalecky <streamich@gmail.com>
Co-authored-by: Jean-Louis Leysens <jloleysens@gmail.com>
---
 x-pack/plugins/reporting/common/types.ts      |   3 +-
 .../reporting/server/lib/enqueue_job.ts       |   2 +-
 .../plugins/reporting/server/lib/statuses.ts  |   5 +-
 .../reporting/server/lib/store/mapping.ts     |  18 +-
 .../reporting/server/lib/store/report.test.ts |  55 ++--
 .../reporting/server/lib/store/report.ts      |  49 ++--
 .../reporting/server/lib/store/store.test.ts  | 152 ++++++-----
 .../reporting/server/lib/store/store.ts       | 239 +++++++++++-------
 .../server/lib/tasks/execute_report.ts        | 133 ++++++----
 .../reporting/server/lib/tasks/index.ts       |   8 -
 .../server/lib/tasks/monitor_reports.ts       | 105 ++++----
 .../reporting_without_security/job_apis.ts    |   1 -
 12 files changed, 415 insertions(+), 355 deletions(-)

diff --git a/x-pack/plugins/reporting/common/types.ts b/x-pack/plugins/reporting/common/types.ts
index 2148cf983d889..8205b4f13a320 100644
--- a/x-pack/plugins/reporting/common/types.ts
+++ b/x-pack/plugins/reporting/common/types.ts
@@ -68,6 +68,7 @@ export interface ReportSource {
   };
   meta: { objectType: string; layout?: string };
   browser_type: string;
+  migration_version: string;
   max_attempts: number;
   timeout: number;
 
@@ -77,7 +78,7 @@ export interface ReportSource {
   started_at?: string;
   completed_at?: string;
   created_at: string;
-  process_expiration?: string;
+  process_expiration?: string | null; // must be set to null to clear the expiration
 }
 
 /*
diff --git a/x-pack/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
index b0e5d7bafb03c..70492b415f961 100644
--- a/x-pack/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
@@ -68,7 +68,7 @@ export function enqueueJobFactory(
     // 2. Schedule the report with Task Manager
     const task = await reporting.scheduleTask(report.toReportTaskJSON());
     logger.info(
-      `Scheduled ${exportType.name} reporting task. Task ID: ${task.id}. Report ID: ${report._id}`
+      `Scheduled ${exportType.name} reporting task. Task ID: task:${task.id}. Report ID: ${report._id}`
     );
 
     return report;
diff --git a/x-pack/plugins/reporting/server/lib/statuses.ts b/x-pack/plugins/reporting/server/lib/statuses.ts
index 1aa6b6d5ac8ff..2c25708078aaf 100644
--- a/x-pack/plugins/reporting/server/lib/statuses.ts
+++ b/x-pack/plugins/reporting/server/lib/statuses.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-export const statuses = {
+import { JobStatus } from '../../common/types';
+
+export const statuses: Record<string, JobStatus> = {
   JOB_STATUS_PENDING: 'pending',
   JOB_STATUS_PROCESSING: 'processing',
   JOB_STATUS_COMPLETED: 'completed',
   JOB_STATUS_WARNINGS: 'completed_with_warnings',
   JOB_STATUS_FAILED: 'failed',
-  JOB_STATUS_CANCELLED: 'cancelled',
 };
diff --git a/x-pack/plugins/reporting/server/lib/store/mapping.ts b/x-pack/plugins/reporting/server/lib/store/mapping.ts
index ce8f768ef077f..69f432562ec98 100644
--- a/x-pack/plugins/reporting/server/lib/store/mapping.ts
+++ b/x-pack/plugins/reporting/server/lib/store/mapping.ts
@@ -7,15 +7,10 @@
 
 export const mapping = {
   meta: {
-    // We are indexing these properties with both text and keyword fields because that's what will be auto generated
-    // when an index already exists. This schema is only used when a reporting index doesn't exist.  This way existing
-    // reporting indexes and new reporting indexes will look the same and the data can be queried in the same
-    // manner.
+    // We are indexing these properties with both text and keyword fields
+    // because that's what will be auto generated when an index already exists.
     properties: {
-      /**
-       * Type of object that is triggering this report. Should be either search, visualization or dashboard.
-       * Used for job listing and telemetry stats only.
-       */
+      // ID of the app this report: search, visualization or dashboard, etc
       objectType: {
         type: 'text',
         fields: {
@@ -25,10 +20,6 @@ export const mapping = {
           },
         },
       },
-      /**
-       * Can be either preserve_layout, print or none (in the case of csv export).
-       * Used for phone home stats only.
-       */
       layout: {
         type: 'text',
         fields: {
@@ -41,9 +32,10 @@ export const mapping = {
     },
   },
   browser_type: { type: 'keyword' },
+  migration_version: { type: 'keyword' }, // new field (7.14) to distinguish reports that were scheduled with Task Manager
   jobtype: { type: 'keyword' },
   payload: { type: 'object', enabled: false },
-  priority: { type: 'byte' }, // NOTE: this is unused, but older data may have a mapping for this field
+  priority: { type: 'byte' }, // TODO: remove: this is unused
   timeout: { type: 'long' },
   process_expiration: { type: 'date' },
   created_by: { type: 'keyword' }, // `null` if security is disabled
diff --git a/x-pack/plugins/reporting/server/lib/store/report.test.ts b/x-pack/plugins/reporting/server/lib/store/report.test.ts
index 23d766f2190f6..a8d14e12a738b 100644
--- a/x-pack/plugins/reporting/server/lib/store/report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/report.test.ts
@@ -20,21 +20,18 @@ describe('Class Report', () => {
       timeout: 30000,
     });
 
-    expect(report.toEsDocsJSON()).toMatchObject({
-      _index: '.reporting-test-index-12345',
-      _source: {
-        attempts: 0,
-        browser_type: 'browser_type_test_string',
-        completed_at: undefined,
-        created_by: 'created_by_test_string',
-        jobtype: 'test-report',
-        max_attempts: 50,
-        meta: { objectType: 'test' },
-        payload: { headers: 'payload_test_field', objectType: 'testOt' },
-        started_at: undefined,
-        status: 'pending',
-        timeout: 30000,
-      },
+    expect(report.toReportSource()).toMatchObject({
+      attempts: 0,
+      browser_type: 'browser_type_test_string',
+      completed_at: undefined,
+      created_by: 'created_by_test_string',
+      jobtype: 'test-report',
+      max_attempts: 50,
+      meta: { objectType: 'test' },
+      payload: { headers: 'payload_test_field', objectType: 'testOt' },
+      started_at: undefined,
+      status: 'pending',
+      timeout: 30000,
     });
     expect(report.toReportTaskJSON()).toMatchObject({
       attempts: 0,
@@ -80,22 +77,18 @@ describe('Class Report', () => {
     };
     report.updateWithEsDoc(metadata);
 
-    expect(report.toEsDocsJSON()).toMatchObject({
-      _id: '12342p9o387549o2345',
-      _index: '.reporting-test-update',
-      _source: {
-        attempts: 0,
-        browser_type: 'browser_type_test_string',
-        completed_at: undefined,
-        created_by: 'created_by_test_string',
-        jobtype: 'test-report',
-        max_attempts: 50,
-        meta: { objectType: 'stange' },
-        payload: { objectType: 'testOt' },
-        started_at: undefined,
-        status: 'pending',
-        timeout: 30000,
-      },
+    expect(report.toReportSource()).toMatchObject({
+      attempts: 0,
+      browser_type: 'browser_type_test_string',
+      completed_at: undefined,
+      created_by: 'created_by_test_string',
+      jobtype: 'test-report',
+      max_attempts: 50,
+      meta: { objectType: 'stange' },
+      payload: { objectType: 'testOt' },
+      started_at: undefined,
+      status: 'pending',
+      timeout: 30000,
     });
     expect(report.toReportTaskJSON()).toMatchObject({
       attempts: 0,
diff --git a/x-pack/plugins/reporting/server/lib/store/report.ts b/x-pack/plugins/reporting/server/lib/store/report.ts
index 9b98650e1d984..fa5b91527ccc4 100644
--- a/x-pack/plugins/reporting/server/lib/store/report.ts
+++ b/x-pack/plugins/reporting/server/lib/store/report.ts
@@ -21,8 +21,13 @@ export { ReportDocument };
 export { ReportApiJSON, ReportSource };
 
 const puid = new Puid();
+export const MIGRATION_VERSION = '7.14.0';
 
-export class Report implements Partial<ReportSource> {
+/*
+ * The public fields are a flattened version what Elasticsearch returns when you
+ * `GET` a document.
+ */
+export class Report implements Partial<ReportSource & ReportDocumentHead> {
   public _index?: string;
   public _id: string;
   public _primary_term?: number; // set by ES
@@ -47,6 +52,7 @@ export class Report implements Partial<ReportSource> {
   public readonly timeout?: ReportSource['timeout'];
 
   public process_expiration?: ReportSource['process_expiration'];
+  public migration_version: string;
 
   /*
    * Create an unsaved report
@@ -58,6 +64,8 @@ export class Report implements Partial<ReportSource> {
     this._primary_term = opts._primary_term;
     this._seq_no = opts._seq_no;
 
+    this.migration_version = MIGRATION_VERSION;
+
     this.payload = opts.payload!;
     this.kibana_name = opts.kibana_name!;
     this.kibana_id = opts.kibana_id!;
@@ -80,7 +88,7 @@ export class Report implements Partial<ReportSource> {
   /*
    * Update the report with "live" storage metadata
    */
-  updateWithEsDoc(doc: Partial<Report>) {
+  updateWithEsDoc(doc: Partial<Report>): void {
     if (doc._index == null || doc._id == null) {
       throw new Error(`Report object from ES has missing fields!`);
     }
@@ -89,30 +97,31 @@ export class Report implements Partial<ReportSource> {
     this._index = doc._index;
     this._primary_term = doc._primary_term;
     this._seq_no = doc._seq_no;
+    this.migration_version = MIGRATION_VERSION;
   }
 
   /*
    * Data structure for writing to Elasticsearch index
    */
-  toEsDocsJSON() {
+  toReportSource(): ReportSource {
     return {
-      _id: this._id,
-      _index: this._index,
-      _source: {
-        jobtype: this.jobtype,
-        created_at: this.created_at,
-        created_by: this.created_by,
-        payload: this.payload,
-        meta: this.meta,
-        timeout: this.timeout,
-        max_attempts: this.max_attempts,
-        browser_type: this.browser_type,
-        status: this.status,
-        attempts: this.attempts,
-        started_at: this.started_at,
-        completed_at: this.completed_at,
-        process_expiration: this.process_expiration,
-      },
+      migration_version: MIGRATION_VERSION,
+      kibana_name: this.kibana_name,
+      kibana_id: this.kibana_id,
+      jobtype: this.jobtype,
+      created_at: this.created_at,
+      created_by: this.created_by,
+      payload: this.payload,
+      meta: this.meta,
+      timeout: this.timeout!,
+      max_attempts: this.max_attempts,
+      browser_type: this.browser_type!,
+      status: this.status,
+      attempts: this.attempts,
+      started_at: this.started_at,
+      completed_at: this.completed_at,
+      process_expiration: this.process_expiration,
+      output: this.output || null,
     };
   }
 
diff --git a/x-pack/plugins/reporting/server/lib/store/store.test.ts b/x-pack/plugins/reporting/server/lib/store/store.test.ts
index 7f96433fcc6ce..8bb5c7fb8bbf9 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.test.ts
@@ -184,6 +184,7 @@ describe('ReportingStore', () => {
       _source: {
         kibana_name: 'test',
         kibana_id: 'test123',
+        migration_version: 'X.0.0',
         created_at: 'some time',
         created_by: 'some security person',
         jobtype: 'csv',
@@ -222,6 +223,7 @@ describe('ReportingStore', () => {
         "meta": Object {
           "testMeta": "meta",
         },
+        "migration_version": "7.14.0",
         "output": null,
         "payload": Object {
           "testPayload": "payload",
@@ -239,6 +241,8 @@ describe('ReportingStore', () => {
     const report = new Report({
       _id: 'id-of-processing',
       _index: '.reporting-test-index-12345',
+      _seq_no: 42,
+      _primary_term: 10002,
       jobtype: 'test-report',
       created_by: 'created_by_test_string',
       browser_type: 'browser_type_test_string',
@@ -254,24 +258,12 @@ describe('ReportingStore', () => {
 
     await store.setReportClaimed(report, { testDoc: 'test' } as any);
 
-    const [updateCall] = mockEsClient.update.mock.calls;
-    expect(updateCall).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "body": Object {
-            "doc": Object {
-              "status": "processing",
-              "testDoc": "test",
-            },
-          },
-          "id": "id-of-processing",
-          "if_primary_term": undefined,
-          "if_seq_no": undefined,
-          "index": ".reporting-test-index-12345",
-          "refresh": true,
-        },
-      ]
-    `);
+    const [[updateCall]] = mockEsClient.update.mock.calls;
+    const response = updateCall.body?.doc as Report;
+    expect(response.migration_version).toBe(`7.14.0`);
+    expect(response.status).toBe(`processing`);
+    expect(updateCall.if_seq_no).toBe(42);
+    expect(updateCall.if_primary_term).toBe(10002);
   });
 
   it('setReportFailed sets the status of a record to failed', async () => {
@@ -279,6 +271,8 @@ describe('ReportingStore', () => {
     const report = new Report({
       _id: 'id-of-failure',
       _index: '.reporting-test-index-12345',
+      _seq_no: 43,
+      _primary_term: 10002,
       jobtype: 'test-report',
       created_by: 'created_by_test_string',
       browser_type: 'browser_type_test_string',
@@ -294,24 +288,12 @@ describe('ReportingStore', () => {
 
     await store.setReportFailed(report, { errors: 'yes' } as any);
 
-    const [updateCall] = mockEsClient.update.mock.calls;
-    expect(updateCall).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "body": Object {
-            "doc": Object {
-              "errors": "yes",
-              "status": "failed",
-            },
-          },
-          "id": "id-of-failure",
-          "if_primary_term": undefined,
-          "if_seq_no": undefined,
-          "index": ".reporting-test-index-12345",
-          "refresh": true,
-        },
-      ]
-    `);
+    const [[updateCall]] = mockEsClient.update.mock.calls;
+    const response = updateCall.body?.doc as Report;
+    expect(response.migration_version).toBe(`7.14.0`);
+    expect(response.status).toBe(`failed`);
+    expect(updateCall.if_seq_no).toBe(43);
+    expect(updateCall.if_primary_term).toBe(10002);
   });
 
   it('setReportCompleted sets the status of a record to completed', async () => {
@@ -319,6 +301,8 @@ describe('ReportingStore', () => {
     const report = new Report({
       _id: 'vastly-great-report-id',
       _index: '.reporting-test-index-12345',
+      _seq_no: 44,
+      _primary_term: 10002,
       jobtype: 'test-report',
       created_by: 'created_by_test_string',
       browser_type: 'browser_type_test_string',
@@ -334,31 +318,21 @@ describe('ReportingStore', () => {
 
     await store.setReportCompleted(report, { certainly_completed: 'yes' } as any);
 
-    const [updateCall] = mockEsClient.update.mock.calls;
-    expect(updateCall).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "body": Object {
-            "doc": Object {
-              "certainly_completed": "yes",
-              "status": "completed",
-            },
-          },
-          "id": "vastly-great-report-id",
-          "if_primary_term": undefined,
-          "if_seq_no": undefined,
-          "index": ".reporting-test-index-12345",
-          "refresh": true,
-        },
-      ]
-    `);
+    const [[updateCall]] = mockEsClient.update.mock.calls;
+    const response = updateCall.body?.doc as Report;
+    expect(response.migration_version).toBe(`7.14.0`);
+    expect(response.status).toBe(`completed`);
+    expect(updateCall.if_seq_no).toBe(44);
+    expect(updateCall.if_primary_term).toBe(10002);
   });
 
-  it('setReportCompleted sets the status of a record to completed_with_warnings', async () => {
+  it('sets the status of a record to completed_with_warnings', async () => {
     const store = new ReportingStore(mockCore, mockLogger);
     const report = new Report({
       _id: 'vastly-great-report-id',
       _index: '.reporting-test-index-12345',
+      _seq_no: 45,
+      _primary_term: 10002,
       jobtype: 'test-report',
       created_by: 'created_by_test_string',
       browser_type: 'browser_type_test_string',
@@ -379,28 +353,52 @@ describe('ReportingStore', () => {
       },
     } as any);
 
-    const [updateCall] = mockEsClient.update.mock.calls;
-    expect(updateCall).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "body": Object {
-            "doc": Object {
-              "certainly_completed": "pretty_much",
-              "output": Object {
-                "warnings": Array [
-                  "those pants don't go with that shirt",
-                ],
-              },
-              "status": "completed_with_warnings",
-            },
-          },
-          "id": "vastly-great-report-id",
-          "if_primary_term": undefined,
-          "if_seq_no": undefined,
-          "index": ".reporting-test-index-12345",
-          "refresh": true,
-        },
-      ]
+    const [[updateCall]] = mockEsClient.update.mock.calls;
+    const response = updateCall.body?.doc as Report;
+
+    expect(response.migration_version).toBe(`7.14.0`);
+    expect(response.status).toBe(`completed_with_warnings`);
+    expect(updateCall.if_seq_no).toBe(45);
+    expect(updateCall.if_primary_term).toBe(10002);
+    expect(response.output).toMatchInlineSnapshot(`
+      Object {
+        "warnings": Array [
+          "those pants don't go with that shirt",
+        ],
+      }
     `);
   });
+
+  it('prepareReportForRetry resets the expiration and status on the report document', async () => {
+    const store = new ReportingStore(mockCore, mockLogger);
+    const report = new Report({
+      _id: 'pretty-good-report-id',
+      _index: '.reporting-test-index-94058763',
+      _seq_no: 46,
+      _primary_term: 10002,
+      jobtype: 'test-report-2',
+      created_by: 'created_by_test_string',
+      browser_type: 'browser_type_test_string',
+      status: 'processing',
+      process_expiration: '2002',
+      max_attempts: 3,
+      payload: {
+        title: 'test report',
+        headers: 'rp_test_headers',
+        objectType: 'testOt',
+        browserTimezone: 'utc',
+      },
+      timeout: 30000,
+    });
+
+    await store.prepareReportForRetry(report);
+
+    const [[updateCall]] = mockEsClient.update.mock.calls;
+    const response = updateCall.body?.doc as Report;
+
+    expect(response.migration_version).toBe(`7.14.0`);
+    expect(response.status).toBe(`pending`);
+    expect(updateCall.if_seq_no).toBe(46);
+    expect(updateCall.if_primary_term).toBe(10002);
+  });
 });
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index fc7bd9c23d769..8f1e6c315a2d1 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -5,15 +5,38 @@
  * 2.0.
  */
 
+import { IndexResponse, UpdateResponse } from '@elastic/elasticsearch/api/types';
 import { ElasticsearchClient } from 'src/core/server';
 import { LevelLogger, statuses } from '../';
 import { ReportingCore } from '../../';
-import { numberToDuration } from '../../../common/schema_utils';
 import { JobStatus } from '../../../common/types';
 import { ReportTaskParams } from '../tasks';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
-import { Report, ReportDocument, ReportSource } from './report';
+import { MIGRATION_VERSION, Report, ReportDocument, ReportSource } from './report';
+
+/*
+ * When an instance of Kibana claims a report job, this information tells us about that instance
+ */
+export type ReportProcessingFields = Required<{
+  kibana_id: Report['kibana_id'];
+  kibana_name: Report['kibana_name'];
+  browser_type: Report['browser_type'];
+  attempts: Report['attempts'];
+  started_at: Report['started_at'];
+  timeout: Report['timeout'];
+  process_expiration: Report['process_expiration'];
+}>;
+
+export type ReportFailedFields = Required<{
+  completed_at: Report['completed_at'];
+  output: Report['output'];
+}>;
+
+export type ReportCompletedFields = Required<{
+  completed_at: Report['completed_at'];
+  output: Report['output'];
+}>;
 
 /*
  * When searching for long-pending reports, we get a subset of fields
@@ -24,15 +47,38 @@ export interface ReportRecordTimeout {
   _source: {
     status: JobStatus;
     process_expiration?: string;
-    created_at?: string;
   };
 }
 
 const checkReportIsEditable = (report: Report) => {
-  if (!report._id || !report._index) {
-    throw new Error(`Report object is not synced with ES!`);
+  const { _id, _index, _seq_no, _primary_term } = report;
+  if (_id == null || _index == null) {
+    throw new Error(`Report is not editable: Job [${_id}] is not synced with ES!`);
+  }
+
+  if (_seq_no == null || _primary_term == null) {
+    throw new Error(
+      `Report is not editable: Job [${_id}] is missing _seq_no and _primary_term fields!`
+    );
   }
 };
+/*
+ * When searching for long-pending reports, we get a subset of fields
+ */
+const sourceDoc = (doc: Partial<ReportSource>): Partial<ReportSource> => {
+  return {
+    ...doc,
+    migration_version: MIGRATION_VERSION,
+  };
+};
+
+const jobDebugMessage = (report: Report) =>
+  `${report._id} ` +
+  `[_index: ${report._index}] ` +
+  `[_seq_no: ${report._seq_no}]  ` +
+  `[_primary_term: ${report._primary_term}]` +
+  `[attempts: ${report.attempts}] ` +
+  `[process_expiration: ${report.process_expiration}]`;
 
 /*
  * A class to give an interface to historical reports in the reporting.index
@@ -43,7 +89,6 @@ const checkReportIsEditable = (report: Report) => {
 export class ReportingStore {
   private readonly indexPrefix: string; // config setting of index prefix in system index name
   private readonly indexInterval: string; // config setting of index prefix: how often to poll for pending work
-  private readonly queueTimeoutMins: number; // config setting of queue timeout, rounded up to nearest minute
   private client?: ElasticsearchClient;
 
   constructor(private reportingCore: ReportingCore, private logger: LevelLogger) {
@@ -52,7 +97,6 @@ export class ReportingStore {
     this.indexPrefix = config.get('index');
     this.indexInterval = config.get('queue', 'indexInterval');
     this.logger = logger.clone(['store']);
-    this.queueTimeoutMins = Math.ceil(numberToDuration(config.get('queue', 'timeout')).asMinutes());
   }
 
   private async getClient() {
@@ -103,18 +147,20 @@ export class ReportingStore {
   /*
    * Called from addReport, which handles any errors
    */
-  private async indexReport(report: Report) {
+  private async indexReport(report: Report): Promise<IndexResponse> {
     const doc = {
       index: report._index!,
       id: report._id,
+      refresh: true,
       body: {
-        ...report.toEsDocsJSON()._source,
-        process_expiration: new Date(0), // use epoch so the job query works
-        attempts: 0,
-        status: statuses.JOB_STATUS_PENDING,
+        ...report.toReportSource(),
+        ...sourceDoc({
+          process_expiration: new Date(0).toISOString(),
+          attempts: 0,
+          status: statuses.JOB_STATUS_PENDING,
+        }),
       },
     };
-
     const client = await this.getClient();
     const { body } = await client.index(doc);
 
@@ -140,8 +186,7 @@ export class ReportingStore {
     await this.createIndex(index);
 
     try {
-      const doc = await this.indexReport(report);
-      report.updateWithEsDoc(doc);
+      report.updateWithEsDoc(await this.indexReport(report));
 
       await this.refreshIndex(index);
 
@@ -156,7 +201,9 @@ export class ReportingStore {
   /*
    * Search for a report from task data and return back the report
    */
-  public async findReportFromTask(taskJson: ReportTaskParams): Promise<Report> {
+  public async findReportFromTask(
+    taskJson: Pick<ReportTaskParams, 'id' | 'index'>
+  ): Promise<Report> {
     if (!taskJson.index) {
       throw new Error('Task JSON is missing index field!');
     }
@@ -186,41 +233,23 @@ export class ReportingStore {
         timeout: document._source?.timeout,
       });
     } catch (err) {
-      this.logger.error('Error in finding a report! ' + JSON.stringify({ report: taskJson }));
-      this.logger.error(err);
-      throw err;
-    }
-  }
-
-  public async setReportPending(report: Report) {
-    const doc = { status: statuses.JOB_STATUS_PENDING };
-
-    try {
-      checkReportIsEditable(report);
-
-      const client = await this.getClient();
-      const { body } = await client.update<ReportDocument>({
-        id: report._id,
-        index: report._index!,
-        if_seq_no: report._seq_no,
-        if_primary_term: report._primary_term,
-        refresh: true,
-        body: { doc },
-      });
-
-      return (body as unknown) as ReportDocument;
-    } catch (err) {
-      this.logger.error('Error in setting report pending status!');
+      this.logger.error(
+        `Error in finding the report from the scheduled task info! ` +
+          `[id: ${taskJson.id}] [index: ${taskJson.index}]`
+      );
       this.logger.error(err);
       throw err;
     }
   }
 
-  public async setReportClaimed(report: Report, stats: Partial<Report>): Promise<ReportDocument> {
-    const doc = {
-      ...stats,
+  public async setReportClaimed(
+    report: Report,
+    processingInfo: ReportProcessingFields
+  ): Promise<UpdateResponse<ReportDocument>> {
+    const doc = sourceDoc({
+      ...processingInfo,
       status: statuses.JOB_STATUS_PROCESSING,
-    };
+    });
 
     try {
       checkReportIsEditable(report);
@@ -235,19 +264,24 @@ export class ReportingStore {
         body: { doc },
       });
 
-      return (body as unknown) as ReportDocument;
+      return body;
     } catch (err) {
-      this.logger.error('Error in setting report processing status!');
+      this.logger.error(
+        `Error in updating status to processing! Report: ` + jobDebugMessage(report)
+      );
       this.logger.error(err);
       throw err;
     }
   }
 
-  public async setReportFailed(report: Report, stats: Partial<Report>): Promise<ReportDocument> {
-    const doc = {
-      ...stats,
+  public async setReportFailed(
+    report: Report,
+    failedInfo: ReportFailedFields
+  ): Promise<UpdateResponse<ReportDocument>> {
+    const doc = sourceDoc({
+      ...failedInfo,
       status: statuses.JOB_STATUS_FAILED,
-    };
+    });
 
     try {
       checkReportIsEditable(report);
@@ -261,26 +295,29 @@ export class ReportingStore {
         refresh: true,
         body: { doc },
       });
-
-      return (body as unknown) as ReportDocument;
+      return body;
     } catch (err) {
-      this.logger.error('Error in setting report failed status!');
+      this.logger.error(`Error in updating status to failed! Report: ` + jobDebugMessage(report));
       this.logger.error(err);
       throw err;
     }
   }
 
-  public async setReportCompleted(report: Report, stats: Partial<Report>): Promise<ReportDocument> {
+  public async setReportCompleted(
+    report: Report,
+    completedInfo: ReportCompletedFields
+  ): Promise<UpdateResponse<ReportDocument>> {
+    const { output } = completedInfo;
+    const status =
+      output && output.warnings && output.warnings.length > 0
+        ? statuses.JOB_STATUS_WARNINGS
+        : statuses.JOB_STATUS_COMPLETED;
+    const doc = sourceDoc({
+      ...completedInfo,
+      status,
+    });
+
     try {
-      const { output } = stats;
-      const status =
-        output && output.warnings && output.warnings.length > 0
-          ? statuses.JOB_STATUS_WARNINGS
-          : statuses.JOB_STATUS_COMPLETED;
-      const doc = {
-        ...stats,
-        status,
-      };
       checkReportIsEditable(report);
 
       const client = await this.getClient();
@@ -292,16 +329,20 @@ export class ReportingStore {
         refresh: true,
         body: { doc },
       });
-
-      return (body as unknown) as ReportDocument;
+      return body;
     } catch (err) {
-      this.logger.error('Error in setting report complete status!');
+      this.logger.error(`Error in updating status to complete! Report: ` + jobDebugMessage(report));
       this.logger.error(err);
       throw err;
     }
   }
 
-  public async clearExpiration(report: Report): Promise<ReportDocument> {
+  public async prepareReportForRetry(report: Report): Promise<UpdateResponse<ReportDocument>> {
+    const doc = sourceDoc({
+      status: statuses.JOB_STATUS_PENDING,
+      process_expiration: null,
+    });
+
     try {
       checkReportIsEditable(report);
 
@@ -312,50 +353,54 @@ export class ReportingStore {
         if_seq_no: report._seq_no,
         if_primary_term: report._primary_term,
         refresh: true,
-        body: { doc: { process_expiration: null } },
+        body: { doc },
       });
-
-      return (body as unknown) as ReportDocument;
+      return body;
     } catch (err) {
-      this.logger.error('Error in clearing expiration!');
+      this.logger.error(
+        `Error in clearing expiration and status for retry! Report: ` + jobDebugMessage(report)
+      );
       this.logger.error(err);
       throw err;
     }
   }
 
   /*
-   * A zombie report document is one that isn't completed or failed, isn't
-   * being executed, and isn't scheduled to run. They arise:
-   * - when the cluster has processing documents in ESQueue before upgrading to v7.13 when ESQueue was removed
-   * - if Kibana crashes while a report task is executing and it couldn't be rescheduled on its own
-   *
-   * Pending reports are not included in this search: they may be scheduled in TM just not run yet.
-   * TODO Should we get a list of the reports that are pending and scheduled in TM so we can exclude them from this query?
+   * A report needs to be rescheduled when:
+   *   1. An older version of Kibana created jobs with ESQueue, and they have
+   *   not yet started running.
+   *   2. The report process_expiration field is overdue, which happens if the
+   *   report runs too long or Kibana restarts during execution
    */
-  public async findZombieReportDocuments(): Promise<ReportRecordTimeout[] | null> {
+  public async findStaleReportJob(): Promise<ReportRecordTimeout> {
     const client = await this.getClient();
+
+    const expiredFilter = {
+      bool: {
+        must: [
+          { range: { process_expiration: { lt: `now` } } },
+          { terms: { status: [statuses.JOB_STATUS_PROCESSING] } },
+        ],
+      },
+    };
+    const oldVersionFilter = {
+      bool: {
+        must: [{ terms: { status: [statuses.JOB_STATUS_PENDING] } }],
+        must_not: [{ exists: { field: 'migration_version' } }],
+      },
+    };
+
     const { body } = await client.search<ReportRecordTimeout['_source']>({
+      size: 1,
       index: this.indexPrefix + '-*',
-      filter_path: 'hits.hits',
+      seq_no_primary_term: true,
+      _source_excludes: ['output'],
       body: {
-        sort: { created_at: { order: 'desc' } },
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  must: [
-                    { range: { process_expiration: { lt: `now-${this.queueTimeoutMins}m` } } },
-                    { terms: { status: [statuses.JOB_STATUS_PROCESSING] } },
-                  ],
-                },
-              },
-            ],
-          },
-        },
+        sort: { created_at: { order: 'asc' as const } }, // find the oldest first
+        query: { bool: { filter: { bool: { should: [expiredFilter, oldVersionFilter] } } } },
       },
     });
 
-    return body.hits?.hits as ReportRecordTimeout[];
+    return body.hits?.hits[0] as ReportRecordTimeout;
   }
 }
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
index 2960ce457b7ae..f9e2cd82b0805 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { UpdateResponse } from '@elastic/elasticsearch/api/types';
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { timeout } from 'rxjs/operators';
@@ -19,9 +20,9 @@ import { CancellationToken } from '../../../common';
 import { durationToNumber, numberToDuration } from '../../../common/schema_utils';
 import { ReportingConfigType } from '../../config';
 import { BasePayload, RunTaskFn } from '../../types';
-import { Report, ReportingStore } from '../store';
+import { Report, ReportDocument, ReportingStore } from '../store';
+import { ReportFailedFields, ReportProcessingFields } from '../store/store';
 import {
-  ReportingExecuteTaskInstance,
   ReportingTask,
   ReportingTaskStatus,
   REPORTING_EXECUTE_TYPE,
@@ -30,6 +31,13 @@ import {
 } from './';
 import { errorLogger } from './error_logger';
 
+interface ReportingExecuteTaskInstance {
+  state: object;
+  taskType: string;
+  params: ReportTaskParams;
+  runAt?: Date;
+}
+
 function isOutput(output: TaskRunResult | Error): output is TaskRunResult {
   return typeof output === 'object' && (output as TaskRunResult).content != null;
 }
@@ -101,15 +109,21 @@ export class ExecuteReportTask implements ReportingTask {
   }
 
   public async _claimJob(task: ReportTaskParams): Promise<Report> {
-    const store = await this.getStore();
+    if (this.kibanaId == null) {
+      throw new Error(`Kibana instance ID is undefined!`);
+    }
+    if (this.kibanaName == null) {
+      throw new Error(`Kibana instance name is undefined!`);
+    }
 
+    const store = await this.getStore();
     let report: Report;
     if (task.id && task.index) {
       // if this is an ad-hoc report, there is a corresponding "pending" record in ReportingStore in need of updating
-      report = await store.findReportFromTask(task); // update seq_no
+      report = await store.findReportFromTask(task); // receives seq_no and primary_term
     } else {
       // if this is a scheduled report (not implemented), the report object needs to be instantiated
-      throw new Error('scheduled reports are not supported!');
+      throw new Error('Could not find matching report document!');
     }
 
     // Check if this is a completed job. This may happen if the `reports:monitor`
@@ -126,7 +140,7 @@ export class ExecuteReportTask implements ReportingTask {
     const maxAttempts = task.max_attempts;
     if (report.attempts >= maxAttempts) {
       const err = new Error(`Max attempts reached (${maxAttempts}). Queue timeout reached.`);
-      await this._failJob(task, err);
+      await this._failJob(report, err);
       throw err;
     }
 
@@ -134,7 +148,7 @@ export class ExecuteReportTask implements ReportingTask {
     const startTime = m.toISOString();
     const expirationTime = m.add(queueTimeout).toISOString();
 
-    const stats = {
+    const doc: ReportProcessingFields = {
       kibana_id: this.kibanaId,
       kibana_name: this.kibanaName,
       browser_type: this.config.capture.browser.type,
@@ -144,19 +158,28 @@ export class ExecuteReportTask implements ReportingTask {
       process_expiration: expirationTime,
     };
 
-    this.logger.debug(`Claiming ${report.jobtype} job ${report._id}`);
-
     const claimedReport = new Report({
       ...report,
-      ...stats,
+      ...doc,
     });
-    await store.setReportClaimed(claimedReport, stats);
 
+    this.logger.debug(
+      `Claiming ${claimedReport.jobtype} ${report._id} ` +
+        `[_index: ${report._index}]  ` +
+        `[_seq_no: ${report._seq_no}]  ` +
+        `[_primary_term: ${report._primary_term}]  ` +
+        `[attempts: ${report.attempts}]  ` +
+        `[process_expiration: ${expirationTime}]`
+    );
+
+    const resp = await store.setReportClaimed(claimedReport, doc);
+    claimedReport._seq_no = resp._seq_no;
+    claimedReport._primary_term = resp._primary_term;
     return claimedReport;
   }
 
-  private async _failJob(task: ReportTaskParams, error?: Error) {
-    const message = `Failing ${task.jobtype} job ${task.id}`;
+  private async _failJob(report: Report, error?: Error): Promise<UpdateResponse<ReportDocument>> {
+    const message = `Failing ${report.jobtype} job ${report._id}`;
 
     // log the error
     let docOutput;
@@ -169,9 +192,8 @@ export class ExecuteReportTask implements ReportingTask {
 
     // update the report in the store
     const store = await this.getStore();
-    const report = await store.findReportFromTask(task);
     const completedTime = moment().toISOString();
-    const doc = {
+    const doc: ReportFailedFields = {
       completed_at: completedTime,
       output: docOutput,
     };
@@ -179,7 +201,7 @@ export class ExecuteReportTask implements ReportingTask {
     return await store.setReportFailed(report, doc);
   }
 
-  private _formatOutput(output: TaskRunResult | Error) {
+  private _formatOutput(output: TaskRunResult | Error): TaskRunResult {
     const docOutput = {} as TaskRunResult;
     const unknownMime = null;
 
@@ -201,7 +223,10 @@ export class ExecuteReportTask implements ReportingTask {
     return docOutput;
   }
 
-  public async _performJob(task: ReportTaskParams, cancellationToken: CancellationToken) {
+  public async _performJob(
+    task: ReportTaskParams,
+    cancellationToken: CancellationToken
+  ): Promise<TaskRunResult> {
     if (!this.taskExecutors) {
       throw new Error(`Task run function factories have not been called yet!`);
     }
@@ -220,10 +245,10 @@ export class ExecuteReportTask implements ReportingTask {
       .toPromise();
   }
 
-  public async _completeJob(task: ReportTaskParams, output: TaskRunResult) {
-    let docId = `/${task.index}/_doc/${task.id}`;
+  public async _completeJob(report: Report, output: TaskRunResult): Promise<Report> {
+    let docId = `/${report._index}/_doc/${report._id}`;
 
-    this.logger.info(`Saving ${task.jobtype} job ${docId}.`);
+    this.logger.debug(`Saving ${report.jobtype} to ${docId}.`);
 
     const completedTime = moment().toISOString();
     const docOutput = this._formatOutput(output);
@@ -233,16 +258,13 @@ export class ExecuteReportTask implements ReportingTask {
       completed_at: completedTime,
       output: docOutput,
     };
-    const report = await store.findReportFromTask(task); // update seq_no and primary_term
     docId = `/${report._index}/_doc/${report._id}`;
 
-    try {
-      await store.setReportCompleted(report, doc);
-      this.logger.debug(`Saved ${report.jobtype} job ${docId}`);
-    } catch (err) {
-      if (err.statusCode === 409) return false;
-      errorLogger(this.logger, `Failure saving completed job ${docId}!`);
-    }
+    const resp = await store.setReportCompleted(report, doc);
+    this.logger.info(`Saved ${report.jobtype} job ${docId}`);
+    report._seq_no = resp._seq_no;
+    report._primary_term = resp._primary_term;
+    return report;
   }
 
   /*
@@ -264,7 +286,6 @@ export class ExecuteReportTask implements ReportingTask {
          */
         run: async () => {
           let report: Report | undefined;
-          let attempts = 0;
 
           // find the job in the store and set status to processing
           const task = context.taskInstance.params as ReportTaskParams;
@@ -278,64 +299,73 @@ export class ExecuteReportTask implements ReportingTask {
 
             // Update job status to claimed
             report = await this._claimJob(task);
-
-            const { jobtype: jobType, attempts: attempt, max_attempts: maxAttempts } = task;
-            this.logger.info(
-              `Starting ${jobType} report ${jobId}: attempt ${attempt + 1} of ${maxAttempts}.`
-            );
-            this.logger.debug(`Reports running: ${this.reporting.countConcurrentReports()}.`);
           } catch (failedToClaim) {
             // error claiming report - log the error
             // could be version conflict, or no longer connected to ES
-            errorLogger(this.logger, `Error in claiming report!`, failedToClaim);
+            errorLogger(this.logger, `Error in claiming ${jobId}`, failedToClaim);
           }
 
           if (!report) {
-            errorLogger(this.logger, `Report could not be claimed. Exiting...`);
+            errorLogger(this.logger, `Job ${jobId} could not be claimed. Exiting...`);
             return;
           }
 
-          attempts = report.attempts;
+          const { jobtype: jobType, attempts, max_attempts: maxAttempts } = report;
+          this.logger.debug(
+            `Starting ${jobType} report ${jobId}: attempt ${attempts} of ${maxAttempts}.`
+          );
+          this.logger.debug(`Reports running: ${this.reporting.countConcurrentReports()}.`);
 
           try {
             const output = await this._performJob(task, cancellationToken);
             if (output) {
-              await this._completeJob(task, output);
+              report = await this._completeJob(report, output);
             }
-
             // untrack the report for concurrency awareness
             this.logger.debug(`Stopping ${jobId}.`);
-            this.reporting.untrackReport(jobId);
-            this.logger.debug(`Reports running: ${this.reporting.countConcurrentReports()}.`);
           } catch (failedToExecuteErr) {
             cancellationToken.cancel();
 
-            const maxAttempts = this.config.capture.maxAttempts;
             if (attempts < maxAttempts) {
-              // attempts remain - reschedule
+              // attempts remain, reschedule
               try {
+                if (report == null) {
+                  throw new Error(`Report ${jobId} is null!`);
+                }
                 // reschedule to retry
                 const remainingAttempts = maxAttempts - report.attempts;
                 errorLogger(
                   this.logger,
-                  `Scheduling retry. Retries remaining: ${remainingAttempts}.`,
+                  `Scheduling retry for job ${jobId}. Retries remaining: ${remainingAttempts}.`,
                   failedToExecuteErr
                 );
 
                 await this.rescheduleTask(reportFromTask(task).toReportTaskJSON(), this.logger);
               } catch (rescheduleErr) {
                 // can not be rescheduled - log the error
-                errorLogger(this.logger, `Could not reschedule the errored job!`, rescheduleErr);
+                errorLogger(
+                  this.logger,
+                  `Could not reschedule the errored job ${jobId}!`,
+                  rescheduleErr
+                );
               }
             } else {
               // 0 attempts remain - fail the job
               try {
-                const maxAttemptsMsg = `Max attempts reached (${attempts}). Failed with: ${failedToExecuteErr}`;
-                await this._failJob(task, new Error(maxAttemptsMsg));
+                const maxAttemptsMsg = `Max attempts (${attempts}) reached for job ${jobId}. Failed with: ${failedToExecuteErr}`;
+                if (report == null) {
+                  throw new Error(`Report ${jobId} is null!`);
+                }
+                const resp = await this._failJob(report, new Error(maxAttemptsMsg));
+                report._seq_no = resp._seq_no;
+                report._primary_term = resp._primary_term;
               } catch (failedToFailError) {
-                errorLogger(this.logger, `Could not fail the job!`, failedToFailError);
+                errorLogger(this.logger, `Could not fail ${jobId}!`, failedToFailError);
               }
             }
+          } finally {
+            this.reporting.untrackReport(jobId);
+            this.logger.debug(`Reports running: ${this.reporting.countConcurrentReports()}.`);
           }
         },
 
@@ -374,11 +404,12 @@ export class ExecuteReportTask implements ReportingTask {
       state: {},
       params: report,
     };
+
     return await this.getTaskManagerStart().schedule(taskInstance);
   }
 
   private async rescheduleTask(task: ReportTaskParams, logger: LevelLogger) {
-    logger.info(`Rescheduling ${task.id} to retry after error.`);
+    logger.info(`Rescheduling task:${task.id} to retry after error.`);
 
     const oldTaskInstance: ReportingExecuteTaskInstance = {
       taskType: REPORTING_EXECUTE_TYPE,
@@ -386,7 +417,7 @@ export class ExecuteReportTask implements ReportingTask {
       params: task,
     };
     const newTask = await this.getTaskManagerStart().schedule(oldTaskInstance);
-    logger.debug(`Rescheduled ${task.id}`);
+    logger.debug(`Rescheduled task:${task.id}. New task: task:${newTask.id}`);
     return newTask;
   }
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/index.ts b/x-pack/plugins/reporting/server/lib/tasks/index.ts
index ec9e85e957d03..c02b06d97adc7 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/index.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/index.ts
@@ -32,13 +32,6 @@ export interface ReportTaskParams<JobPayloadType = BasePayload> {
   meta: ReportSource['meta'];
 }
 
-export interface ReportingExecuteTaskInstance /* extends TaskInstanceWithDeprecatedFields */ {
-  state: object;
-  taskType: string;
-  params: ReportTaskParams;
-  runAt?: Date;
-}
-
 export enum ReportingTaskStatus {
   UNINITIALIZED = 'uninitialized',
   INITIALIZED = 'initialized',
@@ -52,6 +45,5 @@ export interface ReportingTask {
     maxAttempts: number;
     timeout: string;
   };
-
   getStatus: () => ReportingTaskStatus;
 }
diff --git a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
index 36380f767e6d9..9e1bc49739c93 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
@@ -11,21 +11,29 @@ import { ReportingCore } from '../../';
 import { TaskManagerStartContract, TaskRunCreatorFunction } from '../../../../task_manager/server';
 import { numberToDuration } from '../../../common/schema_utils';
 import { ReportingConfigType } from '../../config';
+import { statuses } from '../statuses';
 import { Report } from '../store';
-import {
-  ReportingExecuteTaskInstance,
-  ReportingTask,
-  ReportingTaskStatus,
-  REPORTING_EXECUTE_TYPE,
-  REPORTING_MONITOR_TYPE,
-  ReportTaskParams,
-} from './';
+import { ReportingTask, ReportingTaskStatus, REPORTING_MONITOR_TYPE, ReportTaskParams } from './';
 
 /*
- * Task for finding the ReportingRecords left in the ReportingStore and stuck
- * in pending or processing. It could happen if the server crashed while running
- * a report and was cancelled. Normally a failure would mean scheduling a
- * retry or failing the report, but the retry is not guaranteed to be scheduled.
+ * Task for finding the ReportingRecords left in the ReportingStore (.reporting index) and stuck in
+ * a pending or processing status.
+ *
+ *  Stuck in pending:
+ *    - This can happen if the report was scheduled in an earlier version of Kibana that used ESQueue.
+ *    - Task Manager doesn't know about these types of reports because there was never a task
+ *      scheduled for them.
+ *  Stuck in processing:
+ *    - This can could happen if the server crashed while a report was executing.
+ *    - Task Manager doesn't know about these reports, because the task is completed in Task
+ *      Manager when Reporting starts executing the report. We are not using Task Manager's retry
+ *      mechanisms, which defer the retry for a few minutes.
+ *
+ * These events require us to reschedule the report with Task Manager, so that the jobs can be
+ * distributed and executed.
+ *
+ * The runner function reschedules a single report job per task run, to avoid flooding Task Manager
+ * in case many report jobs need to be recovered.
  */
 export class MonitorReportsTask implements ReportingTask {
   public TYPE = REPORTING_MONITOR_TYPE;
@@ -77,36 +85,41 @@ export class MonitorReportsTask implements ReportingTask {
           const reportingStore = await this.getStore();
 
           try {
-            const results = await reportingStore.findZombieReportDocuments();
-            if (results && results.length) {
-              this.logger.info(
-                `Found ${results.length} reports to reschedule: ${results
-                  .map((pending) => pending._id)
-                  .join(',')}`
-              );
-            } else {
-              this.logger.debug(`Found 0 pending reports.`);
+            const recoveredJob = await reportingStore.findStaleReportJob();
+            if (!recoveredJob) {
+              // no reports need to be rescheduled
               return;
             }
 
-            for (const pending of results) {
-              const {
-                _id: jobId,
-                _source: { process_expiration: processExpiration, status },
-              } = pending;
-              const expirationTime = moment(processExpiration); // If it is the start of the Epoch, something went wrong
-              const timeWaitValue = moment().valueOf() - expirationTime.valueOf();
-              const timeWaitTime = moment.duration(timeWaitValue);
+            const {
+              _id: jobId,
+              _source: { process_expiration: processExpiration, status },
+            } = recoveredJob;
+
+            if (![statuses.JOB_STATUS_PENDING, statuses.JOB_STATUS_PROCESSING].includes(status)) {
+              throw new Error(`Invalid job status in the monitoring search result: ${status}`); // only pending or processing jobs possibility need rescheduling
+            }
+
+            if (status === statuses.JOB_STATUS_PENDING) {
               this.logger.info(
-                `Task ${jobId} has ${status} status for ${timeWaitTime.humanize()}. The queue timeout is ${this.timeout.humanize()}.`
+                `${jobId} was scheduled in a previous version and left in [${status}] status. Rescheduling...`
               );
+            }
 
-              // clear process expiration and reschedule
-              const oldReport = new Report({ ...pending, ...pending._source });
-              const reschedulingTask = oldReport.toReportTaskJSON();
-              await reportingStore.clearExpiration(oldReport);
-              await this.rescheduleTask(reschedulingTask, this.logger);
+            if (status === statuses.JOB_STATUS_PROCESSING) {
+              const expirationTime = moment(processExpiration);
+              const overdueValue = moment().valueOf() - expirationTime.valueOf();
+              this.logger.info(
+                `${jobId} status is [${status}] and the expiration time was [${overdueValue}ms] ago. Rescheduling...`
+              );
             }
+
+            // clear process expiration and set status to pending
+            const report = new Report({ ...recoveredJob, ...recoveredJob._source });
+            await reportingStore.prepareReportForRetry(report); // if there is a version conflict response, this just throws and logs an error
+
+            // clear process expiration and reschedule
+            await this.rescheduleTask(report.toReportTaskJSON(), this.logger); // a recovered report job must be scheduled by only a sinle Kibana instance
           } catch (err) {
             this.logger.error(err);
           }
@@ -126,33 +139,19 @@ export class MonitorReportsTask implements ReportingTask {
       createTaskRunner: this.getTaskRunner(),
       maxAttempts: 1,
       // round the timeout value up to the nearest second, since Task Manager
-      // doesn't support milliseconds
+      // doesn't support milliseconds or > 1s
       timeout: Math.ceil(this.timeout.asSeconds()) + 's',
     };
   }
 
-  // reschedule the task with TM and update the report document status to "Pending"
+  // reschedule the task with TM
   private async rescheduleTask(task: ReportTaskParams, logger: LevelLogger) {
     if (!this.taskManagerStart) {
       throw new Error('Reporting task runner has not been initialized!');
     }
-    logger.info(`Rescheduling ${task.id} to retry after timeout expiration.`);
-
-    const store = await this.getStore();
-
-    const oldTaskInstance: ReportingExecuteTaskInstance = {
-      taskType: REPORTING_EXECUTE_TYPE, // schedule a task to EXECUTE
-      state: {},
-      params: task,
-    };
-
-    const [report, newTask] = await Promise.all([
-      await store.findReportFromTask(task),
-      await this.taskManagerStart.schedule(oldTaskInstance),
-    ]);
-
-    await store.setReportPending(report);
+    logger.info(`Rescheduling task:${task.id} to retry.`);
 
+    const newTask = await this.reporting.scheduleTask(task);
     return newTask;
   }
 
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
index 3b34e17cd3cb1..4c64176dacc8b 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
@@ -45,7 +45,6 @@ export default function ({ getService }: FtrProviderContext) {
         created_by: false,
         jobtype: 'csv',
         status: 'pending',
-        // TODO: remove the payload field from the api respones
       };
       forOwn(expectedResJob, (value: any, key: string) => {
         expect(resJob[key]).to.eql(value, key);

From 1813d70b3d8840b352047bc592ade740f84092ab Mon Sep 17 00:00:00 2001
From: Jorge Sanz <jorge.sanz@elastic.co>
Date: Wed, 23 Jun 2021 21:12:05 +0200
Subject: [PATCH 08/95] [Maps] Duplicated EMS instructions for Elastic Cloud
 (#103124)

---
 .../maps/server/tutorials/ems/index.ts        | 85 ++++++++++---------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/x-pack/plugins/maps/server/tutorials/ems/index.ts b/x-pack/plugins/maps/server/tutorials/ems/index.ts
index 410c833b8ac77..3c63850f87291 100644
--- a/x-pack/plugins/maps/server/tutorials/ems/index.ts
+++ b/x-pack/plugins/maps/server/tutorials/ems/index.ts
@@ -16,6 +16,48 @@ export function emsBoundariesSpecProvider({
   emsLandingPageUrl: string;
   prependBasePath: (path: string) => string;
 }) {
+  const instructions = {
+    instructionSets: [
+      {
+        instructionVariants: [
+          {
+            id: 'EMS',
+            instructions: [
+              {
+                title: i18n.translate('xpack.maps.tutorials.ems.downloadStepTitle', {
+                  defaultMessage: 'Download Elastic Maps Service boundaries',
+                }),
+                textPre: i18n.translate('xpack.maps.tutorials.ems.downloadStepText', {
+                  defaultMessage:
+                    '1. Navigate to Elastic Maps Service [landing page]({emsLandingPageUrl}/).\n\
+2. In the left sidebar, select an administrative boundary.\n\
+3. Click `Download GeoJSON` button.',
+                  values: {
+                    emsLandingPageUrl,
+                  },
+                }),
+              },
+              {
+                title: i18n.translate('xpack.maps.tutorials.ems.uploadStepTitle', {
+                  defaultMessage: 'Index Elastic Maps Service boundaries',
+                }),
+                textPre: i18n.translate('xpack.maps.tutorials.ems.uploadStepText', {
+                  defaultMessage:
+                    '1. Open [Maps]({newMapUrl}).\n\
+2. Click `Add layer`, then select `Upload GeoJSON`.\n\
+3. Upload the GeoJSON file and click `Import file`.',
+                  values: {
+                    newMapUrl: prependBasePath(getNewMapPath()),
+                  },
+                }),
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  };
+
   return () => ({
     id: 'emsBoundaries',
     name: i18n.translate('xpack.maps.tutorials.ems.nameTitle', {
@@ -34,46 +76,7 @@ Indexing EMS administrative boundaries in Elasticsearch allows for search on bou
     euiIconType: 'emsApp',
     completionTimeMinutes: 1,
     previewImagePath: '/plugins/maps/assets/boundaries_screenshot.png',
-    onPrem: {
-      instructionSets: [
-        {
-          instructionVariants: [
-            {
-              id: 'EMS',
-              instructions: [
-                {
-                  title: i18n.translate('xpack.maps.tutorials.ems.downloadStepTitle', {
-                    defaultMessage: 'Download Elastic Maps Service boundaries',
-                  }),
-                  textPre: i18n.translate('xpack.maps.tutorials.ems.downloadStepText', {
-                    defaultMessage:
-                      '1. Navigate to Elastic Maps Service [landing page]({emsLandingPageUrl}).\n\
-2. In the left sidebar, select an administrative boundary.\n\
-3. Click `Download GeoJSON` button.',
-                    values: {
-                      emsLandingPageUrl,
-                    },
-                  }),
-                },
-                {
-                  title: i18n.translate('xpack.maps.tutorials.ems.uploadStepTitle', {
-                    defaultMessage: 'Index Elastic Maps Service boundaries',
-                  }),
-                  textPre: i18n.translate('xpack.maps.tutorials.ems.uploadStepText', {
-                    defaultMessage:
-                      '1. Open [Maps]({newMapUrl}).\n\
-2. Click `Add layer`, then select `Upload GeoJSON`.\n\
-3. Upload the GeoJSON file and click `Import file`.',
-                    values: {
-                      newMapUrl: prependBasePath(getNewMapPath()),
-                    },
-                  }),
-                },
-              ],
-            },
-          ],
-        },
-      ],
-    },
+    onPrem: instructions,
+    elasticCloud: instructions,
   });
 }

From 2dc1715a8ae75742e839838a3cac6dacd4cc2d4b Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Wed, 23 Jun 2021 13:14:43 -0600
Subject: [PATCH 09/95] [Security Solution] [Cases] Swimlane Connector for
 Cases (#100086)

Co-authored-by: Josh <josh.rickard@swimlane.com>
Co-authored-by: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Co-authored-by: Christos Nasikas <christos.nasikas@elastic.co>
Co-authored-by: Jonathan Buttner <jonathan.buttner@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/management/action-types.asciidoc         |   4 +
 .../connectors/action-types/swimlane.asciidoc | 105 ++++
 .../connectors/images/swimlane-connector.png  | Bin 0 -> 74730 bytes
 .../images/swimlane-params-test.png           | Bin 0 -> 175258 bytes
 docs/management/connectors/index.asciidoc     |   1 +
 x-pack/plugins/actions/README.md              | 145 ++++--
 .../server/builtin_action_types/index.test.ts |   1 +
 .../server/builtin_action_types/index.ts      |   2 +
 .../server/builtin_action_types/jira/index.ts |   4 +-
 .../builtin_action_types/jira/schema.ts       |   8 -
 .../builtin_action_types/jira/service.test.ts |  12 +-
 .../server/builtin_action_types/jira/types.ts |  10 +-
 .../builtin_action_types/resilient/schema.ts  |   8 -
 .../builtin_action_types/servicenow/schema.ts |   8 -
 .../builtin_action_types/swimlane/api.test.ts | 142 ++++++
 .../builtin_action_types/swimlane/api.ts      |  60 +++
 .../swimlane/helpers.test.ts                  |  90 ++++
 .../builtin_action_types/swimlane/helpers.ts  |  58 +++
 .../builtin_action_types/swimlane/index.ts    | 116 +++++
 .../builtin_action_types/swimlane/mocks.ts    | 124 +++++
 .../builtin_action_types/swimlane/schema.ts   |  75 +++
 .../swimlane/service.test.ts                  | 434 ++++++++++++++++
 .../builtin_action_types/swimlane/service.ts  | 196 +++++++
 .../swimlane/translations.ts                  |  20 +
 .../builtin_action_types/swimlane/types.ts    | 123 +++++
 .../swimlane/validators.ts                    |  28 +
 x-pack/plugins/actions/server/index.ts        |   1 -
 x-pack/plugins/actions/server/types.ts        |   2 +-
 .../server/usage/actions_usage_collector.ts   |   1 +
 x-pack/plugins/cases/README.md                |   2 +-
 .../cases/common/api/connectors/index.ts      |  14 +-
 .../cases/common/api/connectors/mappings.ts   |   7 +-
 .../cases/common/api/connectors/swimlane.ts   |  21 +
 x-pack/plugins/cases/common/constants.ts      |  16 +-
 .../cases/public/common/shared_imports.ts     |   2 +
 .../components/case_view/index.test.tsx       |  11 +-
 .../public/components/case_view/index.tsx     |   7 +-
 .../components/configure_cases/index.tsx      |   8 +-
 .../components/configure_cases/utils.ts       |  13 +-
 .../components/connector_selector/form.tsx    |  12 +-
 .../components/connectors/fields_form.tsx     |   3 +-
 .../public/components/connectors/index.ts     |   3 +
 .../components/connectors/jira/index.ts       |   4 +-
 .../public/components/connectors/mock.ts      |  18 +
 .../components/connectors/resilient/index.ts  |   4 +-
 .../components/connectors/servicenow/index.ts |  10 +-
 .../connectors/swimlane/case_fields.test.tsx  |  53 ++
 .../connectors/swimlane/case_fields.tsx       |  48 ++
 .../components/connectors/swimlane/index.ts   |  25 +
 .../connectors/swimlane/translations.ts       |  42 ++
 .../connectors/swimlane/validator.test.ts     |  60 +++
 .../connectors/swimlane/validator.ts          |  39 ++
 .../public/components/connectors/types.ts     |   3 +-
 .../components/create/connector.test.tsx      |  52 +-
 .../public/components/create/connector.tsx    |  53 +-
 .../public/components/create/form.test.tsx    |   6 +
 .../public/components/create/form_context.tsx |  33 +-
 .../cases/public/components/create/schema.tsx |   4 +-
 .../components/edit_connector/index.tsx       |  10 +-
 .../plugins/cases/public/components/types.ts  |  10 +
 .../plugins/cases/public/components/utils.ts  |  43 ++
 .../containers/use_get_action_license.tsx     |   3 +-
 .../plugins/cases/server/client/cases/get.ts  |   1 -
 .../cases/server/client/cases/utils.ts        |   1 +
 .../server/connectors/case/index.test.ts      |  14 +-
 .../cases/server/connectors/case/schema.ts    |  26 +-
 .../server/connectors/case/validators.ts      |   3 +-
 .../cases/server/connectors/factory.ts        |   4 +-
 .../server/connectors/swimlane/format.test.ts |  21 +
 .../server/connectors/swimlane/format.ts      |  15 +
 .../cases/server/connectors/swimlane/index.ts |  15 +
 .../server/connectors/swimlane/mapping.ts     |  28 +
 .../cases/server/connectors/swimlane/types.ts |  13 +
 .../security_solution/common/constants.ts     |   1 +
 .../schema/xpack_plugins.json                 |   6 +
 .../components/builtin_action_types/index.ts  |   2 +
 .../jira/jira_connectors.test.tsx             |   2 +-
 .../builtin_action_types/jira/jira_params.tsx |   6 +
 .../resilient/resilient_connectors.test.tsx   |   2 +-
 .../resilient/resilient_params.tsx            |   1 +
 .../servicenow/servicenow_connectors.test.tsx |   2 +-
 .../builtin_action_types/swimlane/api.test.ts | 145 ++++++
 .../builtin_action_types/swimlane/api.ts      |  65 +++
 .../builtin_action_types/swimlane/helpers.ts  |  62 +++
 .../builtin_action_types/swimlane/index.ts    |   8 +
 .../builtin_action_types/swimlane/logo.tsx    |  53 ++
 .../builtin_action_types/swimlane/mocks.ts    |  61 +++
 .../swimlane/steps/index.ts                   |   9 +
 .../swimlane/steps/swimlane_connection.tsx    | 201 ++++++++
 .../swimlane/steps/swimlane_fields.tsx        | 313 ++++++++++++
 .../swimlane/swimlane.test.tsx                | 219 ++++++++
 .../swimlane/swimlane.tsx                     | 106 ++++
 .../swimlane/swimlane_connectors.test.tsx     | 319 ++++++++++++
 .../swimlane/swimlane_connectors.tsx          | 103 ++++
 .../swimlane/swimlane_params.test.tsx         | 137 +++++
 .../swimlane/swimlane_params.tsx              | 159 ++++++
 .../swimlane/translations.ts                  | 282 ++++++++++
 .../builtin_action_types/swimlane/types.ts    |  56 ++
 .../swimlane/use_get_application.test.tsx     | 180 +++++++
 .../swimlane/use_get_application.tsx          |  82 +++
 .../actions/builtin_action_types/swimlane.ts  |  91 ++++
 .../basic/tests/actions/index.ts              |   1 +
 .../alerting_api_integration/common/config.ts |   1 +
 .../actions_simulators/server/plugin.ts       |   6 +
 .../server/swimlane_simulation.ts             |  39 ++
 .../actions/builtin_action_types/swimlane.ts  | 482 ++++++++++++++++++
 .../tests/actions/index.ts                    |   1 +
 .../case_api_integration/common/config.ts     |   1 +
 .../common/config.ts                          |   1 +
 x-pack/test/functional_with_es_ssl/config.ts  |   1 +
 110 files changed, 5531 insertions(+), 233 deletions(-)
 create mode 100644 docs/management/connectors/action-types/swimlane.asciidoc
 create mode 100644 docs/management/connectors/images/swimlane-connector.png
 create mode 100644 docs/management/connectors/images/swimlane-params-test.png
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/api.test.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/api.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.test.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/index.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/mocks.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/schema.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/translations.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/types.ts
 create mode 100644 x-pack/plugins/actions/server/builtin_action_types/swimlane/validators.ts
 create mode 100644 x-pack/plugins/cases/common/api/connectors/swimlane.ts
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.tsx
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/index.ts
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/translations.ts
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/validator.test.ts
 create mode 100644 x-pack/plugins/cases/public/components/connectors/swimlane/validator.ts
 create mode 100644 x-pack/plugins/cases/public/components/types.ts
 create mode 100644 x-pack/plugins/cases/public/components/utils.ts
 create mode 100644 x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
 create mode 100644 x-pack/plugins/cases/server/connectors/swimlane/format.ts
 create mode 100644 x-pack/plugins/cases/server/connectors/swimlane/index.ts
 create mode 100644 x-pack/plugins/cases/server/connectors/swimlane/mapping.ts
 create mode 100644 x-pack/plugins/cases/server/connectors/swimlane/types.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.test.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/helpers.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/index.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/logo.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/mocks.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/index.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_fields.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/translations.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/swimlane.ts
 create mode 100644 x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/swimlane_simulation.ts
 create mode 100644 x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/swimlane.ts

diff --git a/docs/management/action-types.asciidoc b/docs/management/action-types.asciidoc
index 65b600d4b7281..3d3d7aeb2d777 100644
--- a/docs/management/action-types.asciidoc
+++ b/docs/management/action-types.asciidoc
@@ -43,6 +43,10 @@ a| <<slack-action-type, Slack>>
 
 | Send a message to a Slack channel or user.
 
+a| <<swimlane-action-type, Swimlane>>
+
+| Create an incident in Swimlane.
+
 a| <<webhook-action-type, Webhook>>
 
 | Send a request to a web service.
diff --git a/docs/management/connectors/action-types/swimlane.asciidoc b/docs/management/connectors/action-types/swimlane.asciidoc
new file mode 100644
index 0000000000000..88447bb496a86
--- /dev/null
+++ b/docs/management/connectors/action-types/swimlane.asciidoc
@@ -0,0 +1,105 @@
+[role="xpack"]
+[[swimlane-action-type]]
+=== Swimlane connector and action
+++++
+<titleabbrev>Swimlane</titleabbrev>
+++++
+
+The Swimlane connector uses the https://swimlane.com/knowledge-center/docs/developer-guide/rest-api/[Swimlane REST API] to create Swimlane records.
+
+[float]
+[[swimlane-connector-configuration]]
+==== Connector configuration
+
+Swimlane connectors have the following configuration properties.
+
+Name:: The name of the connector. The name is used to identify a connector in the **Stack Management** UI connector listing, and in the connector list when configuring an action.
+URL:: Swimlane instance URL.
+Application ID:: Swimlane application ID.
+API token::  Swimlane API authentication token for HTTP Basic authentication.
+
+[float]
+[[Preconfigured-swimlane-configuration]]
+==== Preconfigured connector type
+
+[source,text]
+--
+ my-swimlane:
+   name: preconfigured-swimlane-connector-type
+   actionTypeId: .swimlane
+   config:
+     apiUrl: https://elastic.swimlaneurl.us
+     appId: app-id
+     mappings:
+       alertIdConfig:
+         fieldType: text
+         id: agp4s
+         key: alert-id
+         name: Alert ID 
+       caseIdConfig:
+         fieldType: text
+         id: ae1mi
+         key: case-id
+         name: Case ID
+       caseNameConfig:
+         fieldType: text
+         id: anxnr
+         key: case-name
+         name: Case Name
+       commentsConfig:
+         fieldType: comments
+         id: au18d
+         key: comments
+         name: Comments
+       descriptionConfig:
+         fieldType: text 
+         id: ae1gd
+         key: description 
+         name: Description 
+       ruleNameConfig:
+         fieldType: text
+         id: avfsl
+         key: rule-name
+         name: Rule Name
+       severityConfig:
+         fieldType: text
+         id: a71ik
+         key: severity
+         name: severity
+   secrets:
+     apiToken: tokenkeystorevalue
+--
+
+Config defines information for the connector type.
+
+`apiUrl`:: An address that corresponds to *URL*.
+`appId`:: A key that corresponds to *Application ID*.
+
+Secrets defines sensitive information for the connector type.
+
+`apiToken`:: A string that corresponds to *API Token*. Should be stored in the <<creating-keystore, {kib} keystore>>.
+
+[float]
+[[define-swimlane-ui]]
+==== Define connector in Stack Management
+
+Define Swimlane connector properties.
+
+[role="screenshot"]
+image::management/connectors/images/swimlane-connector.png[Swimlane connector]
+
+Test Swimlane action parameters.
+
+[role="screenshot"]
+image::management/connectors/images/swimlane-params-test.png[Swimlane params test]
+
+[float]
+[[swimlane-action-configuration]]
+==== Action configuration
+
+Swimlane actions have the following configuration properties.
+
+Comments:: Additional information for the client, such as how to troubleshoot the issue.
+Severity:: The severity of the incident.
+
+NOTE:   Alert ID and Rule Name are filled automatically. Specifically, Alert ID is set to `{{alert.id}}` and Rule Name to `{{rule.name}}`.
\ No newline at end of file
diff --git a/docs/management/connectors/images/swimlane-connector.png b/docs/management/connectors/images/swimlane-connector.png
new file mode 100644
index 0000000000000000000000000000000000000000..520c35d00381bd8d21a0accff1ba56cc1145ffc4
GIT binary patch
literal 74730
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

literal 0
HcmV?d00001

diff --git a/docs/management/connectors/images/swimlane-params-test.png b/docs/management/connectors/images/swimlane-params-test.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0e02c2c7b18f2fa4118e10d31d0a7c6447d4c19
GIT binary patch
literal 175258
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

literal 0
HcmV?d00001

diff --git a/docs/management/connectors/index.asciidoc b/docs/management/connectors/index.asciidoc
index ea4fa46d3e808..033b1c3ac150e 100644
--- a/docs/management/connectors/index.asciidoc
+++ b/docs/management/connectors/index.asciidoc
@@ -6,6 +6,7 @@ include::action-types/teams.asciidoc[]
 include::action-types/pagerduty.asciidoc[]
 include::action-types/server-log.asciidoc[]
 include::action-types/servicenow.asciidoc[]
+include::action-types/swimlane.asciidoc[]
 include::action-types/slack.asciidoc[]
 include::action-types/webhook.asciidoc[]
 include::pre-configured-connectors.asciidoc[]
diff --git a/x-pack/plugins/actions/README.md b/x-pack/plugins/actions/README.md
index 5b4a197eea462..b19e89a599840 100644
--- a/x-pack/plugins/actions/README.md
+++ b/x-pack/plugins/actions/README.md
@@ -19,7 +19,7 @@ Table of Contents
   - [Usage](#usage)
   - [Kibana Actions Configuration](#kibana-actions-configuration)
     - [Configuration Options](#configuration-options)
-      - [Adding Built-in Action Types to allowedHosts](#adding-built-in-action-types-to-allowedhosts)
+      - [**allowedHosts** configuration](#allowedhosts-configuration)
     - [Configuration Utilities](#configuration-utilities)
   - [Action types](#action-types)
     - [Methods](#methods)
@@ -54,6 +54,9 @@ Table of Contents
       - [`subActionParams (getFields)`](#subactionparams-getfields-2)
       - [`subActionParams (incidentTypes)`](#subactionparams-incidenttypes)
       - [`subActionParams (severity)`](#subactionparams-severity)
+  - [Swimlane](#swimlane)
+    - [`params`](#params-3)
+  - [| severity    | The severity of the incident.    | string _(optional)_ |](#-severity-----the-severity-of-the-incident-----string-optional-)
 - [Command Line Utility](#command-line-utility)
 - [Developing New Action Types](#developing-new-action-types)
   - [licensing](#licensing)
@@ -102,8 +105,8 @@ This module provides utilities for interacting with the configuration.
 | ensureUriAllowed                        | _uri_: The URI you wish to validate is allowed               | Validates whether the URI is allowed. This checks the configuration and validates that the hostname of the URI is in the list of allowed Hosts and throws an error if it is not allowed. If the configuration says that all URI's are allowed (using an "\*") then it will never throw.     | No return value, throws if URI isn't allowed        |
 | ensureHostnameAllowed                   | _hostname_: The Hostname you wish to validate is allowed     | Validates whether the Hostname is allowed. This checks the configuration and validates that the hostname is in the list of allowed Hosts and throws an error if it is not allowed. If the configuration says that all Hostnames are allowed (using an "\*") then it will never throw        | No return value, throws if Hostname isn't allowed . |
 | ensureActionTypeEnabled                 | _actionType_: The actionType to check to see if it's enabled | Throws an error if the actionType is not enabled                                                                                                                                                                                                                                            | No return value, throws if actionType isn't enabled |
-| isRejectUnauthorizedCertificatesEnabled | _none_                                                       | Returns value of `rejectUnauthorized` from configuration. | Boolean |
-| getProxySettings                        | _none_                                                       | If `proxyUrl` is set in the configuration, returns the proxy settings `proxyUrl`, `proxyHeaders` and `proxyRejectUnauthorizedCertificates`. Otherwise returns _undefined_. | Undefined or ProxySettings |
+| isRejectUnauthorizedCertificatesEnabled | _none_                                                       | Returns value of `rejectUnauthorized` from configuration.                                                                                                                                                                                                                                   | Boolean                                             |
+| getProxySettings                        | _none_                                                       | If `proxyUrl` is set in the configuration, returns the proxy settings `proxyUrl`, `proxyHeaders` and `proxyRejectUnauthorizedCertificates`. Otherwise returns _undefined_.                                                                                                                  | Undefined or ProxySettings                          |
 
 ## Action types
 
@@ -113,17 +116,17 @@ This module provides utilities for interacting with the configuration.
 
 The following table describes the properties of the `options` object.
 
-| Property                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type                         |
-| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
-| id                       | Unique identifier for the action type. For convention, ids starting with `.` are reserved for built in action types. We recommend using a convention like `<plugin_id>.mySpecialAction` for your action types.                                                                                                                                                                                                                                                                                                                                                                               | string                       |
-| name                     | A user-friendly name for the action type. These will be displayed in dropdowns when chosing action types.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | string                       |
-| maxAttempts              | The maximum number of times this action will attempt to execute when scheduled. | number |
-| minimumLicenseRequired   | The license required to use the action type. | string |
+| Property                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Type                         |
+| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
+| id                       | Unique identifier for the action type. For convention, ids starting with `.` are reserved for built in action types. We recommend using a convention like `<plugin_id>.mySpecialAction` for your action types.                                                                                                                                                                                                                                                                                                                                                                                       | string                       |
+| name                     | A user-friendly name for the action type. These will be displayed in dropdowns when chosing action types.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | string                       |
+| maxAttempts              | The maximum number of times this action will attempt to execute when scheduled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | number                       |
+| minimumLicenseRequired   | The license required to use the action type.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | string                       |
 | validate.params          | When developing an action type, it needs to accept parameters to know what to do with the action. (Example `to`, `from`, `subject`, `body` of an email). See the current built-in email action type for an example of the state-of-the-art validation. <p>Technically, the value of this property should have a property named `validate()` which is a function that takes a params object to validate and returns a sanitized version of that object to pass to the execution function. Validation errors should be thrown from the `validate()` function and will be available as an error message | schema / validation function |
-| validate.config          | Similar to params, a config may be required when creating an action (for example `host` and `port` for an email server).                                                                                                                                                                                                                                                                                                                                                                                                                                                         | schema / validation function |
-| validate.secrets         | Similar to params, a secrets object may be required when creating an action (for example `user` and `password` for an email server).                                                                                                                                                                                                                                                                                                                                                                                                                                                         | schema / validation function |
-| executor                 | This is where the code of an action type lives. This is a function gets called for executing an action from either alerting or manually by using the exposed function (see firing actions). For full details, see executor section below.                                                                                                                                                                                                                                                                                                                                                    | Function                     |
-| renderParameterTemplates | Optionally define a function to provide custom rendering for this action type. | Function |
+| validate.config          | Similar to params, a config may be required when creating an action (for example `host` and `port` for an email server).                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | schema / validation function |
+| validate.secrets         | Similar to params, a secrets object may be required when creating an action (for example `user` and `password` for an email server).                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | schema / validation function |
+| executor                 | This is where the code of an action type lives. This is a function gets called for executing an action from either alerting or manually by using the exposed function (see firing actions). For full details, see executor section below.                                                                                                                                                                                                                                                                                                                                                            | Function                     |
+| renderParameterTemplates | Optionally define a function to provide custom rendering for this action type.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Function                     |
 
 **Important** - The config object is persisted in ElasticSearch and updated via the ElasticSearch update document API. This API allows "partial updates" - and this can cause issues with the encryption used on specified properties. So, a `validate()` function should return values for all configuration properties, so that partial updates do not occur. Setting property values to `null` rather than `undefined`, or not including a property in the config object, is all you need to do to ensure partial updates won't occur.
 
@@ -133,15 +136,15 @@ This is the primary function for an action type. Whenever the action needs to ex
 
 **executor(options)**
 
-| Property                                | Description                                                                                                                                                                                                                                                                                                                                     |
-| --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| actionId                                | The action saved object id that the action type is executing for.                                                                                                                                                                                                                                                                               |
-| config                                  | The action configuration. If you would like to validate the config before being passed to the executor, define `validate.config` within the action type.                                                              |
-| secrets                                 | The decrypted secrets object given to an action. This comes from the action saved object that is partially or fully encrypted within the data store. If you would like to validate the secrets object before being passed to the executor, define `validate.secrets` within the action type.                                                              |
-| params                                  | Parameters for the execution. These will be given at execution time by either an alert or manually provided when calling the plugin provided execute function.                                                                                                                                                                                  |
-| services.scopedClusterClient            | Use this to do Elasticsearch queries on the cluster Kibana connects to. Serves the same purpose as the normal IClusterClient, but exposes an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead.|
-| services.savedObjectsClient             | This is an instance of the saved objects client. This provides the ability to do CRUD on any saved objects within the same space the alert lives in.<br><br>The scope of the saved objects client is tied to the user in context calling the execute API or the API key provided to the execute plugin function (only when security isenabled). |
-| services.log(tags, [data], [timestamp]) | Use this to create server logs. (This is the same function as server.log) 
+| Property                                | Description                                                                                                                                                                                                                                                                                                                                                                                 |
+| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| actionId                                | The action saved object id that the action type is executing for.                                                                                                                                                                                                                                                                                                                           |
+| config                                  | The action configuration. If you would like to validate the config before being passed to the executor, define `validate.config` within the action type.                                                                                                                                                                                                                                    |
+| secrets                                 | The decrypted secrets object given to an action. This comes from the action saved object that is partially or fully encrypted within the data store. If you would like to validate the secrets object before being passed to the executor, define `validate.secrets` within the action type.                                                                                                |
+| params                                  | Parameters for the execution. These will be given at execution time by either an alert or manually provided when calling the plugin provided execute function.                                                                                                                                                                                                                              |
+| services.scopedClusterClient            | Use this to do Elasticsearch queries on the cluster Kibana connects to. Serves the same purpose as the normal IClusterClient, but exposes an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead. |
+| services.savedObjectsClient             | This is an instance of the saved objects client. This provides the ability to do CRUD on any saved objects within the same space the alert lives in.<br><br>The scope of the saved objects client is tied to the user in context calling the execute API or the API key provided to the execute plugin function (only when security isenabled).                                             |
+| services.log(tags, [data], [timestamp]) | Use this to create server logs. (This is the same function as server.log)                                                                                                                                                                                                                                                                                                                   |
 
 ### Example
 
@@ -262,16 +265,16 @@ The [ServiceNow user documentation `params`](https://www.elastic.co/guide/en/kib
 
 The following table describes the properties of the `incident` object.
 
-| Property          | Description                                                                                                               | Type                |
-| ----------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------- |
-| short_description | The title of the incident.                                                                                                | string              |
-| description       | The description of the incident.                                                                                          | string _(optional)_ |
+| Property          | Description                                                                                                      | Type                |
+| ----------------- | ---------------------------------------------------------------------------------------------------------------- | ------------------- |
+| short_description | The title of the incident.                                                                                       | string              |
+| description       | The description of the incident.                                                                                 | string _(optional)_ |
 | externalId        | The ID of the incident in ServiceNow. If present, the incident is updated. Otherwise, a new incident is created. | string _(optional)_ |
-| severity          | The severity in ServiceNow.                                                                                   | string _(optional)_ |
-| urgency           | The urgency in ServiceNow.                                                                                    | string _(optional)_ |
-| impact            | The impact in ServiceNow.                                                                                     | string _(optional)_ |
-| category          | The category in ServiceNow.                                                                                   | string _(optional)_ |
-| subcategory       | The subcategory in ServiceNow.                                                                                | string _(optional)_ |
+| severity          | The severity in ServiceNow.                                                                                      | string _(optional)_ |
+| urgency           | The urgency in ServiceNow.                                                                                       | string _(optional)_ |
+| impact            | The impact in ServiceNow.                                                                                        | string _(optional)_ |
+| category          | The category in ServiceNow.                                                                                      | string _(optional)_ |
+| subcategory       | The subcategory in ServiceNow.                                                                                   | string _(optional)_ |
 
 #### `subActionParams (getFields)`
 
@@ -311,20 +314,20 @@ The [Jira user documentation `params`](https://www.elastic.co/guide/en/kibana/ma
 
 The following table describes the properties of the `incident` object.
 
-| Property    | Description                                                                                                      | Type                  |
-| ----------- | ---------------------------------------------------------------------------------------------------------------- | --------------------- |
-| summary     | The title of the issue.                                                                                          | string                |
-| description | The description of the issue.                                                                                   | string _(optional)_   |
+| Property    | Description                                                                                             | Type                  |
+| ----------- | ------------------------------------------------------------------------------------------------------- | --------------------- |
+| summary     | The title of the issue.                                                                                 | string                |
+| description | The description of the issue.                                                                           | string _(optional)_   |
 | externalId  | The ID of the issue in Jira. If present, the incident is updated. Otherwise, a new incident is created. | string _(optional)_   |
-| issueType   | The ID of the issue type in Jira.                                                                                | string _(optional)_   |
-| priority    | The name of the priority in Jira. Example: `Medium`.                                                             | string _(optional)_   |
-| labels      | An array of labels. Labels cannot contain spaces.                                                                | string[] _(optional)_ |
-| parent      | The ID or key of the parent issue. Only for `Sub-task` issue types.                                                     | string _(optional)_   |
+| issueType   | The ID of the issue type in Jira.                                                                       | string _(optional)_   |
+| priority    | The name of the priority in Jira. Example: `Medium`.                                                    | string _(optional)_   |
+| labels      | An array of labels. Labels cannot contain spaces.                                                       | string[] _(optional)_ |
+| parent      | The ID or key of the parent issue. Only for `Sub-task` issue types.                                     | string _(optional)_   |
 
 #### `subActionParams (getIncident)`
 
-| Property   | Description                 | Type   |
-| ---------- | --------------------------- | ------ |
+| Property   | Description                  | Type   |
+| ---------- | ---------------------------- | ------ |
 | externalId | The ID of the issue in Jira. | string |
 
 #### `subActionParams (issueTypes)`
@@ -333,20 +336,20 @@ No parameters for the `issueTypes` subaction. Provide an empty object `{}`.
 
 #### `subActionParams (fieldsByIssueType)`
 
-| Property | Description                      | Type   |
-| -------- | -------------------------------- | ------ |
+| Property | Description                       | Type   |
+| -------- | --------------------------------- | ------ |
 | id       | The ID of the issue type in Jira. | string |
 
 #### `subActionParams (issues)`
 
-| Property | Description             | Type   |
-| -------- | ----------------------- | ------ |
+| Property | Description              | Type   |
+| -------- | ------------------------ | ------ |
 | title    | The title to search for. | string |
 
 #### `subActionParams (issue)`
 
-| Property | Description                 | Type   |
-| -------- | --------------------------- | ------ |
+| Property | Description                  | Type   |
+| -------- | ---------------------------- | ------ |
 | id       | The ID of the issue in Jira. | string |
 
 #### `subActionParams (getFields)`
@@ -360,10 +363,10 @@ The [IBM Resilient user documentation `params`](https://www.elastic.co/guide/en/
 
 ### `params`
 
-| Property        | Description                                                                                        | Type   |
-| --------------- | -------------------------------------------------------------------------------------------------- | ------ |
+| Property        | Description                                                                                       | Type   |
+| --------------- | ------------------------------------------------------------------------------------------------- | ------ |
 | subAction       | The subaction to perform. It can be `pushToService`, `getFields`, `incidentTypes`, and `severity. | string |
-| subActionParams | The parameters of the subaction.                                                                   | object |
+| subActionParams | The parameters of the subaction.                                                                  | object |
 
 #### `subActionParams (pushToService)`
 
@@ -374,13 +377,13 @@ The [IBM Resilient user documentation `params`](https://www.elastic.co/guide/en/
 
 The following table describes the properties of the `incident` object.
 
-| Property      | Description                                                                                                                  | Type                  |
-| ------------- | ---------------------------------------------------------------------------------------------------------------------------- | --------------------- |
-| name          | The title of the incident.                                                                                                 | string _(optional)_   |
-| description   | The description of the incident.                                                                                             | string _(optional)_   |
+| Property      | Description                                                                                                         | Type                  |
+| ------------- | ------------------------------------------------------------------------------------------------------------------- | --------------------- |
+| name          | The title of the incident.                                                                                          | string _(optional)_   |
+| description   | The description of the incident.                                                                                    | string _(optional)_   |
 | externalId    | The ID of the incident in IBM Resilient. If present, the incident is updated. Otherwise, a new incident is created. | string _(optional)_   |
-| incidentTypes | An array with the IDs of IBM Resilient incident types.                                                                       | number[] _(optional)_ |
-| severityCode  | IBM Resilient ID of the severity code.                                                                                       | number _(optional)_   |
+| incidentTypes | An array with the IDs of IBM Resilient incident types.                                                              | number[] _(optional)_ |
+| severityCode  | IBM Resilient ID of the severity code.                                                                              | number _(optional)_   |
 
 #### `subActionParams (getFields)`
 
@@ -394,6 +397,36 @@ No parameters for the `incidentTypes` subaction. Provide an empty object `{}`.
 
 No parameters for the `severity` subaction. Provide an empty object `{}`.
 
+---
+## Swimlane
+
+
+### `params`
+
+| Property        | Description                                          | Type   |
+| --------------- | ---------------------------------------------------- | ------ |
+| subAction       | The subaction to perform. It can be `pushToService`. | string |
+| subActionParams | The parameters of the subaction.                     | object |
+
+
+`subActionParams (pushToService)`
+
+| Property | Description                                                                                                   | Type                  |
+| -------- | ------------------------------------------------------------------------------------------------------------- | --------------------- |
+| incident | The Swimlane incident.                                                                                        | object                |
+| comments | The comments of the case. A comment is of the form `{ commentId: string, version: string, comment: string }`. | object[] _(optional)_ |
+
+
+The following table describes the properties of the `incident` object.
+
+| Property    | Description                      | Type                |
+| ----------- | -------------------------------- | ------------------- |
+| alertId     | The alert id.                    | string _(optional)_ |
+| caseId      | The case id of the incident.     | string _(optional)_ |
+| caseName    | The case name of the incident.   | string _(optional)_ |
+| description | The description of the incident. | string _(optional)_ |
+| ruleName    | The rule name.                   | string _(optional)_ |
+| severity    | The severity of the incident.    | string _(optional)_ |
 ---
 # Command Line Utility
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
index 10955af2f3b13..5feb47ea6c962 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
@@ -21,6 +21,7 @@ const ACTION_TYPE_IDS = [
   '.pagerduty',
   '.server-log',
   '.slack',
+  '.swimlane',
   '.teams',
   '.webhook',
 ];
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.ts b/x-pack/plugins/actions/server/builtin_action_types/index.ts
index 551d3d02ff05d..07859cba4c371 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.ts
@@ -12,6 +12,7 @@ import { Logger } from '../../../../../src/core/server';
 import { getActionType as getEmailActionType } from './email';
 import { getActionType as getIndexActionType } from './es_index';
 import { getActionType as getPagerDutyActionType } from './pagerduty';
+import { getActionType as getSwimlaneActionType } from './swimlane';
 import { getActionType as getServerLogActionType } from './server_log';
 import { getActionType as getSlackActionType } from './slack';
 import { getActionType as getWebhookActionType } from './webhook';
@@ -65,6 +66,7 @@ export function registerBuiltInActionTypes({
   );
   actionTypeRegistry.register(getIndexActionType({ logger }));
   actionTypeRegistry.register(getPagerDutyActionType({ logger, configurationUtilities }));
+  actionTypeRegistry.register(getSwimlaneActionType({ logger, configurationUtilities }));
   actionTypeRegistry.register(getServerLogActionType({ logger }));
   actionTypeRegistry.register(getSlackActionType({ logger, configurationUtilities }));
   actionTypeRegistry.register(getWebhookActionType({ logger, configurationUtilities }));
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
index 3161e97583b72..aa439787ad96f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
@@ -25,7 +25,7 @@ import {
   JiraSecretConfigurationType,
   JiraExecutorResultData,
   ExecutorSubActionGetFieldsByIssueTypeParams,
-  ExecutorSubActionGetIssueTypesParams,
+  ExecutorSubActionCommonFieldsParams,
   ExecutorSubActionGetIssuesParams,
   ExecutorSubActionGetIssueParams,
   ExecutorSubActionGetIncidentParams,
@@ -137,7 +137,7 @@ async function executor(
   }
 
   if (subAction === 'issueTypes') {
-    const getIssueTypesParams = subActionParams as ExecutorSubActionGetIssueTypesParams;
+    const getIssueTypesParams = subActionParams as ExecutorSubActionCommonFieldsParams;
     data = await api.issueTypes({
       externalService,
       params: getIssueTypesParams,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/schema.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/schema.ts
index a81dfaeef8175..eb2f540deaa9a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/schema.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/schema.ts
@@ -25,14 +25,6 @@ export const ExternalIncidentServiceSecretConfigurationSchema = schema.object(
   ExternalIncidentServiceSecretConfiguration
 );
 
-export const ExecutorSubActionSchema = schema.oneOf([
-  schema.literal('getIncident'),
-  schema.literal('pushToService'),
-  schema.literal('handshake'),
-  schema.literal('issueTypes'),
-  schema.literal('fieldsByIssueType'),
-]);
-
 export const ExecutorSubActionPushParamsSchema = schema.object({
   incident: schema.object({
     summary: schema.string(),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
index f6462bac9d83e..9430d734287d3 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
@@ -155,12 +155,12 @@ describe('Jira service', () => {
       ).toThrow();
     });
 
-    test('throws without username', () => {
+    test('throws without email/username', () => {
       expect(() =>
         createExternalService(
           {
-            config: { apiUrl: 'test.com' },
-            secrets: { apiToken: '', email: 'elastic@elastic.com' },
+            config: { apiUrl: 'test.com', projectKey: 'CK' },
+            secrets: { apiToken: 'token' },
           },
           logger,
           configurationUtilities
@@ -168,12 +168,12 @@ describe('Jira service', () => {
       ).toThrow();
     });
 
-    test('throws without password', () => {
+    test('throws without apiToken/password', () => {
       expect(() =>
         createExternalService(
           {
-            config: { apiUrl: 'test.com' },
-            secrets: { apiToken: '', email: undefined },
+            config: { apiUrl: 'test.com', projectKey: 'CK' },
+            secrets: { email: 'elastic@elastic.com' },
           },
           logger,
           configurationUtilities
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
index 89a5551554c4a..74d53901d55d9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
@@ -16,10 +16,10 @@ import {
   ExecutorSubActionGetIncidentParamsSchema,
   ExecutorSubActionHandshakeParamsSchema,
   ExecutorSubActionGetCapabilitiesParamsSchema,
-  ExecutorSubActionGetIssueTypesParamsSchema,
   ExecutorSubActionGetFieldsByIssueTypeParamsSchema,
   ExecutorSubActionGetIssuesParamsSchema,
   ExecutorSubActionGetIssueParamsSchema,
+  ExecutorSubActionCommonFieldsParamsSchema,
 } from './schema';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { Logger } from '../../../../../../src/core/server';
@@ -124,8 +124,8 @@ export type ExecutorSubActionGetCapabilitiesParams = TypeOf<
   typeof ExecutorSubActionGetCapabilitiesParamsSchema
 >;
 
-export type ExecutorSubActionGetIssueTypesParams = TypeOf<
-  typeof ExecutorSubActionGetIssueTypesParamsSchema
+export type ExecutorSubActionCommonFieldsParams = TypeOf<
+  typeof ExecutorSubActionCommonFieldsParamsSchema
 >;
 
 export type ExecutorSubActionGetFieldsByIssueTypeParams = TypeOf<
@@ -157,12 +157,12 @@ export interface HandshakeApiHandlerArgs extends ExternalServiceApiHandlerArgs {
 
 export interface GetIssueTypesHandlerArgs {
   externalService: ExternalService;
-  params: ExecutorSubActionGetIssueTypesParams;
+  params: ExecutorSubActionCommonFieldsParams;
 }
 
 export interface GetCommonFieldsHandlerArgs {
   externalService: ExternalService;
-  params: ExecutorSubActionGetIssueTypesParams;
+  params: ExecutorSubActionCommonFieldsParams;
 }
 
 export interface GetFieldsByIssueTypeHandlerArgs {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/schema.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/schema.ts
index 9095780fea17c..9f76a236cacd5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/schema.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/schema.ts
@@ -25,14 +25,6 @@ export const ExternalIncidentServiceSecretConfigurationSchema = schema.object(
   ExternalIncidentServiceSecretConfiguration
 );
 
-export const ExecutorSubActionSchema = schema.oneOf([
-  schema.literal('getIncident'),
-  schema.literal('pushToService'),
-  schema.literal('handshake'),
-  schema.literal('incidentTypes'),
-  schema.literal('severity'),
-]);
-
 export const ExecutorSubActionPushParamsSchema = schema.object({
   incident: schema.object({
     name: schema.string(),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
index 59b0803d189cd..6fec30803d6d7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
@@ -24,14 +24,6 @@ export const ExternalIncidentServiceSecretConfigurationSchema = schema.object(
   ExternalIncidentServiceSecretConfiguration
 );
 
-export const ExecutorSubActionSchema = schema.oneOf([
-  schema.literal('getFields'),
-  schema.literal('getIncident'),
-  schema.literal('pushToService'),
-  schema.literal('handshake'),
-  schema.literal('getChoices'),
-]);
-
 const CommentsSchema = schema.nullable(
   schema.arrayOf(
     schema.object({
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.test.ts
new file mode 100644
index 0000000000000..1e633e2175808
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.test.ts
@@ -0,0 +1,142 @@
+/*
+ * 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 { api } from './api';
+import { ExternalService } from './types';
+import {
+  apiParams,
+  externalServiceMock,
+  recordResponseCreate,
+  recordResponseUpdate,
+} from './mocks';
+import { Logger } from '@kbn/logging';
+
+let mockedLogger: jest.Mocked<Logger>;
+
+describe('api', () => {
+  let externalService: jest.Mocked<ExternalService>;
+
+  beforeEach(() => {
+    externalService = externalServiceMock.create();
+  });
+
+  describe('pushToService', () => {
+    test('it pushes a new record', async () => {
+      const params = { ...apiParams, incident: { ...apiParams.incident, externalId: null } };
+      const res = await api.pushToService({
+        externalService,
+        logger: mockedLogger,
+        params,
+      });
+
+      expect(externalService.createComment).toHaveBeenCalled();
+      expect(externalService.createRecord).toHaveBeenCalled();
+      expect(externalService.updateRecord).not.toHaveBeenCalled();
+
+      expect(res).toEqual({
+        ...recordResponseCreate,
+        comments: [
+          {
+            commentId: '123456',
+            pushedDate: '2021-06-01T17:29:51.092Z',
+          },
+          {
+            commentId: '123456',
+            pushedDate: '2021-06-01T17:29:51.092Z',
+          },
+        ],
+      });
+    });
+
+    test('it pushes a new record without comment', async () => {
+      const params = {
+        ...apiParams,
+        incident: { ...apiParams.incident, externalId: null },
+        comments: [],
+      };
+      const res = await api.pushToService({
+        externalService,
+        logger: mockedLogger,
+        params,
+      });
+
+      expect(externalService.createComment).not.toHaveBeenCalled();
+      expect(externalService.createRecord).toHaveBeenCalled();
+      expect(res).toEqual(recordResponseCreate);
+    });
+
+    test('updates existing record', async () => {
+      const res = await api.pushToService({
+        externalService,
+        logger: mockedLogger,
+        params: apiParams,
+      });
+
+      expect(externalService.createComment).toHaveBeenCalled();
+      expect(externalService.createRecord).not.toHaveBeenCalled();
+      expect(externalService.updateRecord).toHaveBeenCalled();
+      expect(res).toEqual({
+        ...recordResponseUpdate,
+        comments: [
+          {
+            commentId: '123456',
+            pushedDate: '2021-06-01T17:29:51.092Z',
+          },
+          {
+            commentId: '123456',
+            pushedDate: '2021-06-01T17:29:51.092Z',
+          },
+        ],
+      });
+    });
+
+    test('it calls createRecord correctly', async () => {
+      const params = { ...apiParams, incident: { ...apiParams.incident, externalId: null } };
+      await api.pushToService({ externalService, params, logger: mockedLogger });
+
+      expect(externalService.createRecord).toHaveBeenCalledWith({
+        incident: {
+          alertId: '123456',
+          caseId: '123456',
+          caseName: 'case name',
+          description: 'case desc',
+          ruleName: 'rule name',
+          severity: 'critical',
+        },
+      });
+    });
+
+    test('it calls createComment correctly', async () => {
+      const mockedToISOString = jest
+        .spyOn(Date.prototype, 'toISOString')
+        .mockReturnValue('2021-06-15T18:02:29.404Z');
+
+      const params = { ...apiParams, incident: { ...apiParams.incident, externalId: null } };
+      await api.pushToService({ externalService, params, logger: mockedLogger });
+
+      expect(externalService.createComment).toHaveBeenNthCalledWith(1, {
+        createdDate: '2021-06-15T18:02:29.404Z',
+        incidentId: '123456',
+        comment: {
+          commentId: 'case-comment-1',
+          comment: 'A comment',
+        },
+      });
+
+      expect(externalService.createComment).toHaveBeenNthCalledWith(2, {
+        createdDate: '2021-06-15T18:02:29.404Z',
+        incidentId: '123456',
+        comment: {
+          commentId: 'case-comment-2',
+          comment: 'Another comment',
+        },
+      });
+
+      mockedToISOString.mockRestore();
+    });
+  });
+});
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.ts
new file mode 100644
index 0000000000000..343a94e52711f
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/api.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 {
+  ExternalServiceIncidentResponse,
+  ExternalServiceApi,
+  Incident,
+  PushToServiceApiHandlerArgs,
+  PushToServiceResponse,
+} from './types';
+
+const pushToServiceHandler = async ({
+  externalService,
+  params,
+}: PushToServiceApiHandlerArgs): Promise<ExternalServiceIncidentResponse> => {
+  const { comments } = params;
+  let res: PushToServiceResponse;
+  const { externalId, ...rest } = params.incident;
+  const incident: Incident = rest;
+
+  if (externalId != null) {
+    res = await externalService.updateRecord({
+      incidentId: externalId,
+      incident,
+    });
+  } else {
+    res = await externalService.createRecord({ incident });
+  }
+
+  const createdDate = new Date().toISOString();
+
+  if (comments && Array.isArray(comments) && comments.length > 0) {
+    res.comments = [];
+    for (const currentComment of comments) {
+      const comment = await externalService.createComment({
+        incidentId: res.id,
+        comment: currentComment,
+        createdDate,
+      });
+
+      res.comments = [
+        ...(res.comments ?? []),
+        {
+          commentId: comment.commentId,
+          pushedDate: comment.pushedDate,
+        },
+      ];
+    }
+  }
+
+  return res;
+};
+
+export const api: ExternalServiceApi = {
+  pushToService: pushToServiceHandler,
+};
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.test.ts
new file mode 100644
index 0000000000000..c2974ec28486c
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.test.ts
@@ -0,0 +1,90 @@
+/*
+ * 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 { getBodyForEventAction } from './helpers';
+import { mappings } from './mocks';
+
+describe('Create Record Mapping', () => {
+  const appId = '45678';
+
+  test('it maps successfully', () => {
+    const params = {
+      alertId: 'al123',
+      ruleName: 'Rule Name',
+      severity: 'Critical',
+      caseName: 'Case Name',
+      caseId: 'es3456789',
+      description: 'case desc',
+      externalId: null,
+    };
+
+    const data = getBodyForEventAction(appId, mappings, params);
+    expect(data.applicationId).toEqual(appId);
+    expect(data.id).not.toBeDefined();
+    expect(data.values?.[mappings.alertIdConfig?.id ?? 0]).toEqual(params.alertId);
+    expect(data.values?.[mappings.ruleNameConfig.id]).toEqual(params.ruleName);
+    expect(data.values?.[mappings.caseNameConfig?.id ?? 0]).toEqual(params.caseName);
+    expect(data.values?.[mappings.caseIdConfig?.id ?? 0]).toEqual(params.caseId);
+    expect(data.values?.[mappings?.severityConfig?.id ?? 0]).toEqual(params.severity);
+    expect(data.values?.[mappings?.descriptionConfig?.id ?? 0]).toEqual(params.description);
+  });
+
+  test('it contains the id if defined', () => {
+    const params = {
+      alertId: 'al123',
+      ruleName: 'Rule Name',
+      severity: 'Critical',
+      caseName: 'Case Name',
+      caseId: 'es3456789',
+      description: 'case desc',
+      externalId: null,
+    };
+    const data = getBodyForEventAction(appId, mappings, params, '123');
+    expect(data.id).toEqual('123');
+  });
+
+  test('it does not includes null mappings', () => {
+    const params = {
+      alertId: 'al123',
+      ruleName: 'Rule Name',
+      severity: 'Critical',
+      caseName: 'Case Name',
+      caseId: 'es3456789',
+      description: 'case desc',
+      externalId: null,
+    };
+
+    // @ts-expect-error
+    const data = getBodyForEventAction(appId, { ...mappings, test: null }, params);
+    expect(data.values?.test).not.toBeDefined();
+  });
+
+  test('it converts a numeric values correctly', () => {
+    const params = {
+      alertId: 'thisIsNotANumber',
+      ruleName: 'Rule Name',
+      severity: 'Critical',
+      caseName: 'Case Name',
+      caseId: '123',
+      description: 'case desc',
+      externalId: null,
+    };
+
+    const data = getBodyForEventAction(
+      appId,
+      {
+        ...mappings,
+        caseIdConfig: { ...mappings.caseIdConfig, fieldType: 'numeric' },
+        alertIdConfig: { ...mappings.alertIdConfig, fieldType: 'numeric' },
+      },
+      params
+    );
+
+    expect(data.values?.[mappings.alertIdConfig?.id ?? 0]).toBe(0);
+    expect(data.values?.[mappings.caseIdConfig?.id ?? 0]).toBe(123);
+  });
+});
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.ts
new file mode 100644
index 0000000000000..13b2df1c97f16
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/helpers.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 { CreateRecordParams, Incident, SwimlaneRecordPayload, MappingConfigType } from './types';
+
+type ConfigMapping = Omit<MappingConfigType, 'commentsConfig'>;
+
+const mappingKeysToIncidentKeys: Record<keyof ConfigMapping, keyof Incident> = {
+  ruleNameConfig: 'ruleName',
+  alertIdConfig: 'alertId',
+  caseIdConfig: 'caseId',
+  caseNameConfig: 'caseName',
+  severityConfig: 'severity',
+  descriptionConfig: 'description',
+};
+
+export const getBodyForEventAction = (
+  applicationId: string,
+  mappingConfig: MappingConfigType,
+  params: CreateRecordParams['incident'],
+  incidentId?: string
+): SwimlaneRecordPayload => {
+  const data: SwimlaneRecordPayload = {
+    applicationId,
+    ...(incidentId ? { id: incidentId } : {}),
+    values: {},
+  };
+
+  return (Object.keys(mappingConfig) as Array<keyof ConfigMapping>).reduce((acc, key) => {
+    const fieldMap = mappingConfig[key];
+
+    if (!fieldMap) {
+      return acc;
+    }
+
+    const { id, fieldType } = fieldMap;
+    const paramName = mappingKeysToIncidentKeys[key];
+    const value = params[paramName];
+
+    if (value) {
+      switch (fieldType) {
+        case 'numeric': {
+          const number = Number(value);
+          return { ...acc, values: { ...acc.values, [id]: isNaN(number) ? 0 : number } };
+        }
+        default: {
+          return { ...acc, values: { ...acc.values, [id]: value } };
+        }
+      }
+    }
+
+    return acc;
+  }, data);
+};
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/index.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/index.ts
new file mode 100644
index 0000000000000..de5010436b6b3
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/index.ts
@@ -0,0 +1,116 @@
+/*
+ * 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 { curry } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import { schema } from '@kbn/config-schema';
+import { Logger } from '@kbn/logging';
+import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../../types';
+import { ActionsConfigurationUtilities } from '../../actions_config';
+import {
+  SwimlaneExecutorResultData,
+  SwimlanePublicConfigurationType,
+  SwimlaneSecretConfigurationType,
+  ExecutorParams,
+  ExecutorSubActionPushParams,
+} from './types';
+import { validate } from './validators';
+import {
+  ExecutorParamsSchema,
+  SwimlaneSecretsConfiguration,
+  SwimlaneServiceConfiguration,
+} from './schema';
+import { createExternalService } from './service';
+import { api } from './api';
+
+interface GetActionTypeParams {
+  logger: Logger;
+  configurationUtilities: ActionsConfigurationUtilities;
+}
+
+const supportedSubActions: string[] = ['pushToService'];
+
+// action type definition
+export function getActionType(
+  params: GetActionTypeParams
+): ActionType<
+  SwimlanePublicConfigurationType,
+  SwimlaneSecretConfigurationType,
+  ExecutorParams,
+  SwimlaneExecutorResultData | {}
+> {
+  const { logger, configurationUtilities } = params;
+
+  return {
+    id: '.swimlane',
+    minimumLicenseRequired: 'gold',
+    name: i18n.translate('xpack.actions.builtin.swimlaneTitle', {
+      defaultMessage: 'Swimlane',
+    }),
+    validate: {
+      config: schema.object(SwimlaneServiceConfiguration, {
+        validate: curry(validate.config)(configurationUtilities),
+      }),
+      secrets: schema.object(SwimlaneSecretsConfiguration, {
+        validate: curry(validate.secrets)(configurationUtilities),
+      }),
+      params: ExecutorParamsSchema,
+    },
+    executor: curry(executor)({ logger, configurationUtilities }),
+  };
+}
+
+async function executor(
+  {
+    logger,
+    configurationUtilities,
+  }: { logger: Logger; configurationUtilities: ActionsConfigurationUtilities },
+  execOptions: ActionTypeExecutorOptions<
+    SwimlanePublicConfigurationType,
+    SwimlaneSecretConfigurationType,
+    ExecutorParams
+  >
+): Promise<ActionTypeExecutorResult<SwimlaneExecutorResultData | {}>> {
+  const { actionId, config, params, secrets } = execOptions;
+  const { subAction, subActionParams } = params as ExecutorParams;
+  let data: SwimlaneExecutorResultData | null = null;
+
+  const externalService = createExternalService(
+    {
+      config,
+      secrets,
+    },
+    logger,
+    configurationUtilities
+  );
+
+  if (!api[subAction]) {
+    const errorMessage = `[Action][ExternalService] -> [Swimlane] Unsupported subAction type ${subAction}.`;
+    logger.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+
+  if (!supportedSubActions.includes(subAction)) {
+    const errorMessage = `[Action][ExternalService] -> [Swimlane] subAction ${subAction} not implemented.`;
+    logger.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+
+  if (subAction === 'pushToService') {
+    const pushToServiceParams = subActionParams as ExecutorSubActionPushParams;
+
+    data = await api.pushToService({
+      externalService,
+      params: pushToServiceParams,
+      logger,
+    });
+
+    logger.debug(`response push to service for incident id: ${data.id}`);
+  }
+
+  return { status: 'ok', data: data ?? {}, actionId };
+}
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/mocks.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/mocks.ts
new file mode 100644
index 0000000000000..f9931049d81c2
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/mocks.ts
@@ -0,0 +1,124 @@
+/*
+ * 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 { ExecutorSubActionPushParams, ExternalService, PushToServiceApiParams } from './types';
+
+export const applicationFields = [
+  {
+    id: 'adnlas',
+    name: 'Severity',
+    key: 'severity',
+    fieldType: 'text',
+  },
+  {
+    id: 'adnfls',
+    name: 'Rule Name',
+    key: 'rule-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6sst',
+    name: 'Case Id',
+    key: 'case-id-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6fst',
+    name: 'Case Name',
+    key: 'case-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6fdf',
+    name: 'Comments',
+    key: 'comments',
+    fieldType: 'notes',
+  },
+  {
+    id: 'a6fde',
+    name: 'Description',
+    key: 'description',
+    fieldType: 'text',
+  },
+  {
+    id: 'dfnkls',
+    name: 'Alert ID',
+    key: 'alert-id',
+    fieldType: 'text',
+  },
+];
+
+export const mappings = {
+  severityConfig: applicationFields[0],
+  ruleNameConfig: applicationFields[1],
+  caseIdConfig: applicationFields[2],
+  caseNameConfig: applicationFields[3],
+  commentsConfig: applicationFields[4],
+  descriptionConfig: applicationFields[5],
+  alertIdConfig: applicationFields[6],
+};
+
+export const getApplicationResponse = { fields: applicationFields };
+
+export const recordResponseCreate = {
+  id: '123456',
+  title: 'neato',
+  url: 'swimlane.com',
+  pushedDate: '2021-06-01T17:29:51.092Z',
+};
+
+export const recordResponseUpdate = {
+  id: '98765',
+  title: 'not neato',
+  url: 'laneswim.com',
+  pushedDate: '2021-06-01T17:29:51.092Z',
+};
+
+export const commentResponse = {
+  commentId: '123456',
+  pushedDate: '2021-06-01T17:29:51.092Z',
+};
+
+const createMock = (): jest.Mocked<ExternalService> => {
+  return {
+    createComment: jest.fn().mockImplementation(() => Promise.resolve(commentResponse)),
+    createRecord: jest.fn().mockImplementation(() => Promise.resolve(recordResponseCreate)),
+    updateRecord: jest.fn().mockImplementation(() => Promise.resolve(recordResponseUpdate)),
+  };
+};
+
+const externalServiceMock = {
+  create: createMock,
+};
+
+const executorParams: ExecutorSubActionPushParams = {
+  incident: {
+    ruleName: 'rule name',
+    alertId: '123456',
+    caseName: 'case name',
+    severity: 'critical',
+    caseId: '123456',
+    description: 'case desc',
+    externalId: 'incident-3',
+  },
+  comments: [
+    {
+      commentId: 'case-comment-1',
+      comment: 'A comment',
+    },
+    {
+      commentId: 'case-comment-2',
+      comment: 'Another comment',
+    },
+  ],
+};
+
+const apiParams: PushToServiceApiParams = {
+  ...executorParams,
+};
+
+export { externalServiceMock, executorParams, apiParams };
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/schema.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/schema.ts
new file mode 100644
index 0000000000000..7f4bdc8ca6c0d
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/schema.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+export const ConfigMap = {
+  id: schema.string(),
+  key: schema.string(),
+  name: schema.string(),
+  fieldType: schema.string(),
+};
+
+export const ConfigMapSchema = schema.object(ConfigMap);
+
+export const ConfigMapping = {
+  ruleNameConfig: schema.nullable(ConfigMapSchema),
+  alertIdConfig: schema.nullable(ConfigMapSchema),
+  caseIdConfig: schema.nullable(ConfigMapSchema),
+  caseNameConfig: schema.nullable(ConfigMapSchema),
+  commentsConfig: schema.nullable(ConfigMapSchema),
+  severityConfig: schema.nullable(ConfigMapSchema),
+  descriptionConfig: schema.nullable(ConfigMapSchema),
+};
+
+export const ConfigMappingSchema = schema.object(ConfigMapping);
+
+export const SwimlaneServiceConfiguration = {
+  apiUrl: schema.string(),
+  appId: schema.string(),
+  connectorType: schema.string(),
+  mappings: ConfigMappingSchema,
+};
+
+export const SwimlaneServiceConfigurationSchema = schema.object(SwimlaneServiceConfiguration);
+
+export const SwimlaneSecretsConfiguration = {
+  apiToken: schema.string(),
+};
+
+export const SwimlaneSecretsConfigurationSchema = schema.object(SwimlaneSecretsConfiguration);
+
+const SwimlaneFields = {
+  alertId: schema.nullable(schema.string()),
+  ruleName: schema.nullable(schema.string()),
+  caseId: schema.nullable(schema.string()),
+  caseName: schema.nullable(schema.string()),
+  severity: schema.nullable(schema.string()),
+  description: schema.nullable(schema.string()),
+};
+
+export const ExecutorSubActionPushParamsSchema = schema.object({
+  incident: schema.object({
+    ...SwimlaneFields,
+    externalId: schema.nullable(schema.string()),
+  }),
+  comments: schema.nullable(
+    schema.arrayOf(
+      schema.object({
+        comment: schema.string(),
+        commentId: schema.string(),
+      })
+    )
+  ),
+});
+
+export const ExecutorParamsSchema = schema.oneOf([
+  schema.object({
+    subAction: schema.literal('pushToService'),
+    subActionParams: ExecutorSubActionPushParamsSchema,
+  }),
+]);
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
new file mode 100644
index 0000000000000..77f4686f8acd0
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
@@ -0,0 +1,434 @@
+/*
+ * 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 axios from 'axios';
+
+import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '../../../../../../src/core/server';
+import { actionsConfigMock } from '../../actions_config.mock';
+import * as utils from '../lib/axios_utils';
+import { createExternalService } from './service';
+import { mappings } from './mocks';
+import { ExternalService } from './types';
+
+const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
+
+jest.mock('axios');
+jest.mock('../lib/axios_utils', () => {
+  const originalUtils = jest.requireActual('../lib/axios_utils');
+  return {
+    ...originalUtils,
+    request: jest.fn(),
+  };
+});
+
+axios.create = jest.fn(() => axios);
+const requestMock = utils.request as jest.Mock;
+const configurationUtilities = actionsConfigMock.create();
+
+describe('Swimlane Service', () => {
+  let service: ExternalService;
+  const config = {
+    apiUrl: 'https://test.swimlane.com/',
+    appId: 'bcq16kdTbz5jlwM6h',
+    connectorType: 'all',
+    mappings,
+  };
+  const apiToken = 'token';
+
+  const headers = {
+    'Content-Type': 'application/json',
+    'Private-Token': apiToken,
+  };
+
+  const incident = {
+    ruleName: 'Rule Name',
+    caseId: 'Case Id',
+    caseName: 'Case Name',
+    severity: 'Severity',
+    externalId: null,
+    description: 'Description',
+    alertId: 'Alert Id',
+  };
+
+  const url = config.apiUrl.slice(0, -1);
+
+  beforeAll(() => {
+    service = createExternalService(
+      {
+        // The trailing slash at the end of the url is intended.
+        // All API calls need to have the trailing slash removed.
+        config,
+        secrets: { apiToken },
+      },
+      logger,
+      configurationUtilities
+    );
+  });
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('createExternalService', () => {
+    test('throws without url', () => {
+      expect(() =>
+        createExternalService(
+          {
+            config: {
+              // @ts-ignore
+              apiUrl: null,
+              appId: '99999',
+              mappings,
+            },
+            secrets: { apiToken },
+          },
+          logger,
+          configurationUtilities
+        )
+      ).toThrow();
+    });
+
+    test('throws without app id', () => {
+      expect(() =>
+        createExternalService(
+          {
+            config: {
+              apiUrl: 'test.com',
+              // @ts-ignore
+              appId: null,
+            },
+            secrets: { apiToken },
+          },
+          logger,
+          configurationUtilities
+        )
+      ).toThrow();
+    });
+
+    test('throws without mappings', () => {
+      expect(() =>
+        createExternalService(
+          {
+            config: {
+              apiUrl: 'test.com',
+              appId: '987987',
+              // @ts-ignore
+              mappings: null,
+            },
+            secrets: { apiToken },
+          },
+          logger,
+          configurationUtilities
+        )
+      ).toThrow();
+    });
+
+    test('throws without api token', () => {
+      expect(() => {
+        return createExternalService(
+          {
+            config: { apiUrl: 'test.com', appId: '78978', mappings, connectorType: 'all' },
+            secrets: {
+              // @ts-ignore
+              apiToken: null,
+            },
+          },
+          logger,
+          configurationUtilities
+        );
+      }).toThrow();
+    });
+  });
+
+  describe('createRecord', () => {
+    const data = {
+      id: '123',
+      name: 'title',
+      createdDate: '2021-06-01T17:29:51.092Z',
+    };
+
+    test('it creates a record correctly', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      const res = await service.createRecord({
+        incident,
+      });
+
+      expect(res).toEqual({
+        id: '123',
+        title: 'title',
+        pushedDate: '2021-06-01T17:29:51.092Z',
+        url: `${url}/record/${config.appId}/123`,
+      });
+    });
+
+    test('it should call request with correct arguments', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      await service.createRecord({
+        incident,
+      });
+
+      expect(requestMock).toHaveBeenCalledWith({
+        axios,
+        logger,
+        headers,
+        data: {
+          applicationId: config.appId,
+          values: {
+            [mappings.ruleNameConfig.id]: 'Rule Name',
+            [mappings.caseNameConfig.id]: 'Case Name',
+            [mappings.caseIdConfig.id]: 'Case Id',
+            [mappings.severityConfig.id]: 'Severity',
+            [mappings.descriptionConfig.id]: 'Description',
+            [mappings.alertIdConfig.id]: 'Alert Id',
+          },
+        },
+        url: `${url}/api/app/${config.appId}/record`,
+        method: 'post',
+        configurationUtilities,
+      });
+    });
+
+    test('it should throw an error', async () => {
+      requestMock.mockImplementation(() => {
+        throw new Error('An error has occurred');
+      });
+
+      await expect(service.createRecord({ incident })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+  });
+
+  describe('updateRecord', () => {
+    const data = {
+      id: '123',
+      name: 'title',
+      modifiedDate: '2021-06-01T17:29:51.092Z',
+    };
+    const incidentId = '123';
+
+    test('it updates a record correctly', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      const res = await service.updateRecord({
+        incident,
+        incidentId,
+      });
+
+      expect(res).toEqual({
+        id: '123',
+        title: 'title',
+        pushedDate: '2021-06-01T17:29:51.092Z',
+        url: `${url}/record/${config.appId}/123`,
+      });
+    });
+
+    test('it should call request with correct arguments', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      await service.updateRecord({
+        incident,
+        incidentId,
+      });
+
+      expect(requestMock).toHaveBeenCalledWith({
+        axios,
+        logger,
+        headers,
+        data: {
+          applicationId: config.appId,
+          id: incidentId,
+          values: {
+            [mappings.ruleNameConfig.id]: 'Rule Name',
+            [mappings.caseNameConfig.id]: 'Case Name',
+            [mappings.caseIdConfig.id]: 'Case Id',
+            [mappings.severityConfig.id]: 'Severity',
+            [mappings.descriptionConfig.id]: 'Description',
+            [mappings.alertIdConfig.id]: 'Alert Id',
+          },
+        },
+        url: `${url}/api/app/${config.appId}/record/${incidentId}`,
+        method: 'patch',
+        configurationUtilities,
+      });
+    });
+
+    test('it should throw an error', async () => {
+      requestMock.mockImplementation(() => {
+        throw new Error('An error has occurred');
+      });
+
+      await expect(service.updateRecord({ incident, incidentId })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to update record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+  });
+
+  describe('createComment', () => {
+    const data = {
+      id: '123',
+      name: 'title',
+      modifiedDate: '2021-06-01T17:29:51.092Z',
+    };
+    const incidentId = '123';
+    const comment = { commentId: '456', comment: 'A comment' };
+    const createdDate = '2021-06-01T17:29:51.092Z';
+
+    test('it updates a record correctly', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      const res = await service.createComment({
+        comment,
+        incidentId,
+        createdDate,
+      });
+
+      expect(res).toEqual({
+        commentId: '456',
+        pushedDate: '2021-06-01T17:29:51.092Z',
+      });
+    });
+
+    test('it should call request with correct arguments', async () => {
+      requestMock.mockImplementation(() => ({
+        data,
+      }));
+
+      await service.createComment({
+        comment,
+        incidentId,
+        createdDate,
+      });
+
+      expect(requestMock).toHaveBeenCalledWith({
+        axios,
+        logger,
+        headers,
+        data: {
+          createdDate,
+          fieldId: mappings.commentsConfig.id,
+          isRichText: true,
+          message: comment.comment,
+        },
+        url: `${url}/api/app/${config.appId}/record/${incidentId}/${mappings.commentsConfig.id}/comment`,
+        method: 'post',
+        configurationUtilities,
+      });
+    });
+
+    test('it should throw an error', async () => {
+      requestMock.mockImplementation(() => {
+        throw new Error('An error has occurred');
+      });
+
+      await expect(service.createComment({ comment, incidentId, createdDate })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create comment in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+  });
+
+  describe('error messages', () => {
+    const errorResponse = { ErrorCode: '1', Argument: 'Invalid field' };
+
+    test('it contains the response error', async () => {
+      requestMock.mockImplementation(() => {
+        const error = new Error('An error has occurred');
+        // @ts-ignore
+        error.response = { data: errorResponse };
+        throw error;
+      });
+
+      await expect(
+        service.createRecord({
+          incident,
+        })
+      ).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: Invalid field (1)`
+      );
+    });
+
+    test('it shows an empty string for reason if the ErrorCode is undefined', async () => {
+      requestMock.mockImplementation(() => {
+        const error = new Error('An error has occurred');
+        // @ts-ignore
+        error.response = { data: { ErrorCode: '1' } };
+        throw error;
+      });
+
+      await expect(
+        service.createRecord({
+          incident,
+        })
+      ).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+
+    test('it shows an empty string for reason if the Argument is undefined', async () => {
+      requestMock.mockImplementation(() => {
+        const error = new Error('An error has occurred');
+        // @ts-ignore
+        error.response = { data: { Argument: 'Invalid field' } };
+        throw error;
+      });
+
+      await expect(
+        service.createRecord({
+          incident,
+        })
+      ).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+
+    test('it shows an empty string for reason if data is undefined', async () => {
+      requestMock.mockImplementation(() => {
+        const error = new Error('An error has occurred');
+        // @ts-ignore
+        error.response = {};
+        throw error;
+      });
+
+      await expect(
+        service.createRecord({
+          incident,
+        })
+      ).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
+      );
+    });
+
+    test('it shows the status code', async () => {
+      requestMock.mockImplementation(() => {
+        const error = new Error('An error has occurred');
+        // @ts-ignore
+        error.response = { data: errorResponse, status: 400 };
+        throw error;
+      });
+
+      await expect(
+        service.createRecord({
+          incident,
+        })
+      ).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 400. Error: An error has occurred. Reason: Invalid field (1)`
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
new file mode 100644
index 0000000000000..f68d22121dbcc
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
@@ -0,0 +1,196 @@
+/*
+ * 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 { Logger } from '@kbn/logging';
+import axios from 'axios';
+
+import { ActionsConfigurationUtilities } from '../../actions_config';
+import { getErrorMessage, request } from '../lib/axios_utils';
+import { getBodyForEventAction } from './helpers';
+import {
+  CreateCommentParams,
+  CreateRecordParams,
+  ExternalService,
+  ExternalServiceCredentials,
+  ExternalServiceIncidentResponse,
+  MappingConfigType,
+  ResponseError,
+  SwimlanePublicConfigurationType,
+  SwimlaneRecordPayload,
+  SwimlaneSecretConfigurationType,
+  UpdateRecordParams,
+} from './types';
+import * as i18n from './translations';
+
+const createErrorMessage = (errorResponse: ResponseError | null | undefined): string => {
+  if (errorResponse == null) {
+    return 'unknown';
+  }
+
+  const { ErrorCode, Argument } = errorResponse;
+  return Argument != null && ErrorCode != null ? `${Argument} (${ErrorCode})` : 'unknown';
+};
+
+export const createExternalService = (
+  { config, secrets }: ExternalServiceCredentials,
+  logger: Logger,
+  configurationUtilities: ActionsConfigurationUtilities
+): ExternalService => {
+  const { apiUrl: url, appId, mappings } = config as SwimlanePublicConfigurationType;
+  const { apiToken } = secrets as SwimlaneSecretConfigurationType;
+
+  const axiosInstance = axios.create();
+
+  if (!url || !appId || !apiToken || !mappings) {
+    throw Error(`[Action]${i18n.NAME}: Wrong configuration.`);
+  }
+
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'Private-Token': `${secrets.apiToken}`,
+  };
+
+  const urlWithoutTrailingSlash = url.endsWith('/') ? url.slice(0, -1) : url;
+  const apiUrl = urlWithoutTrailingSlash.endsWith('api')
+    ? urlWithoutTrailingSlash
+    : urlWithoutTrailingSlash + '/api';
+
+  const getPostRecordUrl = (id: string) => `${apiUrl}/app/${id}/record`;
+
+  const getPostRecordIdUrl = (id: string, recordId: string) =>
+    `${getPostRecordUrl(id)}/${recordId}`;
+
+  const getRecordIdUrl = (id: string, recordId: string) =>
+    `${urlWithoutTrailingSlash}/record/${id}/${recordId}`;
+
+  const getPostCommentUrl = (id: string, recordId: string, commentFieldId: string) =>
+    `${getPostRecordIdUrl(id, recordId)}/${commentFieldId}/comment`;
+
+  const getCommentFieldId = (fieldMappings: MappingConfigType): string | null =>
+    fieldMappings.commentsConfig?.id || null;
+
+  const createRecord = async (
+    params: CreateRecordParams
+  ): Promise<ExternalServiceIncidentResponse> => {
+    try {
+      const mappingConfig = mappings as MappingConfigType;
+      const data = getBodyForEventAction(appId, mappingConfig, params.incident);
+
+      const res = await request({
+        axios: axiosInstance,
+        configurationUtilities,
+        data,
+        headers,
+        logger,
+        method: 'post',
+        url: getPostRecordUrl(appId),
+      });
+      return {
+        id: res.data.id,
+        title: res.data.name,
+        url: getRecordIdUrl(appId, res.data.id),
+        pushedDate: new Date(res.data.createdDate).toISOString(),
+      };
+    } catch (error) {
+      throw new Error(
+        getErrorMessage(
+          i18n.NAME,
+          `Unable to create record in application with id ${appId}. Status: ${
+            error.response?.status ?? 500
+          }. Error: ${error.message}. Reason: ${createErrorMessage(error.response?.data)}`
+        )
+      );
+    }
+  };
+
+  const updateRecord = async (
+    params: UpdateRecordParams
+  ): Promise<ExternalServiceIncidentResponse> => {
+    try {
+      const mappingConfig = mappings as MappingConfigType;
+      const data = getBodyForEventAction(appId, mappingConfig, params.incident, params.incidentId);
+
+      const res = await request<SwimlaneRecordPayload>({
+        axios: axiosInstance,
+        configurationUtilities,
+        data,
+        headers,
+        logger,
+        method: 'patch',
+        url: getPostRecordIdUrl(appId, params.incidentId),
+      });
+
+      return {
+        id: res.data.id,
+        title: res.data.name,
+        url: getRecordIdUrl(appId, params.incidentId),
+        pushedDate: new Date(res.data.modifiedDate).toISOString(),
+      };
+    } catch (error) {
+      throw new Error(
+        getErrorMessage(
+          i18n.NAME,
+          `Unable to update record in application with id ${appId}. Status: ${
+            error.response?.status ?? 500
+          }. Error: ${error.message}. Reason: ${createErrorMessage(error.response?.data)}`
+        )
+      );
+    }
+  };
+
+  const createComment = async ({ incidentId, comment, createdDate }: CreateCommentParams) => {
+    try {
+      const mappingConfig = mappings as MappingConfigType;
+      const fieldId = getCommentFieldId(mappingConfig);
+
+      if (fieldId == null) {
+        throw new Error(`No comment field mapped in ${i18n.NAME} connector`);
+      }
+
+      const data = {
+        createdDate,
+        fieldId,
+        isRichText: true,
+        message: comment.comment,
+      };
+
+      await request({
+        axios: axiosInstance,
+        configurationUtilities,
+        data,
+        headers,
+        logger,
+        method: 'post',
+        url: getPostCommentUrl(appId, incidentId, fieldId),
+      });
+
+      /**
+       * Swimlane response does not contain any data.
+       * We cannot get an externalCommentId
+       */
+      return {
+        commentId: comment.commentId,
+        pushedDate: createdDate,
+      };
+    } catch (error) {
+      throw new Error(
+        getErrorMessage(
+          i18n.NAME,
+          `Unable to create comment in application with id ${appId}. Status: ${
+            error.response?.status ?? 500
+          }. Error: ${error.message}. Reason: ${createErrorMessage(error.response?.data)}`
+        )
+      );
+    }
+  };
+
+  return {
+    createComment,
+    createRecord,
+    updateRecord,
+  };
+};
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/translations.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/translations.ts
new file mode 100644
index 0000000000000..671cf224448f6
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/translations.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const NAME = i18n.translate('xpack.actions.builtin.case.swimlaneTitle', {
+  defaultMessage: 'Swimlane',
+});
+
+export const ALLOWED_HOSTS_ERROR = (message: string) =>
+  i18n.translate('xpack.actions.builtin.swimlane.configuration.apiAllowedHostsError', {
+    defaultMessage: 'error configuring connector action: {message}',
+    values: {
+      message,
+    },
+  });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/types.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/types.ts
new file mode 100644
index 0000000000000..5cb3b10989621
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/types.ts
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/logging';
+import {
+  ConfigMappingSchema,
+  ExecutorParamsSchema,
+  ExecutorSubActionPushParamsSchema,
+  SwimlaneSecretsConfigurationSchema,
+  SwimlaneServiceConfigurationSchema,
+} from './schema';
+import { ActionsConfigurationUtilities } from '../../actions_config';
+
+export type SwimlanePublicConfigurationType = TypeOf<typeof SwimlaneServiceConfigurationSchema>;
+export type SwimlaneSecretConfigurationType = TypeOf<typeof SwimlaneSecretsConfigurationSchema>;
+
+export type MappingConfigType = TypeOf<typeof ConfigMappingSchema>;
+export type ExecutorParams = TypeOf<typeof ExecutorParamsSchema>;
+export type ExecutorSubActionPushParams = TypeOf<typeof ExecutorSubActionPushParamsSchema>;
+
+export interface ExternalServiceCredentials {
+  config: SwimlanePublicConfigurationType;
+  secrets: SwimlaneSecretConfigurationType;
+}
+
+export interface ExternalServiceValidation {
+  config: (configurationUtilities: ActionsConfigurationUtilities, configObject: any) => void;
+  secrets: (configurationUtilities: ActionsConfigurationUtilities, secrets: any) => void;
+}
+
+export interface CreateRecordParams {
+  incident: Incident;
+}
+export interface UpdateRecordParams extends CreateRecordParams {
+  incidentId: string;
+}
+
+export type PushToServiceApiParams = ExecutorSubActionPushParams;
+export interface PushToServiceApiHandlerArgs extends ExternalServiceApiHandlerArgs {
+  params: PushToServiceApiParams;
+  logger: Logger;
+}
+
+export interface ExternalServiceIncidentResponse {
+  id: string;
+  title: string;
+  url: string;
+  pushedDate: string;
+}
+export interface ExternalServiceCommentResponse {
+  commentId: string;
+  pushedDate: string;
+  externalCommentId?: string;
+}
+
+export interface FieldConfig {
+  id: string;
+  name: string;
+  key: string;
+  fieldType: string;
+}
+
+export interface SwimlaneRecordPayload {
+  applicationId: string;
+  values: SwimlaneDataValues;
+  id?: string;
+}
+
+export interface ExternalService {
+  createComment: (params: CreateCommentParams) => Promise<ExternalServiceCommentResponse>;
+  createRecord: (params: CreateRecordParams) => Promise<ExternalServiceIncidentResponse>;
+  updateRecord: (params: UpdateRecordParams) => Promise<ExternalServiceIncidentResponse>;
+}
+
+export type Incident = Omit<ExecutorSubActionPushParams['incident'], 'externalId'>;
+
+export interface ExternalServiceApiHandlerArgs {
+  externalService: ExternalService;
+}
+
+export interface GetApplicationHandlerArgs {
+  externalService: ExternalService;
+}
+
+export interface PushToServiceResponse extends ExternalServiceIncidentResponse {
+  comments?: ExternalServiceCommentResponse[];
+}
+
+export interface ExternalServiceApi {
+  pushToService: (args: PushToServiceApiHandlerArgs) => Promise<ExternalServiceIncidentResponse>;
+}
+
+export type SwimlaneExecutorResultData = ExternalServiceIncidentResponse;
+export type SwimlaneDataValues = Record<string, string | number>;
+export interface SwimlaneComment {
+  fieldId: string;
+  message: string | number;
+  createdDate: string;
+  isRichText: boolean;
+}
+export type SwimlaneDataComments = Record<string, SwimlaneComment[]>;
+
+export interface SimpleComment {
+  comment: SwimlaneComment['message'];
+  commentId: string;
+}
+
+export interface CreateCommentParams {
+  incidentId: string;
+  comment: SimpleComment;
+  createdDate: string;
+}
+
+export interface ResponseError {
+  ErrorCode: number;
+  Argument: string;
+}
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/validators.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/validators.ts
new file mode 100644
index 0000000000000..1972cd7e6af0b
--- /dev/null
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/validators.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 { ActionsConfigurationUtilities } from '../../actions_config';
+import { ExternalServiceValidation, SwimlanePublicConfigurationType } from './types';
+import * as i18n from './translations';
+
+export const validateCommonConfig = (
+  configurationUtilities: ActionsConfigurationUtilities,
+  configObject: SwimlanePublicConfigurationType
+) => {
+  try {
+    configurationUtilities.ensureUriAllowed(configObject.apiUrl);
+  } catch (allowedListError) {
+    return i18n.ALLOWED_HOSTS_ERROR(allowedListError.message);
+  }
+};
+
+export const validateCommonSecrets = () => {};
+
+export const validate: ExternalServiceValidation = {
+  config: validateCommonConfig,
+  secrets: validateCommonSecrets,
+};
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index bcfc91d673bcc..230ed826cb108 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -47,7 +47,6 @@ export type {
   TeamsActionTypeId,
   TeamsActionParams,
 } from './builtin_action_types';
-
 export type { PluginSetupContract, PluginStartContract } from './plugin';
 
 export { asSavedObjectExecutionSource, asHttpRequestExecutionSource } from './lib';
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index a191728a20489..7c05d16923b9d 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -22,7 +22,7 @@ export { ActionTypeExecutorResult } from '../common';
 export { GetFieldsByIssueTypeResponse as JiraGetFieldsResponse } from './builtin_action_types/jira/types';
 export { GetCommonFieldsResponse as ServiceNowGetFieldsResponse } from './builtin_action_types/servicenow/types';
 export { GetCommonFieldsResponse as ResilientGetFieldsResponse } from './builtin_action_types/resilient/types';
-
+export { SwimlanePublicConfigurationType } from './builtin_action_types/swimlane/types';
 export type WithoutQueryAndParams<T> = Pick<T, Exclude<keyof T, 'query' | 'params'>>;
 export type GetServicesFunction = (request: KibanaRequest) => Services;
 export type ActionTypeRegistryContract = PublicMethodsOf<ActionTypeRegistry>;
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index 06248e1fa95a8..80e0c19092c78 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -18,6 +18,7 @@ const byTypeSchema: MakeSchemaFrom<ActionsUsage>['count_by_type'] = {
   __email: { type: 'long' },
   __index: { type: 'long' },
   __pagerduty: { type: 'long' },
+  __swimlane: { type: 'long' },
   '__server-log': { type: 'long' },
   __slack: { type: 'long' },
   __webhook: { type: 'long' },
diff --git a/x-pack/plugins/cases/README.md b/x-pack/plugins/cases/README.md
index a1660911567da..cfff8c79ee2d4 100644
--- a/x-pack/plugins/cases/README.md
+++ b/x-pack/plugins/cases/README.md
@@ -215,7 +215,7 @@ This action type has no `secrets` properties.
 | -------- | ------------------------------------------------------------------------------------------------- | ----------------- |
 | id       | ID of the connector used for pushing case updates to external systems.                            | string            |
 | name     | The connector name.                                                                               | string            |
-| type     | The type of the connector. Must be one of these: `.servicenow`, `jira`, `.resilient`, and `.none` | string            |
+| type     | The type of the connector. Must be one of these: `.servicenow`, `.servicenow-sir`, `.swimlane`, `jira`, `.resilient`, and `.none` | string            |
 | fields   | Object containing the connector’s fields.                                                         | [fields](#fields) |
 
 #### `fields`
diff --git a/x-pack/plugins/cases/common/api/connectors/index.ts b/x-pack/plugins/cases/common/api/connectors/index.ts
index 2a81396025d9a..cee432b17933b 100644
--- a/x-pack/plugins/cases/common/api/connectors/index.ts
+++ b/x-pack/plugins/cases/common/api/connectors/index.ts
@@ -12,12 +12,14 @@ import { JiraFieldsRT } from './jira';
 import { ResilientFieldsRT } from './resilient';
 import { ServiceNowITSMFieldsRT } from './servicenow_itsm';
 import { ServiceNowSIRFieldsRT } from './servicenow_sir';
+import { SwimlaneFieldsRT } from './swimlane';
 
 export * from './jira';
 export * from './servicenow_itsm';
 export * from './servicenow_sir';
 export * from './resilient';
 export * from './mappings';
+export * from './swimlane';
 
 export type ActionConnector = ActionResult;
 export type ActionTypeConnector = ActionType;
@@ -32,10 +34,11 @@ export const ConnectorFieldsRt = rt.union([
 
 export enum ConnectorTypes {
   jira = '.jira',
+  none = '.none',
   resilient = '.resilient',
   serviceNowITSM = '.servicenow',
   serviceNowSIR = '.servicenow-sir',
-  none = '.none',
+  swimlane = '.swimlane',
 }
 
 export const connectorTypes = Object.values(ConnectorTypes);
@@ -55,6 +58,11 @@ const ConnectorServiceNowITSMTypeFieldsRt = rt.type({
   fields: rt.union([ServiceNowITSMFieldsRT, rt.null]),
 });
 
+const ConnectorSwimlaneTypeFieldsRt = rt.type({
+  type: rt.literal(ConnectorTypes.swimlane),
+  fields: rt.union([SwimlaneFieldsRT, rt.null]),
+});
+
 const ConnectorServiceNowSIRTypeFieldsRt = rt.type({
   type: rt.literal(ConnectorTypes.serviceNowSIR),
   fields: rt.union([ServiceNowSIRFieldsRT, rt.null]),
@@ -67,10 +75,11 @@ const ConnectorNoneTypeFieldsRt = rt.type({
 
 export const ConnectorTypeFieldsRt = rt.union([
   ConnectorJiraTypeFieldsRt,
+  ConnectorNoneTypeFieldsRt,
   ConnectorResillientTypeFieldsRt,
   ConnectorServiceNowITSMTypeFieldsRt,
   ConnectorServiceNowSIRTypeFieldsRt,
-  ConnectorNoneTypeFieldsRt,
+  ConnectorSwimlaneTypeFieldsRt,
 ]);
 
 export const CaseConnectorRt = rt.intersection([
@@ -85,6 +94,7 @@ export type CaseConnector = rt.TypeOf<typeof CaseConnectorRt>;
 export type ConnectorTypeFields = rt.TypeOf<typeof ConnectorTypeFieldsRt>;
 export type ConnectorJiraTypeFields = rt.TypeOf<typeof ConnectorJiraTypeFieldsRt>;
 export type ConnectorResillientTypeFields = rt.TypeOf<typeof ConnectorResillientTypeFieldsRt>;
+export type ConnectorSwimlaneTypeFields = rt.TypeOf<typeof ConnectorSwimlaneTypeFieldsRt>;
 export type ConnectorServiceNowITSMTypeFields = rt.TypeOf<
   typeof ConnectorServiceNowITSMTypeFieldsRt
 >;
diff --git a/x-pack/plugins/cases/common/api/connectors/mappings.ts b/x-pack/plugins/cases/common/api/connectors/mappings.ts
index e0fdd2d7e62dc..8737a6c5a6462 100644
--- a/x-pack/plugins/cases/common/api/connectors/mappings.ts
+++ b/x-pack/plugins/cases/common/api/connectors/mappings.ts
@@ -48,9 +48,6 @@ const ConnectorFieldRt = rt.type({
 
 export type ConnectorField = rt.TypeOf<typeof ConnectorFieldRt>;
 
-const GetFieldsResponseRt = rt.type({
-  defaultMappings: rt.array(ConnectorMappingsAttributesRT),
-  fields: rt.array(ConnectorFieldRt),
-});
+const GetDefaultMappingsResponseRt = rt.array(ConnectorMappingsAttributesRT);
 
-export type GetFieldsResponse = rt.TypeOf<typeof GetFieldsResponseRt>;
+export type GetDefaultMappingsResponse = rt.TypeOf<typeof GetDefaultMappingsResponseRt>;
diff --git a/x-pack/plugins/cases/common/api/connectors/swimlane.ts b/x-pack/plugins/cases/common/api/connectors/swimlane.ts
new file mode 100644
index 0000000000000..bc4d9df9ae6a0
--- /dev/null
+++ b/x-pack/plugins/cases/common/api/connectors/swimlane.ts
@@ -0,0 +1,21 @@
+/*
+ * 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 * as rt from 'io-ts';
+
+// New fields should also be added at: x-pack/plugins/cases/server/connectors/case/schema.ts
+export const SwimlaneFieldsRT = rt.type({
+  caseId: rt.union([rt.string, rt.null]),
+});
+
+export enum SwimlaneConnectorType {
+  All = 'all',
+  Alerts = 'alerts',
+  Cases = 'cases',
+}
+
+export type SwimlaneFieldsType = rt.TypeOf<typeof SwimlaneFieldsRT>;
diff --git a/x-pack/plugins/cases/common/constants.ts b/x-pack/plugins/cases/common/constants.ts
index 317fe1d8ed144..5d7ee47bb8ea0 100644
--- a/x-pack/plugins/cases/common/constants.ts
+++ b/x-pack/plugins/cases/common/constants.ts
@@ -4,6 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { ConnectorTypes } from './api';
+
 export const DEFAULT_DATE_FORMAT = 'dateFormat';
 export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
 
@@ -59,16 +61,12 @@ export const CASE_DETAILS_ALERTS_URL = `${CASE_DETAILS_URL}/alerts`;
 
 export const ACTION_URL = '/api/actions';
 export const ACTION_TYPES_URL = '/api/actions/list_action_types';
-export const SERVICENOW_ITSM_ACTION_TYPE_ID = '.servicenow';
-export const SERVICENOW_SIR_ACTION_TYPE_ID = '.servicenow-sir';
-export const JIRA_ACTION_TYPE_ID = '.jira';
-export const RESILIENT_ACTION_TYPE_ID = '.resilient';
-
 export const SUPPORTED_CONNECTORS = [
-  SERVICENOW_ITSM_ACTION_TYPE_ID,
-  SERVICENOW_SIR_ACTION_TYPE_ID,
-  JIRA_ACTION_TYPE_ID,
-  RESILIENT_ACTION_TYPE_ID,
+  `${ConnectorTypes.serviceNowITSM}`,
+  `${ConnectorTypes.serviceNowSIR}`,
+  `${ConnectorTypes.jira}`,
+  `${ConnectorTypes.resilient}`,
+  `${ConnectorTypes.swimlane}`,
 ];
 
 /**
diff --git a/x-pack/plugins/cases/public/common/shared_imports.ts b/x-pack/plugins/cases/public/common/shared_imports.ts
index 675204076b02a..4641fcfa2167c 100644
--- a/x-pack/plugins/cases/public/common/shared_imports.ts
+++ b/x-pack/plugins/cases/public/common/shared_imports.ts
@@ -24,6 +24,8 @@ export {
   ValidationError,
   ValidationFunc,
   VALIDATION_TYPES,
+  FieldConfig,
+  ValidationConfig,
 } from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 export {
   Field,
diff --git a/x-pack/plugins/cases/public/components/case_view/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
index 55de4d07b13b9..1fafbac50c2b9 100644
--- a/x-pack/plugins/cases/public/components/case_view/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
@@ -608,6 +608,7 @@ describe('CaseView ', () => {
       ).toBe(connectorName);
     });
   });
+
   it('should update connector', async () => {
     const wrapper = mount(
       <TestProviders>
@@ -628,15 +629,19 @@ describe('CaseView ', () => {
 
     wrapper.find('[data-test-subj="connector-edit"] button').simulate('click');
     wrapper.find('button[data-test-subj="dropdown-connectors"]').simulate('click');
-
     wrapper.find('button[data-test-subj="dropdown-connector-resilient-2"]').simulate('click');
 
-    await waitFor(() => wrapper.update());
+    await waitFor(() => {
+      wrapper.update();
+      expect(wrapper.find(`[data-test-subj="connector-fields-resilient"]`).exists()).toBeTruthy();
+    });
+
     wrapper.find(`button[data-test-subj="edit-connectors-submit"]`).first().simulate('click');
 
     await waitFor(() => {
-      const updateObject = updateCaseProperty.mock.calls[0][0];
+      wrapper.update();
       expect(updateCaseProperty).toHaveBeenCalledTimes(1);
+      const updateObject = updateCaseProperty.mock.calls[0][0];
       expect(updateObject.updateKey).toEqual('connector');
       expect(updateObject.updateValue).toEqual({
         id: 'resilient-2',
diff --git a/x-pack/plugins/cases/public/components/case_view/index.tsx b/x-pack/plugins/cases/public/components/case_view/index.tsx
index 05f1c6727b168..9c6e9442c8f56 100644
--- a/x-pack/plugins/cases/public/components/case_view/index.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/index.tsx
@@ -31,17 +31,14 @@ import { useGetCaseUserActions } from '../../containers/use_get_case_user_action
 import { usePushToService } from '../use_push_to_service';
 import { EditConnector } from '../edit_connector';
 import { useConnectors } from '../../containers/configure/use_connectors';
-import {
-  getConnectorById,
-  normalizeActionConnector,
-  getNoneConnector,
-} from '../configure_cases/utils';
+import { normalizeActionConnector, getNoneConnector } from '../configure_cases/utils';
 import { StatusActionButton } from '../status/button';
 import * as i18n from './translations';
 import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../timeline_context';
 import { useTimelineContext } from '../timeline_context/use_timeline_context';
 import { CasesNavigation } from '../links';
 import { OwnerProvider } from '../owner_context';
+import { getConnectorById } from '../utils';
 import { DoesNotExist } from './does_not_exist';
 
 const gutterTimeline = '70px'; // seems to be a timeline reference from the original file
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
index 3ee4bc77cd237..ac43ec05319a0 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
@@ -24,15 +24,11 @@ import { ActionConnectorTableItem } from '../../../../triggers_actions_ui/public
 import { SectionWrapper } from '../wrappers';
 import { Connectors } from './connectors';
 import { ClosureOptions } from './closure_options';
-import {
-  getConnectorById,
-  getNoneConnector,
-  normalizeActionConnector,
-  normalizeCaseConnector,
-} from './utils';
+import { getNoneConnector, normalizeActionConnector, normalizeCaseConnector } from './utils';
 import * as i18n from './translations';
 import { Owner } from '../../types';
 import { OwnerProvider } from '../owner_context';
+import { getConnectorById } from '../utils';
 
 const FormWrapper = styled.div`
   ${({ theme }) => css`
diff --git a/x-pack/plugins/cases/public/components/configure_cases/utils.ts b/x-pack/plugins/cases/public/components/configure_cases/utils.ts
index ade1a5e0c2bba..6597417b5068a 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/utils.ts
+++ b/x-pack/plugins/cases/public/components/configure_cases/utils.ts
@@ -10,10 +10,10 @@ import {
   CaseField,
   ActionType,
   ThirdPartyField,
-  ActionConnector,
   CaseConnector,
   CaseConnectorMapping,
 } from '../../containers/configure/types';
+import { CaseActionConnector } from '../types';
 
 export const setActionTypeToMapping = (
   caseField: CaseField,
@@ -54,13 +54,8 @@ export const getNoneConnector = (): CaseConnector => ({
   fields: null,
 });
 
-export const getConnectorById = (
-  id: string,
-  connectors: ActionConnector[]
-): ActionConnector | null => connectors.find((c) => c.id === id) ?? null;
-
 export const normalizeActionConnector = (
-  actionConnector: ActionConnector,
+  actionConnector: CaseActionConnector,
   fields: CaseConnector['fields'] = null
 ): CaseConnector => {
   const caseConnectorFieldsType = {
@@ -75,6 +70,6 @@ export const normalizeActionConnector = (
 };
 
 export const normalizeCaseConnector = (
-  connectors: ActionConnector[],
+  connectors: CaseActionConnector[],
   caseConnector: CaseConnector
-): ActionConnector | null => connectors.find((c) => c.id === caseConnector.id) ?? null;
+): CaseActionConnector | null => connectors.find((c) => c.id === caseConnector.id) ?? null;
diff --git a/x-pack/plugins/cases/public/components/connector_selector/form.tsx b/x-pack/plugins/cases/public/components/connector_selector/form.tsx
index 210334e93adb8..71a65ae030d9d 100644
--- a/x-pack/plugins/cases/public/components/connector_selector/form.tsx
+++ b/x-pack/plugins/cases/public/components/connector_selector/form.tsx
@@ -8,6 +8,7 @@
 import React, { useCallback } from 'react';
 import { isEmpty } from 'lodash/fp';
 import { EuiFormRow } from '@elastic/eui';
+import styled from 'styled-components';
 
 import { FieldHook, getFieldValidityAndErrorMessage } from '../../common/shared_imports';
 import { ConnectorsDropdown } from '../configure_cases/connectors_dropdown';
@@ -24,6 +25,13 @@ interface ConnectorSelectorProps {
   handleChange?: (newValue: string) => void;
   hideConnectorServiceNowSir?: boolean;
 }
+
+const EuiFormRowWrapper = styled(EuiFormRow)`
+  .euiFormErrorText {
+    display: none;
+  }
+`;
+
 export const ConnectorSelector = ({
   connectors,
   dataTestSubj,
@@ -47,7 +55,7 @@ export const ConnectorSelector = ({
   );
 
   return isEdit ? (
-    <EuiFormRow
+    <EuiFormRowWrapper
       data-test-subj={dataTestSubj}
       describedByIds={idAria ? [idAria] : undefined}
       error={errorMessage}
@@ -65,6 +73,6 @@ export const ConnectorSelector = ({
         onChange={onChange}
         selectedConnector={isEmpty(field.value) ? 'none' : field.value}
       />
-    </EuiFormRow>
+    </EuiFormRowWrapper>
   ) : null;
 };
diff --git a/x-pack/plugins/cases/public/components/connectors/fields_form.tsx b/x-pack/plugins/cases/public/components/connectors/fields_form.tsx
index d71da6f87689d..062695fa41cc2 100644
--- a/x-pack/plugins/cases/public/components/connectors/fields_form.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/fields_form.tsx
@@ -8,7 +8,8 @@
 import React, { memo, Suspense } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 
-import { CaseActionConnector, ConnectorFieldsProps } from './types';
+import { CaseActionConnector } from '../types';
+import { ConnectorFieldsProps } from './types';
 import { getCaseConnectors } from '.';
 import { ConnectorTypeFields } from '../../../common';
 
diff --git a/x-pack/plugins/cases/public/components/connectors/index.ts b/x-pack/plugins/cases/public/components/connectors/index.ts
index ad202365ae967..3aa10c56dd8e9 100644
--- a/x-pack/plugins/cases/public/components/connectors/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/index.ts
@@ -8,6 +8,7 @@
 import { CaseConnectorsRegistry } from './types';
 import { createCaseConnectorsRegistry } from './connectors_registry';
 import { getCaseConnector as getJiraCaseConnector } from './jira';
+import { getCaseConnector as getSwimlaneCaseConnector } from './swimlane';
 import { getCaseConnector as getResilientCaseConnector } from './resilient';
 import { getServiceNowITSMCaseConnector, getServiceNowSIRCaseConnector } from './servicenow';
 import {
@@ -15,6 +16,7 @@ import {
   ServiceNowITSMFieldsType,
   ServiceNowSIRFieldsType,
   ResilientFieldsType,
+  SwimlaneFieldsType,
 } from '../../../common';
 
 export { getActionType as getCaseConnectorUi } from './case';
@@ -40,6 +42,7 @@ class CaseConnectors {
       getServiceNowITSMCaseConnector()
     );
     this.caseConnectorsRegistry.register<ServiceNowSIRFieldsType>(getServiceNowSIRCaseConnector());
+    this.caseConnectorsRegistry.register<SwimlaneFieldsType>(getSwimlaneCaseConnector());
   }
 
   registry(): CaseConnectorsRegistry {
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/index.ts b/x-pack/plugins/cases/public/components/connectors/jira/index.ts
index f987d9823af8e..d59d20177c14d 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/index.ts
@@ -8,13 +8,13 @@
 import { lazy } from 'react';
 
 import { CaseConnector } from '../types';
-import { JiraFieldsType } from '../../../../common';
+import { ConnectorTypes, JiraFieldsType } from '../../../../common';
 import * as i18n from './translations';
 
 export * from './types';
 
 export const getCaseConnector = (): CaseConnector<JiraFieldsType> => ({
-  id: '.jira',
+  id: ConnectorTypes.jira,
   fieldsComponent: lazy(() => import('./case_fields')),
 });
 export const fieldLabels = {
diff --git a/x-pack/plugins/cases/public/components/connectors/mock.ts b/x-pack/plugins/cases/public/components/connectors/mock.ts
index f5429fa2396aa..663b397e6f4fe 100644
--- a/x-pack/plugins/cases/public/components/connectors/mock.ts
+++ b/x-pack/plugins/cases/public/components/connectors/mock.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { SwimlaneConnectorType } from '../../../common';
+
 export const connector = {
   id: '123',
   name: 'My connector',
@@ -13,6 +15,22 @@ export const connector = {
   isPreconfigured: false,
 };
 
+export const swimlaneConnector = {
+  id: '123',
+  name: 'My connector',
+  actionTypeId: '.swimlane',
+  config: {
+    connectorType: SwimlaneConnectorType.Cases,
+    mappings: {
+      caseIdConfig: {},
+      caseNameConfig: {},
+      descriptionConfig: {},
+      commentsConfig: {},
+    },
+  },
+  isPreconfigured: false,
+};
+
 export const issues = [
   { id: 'personId', title: 'Person Task', key: 'personKey' },
   { id: 'womanId', title: 'Woman Task', key: 'womanKey' },
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/index.ts b/x-pack/plugins/cases/public/components/connectors/resilient/index.ts
index 9bf96b16f358c..8a429c0dea091 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/index.ts
@@ -8,13 +8,13 @@
 import { lazy } from 'react';
 
 import { CaseConnector } from '../types';
-import { ResilientFieldsType } from '../../../../common';
+import { ConnectorTypes, ResilientFieldsType } from '../../../../common';
 import * as i18n from './translations';
 
 export * from './types';
 
 export const getCaseConnector = (): CaseConnector<ResilientFieldsType> => ({
-  id: '.resilient',
+  id: ConnectorTypes.resilient,
   fieldsComponent: lazy(() => import('./case_fields')),
 });
 
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/index.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/index.ts
index 9df5f87b416e1..88afd902ccf60 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/index.ts
@@ -8,16 +8,20 @@
 import { lazy } from 'react';
 
 import { CaseConnector } from '../types';
-import { ServiceNowITSMFieldsType, ServiceNowSIRFieldsType } from '../../../../common';
+import {
+  ConnectorTypes,
+  ServiceNowITSMFieldsType,
+  ServiceNowSIRFieldsType,
+} from '../../../../common';
 import * as i18n from './translations';
 
 export const getServiceNowITSMCaseConnector = (): CaseConnector<ServiceNowITSMFieldsType> => ({
-  id: '.servicenow',
+  id: ConnectorTypes.serviceNowITSM,
   fieldsComponent: lazy(() => import('./servicenow_itsm_case_fields')),
 });
 
 export const getServiceNowSIRCaseConnector = (): CaseConnector<ServiceNowSIRFieldsType> => ({
-  id: '.servicenow-sir',
+  id: ConnectorTypes.serviceNowSIR,
   fieldsComponent: lazy(() => import('./servicenow_sir_case_fields')),
 });
 
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.test.tsx
new file mode 100644
index 0000000000000..1a035d92611bd
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.test.tsx
@@ -0,0 +1,53 @@
+/*
+ * 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 React from 'react';
+import { render, screen } from '@testing-library/react';
+
+import { SwimlaneConnectorType } from '../../../../common';
+import Fields from './case_fields';
+import * as i18n from './translations';
+import { swimlaneConnector as connector } from '../mock';
+
+const fields = {
+  caseId: '123',
+};
+
+const onChange = jest.fn();
+
+describe('Swimlane Cases Fields', () => {
+  test('it does not shows the mapping error callout', () => {
+    render(<Fields connector={connector} fields={fields} onChange={onChange} />);
+    expect(screen.queryByText(i18n.EMPTY_MAPPING_WARNING_TITLE)).toBeFalsy();
+  });
+
+  test('it shows the mapping error callout when mapping is invalid', () => {
+    const invalidConnector = {
+      ...connector,
+      config: {
+        ...connector.config,
+        mappings: {},
+      },
+    };
+
+    render(<Fields connector={invalidConnector} fields={fields} onChange={onChange} />);
+    expect(screen.queryByText(i18n.EMPTY_MAPPING_WARNING_TITLE)).toBeTruthy();
+  });
+
+  test('it shows the mapping error callout when the connector is of type alerts', () => {
+    const invalidConnector = {
+      ...connector,
+      config: {
+        ...connector.config,
+        connectorType: SwimlaneConnectorType.Alerts,
+      },
+    };
+
+    render(<Fields connector={invalidConnector} fields={fields} onChange={onChange} />);
+    expect(screen.queryByText(i18n.EMPTY_MAPPING_WARNING_TITLE)).toBeTruthy();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.tsx b/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.tsx
new file mode 100644
index 0000000000000..b6370504edbb6
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/case_fields.tsx
@@ -0,0 +1,48 @@
+/*
+ * 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 React, { useMemo } from 'react';
+import { EuiCallOut } from '@elastic/eui';
+import * as i18n from './translations';
+
+import { ConnectorTypes, SwimlaneFieldsType } from '../../../../common';
+import { ConnectorFieldsProps } from '../types';
+import { ConnectorCard } from '../card';
+import { connectorValidator } from './validator';
+
+const SwimlaneComponent: React.FunctionComponent<ConnectorFieldsProps<SwimlaneFieldsType>> = ({
+  connector,
+  isEdit = true,
+}) => {
+  const showMappingWarning = useMemo(() => connectorValidator(connector) != null, [connector]);
+
+  return (
+    <>
+      {!isEdit && (
+        <ConnectorCard
+          connectorType={ConnectorTypes.swimlane}
+          isLoading={false}
+          listItems={[]}
+          title={connector.name}
+        />
+      )}
+      {showMappingWarning && (
+        <EuiCallOut
+          title={i18n.EMPTY_MAPPING_WARNING_TITLE}
+          color="danger"
+          iconType="alert"
+          data-test-subj="mapping-warning-callout"
+        >
+          {i18n.EMPTY_MAPPING_WARNING_DESC}
+        </EuiCallOut>
+      )}
+    </>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export { SwimlaneComponent as default };
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/index.ts b/x-pack/plugins/cases/public/components/connectors/swimlane/index.ts
new file mode 100644
index 0000000000000..bd2eaae9e0174
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/index.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { CaseConnector } from '../types';
+import { ConnectorTypes, SwimlaneFieldsType } from '../../../../common';
+import * as i18n from './translations';
+
+export const getCaseConnector = (): CaseConnector<SwimlaneFieldsType> => {
+  return {
+    id: ConnectorTypes.swimlane,
+    fieldsComponent: lazy(() => import('./case_fields')),
+  };
+};
+
+export const fieldLabels = {
+  caseId: i18n.CASE_ID_LABEL,
+  caseName: i18n.CASE_NAME_LABEL,
+  severity: i18n.SEVERITY_LABEL,
+};
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/translations.ts b/x-pack/plugins/cases/public/components/connectors/swimlane/translations.ts
new file mode 100644
index 0000000000000..eb6cd168fab99
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/translations.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 { i18n } from '@kbn/i18n';
+
+export const ALERT_SOURCE_LABEL = i18n.translate(
+  'xpack.cases.connectors.swimlane.alertSourceLabel',
+  {
+    defaultMessage: 'Alert Source',
+  }
+);
+
+export const CASE_ID_LABEL = i18n.translate('xpack.cases.connectors.swimlane.caseIdLabel', {
+  defaultMessage: 'Case Id',
+});
+
+export const CASE_NAME_LABEL = i18n.translate('xpack.cases.connectors.swimlane.caseNameLabel', {
+  defaultMessage: 'Case Name',
+});
+
+export const SEVERITY_LABEL = i18n.translate('xpack.cases.connectors.swimlane.severityLabel', {
+  defaultMessage: 'Severity',
+});
+
+export const EMPTY_MAPPING_WARNING_TITLE = i18n.translate(
+  'xpack.cases.connectors.swimlane.emptyMappingWarningTitle',
+  {
+    defaultMessage: 'This connector has missing field mappings',
+  }
+);
+
+export const EMPTY_MAPPING_WARNING_DESC = i18n.translate(
+  'xpack.cases.connectors.swimlane.emptyMappingWarningDesc',
+  {
+    defaultMessage:
+      'This connector cannot be selected because it is missing the required case field mappings. You can edit this connector to add required field mappings or select a connector of type Cases.',
+  }
+);
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/validator.test.ts b/x-pack/plugins/cases/public/components/connectors/swimlane/validator.test.ts
new file mode 100644
index 0000000000000..552d988c26330
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/validator.test.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 { SwimlaneConnectorType } from '../../../../common';
+import { swimlaneConnector as connector } from '../mock';
+import { isAnyRequiredFieldNotSet, connectorValidator } from './validator';
+
+describe('Swimlane validator', () => {
+  describe('isAnyRequiredFieldNotSet', () => {
+    test('it returns true if a required field is not set', () => {
+      expect(isAnyRequiredFieldNotSet({ notRequired: 'test' })).toBeTruthy();
+    });
+
+    test('it returns false if all required fields are set', () => {
+      expect(isAnyRequiredFieldNotSet(connector.config.mappings)).toBeFalsy();
+    });
+  });
+
+  describe('connectorValidator', () => {
+    test('it returns an error message if the mapping is not correct', () => {
+      const invalidConnector = {
+        ...connector,
+        config: {
+          ...connector.config,
+          mappings: {},
+        },
+      };
+      expect(connectorValidator(invalidConnector)).toEqual({ message: 'Invalid connector' });
+    });
+
+    test('it returns an error message if the connector is of type alerts', () => {
+      const invalidConnector = {
+        ...connector,
+        config: {
+          ...connector.config,
+          connectorType: SwimlaneConnectorType.Alerts,
+        },
+      };
+      expect(connectorValidator(invalidConnector)).toEqual({ message: 'Invalid connector' });
+    });
+
+    test.each([SwimlaneConnectorType.Cases, SwimlaneConnectorType.All])(
+      'it does not return an error message if the connector is of type %s',
+      (connectorType) => {
+        const invalidConnector = {
+          ...connector,
+          config: {
+            ...connector.config,
+            connectorType,
+          },
+        };
+        expect(connectorValidator(invalidConnector)).toBe(undefined);
+      }
+    );
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/connectors/swimlane/validator.ts b/x-pack/plugins/cases/public/components/connectors/swimlane/validator.ts
new file mode 100644
index 0000000000000..4ead75e5854f9
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/swimlane/validator.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 { SwimlaneConnectorType } from '../../../../common';
+import { ValidationConfig } from '../../../common/shared_imports';
+import { CaseActionConnector } from '../../types';
+
+const casesRequiredFields = [
+  'caseIdConfig',
+  'caseNameConfig',
+  'descriptionConfig',
+  'commentsConfig',
+];
+
+export const isAnyRequiredFieldNotSet = (mapping: Record<string, unknown> | undefined) =>
+  casesRequiredFields.some((field) => mapping?.[field] == null);
+
+/**
+ * The user can use either a connector of type cases or all.
+ * If the connector is of type all we should check if all
+ * required field have been configured.
+ */
+
+export const connectorValidator = (
+  connector: CaseActionConnector
+): ReturnType<ValidationConfig['validator']> => {
+  const {
+    config: { mappings, connectorType },
+  } = connector;
+  if (connectorType === SwimlaneConnectorType.Alerts || isAnyRequiredFieldNotSet(mappings)) {
+    return {
+      message: 'Invalid connector',
+    };
+  }
+};
diff --git a/x-pack/plugins/cases/public/components/connectors/types.ts b/x-pack/plugins/cases/public/components/connectors/types.ts
index 4eb97513b9f58..5bbd77c790901 100644
--- a/x-pack/plugins/cases/public/components/connectors/types.ts
+++ b/x-pack/plugins/cases/public/components/connectors/types.ts
@@ -11,12 +11,11 @@ import React from 'react';
 import {
   ActionType as ThirdPartySupportedActions,
   CaseField,
-  ActionConnector,
   ConnectorTypeFields,
 } from '../../../common';
+import { CaseActionConnector } from '../types';
 
 export { ThirdPartyField as AllThirdPartyFields } from '../../../common';
-export type CaseActionConnector = ActionConnector;
 
 export interface ThirdPartyField {
   label: string;
diff --git a/x-pack/plugins/cases/public/components/create/connector.test.tsx b/x-pack/plugins/cases/public/components/create/connector.test.tsx
index c453838f6cd7a..bc6d5c8717ece 100644
--- a/x-pack/plugins/cases/public/components/create/connector.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/connector.test.tsx
@@ -18,6 +18,9 @@ import { useGetSeverity } from '../connectors/resilient/use_get_severity';
 import { useGetChoices } from '../connectors/servicenow/use_get_choices';
 import { incidentTypes, severity, choices } from '../connectors/mock';
 import { schema, FormProps } from './schema';
+import { TestProviders } from '../../common/mock';
+import { useCaseConfigure } from '../../containers/configure/use_configure';
+import { useCaseConfigureResponse } from '../configure_cases/__mock__';
 
 jest.mock('../../common/lib/kibana', () => ({
   useKibana: () => ({
@@ -39,10 +42,12 @@ jest.mock('../../common/lib/kibana', () => ({
 jest.mock('../connectors/resilient/use_get_incident_types');
 jest.mock('../connectors/resilient/use_get_severity');
 jest.mock('../connectors/servicenow/use_get_choices');
+jest.mock('../../containers/configure/use_configure');
 
 const useGetIncidentTypesMock = useGetIncidentTypes as jest.Mock;
 const useGetSeverityMock = useGetSeverity as jest.Mock;
 const useGetChoicesMock = useGetChoices as jest.Mock;
+const useCaseConfigureMock = useCaseConfigure as jest.Mock;
 
 const useGetIncidentTypesResponse = {
   isLoading: false,
@@ -87,35 +92,30 @@ describe('Connector', () => {
     useGetIncidentTypesMock.mockReturnValue(useGetIncidentTypesResponse);
     useGetSeverityMock.mockReturnValue(useGetSeverityResponse);
     useGetChoicesMock.mockReturnValue(useGetChoicesResponse);
+    useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
   });
 
   it('it renders', async () => {
     const wrapper = mount(
-      <MockHookWrapperComponent>
-        <Connector {...defaultProps} />
-      </MockHookWrapperComponent>
+      <TestProviders>
+        <MockHookWrapperComponent>
+          <Connector {...defaultProps} />
+        </MockHookWrapperComponent>
+      </TestProviders>
     );
 
     expect(wrapper.find(`[data-test-subj="caseConnectors"]`).exists()).toBeTruthy();
-    expect(wrapper.find(`[data-test-subj="connector-fields"]`).exists()).toBeTruthy();
-
-    await waitFor(() => {
-      expect(wrapper.find(`button[data-test-subj="dropdown-connectors"]`).first().text()).toBe(
-        'My Connector'
-      );
-    });
-
-    await waitFor(() => {
-      wrapper.update();
-      expect(wrapper.find(`[data-test-subj="connector-fields-sn-itsm"]`).exists()).toBeTruthy();
-    });
+    // Selected connector is set to none so no fields should be displayed
+    expect(wrapper.find(`[data-test-subj="connector-fields"]`).exists()).toBeFalsy();
   });
 
   it('it is disabled and loading when isLoadingConnectors=true', async () => {
     const wrapper = mount(
-      <MockHookWrapperComponent>
-        <Connector {...{ ...defaultProps, isLoadingConnectors: true }} />
-      </MockHookWrapperComponent>
+      <TestProviders>
+        <MockHookWrapperComponent>
+          <Connector {...{ ...defaultProps, isLoadingConnectors: true }} />
+        </MockHookWrapperComponent>
+      </TestProviders>
     );
 
     expect(
@@ -129,9 +129,11 @@ describe('Connector', () => {
 
   it('it is disabled and loading when isLoading=true', async () => {
     const wrapper = mount(
-      <MockHookWrapperComponent>
-        <Connector {...{ ...defaultProps, isLoading: true }} />
-      </MockHookWrapperComponent>
+      <TestProviders>
+        <MockHookWrapperComponent>
+          <Connector {...{ ...defaultProps, isLoading: true }} />
+        </MockHookWrapperComponent>
+      </TestProviders>
     );
 
     expect(
@@ -144,9 +146,11 @@ describe('Connector', () => {
 
   it(`it should change connector`, async () => {
     const wrapper = mount(
-      <MockHookWrapperComponent>
-        <Connector {...defaultProps} />
-      </MockHookWrapperComponent>
+      <TestProviders>
+        <MockHookWrapperComponent>
+          <Connector {...defaultProps} />
+        </MockHookWrapperComponent>
+      </TestProviders>
     );
 
     expect(wrapper.find(`[data-test-subj="connector-fields-resilient"]`).exists()).toBeFalsy();
diff --git a/x-pack/plugins/cases/public/components/create/connector.tsx b/x-pack/plugins/cases/public/components/create/connector.tsx
index 2049f2a083a6f..2ec6d1ffef23d 100644
--- a/x-pack/plugins/cases/public/components/create/connector.tsx
+++ b/x-pack/plugins/cases/public/components/create/connector.tsx
@@ -5,15 +5,22 @@
  * 2.0.
  */
 
-import React, { memo, useCallback } from 'react';
+import React, { memo, useCallback, useMemo, useEffect } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { ActionConnector, ConnectorTypes } from '../../../common';
-import { UseField, useFormData, FieldHook, useFormContext } from '../../common/shared_imports';
+import { ConnectorTypes, ActionConnector } from '../../../common';
+import {
+  UseField,
+  useFormData,
+  FieldHook,
+  useFormContext,
+  FieldConfig,
+} from '../../common/shared_imports';
 import { ConnectorSelector } from '../connector_selector/form';
 import { ConnectorFieldsForm } from '../connectors/fields_form';
-import { getConnectorById } from '../configure_cases/utils';
-import { FormProps } from './schema';
+import { FormProps, schema } from './schema';
+import { useCaseConfigure } from '../../containers/configure/use_configure';
+import { getConnectorById, getConnectorsFormValidators } from '../utils';
 
 interface Props {
   connectors: ActionConnector[];
@@ -26,6 +33,7 @@ interface ConnectorsFieldProps {
   connectors: ActionConnector[];
   field: FieldHook<FormProps['fields']>;
   isEdit: boolean;
+  setErrors: (errors: boolean) => void;
   hideConnectorServiceNowSir?: boolean;
 }
 
@@ -33,11 +41,13 @@ const ConnectorFields = ({
   connectors,
   isEdit,
   field,
+  setErrors,
   hideConnectorServiceNowSir = false,
 }: ConnectorsFieldProps) => {
   const [{ connectorId }] = useFormData({ watch: ['connectorId'] });
   const { setValue } = field;
   let connector = getConnectorById(connectorId, connectors) ?? null;
+
   if (
     connector &&
     hideConnectorServiceNowSir &&
@@ -61,18 +71,49 @@ const ConnectorComponent: React.FC<Props> = ({
   isLoading,
   isLoadingConnectors,
 }) => {
-  const { getFields } = useFormContext();
+  const { getFields, setFieldValue } = useFormContext();
+  const { connector: configurationConnector } = useCaseConfigure();
+
   const handleConnectorChange = useCallback(() => {
     const { fields } = getFields();
     fields.setValue(null);
   }, [getFields]);
 
+  const defaultConnectorId = useMemo(() => {
+    if (
+      hideConnectorServiceNowSir &&
+      configurationConnector.type === ConnectorTypes.serviceNowSIR
+    ) {
+      return 'none';
+    }
+    return connectors.some((connector) => connector.id === configurationConnector.id)
+      ? configurationConnector.id
+      : 'none';
+  }, [
+    configurationConnector.id,
+    configurationConnector.type,
+    connectors,
+    hideConnectorServiceNowSir,
+  ]);
+
+  useEffect(() => setFieldValue('connectorId', defaultConnectorId), [
+    defaultConnectorId,
+    setFieldValue,
+  ]);
+
+  const connectorIdConfig = getConnectorsFormValidators({
+    config: schema.connectorId as FieldConfig,
+    connectors,
+  });
+
   return (
     <EuiFlexGroup>
       <EuiFlexItem>
         <UseField
           path="connectorId"
+          config={connectorIdConfig}
           component={ConnectorSelector}
+          defaultValue={defaultConnectorId}
           componentProps={{
             connectors,
             handleChange: handleConnectorChange,
diff --git a/x-pack/plugins/cases/public/components/create/form.test.tsx b/x-pack/plugins/cases/public/components/create/form.test.tsx
index 5f3b778a7cafc..783ead9b271fd 100644
--- a/x-pack/plugins/cases/public/components/create/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.test.tsx
@@ -17,11 +17,16 @@ import { schema, FormProps } from './schema';
 import { CreateCaseForm } from './form';
 import { OwnerProvider } from '../owner_context';
 import { SECURITY_SOLUTION_OWNER } from '../../../common';
+import { useCaseConfigure } from '../../containers/configure/use_configure';
+import { useCaseConfigureResponse } from '../configure_cases/__mock__';
 
 jest.mock('../../containers/use_get_tags');
 jest.mock('../../containers/configure/use_connectors');
+jest.mock('../../containers/configure/use_configure');
+
 const useGetTagsMock = useGetTags as jest.Mock;
 const useConnectorsMock = useConnectors as jest.Mock;
+const useCaseConfigureMock = useCaseConfigure as jest.Mock;
 
 const initialCaseValue: FormProps = {
   description: '',
@@ -54,6 +59,7 @@ describe('CreateCaseForm', () => {
     jest.resetAllMocks();
     useGetTagsMock.mockReturnValue({ tags: ['test'] });
     useConnectorsMock.mockReturnValue({ loading: false, connectors: connectorsMock });
+    useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
   });
 
   it('it renders with steps', async () => {
diff --git a/x-pack/plugins/cases/public/components/create/form_context.tsx b/x-pack/plugins/cases/public/components/create/form_context.tsx
index 30a60fb5c1e47..65c102583455a 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -5,23 +5,19 @@
  * 2.0.
  */
 
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { schema, FormProps } from './schema';
 import { Form, useForm } from '../../common/shared_imports';
-import {
-  getConnectorById,
-  getNoneConnector,
-  normalizeActionConnector,
-} from '../configure_cases/utils';
+import { getNoneConnector, normalizeActionConnector } from '../configure_cases/utils';
 import { usePostCase } from '../../containers/use_post_case';
 import { usePostPushToService } from '../../containers/use_post_push_to_service';
 
 import { useConnectors } from '../../containers/configure/use_connectors';
-import { useCaseConfigure } from '../../containers/configure/use_configure';
 import { Case } from '../../containers/types';
-import { CaseType, ConnectorTypes } from '../../../common';
+import { CaseType } from '../../../common';
 import { UsePostComment, usePostComment } from '../../containers/use_post_comment';
 import { useOwnerContext } from '../owner_context/use_owner_context';
+import { getConnectorById } from '../utils';
 
 const initialCaseValue: FormProps = {
   description: '',
@@ -49,28 +45,10 @@ export const FormContext: React.FC<Props> = ({
 }) => {
   const { connectors, loading: isLoadingConnectors } = useConnectors();
   const owner = useOwnerContext();
-  const { connector: configurationConnector } = useCaseConfigure();
   const { postCase } = usePostCase();
   const { postComment } = usePostComment();
   const { pushCaseToExternalService } = usePostPushToService();
 
-  const connectorId = useMemo(() => {
-    if (
-      hideConnectorServiceNowSir &&
-      configurationConnector.type === ConnectorTypes.serviceNowSIR
-    ) {
-      return 'none';
-    }
-    return connectors.some((connector) => connector.id === configurationConnector.id)
-      ? configurationConnector.id
-      : 'none';
-  }, [
-    configurationConnector.id,
-    configurationConnector.type,
-    connectors,
-    hideConnectorServiceNowSir,
-  ]);
-
   const submitCase = useCallback(
     async (
       { connectorId: dataConnectorId, fields, syncAlerts = true, ...dataWithoutConnectorId },
@@ -125,9 +103,6 @@ export const FormContext: React.FC<Props> = ({
     schema,
     onSubmit: submitCase,
   });
-  const { setFieldValue } = form;
-  // Set the selected connector to the configuration connector
-  useEffect(() => setFieldValue('connectorId', connectorId), [connectorId, setFieldValue]);
 
   const childrenWithExtraProp = useMemo(
     () =>
diff --git a/x-pack/plugins/cases/public/components/create/schema.tsx b/x-pack/plugins/cases/public/components/create/schema.tsx
index 6e6d1a414280e..bea1a46d93760 100644
--- a/x-pack/plugins/cases/public/components/create/schema.tsx
+++ b/x-pack/plugins/cases/public/components/create/schema.tsx
@@ -49,7 +49,9 @@ export const schema: FormSchema<FormProps> = {
     label: i18n.CONNECTORS,
     defaultValue: 'none',
   },
-  fields: {},
+  fields: {
+    defaultValue: null,
+  },
   syncAlerts: {
     helpText: i18n.SYNC_ALERTS_HELP,
     type: FIELD_TYPES.TOGGLE,
diff --git a/x-pack/plugins/cases/public/components/edit_connector/index.tsx b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
index 570f6e34d2528..8057d188b8c04 100644
--- a/x-pack/plugins/cases/public/components/edit_connector/index.tsx
+++ b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
@@ -20,15 +20,15 @@ import {
 import styled from 'styled-components';
 import { noop } from 'lodash/fp';
 
-import { Form, UseField, useForm } from '../../common/shared_imports';
+import { FieldConfig, Form, UseField, useForm } from '../../common/shared_imports';
 import { ActionConnector, ConnectorTypeFields } from '../../../common';
 import { ConnectorSelector } from '../connector_selector/form';
 import { ConnectorFieldsForm } from '../connectors/fields_form';
-import { getConnectorById } from '../configure_cases/utils';
 import { CaseUserActions } from '../../containers/types';
 import { schema } from './schema';
 import { getConnectorFieldsFromUserActions } from './helpers';
 import * as i18n from './translations';
+import { getConnectorById, getConnectorsFormValidators } from '../utils';
 
 export interface EditConnectorProps {
   caseFields: ConnectorTypeFields['fields'];
@@ -205,6 +205,11 @@ export const EditConnector = React.memo(
       });
     }, [dispatch]);
 
+    const connectorIdConfig = getConnectorsFormValidators({
+      config: schema.connectorId as FieldConfig,
+      connectors,
+    });
+
     /**
      * if this evaluates to true it means that the connector was likely deleted because the case connector was set to something
      * other than none but we don't find it in the list of connectors returned from the actions plugin
@@ -243,6 +248,7 @@ export const EditConnector = React.memo(
                 <EuiFlexItem>
                   <UseField
                     path="connectorId"
+                    config={connectorIdConfig}
                     component={ConnectorSelector}
                     componentProps={{
                       connectors,
diff --git a/x-pack/plugins/cases/public/components/types.ts b/x-pack/plugins/cases/public/components/types.ts
new file mode 100644
index 0000000000000..014afc371e761
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/types.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.
+ */
+
+import { ActionConnector } from '../../common';
+
+export type CaseActionConnector = ActionConnector;
diff --git a/x-pack/plugins/cases/public/components/utils.ts b/x-pack/plugins/cases/public/components/utils.ts
new file mode 100644
index 0000000000000..033529c27a2d4
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/utils.ts
@@ -0,0 +1,43 @@
+/*
+ * 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 { ConnectorTypes } from '../../common';
+import { FieldConfig, ValidationConfig } from '../common/shared_imports';
+import { connectorValidator as swimlaneConnectorValidator } from './connectors/swimlane/validator';
+import { CaseActionConnector } from './types';
+
+export const getConnectorById = (
+  id: string,
+  connectors: CaseActionConnector[]
+): CaseActionConnector | null => connectors.find((c) => c.id === id) ?? null;
+
+const validators: Record<
+  string,
+  (connector: CaseActionConnector) => ReturnType<ValidationConfig['validator']>
+> = {
+  [ConnectorTypes.swimlane]: swimlaneConnectorValidator,
+};
+
+export const getConnectorsFormValidators = ({
+  connectors = [],
+  config = {},
+}: {
+  connectors: CaseActionConnector[];
+  config: FieldConfig;
+}): FieldConfig => ({
+  ...config,
+  validations: [
+    {
+      validator: ({ value: connectorId }) => {
+        const connector = getConnectorById(connectorId as string, connectors);
+        if (connector != null) {
+          return validators[connector.actionTypeId]?.(connector);
+        }
+      },
+    },
+  ],
+});
diff --git a/x-pack/plugins/cases/public/containers/use_get_action_license.tsx b/x-pack/plugins/cases/public/containers/use_get_action_license.tsx
index 4f28d88c14b25..e4ea6d05011a7 100644
--- a/x-pack/plugins/cases/public/containers/use_get_action_license.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_action_license.tsx
@@ -11,6 +11,7 @@ import { useToasts } from '../common/lib/kibana';
 import { getActionLicense } from './api';
 import * as i18n from './translations';
 import { ActionLicense } from './types';
+import { ConnectorTypes } from '../../common';
 
 export interface ActionLicenseState {
   actionLicense: ActionLicense | null;
@@ -24,7 +25,7 @@ export const initialData: ActionLicenseState = {
   isError: false,
 };
 
-const MINIMUM_LICENSE_REQUIRED_CONNECTOR = '.jira';
+const MINIMUM_LICENSE_REQUIRED_CONNECTOR = ConnectorTypes.jira;
 
 export const useGetActionLicense = (): ActionLicenseState => {
   const [actionLicenseState, setActionLicensesState] = useState<ActionLicenseState>(initialData);
diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
index 3df1891391c75..4f8713704361b 100644
--- a/x-pack/plugins/cases/server/client/cases/get.ts
+++ b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -173,7 +173,6 @@ export const get = async (
 
     let theCase: SavedObject<ESCaseAttributes>;
     let subCaseIds: string[] = [];
-
     if (ENABLE_CASE_CONNECTOR) {
       const [caseInfo, subCasesForCaseId] = await Promise.all([
         caseService.getCase({
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index d920c517a0004..f5a10d705e095 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -252,6 +252,7 @@ export const prepareFieldsForTransformation = ({
   mappings.reduce(
     (acc: PipedField[], mapping) =>
       mapping != null &&
+      mapping.target != null &&
       mapping.target !== 'not_mapped' &&
       mapping.action_type !== 'nothing' &&
       mapping.source !== 'comments'
diff --git a/x-pack/plugins/cases/server/connectors/case/index.test.ts b/x-pack/plugins/cases/server/connectors/case/index.test.ts
index 7b8f57bf0d3bf..51c45bd25444e 100644
--- a/x-pack/plugins/cases/server/connectors/case/index.test.ts
+++ b/x-pack/plugins/cases/server/connectors/case/index.test.ts
@@ -60,7 +60,7 @@ describe('case connector', () => {
             connector: {
               id: 'jira',
               name: 'Jira',
-              type: '.jira',
+              type: ConnectorTypes.jira,
               fields: {
                 issueType: '10006',
                 priority: 'High',
@@ -99,7 +99,7 @@ describe('case connector', () => {
                 connector: {
                   id: 'jira',
                   name: 'Jira',
-                  type: '.jira',
+                  type: ConnectorTypes.jira,
                   fields: {
                     issueType: '10006',
                     priority: 'High',
@@ -293,7 +293,7 @@ describe('case connector', () => {
               connector: {
                 id: 'jira',
                 name: 'Jira',
-                type: '.jira',
+                type: ConnectorTypes.jira,
                 fields: {
                   priority: 'High',
                   parent: null,
@@ -438,7 +438,7 @@ describe('case connector', () => {
               connector: {
                 id: 'jira',
                 name: 'Jira',
-                type: '.jira',
+                type: ConnectorTypes.jira,
                 fields: {
                   issueType: '10006',
                   priority: 'High',
@@ -640,7 +640,7 @@ describe('case connector', () => {
               connector: {
                 id: 'jira',
                 name: 'Jira',
-                type: '.jira',
+                type: ConnectorTypes.jira,
                 fields: {
                   priority: 'High',
                   parent: null,
@@ -974,7 +974,7 @@ describe('case connector', () => {
             connector: {
               id: 'jira',
               name: 'Jira',
-              type: '.jira',
+              type: ConnectorTypes.jira,
               fields: {
                 issueType: '10006',
                 priority: 'High',
@@ -1003,7 +1003,7 @@ describe('case connector', () => {
           connector: {
             id: 'jira',
             name: 'Jira',
-            type: '.jira',
+            type: ConnectorTypes.jira,
             fields: {
               issueType: '10006',
               priority: 'High',
diff --git a/x-pack/plugins/cases/server/connectors/case/schema.ts b/x-pack/plugins/cases/server/connectors/case/schema.ts
index 596a5a4aae45e..79d3bf62e8a9e 100644
--- a/x-pack/plugins/cases/server/connectors/case/schema.ts
+++ b/x-pack/plugins/cases/server/connectors/case/schema.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { CommentType } from '../../../common';
+import { CommentType, ConnectorTypes } from '../../../common';
 import { validateConnector } from './validators';
 
 // Reserved for future implementation
@@ -77,23 +77,29 @@ const ServiceNowSIRFieldsSchema = schema.object({
   subcategory: schema.nullable(schema.string()),
 });
 
+const SwimlaneFieldsSchema = schema.object({
+  caseId: schema.nullable(schema.string()),
+});
+
 const NoneFieldsSchema = schema.nullable(schema.object({}));
 
 const ReducedConnectorFieldsSchema: { [x: string]: any } = {
-  '.jira': JiraFieldsSchema,
-  '.resilient': ResilientFieldsSchema,
-  '.servicenow-sir': ServiceNowSIRFieldsSchema,
+  [ConnectorTypes.jira]: JiraFieldsSchema,
+  [ConnectorTypes.resilient]: ResilientFieldsSchema,
+  [ConnectorTypes.serviceNowSIR]: ServiceNowSIRFieldsSchema,
+  [ConnectorTypes.swimlane]: SwimlaneFieldsSchema,
 };
 
 export const ConnectorProps = {
   id: schema.string(),
   name: schema.string(),
   type: schema.oneOf([
-    schema.literal('.servicenow'),
-    schema.literal('.jira'),
-    schema.literal('.resilient'),
-    schema.literal('.servicenow-sir'),
-    schema.literal('.none'),
+    schema.literal(ConnectorTypes.jira),
+    schema.literal(ConnectorTypes.none),
+    schema.literal(ConnectorTypes.resilient),
+    schema.literal(ConnectorTypes.serviceNowITSM),
+    schema.literal(ConnectorTypes.serviceNowSIR),
+    schema.literal(ConnectorTypes.swimlane),
   ]),
   // Chain of conditional schemes
   fields: Object.keys(ReducedConnectorFieldsSchema).reduce(
@@ -106,7 +112,7 @@ export const ConnectorProps = {
       ),
     schema.conditional(
       schema.siblingRef('type'),
-      '.servicenow',
+      ConnectorTypes.serviceNowITSM,
       ServiceNowITSMFieldsSchema,
       NoneFieldsSchema
     )
diff --git a/x-pack/plugins/cases/server/connectors/case/validators.ts b/x-pack/plugins/cases/server/connectors/case/validators.ts
index 03110d15c9d3f..6ab4f3a21a24f 100644
--- a/x-pack/plugins/cases/server/connectors/case/validators.ts
+++ b/x-pack/plugins/cases/server/connectors/case/validators.ts
@@ -6,9 +6,10 @@
  */
 
 import { Connector } from './types';
+import { ConnectorTypes } from '../../../common';
 
 export const validateConnector = (connector: Connector) => {
-  if (connector.type === '.none' && connector.fields !== null) {
+  if (connector.type === ConnectorTypes.none && connector.fields !== null) {
     return 'Fields must be set to null for connectors of type .none';
   }
 };
diff --git a/x-pack/plugins/cases/server/connectors/factory.ts b/x-pack/plugins/cases/server/connectors/factory.ts
index 5ed7eb4ade4ca..d0ae7154fe5d9 100644
--- a/x-pack/plugins/cases/server/connectors/factory.ts
+++ b/x-pack/plugins/cases/server/connectors/factory.ts
@@ -6,16 +6,18 @@
  */
 
 import { ConnectorTypes } from '../../common';
+import { ICasesConnector, CasesConnectorsMap } from './types';
 import { getCaseConnector as getJiraCaseConnector } from './jira';
 import { getCaseConnector as getResilientCaseConnector } from './resilient';
 import { getServiceNowITSMCaseConnector, getServiceNowSIRCaseConnector } from './servicenow';
-import { ICasesConnector, CasesConnectorsMap } from './types';
+import { getCaseConnector as getSwimlaneCaseConnector } from './swimlane';
 
 const mapping: Record<ConnectorTypes, ICasesConnector | null> = {
   [ConnectorTypes.jira]: getJiraCaseConnector(),
   [ConnectorTypes.serviceNowITSM]: getServiceNowITSMCaseConnector(),
   [ConnectorTypes.serviceNowSIR]: getServiceNowSIRCaseConnector(),
   [ConnectorTypes.resilient]: getResilientCaseConnector(),
+  [ConnectorTypes.swimlane]: getSwimlaneCaseConnector(),
   [ConnectorTypes.none]: null,
 };
 
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts b/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
new file mode 100644
index 0000000000000..55cbbdb68691e
--- /dev/null
+++ b/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
@@ -0,0 +1,21 @@
+/*
+ * 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 { CaseResponse } from '../../../common';
+import { format } from './format';
+
+describe('Swimlane formatter', () => {
+  const theCase = {
+    id: 'case-id',
+    connector: { fields: null },
+  } as CaseResponse;
+
+  it('it formats correctly', async () => {
+    const res = await format(theCase, []);
+    expect(res).toEqual({ caseId: theCase.id });
+  });
+});
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/format.ts b/x-pack/plugins/cases/server/connectors/swimlane/format.ts
new file mode 100644
index 0000000000000..9531e4099a4f4
--- /dev/null
+++ b/x-pack/plugins/cases/server/connectors/swimlane/format.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { ConnectorSwimlaneTypeFields } from '../../../common';
+import { Format } from './types';
+
+export const format: Format = (theCase) => {
+  const { caseId = theCase.id } =
+    (theCase.connector.fields as ConnectorSwimlaneTypeFields['fields']) ?? {};
+  return { caseId };
+};
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/index.ts b/x-pack/plugins/cases/server/connectors/swimlane/index.ts
new file mode 100644
index 0000000000000..2cad92391bdec
--- /dev/null
+++ b/x-pack/plugins/cases/server/connectors/swimlane/index.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { getMapping } from './mapping';
+import { format } from './format';
+import { SwimlaneCaseConnector } from './types';
+
+export const getCaseConnector = (): SwimlaneCaseConnector => ({
+  getMapping,
+  format,
+});
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/mapping.ts b/x-pack/plugins/cases/server/connectors/swimlane/mapping.ts
new file mode 100644
index 0000000000000..e1e34054463e5
--- /dev/null
+++ b/x-pack/plugins/cases/server/connectors/swimlane/mapping.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 { GetMapping } from './types';
+
+export const getMapping: GetMapping = () => {
+  return [
+    {
+      source: 'title',
+      target: 'caseName',
+      action_type: 'overwrite',
+    },
+    {
+      source: 'description',
+      target: 'description',
+      action_type: 'overwrite',
+    },
+    {
+      source: 'comments',
+      target: 'comments',
+      action_type: 'append',
+    },
+  ];
+};
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/types.ts b/x-pack/plugins/cases/server/connectors/swimlane/types.ts
new file mode 100644
index 0000000000000..22a1e9f6372d5
--- /dev/null
+++ b/x-pack/plugins/cases/server/connectors/swimlane/types.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 { SwimlaneFieldsType } from '../../../common/api';
+import { ICasesConnector } from '../types';
+
+export type SwimlaneCaseConnector = ICasesConnector<SwimlaneFieldsType>;
+export type Format = ICasesConnector<SwimlaneFieldsType>['format'];
+export type GetMapping = ICasesConnector<SwimlaneFieldsType>['getMapping'];
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index d112630facbc6..d59d7e7b7da4f 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -241,6 +241,7 @@ export const NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS = [
   '.email',
   '.slack',
   '.pagerduty',
+  '.swimlane',
   '.webhook',
   '.servicenow',
   '.jira',
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index 9230b4d829853..39852ebaeb46b 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -31,6 +31,9 @@
             "__index": {
               "type": "long"
             },
+            "__swimlane": {
+              "type": "long"
+            },
             "__pagerduty": {
               "type": "long"
             },
@@ -68,6 +71,9 @@
             "__index": {
               "type": "long"
             },
+            "__swimlane": {
+              "type": "long"
+            },
             "__pagerduty": {
               "type": "long"
             },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/index.ts
index 2eda435d045a4..4266822bda1fc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/index.ts
@@ -10,6 +10,7 @@ import { getSlackActionType } from './slack';
 import { getEmailActionType } from './email';
 import { getIndexActionType } from './es_index';
 import { getPagerDutyActionType } from './pagerduty';
+import { getSwimlaneActionType } from './swimlane';
 import { getWebhookActionType } from './webhook';
 import { TypeRegistry } from '../../type_registry';
 import { ActionTypeModel } from '../../../types';
@@ -28,6 +29,7 @@ export function registerBuiltInActionTypes({
   actionTypeRegistry.register(getEmailActionType());
   actionTypeRegistry.register(getIndexActionType());
   actionTypeRegistry.register(getPagerDutyActionType());
+  actionTypeRegistry.register(getSwimlaneActionType());
   actionTypeRegistry.register(getWebhookActionType());
   actionTypeRegistry.register(getServiceNowITSMActionType());
   actionTypeRegistry.register(getServiceNowSIRActionType());
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.test.tsx
index b89f71b0fc354..be5250ccf8b29 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.test.tsx
@@ -12,7 +12,7 @@ import { JiraActionConnector } from './types';
 jest.mock('../../../../common/lib/kibana');
 
 describe('JiraActionConnectorFields renders', () => {
-  test('alerting Jira connector fields is rendered', () => {
+  test('alerting Jira connector fields are rendered', () => {
     const actionConnector = {
       secrets: {
         email: 'email',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
index 5897de46f94df..99d7e9510454f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
@@ -63,6 +63,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
     actionConnector,
     issueType: incident.issueType ?? '',
   });
+
   const editSubActionProperty = useCallback(
     (key: string, value: any) => {
       if (key === 'issueType') {
@@ -75,9 +76,11 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
           index
         );
       }
+
       if (key === 'comments') {
         return editAction('subActionParams', { incident, comments: value }, index);
       }
+
       return editAction(
         'subActionParams',
         {
@@ -124,6 +127,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
       text: type.name ?? '',
     }));
   }, [editSubActionProperty, incident, issueTypes]);
+
   const prioritiesSelectOptions: EuiSelectOption[] = useMemo(() => {
     if (incident.issueType != null && fields != null) {
       const priorities = fields.priority != null ? fields.priority.allowedValues : [];
@@ -141,6 +145,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
     }
     return [];
   }, [editSubActionProperty, fields, incident.issueType, incident.priority]);
+
   useEffect(() => {
     if (!hasPriority && incident.priority != null) {
       editSubActionProperty('priority', null);
@@ -167,6 +172,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [actionConnector]);
+
   useEffect(() => {
     if (!actionParams.subAction) {
       editAction('subAction', 'pushToService', index);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.test.tsx
index b7b68b9485d8a..bbd237a7cec89 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.test.tsx
@@ -12,7 +12,7 @@ import { ResilientActionConnector } from './types';
 jest.mock('../../../../common/lib/kibana');
 
 describe('ResilientActionConnectorFields renders', () => {
-  test('alerting Resilient connector fields is rendered', () => {
+  test('alerting Resilient connector fields are rendered', () => {
     const actionConnector = {
       secrets: {
         apiKeyId: 'key',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
index 54a138a2bc7cf..b0f5198b6b5fd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
@@ -147,6 +147,7 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [actionConnector]);
+
   useEffect(() => {
     if (!actionParams.subAction) {
       editAction('subAction', 'pushToService', index);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
index 330844b93b6b5..4993c51f350ad 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
@@ -12,7 +12,7 @@ import { ServiceNowActionConnector } from './types';
 jest.mock('../../../../common/lib/kibana');
 
 describe('ServiceNowActionConnectorFields renders', () => {
-  test('alerting servicenow connector fields is rendered', () => {
+  test('alerting servicenow connector fields are rendered', () => {
     const actionConnector = {
       secrets: {
         username: 'user',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.test.ts
new file mode 100644
index 0000000000000..90bab65b83bfd
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.test.ts
@@ -0,0 +1,145 @@
+/*
+ * 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 { getApplication } from './api';
+
+const getApplicationResponse = {
+  fields: [],
+};
+
+describe('Swimlane API', () => {
+  let fetchMock: jest.SpyInstance<Promise<unknown>>;
+
+  beforeAll(() => jest.spyOn(window, 'fetch'));
+  beforeEach(() => {
+    jest.resetAllMocks();
+    fetchMock = jest.spyOn(window, 'fetch');
+  });
+
+  describe('getApplication', () => {
+    it('should call getApplication API correctly', async () => {
+      const abortCtrl = new AbortController();
+
+      fetchMock.mockResolvedValueOnce({
+        ok: true,
+        json: async () => getApplicationResponse,
+      });
+      const res = await getApplication({
+        signal: abortCtrl.signal,
+        apiToken: '',
+        appId: '',
+        url: '',
+      });
+
+      expect(res).toEqual(getApplicationResponse);
+    });
+
+    it('returns an error when the response fails', async () => {
+      const abortCtrl = new AbortController();
+
+      fetchMock.mockResolvedValueOnce({
+        ok: false,
+        status: 401,
+        json: async () => getApplicationResponse,
+      });
+
+      try {
+        await getApplication({
+          signal: abortCtrl.signal,
+          apiToken: '',
+          appId: '',
+          url: '',
+        });
+      } catch (e) {
+        expect(e.message).toContain('Received status:');
+      }
+    });
+
+    it('returns an error when parsing the json fails', async () => {
+      const abortCtrl = new AbortController();
+
+      fetchMock.mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        json: async () => {
+          throw new Error('bad');
+        },
+      });
+
+      try {
+        await getApplication({
+          signal: abortCtrl.signal,
+          apiToken: '',
+          appId: '',
+          url: '',
+        });
+      } catch (e) {
+        expect(e.message).toContain('bad');
+      }
+    });
+
+    it('it removes unsafe fields', async () => {
+      const abortCtrl = new AbortController();
+
+      fetchMock.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          fields: [
+            {
+              id: '__proto__',
+              name: 'Alert Id',
+              key: 'alert-id',
+              fieldType: 'text',
+            },
+            {
+              id: 'a6ide',
+              name: '__proto__',
+              key: 'alert-id',
+              fieldType: 'text',
+            },
+            {
+              id: 'a6ide',
+              name: 'Alert Id',
+              key: '__proto__',
+              fieldType: 'text',
+            },
+            {
+              id: 'a6ide',
+              name: 'Alert Id',
+              key: 'alert-id',
+              fieldType: '__proto__',
+            },
+            {
+              id: 'safe-id',
+              name: 'Safe',
+              key: 'safe-key',
+              fieldType: 'safe-text',
+            },
+          ],
+        }),
+      });
+
+      const res = await getApplication({
+        signal: abortCtrl.signal,
+        apiToken: '',
+        appId: '',
+        url: '',
+      });
+
+      expect(res).toEqual({
+        fields: [
+          {
+            id: 'safe-id',
+            name: 'Safe',
+            key: 'safe-key',
+            fieldType: 'safe-text',
+          },
+        ],
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.ts
new file mode 100644
index 0000000000000..c6f9d4bee3e13
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/api.ts
@@ -0,0 +1,65 @@
+/*
+ * 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 { SwimlaneFieldMappingConfig } from './types';
+
+const removeUnsafeFields = (fields: SwimlaneFieldMappingConfig[]): SwimlaneFieldMappingConfig[] =>
+  fields.filter(
+    (filter) =>
+      filter.id !== '__proto__' &&
+      filter.key !== '__proto__' &&
+      filter.name !== '__proto__' &&
+      filter.fieldType !== '__proto__'
+  );
+export async function getApplication({
+  signal,
+  url,
+  appId,
+  apiToken,
+}: {
+  signal: AbortSignal;
+  url: string;
+  appId: string;
+  apiToken: string;
+}): Promise<Record<string, any>> {
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'Private-Token': `${apiToken}`,
+  };
+
+  const urlWithoutTrailingSlash = url.endsWith('/') ? url.slice(0, -1) : url;
+  const apiUrl = urlWithoutTrailingSlash.endsWith('api')
+    ? urlWithoutTrailingSlash
+    : urlWithoutTrailingSlash + '/api';
+  const applicationUrl = `${apiUrl}/app/{appId}`;
+
+  const getApplicationUrl = (id: string) => applicationUrl.replace('{appId}', id);
+
+  try {
+    const response = await fetch(getApplicationUrl(appId), {
+      method: 'GET',
+      headers,
+      signal,
+    });
+
+    /**
+     * Fetch do not throw when there is an HTTP error (status >= 400).
+     * We need to do it manually.
+     */
+
+    if (!response.ok) {
+      throw new Error(
+        `Received status: ${response.status} when attempting to get application with id: ${appId}`
+      );
+    }
+
+    const data = await response.json();
+    return { ...data, fields: removeUnsafeFields(data?.fields ?? []) };
+  } catch (error) {
+    throw new Error(`Unable to get application with id ${appId}. Error: ${error.message}`);
+  }
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/helpers.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/helpers.ts
new file mode 100644
index 0000000000000..413b952675b8c
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/helpers.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { SwimlaneConnectorType, SwimlaneMappingConfig, MappingConfigurationKeys } from './types';
+import * as i18n from './translations';
+
+const casesRequiredFields: MappingConfigurationKeys[] = [
+  'caseNameConfig',
+  'descriptionConfig',
+  'commentsConfig',
+  'caseIdConfig',
+];
+const casesFields = [...casesRequiredFields];
+const alertsRequiredFields: MappingConfigurationKeys[] = ['ruleNameConfig', 'alertIdConfig'];
+const alertsFields = ['severityConfig', 'commentsConfig', ...alertsRequiredFields];
+
+const translationMapping: Record<string, string> = {
+  caseIdConfig: i18n.SW_REQUIRED_CASE_ID,
+  alertIdConfig: i18n.SW_REQUIRED_ALERT_ID,
+  caseNameConfig: i18n.SW_REQUIRED_CASE_NAME,
+  descriptionConfig: i18n.SW_REQUIRED_DESCRIPTION,
+  commentsConfig: i18n.SW_REQUIRED_COMMENTS,
+  ruleNameConfig: i18n.SW_REQUIRED_RULE_NAME,
+  severityConfig: i18n.SW_REQUIRED_SEVERITY,
+};
+
+export const isValidFieldForConnector = (
+  connector: SwimlaneConnectorType,
+  field: MappingConfigurationKeys
+): boolean => {
+  if (connector === SwimlaneConnectorType.All) {
+    return true;
+  }
+
+  return connector === SwimlaneConnectorType.Alerts
+    ? alertsFields.includes(field)
+    : casesFields.includes(field);
+};
+
+export const validateMappingForConnector = (
+  connectorType: SwimlaneConnectorType,
+  mapping: SwimlaneMappingConfig
+): Record<string, string> => {
+  if (connectorType === SwimlaneConnectorType.All || connectorType == null) {
+    return {};
+  }
+
+  const requiredFields =
+    connectorType === SwimlaneConnectorType.Alerts ? alertsRequiredFields : casesRequiredFields;
+
+  return requiredFields.reduce((errors, field) => {
+    if (mapping?.[field] == null) {
+      errors = { ...errors, [field]: translationMapping[field] };
+    }
+
+    return errors;
+  }, {} as Record<string, string>);
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/index.ts
new file mode 100644
index 0000000000000..39a57e1bccb61
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/index.ts
@@ -0,0 +1,8 @@
+/*
+ * 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 { getActionType as getSwimlaneActionType } from './swimlane';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/logo.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/logo.tsx
new file mode 100644
index 0000000000000..d22ff809fe74d
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/logo.tsx
@@ -0,0 +1,53 @@
+/*
+ * 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 React from 'react';
+
+const Logo = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="32"
+      height="32"
+      fill="none"
+      stroke="null"
+      vectorEffect="non-scaling-stroke"
+    >
+      <g fillRule="evenodd" stroke="null" clipRule="evenodd">
+        <path
+          fill="#19CCC0"
+          d="M21.536 9.338a1.053 1.053 0 00-1.29 0l-4.564 3.566a.988.988 0 000 1.566l4.725 3.691c.02.016.05.016.07 0l6.12-4.782a.054.054 0 000-.086l-5.061-3.955z"
+          vectorEffect="non-scaling-stroke"
+        />
+        <path
+          fill="#00FFF4"
+          d="M15.684 31.61l10.728-8.382a.627.627 0 00.244-.494v-9.401l-11.787 9.21a.627.627 0 00-.244.494v8.08c0 .531.633.827 1.059.494z"
+          vectorEffect="non-scaling-stroke"
+        />
+        <path
+          fill="#27AFA2"
+          d="M26.655 13.331L20.44 18.19l-1.703-1.331 7.917-3.527z"
+          vectorEffect="non-scaling-stroke"
+        />
+        <path
+          fill="#028ACF"
+          d="M10.464 22.663c.377.294.914.294 1.291 0l4.563-3.566a.987.987 0 000-1.565l-4.724-3.692a.058.058 0 00-.071 0l-6.12 4.782a.054.054 0 000 .086l5.061 3.955z"
+          vectorEffect="non-scaling-stroke"
+        />
+        <path
+          fill="#02AAFF"
+          d="M16.316.39L5.588 8.771a.628.628 0 00-.244.494v9.401l11.787-9.21a.628.628 0 00.244-.494V.883c0-.531-.633-.827-1.059-.494z"
+          vectorEffect="non-scaling-stroke"
+        />
+        <path fill="#0578A5" d="M5.344 18.67l6.214-4.858 1.704 1.331-7.918 3.527z" />
+      </g>
+    </svg>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export { Logo as default };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/mocks.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/mocks.ts
new file mode 100644
index 0000000000000..1574dfe2f5384
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/mocks.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 applicationFields = [
+  {
+    id: 'a6ide',
+    name: 'Alert Id',
+    key: 'alert-id',
+    fieldType: 'text',
+  },
+  {
+    id: 'adnlas',
+    name: 'Severity',
+    key: 'severity',
+    fieldType: 'text',
+  },
+  {
+    id: 'adnfls',
+    name: 'Rule Name',
+    key: 'rule-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6sst',
+    name: 'Case Id',
+    key: 'case-id-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6fst',
+    name: 'Case Name',
+    key: 'case-name',
+    fieldType: 'text',
+  },
+  {
+    id: 'a6fdf',
+    name: 'Comments',
+    key: 'notes',
+    fieldType: 'comments',
+  },
+  {
+    id: 'a6fde',
+    name: 'Description',
+    key: 'description',
+    fieldType: 'text',
+  },
+];
+
+export const mappings = {
+  alertIdConfig: applicationFields[0],
+  severityConfig: applicationFields[1],
+  ruleNameConfig: applicationFields[2],
+  caseIdConfig: applicationFields[3],
+  caseNameConfig: applicationFields[4],
+  commentsConfig: applicationFields[5],
+  descriptionConfig: applicationFields[6],
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/index.ts
new file mode 100644
index 0000000000000..ca7c39bf1378c
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/index.ts
@@ -0,0 +1,9 @@
+/*
+ * 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 { SwimlaneConnection } from './swimlane_connection';
+export { SwimlaneFields } from './swimlane_fields';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
new file mode 100644
index 0000000000000..cd29037e3535f
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
@@ -0,0 +1,201 @@
+/*
+ * 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 {
+  EuiButton,
+  EuiCallOut,
+  EuiFieldText,
+  EuiFormRow,
+  EuiLink,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
+import React, { useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
+import * as i18n from '../translations';
+import { useKibana } from '../../../../../common/lib/kibana';
+import { useGetApplication } from '../use_get_application';
+import { SwimlaneActionConnector, SwimlaneFieldMappingConfig } from '../types';
+import { IErrorObject } from '../../../../../types';
+
+interface Props {
+  action: SwimlaneActionConnector;
+  editActionConfig: (property: string, value: any) => void;
+  editActionSecrets: (property: string, value: any) => void;
+  errors: IErrorObject;
+  readOnly: boolean;
+  updateCurrentStep: (step: number) => void;
+  updateFields: (items: SwimlaneFieldMappingConfig[]) => void;
+}
+
+const SwimlaneConnectionComponent: React.FunctionComponent<Props> = ({
+  action,
+  editActionConfig,
+  editActionSecrets,
+  errors,
+  readOnly,
+  updateCurrentStep,
+  updateFields,
+}) => {
+  const {
+    notifications: { toasts },
+  } = useKibana().services;
+  const { apiUrl, appId } = action.config;
+  const { apiToken } = action.secrets;
+  const { docLinks } = useKibana().services;
+  const { getApplication } = useGetApplication({
+    toastNotifications: toasts,
+    apiToken,
+    appId,
+    apiUrl,
+  });
+  const isValid = apiUrl && apiToken && appId;
+
+  const connectSwimlane = useCallback(async () => {
+    // fetch swimlane application configuration
+    const application = await getApplication();
+
+    if (application?.fields) {
+      const allFields = application.fields;
+      updateFields(allFields);
+      updateCurrentStep(2);
+    }
+  }, [getApplication, updateCurrentStep, updateFields]);
+
+  const onChangeConfig = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>, key: 'apiUrl' | 'appId') => {
+      editActionConfig(key, e.target.value);
+    },
+    [editActionConfig]
+  );
+
+  const onBlurConfig = useCallback(
+    (key: 'apiUrl' | 'appId') => {
+      if (!action.config[key]) {
+        editActionConfig(key, '');
+      }
+    },
+    [action.config, editActionConfig]
+  );
+
+  const onChangeSecrets = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      editActionSecrets('apiToken', e.target.value);
+    },
+    [editActionSecrets]
+  );
+
+  const onBlurSecrets = useCallback(() => {
+    if (!apiToken) {
+      editActionSecrets('apiToken', '');
+    }
+  }, [apiToken, editActionSecrets]);
+
+  const isApiUrlInvalid = errors.apiUrl?.length > 0 && apiToken !== undefined;
+  const isAppIdInvalid = errors.appId?.length > 0 && apiToken !== undefined;
+  const isApiTokenInvalid = errors.apiToken?.length > 0 && apiToken !== undefined;
+
+  return (
+    <>
+      <EuiFormRow
+        id="apiUrl"
+        fullWidth
+        label={i18n.SW_API_URL_TEXT_FIELD_LABEL}
+        error={errors.apiUrl}
+        isInvalid={isApiUrlInvalid}
+      >
+        <EuiFieldText
+          fullWidth
+          name="apiUrl"
+          value={apiUrl ?? ''}
+          readOnly={readOnly}
+          isInvalid={isApiUrlInvalid}
+          data-test-subj="swimlaneApiUrlInput"
+          onChange={(e) => onChangeConfig(e, 'apiUrl')}
+          onBlur={() => onBlurConfig('apiUrl')}
+        />
+      </EuiFormRow>
+      <EuiFormRow
+        id="appId"
+        fullWidth
+        label={i18n.SW_APP_ID_TEXT_FIELD_LABEL}
+        error={errors.appId}
+        isInvalid={isAppIdInvalid}
+      >
+        <EuiFieldText
+          fullWidth
+          name="appId"
+          value={appId ?? ''}
+          readOnly={readOnly}
+          isInvalid={isAppIdInvalid}
+          data-test-subj="swimlaneAppIdInput"
+          onChange={(e) => onChangeConfig(e, 'appId')}
+          onBlur={() => onBlurConfig('appId')}
+        />
+      </EuiFormRow>
+      <EuiFormRow
+        id="apiToken"
+        fullWidth
+        helpText={
+          <EuiLink
+            href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/swimlane-action-type.html`}
+            target="_blank"
+          >
+            <FormattedMessage
+              id="xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.apiTokenNameHelpLabel"
+              defaultMessage="Provide a Swimlane API Token"
+            />
+          </EuiLink>
+        }
+        error={errors.apiToken}
+        isInvalid={isApiTokenInvalid}
+        label={i18n.SW_API_TOKEN_TEXT_FIELD_LABEL}
+      >
+        <>
+          {!action.id ? (
+            <>
+              <EuiSpacer size="s" />
+              <EuiText size="s" data-test-subj="rememberValuesMessage">
+                {i18n.SW_REMEMBER_VALUE_LABEL}
+              </EuiText>
+              <EuiSpacer size="s" />
+            </>
+          ) : (
+            <>
+              <EuiSpacer size="s" />
+              <EuiCallOut
+                size="s"
+                iconType="iInCircle"
+                data-test-subj="reenterValuesMessage"
+                title={i18n.SW_REENTER_VALUE_LABEL}
+              />
+              <EuiSpacer size="m" />
+            </>
+          )}
+          <EuiFieldText
+            fullWidth
+            isInvalid={isApiTokenInvalid}
+            readOnly={readOnly}
+            value={apiToken ?? ''}
+            data-test-subj="swimlaneApiTokenInput"
+            onChange={onChangeSecrets}
+            onBlur={onBlurSecrets}
+          />
+        </>
+      </EuiFormRow>
+      <EuiSpacer />
+      <EuiButton
+        disabled={!isValid}
+        onClick={connectSwimlane}
+        data-test-subj="swimlaneConfigureMapping"
+      >
+        {i18n.SW_RETRIEVE_CONFIGURATION_LABEL}
+      </EuiButton>
+    </>
+  );
+};
+
+export const SwimlaneConnection = React.memo(SwimlaneConnectionComponent);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_fields.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_fields.tsx
new file mode 100644
index 0000000000000..87d0964322e14
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_fields.tsx
@@ -0,0 +1,313 @@
+/*
+ * 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 React, { useMemo, useCallback, useEffect, useRef } from 'react';
+import {
+  EuiButton,
+  EuiFormRow,
+  EuiComboBox,
+  EuiComboBoxOptionOption,
+  EuiButtonGroup,
+} from '@elastic/eui';
+import * as i18n from '../translations';
+import {
+  SwimlaneActionConnector,
+  SwimlaneConnectorType,
+  SwimlaneFieldMappingConfig,
+  SwimlaneMappingConfig,
+} from '../types';
+import { IErrorObject } from '../../../../../types';
+import { isValidFieldForConnector } from '../helpers';
+
+const SINGLE_SELECTION = { asPlainText: true };
+const EMPTY_COMBO_BOX_ARRAY: Array<EuiComboBoxOptionOption<string>> | undefined = [];
+
+const formatOption = (field: SwimlaneFieldMappingConfig) => ({
+  label: `${field.name} (${field.key})`,
+  value: field.id,
+});
+
+const createSelectedOption = (field: SwimlaneFieldMappingConfig | null | undefined) =>
+  field != null ? [formatOption(field)] : EMPTY_COMBO_BOX_ARRAY;
+
+interface Props {
+  action: SwimlaneActionConnector;
+  editActionConfig: (property: string, value: any) => void;
+  updateCurrentStep: (step: number) => void;
+  fields: SwimlaneFieldMappingConfig[];
+  errors: IErrorObject;
+}
+
+const connectorTypeButtons = [
+  { id: 'all', label: 'All' },
+  { id: 'alerts', label: 'Alerts' },
+  { id: 'cases', label: 'Cases' },
+];
+
+const SwimlaneFieldsComponent: React.FC<Props> = ({
+  action,
+  editActionConfig,
+  updateCurrentStep,
+  fields,
+  errors,
+}) => {
+  const { mappings, connectorType = SwimlaneConnectorType.All } = action.config;
+  const prevConnectorType = useRef<SwimlaneConnectorType>(connectorType);
+  const hasChangedConnectorType = connectorType !== prevConnectorType.current;
+
+  const [fieldTypeMap, fieldIdMap] = useMemo(
+    () =>
+      fields.reduce(
+        ([typeMap, idMap], field) => {
+          if (field != null) {
+            typeMap.set(field.fieldType, [
+              ...(typeMap.get(field.fieldType) ?? []),
+              formatOption(field),
+            ]);
+            idMap.set(field.id, field);
+          }
+
+          return [typeMap, idMap];
+        },
+        [
+          new Map<string, Array<EuiComboBoxOptionOption<string>>>(),
+          new Map<string, SwimlaneFieldMappingConfig>(),
+        ]
+      ),
+    [fields]
+  );
+
+  const textOptions = useMemo(() => fieldTypeMap.get('text') ?? [], [fieldTypeMap]);
+  const commentsOptions = useMemo(() => fieldTypeMap.get('comments') ?? [], [fieldTypeMap]);
+
+  const state = useMemo(
+    () => ({
+      alertIdConfig: createSelectedOption(mappings?.alertIdConfig),
+      severityConfig: createSelectedOption(mappings?.severityConfig),
+      ruleNameConfig: createSelectedOption(mappings?.ruleNameConfig),
+      caseIdConfig: createSelectedOption(mappings?.caseIdConfig),
+      caseNameConfig: createSelectedOption(mappings?.caseNameConfig),
+      commentsConfig: createSelectedOption(mappings?.commentsConfig),
+      descriptionConfig: createSelectedOption(mappings?.descriptionConfig),
+    }),
+    [mappings]
+  );
+
+  const mappingErrors: Record<string, string> = useMemo(
+    () => (Array.isArray(errors?.mappings) ? errors?.mappings[0] : {}),
+    [errors]
+  );
+
+  const resetConnection = useCallback(() => {
+    updateCurrentStep(1);
+  }, [updateCurrentStep]);
+
+  const editMappings = useCallback(
+    (key: keyof SwimlaneMappingConfig, e: Array<EuiComboBoxOptionOption<string>>) => {
+      if (e.length === 0) {
+        const newProps = {
+          ...mappings,
+          [key]: null,
+        };
+        editActionConfig('mappings', newProps);
+        return;
+      }
+
+      const option = e[0];
+      const item = fieldIdMap.get(option.value ?? '');
+      if (!item) {
+        return;
+      }
+
+      const newProps = {
+        ...mappings,
+        [key]: { id: item.id, name: item.name, key: item.key, fieldType: item.fieldType },
+      };
+      editActionConfig('mappings', newProps);
+    },
+    [editActionConfig, fieldIdMap, mappings]
+  );
+
+  /**
+   * Connector type needs to be updated on mount to All.
+   * Otherwise it is undefined and this will cause an error
+   * if the user saves the connector without any mapping
+   */
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(() => editActionConfig('connectorType', connectorType), []);
+
+  useEffect(() => {
+    if (connectorType !== prevConnectorType.current) {
+      prevConnectorType.current = connectorType;
+    }
+  }, [connectorType]);
+
+  return (
+    <>
+      <EuiFormRow id="connectorType" fullWidth label={i18n.SW_CONNECTOR_TYPE_LABEL}>
+        <EuiButtonGroup
+          name="connectorType"
+          legend={i18n.SW_CONNECTOR_TYPE_LABEL}
+          options={connectorTypeButtons}
+          idSelected={connectorType}
+          onChange={(type) => editActionConfig('connectorType', type)}
+          buttonSize="compressed"
+        />
+      </EuiFormRow>
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType.All, 'alertIdConfig') && (
+        <>
+          <EuiFormRow
+            id="alertIdConfig"
+            fullWidth
+            label={i18n.SW_ALERT_ID_FIELD_LABEL}
+            error={mappingErrors?.alertIdConfig}
+            isInvalid={mappingErrors?.alertIdConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.alertIdConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneAlertIdInput"
+              onChange={(e) => editMappings('alertIdConfig', e)}
+              isInvalid={mappingErrors?.alertIdConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'ruleNameConfig') && (
+        <>
+          <EuiFormRow
+            id="ruleNameConfig"
+            fullWidth
+            label={i18n.SW_RULE_NAME_FIELD_LABEL}
+            error={mappingErrors?.ruleNameConfig}
+            isInvalid={mappingErrors?.ruleNameConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.ruleNameConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneAlertNameInput"
+              onChange={(e) => editMappings('ruleNameConfig', e)}
+              isInvalid={mappingErrors?.ruleNameConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'severityConfig') && (
+        <>
+          <EuiFormRow
+            id="severityConfig"
+            fullWidth
+            label={i18n.SW_SEVERITY_FIELD_LABEL}
+            error={mappingErrors?.severityConfig}
+            isInvalid={mappingErrors?.severityConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.severityConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneSeverityInput"
+              onChange={(e) => editMappings('severityConfig', e)}
+              isInvalid={mappingErrors?.severityConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'caseIdConfig') && (
+        <>
+          <EuiFormRow
+            id="caseIdConfig"
+            fullWidth
+            label={i18n.SW_CASE_ID_FIELD_LABEL}
+            error={mappingErrors?.caseIdConfig}
+            isInvalid={mappingErrors?.caseIdConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.caseIdConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneCaseIdConfig"
+              onChange={(e) => editMappings('caseIdConfig', e)}
+              isInvalid={mappingErrors?.caseIdConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'caseNameConfig') && (
+        <>
+          <EuiFormRow
+            id="caseNameConfig"
+            fullWidth
+            label={i18n.SW_CASE_NAME_FIELD_LABEL}
+            error={mappingErrors?.caseNameConfig}
+            isInvalid={mappingErrors?.caseNameConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.caseNameConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneCaseNameConfig"
+              onChange={(e) => editMappings('caseNameConfig', e)}
+              isInvalid={mappingErrors?.caseNameConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'commentsConfig') && (
+        <>
+          <EuiFormRow
+            id="commentsConfig"
+            fullWidth
+            label={i18n.SW_COMMENTS_FIELD_LABEL}
+            error={mappingErrors?.commentsConfig}
+            isInvalid={mappingErrors?.commentsConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.commentsConfig}
+              options={commentsOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneCommentsConfig"
+              onChange={(e) => editMappings('commentsConfig', e)}
+              isInvalid={mappingErrors?.commentsConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      {isValidFieldForConnector(connectorType as SwimlaneConnectorType, 'descriptionConfig') && (
+        <>
+          <EuiFormRow
+            id="descriptionConfig"
+            fullWidth
+            label={i18n.SW_DESCRIPTION_FIELD_LABEL}
+            error={mappingErrors?.descriptionConfig}
+            isInvalid={mappingErrors?.descriptionConfig != null && !hasChangedConnectorType}
+          >
+            <EuiComboBox
+              fullWidth
+              selectedOptions={state.descriptionConfig}
+              options={textOptions}
+              singleSelection={SINGLE_SELECTION}
+              data-test-subj="swimlaneDescriptionConfig"
+              onChange={(e) => editMappings('descriptionConfig', e)}
+              isInvalid={mappingErrors?.descriptionConfig != null && !hasChangedConnectorType}
+            />
+          </EuiFormRow>
+        </>
+      )}
+      <EuiButton onClick={resetConnection}>{i18n.SW_CONFIGURE_API_LABEL}</EuiButton>
+    </>
+  );
+};
+
+export const SwimlaneFields = React.memo(SwimlaneFieldsComponent);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
new file mode 100644
index 0000000000000..07d78a8885c51
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
@@ -0,0 +1,219 @@
+/*
+ * 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 { TypeRegistry } from '../../../type_registry';
+import { registerBuiltInActionTypes } from '.././index';
+import { ActionTypeModel } from '../../../../types';
+import { SwimlaneActionConnector } from './types';
+
+const ACTION_TYPE_ID = '.swimlane';
+let actionTypeModel: ActionTypeModel;
+
+beforeAll(() => {
+  const actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
+  registerBuiltInActionTypes({ actionTypeRegistry });
+  const getResult = actionTypeRegistry.get(ACTION_TYPE_ID);
+  if (getResult !== null) {
+    actionTypeModel = getResult;
+  }
+});
+
+describe('actionTypeRegistry.get() works', () => {
+  test('action type static data is as expected', () => {
+    expect(actionTypeModel.id).toEqual(ACTION_TYPE_ID);
+  });
+});
+
+describe('swimlane connector validation', () => {
+  test('connector validation succeeds when connector is valid', async () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings: {
+          alertIdConfig: { id: '1234' },
+          severityConfig: { id: '1234' },
+          ruleNameConfig: { id: '1234' },
+          caseIdConfig: { id: '1234' },
+          caseNameConfig: { id: '1234' },
+          descriptionConfig: { id: '1234' },
+          commentsConfig: { id: '1234' },
+        },
+      },
+    } as SwimlaneActionConnector;
+
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
+      config: { errors: { apiUrl: [], appId: [], mappings: [], connectorType: [] } },
+      secrets: { errors: { apiToken: [] } },
+    });
+  });
+
+  test('it validates correctly when connectorType=all', async () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings: {},
+      },
+    } as SwimlaneActionConnector;
+
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
+      config: { errors: { apiUrl: [], appId: [], mappings: [], connectorType: [] } },
+      secrets: { errors: { apiToken: [] } },
+    });
+  });
+
+  test('it validates correctly when connectorType=cases', async () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'cases',
+        mappings: {},
+      },
+    } as SwimlaneActionConnector;
+
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
+      config: {
+        errors: {
+          apiUrl: [],
+          appId: [],
+          mappings: [
+            {
+              caseIdConfig: 'Case ID is required.',
+              caseNameConfig: 'Case name is required.',
+              commentsConfig: 'Comments are required.',
+              descriptionConfig: 'Description is required.',
+            },
+          ],
+          connectorType: [],
+        },
+      },
+      secrets: { errors: { apiToken: [] } },
+    });
+  });
+
+  test('it validates correctly when connectorType=alerts', async () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'alerts',
+        mappings: {},
+      },
+    } as SwimlaneActionConnector;
+
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
+      config: {
+        errors: {
+          apiUrl: [],
+          appId: [],
+          mappings: [
+            {
+              alertIdConfig: 'Alert ID is required.',
+              ruleNameConfig: 'Rule name is required.',
+            },
+          ],
+          connectorType: [],
+        },
+      },
+      secrets: { errors: { apiToken: [] } },
+    });
+  });
+
+  test('it validates correctly required config/secrets fields', async () => {
+    const actionConnector = {
+      secrets: {},
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {},
+    } as SwimlaneActionConnector;
+
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
+      config: {
+        errors: {
+          apiUrl: ['URL is required.'],
+          appId: ['An App ID is required.'],
+          mappings: [],
+          connectorType: [],
+        },
+      },
+      secrets: { errors: { apiToken: ['An API token is required.'] } },
+    });
+  });
+});
+
+describe('swimlane action params validation', () => {
+  test('action params validation succeeds when action params is valid', async () => {
+    const actionParams = {
+      subActionParams: {
+        ruleName: 'Rule Name',
+        alertId: 'alert-id',
+      },
+    };
+
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
+      errors: {
+        'subActionParams.incident.ruleName': [],
+        'subActionParams.incident.alertId': [],
+      },
+    });
+  });
+
+  test('it validates correctly required fields', async () => {
+    const actionParams = {
+      subActionParams: { incident: {} },
+    };
+
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
+      errors: {
+        'subActionParams.incident.ruleName': ['Rule name is required.'],
+        'subActionParams.incident.alertId': ['Alert ID is required.'],
+      },
+    });
+  });
+
+  test('it succeeds when missing incident', async () => {
+    const actionParams = {
+      subActionParams: {},
+    };
+
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
+      errors: {
+        'subActionParams.incident.ruleName': [],
+        'subActionParams.incident.alertId': [],
+      },
+    });
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.tsx
new file mode 100644
index 0000000000000..5e06e3935eebd
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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 { isEmpty } from 'lodash';
+import { lazy } from 'react';
+import {
+  ActionTypeModel,
+  ConnectorValidationResult,
+  GenericValidationResult,
+} from '../../../../types';
+import {
+  SwimlaneActionConnector,
+  SwimlaneConfig,
+  SwimlaneSecrets,
+  SwimlaneActionParams,
+} from './types';
+import * as i18n from './translations';
+import { isValidUrl } from '../../../lib/value_validators';
+import { validateMappingForConnector } from './helpers';
+
+export function getActionType(): ActionTypeModel<
+  SwimlaneConfig,
+  SwimlaneSecrets,
+  SwimlaneActionParams
+> {
+  return {
+    id: '.swimlane',
+    iconClass: lazy(() => import('./logo')),
+    selectMessage: i18n.SW_SELECT_MESSAGE_TEXT,
+    actionTypeTitle: i18n.SW_ACTION_TYPE_TITLE,
+    validateConnector: async (
+      action: SwimlaneActionConnector
+    ): Promise<ConnectorValidationResult<SwimlaneConfig, SwimlaneSecrets>> => {
+      const configErrors = {
+        apiUrl: new Array<string>(),
+        appId: new Array<string>(),
+        connectorType: new Array<string>(),
+        mappings: new Array<Record<string, string>>(),
+      };
+      const secretsErrors = {
+        apiToken: new Array<string>(),
+      };
+
+      const validationResult = {
+        config: { errors: configErrors },
+        secrets: { errors: secretsErrors },
+      };
+
+      if (!action.config.apiUrl) {
+        configErrors.apiUrl = [...configErrors.apiUrl, i18n.SW_API_URL_REQUIRED];
+      } else if (action.config.apiUrl) {
+        if (!isValidUrl(action.config.apiUrl)) {
+          configErrors.apiUrl = [...configErrors.apiUrl, i18n.SW_API_URL_INVALID];
+        }
+      }
+
+      if (!action.secrets.apiToken) {
+        secretsErrors.apiToken = [...secretsErrors.apiToken, i18n.SW_REQUIRED_API_TOKEN_TEXT];
+      }
+
+      if (!action.config.appId) {
+        configErrors.appId = [...configErrors.appId, i18n.SW_REQUIRED_APP_ID_TEXT];
+      }
+
+      const mappingErrors = validateMappingForConnector(
+        action.config.connectorType,
+        action.config.mappings
+      );
+
+      if (!isEmpty(mappingErrors)) {
+        configErrors.mappings = [...configErrors.mappings, mappingErrors];
+      }
+
+      return validationResult;
+    },
+    validateParams: async (
+      actionParams: SwimlaneActionParams
+    ): Promise<GenericValidationResult<unknown>> => {
+      const errors = {
+        'subActionParams.incident.ruleName': new Array<string>(),
+        'subActionParams.incident.alertId': new Array<string>(),
+      };
+      const validationResult = {
+        errors,
+      };
+
+      const hasIncident = actionParams.subActionParams && actionParams.subActionParams.incident;
+
+      if (hasIncident && !actionParams.subActionParams.incident.ruleName?.length) {
+        errors['subActionParams.incident.ruleName'].push(i18n.SW_REQUIRED_RULE_NAME);
+      }
+
+      if (hasIncident && !actionParams.subActionParams.incident.alertId?.length) {
+        errors['subActionParams.incident.alertId'].push(i18n.SW_REQUIRED_ALERT_ID);
+      }
+
+      return validationResult;
+    },
+    actionConnectorFields: lazy(() => import('./swimlane_connectors')),
+    actionParamsFields: lazy(() => import('./swimlane_params')),
+  };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.test.tsx
new file mode 100644
index 0000000000000..6740179d786f2
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.test.tsx
@@ -0,0 +1,319 @@
+/*
+ * 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 React from 'react';
+import { mountWithIntl, nextTick } from '@kbn/test/jest';
+import { act } from 'react-dom/test-utils';
+import { SwimlaneActionConnector } from './types';
+import SwimlaneActionConnectorFields from './swimlane_connectors';
+import { useGetApplication } from './use_get_application';
+import { applicationFields, mappings } from './mocks';
+
+jest.mock('../../../../common/lib/kibana');
+jest.mock('./use_get_application');
+
+const useGetApplicationMock = useGetApplication as jest.Mock;
+const getApplication = jest.fn();
+
+describe('SwimlaneActionConnectorFields renders', () => {
+  beforeAll(() => {
+    useGetApplicationMock.mockReturnValue({
+      getApplication,
+      isLoading: false,
+    });
+  });
+
+  test('all connector fields are rendered', async () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="swimlaneApiUrlInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneAppIdInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneApiTokenInput"]').exists()).toBeTruthy();
+  });
+
+  test('should display a message on create to remember credentials', () => {
+    const actionConnector = {
+      actionTypeId: '.swimlane',
+      secrets: {},
+      config: {},
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="rememberValuesMessage"]').length).toBeGreaterThan(0);
+    expect(wrapper.find('[data-test-subj="reenterValuesMessage"]').length).toEqual(0);
+  });
+
+  test('should display a message on edit to re-enter credentials', () => {
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="reenterValuesMessage"]').length).toBeGreaterThan(0);
+    expect(wrapper.find('[data-test-subj="rememberValuesMessage"]').length).toEqual(0);
+  });
+
+  test('renders the mappings correctly - connector type all', async () => {
+    getApplication.mockResolvedValue({
+      fields: applicationFields,
+    });
+
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+
+    await act(async () => {
+      wrapper.find('[data-test-subj="swimlaneConfigureMapping"]').first().simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="swimlaneAlertIdInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneAlertNameInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneSeverityInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseIdConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseNameConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCommentsConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneDescriptionConfig"]').exists()).toBeTruthy();
+  });
+
+  test('renders the mappings correctly - connector type cases', async () => {
+    getApplication.mockResolvedValue({
+      fields: applicationFields,
+    });
+
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'cases',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+
+    await act(async () => {
+      wrapper.find('[data-test-subj="swimlaneConfigureMapping"]').first().simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="swimlaneAlertIdInput"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="swimlaneAlertNameInput"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="swimlaneSeverityInput"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseIdConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseNameConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCommentsConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneDescriptionConfig"]').exists()).toBeTruthy();
+  });
+
+  test('renders the mappings correctly - connector type alerts', async () => {
+    getApplication.mockResolvedValue({
+      fields: applicationFields,
+    });
+
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'alerts',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+
+    await act(async () => {
+      wrapper.find('[data-test-subj="swimlaneConfigureMapping"]').first().simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="swimlaneAlertIdInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneAlertNameInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneSeverityInput"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseIdConfig"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="swimlaneCaseNameConfig"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="swimlaneCommentsConfig"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="swimlaneDescriptionConfig"]').exists()).toBeFalsy();
+  });
+
+  test('renders the correct options per field', async () => {
+    getApplication.mockResolvedValue({
+      fields: applicationFields,
+    });
+
+    const actionConnector = {
+      secrets: {
+        apiToken: 'test',
+      },
+      id: 'test',
+      actionTypeId: '.swimlane',
+      name: 'swimlane',
+      config: {
+        apiUrl: 'http:\\test',
+        appId: '1234567asbd32',
+        connectorType: 'all',
+        mappings,
+      },
+    } as SwimlaneActionConnector;
+
+    const textOptions = [
+      { label: 'Alert Id (alert-id)', value: 'a6ide' },
+      { label: 'Severity (severity)', value: 'adnlas' },
+      { label: 'Rule Name (rule-name)', value: 'adnfls' },
+      { label: 'Case Id (case-id-name)', value: 'a6sst' },
+      { label: 'Case Name (case-name)', value: 'a6fst' },
+      { label: 'Description (description)', value: 'a6fde' },
+    ];
+
+    const commentOptions = [{ label: 'Comments (notes)', value: 'a6fdf' }];
+
+    const wrapper = mountWithIntl(
+      <SwimlaneActionConnectorFields
+        action={actionConnector}
+        errors={{ connectorType: [], appId: [], apiUrl: [], mappings: [], apiToken: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+
+    await act(async () => {
+      wrapper.find('[data-test-subj="swimlaneConfigureMapping"]').first().simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="swimlaneAlertIdInput"]').first().prop('options')).toEqual(
+      textOptions
+    );
+    expect(
+      wrapper.find('[data-test-subj="swimlaneAlertNameInput"]').first().prop('options')
+    ).toEqual(textOptions);
+    expect(
+      wrapper.find('[data-test-subj="swimlaneSeverityInput"]').first().prop('options')
+    ).toEqual(textOptions);
+    expect(wrapper.find('[data-test-subj="swimlaneCaseIdConfig"]').first().prop('options')).toEqual(
+      textOptions
+    );
+    expect(
+      wrapper.find('[data-test-subj="swimlaneCaseNameConfig"]').first().prop('options')
+    ).toEqual(textOptions);
+    expect(
+      wrapper.find('[data-test-subj="swimlaneCommentsConfig"]').first().prop('options')
+    ).toEqual(commentOptions);
+    expect(
+      wrapper.find('[data-test-subj="swimlaneDescriptionConfig"]').first().prop('options')
+    ).toEqual(textOptions);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.tsx
new file mode 100644
index 0000000000000..acf9f38e9ba48
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_connectors.tsx
@@ -0,0 +1,103 @@
+/*
+ * 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 React, { Fragment, useCallback, useMemo, useState } from 'react';
+import { EuiForm, EuiSpacer, EuiStepsHorizontal, EuiStepStatus } from '@elastic/eui';
+import * as i18n from './translations';
+import { ActionConnectorFieldsProps } from '../../../../types';
+import { SwimlaneActionConnector, SwimlaneFieldMappingConfig } from './types';
+import { SwimlaneConnection, SwimlaneFields } from './steps';
+
+const SwimlaneActionConnectorFields: React.FunctionComponent<
+  ActionConnectorFieldsProps<SwimlaneActionConnector>
+> = ({ errors, action, editActionConfig, editActionSecrets, readOnly }) => {
+  const [currentStep, setCurrentStep] = useState<number>(1);
+  const [stepsStatuses, setStepsStatuses] = useState<{
+    connection: EuiStepStatus;
+    fields: EuiStepStatus;
+  }>({ connection: 'incomplete', fields: 'incomplete' });
+  const [fields, setFields] = useState<SwimlaneFieldMappingConfig[]>([]);
+
+  const updateCurrentStep = useCallback(
+    (step: number) => {
+      setCurrentStep(step);
+      if (step === 2) {
+        setStepsStatuses((statuses) => ({ ...statuses, connection: 'complete' }));
+      } else if (step === 1) {
+        setStepsStatuses({
+          fields: 'incomplete',
+          connection: 'incomplete',
+        });
+        editActionConfig('mappings', action.config.mappings);
+      }
+    },
+    [action.config.mappings, editActionConfig]
+  );
+
+  const setupSteps = useMemo(
+    () => [
+      {
+        title: i18n.SW_CONFIGURE_CONNECTION_LABEL,
+        status: stepsStatuses.connection,
+        onClick: () => updateCurrentStep(1),
+      },
+      {
+        title: i18n.SW_MAPPING_TITLE_TEXT_FIELD_LABEL,
+        disabled: stepsStatuses.connection !== 'complete',
+        status: stepsStatuses.fields,
+        onClick: () => updateCurrentStep(2),
+      },
+    ],
+    [stepsStatuses.connection, stepsStatuses.fields, updateCurrentStep]
+  );
+
+  const editActionConfigCb = useCallback(
+    (k: string, v: string) => {
+      editActionConfig(k, v);
+      if (
+        Object.values(errors?.mappings ?? {}).every((mappingError) => mappingError.length === 0)
+      ) {
+        setStepsStatuses((statuses) => ({ ...statuses, fields: 'complete' }));
+      } else {
+        setStepsStatuses((statuses) => ({ ...statuses, fields: 'incomplete' }));
+      }
+    },
+    [editActionConfig, errors?.mappings]
+  );
+
+  return (
+    <Fragment>
+      <EuiStepsHorizontal steps={setupSteps} />
+      <EuiSpacer size="l" />
+      <EuiForm>
+        {currentStep === 1 && (
+          <SwimlaneConnection
+            action={action}
+            editActionConfig={editActionConfigCb}
+            editActionSecrets={editActionSecrets}
+            readOnly={readOnly}
+            errors={errors}
+            updateCurrentStep={updateCurrentStep}
+            updateFields={setFields}
+          />
+        )}
+        {currentStep === 2 && (
+          <SwimlaneFields
+            action={action}
+            editActionConfig={editActionConfigCb}
+            updateCurrentStep={updateCurrentStep}
+            fields={fields}
+            errors={errors}
+          />
+        )}
+      </EuiForm>
+    </Fragment>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export { SwimlaneActionConnectorFields as default };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.test.tsx
new file mode 100644
index 0000000000000..32cf2c3c786d3
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.test.tsx
@@ -0,0 +1,137 @@
+/*
+ * 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 React from 'react';
+import { mountWithIntl } from '@kbn/test/jest';
+import SwimlaneParamsFields from './swimlane_params';
+import { SwimlaneConnectorType } from './types';
+import { mappings } from './mocks';
+
+describe('SwimlaneParamsFields renders', () => {
+  const editAction = jest.fn();
+  const actionParams = {
+    subAction: 'pushToService',
+    subActionParams: {
+      incident: {
+        alertId: '3456789',
+        ruleName: 'rule name',
+        severity: 'critical',
+        caseId: null,
+        caseName: null,
+        description: null,
+        externalId: null,
+      },
+      comments: [],
+    },
+  };
+
+  const connector = {
+    secrets: {},
+    config: { mappings, connectorType: SwimlaneConnectorType.All },
+    id: 'test',
+    actionTypeId: '.test',
+    name: 'Test',
+    isPreconfigured: false,
+  };
+
+  const defaultProps = {
+    actionParams,
+    errors: {
+      'subActionParams.incident.ruleName': [],
+      'subActionParams.incident.alertId': [],
+    },
+    editAction,
+    index: 0,
+    messageVariables: [],
+    actionConnector: connector,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('all params fields are rendered', () => {
+    const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+
+    expect(wrapper.find('[data-test-subj="severity"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="comments"]').exists()).toBeTruthy();
+  });
+
+  test('it set the correct default params', () => {
+    mountWithIntl(<SwimlaneParamsFields {...defaultProps} actionParams={{}} />);
+    expect(editAction).toHaveBeenCalledWith('subAction', 'pushToService', 0);
+    expect(editAction).toHaveBeenCalledWith(
+      'subActionParams',
+      {
+        incident: { alertId: '{{alert.id}}', ruleName: '{{rule.name}}' },
+        comments: [],
+      },
+      0
+    );
+  });
+
+  test('it reset the fields when connector changes', () => {
+    const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+    expect(editAction).not.toHaveBeenCalled();
+
+    wrapper.setProps({ actionConnector: { ...connector, id: '1234' } });
+    expect(editAction).toHaveBeenCalledWith(
+      'subActionParams',
+      {
+        incident: { alertId: '{{alert.id}}', ruleName: '{{rule.name}}' },
+        comments: [],
+      },
+      0
+    );
+  });
+
+  test('it set the severity', () => {
+    const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+    expect(editAction).not.toHaveBeenCalled();
+
+    wrapper.setProps({ actionConnector: { ...connector, id: '1234' } });
+    expect(editAction).toHaveBeenCalledWith(
+      'subActionParams',
+      {
+        incident: { alertId: '{{alert.id}}', ruleName: '{{rule.name}}' },
+        comments: [],
+      },
+      0
+    );
+  });
+
+  describe('UI updates', () => {
+    const changeEvent = { target: { value: 'Bug' } } as React.ChangeEvent<HTMLSelectElement>;
+    const simpleFields = [
+      { dataTestSubj: 'input[data-test-subj="severityInput"]', key: 'severity' },
+    ];
+
+    simpleFields.forEach((field) =>
+      test(`${field.key} update triggers editAction`, () => {
+        const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+        const theField = wrapper.find(field.dataTestSubj).first();
+        theField.prop('onChange')!(changeEvent);
+        expect(editAction.mock.calls[0][1].incident[field.key]).toEqual(changeEvent.target.value);
+      })
+    );
+
+    test('A comment triggers editAction', () => {
+      const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+      const comments = wrapper.find('textarea[data-test-subj="commentsTextArea"]');
+      expect(comments.simulate('change', changeEvent));
+      expect(editAction.mock.calls[0][1].comments.length).toEqual(1);
+    });
+
+    test('An empty comment does not trigger editAction', () => {
+      const wrapper = mountWithIntl(<SwimlaneParamsFields {...defaultProps} />);
+      const emptyComment = { target: { value: '' } };
+      const comments = wrapper.find('[data-test-subj="commentsTextArea"] textarea');
+      expect(comments.simulate('change', emptyComment));
+      expect(editAction.mock.calls.length).toEqual(0);
+    });
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.tsx
new file mode 100644
index 0000000000000..9bd14a06d657a
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane_params.tsx
@@ -0,0 +1,159 @@
+/*
+ * 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 React, { useCallback, useEffect, useRef, useMemo } from 'react';
+import { EuiCallOut, EuiFormRow, EuiSpacer } from '@elastic/eui';
+import * as i18n from './translations';
+import { ActionParamsProps } from '../../../../types';
+import { SwimlaneActionConnector, SwimlaneActionParams, SwimlaneConnectorType } from './types';
+import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
+import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
+
+const SwimlaneParamsFields: React.FunctionComponent<ActionParamsProps<SwimlaneActionParams>> = ({
+  actionParams,
+  editAction,
+  index,
+  messageVariables,
+  actionConnector,
+}) => {
+  const { incident, comments } = useMemo(
+    () =>
+      actionParams.subActionParams ??
+      (({
+        incident: {},
+        comments: [],
+      } as unknown) as SwimlaneActionParams['subActionParams']),
+    [actionParams.subActionParams]
+  );
+
+  const actionConnectorRef = useRef(actionConnector?.id ?? '');
+
+  const {
+    mappings,
+    connectorType,
+  } = ((actionConnector as unknown) as SwimlaneActionConnector).config;
+  const { hasAlertId, hasRuleName, hasComments, hasSeverity } = useMemo(
+    () => ({
+      hasAlertId: mappings.alertIdConfig != null,
+      hasRuleName: mappings.ruleNameConfig != null,
+      hasComments: mappings.commentsConfig != null,
+      hasSeverity: mappings.severityConfig != null,
+    }),
+    [
+      mappings.alertIdConfig,
+      mappings.ruleNameConfig,
+      mappings.commentsConfig,
+      mappings.severityConfig,
+    ]
+  );
+
+  /**
+   * The user can use either a connector of type alerts or all.
+   * If the connector is of type all we should check if all
+   * required field have been configured.
+   */
+  const showMappingWarning =
+    connectorType === SwimlaneConnectorType.Cases || !hasRuleName || !hasAlertId;
+
+  const editSubActionProperty = useCallback(
+    (key: string, value: any) => {
+      if (key === 'comments') {
+        return editAction('subActionParams', { incident, comments: value }, index);
+      }
+
+      return editAction(
+        'subActionParams',
+        {
+          incident: { ...incident, [key]: value },
+          comments,
+        },
+        index
+      );
+    },
+    [editAction, incident, comments, index]
+  );
+
+  const editComment = useCallback(
+    (key, value) => {
+      if (value.length > 0) {
+        editSubActionProperty(key, [{ commentId: '1', comment: value }]);
+      }
+    },
+    [editSubActionProperty]
+  );
+
+  useEffect(() => {
+    if (actionConnector != null && actionConnectorRef.current !== actionConnector.id) {
+      actionConnectorRef.current = actionConnector.id;
+      editAction(
+        'subActionParams',
+        {
+          incident: { alertId: '{{alert.id}}', ruleName: '{{rule.name}}' },
+          comments: [],
+        },
+        index
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionConnector]);
+
+  useEffect(() => {
+    if (!actionParams.subAction) {
+      editAction('subAction', 'pushToService', index);
+    }
+
+    if (!actionParams.subActionParams) {
+      editAction(
+        'subActionParams',
+        {
+          incident: { alertId: '{{alert.id}}', ruleName: '{{rule.name}}' },
+          comments: [],
+        },
+        index
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionParams]);
+
+  return !showMappingWarning ? (
+    <>
+      {hasSeverity && (
+        <>
+          <EuiFormRow fullWidth label={i18n.SW_SEVERITY_FIELD_LABEL}>
+            <TextFieldWithMessageVariables
+              index={index}
+              data-test-subj="severity"
+              editAction={editSubActionProperty}
+              messageVariables={messageVariables}
+              paramsProperty={'severity'}
+              inputTargetValue={incident.severity ?? undefined}
+            />
+          </EuiFormRow>
+          <EuiSpacer size="m" />
+        </>
+      )}
+      {hasComments && (
+        <TextAreaWithMessageVariables
+          data-test-subj="comments"
+          index={index}
+          editAction={editComment}
+          messageVariables={messageVariables}
+          paramsProperty={'comments'}
+          inputTargetValue={comments && comments.length > 0 ? comments[0].comment : undefined}
+          label={i18n.SW_COMMENTS_FIELD_LABEL}
+        />
+      )}
+    </>
+  ) : (
+    <EuiCallOut title={i18n.EMPTY_MAPPING_WARNING_TITLE} color="warning" iconType="help">
+      {i18n.EMPTY_MAPPING_WARNING_DESC}
+    </EuiCallOut>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export { SwimlaneParamsFields as default };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/translations.ts
new file mode 100644
index 0000000000000..726997cb4456a
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/translations.ts
@@ -0,0 +1,282 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const SW_SELECT_MESSAGE_TEXT = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.selectMessageText',
+  {
+    defaultMessage: 'Create record in Swimlane',
+  }
+);
+
+export const SW_ACTION_TYPE_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.actionTypeTitle',
+  {
+    defaultMessage: 'Create Swimlane Record',
+  }
+);
+
+export const SW_REQUIRED_RULE_NAME = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredRuleName',
+  {
+    defaultMessage: 'Rule name is required.',
+  }
+);
+
+export const SW_REQUIRED_APP_ID_TEXT = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredAppIdText',
+  {
+    defaultMessage: 'An App ID is required.',
+  }
+);
+
+export const SW_REQUIRED_FIELD_MAPPINGS_TEXT = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredFieldMappingsText',
+  {
+    defaultMessage: 'Field mappings are required.',
+  }
+);
+
+export const SW_REQUIRED_API_TOKEN_TEXT = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredApiTokenText',
+  {
+    defaultMessage: 'An API token is required.',
+  }
+);
+
+export const SW_GET_APPLICATION_API_ERROR = (id: string | null) =>
+  i18n.translate(
+    'xpack.triggersActionsUI.components.builtinActionTypes.swimlane.unableToGetApplicationMessage',
+    {
+      defaultMessage: 'Unable to get application with id {id}',
+      values: { id },
+    }
+  );
+
+export const SW_GET_APPLICATION_API_NO_FIELDS_ERROR = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlane.unableToGetApplicationFieldsMessage',
+  {
+    defaultMessage: 'Unable to get application fields',
+  }
+);
+
+export const SW_API_URL_TEXT_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.apiUrlTextFieldLabel',
+  {
+    defaultMessage: 'API Url',
+  }
+);
+
+export const SW_API_URL_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.requiredApiUrlTextField',
+  {
+    defaultMessage: 'URL is required.',
+  }
+);
+
+export const SW_API_URL_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.invalidApiUrlTextField',
+  {
+    defaultMessage: 'URL is invalid.',
+  }
+);
+
+export const SW_APP_ID_TEXT_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.appIdTextFieldLabel',
+  {
+    defaultMessage: 'Application ID',
+  }
+);
+
+export const SW_API_TOKEN_TEXT_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.apiTokenTextFieldLabel',
+  {
+    defaultMessage: 'API Token',
+  }
+);
+
+export const SW_MAPPING_TITLE_TEXT_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.mappingTitleTextFieldLabel',
+  {
+    defaultMessage: 'Configure Field Mappings',
+  }
+);
+
+export const SW_ALERT_SOURCE_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.alertSourceFieldLabel',
+  {
+    defaultMessage: 'Alert source',
+  }
+);
+
+export const SW_SEVERITY_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.severityFieldLabel',
+  {
+    defaultMessage: 'Severity',
+  }
+);
+
+export const SW_MAPPING_DESCRIPTION_TEXT_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.mappingDescriptionTextFieldLabel',
+  {
+    defaultMessage: 'Used to specify the field names in the Swimlane Application',
+  }
+);
+
+export const SW_RULE_NAME_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.ruleNameFieldLabel',
+  {
+    defaultMessage: 'Rule name',
+  }
+);
+
+export const SW_ALERT_ID_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.alertIdFieldLabel',
+  {
+    defaultMessage: 'Alert ID',
+  }
+);
+
+export const SW_CASE_ID_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.caseIdFieldLabel',
+  {
+    defaultMessage: 'Case ID',
+  }
+);
+
+export const SW_CASE_NAME_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.caseNameFieldLabel',
+  {
+    defaultMessage: 'Case name',
+  }
+);
+
+export const SW_COMMENTS_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.commentsFieldLabel',
+  {
+    defaultMessage: 'Comments',
+  }
+);
+
+export const SW_DESCRIPTION_FIELD_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.descriptionFieldLabel',
+  {
+    defaultMessage: 'Description',
+  }
+);
+
+export const SW_REMEMBER_VALUE_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.rememberValueLabel',
+  { defaultMessage: 'Remember this value. You must reenter it each time you edit the connector.' }
+);
+
+export const SW_REENTER_VALUE_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.reenterValueLabel',
+  { defaultMessage: 'This key is encrypted. Please reenter a value for this field.' }
+);
+
+export const SW_CONFIGURE_CONNECTION_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.configureConnectionLabel',
+  { defaultMessage: 'Configure API Connection' }
+);
+
+export const SW_RETRIEVE_CONFIGURATION_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.retrieveConfigurationLabel',
+  { defaultMessage: 'Configure Fields' }
+);
+
+export const SW_CONFIGURE_API_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.configureAPILabel',
+  { defaultMessage: 'Configure API' }
+);
+
+export const SW_CONNECTOR_TYPE_LABEL = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.connectorType',
+  {
+    defaultMessage: 'Connector Type',
+  }
+);
+
+export const SW_FIELD_MAPPING_IS_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.mappingFieldRequired',
+  {
+    defaultMessage: 'Field mapping is required.',
+  }
+);
+
+export const EMPTY_MAPPING_WARNING_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.emptyMappingWarningTitle',
+  {
+    defaultMessage: 'This connector has missing field mappings',
+  }
+);
+
+export const EMPTY_MAPPING_WARNING_DESC = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.emptyMappingWarningDesc',
+  {
+    defaultMessage:
+      'This connector cannot be selected because it is missing the required case field mappings. You can edit this connector to add required field mappings or select a connector of type Alerts.',
+  }
+);
+
+export const SW_REQUIRED_ALERT_SOURCE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredAlertSource',
+  {
+    defaultMessage: 'Alert source is required.',
+  }
+);
+
+export const SW_REQUIRED_SEVERITY = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredSeverity',
+  {
+    defaultMessage: 'Severity is required.',
+  }
+);
+
+export const SW_REQUIRED_CASE_NAME = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredCaseName',
+  {
+    defaultMessage: 'Case name is required.',
+  }
+);
+
+export const SW_REQUIRED_CASE_ID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredCaseID',
+  {
+    defaultMessage: 'Case ID is required.',
+  }
+);
+
+export const SW_REQUIRED_COMMENTS = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredComments',
+  {
+    defaultMessage: 'Comments are required.',
+  }
+);
+
+export const SW_REQUIRED_DESCRIPTION = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredDescription',
+  {
+    defaultMessage: 'Description is required.',
+  }
+);
+
+export const SW_REQUIRED_ALERT_ID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.error.requiredAlertID',
+  {
+    defaultMessage: 'Alert ID is required.',
+  }
+);
+
+export const SW_ALERT_SOURCE_TOOLTIP = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.swimlaneAction.alertSourceTooltip',
+  {
+    defaultMessage: 'The index of the alert. Use {index} in Detections.',
+    values: { index: '{{context.rule.output_index}}' },
+  }
+);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
new file mode 100644
index 0000000000000..f0a54e8b6c3bf
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+
+import { UserConfiguredActionConnector } from '../../../../types';
+import {
+  ExecutorSubActionPushParams,
+  MappingConfigType,
+} from '../../../../../../actions/server/builtin_action_types/swimlane/types';
+
+export type SwimlaneActionConnector = UserConfiguredActionConnector<
+  SwimlaneConfig,
+  SwimlaneSecrets
+>;
+
+export interface SwimlaneConfig {
+  apiUrl: string;
+  appId: string;
+  connectorType: SwimlaneConnectorType;
+  mappings: SwimlaneMappingConfig;
+}
+
+export type MappingConfigurationKeys = keyof MappingConfigType;
+export type SwimlaneMappingConfig = Record<keyof MappingConfigType, SwimlaneFieldMappingConfig>;
+
+export interface SwimlaneFieldMappingConfig {
+  id: string;
+  key: string;
+  name: string;
+  fieldType: string;
+}
+
+export interface SwimlaneSecrets {
+  apiToken: string;
+}
+
+export interface SwimlaneActionParams {
+  subAction: string;
+  subActionParams: ExecutorSubActionPushParams;
+}
+
+export interface SwimlaneFieldMap {
+  key: string;
+  name: string;
+}
+
+export enum SwimlaneConnectorType {
+  All = 'all',
+  Alerts = 'alerts',
+  Cases = 'cases',
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.test.tsx
new file mode 100644
index 0000000000000..4744c4d22fdc9
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.test.tsx
@@ -0,0 +1,180 @@
+/*
+ * 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 { renderHook, act } from '@testing-library/react-hooks';
+
+import { useKibana } from '../../../../common/lib/kibana';
+import { getApplication } from './api';
+import { SwimlaneActionConnector } from './types';
+import { useGetApplication, UseGetApplication } from './use_get_application';
+
+jest.mock('./api');
+jest.mock('../../../../common/lib/kibana');
+
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
+const getApplicationMock = getApplication as jest.Mock;
+
+const action = {
+  secrets: { apiToken: 'token' },
+  id: 'test',
+  actionTypeId: '.swimlane',
+  name: 'Swimlane',
+  isPreconfigured: false,
+  config: {
+    apiUrl: 'https://test.swimlane.com/',
+    appId: 'bcq16kdTbz5jlwM6h',
+    mappings: {},
+  },
+} as SwimlaneActionConnector;
+
+describe('useGetApplication', () => {
+  const { services } = useKibanaMock();
+  getApplicationMock.mockResolvedValue({
+    data: { fields: [] },
+  });
+  const abortCtrl = new AbortController();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  it('init', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+
+      await waitForNextUpdate();
+      expect(result.current).toEqual({
+        isLoading: false,
+        getApplication: result.current.getApplication,
+      });
+    });
+  });
+
+  it('calls getApplication with correct arguments', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+
+      await waitForNextUpdate();
+
+      result.current.getApplication();
+      await waitForNextUpdate();
+      expect(getApplicationMock).toBeCalledWith({
+        signal: abortCtrl.signal,
+        appId: action.config.appId,
+        apiToken: action.secrets.apiToken,
+        url: action.config.apiUrl,
+      });
+    });
+  });
+
+  it('get application', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+
+      await waitForNextUpdate();
+      result.current.getApplication();
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual({
+        isLoading: false,
+        getApplication: result.current.getApplication,
+      });
+    });
+  });
+
+  it('set isLoading to true when getting the application', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+
+      await waitForNextUpdate();
+      result.current.getApplication();
+
+      expect(result.current.isLoading).toBe(true);
+    });
+  });
+
+  it('it displays an error when http throws an error', async () => {
+    getApplicationMock.mockImplementation(() => {
+      throw new Error('Something went wrong');
+    });
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+      await waitForNextUpdate();
+      result.current.getApplication();
+
+      expect(result.current).toEqual({
+        isLoading: false,
+        getApplication: result.current.getApplication,
+      });
+
+      expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+        title: 'Unable to get application with id bcq16kdTbz5jlwM6h',
+        text: 'Something went wrong',
+      });
+    });
+  });
+
+  it('it displays an error when the response does not contain the correct fields', async () => {
+    getApplicationMock.mockResolvedValue({});
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseGetApplication>(() =>
+        useGetApplication({
+          appId: action.config.appId,
+          apiToken: action.secrets.apiToken,
+          apiUrl: action.config.apiUrl,
+          toastNotifications: services.notifications.toasts,
+        })
+      );
+      await waitForNextUpdate();
+      result.current.getApplication();
+      await waitForNextUpdate();
+
+      expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+        title: 'Unable to get application with id bcq16kdTbz5jlwM6h',
+        text: 'Unable to get application fields',
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
new file mode 100644
index 0000000000000..f18770067b8a8
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
@@ -0,0 +1,82 @@
+/*
+ * 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 { useState, useCallback, useRef } from 'react';
+import { ToastsApi } from 'kibana/public';
+import { getApplication as getApplicationApi } from './api';
+import * as i18n from './translations';
+import { SwimlaneFieldMappingConfig } from './types';
+
+interface Props {
+  toastNotifications: Pick<
+    ToastsApi,
+    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
+  >;
+  appId: string;
+  apiToken: string;
+  apiUrl: string;
+}
+
+export interface UseGetApplication {
+  getApplication: () => Promise<{ fields?: SwimlaneFieldMappingConfig[] } | undefined>;
+  isLoading: boolean;
+}
+
+export const useGetApplication = ({
+  toastNotifications,
+  appId,
+  apiToken,
+  apiUrl,
+}: Props): UseGetApplication => {
+  const [isLoading, setIsLoading] = useState(false);
+  const isCancelledRef = useRef(false);
+  const abortCtrlRef = useRef(new AbortController());
+
+  const getApplication = useCallback(async () => {
+    try {
+      isCancelledRef.current = false;
+      abortCtrlRef.current.abort();
+      abortCtrlRef.current = new AbortController();
+      setIsLoading(true);
+
+      const data = await getApplicationApi({
+        signal: abortCtrlRef.current.signal,
+        appId,
+        apiToken,
+        url: apiUrl,
+      });
+
+      if (!isCancelledRef.current) {
+        setIsLoading(false);
+        if (!data.fields) {
+          // If the response was malformed and fields doesn't exist, show an error toast
+          toastNotifications.addDanger({
+            title: i18n.SW_GET_APPLICATION_API_ERROR(appId),
+            text: i18n.SW_GET_APPLICATION_API_NO_FIELDS_ERROR,
+          });
+          return;
+        }
+        return data;
+      }
+    } catch (error) {
+      if (!isCancelledRef.current) {
+        if (error.name !== 'AbortError') {
+          toastNotifications.addDanger({
+            title: i18n.SW_GET_APPLICATION_API_ERROR(appId),
+            text: error.message,
+          });
+        }
+        setIsLoading(false);
+      }
+    }
+  }, [apiToken, apiUrl, appId, toastNotifications]);
+
+  return {
+    isLoading,
+    getApplication,
+  };
+};
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/swimlane.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/swimlane.ts
new file mode 100644
index 0000000000000..95e041bbeb03a
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/swimlane.ts
@@ -0,0 +1,91 @@
+/*
+ * 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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
+
+// eslint-disable-next-line import/no-default-export
+export default function swimlaneTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+  const mockSwimlane = {
+    name: 'A swimlane action',
+    actionTypeId: '.swimlane',
+    config: {
+      apiUrl: 'http://swimlane.mynonexistent.co',
+      appId: '123456asdf',
+      connectorType: 'all',
+      mappings: {
+        severityConfig: {
+          id: 'adnlas',
+          name: 'Severity',
+          key: 'severity',
+          fieldType: 'text',
+        },
+        ruleNameConfig: {
+          id: 'adnfls',
+          name: 'Rule Name',
+          key: 'rule-name',
+          fieldType: 'text',
+        },
+        caseIdConfig: {
+          id: 'a6sst',
+          name: 'Case Id',
+          key: 'case-id-name',
+          fieldType: 'text',
+        },
+        caseNameConfig: {
+          id: 'a6fst',
+          name: 'Case Name',
+          key: 'case-name',
+          fieldType: 'text',
+        },
+        commentsConfig: {
+          id: 'a6fdf',
+          name: 'Comments',
+          key: 'comments',
+          fieldType: 'text',
+        },
+      },
+    },
+    secrets: {
+      apiToken: 'swimlane-api-key',
+    },
+  };
+
+  describe('swimlane', () => {
+    let swimlaneSimulatorURL: string = '<could not determine kibana url>';
+
+    // need to wait for kibanaServer to settle ...
+    before(() => {
+      swimlaneSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SWIMLANE)
+      );
+    });
+    it('should return 403 when creating a swimlane action', async () => {
+      await supertest
+        .post('/api/actions/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          ...mockSwimlane,
+          config: {
+            ...mockSwimlane.config,
+            apiUrl: swimlaneSimulatorURL,
+          },
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .swimlane is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
index 3f0524750d5f8..21cb0db3057bb 100644
--- a/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
@@ -14,6 +14,7 @@ export default function actionsTests({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./builtin_action_types/es_index'));
     loadTestFile(require.resolve('./builtin_action_types/jira'));
     loadTestFile(require.resolve('./builtin_action_types/pagerduty'));
+    loadTestFile(require.resolve('./builtin_action_types/swimlane'));
     loadTestFile(require.resolve('./builtin_action_types/server_log'));
     loadTestFile(require.resolve('./builtin_action_types/servicenow'));
     loadTestFile(require.resolve('./builtin_action_types/slack'));
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 61b452fc11835..3dcbde5f21149 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -31,6 +31,7 @@ const enabledActionTypes = [
   '.email',
   '.index',
   '.pagerduty',
+  '.swimlane',
   '.server-log',
   '.servicenow',
   '.jira',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
index 878507bcf4afc..a479070c824f2 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -13,6 +13,7 @@ import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../..
 import { PluginSetupContract as ActionsPluginSetupContract } from '../../../../../../../plugins/actions/server/plugin';
 import { ActionType } from '../../../../../../../plugins/actions/server';
 import { initPlugin as initPagerduty } from './pagerduty_simulation';
+import { initPlugin as initSwimlane } from './swimlane_simulation';
 import { initPlugin as initServiceNow } from './servicenow_simulation';
 import { initPlugin as initJira } from './jira_simulation';
 import { initPlugin as initResilient } from './resilient_simulation';
@@ -23,6 +24,7 @@ export const NAME = 'actions-FTS-external-service-simulators';
 
 export enum ExternalServiceSimulator {
   PAGERDUTY = 'pagerduty',
+  SWIMLANE = 'swimlane',
   SERVICENOW = 'servicenow',
   SLACK = 'slack',
   JIRA = 'jira',
@@ -66,6 +68,10 @@ export async function getSlackServer(): Promise<http.Server> {
   return await initSlack();
 }
 
+export async function getSwimlaneServer(): Promise<http.Server> {
+  return await initSwimlane();
+}
+
 interface FixtureSetupDeps {
   actions: ActionsPluginSetupContract;
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/swimlane_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/swimlane_simulation.ts
new file mode 100644
index 0000000000000..afba550908ddc
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/swimlane_simulation.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 http from 'http';
+
+export const initPlugin = async () => http.createServer(handler);
+
+const sendResponse = (response: http.ServerResponse, data: any) => {
+  response.statusCode = 200;
+  response.setHeader('Content-Type', 'application/json');
+  response.end(JSON.stringify(data, null, 4));
+};
+
+const handler = (request: http.IncomingMessage, response: http.ServerResponse) => {
+  if (request.method === 'POST') {
+    return sendResponse(response, {
+      id: 'wowzeronza',
+      name: 'ET-69',
+      createdDate: '2021-06-01T17:29:51.092Z',
+    });
+  }
+
+  if (request.method === 'PATCH') {
+    return sendResponse(response, {
+      id: 'wowzeronza',
+      name: 'ET-69',
+      modifiedDate: '2021-06-01T17:29:51.092Z',
+    });
+  }
+
+  // Return an 400 error if http method is not supported
+  response.statusCode = 400;
+  response.setHeader('Content-Type', 'application/json');
+  response.end('Not supported http method to request slack simulator');
+};
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/swimlane.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/swimlane.ts
new file mode 100644
index 0000000000000..92e99a9d504f3
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/swimlane.ts
@@ -0,0 +1,482 @@
+/*
+ * 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 httpProxy from 'http-proxy';
+import expect from '@kbn/expect';
+import getPort from 'get-port';
+import http from 'http';
+
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { getSwimlaneServer } from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
+
+// eslint-disable-next-line import/no-default-export
+export default function swimlaneTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const configService = getService('config');
+
+  const mockSwimlane = {
+    name: 'A swimlane action',
+    actionTypeId: '.swimlane',
+    config: {
+      apiUrl: 'http://swimlane.mynonexistent.com',
+      appId: '123456asdf',
+      connectorType: 'all',
+      mappings: {
+        alertIdConfig: {
+          id: 'ednjls',
+          name: 'Alert id',
+          key: 'alert-id',
+          fieldType: 'text',
+        },
+        severityConfig: {
+          id: 'adnlas',
+          name: 'Severity',
+          key: 'severity',
+          fieldType: 'text',
+        },
+        ruleNameConfig: {
+          id: 'adnfls',
+          name: 'Rule Name',
+          key: 'rule-name',
+          fieldType: 'text',
+        },
+        caseIdConfig: {
+          id: 'a6sst',
+          name: 'Case Id',
+          key: 'case-id-name',
+          fieldType: 'text',
+        },
+        caseNameConfig: {
+          id: 'a6fst',
+          name: 'Case Name',
+          key: 'case-name',
+          fieldType: 'text',
+        },
+        commentsConfig: {
+          id: 'a6fdf',
+          name: 'Comments',
+          key: 'comments',
+          fieldType: 'notes',
+        },
+        descriptionConfig: {
+          id: 'a6fdf',
+          name: 'Description',
+          key: 'description',
+          fieldType: 'text',
+        },
+      },
+    },
+    secrets: {
+      apiToken: 'swimlane-api-key',
+    },
+    params: {
+      subAction: 'pushToService',
+      subActionParams: {
+        incident: {
+          alertId: 'fs345f78g',
+          ruleName: 'Rule Name',
+          severity: 'Critical',
+          caseName: 'Case Name',
+          caseId: 'es3456789',
+          description: 'This is a description',
+          externalId: null,
+        },
+        comments: [
+          {
+            comment: 'first comment',
+            commentId: '123',
+          },
+        ],
+      },
+    },
+  };
+
+  describe('Swimlane', () => {
+    let simulatedActionId = '';
+    let swimlaneSimulatorURL: string = '';
+    let swimlaneServer: http.Server;
+    let proxyServer: httpProxy | undefined;
+    let proxyHaveBeenCalled = false;
+
+    before(async () => {
+      swimlaneServer = await getSwimlaneServer();
+      const availablePort = await getPort({ port: getPort.makeRange(9000, 9100) });
+      if (!swimlaneServer.listening) {
+        swimlaneServer.listen(availablePort);
+      }
+      swimlaneSimulatorURL = `http://localhost:${availablePort}`;
+      proxyServer = await getHttpProxyServer(
+        swimlaneSimulatorURL,
+        configService.get('kbnTestServer.serverArgs'),
+        () => {
+          proxyHaveBeenCalled = true;
+        }
+      );
+    });
+
+    after(() => {
+      swimlaneServer.close();
+      if (proxyServer) {
+        proxyServer.close();
+      }
+    });
+
+    describe('Swimlane - Action Creation', () => {
+      it('should return 200 when creating a swimlane action successfully', async () => {
+        const { body: createdAction } = await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane action',
+            connector_type_id: '.swimlane',
+            config: {
+              ...mockSwimlane.config,
+              apiUrl: swimlaneSimulatorURL,
+            },
+            secrets: mockSwimlane.secrets,
+          })
+          .expect(200);
+
+        expect(createdAction).to.eql({
+          config: {
+            ...mockSwimlane.config,
+            apiUrl: swimlaneSimulatorURL,
+          },
+          connector_type_id: '.swimlane',
+          id: createdAction.id,
+          is_missing_secrets: false,
+          is_preconfigured: false,
+          name: 'A swimlane action',
+        });
+
+        expect(typeof createdAction.id).to.be('string');
+
+        const { body: fetchedAction } = await supertest
+          .get(`/api/actions/connector/${createdAction.id}`)
+          .expect(200);
+
+        expect(fetchedAction).to.eql({
+          id: fetchedAction.id,
+          is_preconfigured: false,
+          is_missing_secrets: false,
+          name: 'A swimlane action',
+          connector_type_id: '.swimlane',
+          config: {
+            ...mockSwimlane.config,
+            apiUrl: swimlaneSimulatorURL,
+          },
+        });
+      });
+
+      it('should respond with a 400 Bad Request when creating a swimlane action with no apiUrl', async () => {
+        await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane action',
+            connector_type_id: '.swimlane',
+            config: {
+              appId: mockSwimlane.config.appId,
+              mappings: mockSwimlane.config.mappings,
+            },
+            secrets: mockSwimlane.secrets,
+          })
+          .expect(400)
+          .then((resp: any) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message:
+                'error validating action type config: [apiUrl]: expected value of type [string] but got [undefined]',
+            });
+          });
+      });
+
+      it('should respond with a 400 Bad Request when creating a swimlane action with no appId', async () => {
+        await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane action',
+            connector_type_id: '.swimlane',
+            config: {
+              mappings: mockSwimlane.config.mappings,
+              apiUrl: swimlaneSimulatorURL,
+            },
+            secrets: mockSwimlane.secrets,
+          })
+          .expect(400)
+          .then((resp: any) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message:
+                'error validating action type config: [appId]: expected value of type [string] but got [undefined]',
+            });
+          });
+      });
+
+      it('should respond with a 400 Bad Request when creating a swimlane action without secrets', async () => {
+        await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane action',
+            connector_type_id: '.swimlane',
+            config: {
+              ...mockSwimlane.config,
+              apiUrl: swimlaneSimulatorURL,
+            },
+            secrets: {},
+          })
+          .expect(400)
+          .then((resp: any) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message:
+                'error validating action type secrets: [apiToken]: expected value of type [string] but got [undefined]',
+            });
+          });
+      });
+
+      it('should respond with a 400 Bad Request default swimlane url is not present in allowedHosts', async () => {
+        await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane action',
+            connector_type_id: '.swimlane',
+            config: mockSwimlane.config,
+            secrets: mockSwimlane.secrets,
+          })
+          .expect(400)
+          .then((resp: any) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: `error validating action type config: error configuring connector action: target url "${mockSwimlane.config.apiUrl}" is not added to the Kibana config xpack.actions.allowedHosts`,
+            });
+          });
+      });
+    });
+
+    describe('Swimlane - Executor', () => {
+      before(async () => {
+        const { body } = await supertest
+          .post('/api/actions/connector')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            name: 'A swimlane simulator',
+            connector_type_id: '.swimlane',
+            config: {
+              ...mockSwimlane.config,
+              apiUrl: swimlaneSimulatorURL,
+            },
+            secrets: mockSwimlane.secrets,
+          });
+        simulatedActionId = body.id;
+      });
+
+      describe('Validation', () => {
+        it('should handle failing with a simulated success without action', async () => {
+          await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: {},
+            })
+            .then((resp: any) => {
+              expect(Object.keys(resp.body)).to.eql(['status', 'message', 'retry', 'connector_id']);
+              expect(resp.body.connector_id).to.eql(simulatedActionId);
+              expect(resp.body.status).to.eql('error');
+              expect(resp.body.retry).to.eql(false);
+              // Node.js 12 oddity:
+              //
+              // The first time after the server is booted, the error message will be:
+              //
+              //     undefined is not iterable (cannot read property Symbol(Symbol.iterator))
+              //
+              // After this, the error will be:
+              //
+              //     Cannot destructure property 'value' of 'undefined' as it is undefined.
+              //
+              // The error seems to come from the exact same place in the code based on the
+              // exact same circomstances:
+              //
+              //     https://github.com/elastic/kibana/blob/b0a223ebcbac7e404e8ae6da23b2cc6a4b509ff1/packages/kbn-config-schema/src/types/literal_type.ts#L28
+              //
+              // What triggers the error is that the `handleError` function expects its 2nd
+              // argument to be an object containing a `valids` property of type array.
+              //
+              // In this test the object does not contain a `valids` property, so hence the
+              // error.
+              //
+              // Why the error message isn't the same in all scenarios is unknown to me and
+              // could be a bug in V8.
+              expect(resp.body.message).to.match(
+                /^error validating action params: (undefined is not iterable \(cannot read property Symbol\(Symbol.iterator\)\)|Cannot destructure property 'value' of 'undefined' as it is undefined\.)$/
+              );
+            });
+        });
+
+        it('should handle failing with a simulated success without unsupported action', async () => {
+          await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: { subAction: 'non-supported' },
+            })
+            .then((resp: any) => {
+              expect(resp.body).to.eql({
+                connector_id: simulatedActionId,
+                status: 'error',
+                retry: false,
+                message:
+                  'error validating action params: [subAction]: expected value to equal [pushToService]',
+              });
+            });
+        });
+
+        /**
+         * All subActionParams are optional.
+         * If subActionParams is not provided all
+         * the subActionParams attributes will be set to null
+         * and the validation will succeed. For that reason,
+         * the subActionParams need to be set to null.
+         */
+        it('should handle failing with a simulated success without subActionParams', async () => {
+          await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: { subAction: 'pushToService', subActionParams: null },
+            })
+            .then((resp: any) => {
+              expect(resp.body).to.eql({
+                connector_id: simulatedActionId,
+                status: 'error',
+                retry: false,
+                message:
+                  'error validating action params: [subActionParams]: expected a plain object value, but found [null] instead.',
+              });
+            });
+        });
+
+        it('should handle failing with a simulated success without commentId', async () => {
+          await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: {
+                ...mockSwimlane.params,
+                subActionParams: {
+                  ...mockSwimlane.params.subActionParams,
+                  comments: [{ comment: 'comment' }],
+                },
+              },
+            })
+            .then((resp: any) => {
+              expect(resp.body).to.eql({
+                connector_id: simulatedActionId,
+                status: 'error',
+                retry: false,
+                message:
+                  'error validating action params: [subActionParams.comments]: types that failed validation:\n- [subActionParams.comments.0.0.commentId]: expected value of type [string] but got [undefined]\n- [subActionParams.comments.1]: expected value to equal [null]',
+              });
+            });
+        });
+
+        it('should handle failing with a simulated success without comment message', async () => {
+          await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: {
+                ...mockSwimlane.params,
+                subActionParams: {
+                  ...mockSwimlane.params.subActionParams,
+                  comments: [{ commentId: 'success' }],
+                },
+              },
+            })
+            .then((resp: any) => {
+              expect(resp.body).to.eql({
+                connector_id: simulatedActionId,
+                status: 'error',
+                retry: false,
+                message:
+                  'error validating action params: [subActionParams.comments]: types that failed validation:\n- [subActionParams.comments.0.0.comment]: expected value of type [string] but got [undefined]\n- [subActionParams.comments.1]: expected value to equal [null]',
+              });
+            });
+        });
+      });
+
+      describe('Execution', () => {
+        it('should handle creating an incident', async () => {
+          const { body } = await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: {
+                ...mockSwimlane.params,
+                subActionParams: {
+                  ...mockSwimlane.params.subActionParams,
+                  comments: [],
+                },
+              },
+            })
+            .expect(200);
+
+          expect(proxyHaveBeenCalled).to.equal(true);
+          expect(body).to.eql({
+            status: 'ok',
+            connector_id: simulatedActionId,
+            data: {
+              id: 'wowzeronza',
+              title: 'ET-69',
+              pushedDate: '2021-06-01T17:29:51.092Z',
+              url: `${swimlaneSimulatorURL}/record/123456asdf/wowzeronza`,
+            },
+          });
+        });
+
+        it('should handle updating an incident', async () => {
+          const { body } = await supertest
+            .post(`/api/actions/connector/${simulatedActionId}/_execute`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              params: {
+                ...mockSwimlane.params,
+                subActionParams: {
+                  incident: {
+                    ...mockSwimlane.params.subActionParams.incident,
+                    externalId: 'wowzeronza',
+                  },
+                  comments: [],
+                },
+              },
+            })
+            .expect(200);
+
+          expect(proxyHaveBeenCalled).to.equal(true);
+          expect(body).to.eql({
+            status: 'ok',
+            connector_id: simulatedActionId,
+            data: {
+              id: 'wowzeronza',
+              title: 'ET-69',
+              pushedDate: '2021-06-01T17:29:51.092Z',
+              url: `${swimlaneSimulatorURL}/record/123456asdf/wowzeronza`,
+            },
+          });
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
index b5ff287ac58f6..db57af0ba1a98 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
@@ -23,6 +23,7 @@ export default function actionsTests({ loadTestFile, getService }: FtrProviderCo
     loadTestFile(require.resolve('./builtin_action_types/es_index'));
     loadTestFile(require.resolve('./builtin_action_types/es_index_preconfigured'));
     loadTestFile(require.resolve('./builtin_action_types/pagerduty'));
+    loadTestFile(require.resolve('./builtin_action_types/swimlane'));
     loadTestFile(require.resolve('./builtin_action_types/server_log'));
     loadTestFile(require.resolve('./builtin_action_types/servicenow'));
     loadTestFile(require.resolve('./builtin_action_types/jira'));
diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts
index 6c81f1fcfa264..887e6e7894f98 100644
--- a/x-pack/test/case_api_integration/common/config.ts
+++ b/x-pack/test/case_api_integration/common/config.ts
@@ -26,6 +26,7 @@ const enabledActionTypes = [
   '.index',
   '.jira',
   '.pagerduty',
+  '.swimlane',
   '.resilient',
   '.server-log',
   '.servicenow',
diff --git a/x-pack/test/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts
index 5cbf9598dc4a1..ef822b0af2a29 100644
--- a/x-pack/test/detection_engine_api_integration/common/config.ts
+++ b/x-pack/test/detection_engine_api_integration/common/config.ts
@@ -20,6 +20,7 @@ const enabledActionTypes = [
   '.email',
   '.index',
   '.pagerduty',
+  '.swimlane',
   '.server-log',
   '.servicenow',
   '.slack',
diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts
index 3ed382053f561..b8010c089ad03 100644
--- a/x-pack/test/functional_with_es_ssl/config.ts
+++ b/x-pack/test/functional_with_es_ssl/config.ts
@@ -16,6 +16,7 @@ const enabledActionTypes = [
   '.email',
   '.index',
   '.pagerduty',
+  '.swimlane',
   '.servicenow',
   '.slack',
   '.webhook',

From 77fe1c10870a3fb72eb3643d373c3ba0e7405a1a Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Wed, 23 Jun 2021 22:40:56 +0300
Subject: [PATCH 10/95] [Query] Use a minimal index pattern interface for es
 query  (#102364)

* Move JSON utils to utils package

* Imports from tests

* delete

* split package

* docs

* test

* test

* imports

* minimal index pattern

* move some functions out and use miniaml ip in all es-kuery

* docs

* docs

* rename

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...na-plugin-plugins-data-public.esfilters.md |  8 +++---
 ...bana-plugin-plugins-data-public.eskuery.md |  2 +-
 ...bana-plugin-plugins-data-public.esquery.md |  2 +-
 ...lugins-data-public.iindexpattern.fields.md | 11 --------
 ...in-plugins-data-public.iindexpattern.id.md | 11 --------
 ...lugin-plugins-data-public.iindexpattern.md |  4 +--
 ...na-plugin-plugins-data-server.esfilters.md |  8 +++---
 ...bana-plugin-plugins-data-server.eskuery.md |  2 +-
 ...bana-plugin-plugins-data-server.esquery.md |  2 +-
 .../es_query/es_query/build_es_query.ts       |  4 +--
 .../es_query/es_query/filter_matches_index.ts |  5 ++--
 .../common/es_query/es_query/from_filters.ts  |  4 +--
 .../common/es_query/es_query/from_kuery.ts    |  6 ++---
 .../es_query/handle_nested_filter.test.ts     |  7 ++---
 .../es_query/es_query/handle_nested_filter.ts |  4 +--
 .../data/common/es_query/es_query/index.ts    |  1 +
 .../es_query/es_query/migrate_filter.ts       |  4 +--
 .../data/common/es_query/es_query/types.ts    | 14 ++++++++++
 .../common/es_query/filters/build_filters.ts  |  6 ++---
 .../common/es_query/filters/exists_filter.ts  |  5 ++--
 .../data/common/es_query/filters/index.ts     |  2 --
 .../common/es_query/filters/phrase_filter.ts  |  5 ++--
 .../common/es_query/filters/phrases_filter.ts |  5 ++--
 .../common/es_query/filters/range_filter.ts   |  5 ++--
 .../data/common/es_query/kuery/ast/ast.ts     |  4 +--
 .../common/es_query/kuery/functions/and.ts    |  4 +--
 .../common/es_query/kuery/functions/exists.ts |  4 +--
 .../kuery/functions/geo_bounding_box.ts       |  4 +--
 .../es_query/kuery/functions/geo_polygon.ts   |  4 +--
 .../common/es_query/kuery/functions/is.ts     |  4 +--
 .../common/es_query/kuery/functions/nested.ts |  4 +--
 .../common/es_query/kuery/functions/not.ts    |  4 +--
 .../common/es_query/kuery/functions/or.ts     |  4 +--
 .../common/es_query/kuery/functions/range.ts  |  4 +--
 .../kuery/functions/utils/get_fields.ts       |  4 +--
 .../utils/get_full_field_name_node.ts         |  4 +--
 .../es_query/kuery/node_types/function.ts     |  4 +--
 .../common/es_query/kuery/node_types/types.ts |  4 +--
 .../data/common/index_patterns/types.ts       |  5 ++--
 src/plugins/data/public/index.ts              |  2 +-
 src/plugins/data/public/public.api.md         | 27 +++++++++----------
 .../data/public/query/filter_manager/index.ts |  2 ++
 .../filter_manager/lib}/get_display_value.ts  |  3 +--
 .../get_index_pattern_from_filter.test.ts     |  0
 .../lib}/get_index_pattern_from_filter.ts     |  3 +--
 .../apply_filter_popover_content.tsx          |  4 +--
 .../ui/filter_bar/filter_editor/index.tsx     |  2 +-
 .../data/public/ui/filter_bar/filter_item.tsx |  3 +--
 src/plugins/data/server/server.api.md         | 12 ++++-----
 49 files changed, 118 insertions(+), 128 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fields.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.id.md
 create mode 100644 src/plugins/data/common/es_query/es_query/types.ts
 rename src/plugins/data/{common/es_query/filters => public/query/filter_manager/lib}/get_display_value.ts (95%)
 rename src/plugins/data/{common/es_query/filters => public/query/filter_manager/lib}/get_index_pattern_from_filter.test.ts (100%)
 rename src/plugins/data/{common/es_query/filters => public/query/filter_manager/lib}/get_index_pattern_from_filter.ts (88%)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md
index 54b5a33ccf682..2ca4847d6dc39 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md
@@ -13,11 +13,11 @@ esFilters: {
     FILTERS: typeof FILTERS;
     FilterStateStore: typeof FilterStateStore;
     buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
-    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
-    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
-    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
+    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhrasesFilter;
+    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").MinimalIndexPattern) => import("../common").ExistsFilter;
+    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhraseFilter;
     buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
-    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
+    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").MinimalIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
     isPhraseFilter: (filter: any) => filter is import("../common").PhraseFilter;
     isExistsFilter: (filter: any) => filter is import("../common").ExistsFilter;
     isPhrasesFilter: (filter: any) => filter is import("../common").PhrasesFilter;
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
index 2cde2b7455585..881a1fa803ca6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
@@ -10,6 +10,6 @@
 esKuery: {
     nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
     fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
-    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
+    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").MinimalIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
 }
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md
index 2430e6a93bd2b..70805aaaaee8c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md
@@ -10,7 +10,7 @@
 esQuery: {
     buildEsQuery: typeof buildEsQuery;
     getEsQueryConfig: typeof getEsQueryConfig;
-    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
+    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").MinimalIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
         must: never[];
         filter: import("../common").Filter[];
         should: never[];
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fields.md
deleted file mode 100644
index 792bee44f96a8..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fields.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IIndexPattern](./kibana-plugin-plugins-data-public.iindexpattern.md) &gt; [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md)
-
-## IIndexPattern.fields property
-
-<b>Signature:</b>
-
-```typescript
-fields: IFieldType[];
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.id.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.id.md
deleted file mode 100644
index 917a80975df6c..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.id.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IIndexPattern](./kibana-plugin-plugins-data-public.iindexpattern.md) &gt; [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md)
-
-## IIndexPattern.id property
-
-<b>Signature:</b>
-
-```typescript
-id?: string;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
index bf7f88ab37039..88d8520a373c6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
@@ -12,7 +12,7 @@
 <b>Signature:</b>
 
 ```typescript
-export interface IIndexPattern 
+export interface IIndexPattern extends MinimalIndexPattern 
 ```
 
 ## Properties
@@ -20,9 +20,7 @@ export interface IIndexPattern
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, SerializedFieldFormat&lt;unknown&gt; &#124; undefined&gt;</code> |  |
-|  [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [getFormatterForField](./kibana-plugin-plugins-data-public.iindexpattern.getformatterforfield.md) | <code>(field: IndexPatternField &#124; IndexPatternField['spec'] &#124; IFieldType) =&gt; FieldFormat</code> | Look up a formatter for a given field |
-|  [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.iindexpattern.timefieldname.md) | <code>string</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.iindexpattern.title.md) | <code>string</code> |  |
 |  [type](./kibana-plugin-plugins-data-public.iindexpattern.type.md) | <code>string</code> | Type is used for identifying rollup indices, otherwise left undefined |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esfilters.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esfilters.md
index d7e80d94db4e6..d951cb2426943 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esfilters.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esfilters.md
@@ -11,11 +11,11 @@ esFilters: {
     buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
     buildCustomFilter: typeof buildCustomFilter;
     buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
-    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
+    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").MinimalIndexPattern) => import("../common").ExistsFilter;
     buildFilter: typeof buildFilter;
-    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
-    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
-    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
+    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhraseFilter;
+    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhrasesFilter;
+    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").MinimalIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
     isFilterDisabled: (filter: import("../common").Filter) => boolean;
 }
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
index 4b96d8af756f3..6274eb5f4f4a5 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
@@ -10,6 +10,6 @@
 esKuery: {
     nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
     fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
-    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
+    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").MinimalIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
 }
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esquery.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esquery.md
index ac9be23bc6b6f..0d1baecb014f5 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esquery.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esquery.md
@@ -8,7 +8,7 @@
 
 ```typescript
 esQuery: {
-    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
+    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").MinimalIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
         must: never[];
         filter: import("../common").Filter[];
         should: never[];
diff --git a/src/plugins/data/common/es_query/es_query/build_es_query.ts b/src/plugins/data/common/es_query/es_query/build_es_query.ts
index 45724796c3518..d7b3c630d1a6e 100644
--- a/src/plugins/data/common/es_query/es_query/build_es_query.ts
+++ b/src/plugins/data/common/es_query/es_query/build_es_query.ts
@@ -10,9 +10,9 @@ import { groupBy, has, isEqual } from 'lodash';
 import { buildQueryFromKuery } from './from_kuery';
 import { buildQueryFromFilters } from './from_filters';
 import { buildQueryFromLucene } from './from_lucene';
-import { IIndexPattern } from '../../index_patterns';
 import { Filter } from '../filters';
 import { Query } from '../../query/types';
+import { IndexPatternBase } from './types';
 
 export interface EsQueryConfig {
   allowLeadingWildcards: boolean;
@@ -36,7 +36,7 @@ function removeMatchAll<T>(filters: T[]) {
  * config contains dateformat:tz
  */
 export function buildEsQuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: IndexPatternBase | undefined,
   queries: Query | Query[],
   filters: Filter | Filter[],
   config: EsQueryConfig = {
diff --git a/src/plugins/data/common/es_query/es_query/filter_matches_index.ts b/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
index 478263d5ce601..b376436756092 100644
--- a/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
+++ b/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
@@ -6,15 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
 import { Filter } from '../filters';
+import { IndexPatternBase } from './types';
 
 /*
  * TODO: We should base this on something better than `filter.meta.key`. We should probably modify
  * this to check if `filter.meta.index` matches `indexPattern.id` instead, but that's a breaking
  * change.
  */
-export function filterMatchesIndex(filter: Filter, indexPattern?: IIndexPattern | null) {
+export function filterMatchesIndex(filter: Filter, indexPattern?: IndexPatternBase | null) {
   if (!filter.meta?.key || !indexPattern) {
     return true;
   }
diff --git a/src/plugins/data/common/es_query/es_query/from_filters.ts b/src/plugins/data/common/es_query/es_query/from_filters.ts
index e50862235af1d..7b3c58d45a569 100644
--- a/src/plugins/data/common/es_query/es_query/from_filters.ts
+++ b/src/plugins/data/common/es_query/es_query/from_filters.ts
@@ -10,7 +10,7 @@ import { isUndefined } from 'lodash';
 import { migrateFilter } from './migrate_filter';
 import { filterMatchesIndex } from './filter_matches_index';
 import { Filter, cleanFilter, isFilterDisabled } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { IndexPatternBase } from './types';
 import { handleNestedFilter } from './handle_nested_filter';
 
 /**
@@ -45,7 +45,7 @@ const translateToQuery = (filter: Filter) => {
 
 export const buildQueryFromFilters = (
   filters: Filter[] = [],
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: IndexPatternBase | undefined,
   ignoreFilterIfFieldNotInIndex: boolean = false
 ) => {
   filters = filters.filter((filter) => filter && !isFilterDisabled(filter));
diff --git a/src/plugins/data/common/es_query/es_query/from_kuery.ts b/src/plugins/data/common/es_query/es_query/from_kuery.ts
index afedaae45872b..3eccfd8776113 100644
--- a/src/plugins/data/common/es_query/es_query/from_kuery.ts
+++ b/src/plugins/data/common/es_query/es_query/from_kuery.ts
@@ -7,11 +7,11 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery, nodeTypes, KueryNode } from '../kuery';
-import { IIndexPattern } from '../../index_patterns';
+import { IndexPatternBase } from './types';
 import { Query } from '../../query/types';
 
 export function buildQueryFromKuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: IndexPatternBase | undefined,
   queries: Query[] = [],
   allowLeadingWildcards: boolean = false,
   dateFormatTZ?: string
@@ -24,7 +24,7 @@ export function buildQueryFromKuery(
 }
 
 function buildQuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: IndexPatternBase | undefined,
   queryASTs: KueryNode[],
   config: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts b/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts
index ee5305132042a..d312d034df564 100644
--- a/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts
+++ b/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts
@@ -9,13 +9,14 @@
 import { handleNestedFilter } from './handle_nested_filter';
 import { fields } from '../../index_patterns/mocks';
 import { buildPhraseFilter, buildQueryFilter } from '../filters';
-import { IFieldType, IIndexPattern } from '../../index_patterns';
+import { IndexPatternBase } from './types';
+import { IFieldType } from '../../index_patterns';
 
 describe('handleNestedFilter', function () {
-  const indexPattern: IIndexPattern = ({
+  const indexPattern: IndexPatternBase = {
     id: 'logstash-*',
     fields,
-  } as unknown) as IIndexPattern;
+  };
 
   it("should return the filter's query wrapped in nested query if the target field is nested", () => {
     const field = getField('nestedField.child');
diff --git a/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts b/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts
index 93927d81565ef..60e92769503fb 100644
--- a/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts
+++ b/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts
@@ -7,9 +7,9 @@
  */
 
 import { getFilterField, cleanFilter, Filter } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { IndexPatternBase } from './types';
 
-export const handleNestedFilter = (filter: Filter, indexPattern?: IIndexPattern) => {
+export const handleNestedFilter = (filter: Filter, indexPattern?: IndexPatternBase) => {
   if (!indexPattern) return filter;
 
   const fieldName = getFilterField(filter);
diff --git a/src/plugins/data/common/es_query/es_query/index.ts b/src/plugins/data/common/es_query/es_query/index.ts
index 31529480c8ac9..c10ea5846ae3f 100644
--- a/src/plugins/data/common/es_query/es_query/index.ts
+++ b/src/plugins/data/common/es_query/es_query/index.ts
@@ -11,3 +11,4 @@ export { buildQueryFromFilters } from './from_filters';
 export { luceneStringToDsl } from './lucene_string_to_dsl';
 export { decorateQuery } from './decorate_query';
 export { getEsQueryConfig } from './get_es_query_config';
+export { IndexPatternBase } from './types';
diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.ts
index c7c44d019a31c..9bd78b092fc18 100644
--- a/src/plugins/data/common/es_query/es_query/migrate_filter.ts
+++ b/src/plugins/data/common/es_query/es_query/migrate_filter.ts
@@ -9,7 +9,7 @@
 import { get, omit } from 'lodash';
 import { getConvertedValueForField } from '../filters';
 import { Filter } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { IndexPatternBase } from './types';
 
 export interface DeprecatedMatchPhraseFilter extends Filter {
   query: {
@@ -28,7 +28,7 @@ function isDeprecatedMatchPhraseFilter(filter: any): filter is DeprecatedMatchPh
   return Boolean(fieldName && get(filter, ['query', 'match', fieldName, 'type']) === 'phrase');
 }
 
-export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) {
+export function migrateFilter(filter: Filter, indexPattern?: IndexPatternBase) {
   if (isDeprecatedMatchPhraseFilter(filter)) {
     const fieldName = Object.keys(filter.query.match)[0];
     const params: Record<string, any> = get(filter, ['query', 'match', fieldName]);
diff --git a/src/plugins/data/common/es_query/es_query/types.ts b/src/plugins/data/common/es_query/es_query/types.ts
new file mode 100644
index 0000000000000..2133736516049
--- /dev/null
+++ b/src/plugins/data/common/es_query/es_query/types.ts
@@ -0,0 +1,14 @@
+/*
+ * 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 { IFieldType } from '../../index_patterns';
+
+export interface IndexPatternBase {
+  fields: IFieldType[];
+  id?: string;
+}
diff --git a/src/plugins/data/common/es_query/filters/build_filters.ts b/src/plugins/data/common/es_query/filters/build_filters.ts
index ba1bd0a615493..369f9530fb92b 100644
--- a/src/plugins/data/common/es_query/filters/build_filters.ts
+++ b/src/plugins/data/common/es_query/filters/build_filters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPattern, IFieldType } from '../..';
+import { IFieldType, IndexPatternBase } from '../..';
 import {
   Filter,
   FILTERS,
@@ -19,7 +19,7 @@ import {
 } from '.';
 
 export function buildFilter(
-  indexPattern: IIndexPattern,
+  indexPattern: IndexPatternBase,
   field: IFieldType,
   type: FILTERS,
   negate: boolean,
@@ -59,7 +59,7 @@ export function buildCustomFilter(
 }
 
 function buildBaseFilter(
-  indexPattern: IIndexPattern,
+  indexPattern: IndexPatternBase,
   field: IFieldType,
   type: FILTERS,
   params: any
diff --git a/src/plugins/data/common/es_query/filters/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts
index 441a6bcb924b7..4836950c3bb27 100644
--- a/src/plugins/data/common/es_query/filters/exists_filter.ts
+++ b/src/plugins/data/common/es_query/filters/exists_filter.ts
@@ -7,7 +7,8 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { IndexPatternBase } from '..';
 
 export type ExistsFilterMeta = FilterMeta;
 
@@ -26,7 +27,7 @@ export const getExistsFilterField = (filter: ExistsFilter) => {
   return filter.exists && filter.exists.field;
 };
 
-export const buildExistsFilter = (field: IFieldType, indexPattern: IIndexPattern) => {
+export const buildExistsFilter = (field: IFieldType, indexPattern: IndexPatternBase) => {
   return {
     meta: {
       index: indexPattern.id,
diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts
index 133f5cd232e6f..fe7cdadabaee3 100644
--- a/src/plugins/data/common/es_query/filters/index.ts
+++ b/src/plugins/data/common/es_query/filters/index.ts
@@ -14,10 +14,8 @@ export * from './custom_filter';
 export * from './exists_filter';
 export * from './geo_bounding_box_filter';
 export * from './geo_polygon_filter';
-export * from './get_display_value';
 export * from './get_filter_field';
 export * from './get_filter_params';
-export * from './get_index_pattern_from_filter';
 export * from './match_all_filter';
 export * from './meta_filter';
 export * from './missing_filter';
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
index 85562435e68d0..27c1e85562097 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts
@@ -8,7 +8,8 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { get, isPlainObject } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { IndexPatternBase } from '..';
 
 export type PhraseFilterMeta = FilterMeta & {
   params?: {
@@ -60,7 +61,7 @@ export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue =>
 export const buildPhraseFilter = (
   field: IFieldType,
   value: any,
-  indexPattern: IIndexPattern
+  indexPattern: IndexPatternBase
 ): PhraseFilter => {
   const convertedValue = getConvertedValueForField(field, value);
 
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
index 849c1b3faef2a..8a79472154493 100644
--- a/src/plugins/data/common/es_query/filters/phrases_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -9,7 +9,8 @@
 import { Filter, FilterMeta } from './meta_filter';
 import { getPhraseScript } from './phrase_filter';
 import { FILTERS } from './index';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { IndexPatternBase } from '../es_query';
 
 export type PhrasesFilterMeta = FilterMeta & {
   params: string[]; // The unformatted values
@@ -34,7 +35,7 @@ export const getPhrasesFilterField = (filter: PhrasesFilter) => {
 export const buildPhrasesFilter = (
   field: IFieldType,
   params: any[],
-  indexPattern: IIndexPattern
+  indexPattern: IndexPatternBase
 ) => {
   const index = indexPattern.id;
   const type = FILTERS.PHRASES;
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index a082b93c0a79a..7bc7a8cff7487 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -8,7 +8,8 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { map, reduce, mapValues, get, keys, pickBy } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { IndexPatternBase } from '..';
 
 const OPERANDS_IN_RANGE = 2;
 
@@ -93,7 +94,7 @@ const format = (field: IFieldType, value: any) =>
 export const buildRangeFilter = (
   field: IFieldType,
   params: RangeFilterParams,
-  indexPattern: IIndexPattern,
+  indexPattern: IndexPatternBase,
   formattedValue?: string
 ): RangeFilter => {
   const filter: any = { meta: { index: indexPattern.id, params: {} } };
diff --git a/src/plugins/data/common/es_query/kuery/ast/ast.ts b/src/plugins/data/common/es_query/kuery/ast/ast.ts
index be82128969968..3e7b25897cab7 100644
--- a/src/plugins/data/common/es_query/kuery/ast/ast.ts
+++ b/src/plugins/data/common/es_query/kuery/ast/ast.ts
@@ -10,10 +10,10 @@ import { JsonObject } from '@kbn/common-utils';
 import { nodeTypes } from '../node_types/index';
 import { KQLSyntaxError } from '../kuery_syntax_error';
 import { KueryNode, DslQuery, KueryParseOptions } from '../types';
-import { IIndexPattern } from '../../../index_patterns/types';
 
 // @ts-ignore
 import { parse as parseKuery } from './_generated_/kuery';
+import { IndexPatternBase } from '../..';
 
 const fromExpression = (
   expression: string | DslQuery,
@@ -65,7 +65,7 @@ export const fromKueryExpression = (
  */
 export const toElasticsearchQuery = (
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config?: Record<string, any>,
   context?: Record<string, any>
 ): JsonObject => {
diff --git a/src/plugins/data/common/es_query/kuery/functions/and.ts b/src/plugins/data/common/es_query/kuery/functions/and.ts
index 1989704cb627e..ba7d5d1f6645b 100644
--- a/src/plugins/data/common/es_query/kuery/functions/and.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/and.ts
@@ -7,7 +7,7 @@
  */
 
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode } from '../../..';
+import { IndexPatternBase, KueryNode } from '../../..';
 
 export function buildNodeParams(children: KueryNode[]) {
   return {
@@ -17,7 +17,7 @@ export function buildNodeParams(children: KueryNode[]) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/exists.ts b/src/plugins/data/common/es_query/kuery/functions/exists.ts
index 5238fb1d8ee7f..fa6c37e6ba18f 100644
--- a/src/plugins/data/common/es_query/kuery/functions/exists.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/exists.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import * as literal from '../node_types/literal';
-import { IIndexPattern, KueryNode, IFieldType } from '../../..';
+import { KueryNode, IFieldType, IndexPatternBase } from '../../..';
 
 export function buildNodeParams(fieldName: string) {
   return {
@@ -18,7 +18,7 @@ export function buildNodeParams(fieldName: string) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts
index f2498f3ea2ad4..38a433b1b80ab 100644
--- a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
+import { IndexPatternBase, KueryNode, IFieldType, LatLon } from '../../..';
 
 export function buildNodeParams(fieldName: string, params: any) {
   params = _.pick(params, 'topLeft', 'bottomRight');
@@ -26,7 +26,7 @@ export function buildNodeParams(fieldName: string, params: any) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/geo_polygon.ts b/src/plugins/data/common/es_query/kuery/functions/geo_polygon.ts
index 584a315930d9c..69de7248a7b38 100644
--- a/src/plugins/data/common/es_query/kuery/functions/geo_polygon.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/geo_polygon.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
+import { IndexPatternBase, KueryNode, IFieldType, LatLon } from '../../..';
 import { LiteralTypeBuildNode } from '../node_types/types';
 
 export function buildNodeParams(fieldName: string, points: LatLon[]) {
@@ -25,7 +25,7 @@ export function buildNodeParams(fieldName: string, points: LatLon[]) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/is.ts b/src/plugins/data/common/es_query/kuery/functions/is.ts
index a18ad230c3cae..55d036c2156f9 100644
--- a/src/plugins/data/common/es_query/kuery/functions/is.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/is.ts
@@ -11,7 +11,7 @@ import { getPhraseScript } from '../../filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings } from '../../utils';
 import { getFullFieldNameNode } from './utils/get_full_field_name_node';
-import { IIndexPattern, KueryNode, IFieldType } from '../../..';
+import { IndexPatternBase, KueryNode, IFieldType } from '../../..';
 
 import * as ast from '../ast';
 
@@ -39,7 +39,7 @@ export function buildNodeParams(fieldName: string, value: any, isPhrase: boolean
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/nested.ts b/src/plugins/data/common/es_query/kuery/functions/nested.ts
index bfd01ef39764c..46ceeaf3e5de6 100644
--- a/src/plugins/data/common/es_query/kuery/functions/nested.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/nested.ts
@@ -8,7 +8,7 @@
 
 import * as ast from '../ast';
 import * as literal from '../node_types/literal';
-import { IIndexPattern, KueryNode } from '../../..';
+import { IndexPatternBase, KueryNode } from '../../..';
 
 export function buildNodeParams(path: any, child: any) {
   const pathNode =
@@ -20,7 +20,7 @@ export function buildNodeParams(path: any, child: any) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/not.ts b/src/plugins/data/common/es_query/kuery/functions/not.ts
index ef4456897bcdd..f837cd261c814 100644
--- a/src/plugins/data/common/es_query/kuery/functions/not.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/not.ts
@@ -7,7 +7,7 @@
  */
 
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode } from '../../..';
+import { IndexPatternBase, KueryNode } from '../../..';
 
 export function buildNodeParams(child: KueryNode) {
   return {
@@ -17,7 +17,7 @@ export function buildNodeParams(child: KueryNode) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/or.ts b/src/plugins/data/common/es_query/kuery/functions/or.ts
index 416687e7cde9c..7365cc39595e6 100644
--- a/src/plugins/data/common/es_query/kuery/functions/or.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/or.ts
@@ -7,7 +7,7 @@
  */
 
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode } from '../../..';
+import { IndexPatternBase, KueryNode } from '../../..';
 
 export function buildNodeParams(children: KueryNode[]) {
   return {
@@ -17,7 +17,7 @@ export function buildNodeParams(children: KueryNode[]) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/range.ts b/src/plugins/data/common/es_query/kuery/functions/range.ts
index 06b345e5821c3..caefa7e5373ca 100644
--- a/src/plugins/data/common/es_query/kuery/functions/range.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/range.ts
@@ -13,7 +13,7 @@ import { getRangeScript, RangeFilterParams } from '../../filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings } from '../../utils';
 import { getFullFieldNameNode } from './utils/get_full_field_name_node';
-import { IIndexPattern, KueryNode, IFieldType } from '../../..';
+import { IndexPatternBase, KueryNode, IFieldType } from '../../..';
 
 export function buildNodeParams(fieldName: string, params: RangeFilterParams) {
   const paramsToMap = _.pick(params, 'gt', 'lt', 'gte', 'lte', 'format');
@@ -33,7 +33,7 @@ export function buildNodeParams(fieldName: string, params: RangeFilterParams) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/functions/utils/get_fields.ts b/src/plugins/data/common/es_query/kuery/functions/utils/get_fields.ts
index 4002a36648f04..7dac1262d5062 100644
--- a/src/plugins/data/common/es_query/kuery/functions/utils/get_fields.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/utils/get_fields.ts
@@ -8,10 +8,10 @@
 
 import * as literal from '../../node_types/literal';
 import * as wildcard from '../../node_types/wildcard';
-import { KueryNode, IIndexPattern } from '../../../..';
+import { KueryNode, IndexPatternBase } from '../../../..';
 import { LiteralTypeBuildNode } from '../../node_types/types';
 
-export function getFields(node: KueryNode, indexPattern?: IIndexPattern) {
+export function getFields(node: KueryNode, indexPattern?: IndexPatternBase) {
   if (!indexPattern) return [];
   if (node.type === 'literal') {
     const fieldName = literal.toElasticsearchQuery(node as LiteralTypeBuildNode);
diff --git a/src/plugins/data/common/es_query/kuery/functions/utils/get_full_field_name_node.ts b/src/plugins/data/common/es_query/kuery/functions/utils/get_full_field_name_node.ts
index e623579226861..644791637aa70 100644
--- a/src/plugins/data/common/es_query/kuery/functions/utils/get_full_field_name_node.ts
+++ b/src/plugins/data/common/es_query/kuery/functions/utils/get_full_field_name_node.ts
@@ -7,11 +7,11 @@
  */
 
 import { getFields } from './get_fields';
-import { IIndexPattern, IFieldType, KueryNode } from '../../../..';
+import { IndexPatternBase, IFieldType, KueryNode } from '../../../..';
 
 export function getFullFieldNameNode(
   rootNameNode: any,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   nestedPath?: string
 ): KueryNode {
   const fullFieldNameNode = {
diff --git a/src/plugins/data/common/es_query/kuery/node_types/function.ts b/src/plugins/data/common/es_query/kuery/node_types/function.ts
index b9b7379dfb23d..642089a101f31 100644
--- a/src/plugins/data/common/es_query/kuery/node_types/function.ts
+++ b/src/plugins/data/common/es_query/kuery/node_types/function.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 
 import { functions } from '../functions';
-import { IIndexPattern, KueryNode } from '../../..';
+import { IndexPatternBase, KueryNode } from '../../..';
 import { FunctionName, FunctionTypeBuildNode } from './types';
 
 export function buildNode(functionName: FunctionName, ...args: any[]) {
@@ -45,7 +45,7 @@ export function buildNodeWithArgumentNodes(
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: IndexPatternBase,
   config?: Record<string, any>,
   context?: Record<string, any>
 ) {
diff --git a/src/plugins/data/common/es_query/kuery/node_types/types.ts b/src/plugins/data/common/es_query/kuery/node_types/types.ts
index b3247a0ad8dc2..ea8eb5e8a0618 100644
--- a/src/plugins/data/common/es_query/kuery/node_types/types.ts
+++ b/src/plugins/data/common/es_query/kuery/node_types/types.ts
@@ -11,8 +11,8 @@
  */
 
 import { JsonValue } from '@kbn/common-utils';
-import { IIndexPattern } from '../../../index_patterns';
 import { KueryNode } from '..';
+import { IndexPatternBase } from '../..';
 
 export type FunctionName =
   | 'is'
@@ -30,7 +30,7 @@ interface FunctionType {
   buildNodeWithArgumentNodes: (functionName: FunctionName, args: any[]) => FunctionTypeBuildNode;
   toElasticsearchQuery: (
     node: any,
-    indexPattern?: IIndexPattern,
+    indexPattern?: IndexPatternBase,
     config?: Record<string, any>,
     context?: Record<string, any>
   ) => JsonValue;
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 07aa8967b905e..a88f029c0c7cd 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -9,6 +9,7 @@ import type { estypes } from '@elastic/elasticsearch';
 import { ToastInputFields, ErrorToastOptions } from 'src/core/public/notifications';
 // eslint-disable-next-line
 import type { SavedObject } from 'src/core/server';
+import type { IndexPatternBase } from '../es_query';
 import { IFieldType } from './fields';
 import { RUNTIME_FIELD_TYPES } from './constants';
 import { SerializedFieldFormat } from '../../../expressions/common';
@@ -29,10 +30,8 @@ export interface RuntimeField {
  * IIndexPattern allows for an IndexPattern OR an index pattern saved object
  * Use IndexPattern or IndexPatternSpec instead
  */
-export interface IIndexPattern {
-  fields: IFieldType[];
+export interface IIndexPattern extends IndexPatternBase {
   title: string;
-  id?: string;
   /**
    * Type is used for identifying rollup indices, otherwise left undefined
    */
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 078dd3a9b7c5a..d7667f20d517e 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -23,7 +23,6 @@ import {
   disableFilter,
   FILTERS,
   FilterStateStore,
-  getDisplayValueFromFilter,
   getPhraseFilterField,
   getPhraseFilterValue,
   isExistsFilter,
@@ -43,6 +42,7 @@ import { FilterLabel } from './ui';
 import { FilterItem } from './ui/filter_bar';
 
 import {
+  getDisplayValueFromFilter,
   generateFilters,
   onlyDisabledFiltersChanged,
   changeTimeFilter,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 7a5f323e51459..2849b93b14483 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -808,11 +808,11 @@ export const esFilters: {
     FILTERS: typeof FILTERS;
     FilterStateStore: typeof FilterStateStore;
     buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
-    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
-    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
-    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
+    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IndexPatternBase) => import("../common").PhrasesFilter;
+    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IndexPatternBase) => import("../common").ExistsFilter;
+    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IndexPatternBase) => import("../common").PhraseFilter;
     buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
-    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
+    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IndexPatternBase, formattedValue?: string | undefined) => import("../common").RangeFilter;
     isPhraseFilter: (filter: any) => filter is import("../common").PhraseFilter;
     isExistsFilter: (filter: any) => filter is import("../common").ExistsFilter;
     isPhrasesFilter: (filter: any) => filter is import("../common").PhrasesFilter;
@@ -858,7 +858,7 @@ export const esFilters: {
 export const esKuery: {
     nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
     fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
-    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
+    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IndexPatternBase | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
 };
 
 // Warning: (ae-missing-release-tag) "esQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -867,7 +867,7 @@ export const esKuery: {
 export const esQuery: {
     buildEsQuery: typeof buildEsQuery;
     getEsQueryConfig: typeof getEsQueryConfig;
-    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
+    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
         must: never[];
         filter: import("../common").Filter[];
         should: never[];
@@ -1286,22 +1286,19 @@ export interface IFieldType {
     visualizable?: boolean;
 }
 
+// Warning: (ae-forgotten-export) The symbol "IndexPatternBase" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "IIndexPattern" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public @deprecated (undocumented)
-export interface IIndexPattern {
+export interface IIndexPattern extends IndexPatternBase {
     // Warning: (ae-forgotten-export) The symbol "SerializedFieldFormat" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
     fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
-    // (undocumented)
-    fields: IFieldType[];
     getFormatterForField?: (field: IndexPatternField | IndexPatternField['spec'] | IFieldType) => FieldFormat;
     // (undocumented)
     getTimeField?(): IFieldType | undefined;
     // (undocumented)
-    id?: string;
-    // (undocumented)
     timeFieldName?: string;
     // (undocumented)
     title: string;
@@ -2731,13 +2728,13 @@ export interface WaitUntilNextSessionCompletesOptions {
 
 // Warnings were encountered during analysis:
 //
-// src/plugins/data/common/es_query/filters/exists_filter.ts:19:3 - (ae-forgotten-export) The symbol "ExistsFilterMeta" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/es_query/filters/exists_filter.ts:20:3 - (ae-forgotten-export) The symbol "FilterExistsProperty" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/es_query/filters/exists_filter.ts:20:3 - (ae-forgotten-export) The symbol "ExistsFilterMeta" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/es_query/filters/exists_filter.ts:21:3 - (ae-forgotten-export) The symbol "FilterExistsProperty" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/match_all_filter.ts:17:3 - (ae-forgotten-export) The symbol "MatchAllFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/meta_filter.ts:43:3 - (ae-forgotten-export) The symbol "FilterState" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/meta_filter.ts:44:3 - (ae-forgotten-export) The symbol "FilterMeta" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/es_query/filters/phrase_filter.ts:22:3 - (ae-forgotten-export) The symbol "PhraseFilterMeta" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/es_query/filters/phrases_filter.ts:20:3 - (ae-forgotten-export) The symbol "PhrasesFilterMeta" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/es_query/filters/phrase_filter.ts:23:3 - (ae-forgotten-export) The symbol "PhraseFilterMeta" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/es_query/filters/phrases_filter.ts:21:3 - (ae-forgotten-export) The symbol "PhrasesFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:65:5 - (ae-forgotten-export) The symbol "FormatFieldFn" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:138:7 - (ae-forgotten-export) The symbol "FieldAttrSet" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:169:7 - (ae-forgotten-export) The symbol "RuntimeField" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/data/public/query/filter_manager/index.ts b/src/plugins/data/public/query/filter_manager/index.ts
index 327b9763541ac..55dba640b07b6 100644
--- a/src/plugins/data/public/query/filter_manager/index.ts
+++ b/src/plugins/data/public/query/filter_manager/index.ts
@@ -11,3 +11,5 @@ export { FilterManager } from './filter_manager';
 export { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
 export { onlyDisabledFiltersChanged } from './lib/only_disabled';
 export { generateFilters } from './lib/generate_filters';
+export { getDisplayValueFromFilter } from './lib/get_display_value';
+export { getIndexPatternFromFilter } from './lib/get_index_pattern_from_filter';
diff --git a/src/plugins/data/common/es_query/filters/get_display_value.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
similarity index 95%
rename from src/plugins/data/common/es_query/filters/get_display_value.ts
rename to src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
index ee719843ae879..45c6167f600bc 100644
--- a/src/plugins/data/common/es_query/filters/get_display_value.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
@@ -7,9 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IIndexPattern } from '../..';
+import { Filter, IIndexPattern } from '../../../../common';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
-import { Filter } from '../filters';
 
 function getValueFormatter(indexPattern?: IIndexPattern, key?: string) {
   // checking getFormatterForField exists because there is at least once case where an index pattern
diff --git a/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
similarity index 100%
rename from src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
diff --git a/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
similarity index 88%
rename from src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.ts
rename to src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
index bceeb5f2793ec..7a2ce29102e51 100644
--- a/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Filter } from '../filters';
-import { IIndexPattern } from '../..';
+import { Filter, IIndexPattern } from '../../../../common';
 
 export function getIndexPatternFromFilter(
   filter: Filter,
diff --git a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx b/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx
index 23de8327ce1f1..9cc9af04409f1 100644
--- a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx
+++ b/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx
@@ -20,9 +20,9 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { IIndexPattern } from '../..';
-import { getDisplayValueFromFilter, Filter } from '../../../common';
+import { Filter } from '../../../common';
 import { FilterLabel } from '../filter_bar';
-import { mapAndFlattenFilters } from '../../query';
+import { mapAndFlattenFilters, getDisplayValueFromFilter } from '../../query';
 
 interface Props {
   filters: Filter[];
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
index 2b8978a125bca..734161ea87232 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
@@ -37,10 +37,10 @@ import { Operator } from './lib/filter_operators';
 import { PhraseValueInput } from './phrase_value_input';
 import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
+import { getIndexPatternFromFilter } from '../../../query';
 import { IIndexPattern, IFieldType } from '../../..';
 import {
   Filter,
-  getIndexPatternFromFilter,
   FieldFilter,
   buildFilter,
   buildCustomFilter,
diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/data/public/ui/filter_bar/filter_item.tsx
index 9e5090f945182..09e0571c2a870 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_item.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_item.tsx
@@ -14,14 +14,13 @@ import { IUiSettingsClient } from 'src/core/public';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
 import { IIndexPattern } from '../..';
+import { getDisplayValueFromFilter, getIndexPatternFromFilter } from '../../query';
 import {
   Filter,
   isFilterPinned,
-  getDisplayValueFromFilter,
   toggleFilterNegated,
   toggleFilterPinned,
   toggleFilterDisabled,
-  getIndexPatternFromFilter,
 } from '../../../common';
 import { getIndexPatterns } from '../../services';
 
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 768c44d3e3e95..5ca19f9e1e509 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -447,11 +447,11 @@ export const esFilters: {
     buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
     buildCustomFilter: typeof buildCustomFilter;
     buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
-    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
+    buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IndexPatternBase) => import("../common").ExistsFilter;
     buildFilter: typeof buildFilter;
-    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
-    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
-    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
+    buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IndexPatternBase) => import("../common").PhraseFilter;
+    buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IndexPatternBase) => import("../common").PhrasesFilter;
+    buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IndexPatternBase, formattedValue?: string | undefined) => import("../common").RangeFilter;
     isFilterDisabled: (filter: import("../common").Filter) => boolean;
 };
 
@@ -461,14 +461,14 @@ export const esFilters: {
 export const esKuery: {
     nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
     fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
-    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
+    toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IndexPatternBase | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
 };
 
 // Warning: (ae-missing-release-tag) "esQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const esQuery: {
-    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
+    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
         must: never[];
         filter: import("../common").Filter[];
         should: never[];

From 23666832091d0a30c00222fdd73d56af51224ff9 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 23 Jun 2021 14:43:17 -0500
Subject: [PATCH 11/95] [Enterprise Search] Add shared Users components and
 enable RBAC functionality (#102826)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add RolesEmptyPrompt component

* Move constants to shared

Will be used in next commit so DRYing them out here

* Add UserAddedInfo component

* Add UsersEmptyPrompt component

* Add UserInvitationCallout component

* Add some shared types

* Add UserSelector component

* Fix imports from a previous commit

Refactored these to shared but missed updating the implementation. See e2d3ec2ca4aba3cb6f7e8e2d2d2da96aa6bedf1b

* Add UsersHeading component

* Add UserFlyout component

* Update UsersAndRolesRowActions with confirm modal

Design calls for using a custom call out instead of window.confirm

* Add pagination size and fix type

- email can be null on bult-in elasticsearch users

* Add UsersTable component

* Remove window.confirm from logic files

The UsersAndRolesRowActions component now uses an EUI prompt for this. Whitespace changes should be hidden for this commit

* Add routes for enabling RBAC

* Update App Search routes

https://github.com/elastic/ent-search/pull/3862

added the ‘/as’ prefix to App Search role mappings routes

* Add logic for enabling role-based access

* Pass docsLink as a prop to the heading component

* Add empty states to mappings landing pages

* Fix a couple of missed i18ns

* Remove unused translations

* Remove EuiOverlayMask

This was needed in ent-search because it uses an older EUI. The newer confirm modal has its own overlay

* Update RoleMappingsTable to use new design

Previously, we showed all engines/groups in the table but the new design calls for a truncated list with additional items so [‘foo’, ‘bar’, ‘baz’]  would display as “foo, bar + 1”

This is already in place for the users table

* Lint fix

* Another lint fix

* Fix test name

Co-authored-by: Jason Stoltzfus <jastoltz24@gmail.com>

* Move test

Co-authored-by: Jason Stoltzfus <jastoltz24@gmail.com>
---
 .../components/role_mappings/constants.ts     |   8 -
 .../role_mappings/role_mappings.tsx           |  22 +-
 .../role_mappings/role_mappings_logic.test.ts |  49 ++--
 .../role_mappings/role_mappings_logic.ts      |  37 ++-
 .../applications/shared/constants/index.ts    |   1 +
 .../applications/shared/constants/labels.ts   |  15 ++
 .../__mocks__/elasticsearch_users.ts          |  13 ++
 .../shared/role_mapping/__mocks__/roles.ts    |  19 ++
 .../shared/role_mapping/constants.ts          | 213 +++++++++++++++++-
 .../applications/shared/role_mapping/index.ts |   8 +
 .../role_mappings_heading.test.tsx            |   8 +-
 .../role_mapping/role_mappings_heading.tsx    |   8 +-
 .../role_mapping/role_mappings_table.test.tsx |  34 +--
 .../role_mapping/role_mappings_table.tsx      |  37 ++-
 .../role_mapping/roles_empty_prompt.test.tsx  |  39 ++++
 .../role_mapping/roles_empty_prompt.tsx       |  48 ++++
 .../role_mapping/user_added_info.test.tsx     |  28 +++
 .../shared/role_mapping/user_added_info.tsx   |  40 ++++
 .../shared/role_mapping/user_flyout.test.tsx  |  70 ++++++
 .../shared/role_mapping/user_flyout.tsx       | 113 ++++++++++
 .../user_invitation_callout.test.tsx          |  46 ++++
 .../role_mapping/user_invitation_callout.tsx  |  47 ++++
 .../role_mapping/user_selector.test.tsx       | 112 +++++++++
 .../shared/role_mapping/user_selector.tsx     | 159 +++++++++++++
 .../users_and_roles_row_actions.test.tsx      |  22 +-
 .../users_and_roles_row_actions.tsx           |  63 +++++-
 .../role_mapping/users_empty_prompt.test.tsx  |  22 ++
 .../role_mapping/users_empty_prompt.tsx       |  43 ++++
 .../role_mapping/users_heading.test.tsx       |  32 +++
 .../shared/role_mapping/users_heading.tsx     |  37 +++
 .../shared/role_mapping/users_table.test.tsx  | 100 ++++++++
 .../shared/role_mapping/users_table.tsx       | 147 ++++++++++++
 .../public/applications/shared/types.ts       |  16 ++
 .../groups/components/group_users_table.tsx   |  18 +-
 .../views/role_mappings/constants.ts          |   8 -
 .../views/role_mappings/role_mappings.tsx     |  27 ++-
 .../role_mappings/role_mappings_logic.test.ts |  50 ++--
 .../role_mappings/role_mappings_logic.ts      |  37 ++-
 .../routes/app_search/role_mappings.test.ts   |  37 ++-
 .../server/routes/app_search/role_mappings.ts |  24 +-
 .../workplace_search/role_mappings.test.ts    |  29 ++-
 .../routes/workplace_search/role_mappings.ts  |  16 ++
 .../translations/translations/ja-JP.json      |   9 +-
 .../translations/translations/zh-CN.json      |   9 +-
 44 files changed, 1748 insertions(+), 172 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
index df1e19e264c75..cce18cbeffd0a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
@@ -9,14 +9,6 @@ import { i18n } from '@kbn/i18n';
 
 import { AdvanceRoleType } from '../../types';
 
-export const DELETE_ROLE_MAPPING_MESSAGE = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.deleteRoleMappingMessage',
-  {
-    defaultMessage:
-      'Are you sure you want to permanently delete this mapping? This action is not reversible and some users might lose access.',
-  }
-);
-
 export const ROLE_MAPPING_DELETED_MESSAGE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.roleMappingDeletedMessage',
   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
index db0e6e6dead11..03e2ae67eca9e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
@@ -10,16 +10,25 @@ import React, { useEffect } from 'react';
 import { useActions, useValues } from 'kea';
 
 import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
-import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
+import {
+  RoleMappingsTable,
+  RoleMappingsHeading,
+  RolesEmptyPrompt,
+} from '../../../shared/role_mapping';
 import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
+
+import { DOCS_PREFIX } from '../../routes';
 import { AppSearchPageTemplate } from '../layout';
 
 import { ROLE_MAPPINGS_ENGINE_ACCESS_HEADING } from './constants';
 import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
 
+const ROLES_DOCS_LINK = `${DOCS_PREFIX}/security-and-users.html`;
+
 export const RoleMappings: React.FC = () => {
   const {
+    enableRoleBasedAccess,
     initializeRoleMappings,
     initializeRoleMapping,
     handleDeleteMapping,
@@ -37,10 +46,19 @@ export const RoleMappings: React.FC = () => {
     return resetState;
   }, []);
 
+  const rolesEmptyState = (
+    <RolesEmptyPrompt
+      productName={APP_SEARCH_PLUGIN.NAME}
+      docsLink={ROLES_DOCS_LINK}
+      onEnable={enableRoleBasedAccess}
+    />
+  );
+
   const roleMappingsSection = (
     <section>
       <RoleMappingsHeading
         productName={APP_SEARCH_PLUGIN.NAME}
+        docsLink={ROLES_DOCS_LINK}
         onClick={() => initializeRoleMapping()}
       />
       <RoleMappingsTable
@@ -59,6 +77,8 @@ export const RoleMappings: React.FC = () => {
       pageChrome={[ROLE_MAPPINGS_TITLE]}
       pageHeader={{ pageTitle: ROLE_MAPPINGS_TITLE }}
       isLoading={dataLoading}
+      isEmptyState={roleMappings.length < 1}
+      emptyState={rolesEmptyState}
     >
       {roleMappingFlyoutOpen && <RoleMapping />}
       {roleMappingsSection}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
index 870e303a2930d..6985f213d1dd5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
@@ -87,6 +87,13 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    it('setRoleMappings', () => {
+      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [asRoleMapping] });
+
+      expect(RoleMappingsLogic.values.roleMappings).toEqual([asRoleMapping]);
+      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
+    });
+
     it('handleRoleChange', () => {
       RoleMappingsLogic.actions.handleRoleChange('dev');
 
@@ -266,6 +273,30 @@ describe('RoleMappingsLogic', () => {
   });
 
   describe('listeners', () => {
+    describe('enableRoleBasedAccess', () => {
+      it('calls API and sets values', async () => {
+        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.enableRoleBasedAccess();
+
+        expect(RoleMappingsLogic.values.dataLoading).toEqual(true);
+
+        expect(http.post).toHaveBeenCalledWith(
+          '/api/app_search/role_mappings/enable_role_based_access'
+        );
+        await nextTick();
+        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+      });
+
+      it('handles error', async () => {
+        http.post.mockReturnValue(Promise.reject('this is an error'));
+        RoleMappingsLogic.actions.enableRoleBasedAccess();
+        await nextTick();
+
+        expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
+      });
+    });
+
     describe('initializeRoleMappings', () => {
       it('calls API and sets values', async () => {
         const setRoleMappingsDataSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappingsData');
@@ -400,18 +431,8 @@ describe('RoleMappingsLogic', () => {
     });
 
     describe('handleDeleteMapping', () => {
-      let confirmSpy: any;
       const roleMappingId = 'r1';
 
-      beforeEach(() => {
-        confirmSpy = jest.spyOn(window, 'confirm');
-        confirmSpy.mockImplementation(jest.fn(() => true));
-      });
-
-      afterEach(() => {
-        confirmSpy.mockRestore();
-      });
-
       it('calls API and refreshes list', async () => {
         mount(mappingsServerProps);
         const initializeRoleMappingsSpy = jest.spyOn(
@@ -436,14 +457,6 @@ describe('RoleMappingsLogic', () => {
 
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
-
-      it('will do nothing if not confirmed', () => {
-        mount(mappingsServerProps);
-        jest.spyOn(window, 'confirm').mockReturnValueOnce(false);
-        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
-
-        expect(http.delete).not.toHaveBeenCalled();
-      });
     });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
index fc0a235b23c77..e2ef75897528c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
@@ -22,7 +22,6 @@ import { roleHasScopedEngines } from '../../utils/role/has_scoped_engines';
 import { Engine } from '../engine/types';
 
 import {
-  DELETE_ROLE_MAPPING_MESSAGE,
   ROLE_MAPPING_DELETED_MESSAGE,
   ROLE_MAPPING_CREATED_MESSAGE,
   ROLE_MAPPING_UPDATED_MESSAGE,
@@ -59,10 +58,16 @@ interface RoleMappingsActions {
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMapping(roleMapping: ASRoleMapping): { roleMapping: ASRoleMapping };
+  setRoleMappings({
+    roleMappings,
+  }: {
+    roleMappings: ASRoleMapping[];
+  }): { roleMappings: ASRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   openRoleMappingFlyout(): void;
   closeRoleMappingFlyout(): void;
   setRoleMappingErrors(errors: string[]): { errors: string[] };
+  enableRoleBasedAccess(): void;
 }
 
 interface RoleMappingsValues {
@@ -91,6 +96,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMapping: (roleMapping: ASRoleMapping) => ({ roleMapping }),
+    setRoleMappings: ({ roleMappings }: { roleMappings: ASRoleMapping[] }) => ({ roleMappings }),
     setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string) => ({ value }),
     handleRoleChange: (roleType: RoleTypes) => ({ roleType }),
@@ -101,6 +107,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     }),
     handleAttributeValueChange: (value: string) => ({ value }),
     handleAccessAllEnginesChange: (selected: boolean) => ({ selected }),
+    enableRoleBasedAccess: true,
     resetState: true,
     initializeRoleMappings: true,
     initializeRoleMapping: (roleMappingId) => ({ roleMappingId }),
@@ -114,13 +121,16 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       true,
       {
         setRoleMappingsData: () => false,
+        setRoleMappings: () => false,
         resetState: () => true,
+        enableRoleBasedAccess: () => true,
       },
     ],
     roleMappings: [
       [],
       {
         setRoleMappingsData: (_, { roleMappings }) => roleMappings,
+        setRoleMappings: (_, { roleMappings }) => roleMappings,
         resetState: () => [],
       },
     ],
@@ -267,6 +277,17 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     ],
   }),
   listeners: ({ actions, values }) => ({
+    enableRoleBasedAccess: async () => {
+      const { http } = HttpLogic.values;
+      const route = '/api/app_search/role_mappings/enable_role_based_access';
+
+      try {
+        const response = await http.post(route);
+        actions.setRoleMappings(response);
+      } catch (e) {
+        flashAPIErrors(e);
+      }
+    },
     initializeRoleMappings: async () => {
       const { http } = HttpLogic.values;
       const route = '/api/app_search/role_mappings';
@@ -286,14 +307,12 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const { http } = HttpLogic.values;
       const route = `/api/app_search/role_mappings/${roleMappingId}`;
 
-      if (window.confirm(DELETE_ROLE_MAPPING_MESSAGE)) {
-        try {
-          await http.delete(route);
-          actions.initializeRoleMappings();
-          setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
-        } catch (e) {
-          flashAPIErrors(e);
-        }
+      try {
+        await http.delete(route);
+        actions.initializeRoleMappings();
+        setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
+      } catch (e) {
+        flashAPIErrors(e);
       }
     },
     handleSaveMapping: async () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/constants/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/constants/index.ts
index 70990727b8a62..b15bd9e1155cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/constants/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/constants/index.ts
@@ -6,4 +6,5 @@
  */
 
 export * from './actions';
+export * from './labels';
 export { DEFAULT_META } from './default_meta';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts b/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
new file mode 100644
index 0000000000000..8e6159d2b5b2a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const USERNAME_LABEL = i18n.translate('xpack.enterpriseSearch.usernameLabel', {
+  defaultMessage: 'Username',
+});
+export const EMAIL_LABEL = i18n.translate('xpack.enterpriseSearch.emailLabel', {
+  defaultMessage: 'Email',
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
new file mode 100644
index 0000000000000..500f560675679
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 elasticsearchUsers = [
+  {
+    email: 'user1@user.com',
+    username: 'user1',
+  },
+];
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/roles.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/roles.ts
index 15dec753351ba..486c1ba6c9af6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/roles.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/roles.ts
@@ -9,6 +9,8 @@ import { engines } from '../../../app_search/__mocks__/engines.mock';
 
 import { AttributeName } from '../../types';
 
+import { elasticsearchUsers } from './elasticsearch_users';
+
 export const asRoleMapping = {
   id: 'sdgfasdgadf123',
   attributeName: 'role' as AttributeName,
@@ -70,3 +72,20 @@ export const wsRoleMapping = {
     },
   ],
 };
+
+export const invitation = {
+  email: 'foo@example.com',
+  code: '123fooqwe',
+};
+
+export const wsSingleUserRoleMapping = {
+  invitation,
+  elasticsearchUser: elasticsearchUsers[0],
+  roleMapping: wsRoleMapping,
+};
+
+export const asSingleUserRoleMapping = {
+  invitation,
+  elasticsearchUser: elasticsearchUsers[0],
+  roleMapping: asRoleMapping,
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
index 9f40844e52470..45cab32b67e08 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
@@ -50,10 +50,26 @@ export const ROLE_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.rol
   defaultMessage: 'Role',
 });
 
+export const USERNAME_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.usernameLabel', {
+  defaultMessage: 'Username',
+});
+
+export const EMAIL_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.emailLabel', {
+  defaultMessage: 'Email',
+});
+
 export const ALL_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.allLabel', {
   defaultMessage: 'All',
 });
 
+export const GROUPS_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.groupsLabel', {
+  defaultMessage: 'Groups',
+});
+
+export const ENGINES_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.enginesLabel', {
+  defaultMessage: 'Engines',
+});
+
 export const AUTH_PROVIDER_LABEL = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.authProviderLabel',
   {
@@ -82,10 +98,10 @@ export const ATTRIBUTE_VALUE_ERROR = i18n.translate(
   }
 );
 
-export const DELETE_ROLE_MAPPING_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle',
+export const REMOVE_ROLE_MAPPING_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.removeRoleMappingTitle',
   {
-    defaultMessage: 'Remove this role mapping',
+    defaultMessage: 'Remove role mapping',
   }
 );
 
@@ -96,10 +112,17 @@ export const DELETE_ROLE_MAPPING_DESCRIPTION = i18n.translate(
   }
 );
 
-export const DELETE_ROLE_MAPPING_BUTTON = i18n.translate(
-  'xpack.enterpriseSearch.roleMapping.deleteRoleMappingButton',
+export const REMOVE_ROLE_MAPPING_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.removeRoleMappingButton',
+  {
+    defaultMessage: 'Remove mapping',
+  }
+);
+
+export const REMOVE_USER_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.removeUserButton',
   {
-    defaultMessage: 'Delete mapping',
+    defaultMessage: 'Remove user',
   }
 );
 
@@ -205,3 +228,181 @@ export const ROLE_MAPPINGS_NO_RESULTS_MESSAGE = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.noResults.message',
   { defaultMessage: 'Create a new role mapping' }
 );
+
+export const ROLES_DISABLED_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.rolesDisabledTitle',
+  { defaultMessage: 'Role-based access is disabled' }
+);
+
+export const ROLES_DISABLED_DESCRIPTION = (productName: ProductName) =>
+  i18n.translate('xpack.enterpriseSearch.roleMapping.rolesDisabledDescription', {
+    defaultMessage:
+      'All users set for this deployment currently have full access to {productName}. To restrict access and manage permissions, you must enable role-based access for Enterprise Search.',
+    values: { productName },
+  });
+
+export const ROLES_DISABLED_NOTE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.rolesDisabledNote',
+  {
+    defaultMessage:
+      'Note: enabling role-based access restricts access for both App Search and Workplace Search. Once enabled, review access management for both products, if applicable.',
+  }
+);
+
+export const ENABLE_ROLES_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.enableRolesButton',
+  { defaultMessage: 'Enable role-based access' }
+);
+
+export const ENABLE_ROLES_LINK = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.enableRolesLink',
+  { defaultMessage: 'Learn more about role-based access' }
+);
+
+export const INVITATION_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.invitationDescription',
+  {
+    defaultMessage:
+      'This URL can be shared with the user, allowing them to accept the Enterprise Search invitation and set a new password',
+  }
+);
+
+export const NEW_INVITATION_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.newInvitationLabel',
+  { defaultMessage: 'Invitation URL' }
+);
+
+export const EXISTING_INVITATION_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.existingInvitationLabel',
+  { defaultMessage: 'The user has not yet accepted the invitation.' }
+);
+
+export const INVITATION_LINK = i18n.translate('xpack.enterpriseSearch.roleMapping.invitationLink', {
+  defaultMessage: 'Enterprise Search Invitation Link',
+});
+
+export const NO_USERS_TITLE = i18n.translate('xpack.enterpriseSearch.roleMapping.noUsersTitle', {
+  defaultMessage: 'No user added',
+});
+
+export const NO_USERS_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.noUsersDescription',
+  {
+    defaultMessage:
+      'Users can be added individually, for flexibility. Role mappings provide a broader interface for adding large number of users using user attributes.',
+  }
+);
+
+export const ENABLE_USERS_LINK = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.enableUsersLink',
+  { defaultMessage: 'Learn more about user management' }
+);
+
+export const NEW_USER_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.newUserLabel', {
+  defaultMessage: 'Create new user',
+});
+
+export const EXISTING_USER_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.existingUserLabel',
+  { defaultMessage: 'Add existing user' }
+);
+
+export const USERNAME_NO_USERS_TEXT = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.usernameNoUsersText',
+  { defaultMessage: 'No existing user eligible for addition.' }
+);
+
+export const REQUIRED_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.requiredLabel', {
+  defaultMessage: 'Required',
+});
+
+export const USERS_HEADING_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.usersHeadingTitle',
+  { defaultMessage: 'Users' }
+);
+
+export const USERS_HEADING_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.usersHeadingDescription',
+  {
+    defaultMessage:
+      'User management provides granular access for individual or special permission needs. Users from federated sources such as SAML are managed by role mappings, and excluded from this list.',
+  }
+);
+
+export const USERS_HEADING_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.usersHeadingLabel',
+  { defaultMessage: 'Add a new user' }
+);
+
+export const UPDATE_USER_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.updateUserLabel',
+  {
+    defaultMessage: 'Update user',
+  }
+);
+
+export const ADD_USER_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.addUserLabel', {
+  defaultMessage: 'Add user',
+});
+
+export const USER_ADDED_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.userAddedLabel',
+  {
+    defaultMessage: 'User added',
+  }
+);
+
+export const USER_UPDATED_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.userUpdatedLabel',
+  {
+    defaultMessage: 'User updated',
+  }
+);
+
+export const NEW_USER_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.newUserDescription',
+  {
+    defaultMessage: 'Provide granular access and permissions',
+  }
+);
+
+export const UPDATE_USER_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.updateUserDescription',
+  {
+    defaultMessage: 'Manage granular access and permissions',
+  }
+);
+
+export const INVITATION_PENDING_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.invitationPendingLabel',
+  {
+    defaultMessage: 'Invitation pending',
+  }
+);
+
+export const ROLE_MODAL_TEXT = i18n.translate('xpack.enterpriseSearch.roleMapping.roleModalText', {
+  defaultMessage:
+    'Removing a role mapping revokes access to any user corresponding to the mapping attributes, but may not take effect immediately for SAML-governed roles. Users with an active SAML session will retain access until it expires.',
+});
+
+export const USER_MODAL_TITLE = (username: string) =>
+  i18n.translate('xpack.enterpriseSearch.roleMapping.userModalTitle', {
+    defaultMessage: 'Remove {username}',
+    values: { username },
+  });
+
+export const USER_MODAL_TEXT = i18n.translate('xpack.enterpriseSearch.roleMapping.userModalText', {
+  defaultMessage:
+    'Removing a user immediately revokes access to the experience, unless this user’s attributes also corresponds to a role mapping for native and SAML-governed authentication, in which case associated role mappings should also be reviewed and adjusted, as needed.',
+});
+
+export const FILTER_USERS_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.filterUsersLabel',
+  {
+    defaultMessage: 'Filter users',
+  }
+);
+
+export const NO_USERS_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.noUsersLabel', {
+  defaultMessage: 'No matching users found',
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
index b0d10e9692714..8096b86939ff3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
@@ -6,9 +6,17 @@
  */
 
 export { AttributeSelector } from './attribute_selector';
+export { RolesEmptyPrompt } from './roles_empty_prompt';
 export { RoleMappingsTable } from './role_mappings_table';
 export { RoleOptionLabel } from './role_option_label';
 export { RoleSelector } from './role_selector';
 export { RoleMappingFlyout } from './role_mapping_flyout';
 export { RoleMappingsHeading } from './role_mappings_heading';
+export { UserAddedInfo } from './user_added_info';
+export { UserFlyout } from './user_flyout';
+export { UsersHeading } from './users_heading';
+export { UserInvitationCallout } from './user_invitation_callout';
+export { UserSelector } from './user_selector';
+export { UsersTable } from './users_table';
 export { UsersAndRolesRowActions } from './users_and_roles_row_actions';
+export { UsersEmptyPrompt } from './users_empty_prompt';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx
index f0bf86fb306c6..5a2958d60dc2c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx
@@ -15,7 +15,13 @@ import { RoleMappingsHeading } from './role_mappings_heading';
 
 describe('RoleMappingsHeading', () => {
   it('renders ', () => {
-    const wrapper = shallow(<RoleMappingsHeading productName="App Search" onClick={jest.fn()} />);
+    const wrapper = shallow(
+      <RoleMappingsHeading
+        docsLink="http://elastic.co"
+        productName="App Search"
+        onClick={jest.fn()}
+      />
+    );
 
     expect(wrapper.find(EuiTitle)).toHaveLength(1);
     expect(wrapper.find(EuiText)).toHaveLength(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx
index eee8b180d3281..1984cc6c60a34 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx
@@ -28,13 +28,11 @@ import {
 
 interface Props {
   productName: ProductName;
+  docsLink: string;
   onClick(): void;
 }
 
-// TODO: Replace EuiLink href with acutal docs link when available
-const ROLE_MAPPINGS_DOCS_HREF = '#TODO';
-
-export const RoleMappingsHeading: React.FC<Props> = ({ productName, onClick }) => (
+export const RoleMappingsHeading: React.FC<Props> = ({ productName, docsLink, onClick }) => (
   <header>
     <EuiFlexGroup justifyContent="spaceBetween">
       <EuiFlexItem>
@@ -45,7 +43,7 @@ export const RoleMappingsHeading: React.FC<Props> = ({ productName, onClick }) =
         <EuiText color="subdued">
           <p>
             {ROLE_MAPPINGS_HEADING_DESCRIPTION(productName)}{' '}
-            <EuiLink external href={ROLE_MAPPINGS_DOCS_HREF} target="_blank">
+            <EuiLink external href={docsLink} target="_blank">
               {ROLE_MAPPINGS_HEADING_DOCS_LINK}
             </EuiLink>
           </p>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
index 156b52a4016c3..81a7c06020165 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
@@ -13,7 +13,9 @@ import { mount } from 'enzyme';
 
 import { EuiInMemoryTable, EuiTableHeaderCell } from '@elastic/eui';
 
-import { ALL_LABEL, ANY_AUTH_PROVIDER_OPTION_LABEL } from './constants';
+import { engines } from '../../app_search/__mocks__/engines.mock';
+
+import { ANY_AUTH_PROVIDER_OPTION_LABEL } from './constants';
 
 import { RoleMappingsTable } from './role_mappings_table';
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
@@ -78,28 +80,30 @@ describe('RoleMappingsTable', () => {
     expect(handleDeleteMapping).toHaveBeenCalled();
   });
 
-  it('shows default message when "accessAllEngines" is true', () => {
+  it('handles access items display for all items', () => {
     const wrapper = mount(
       <RoleMappingsTable {...props} roleMappings={[asRoleMapping as any]} accessItemKey="engines" />
     );
 
-    expect(wrapper.find('[data-test-subj="AccessItemsList"]').prop('children')).toEqual(ALL_LABEL);
+    expect(wrapper.find('[data-test-subj="AllItems"]')).toHaveLength(1);
   });
 
-  it('handles display when no items present', () => {
-    const noItemsRoleMapping = { ...asRoleMapping, engines: [] };
-    noItemsRoleMapping.accessAllEngines = false;
-
+  it('handles access items display more than 2 items', () => {
+    const extraEngine = {
+      ...engines[0],
+      id: '3',
+    };
+
+    const roleMapping = {
+      ...asRoleMapping,
+      engines: [...engines, extraEngine],
+      accessAllEngines: false,
+    };
     const wrapper = mount(
-      <RoleMappingsTable
-        {...props}
-        roleMappings={[noItemsRoleMapping as any]}
-        accessItemKey="engines"
-      />
+      <RoleMappingsTable {...props} roleMappings={[roleMapping as any]} accessItemKey="engines" />
     );
-
-    expect(wrapper.find('[data-test-subj="AccessItemsList"]').children().children().text()).toEqual(
-      '—'
+    expect(wrapper.find('[data-test-subj="AccessItems"]').prop('children')).toEqual(
+      `${engines[0].name}, ${engines[1].name} + 1`
     );
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
index 7696cf03ed4b1..eb9621c7a242c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
+import React from 'react';
 
-import { EuiIconTip, EuiTextColor, EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui';
+import { EuiIconTip, EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui';
 
 import { ASRoleMapping } from '../../app_search/types';
 import { WSRoleMapping } from '../../workplace_search/types';
@@ -46,8 +46,6 @@ interface Props {
   handleDeleteMapping(roleMappingId: string): void;
 }
 
-const noItemsPlaceholder = <EuiTextColor color="subdued">&mdash;</EuiTextColor>;
-
 const getAuthProviderDisplayValue = (authProvider: string) =>
   authProvider === ANY_AUTH_PROVIDER ? ANY_AUTH_PROVIDER_OPTION_LABEL : authProvider;
 
@@ -90,24 +88,18 @@ export const RoleMappingsTable: React.FC<Props> = ({
   const accessItemsCol: EuiBasicTableColumn<SharedRoleMapping> = {
     field: 'accessItems',
     name: accessHeader,
-    render: (_, { accessAllEngines, accessItems }: SharedRoleMapping) => (
-      <span data-test-subj="AccessItemsList">
-        {accessAllEngines ? (
-          ALL_LABEL
-        ) : (
-          <>
-            {accessItems.length === 0
-              ? noItemsPlaceholder
-              : accessItems.map(({ name }) => (
-                  <Fragment key={name}>
-                    {name}
-                    <br />
-                  </Fragment>
-                ))}
-          </>
-        )}
-      </span>
-    ),
+    render: (_, { accessAllEngines, accessItems }: SharedRoleMapping) => {
+      // Design calls for showing the first 2 items followed by a +x after those 2.
+      // ['foo', 'bar', 'baz'] would display as: "foo, bar + 1"
+      const numItems = accessItems.length;
+      if (accessAllEngines || numItems === 0)
+        return <span data-test-subj="AllItems">{ALL_LABEL}</span>;
+      const additionalItems = numItems > 2 ? ` + ${numItems - 2}` : '';
+      const names = accessItems.map((item) => item.name);
+      return (
+        <span data-test-subj="AccessItems">{names.slice(0, 2).join(', ') + additionalItems}</span>
+      );
+    },
   };
 
   const authProviderCol: EuiBasicTableColumn<SharedRoleMapping> = {
@@ -143,6 +135,7 @@ export const RoleMappingsTable: React.FC<Props> = ({
 
   const pagination = {
     hidePerPageOptions: true,
+    pageSize: 10,
   };
 
   const search = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.test.tsx
new file mode 100644
index 0000000000000..8331a45849e3a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.test.tsx
@@ -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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiButton, EuiLink, EuiEmptyPrompt } from '@elastic/eui';
+
+import { RolesEmptyPrompt } from './roles_empty_prompt';
+
+describe('RolesEmptyPrompt', () => {
+  const onEnable = jest.fn();
+
+  const props = {
+    productName: 'App Search',
+    docsLink: 'http://elastic.co',
+    onEnable,
+  };
+
+  it('renders', () => {
+    const wrapper = shallow(<RolesEmptyPrompt {...props} />);
+
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+    expect(wrapper.find(EuiEmptyPrompt).dive().find(EuiLink).prop('href')).toEqual(props.docsLink);
+  });
+
+  it('calls onEnable on change', () => {
+    const wrapper = shallow(<RolesEmptyPrompt {...props} />);
+    const prompt = wrapper.find(EuiEmptyPrompt).dive();
+    prompt.find(EuiButton).simulate('click');
+
+    expect(onEnable).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
new file mode 100644
index 0000000000000..11d50573c45f6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
@@ -0,0 +1,48 @@
+/*
+ * 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 React from 'react';
+
+import { EuiEmptyPrompt, EuiButton, EuiLink, EuiSpacer } from '@elastic/eui';
+
+import { ProductName } from '../types';
+
+import {
+  ROLES_DISABLED_TITLE,
+  ROLES_DISABLED_DESCRIPTION,
+  ROLES_DISABLED_NOTE,
+  ENABLE_ROLES_BUTTON,
+  ENABLE_ROLES_LINK,
+} from './constants';
+
+interface Props {
+  productName: ProductName;
+  docsLink: string;
+  onEnable(): void;
+}
+
+export const RolesEmptyPrompt: React.FC<Props> = ({ onEnable, docsLink, productName }) => (
+  <EuiEmptyPrompt
+    iconType="lockOpen"
+    title={<h2>{ROLES_DISABLED_TITLE}</h2>}
+    body={
+      <>
+        <p>{ROLES_DISABLED_DESCRIPTION(productName)}</p>
+        <p>{ROLES_DISABLED_NOTE}</p>
+      </>
+    }
+    actions={[
+      <EuiButton key="enableRolesButton" fill onClick={onEnable}>
+        {ENABLE_ROLES_BUTTON}
+      </EuiButton>,
+      <EuiSpacer key="spacer" size="xs" />,
+      <EuiLink key="enableRolesLink" href={docsLink} target="_blank" external>
+        {ENABLE_ROLES_LINK}
+      </EuiLink>,
+    ]}
+  />
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
new file mode 100644
index 0000000000000..30bdaa0010b58
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
@@ -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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiText } from '@elastic/eui';
+
+import { UserAddedInfo } from './';
+
+describe('UserAddedInfo', () => {
+  const props = {
+    username: 'user1',
+    email: 'test@test.com',
+    roleType: 'user',
+  };
+
+  it('renders', () => {
+    const wrapper = shallow(<UserAddedInfo {...props} />);
+
+    expect(wrapper.find(EuiText)).toHaveLength(6);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
new file mode 100644
index 0000000000000..a12eae66262a0
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
@@ -0,0 +1,40 @@
+/*
+ * 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 React from 'react';
+
+import { EuiSpacer, EuiText } from '@elastic/eui';
+
+import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
+
+import { ROLE_LABEL } from './constants';
+
+interface Props {
+  username: string;
+  email: string;
+  roleType: string;
+}
+
+export const UserAddedInfo: React.FC<Props> = ({ username, email, roleType }) => (
+  <>
+    <EuiText size="s">
+      <strong>{USERNAME_LABEL}</strong>
+    </EuiText>
+    <EuiText size="s">{username}</EuiText>
+    <EuiSpacer />
+    <EuiText size="s">
+      <strong>{EMAIL_LABEL}</strong>
+    </EuiText>
+    <EuiText size="s">{email}</EuiText>
+    <EuiSpacer />
+    <EuiText size="s">
+      <strong>{ROLE_LABEL}</strong>
+    </EuiText>
+    <EuiText size="s">{roleType}</EuiText>
+    <EuiSpacer />
+  </>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
new file mode 100644
index 0000000000000..43333fe048f23
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
@@ -0,0 +1,70 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiFlyout, EuiText, EuiIcon } from '@elastic/eui';
+
+import {
+  USERS_HEADING_LABEL,
+  UPDATE_USER_LABEL,
+  USER_UPDATED_LABEL,
+  NEW_USER_DESCRIPTION,
+  UPDATE_USER_DESCRIPTION,
+} from './constants';
+
+import { UserFlyout } from './';
+
+describe('UserFlyout', () => {
+  const closeUserFlyout = jest.fn();
+  const handleSaveUser = jest.fn();
+
+  const props = {
+    children: <div />,
+    isNew: true,
+    isComplete: false,
+    disabled: false,
+    closeUserFlyout,
+    handleSaveUser,
+  };
+
+  it('renders for new user', () => {
+    const wrapper = shallow(<UserFlyout {...props} />);
+
+    expect(wrapper.find(EuiFlyout)).toHaveLength(1);
+    expect(wrapper.find('h2').prop('children')).toEqual(USERS_HEADING_LABEL);
+    expect(wrapper.find(EuiText).prop('children')).toEqual(<p>{NEW_USER_DESCRIPTION}</p>);
+  });
+
+  it('renders for existing user', () => {
+    const wrapper = shallow(<UserFlyout {...props} isNew={false} />);
+
+    expect(wrapper.find('h2').prop('children')).toEqual(UPDATE_USER_LABEL);
+    expect(wrapper.find(EuiText).prop('children')).toEqual(<p>{UPDATE_USER_DESCRIPTION}</p>);
+  });
+
+  it('renders icon and message for completed user', () => {
+    const wrapper = shallow(<UserFlyout {...props} isNew={false} isComplete />);
+    const icon = (
+      <EuiIcon
+        color="secondary"
+        size="l"
+        type="checkInCircleFilled"
+        style={{ marginLeft: 5, marginTop: -5 }}
+      />
+    );
+    const children = (
+      <span>
+        {USER_UPDATED_LABEL} {icon}
+      </span>
+    );
+
+    expect(wrapper.find('h2').prop('children')).toEqual(children);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
new file mode 100644
index 0000000000000..e13a56a716929
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
@@ -0,0 +1,113 @@
+/*
+ * 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 React from 'react';
+
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiFlyoutHeader,
+  EuiIcon,
+  EuiText,
+  EuiTitle,
+  EuiSpacer,
+} from '@elastic/eui';
+
+interface Props {
+  children: React.ReactNode;
+  isNew: boolean;
+  isComplete: boolean;
+  disabled: boolean;
+  closeUserFlyout(): void;
+  handleSaveUser(): void;
+}
+
+import { CANCEL_BUTTON_LABEL, CLOSE_BUTTON_LABEL } from '../constants';
+
+import {
+  USERS_HEADING_LABEL,
+  UPDATE_USER_LABEL,
+  ADD_USER_LABEL,
+  USER_ADDED_LABEL,
+  USER_UPDATED_LABEL,
+  NEW_USER_DESCRIPTION,
+  UPDATE_USER_DESCRIPTION,
+} from './constants';
+
+export const UserFlyout: React.FC<Props> = ({
+  children,
+  isNew,
+  isComplete,
+  disabled,
+  closeUserFlyout,
+  handleSaveUser,
+}) => {
+  const savedIcon = (
+    <EuiIcon
+      color="secondary"
+      size="l"
+      type="checkInCircleFilled"
+      style={{ marginLeft: 5, marginTop: -5 }}
+    />
+  );
+  const IS_EDITING_HEADING = isNew ? USERS_HEADING_LABEL : UPDATE_USER_LABEL;
+  const IS_EDITING_DESCRIPTION = isNew ? NEW_USER_DESCRIPTION : UPDATE_USER_DESCRIPTION;
+  const USER_SAVED_HEADING = isNew ? USER_ADDED_LABEL : USER_UPDATED_LABEL;
+  const IS_COMPLETE_HEADING = (
+    <span>
+      {USER_SAVED_HEADING} {savedIcon}
+    </span>
+  );
+
+  const editingFooterActions = (
+    <EuiFlexGroup justifyContent="spaceBetween">
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty onClick={closeUserFlyout}>{CANCEL_BUTTON_LABEL}</EuiButtonEmpty>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButton disabled={disabled} onClick={handleSaveUser} fill>
+          {isNew ? ADD_USER_LABEL : UPDATE_USER_LABEL}
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  const completedFooterAction = (
+    <EuiFlexGroup justifyContent="center">
+      <EuiFlexItem grow={false}>
+        <EuiButton fill onClick={closeUserFlyout}>
+          {CLOSE_BUTTON_LABEL}
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  return (
+    <EuiFlyout ownFocus onClose={closeUserFlyout} size="s" aria-labelledby="userFlyoutTitle">
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="userFlyoutTitle">{isComplete ? IS_COMPLETE_HEADING : IS_EDITING_HEADING}</h2>
+        </EuiTitle>
+        {!isComplete && (
+          <EuiText size="xs">
+            <p>{IS_EDITING_DESCRIPTION}</p>
+          </EuiText>
+        )}
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        {children}
+        <EuiSpacer />
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>{isComplete ? completedFooterAction : editingFooterActions}</EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
new file mode 100644
index 0000000000000..d5272a26715b6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
@@ -0,0 +1,46 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiText, EuiButtonIcon, EuiCopy } from '@elastic/eui';
+
+import { EXISTING_INVITATION_LABEL } from './constants';
+
+import { UserInvitationCallout } from './';
+
+describe('UserInvitationCallout', () => {
+  const props = {
+    isNew: true,
+    invitationCode: 'test@test.com',
+    urlPrefix: 'http://foo',
+  };
+
+  it('renders', () => {
+    const wrapper = shallow(<UserInvitationCallout {...props} />);
+
+    expect(wrapper.find(EuiText)).toHaveLength(2);
+  });
+
+  it('renders the copy button', () => {
+    const copyMock = jest.fn();
+    const wrapper = shallow(<UserInvitationCallout {...props} />);
+
+    const copyEl = shallow(<div>{wrapper.find(EuiCopy).props().children(copyMock)}</div>);
+    expect(copyEl.find(EuiButtonIcon).props().onClick).toEqual(copyMock);
+  });
+
+  it('renders existing invitation label', () => {
+    const wrapper = shallow(<UserInvitationCallout {...props} isNew={false} />);
+
+    expect(wrapper.find(EuiText).first().prop('children')).toEqual(
+      <strong>{EXISTING_INVITATION_LABEL}</strong>
+    );
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
new file mode 100644
index 0000000000000..8310077ad6f2e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
@@ -0,0 +1,47 @@
+/*
+ * 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 React from 'react';
+
+import { EuiCopy, EuiButtonIcon, EuiSpacer, EuiText, EuiLink } from '@elastic/eui';
+
+import {
+  INVITATION_DESCRIPTION,
+  NEW_INVITATION_LABEL,
+  EXISTING_INVITATION_LABEL,
+  INVITATION_LINK,
+} from './constants';
+
+interface Props {
+  isNew: boolean;
+  invitationCode: string;
+  urlPrefix: string;
+}
+
+export const UserInvitationCallout: React.FC<Props> = ({ isNew, invitationCode, urlPrefix }) => {
+  const link = urlPrefix + invitationCode;
+  const label = isNew ? NEW_INVITATION_LABEL : EXISTING_INVITATION_LABEL;
+
+  return (
+    <>
+      {!isNew && <EuiSpacer />}
+      <EuiText size="s">
+        <strong>{label}</strong>
+      </EuiText>
+      <EuiSpacer size="xs" />
+      <EuiText size="s">{INVITATION_DESCRIPTION}</EuiText>
+      <EuiSpacer size="xs" />
+      <EuiLink href={link} target="_blank" external>
+        {INVITATION_LINK}
+      </EuiLink>{' '}
+      <EuiCopy textToCopy={link}>
+        {(copy) => <EuiButtonIcon iconType="copy" onClick={copy} />}
+      </EuiCopy>
+      <EuiSpacer />
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
new file mode 100644
index 0000000000000..08ddc7ba5427f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * 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 { elasticsearchUsers } from './__mocks__/elasticsearch_users';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiFormRow } from '@elastic/eui';
+
+import { Role as ASRole } from '../../app_search/types';
+
+import { REQUIRED_LABEL, USERNAME_NO_USERS_TEXT } from './constants';
+
+import { UserSelector } from './';
+
+const simulatedEvent = {
+  target: { value: 'foo' },
+};
+
+describe('UserSelector', () => {
+  const setUserExisting = jest.fn();
+  const setElasticsearchUsernameValue = jest.fn();
+  const setElasticsearchEmailValue = jest.fn();
+  const handleRoleChange = jest.fn();
+  const handleUsernameSelectChange = jest.fn();
+
+  const roleType = ('user' as unknown) as ASRole;
+
+  const props = {
+    isNewUser: true,
+    userFormUserIsExisting: true,
+    elasticsearchUsers,
+    elasticsearchUser: elasticsearchUsers[0],
+    roleTypes: [roleType],
+    roleType,
+    setUserExisting,
+    setElasticsearchUsernameValue,
+    setElasticsearchEmailValue,
+    handleRoleChange,
+    handleUsernameSelectChange,
+  };
+
+  it('renders Role select and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} />);
+    wrapper.find('[data-test-subj="RoleSelect"]').simulate('change', simulatedEvent);
+
+    expect(handleRoleChange).toHaveBeenCalled();
+  });
+
+  it('renders when updating user', () => {
+    const wrapper = shallow(<UserSelector {...props} isNewUser={false} />);
+
+    expect(wrapper.find('[data-test-subj="UsernameInput"]')).toHaveLength(1);
+    expect(wrapper.find('[data-test-subj="EmailInput"]')).toHaveLength(1);
+  });
+
+  it('renders Username select and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} />);
+    wrapper.find('[data-test-subj="UsernameSelect"]').simulate('change', simulatedEvent);
+
+    expect(handleUsernameSelectChange).toHaveBeenCalled();
+  });
+
+  it('renders Existing user radio and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} />);
+    wrapper.find('[data-test-subj="ExistingUserRadio"]').simulate('change');
+
+    expect(setUserExisting).toHaveBeenCalledWith(true);
+  });
+
+  it('renders Email input and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} userFormUserIsExisting={false} />);
+    wrapper.find('[data-test-subj="EmailInput"]').simulate('change', simulatedEvent);
+
+    expect(setElasticsearchEmailValue).toHaveBeenCalled();
+  });
+
+  it('renders Username input and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} userFormUserIsExisting={false} />);
+    wrapper.find('[data-test-subj="UsernameInput"]').simulate('change', simulatedEvent);
+
+    expect(setElasticsearchUsernameValue).toHaveBeenCalled();
+  });
+
+  it('renders New user radio and calls method', () => {
+    const wrapper = shallow(<UserSelector {...props} />);
+    wrapper.find('[data-test-subj="NewUserRadio"]').simulate('change');
+
+    expect(setUserExisting).toHaveBeenCalledWith(false);
+  });
+
+  it('renders helpText when values are empty', () => {
+    const wrapper = shallow(
+      <UserSelector
+        {...props}
+        userFormUserIsExisting={false}
+        elasticsearchUsers={[]}
+        elasticsearchUser={{ email: '', username: '' }}
+      />
+    );
+
+    expect(wrapper.find(EuiFormRow).at(0).prop('helpText')).toEqual(USERNAME_NO_USERS_TEXT);
+    expect(wrapper.find(EuiFormRow).at(1).prop('helpText')).toEqual(REQUIRED_LABEL);
+    expect(wrapper.find(EuiFormRow).at(2).prop('helpText')).toEqual(REQUIRED_LABEL);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
new file mode 100644
index 0000000000000..70348bf29894a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
@@ -0,0 +1,159 @@
+/*
+ * 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 React from 'react';
+
+import {
+  EuiFieldText,
+  EuiRadio,
+  EuiFormRow,
+  EuiSelect,
+  EuiSelectOption,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { Role as ASRole } from '../../app_search/types';
+import { ElasticsearchUser } from '../../shared/types';
+import { Role as WSRole } from '../../workplace_search/types';
+
+import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
+
+import {
+  NEW_USER_LABEL,
+  EXISTING_USER_LABEL,
+  USERNAME_NO_USERS_TEXT,
+  REQUIRED_LABEL,
+  ROLE_LABEL,
+} from './constants';
+
+type SharedRole = WSRole | ASRole;
+
+interface Props {
+  isNewUser: boolean;
+  userFormUserIsExisting: boolean;
+  elasticsearchUsers: ElasticsearchUser[];
+  elasticsearchUser: ElasticsearchUser;
+  roleTypes: SharedRole[];
+  roleType: SharedRole;
+  setUserExisting(userFormUserIsExisting: boolean): void;
+  setElasticsearchUsernameValue(username: string): void;
+  setElasticsearchEmailValue(email: string): void;
+  handleRoleChange(roleType: SharedRole): void;
+  handleUsernameSelectChange(username: string): void;
+}
+
+export const UserSelector: React.FC<Props> = ({
+  isNewUser,
+  userFormUserIsExisting,
+  elasticsearchUsers,
+  elasticsearchUser,
+  roleTypes,
+  roleType,
+  setUserExisting,
+  setElasticsearchUsernameValue,
+  setElasticsearchEmailValue,
+  handleRoleChange,
+  handleUsernameSelectChange,
+}) => {
+  const roleOptions = roleTypes.map((role) => ({ id: role, text: role }));
+  const usernameOptions = elasticsearchUsers.map(({ username }) => ({
+    id: username,
+    text: username,
+  }));
+  const hasElasticsearchUsers = elasticsearchUsers.length > 0;
+  const showNewUserExistingUserControls = userFormUserIsExisting && hasElasticsearchUsers;
+
+  const roleSelect = (
+    <EuiFormRow label={ROLE_LABEL}>
+      <EuiSelect
+        name={ROLE_LABEL}
+        data-test-subj="RoleSelect"
+        options={roleOptions as EuiSelectOption[]}
+        value={roleType as string}
+        onChange={(e) => handleRoleChange(e.target.value as SharedRole)}
+      />
+    </EuiFormRow>
+  );
+
+  const emailInput = (
+    <EuiFormRow label={EMAIL_LABEL} helpText={!elasticsearchUser.email && REQUIRED_LABEL}>
+      <EuiFieldText
+        name={EMAIL_LABEL}
+        data-test-subj="EmailInput"
+        value={elasticsearchUser.email as string}
+        onChange={(e) => setElasticsearchEmailValue(e.target.value)}
+      />
+    </EuiFormRow>
+  );
+
+  const usernameAndEmailControls = (
+    <>
+      <EuiFormRow label={USERNAME_LABEL} helpText={!elasticsearchUser.username && REQUIRED_LABEL}>
+        <EuiFieldText
+          name={USERNAME_LABEL}
+          data-test-subj="UsernameInput"
+          value={elasticsearchUser.username}
+          onChange={(e) => setElasticsearchUsernameValue(e.target.value)}
+        />
+      </EuiFormRow>
+      {elasticsearchUser.email !== null && emailInput}
+      {roleSelect}
+    </>
+  );
+
+  const existingUserControls = (
+    <>
+      <EuiSpacer size="s" />
+      <EuiFormRow label={USERNAME_LABEL}>
+        <EuiSelect
+          name="Username select"
+          data-test-subj="UsernameSelect"
+          options={usernameOptions}
+          value={elasticsearchUser.username}
+          disabled={!hasElasticsearchUsers}
+          onChange={(e) => handleUsernameSelectChange(e.target.value)}
+        />
+      </EuiFormRow>
+      {roleSelect}
+    </>
+  );
+
+  const newUserControls = (
+    <>
+      <EuiSpacer size="s" />
+      {usernameAndEmailControls}
+    </>
+  );
+
+  const createUserControls = (
+    <>
+      <EuiFormRow helpText={!hasElasticsearchUsers && USERNAME_NO_USERS_TEXT}>
+        <EuiRadio
+          id="existingUser"
+          data-test-subj="ExistingUserRadio"
+          label={EXISTING_USER_LABEL}
+          checked={userFormUserIsExisting && hasElasticsearchUsers}
+          onChange={() => setUserExisting(true)}
+          disabled={!hasElasticsearchUsers}
+        />
+      </EuiFormRow>
+
+      {showNewUserExistingUserControls && existingUserControls}
+      <EuiSpacer />
+      <EuiRadio
+        id="newUser"
+        data-test-subj="NewUserRadio"
+        label={NEW_USER_LABEL}
+        checked={!userFormUserIsExisting || !hasElasticsearchUsers}
+        onChange={() => setUserExisting(false)}
+      />
+      {!showNewUserExistingUserControls && newUserControls}
+    </>
+  );
+
+  return isNewUser ? createUserControls : usernameAndEmailControls;
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.test.tsx
index dbb47b50d4066..5f1fefc688c77 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.test.tsx
@@ -9,15 +9,23 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiButtonIcon } from '@elastic/eui';
+import { EuiButtonIcon, EuiConfirmModal } from '@elastic/eui';
+
+import {
+  REMOVE_ROLE_MAPPING_TITLE,
+  REMOVE_ROLE_MAPPING_BUTTON,
+  ROLE_MODAL_TEXT,
+} from './constants';
 
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
 
 describe('UsersAndRolesRowActions', () => {
   const onManageClick = jest.fn();
   const onDeleteClick = jest.fn();
+  const username = 'foo';
 
   const props = {
+    username,
     onManageClick,
     onDeleteClick,
   };
@@ -40,7 +48,19 @@ describe('UsersAndRolesRowActions', () => {
     const wrapper = shallow(<UsersAndRolesRowActions {...props} />);
     const button = wrapper.find(EuiButtonIcon).last();
     button.simulate('click');
+    wrapper.find(EuiConfirmModal).prop('onConfirm')!({} as any);
 
     expect(onDeleteClick).toHaveBeenCalled();
   });
+
+  it('renders role mapping confirm modal text', () => {
+    const wrapper = shallow(<UsersAndRolesRowActions {...props} username={undefined} />);
+    const button = wrapper.find(EuiButtonIcon).last();
+    button.simulate('click');
+    const modal = wrapper.find(EuiConfirmModal);
+
+    expect(modal.prop('title')).toEqual(REMOVE_ROLE_MAPPING_TITLE);
+    expect(modal.prop('children')).toEqual(<p>{ROLE_MODAL_TEXT}</p>);
+    expect(modal.prop('confirmButtonText')).toEqual(REMOVE_ROLE_MAPPING_BUTTON);
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.tsx
index 3d956c0aabd68..a3b0d24769bf6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_and_roles_row_actions.tsx
@@ -5,20 +5,65 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 
-import { EuiButtonIcon } from '@elastic/eui';
+import { EuiButtonIcon, EuiConfirmModal } from '@elastic/eui';
 
-import { MANAGE_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../constants';
+import { CANCEL_BUTTON_LABEL, MANAGE_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../constants';
+
+import {
+  REMOVE_ROLE_MAPPING_TITLE,
+  REMOVE_ROLE_MAPPING_BUTTON,
+  REMOVE_USER_BUTTON,
+  ROLE_MODAL_TEXT,
+  USER_MODAL_TITLE,
+  USER_MODAL_TEXT,
+} from './constants';
 
 interface Props {
+  username?: string;
   onManageClick(): void;
   onDeleteClick(): void;
 }
 
-export const UsersAndRolesRowActions: React.FC<Props> = ({ onManageClick, onDeleteClick }) => (
-  <>
-    <EuiButtonIcon onClick={onManageClick} iconType="pencil" aria-label={MANAGE_BUTTON_LABEL} />{' '}
-    <EuiButtonIcon onClick={onDeleteClick} iconType="trash" aria-label={DELETE_BUTTON_LABEL} />
-  </>
-);
+export const UsersAndRolesRowActions: React.FC<Props> = ({
+  onManageClick,
+  onDeleteClick,
+  username,
+}) => {
+  const [deleteModalVisible, setVisible] = useState(false);
+  const showDeleteModal = () => setVisible(true);
+  const closeDeleteModal = () => setVisible(false);
+  const title = username ? USER_MODAL_TITLE(username) : REMOVE_ROLE_MAPPING_TITLE;
+  const text = username ? USER_MODAL_TEXT : ROLE_MODAL_TEXT;
+  const confirmButton = username ? REMOVE_USER_BUTTON : REMOVE_ROLE_MAPPING_BUTTON;
+
+  const deleteModal = (
+    <EuiConfirmModal
+      title={title}
+      onCancel={closeDeleteModal}
+      onConfirm={() => {
+        onDeleteClick();
+        closeDeleteModal();
+      }}
+      cancelButtonText={CANCEL_BUTTON_LABEL}
+      confirmButtonText={confirmButton}
+      buttonColor="danger"
+      defaultFocusedButton="confirm"
+    >
+      <p>{text}</p>
+    </EuiConfirmModal>
+  );
+
+  return (
+    <>
+      {deleteModalVisible && deleteModal}
+      <EuiButtonIcon
+        onClick={onManageClick}
+        iconType="pencil"
+        aria-label={MANAGE_BUTTON_LABEL}
+      />{' '}
+      <EuiButtonIcon onClick={showDeleteModal} iconType="trash" aria-label={DELETE_BUTTON_LABEL} />
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
new file mode 100644
index 0000000000000..9110c09827c49
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
@@ -0,0 +1,22 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiEmptyPrompt } from '@elastic/eui';
+
+import { UsersEmptyPrompt } from './';
+
+describe('UsersEmptyPrompt', () => {
+  it('renders', () => {
+    const wrapper = shallow(<UsersEmptyPrompt />);
+
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.tsx
new file mode 100644
index 0000000000000..42bf690c388c4
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.tsx
@@ -0,0 +1,43 @@
+/*
+ * 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 React from 'react';
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiEmptyPrompt,
+  EuiLink,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { docLinks } from '../doc_links';
+
+import { NO_USERS_TITLE, NO_USERS_DESCRIPTION, ENABLE_USERS_LINK } from './constants';
+
+const USERS_DOCS_URL = `${docLinks.enterpriseSearchBase}/users-access.html`;
+
+export const UsersEmptyPrompt: React.FC = () => (
+  <EuiFlexGroup alignItems="center" justifyContent="center">
+    <EuiFlexItem>
+      <EuiSpacer />
+      <EuiPanel style={{ maxWidth: 700, margin: '0 auto' }}>
+        <EuiEmptyPrompt
+          iconType="user"
+          title={<h2>{NO_USERS_TITLE}</h2>}
+          body={<p>{NO_USERS_DESCRIPTION}</p>}
+          actions={
+            <EuiLink href={USERS_DOCS_URL} target="_blank" external>
+              {ENABLE_USERS_LINK}
+            </EuiLink>
+          }
+        />
+      </EuiPanel>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
new file mode 100644
index 0000000000000..9bae93079e89f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
@@ -0,0 +1,32 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiButton, EuiText, EuiTitle } from '@elastic/eui';
+
+import { UsersHeading } from './';
+
+describe('UsersHeading', () => {
+  const onClick = jest.fn();
+
+  it('renders', () => {
+    const wrapper = shallow(<UsersHeading onClick={onClick} />);
+
+    expect(wrapper.find(EuiText)).toHaveLength(1);
+    expect(wrapper.find(EuiTitle)).toHaveLength(1);
+  });
+
+  it('handles button click', () => {
+    const wrapper = shallow(<UsersHeading onClick={onClick} />);
+    wrapper.find(EuiButton).simulate('click');
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.tsx
new file mode 100644
index 0000000000000..8d097e21e9c3f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.tsx
@@ -0,0 +1,37 @@
+/*
+ * 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 React from 'react';
+
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+
+import { USERS_HEADING_TITLE, USERS_HEADING_DESCRIPTION, USERS_HEADING_LABEL } from './constants';
+
+interface Props {
+  onClick(): void;
+}
+
+export const UsersHeading: React.FC<Props> = ({ onClick }) => (
+  <>
+    <EuiFlexGroup justifyContent="spaceBetween">
+      <EuiFlexItem>
+        <EuiTitle>
+          <h2>{USERS_HEADING_TITLE}</h2>
+        </EuiTitle>
+        <EuiText>
+          <p>{USERS_HEADING_DESCRIPTION}</p>
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButton fill onClick={onClick}>
+          {USERS_HEADING_LABEL}
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer size="s" />
+  </>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
new file mode 100644
index 0000000000000..dc1a2713ced12
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
@@ -0,0 +1,100 @@
+/*
+ * 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 { asSingleUserRoleMapping, wsSingleUserRoleMapping, asRoleMapping } from './__mocks__/roles';
+
+import React from 'react';
+
+import { shallow, mount } from 'enzyme';
+
+import { EuiInMemoryTable, EuiTextColor } from '@elastic/eui';
+
+import { engines } from '../../app_search/__mocks__/engines.mock';
+
+import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
+
+import { UsersTable } from './';
+
+describe('UsersTable', () => {
+  const initializeSingleUserRoleMapping = jest.fn();
+  const handleDeleteMapping = jest.fn();
+  const props = {
+    accessItemKey: 'groups' as 'groups' | 'engines',
+    singleUserRoleMappings: [wsSingleUserRoleMapping],
+    initializeSingleUserRoleMapping,
+    handleDeleteMapping,
+  };
+
+  it('renders', () => {
+    const wrapper = shallow(<UsersTable {...props} />);
+
+    expect(wrapper.find(EuiInMemoryTable)).toHaveLength(1);
+  });
+
+  it('handles manage click', () => {
+    const wrapper = mount(<UsersTable {...props} />);
+    wrapper.find(UsersAndRolesRowActions).prop('onManageClick')();
+
+    expect(initializeSingleUserRoleMapping).toHaveBeenCalled();
+  });
+
+  it('handles delete click', () => {
+    const wrapper = mount(<UsersTable {...props} />);
+    wrapper.find(UsersAndRolesRowActions).prop('onDeleteClick')();
+
+    expect(handleDeleteMapping).toHaveBeenCalled();
+  });
+
+  it('handles display when no email present', () => {
+    const userWithNoEmail = {
+      ...wsSingleUserRoleMapping,
+      elasticsearchUser: {
+        email: null,
+        username: 'foo',
+      },
+    };
+    const wrapper = mount(<UsersTable {...props} singleUserRoleMappings={[userWithNoEmail]} />);
+
+    expect(wrapper.find(EuiTextColor)).toHaveLength(1);
+  });
+
+  it('handles access items display for all items', () => {
+    const userWithAllItems = {
+      ...asSingleUserRoleMapping,
+      roleMapping: {
+        ...asRoleMapping,
+        engines: [],
+      },
+    };
+    const wrapper = mount(
+      <UsersTable {...props} accessItemKey="engines" singleUserRoleMappings={[userWithAllItems]} />
+    );
+
+    expect(wrapper.find('[data-test-subj="AllItems"]')).toHaveLength(1);
+  });
+
+  it('handles access items display more than 2 items', () => {
+    const extraEngine = {
+      ...engines[0],
+      id: '3',
+    };
+    const userWithAllItems = {
+      ...asSingleUserRoleMapping,
+      roleMapping: {
+        ...asRoleMapping,
+        engines: [...engines, extraEngine],
+      },
+    };
+    const wrapper = mount(
+      <UsersTable {...props} accessItemKey="engines" singleUserRoleMappings={[userWithAllItems]} />
+    );
+
+    expect(wrapper.find('[data-test-subj="AccessItems"]').prop('children')).toEqual(
+      `${engines[0].name}, ${engines[1].name} + 1`
+    );
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
new file mode 100644
index 0000000000000..86dc2c2626229
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
@@ -0,0 +1,147 @@
+/*
+ * 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 React from 'react';
+
+import { EuiBadge, EuiBasicTableColumn, EuiInMemoryTable, EuiTextColor } from '@elastic/eui';
+
+import { ASRoleMapping } from '../../app_search/types';
+import { SingleUserRoleMapping } from '../../shared/types';
+import { WSRoleMapping } from '../../workplace_search/types';
+
+import {
+  INVITATION_PENDING_LABEL,
+  ALL_LABEL,
+  FILTER_USERS_LABEL,
+  NO_USERS_LABEL,
+  ROLE_LABEL,
+  USERNAME_LABEL,
+  EMAIL_LABEL,
+  GROUPS_LABEL,
+  ENGINES_LABEL,
+} from './constants';
+
+import { UsersAndRolesRowActions } from './';
+
+interface AccessItem {
+  name: string;
+}
+
+interface SharedUser extends SingleUserRoleMapping<ASRoleMapping | WSRoleMapping> {
+  accessItems: AccessItem[];
+  username: string;
+  email: string | null;
+  roleType: string;
+  id: string;
+}
+
+interface SharedRoleMapping extends ASRoleMapping, WSRoleMapping {
+  accessItems: AccessItem[];
+}
+
+interface Props {
+  accessItemKey: 'groups' | 'engines';
+  singleUserRoleMappings: Array<SingleUserRoleMapping<ASRoleMapping | WSRoleMapping>>;
+  initializeSingleUserRoleMapping(roleId: string): string;
+  handleDeleteMapping(roleId: string): string;
+}
+
+const noItemsPlaceholder = <EuiTextColor color="subdued">&mdash;</EuiTextColor>;
+const invitationBadge = <EuiBadge color="hollow">{INVITATION_PENDING_LABEL}</EuiBadge>;
+
+export const UsersTable: React.FC<Props> = ({
+  accessItemKey,
+  singleUserRoleMappings,
+  initializeSingleUserRoleMapping,
+  handleDeleteMapping,
+}) => {
+  // 'accessItems' is needed because App Search has `engines` and Workplace Search has `groups`.
+  const users = ((singleUserRoleMappings as SharedUser[]).map((user) => ({
+    username: user.elasticsearchUser.username,
+    email: user.elasticsearchUser.email,
+    roleType: user.roleMapping.roleType,
+    id: user.roleMapping.id,
+    accessItems: (user.roleMapping as SharedRoleMapping)[accessItemKey],
+    invitation: user.invitation,
+  })) as unknown) as Array<Omit<SharedUser, 'elasticsearchUser | roleMapping'>>;
+
+  const columns: Array<EuiBasicTableColumn<SharedUser>> = [
+    {
+      field: 'username',
+      name: USERNAME_LABEL,
+      render: (_, { username }: SharedUser) => username,
+    },
+    {
+      field: 'email',
+      name: EMAIL_LABEL,
+      render: (_, { email, invitation }: SharedUser) => {
+        if (!email) return noItemsPlaceholder;
+        return (
+          <div data-test-subj="EmailDisplayValue">
+            {email} {invitation && invitationBadge}
+          </div>
+        );
+      },
+    },
+    {
+      field: 'roleType',
+      name: ROLE_LABEL,
+      render: (_, user: SharedUser) => user.roleType,
+    },
+    {
+      field: 'accessItems',
+      name: accessItemKey === 'groups' ? GROUPS_LABEL : ENGINES_LABEL,
+      render: (_, { accessItems }: SharedUser) => {
+        // Design calls for showing the first 2 items followed by a +x after those 2.
+        // ['foo', 'bar', 'baz'] would display as: "foo, bar + 1"
+        const numItems = accessItems.length;
+        if (numItems === 0) return <span data-test-subj="AllItems">{ALL_LABEL}</span>;
+        const additionalItems = numItems > 2 ? ` + ${numItems - 2}` : '';
+        const names = accessItems.map((item) => item.name);
+        return (
+          <span data-test-subj="AccessItems">{names.slice(0, 2).join(', ') + additionalItems}</span>
+        );
+      },
+    },
+    {
+      field: 'id',
+      name: '',
+      render: (_, { id, username }: SharedUser) => (
+        <UsersAndRolesRowActions
+          username={username}
+          onManageClick={() => initializeSingleUserRoleMapping(id)}
+          onDeleteClick={() => handleDeleteMapping(id)}
+        />
+      ),
+    },
+  ];
+
+  const pagination = {
+    hidePerPageOptions: true,
+    pageSize: 10,
+  };
+
+  const search = {
+    box: {
+      incremental: true,
+      fullWidth: false,
+      placeholder: FILTER_USERS_LABEL,
+      'data-test-subj': 'UsersTableSearchInput',
+    },
+  };
+
+  return (
+    <EuiInMemoryTable
+      data-test-subj="UsersTable"
+      columns={columns}
+      items={users}
+      search={search}
+      pagination={pagination}
+      message={NO_USERS_LABEL}
+    />
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index 67208c63ddf4c..e6d2c67d1baf8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -40,3 +40,19 @@ export interface RoleMapping {
 
 const productNames = [APP_SEARCH_PLUGIN.NAME, WORKPLACE_SEARCH_PLUGIN.NAME] as const;
 export type ProductName = typeof productNames[number];
+
+export interface Invitation {
+  email: string;
+  code: string;
+}
+
+export interface ElasticsearchUser {
+  email: string | null;
+  username: string;
+}
+
+export interface SingleUserRoleMapping<T> {
+  invitation: Invitation;
+  elasticsearchUser: ElasticsearchUser;
+  roleMapping: T;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
index a4eb228eff92f..050aaf1dadf89 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
@@ -11,8 +11,8 @@ import { useValues } from 'kea';
 
 import { EuiTable, EuiTableBody, EuiTablePagination } from '@elastic/eui';
 import { Pager } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 
+import { USERNAME_LABEL, EMAIL_LABEL } from '../../../../shared/constants';
 import { TableHeader } from '../../../../shared/table_header';
 import { AppLogic } from '../../../app_logic';
 import { UserRow } from '../../../components/shared/user_row';
@@ -20,27 +20,15 @@ import { User } from '../../../types';
 import { GroupLogic } from '../group_logic';
 
 const USERS_PER_PAGE = 10;
-const USERNAME_TABLE_HEADER = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.usernameTableHeader',
-  {
-    defaultMessage: 'Username',
-  }
-);
-const EMAIL_TABLE_HEADER = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.emailTableHeader',
-  {
-    defaultMessage: 'Email',
-  }
-);
 
 export const GroupUsersTable: React.FC = () => {
   const { isFederatedAuth } = useValues(AppLogic);
   const {
     group: { users },
   } = useValues(GroupLogic);
-  const headerItems = [USERNAME_TABLE_HEADER];
+  const headerItems = [USERNAME_LABEL];
   if (!isFederatedAuth) {
-    headerItems.push(EMAIL_TABLE_HEADER);
+    headerItems.push(EMAIL_LABEL);
   }
 
   const [firstItem, setFirstItem] = useState(0);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
index 92c8b7827b9b6..809b631c78391 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
@@ -7,14 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const DELETE_ROLE_MAPPING_MESSAGE = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.deleteRoleMappingButtonMessage',
-  {
-    defaultMessage:
-      'Are you sure you want to permanently delete this mapping? This action is not reversible and some users might lose access.',
-  }
-);
-
 export const ROLE_MAPPING_DELETED_MESSAGE = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.roleMappingDeletedMessage',
   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
index b153d01224193..01d32bec14ebd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
@@ -10,9 +10,14 @@ import React, { useEffect } from 'react';
 import { useActions, useValues } from 'kea';
 
 import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
-import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
+import {
+  RoleMappingsTable,
+  RoleMappingsHeading,
+  RolesEmptyPrompt,
+} from '../../../shared/role_mapping';
 import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 import { WorkplaceSearchPageTemplate } from '../../components/layout';
+import { SECURITY_DOCS_URL } from '../../routes';
 
 import { ROLE_MAPPINGS_TABLE_HEADER } from './constants';
 
@@ -20,9 +25,12 @@ import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
 
 export const RoleMappings: React.FC = () => {
-  const { initializeRoleMappings, initializeRoleMapping, handleDeleteMapping } = useActions(
-    RoleMappingsLogic
-  );
+  const {
+    enableRoleBasedAccess,
+    initializeRoleMappings,
+    initializeRoleMapping,
+    handleDeleteMapping,
+  } = useActions(RoleMappingsLogic);
 
   const {
     roleMappings,
@@ -35,10 +43,19 @@ export const RoleMappings: React.FC = () => {
     initializeRoleMappings();
   }, []);
 
+  const rolesEmptyState = (
+    <RolesEmptyPrompt
+      productName={WORKPLACE_SEARCH_PLUGIN.NAME}
+      docsLink={SECURITY_DOCS_URL}
+      onEnable={enableRoleBasedAccess}
+    />
+  );
+
   const roleMappingsSection = (
     <section>
       <RoleMappingsHeading
         productName={WORKPLACE_SEARCH_PLUGIN.NAME}
+        docsLink={SECURITY_DOCS_URL}
         onClick={() => initializeRoleMapping()}
       />
       <RoleMappingsTable
@@ -57,6 +74,8 @@ export const RoleMappings: React.FC = () => {
       pageChrome={[ROLE_MAPPINGS_TITLE]}
       pageHeader={{ pageTitle: ROLE_MAPPINGS_TITLE }}
       isLoading={dataLoading}
+      isEmptyState={roleMappings.length < 1}
+      emptyState={rolesEmptyState}
     >
       {roleMappingFlyoutOpen && <RoleMapping />}
       {roleMappingsSection}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
index 4ee530870284e..a4bbddbd23b49 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
@@ -90,6 +90,13 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values.selectedGroups).toEqual(new Set([defaultGroup.id]));
     });
 
+    it('setRoleMappings', () => {
+      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [wsRoleMapping] });
+
+      expect(RoleMappingsLogic.values.roleMappings).toEqual([wsRoleMapping]);
+      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
+    });
+
     it('handleRoleChange', () => {
       RoleMappingsLogic.actions.handleRoleChange('user');
 
@@ -234,6 +241,30 @@ describe('RoleMappingsLogic', () => {
   });
 
   describe('listeners', () => {
+    describe('enableRoleBasedAccess', () => {
+      it('calls API and sets values', async () => {
+        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.enableRoleBasedAccess();
+
+        expect(RoleMappingsLogic.values.dataLoading).toEqual(true);
+
+        expect(http.post).toHaveBeenCalledWith(
+          '/api/workplace_search/org/role_mappings/enable_role_based_access'
+        );
+        await nextTick();
+        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+      });
+
+      it('handles error', async () => {
+        http.post.mockReturnValue(Promise.reject('this is an error'));
+        RoleMappingsLogic.actions.enableRoleBasedAccess();
+        await nextTick();
+
+        expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
+      });
+    });
+
     describe('initializeRoleMappings', () => {
       it('calls API and sets values', async () => {
         const setRoleMappingsDataSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappingsData');
@@ -351,18 +382,8 @@ describe('RoleMappingsLogic', () => {
     });
 
     describe('handleDeleteMapping', () => {
-      let confirmSpy: any;
       const roleMappingId = 'r1';
 
-      beforeEach(() => {
-        confirmSpy = jest.spyOn(window, 'confirm');
-        confirmSpy.mockImplementation(jest.fn(() => true));
-      });
-
-      afterEach(() => {
-        confirmSpy.mockRestore();
-      });
-
       it('calls API and refreshes list', async () => {
         const initializeRoleMappingsSpy = jest.spyOn(
           RoleMappingsLogic.actions,
@@ -388,15 +409,6 @@ describe('RoleMappingsLogic', () => {
 
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
-
-      it('will do nothing if not confirmed', async () => {
-        RoleMappingsLogic.actions.setRoleMapping(wsRoleMapping);
-        window.confirm = () => false;
-        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
-
-        expect(http.delete).not.toHaveBeenCalled();
-        await nextTick();
-      });
     });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
index 361425b7a78a1..76b41b2f383eb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
@@ -20,7 +20,6 @@ import { AttributeName } from '../../../shared/types';
 import { RoleGroup, WSRoleMapping, Role } from '../../types';
 
 import {
-  DELETE_ROLE_MAPPING_MESSAGE,
   ROLE_MAPPING_DELETED_MESSAGE,
   ROLE_MAPPING_CREATED_MESSAGE,
   ROLE_MAPPING_UPDATED_MESSAGE,
@@ -57,10 +56,16 @@ interface RoleMappingsActions {
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMapping(roleMapping: WSRoleMapping): { roleMapping: WSRoleMapping };
+  setRoleMappings({
+    roleMappings,
+  }: {
+    roleMappings: WSRoleMapping[];
+  }): { roleMappings: WSRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   openRoleMappingFlyout(): void;
   closeRoleMappingFlyout(): void;
   setRoleMappingErrors(errors: string[]): { errors: string[] };
+  enableRoleBasedAccess(): void;
 }
 
 interface RoleMappingsValues {
@@ -88,6 +93,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMapping: (roleMapping: WSRoleMapping) => ({ roleMapping }),
+    setRoleMappings: ({ roleMappings }: { roleMappings: WSRoleMapping[] }) => ({ roleMappings }),
     setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string[]) => ({ value }),
     handleRoleChange: (roleType: Role) => ({ roleType }),
@@ -98,6 +104,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     }),
     handleAttributeValueChange: (value: string) => ({ value }),
     handleAllGroupsSelectionChange: (selected: boolean) => ({ selected }),
+    enableRoleBasedAccess: true,
     resetState: true,
     initializeRoleMappings: true,
     initializeRoleMapping: (roleMappingId?: string) => ({ roleMappingId }),
@@ -111,13 +118,16 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       true,
       {
         setRoleMappingsData: () => false,
+        setRoleMappings: () => false,
         resetState: () => true,
+        enableRoleBasedAccess: () => true,
       },
     ],
     roleMappings: [
       [],
       {
         setRoleMappingsData: (_, { roleMappings }) => roleMappings,
+        setRoleMappings: (_, { roleMappings }) => roleMappings,
         resetState: () => [],
       },
     ],
@@ -260,6 +270,17 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     ],
   }),
   listeners: ({ actions, values }) => ({
+    enableRoleBasedAccess: async () => {
+      const { http } = HttpLogic.values;
+      const route = '/api/workplace_search/org/role_mappings/enable_role_based_access';
+
+      try {
+        const response = await http.post(route);
+        actions.setRoleMappings(response);
+      } catch (e) {
+        flashAPIErrors(e);
+      }
+    },
     initializeRoleMappings: async () => {
       const { http } = HttpLogic.values;
       const route = '/api/workplace_search/org/role_mappings';
@@ -279,14 +300,12 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const { http } = HttpLogic.values;
       const route = `/api/workplace_search/org/role_mappings/${roleMappingId}`;
 
-      if (window.confirm(DELETE_ROLE_MAPPING_MESSAGE)) {
-        try {
-          await http.delete(route);
-          actions.initializeRoleMappings();
-          setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
-        } catch (e) {
-          flashAPIErrors(e);
-        }
+      try {
+        await http.delete(route);
+        actions.initializeRoleMappings();
+        setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
+      } catch (e) {
+        flashAPIErrors(e);
       }
     },
     handleSaveMapping: async () => {
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
index 718597c12e9c5..7d9f08627516b 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
@@ -7,7 +7,11 @@
 
 import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
 
-import { registerRoleMappingsRoute, registerRoleMappingRoute } from './role_mappings';
+import {
+  registerEnableRoleMappingsRoute,
+  registerRoleMappingsRoute,
+  registerRoleMappingRoute,
+} from './role_mappings';
 
 const roleMappingBaseSchema = {
   rules: { username: 'user' },
@@ -18,6 +22,29 @@ const roleMappingBaseSchema = {
 };
 
 describe('role mappings routes', () => {
+  describe('POST /api/app_search/role_mappings/enable_role_based_access', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'post',
+        path: '/api/app_search/role_mappings/enable_role_based_access',
+      });
+
+      registerEnableRoleMappingsRoute({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/as/role_mappings/enable_role_based_access',
+      });
+    });
+  });
+
   describe('GET /api/app_search/role_mappings', () => {
     let mockRouter: MockRouter;
 
@@ -36,7 +63,7 @@ describe('role mappings routes', () => {
 
     it('creates a request handler', () => {
       expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
-        path: '/role_mappings',
+        path: '/as/role_mappings',
       });
     });
   });
@@ -59,7 +86,7 @@ describe('role mappings routes', () => {
 
     it('creates a request handler', () => {
       expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
-        path: '/role_mappings',
+        path: '/as/role_mappings',
       });
     });
 
@@ -94,7 +121,7 @@ describe('role mappings routes', () => {
 
     it('creates a request handler', () => {
       expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
-        path: '/role_mappings/:id',
+        path: '/as/role_mappings/:id',
       });
     });
 
@@ -129,7 +156,7 @@ describe('role mappings routes', () => {
 
     it('creates a request handler', () => {
       expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
-        path: '/role_mappings/:id',
+        path: '/as/role_mappings/:id',
       });
     });
   });
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
index 75724a3344d6d..da620be2ea950 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
@@ -17,6 +17,21 @@ const roleMappingBaseSchema = {
   authProvider: schema.arrayOf(schema.string()),
 };
 
+export function registerEnableRoleMappingsRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.post(
+    {
+      path: '/api/app_search/role_mappings/enable_role_based_access',
+      validate: false,
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/as/role_mappings/enable_role_based_access',
+    })
+  );
+}
+
 export function registerRoleMappingsRoute({
   router,
   enterpriseSearchRequestHandler,
@@ -27,7 +42,7 @@ export function registerRoleMappingsRoute({
       validate: false,
     },
     enterpriseSearchRequestHandler.createRequest({
-      path: '/role_mappings',
+      path: '/as/role_mappings',
     })
   );
 
@@ -39,7 +54,7 @@ export function registerRoleMappingsRoute({
       },
     },
     enterpriseSearchRequestHandler.createRequest({
-      path: '/role_mappings',
+      path: '/as/role_mappings',
     })
   );
 }
@@ -59,7 +74,7 @@ export function registerRoleMappingRoute({
       },
     },
     enterpriseSearchRequestHandler.createRequest({
-      path: '/role_mappings/:id',
+      path: '/as/role_mappings/:id',
     })
   );
 
@@ -73,12 +88,13 @@ export function registerRoleMappingRoute({
       },
     },
     enterpriseSearchRequestHandler.createRequest({
-      path: '/role_mappings/:id',
+      path: '/as/role_mappings/:id',
     })
   );
 }
 
 export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
+  registerEnableRoleMappingsRoute(dependencies);
   registerRoleMappingsRoute(dependencies);
   registerRoleMappingRoute(dependencies);
 };
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
index a945866da5ef2..aa0e9983166c0 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
@@ -7,9 +7,36 @@
 
 import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
 
-import { registerOrgRoleMappingsRoute, registerOrgRoleMappingRoute } from './role_mappings';
+import {
+  registerOrgEnableRoleMappingsRoute,
+  registerOrgRoleMappingsRoute,
+  registerOrgRoleMappingRoute,
+} from './role_mappings';
 
 describe('role mappings routes', () => {
+  describe('POST /api/workplace_search/org/role_mappings/enable_role_based_access', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'post',
+        path: '/api/workplace_search/org/role_mappings/enable_role_based_access',
+      });
+
+      registerOrgEnableRoleMappingsRoute({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/ws/org/role_mappings/enable_role_based_access',
+      });
+    });
+  });
+
   describe('GET /api/workplace_search/org/role_mappings', () => {
     let mockRouter: MockRouter;
 
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
index a0fcec63cbb27..cea7bcb311ce8 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
@@ -17,6 +17,21 @@ const roleMappingBaseSchema = {
   authProvider: schema.arrayOf(schema.string()),
 };
 
+export function registerOrgEnableRoleMappingsRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.post(
+    {
+      path: '/api/workplace_search/org/role_mappings/enable_role_based_access',
+      validate: false,
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/ws/org/role_mappings/enable_role_based_access',
+    })
+  );
+}
+
 export function registerOrgRoleMappingsRoute({
   router,
   enterpriseSearchRequestHandler,
@@ -79,6 +94,7 @@ export function registerOrgRoleMappingRoute({
 }
 
 export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
+  registerOrgEnableRoleMappingsRoute(dependencies);
   registerOrgRoleMappingsRoute(dependencies);
   registerOrgRoleMappingRoute(dependencies);
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e246cd0681053..17c31b8cd115e 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7521,7 +7521,6 @@
     "xpack.enterpriseSearch.appSearch.credentials.title": "資格情報",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarning": "既存の API キーはユーザー間で共有できます。このキーのアクセス権を変更すると、このキーにアクセスできるすべてのユーザーに影響します。",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarningTitle": "十分ご注意ください！",
-    "xpack.enterpriseSearch.appSearch.deleteRoleMappingMessage": "このマッピングを完全に削除しますか？このアクションは元に戻せません。一部のユーザーがアクセスを失う可能性があります。",
     "xpack.enterpriseSearch.appSearch.DEV_ROLE_TYPE_DESCRIPTION": "開発者はエンジンのすべての要素を管理できます。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.description": "{documentsApiLink}を使用すると、新しいドキュメントをエンジンに追加できるほか、ドキュメントの更新、IDによるドキュメントの取得、ドキュメントの削除が可能です。基本操作を説明するさまざまな{clientLibrariesLink}があります。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.example": "実行中のAPIを表示するには、コマンドラインまたはクライアントライブラリを使用して、次の要求の例で実験することができます。",
@@ -7906,6 +7905,7 @@
     "xpack.enterpriseSearch.appSearch.tokens.search.description": "エンドポイントのみの検索では、公開検索キーが使用されます。",
     "xpack.enterpriseSearch.appSearch.tokens.search.name": "公開検索キー",
     "xpack.enterpriseSearch.appSearch.tokens.update": "正常に API キーを更新しました。",
+    "xpack.enterpriseSearch.emailLabel": "メール",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.description": "場所を問わず、何でも検索。組織を支える多忙なチームのために、パワフルでモダンな検索エクスペリエンスを簡単に導入できます。Webサイトやアプリ、ワークプレイスに事前調整済みの検索をすばやく追加しましょう。何でもシンプルに検索できます。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.notConfigured": "エンタープライズサーチはまだKibanaインスタンスで構成されていません。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.videoAlt": "エンタープライズ サーチの基本操作",
@@ -7948,15 +7948,14 @@
     "xpack.enterpriseSearch.roleMapping.attributeSelectorTitle": "属性マッピング",
     "xpack.enterpriseSearch.roleMapping.attributeValueLabel": "属性値",
     "xpack.enterpriseSearch.roleMapping.authProviderLabel": "認証プロバイダー",
-    "xpack.enterpriseSearch.roleMapping.deleteRoleMappingButton": "マッピングを削除",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingDescription": "マッピングの削除は永久的であり、元に戻すことはできません",
-    "xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle": "このロールマッピングを削除",
     "xpack.enterpriseSearch.roleMapping.externalAttributeLabel": "外部属性",
     "xpack.enterpriseSearch.roleMapping.filterRoleMappingsPlaceholder": "ロールをフィルタリング...",
     "xpack.enterpriseSearch.roleMapping.individualAuthProviderLabel": "個別の認証プロバイダーを選択",
     "xpack.enterpriseSearch.roleMapping.manageRoleMappingTitle": "ロールマッピングを管理",
     "xpack.enterpriseSearch.roleMapping.noResults.message": "の結果が見つかりません。",
     "xpack.enterpriseSearch.roleMapping.newRoleMappingTitle": "ロールマッピングを追加",
+    "xpack.enterpriseSearch.roleMapping.removeRoleMappingTitle": "このロールマッピングを削除",
     "xpack.enterpriseSearch.roleMapping.roleLabel": "ロール",
     "xpack.enterpriseSearch.roleMapping.roleMappingsTitle": "ユーザーとロール",
     "xpack.enterpriseSearch.roleMapping.saveRoleMappingButtonLabel": "ロールマッピングの保存",
@@ -7993,6 +7992,7 @@
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.title": "{productName}とKibanaは別のElasticsearchクラスターにあります",
     "xpack.enterpriseSearch.troubleshooting.standardAuth.description": "このプラグインは、{standardAuthLink}の{productName}を完全にはサポートしていません。{productName}で作成されたユーザーはKibanaアクセス権が必要です。Kibanaで作成されたユーザーは、ナビゲーションメニューに{productName}が表示されません。",
     "xpack.enterpriseSearch.troubleshooting.standardAuth.title": "標準認証の{productName}はサポートされていません",
+    "xpack.enterpriseSearch.usernameLabel": "ユーザー名",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.account.link": "マイアカウント",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.logout.link": "ログアウト",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.orgDashboard.link": "組織ダッシュボードに移動",
@@ -8163,8 +8163,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupTableHeader": "グループ",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.sourcesTableHeader": "コンテンツソース",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader": "ユーザー",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.emailTableHeader": "メール",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.usernameTableHeader": "ユーザー名",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText": "前回更新日時{updatedAt}。",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUsersUpdated": "このグループのユーザーが正常に更新されました。",
     "xpack.enterpriseSearch.workplaceSearch.groups.heading": "グループを管理",
@@ -8264,7 +8262,6 @@
     "xpack.enterpriseSearch.workplaceSearch.reset.button": "リセット",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.adminRoleTypeDescription": "管理者は、コンテンツソース、グループ、ユーザー管理機能など、すべての組織レベルの設定に無制限にアクセスできます。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.defaultGroupName": "デフォルト",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.deleteRoleMappingButtonMessage": "このマッピングを完全に削除しますか？このアクションは元に戻せません。一部のユーザーがアクセスを失う可能性があります。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError": "1つ以上の割り当てられたグループが必要です。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader": "グループアクセス",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.userRoleTypeDescription": "ユーザーの機能アクセスは検索インターフェースと個人設定管理に制限されます。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 6a96769e2da1e..055ccbdde6ae8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7580,7 +7580,6 @@
     "xpack.enterpriseSearch.appSearch.credentials.title": "凭据",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarning": "现有 API 密钥可在用户之间共享。更改此密钥的权限将影响有权访问此密钥的所有用户。",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarningTitle": "谨慎操作！",
-    "xpack.enterpriseSearch.appSearch.deleteRoleMappingMessage": "确定要永久删除此映射？此操作不可逆转，且某些用户可能会失去访问权限。",
     "xpack.enterpriseSearch.appSearch.DEV_ROLE_TYPE_DESCRIPTION": "开发人员可以管理引擎的所有方面。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.description": "{documentsApiLink} 可用于将新文档添加到您的引擎、更新文档、按 ID 检索文档以及删除文档。有各种{clientLibrariesLink}可帮助您入门。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.example": "要了解如何使用 API，可以在下面通过命令行或客户端库试用示例请求。",
@@ -7974,6 +7973,7 @@
     "xpack.enterpriseSearch.appSearch.tokens.search.description": "公有搜索密钥仅用于搜索终端。",
     "xpack.enterpriseSearch.appSearch.tokens.search.name": "公有搜索密钥",
     "xpack.enterpriseSearch.appSearch.tokens.update": "成功更新 API 密钥。",
+    "xpack.enterpriseSearch.emailLabel": "电子邮件",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.description": "随时随地进行全面搜索。为工作繁忙的团队轻松实现强大的现代搜索体验。将预先调整的搜索功能快速添加到您的网站、应用或工作区。全面搜索就是这么简单。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.notConfigured": "企业搜索尚未在您的 Kibana 实例中配置。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.videoAlt": "企业搜索入门",
@@ -8016,9 +8016,7 @@
     "xpack.enterpriseSearch.roleMapping.attributeSelectorTitle": "属性映射",
     "xpack.enterpriseSearch.roleMapping.attributeValueLabel": "属性值",
     "xpack.enterpriseSearch.roleMapping.authProviderLabel": "身份验证提供程序",
-    "xpack.enterpriseSearch.roleMapping.deleteRoleMappingButton": "删除映射",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingDescription": "请注意，删除映射是永久性的，无法撤消",
-    "xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle": "移除此角色映射",
     "xpack.enterpriseSearch.roleMapping.externalAttributeLabel": "外部属性",
     "xpack.enterpriseSearch.roleMapping.filterRoleMappingsPlaceholder": "筛选角色......",
     "xpack.enterpriseSearch.roleMapping.individualAuthProviderLabel": "选择单个身份验证提供程序",
@@ -8027,6 +8025,7 @@
     "xpack.enterpriseSearch.roleMapping.newRoleMappingTitle": "添加角色映射",
     "xpack.enterpriseSearch.roleMapping.roleLabel": "角色",
     "xpack.enterpriseSearch.roleMapping.roleMappingsTitle": "用户和角色",
+    "xpack.enterpriseSearch.roleMapping.removeRoleMappingTitle": "移除此角色映射",
     "xpack.enterpriseSearch.roleMapping.saveRoleMappingButtonLabel": "保存角色映射",
     "xpack.enterpriseSearch.roleMapping.updateRoleMappingButtonLabel": "更新角色映射",
     "xpack.enterpriseSearch.schema.addFieldModal.fieldNameNote.correct": "字段名称只能包含小写字母、数字和下划线",
@@ -8061,6 +8060,7 @@
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.title": "{productName} 和 Kibana 在不同的 Elasticsearch 集群中",
     "xpack.enterpriseSearch.troubleshooting.standardAuth.description": "此插件不完全支持使用 {standardAuthLink} 的 {productName}。{productName} 中创建的用户必须具有 Kibana 访问权限。Kibana 中创建的用户在导航菜单中将看不到 {productName}。",
     "xpack.enterpriseSearch.troubleshooting.standardAuth.title": "不支持使用标准身份验证的 {productName}",
+    "xpack.enterpriseSearch.usernameLabel": "用户名",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.account.link": "我的帐户",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.logout.link": "注销",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.orgDashboard.link": "前往组织仪表板",
@@ -8231,8 +8231,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupTableHeader": "组",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.sourcesTableHeader": "内容源",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader": "用户",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.emailTableHeader": "电子邮件",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsUsersTable.usernameTableHeader": "用户名",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText": "上次更新于 {updatedAt}。",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUsersUpdated": "已成功更新此组的用户",
     "xpack.enterpriseSearch.workplaceSearch.groups.heading": "管理组",
@@ -8332,7 +8330,6 @@
     "xpack.enterpriseSearch.workplaceSearch.reset.button": "重置",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.adminRoleTypeDescription": "管理员对所有组织范围设置 (包括内容源、组和用户管理功能) 具有完全权限。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.defaultGroupName": "默认",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.deleteRoleMappingButtonMessage": "确定要永久删除此映射？此操作不可逆转，且某些用户可能会失去访问权限。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError": "至少需要一个分配的组。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader": "组访问权限",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.userRoleTypeDescription": "用户的功能访问权限仅限于搜索界面和个人设置管理。",

From 136d3617032526dcb396896da408791c1362cb39 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 23 Jun 2021 15:10:34 -0500
Subject: [PATCH 12/95] Upgrade EUI to v34.3.0 (#101334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* eui to v34.1.0

* styled-components types

* src snapshot updates

* x-pack snapshot updates

* eui to v34.2.0

* styled-components todo

* src snapshot updates

* x-pack snapshot updates

* jest test updates

* collapsible_nav

* Hard-code global nav width for bottom bar’s (for now)

* Update to eui v34.3.0

* flyout unmock

* src flyout snapshots

* remove duplicate euioverlaymask

* xpack flyout snapshots

* remove unused import

* sidenavprops

* attr updates

* trial: flyout ownfocus

* remove unused

* graph selector

* jest

* jest

* flyout ownFocus

* saved objects flyout

* console welcome flyout

* timeline flyout

* clean up

* visible

* colorpicker data-test-subj

* selectors

* selector

* ts

* selector

* snapshot

* Fix `use_security_solution_navigation` TS error

* cypress

Co-authored-by: cchaos <caroline.horn@elastic.co>
Co-authored-by: Chandler Prall <chandler.prall@gmail.com>
---
 package.json                                  |    2 +-
 .../collapsible_nav.test.tsx.snap             | 3451 ++++++++---------
 .../header/__snapshots__/header.test.tsx.snap |  989 +++--
 .../chrome/ui/header/collapsible_nav.test.tsx |    4 -
 .../public/chrome/ui/header/header.test.tsx   |    2 +-
 src/core/public/chrome/ui/header/header.tsx   |    2 +-
 .../flyout_service.test.tsx.snap              |    4 +-
 src/core/public/styles/_base.scss             |    2 +-
 .../application/components/welcome_panel.tsx  |    2 +-
 .../dashboard_empty_screen.test.tsx.snap      |    8 +-
 .../__snapshots__/data_view.test.tsx.snap     |   30 +-
 .../discover_grid_flyout.test.tsx             |    4 +-
 .../__snapshots__/source_viewer.test.tsx.snap |   22 +-
 .../url/__snapshots__/url.test.tsx.snap       |    8 +-
 .../header/__snapshots__/header.test.tsx.snap |    2 +-
 .../warning_call_out.test.tsx.snap            |   98 +-
 .../inspector_panel.test.tsx.snap             |    1 +
 .../__snapshots__/solution_nav.test.tsx.snap  |   18 +
 .../solution_nav/solution_nav.tsx             |    2 +-
 .../public/components/labs/labs_flyout.tsx    |   51 +-
 .../__snapshots__/intro.test.tsx.snap         |   26 +-
 .../not_found_errors.test.tsx.snap            |  160 +-
 .../__snapshots__/flyout.test.tsx.snap        |    3 +
 .../objects_table/components/flyout.tsx       |    2 +-
 .../components/color_picker.test.tsx          |    4 +-
 .../visualization_noresults.test.js.snap      |    2 +-
 test/accessibility/apps/management.ts         |    1 +
 .../apps/management/_import_objects.ts        |    8 +-
 test/functional/page_objects/settings_page.ts |    4 +
 .../page_objects/visual_builder_page.ts       |    2 +-
 .../Waterfall/ResponsiveFlyout.tsx            |   15 +-
 .../asset_manager.stories.storyshot           |   17 +-
 .../custom_element_modal.stories.storyshot    |   32 +-
 .../datasource_component.stories.storyshot    |   10 +-
 .../keyboard_shortcuts_doc.stories.storyshot  | 2145 +++++-----
 .../saved_elements_modal.stories.storyshot    |   12 +-
 .../__snapshots__/pdf_panel.stories.storyshot |    4 +-
 .../__snapshots__/settings.test.tsx.snap      |   10 +-
 .../autoplay_settings.stories.storyshot       |   12 +-
 .../toolbar_settings.stories.storyshot        |   12 +-
 .../filebeat_config_flyout.tsx                |    2 +-
 .../private_sources_sidebar.tsx               |    1 -
 .../components/create_agent_policy.tsx        |   11 +-
 .../extend_index_management.test.tsx.snap     |  142 +-
 .../__snapshots__/policy_table.test.tsx.snap  |   15 +-
 .../components/table_basic.test.tsx           |   22 +-
 .../upload_license.test.tsx.snap              |   96 +-
 .../action_edit/edit_action_flyout.tsx        |  327 +-
 .../__snapshots__/checker_errors.test.js.snap |   54 +-
 .../__snapshots__/no_data.test.js.snap        |    8 +-
 .../__snapshots__/page_loading.test.js.snap   |    4 +-
 .../app/cases/create/flyout.test.tsx          |    2 +-
 .../components/app/cases/create/flyout.tsx    |   10 +-
 .../shared/page_template/page_template.tsx    |   10 +-
 ...screen_capture_panel_content.test.tsx.snap |   18 +-
 .../report_info_button.test.tsx.snap          |  356 +-
 .../privilege_summary/privilege_summary.tsx   |   61 +-
 .../privilege_space_form.tsx                  |  116 +-
 .../roles_grid_page.test.tsx.snap             |   34 +-
 .../__snapshots__/prompt_page.test.tsx.snap   |    4 +-
 .../unauthenticated_page.test.tsx.snap        |    2 +-
 .../reset_session_page.test.tsx.snap          |    2 +-
 .../timelines/data_providers.spec.ts          |    4 +-
 .../integration/timelines/pagination.spec.ts  |    6 +-
 .../cypress/screens/timeline.ts               |    8 +-
 .../cases/components/create/flyout.test.tsx   |    2 +-
 .../public/cases/components/create/flyout.tsx |   10 +-
 .../exceptions/add_exception_comments.tsx     |    2 +-
 .../index.test.tsx                            |    4 +-
 .../endpoint_hosts/view/details/index.tsx     |    1 +
 .../__snapshots__/index.test.tsx.snap         |   11 +-
 .../timelines/components/flyout/index.tsx     |   11 +-
 .../components/flyout/pane/index.tsx          |   13 +-
 .../__snapshots__/index.test.tsx.snap         |  827 ++--
 .../timelines/components/side_panel/index.tsx |   10 +-
 .../edit_transform_flyout.tsx                 |  127 +-
 .../sections/alert_form/alert_add.tsx         |    1 +
 .../__snapshots__/license_info.test.tsx.snap  |   30 +-
 .../ml/__snapshots__/ml_flyout.test.tsx.snap  |  205 +-
 .../__snapshots__/expanded_row.test.tsx.snap  |   82 +-
 .../waterfall/waterfall_flyout.tsx            |   10 +-
 .../test/functional/apps/lens/lens_tagging.ts |    2 +-
 .../functional/page_objects/graph_page.ts     |    4 +-
 .../test/functional/page_objects/lens_page.ts |    4 +-
 .../page_objects/space_selector_page.ts       |    4 +-
 .../page_objects/tag_management_page.ts       |    5 +-
 .../functional/tests/dashboard_integration.ts |    2 +-
 .../functional/tests/maps_integration.ts      |    2 +-
 .../functional/tests/visualize_integration.ts |    2 +-
 yarn.lock                                     |   25 +-
 90 files changed, 4774 insertions(+), 5120 deletions(-)

diff --git a/package.json b/package.json
index 26465133569cd..f99eb86a43cec 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.13",
     "@elastic/ems-client": "7.14.0",
-    "@elastic/eui": "33.0.0",
+    "@elastic/eui": "34.3.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/maki": "6.3.0",
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 3668829a6888c..0b10209bc13e5 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -370,54 +370,62 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
     isOpen={true}
     onClose={[Function]}
   >
-    <EuiWindowEvent
-      event="keydown"
-      handler={[Function]}
-    />
-    <EuiOverlayMask
-      headerZindexLocation="below"
-      onClick={[Function]}
+    <EuiFlyout
+      aria-label="Primary"
+      as="nav"
+      className="euiCollapsibleNav"
+      closeButtonPosition="outside"
+      data-test-subj="collapsibleNav"
+      hideCloseButton={false}
+      id="collapsibe-nav"
+      onClose={[Function]}
+      outsideClickCloses={true}
+      ownFocus={true}
+      paddingSize="none"
+      pushMinBreakpoint="l"
+      role={null}
+      side="left"
+      size={320}
+      type="overlay"
     >
-      <Portal
-        containerInfo={
-          <div
-            class="euiOverlayMask euiOverlayMask--belowHeader"
-          />
-        }
-      />
-    </EuiOverlayMask>
-    <EuiFocusTrap
-      clickOutsideDisables={true}
-      disabled={false}
-    >
-      <div
-        data-eui="EuiFocusTrap"
+      <nav
+        data-eui="EuiFlyout"
+        data-test-subj="collapsibleNav"
+        role={null}
       >
-        <nav
-          aria-label="Primary"
-          className="euiCollapsibleNav"
-          data-test-subj="collapsibleNav"
-          id="collapsibe-nav"
+        <button
+          data-test-subj="euiFlyoutCloseButton"
+          onClick={[Function]}
+          type="button"
+        />
+        <EuiFlexItem
+          grow={false}
+          style={
+            Object {
+              "flexShrink": 0,
+            }
+          }
         >
-          <EuiFlexItem
-            grow={false}
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
             style={
               Object {
                 "flexShrink": 0,
               }
             }
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <EuiCollapsibleNavGroup
+              background="light"
+              className="eui-yScroll"
               style={
                 Object {
-                  "flexShrink": 0,
+                  "maxHeight": "40vh",
                 }
               }
             >
-              <EuiCollapsibleNavGroup
-                background="light"
-                className="eui-yScroll"
+              <div
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                id="generated-id"
                 style={
                   Object {
                     "maxHeight": "40vh",
@@ -425,109 +433,109 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 }
               >
                 <div
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                  id="mockId"
-                  style={
-                    Object {
-                      "maxHeight": "40vh",
-                    }
-                  }
+                  className="euiCollapsibleNavGroup__children"
                 >
-                  <div
-                    className="euiCollapsibleNavGroup__children"
+                  <EuiListGroup
+                    color="text"
+                    gutterSize="none"
+                    listItems={
+                      Array [
+                        Object {
+                          "data-test-subj": "collapsibleNavCustomNavLink",
+                          "href": "Custom link",
+                          "icon": undefined,
+                          "iconType": undefined,
+                          "isActive": false,
+                          "isDisabled": undefined,
+                          "label": "Custom link",
+                          "onClick": [Function],
+                        },
+                      ]
+                    }
+                    maxWidth="none"
+                    size="s"
                   >
-                    <EuiListGroup
-                      color="text"
-                      gutterSize="none"
-                      listItems={
-                        Array [
-                          Object {
-                            "data-test-subj": "collapsibleNavCustomNavLink",
-                            "href": "Custom link",
-                            "icon": undefined,
-                            "iconType": undefined,
-                            "isActive": false,
-                            "isDisabled": undefined,
-                            "label": "Custom link",
-                            "onClick": [Function],
-                          },
-                        ]
+                    <ul
+                      className="euiListGroup"
+                      style={
+                        Object {
+                          "maxWidth": "none",
+                        }
                       }
-                      maxWidth="none"
-                      size="s"
                     >
-                      <ul
-                        className="euiListGroup"
-                        style={
-                          Object {
-                            "maxWidth": "none",
-                          }
-                        }
+                      <EuiListGroupItem
+                        color="text"
+                        data-test-subj="collapsibleNavCustomNavLink"
+                        href="Custom link"
+                        isActive={false}
+                        key="title-0"
+                        label="Custom link"
+                        onClick={[Function]}
+                        showToolTip={false}
+                        size="s"
+                        wrapText={false}
                       >
-                        <EuiListGroupItem
-                          color="text"
-                          data-test-subj="collapsibleNavCustomNavLink"
-                          href="Custom link"
-                          isActive={false}
-                          key="title-0"
-                          label="Custom link"
-                          onClick={[Function]}
-                          showToolTip={false}
-                          size="s"
-                          wrapText={false}
+                        <li
+                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                         >
-                          <li
-                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          <a
+                            className="euiListGroupItem__button"
+                            data-test-subj="collapsibleNavCustomNavLink"
+                            href="Custom link"
+                            onClick={[Function]}
+                            rel="noreferrer"
                           >
-                            <a
-                              className="euiListGroupItem__button"
-                              data-test-subj="collapsibleNavCustomNavLink"
-                              href="Custom link"
-                              onClick={[Function]}
-                              rel="noreferrer"
+                            <span
+                              className="euiListGroupItem__label"
+                              title="Custom link"
                             >
-                              <span
-                                className="euiListGroupItem__label"
-                                title="Custom link"
-                              >
-                                Custom link
-                              </span>
-                            </a>
-                          </li>
-                        </EuiListGroupItem>
-                      </ul>
-                    </EuiListGroup>
-                  </div>
+                              Custom link
+                            </span>
+                          </a>
+                        </li>
+                      </EuiListGroupItem>
+                    </ul>
+                  </EuiListGroup>
                 </div>
-              </EuiCollapsibleNavGroup>
-            </div>
-          </EuiFlexItem>
-          <EuiHorizontalRule
-            margin="none"
-          >
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full"
-            />
-          </EuiHorizontalRule>
-          <EuiFlexItem
-            grow={false}
+              </div>
+            </EuiCollapsibleNavGroup>
+          </div>
+        </EuiFlexItem>
+        <EuiHorizontalRule
+          margin="none"
+        >
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full"
+          />
+        </EuiHorizontalRule>
+        <EuiFlexItem
+          grow={false}
+          style={
+            Object {
+              "flexShrink": 0,
+            }
+          }
+        >
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
             style={
               Object {
                 "flexShrink": 0,
               }
             }
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <EuiCollapsibleNavGroup
+              background="light"
+              className="eui-yScroll"
               style={
                 Object {
-                  "flexShrink": 0,
+                  "maxHeight": "40vh",
                 }
               }
             >
-              <EuiCollapsibleNavGroup
-                background="light"
-                className="eui-yScroll"
+              <div
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                id="generated-id"
                 style={
                   Object {
                     "maxHeight": "40vh",
@@ -535,1527 +543,1455 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 }
               >
                 <div
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                  id="mockId"
-                  style={
-                    Object {
-                      "maxHeight": "40vh",
-                    }
-                  }
+                  className="euiCollapsibleNavGroup__children"
                 >
-                  <div
-                    className="euiCollapsibleNavGroup__children"
+                  <EuiListGroup
+                    aria-label="Pinned links"
+                    color="text"
+                    gutterSize="none"
+                    listItems={
+                      Array [
+                        Object {
+                          "data-test-subj": "homeLink",
+                          "href": "/",
+                          "iconType": "home",
+                          "label": "Home",
+                          "onClick": [Function],
+                        },
+                      ]
+                    }
+                    maxWidth="none"
+                    size="s"
                   >
-                    <EuiListGroup
+                    <ul
                       aria-label="Pinned links"
-                      color="text"
-                      gutterSize="none"
-                      listItems={
-                        Array [
-                          Object {
-                            "data-test-subj": "homeLink",
-                            "href": "/",
-                            "iconType": "home",
-                            "label": "Home",
-                            "onClick": [Function],
-                          },
-                        ]
+                      className="euiListGroup"
+                      style={
+                        Object {
+                          "maxWidth": "none",
+                        }
                       }
-                      maxWidth="none"
-                      size="s"
                     >
-                      <ul
-                        aria-label="Pinned links"
-                        className="euiListGroup"
-                        style={
-                          Object {
-                            "maxWidth": "none",
-                          }
-                        }
+                      <EuiListGroupItem
+                        color="text"
+                        data-test-subj="homeLink"
+                        href="/"
+                        iconType="home"
+                        key="title-0"
+                        label="Home"
+                        onClick={[Function]}
+                        showToolTip={false}
+                        size="s"
+                        wrapText={false}
                       >
-                        <EuiListGroupItem
-                          color="text"
-                          data-test-subj="homeLink"
-                          href="/"
-                          iconType="home"
-                          key="title-0"
-                          label="Home"
-                          onClick={[Function]}
-                          showToolTip={false}
-                          size="s"
-                          wrapText={false}
+                        <li
+                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                         >
-                          <li
-                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          <a
+                            className="euiListGroupItem__button"
+                            data-test-subj="homeLink"
+                            href="/"
+                            onClick={[Function]}
+                            rel="noreferrer"
                           >
-                            <a
-                              className="euiListGroupItem__button"
-                              data-test-subj="homeLink"
-                              href="/"
-                              onClick={[Function]}
-                              rel="noreferrer"
+                            <EuiIcon
+                              className="euiListGroupItem__icon"
+                              color="inherit"
+                              type="home"
                             >
-                              <EuiIcon
+                              <span
                                 className="euiListGroupItem__icon"
                                 color="inherit"
-                                type="home"
-                              >
-                                <span
-                                  className="euiListGroupItem__icon"
-                                  color="inherit"
-                                  data-euiicon-type="home"
-                                />
-                              </EuiIcon>
-                              <span
-                                className="euiListGroupItem__label"
-                                title="Home"
-                              >
-                                Home
-                              </span>
-                            </a>
-                          </li>
-                        </EuiListGroupItem>
-                      </ul>
-                    </EuiListGroup>
-                  </div>
+                                data-euiicon-type="home"
+                              />
+                            </EuiIcon>
+                            <span
+                              className="euiListGroupItem__label"
+                              title="Home"
+                            >
+                              Home
+                            </span>
+                          </a>
+                        </li>
+                      </EuiListGroupItem>
+                    </ul>
+                  </EuiListGroup>
                 </div>
-              </EuiCollapsibleNavGroup>
-            </div>
-          </EuiFlexItem>
-          <EuiCollapsibleNavGroup
-            background="light"
+              </div>
+            </EuiCollapsibleNavGroup>
+          </div>
+        </EuiFlexItem>
+        <EuiCollapsibleNavGroup
+          background="light"
+          data-test-subj="collapsibleNavGroup-recentlyViewed"
+          initialIsOpen={true}
+          isCollapsible={true}
+          key="recentlyViewed"
+          onToggle={[Function]}
+          title="Recently viewed"
+        >
+          <EuiAccordion
+            arrowDisplay="right"
+            buttonClassName="euiCollapsibleNavGroup__heading"
+            buttonContent={
+              <EuiFlexGroup
+                alignItems="center"
+                gutterSize="m"
+                responsive={false}
+              >
+                <EuiFlexItem>
+                  <EuiTitle
+                    size="xxs"
+                  >
+                    <h3
+                      className="euiCollapsibleNavGroup__title"
+                      id="generated-id__title"
+                    >
+                      Recently viewed
+                    </h3>
+                  </EuiTitle>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            }
+            className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
             data-test-subj="collapsibleNavGroup-recentlyViewed"
+            id="generated-id"
             initialIsOpen={true}
-            isCollapsible={true}
-            key="recentlyViewed"
+            isLoading={false}
+            isLoadingMessage={false}
             onToggle={[Function]}
-            title="Recently viewed"
+            paddingSize="none"
           >
-            <EuiAccordion
-              arrowDisplay="right"
-              buttonClassName="euiCollapsibleNavGroup__heading"
-              buttonContent={
-                <EuiFlexGroup
-                  alignItems="center"
-                  gutterSize="m"
-                  responsive={false}
-                >
-                  <EuiFlexItem>
-                    <EuiTitle
-                      size="xxs"
-                    >
-                      <h3
-                        className="euiCollapsibleNavGroup__title"
-                        id="mockId__title"
-                      >
-                        Recently viewed
-                      </h3>
-                    </EuiTitle>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              }
-              className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+            <div
+              className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
               data-test-subj="collapsibleNavGroup-recentlyViewed"
-              id="mockId"
-              initialIsOpen={true}
-              isLoading={false}
-              isLoadingMessage={false}
               onToggle={[Function]}
-              paddingSize="none"
             >
               <div
-                className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                data-test-subj="collapsibleNavGroup-recentlyViewed"
-                onToggle={[Function]}
+                className="euiAccordion__triggerWrapper"
               >
-                <div
-                  className="euiAccordion__triggerWrapper"
+                <button
+                  aria-controls="generated-id"
+                  aria-expanded={true}
+                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                  id="generated-id"
+                  onClick={[Function]}
+                  type="button"
                 >
-                  <button
-                    aria-controls="mockId"
-                    aria-expanded={true}
-                    className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                    id="mockId"
-                    onClick={[Function]}
-                    type="button"
+                  <span
+                    className="euiAccordion__iconWrapper"
                   >
-                    <span
-                      className="euiAccordion__iconWrapper"
+                    <EuiIcon
+                      className="euiAccordion__icon euiAccordion__icon-isOpen"
+                      size="m"
+                      type="arrowRight"
                     >
-                      <EuiIcon
+                      <span
                         className="euiAccordion__icon euiAccordion__icon-isOpen"
+                        data-euiicon-type="arrowRight"
                         size="m"
-                        type="arrowRight"
-                      >
-                        <span
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          data-euiicon-type="arrowRight"
-                          size="m"
-                        />
-                      </EuiIcon>
-                    </span>
-                    <span
-                      className="euiIEFlexWrapFix"
+                      />
+                    </EuiIcon>
+                  </span>
+                  <span
+                    className="euiIEFlexWrapFix"
+                  >
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
                     >
-                      <EuiFlexGroup
-                        alignItems="center"
-                        gutterSize="m"
-                        responsive={false}
+                      <div
+                        className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                       >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        >
-                          <EuiFlexItem>
-                            <div
-                              className="euiFlexItem"
+                        <EuiFlexItem>
+                          <div
+                            className="euiFlexItem"
+                          >
+                            <EuiTitle
+                              size="xxs"
                             >
-                              <EuiTitle
-                                size="xxs"
+                              <h3
+                                className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                id="generated-id__title"
                               >
-                                <h3
-                                  className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                  id="mockId__title"
-                                >
-                                  Recently viewed
-                                </h3>
-                              </EuiTitle>
-                            </div>
-                          </EuiFlexItem>
-                        </div>
-                      </EuiFlexGroup>
-                    </span>
-                  </button>
-                </div>
-                <div
-                  aria-labelledby="mockId"
-                  className="euiAccordion__childWrapper"
-                  id="mockId"
-                  role="region"
-                  tabIndex={-1}
+                                Recently viewed
+                              </h3>
+                            </EuiTitle>
+                          </div>
+                        </EuiFlexItem>
+                      </div>
+                    </EuiFlexGroup>
+                  </span>
+                </button>
+              </div>
+              <div
+                aria-labelledby="generated-id"
+                className="euiAccordion__childWrapper"
+                id="generated-id"
+                role="region"
+                tabIndex={-1}
+              >
+                <EuiResizeObserver
+                  onResize={[Function]}
                 >
-                  <EuiResizeObserver
-                    onResize={[Function]}
-                  >
-                    <div>
+                  <div>
+                    <div
+                      className=""
+                    >
                       <div
-                        className=""
+                        className="euiCollapsibleNavGroup__children"
                       >
-                        <div
-                          className="euiCollapsibleNavGroup__children"
+                        <EuiListGroup
+                          aria-label="Recently viewed links"
+                          className="kbnCollapsibleNav__recentsListGroup"
+                          color="subdued"
+                          gutterSize="none"
+                          listItems={
+                            Array [
+                              Object {
+                                "aria-label": "recent 1",
+                                "data-test-subj": "collapsibleNavAppLink--recent",
+                                "href": "http://localhost/recent%201",
+                                "label": "recent 1",
+                                "onClick": [Function],
+                                "title": "recent 1",
+                              },
+                              Object {
+                                "aria-label": "recent 2",
+                                "data-test-subj": "collapsibleNavAppLink--recent",
+                                "href": "http://localhost/recent%202",
+                                "label": "recent 2",
+                                "onClick": [Function],
+                                "title": "recent 2",
+                              },
+                            ]
+                          }
+                          maxWidth="none"
+                          size="s"
                         >
-                          <EuiListGroup
+                          <ul
                             aria-label="Recently viewed links"
-                            className="kbnCollapsibleNav__recentsListGroup"
-                            color="subdued"
-                            gutterSize="none"
-                            listItems={
-                              Array [
-                                Object {
-                                  "aria-label": "recent 1",
-                                  "data-test-subj": "collapsibleNavAppLink--recent",
-                                  "href": "http://localhost/recent%201",
-                                  "label": "recent 1",
-                                  "onClick": [Function],
-                                  "title": "recent 1",
-                                },
-                                Object {
-                                  "aria-label": "recent 2",
-                                  "data-test-subj": "collapsibleNavAppLink--recent",
-                                  "href": "http://localhost/recent%202",
-                                  "label": "recent 2",
-                                  "onClick": [Function],
-                                  "title": "recent 2",
-                                },
-                              ]
+                            className="euiListGroup kbnCollapsibleNav__recentsListGroup"
+                            style={
+                              Object {
+                                "maxWidth": "none",
+                              }
                             }
-                            maxWidth="none"
-                            size="s"
                           >
-                            <ul
-                              aria-label="Recently viewed links"
-                              className="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                              style={
-                                Object {
-                                  "maxWidth": "none",
-                                }
-                              }
+                            <EuiListGroupItem
+                              aria-label="recent 1"
+                              color="subdued"
+                              data-test-subj="collapsibleNavAppLink--recent"
+                              href="http://localhost/recent%201"
+                              key="title-0"
+                              label="recent 1"
+                              onClick={[Function]}
+                              showToolTip={false}
+                              size="s"
+                              title="recent 1"
+                              wrapText={false}
                             >
-                              <EuiListGroupItem
-                                aria-label="recent 1"
-                                color="subdued"
-                                data-test-subj="collapsibleNavAppLink--recent"
-                                href="http://localhost/recent%201"
-                                key="title-0"
-                                label="recent 1"
-                                onClick={[Function]}
-                                showToolTip={false}
-                                size="s"
-                                title="recent 1"
-                                wrapText={false}
+                              <li
+                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                               >
-                                <li
-                                  className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                <a
+                                  aria-label="recent 1"
+                                  className="euiListGroupItem__button"
+                                  data-test-subj="collapsibleNavAppLink--recent"
+                                  href="http://localhost/recent%201"
+                                  onClick={[Function]}
+                                  rel="noreferrer"
+                                  title="recent 1"
                                 >
-                                  <a
-                                    aria-label="recent 1"
-                                    className="euiListGroupItem__button"
-                                    data-test-subj="collapsibleNavAppLink--recent"
-                                    href="http://localhost/recent%201"
-                                    onClick={[Function]}
-                                    rel="noreferrer"
+                                  <span
+                                    className="euiListGroupItem__label"
                                     title="recent 1"
                                   >
-                                    <span
-                                      className="euiListGroupItem__label"
-                                      title="recent 1"
-                                    >
-                                      recent 1
-                                    </span>
-                                  </a>
-                                </li>
-                              </EuiListGroupItem>
-                              <EuiListGroupItem
-                                aria-label="recent 2"
-                                color="subdued"
-                                data-test-subj="collapsibleNavAppLink--recent"
-                                href="http://localhost/recent%202"
-                                key="title-1"
-                                label="recent 2"
-                                onClick={[Function]}
-                                showToolTip={false}
-                                size="s"
-                                title="recent 2"
-                                wrapText={false}
+                                    recent 1
+                                  </span>
+                                </a>
+                              </li>
+                            </EuiListGroupItem>
+                            <EuiListGroupItem
+                              aria-label="recent 2"
+                              color="subdued"
+                              data-test-subj="collapsibleNavAppLink--recent"
+                              href="http://localhost/recent%202"
+                              key="title-1"
+                              label="recent 2"
+                              onClick={[Function]}
+                              showToolTip={false}
+                              size="s"
+                              title="recent 2"
+                              wrapText={false}
+                            >
+                              <li
+                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                               >
-                                <li
-                                  className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                <a
+                                  aria-label="recent 2"
+                                  className="euiListGroupItem__button"
+                                  data-test-subj="collapsibleNavAppLink--recent"
+                                  href="http://localhost/recent%202"
+                                  onClick={[Function]}
+                                  rel="noreferrer"
+                                  title="recent 2"
                                 >
-                                  <a
-                                    aria-label="recent 2"
-                                    className="euiListGroupItem__button"
-                                    data-test-subj="collapsibleNavAppLink--recent"
-                                    href="http://localhost/recent%202"
-                                    onClick={[Function]}
-                                    rel="noreferrer"
+                                  <span
+                                    className="euiListGroupItem__label"
                                     title="recent 2"
                                   >
-                                    <span
-                                      className="euiListGroupItem__label"
-                                      title="recent 2"
-                                    >
-                                      recent 2
-                                    </span>
-                                  </a>
-                                </li>
-                              </EuiListGroupItem>
-                            </ul>
-                          </EuiListGroup>
-                        </div>
+                                    recent 2
+                                  </span>
+                                </a>
+                              </li>
+                            </EuiListGroupItem>
+                          </ul>
+                        </EuiListGroup>
                       </div>
                     </div>
-                  </EuiResizeObserver>
-                </div>
+                  </div>
+                </EuiResizeObserver>
               </div>
-            </EuiAccordion>
-          </EuiCollapsibleNavGroup>
-          <EuiHorizontalRule
-            margin="none"
-          >
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full"
-            />
-          </EuiHorizontalRule>
-          <EuiFlexItem
-            className="eui-yScroll"
+            </div>
+          </EuiAccordion>
+        </EuiCollapsibleNavGroup>
+        <EuiHorizontalRule
+          margin="none"
+        >
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full"
+          />
+        </EuiHorizontalRule>
+        <EuiFlexItem
+          className="eui-yScroll"
+        >
+          <div
+            className="euiFlexItem eui-yScroll"
           >
-            <div
-              className="euiFlexItem eui-yScroll"
+            <EuiCollapsibleNavGroup
+              data-test-subj="collapsibleNavGroup-kibana"
+              iconType="logoKibana"
+              initialIsOpen={true}
+              isCollapsible={true}
+              key="kibana"
+              onToggle={[Function]}
+              title="Analytics"
             >
-              <EuiCollapsibleNavGroup
+              <EuiAccordion
+                arrowDisplay="right"
+                buttonClassName="euiCollapsibleNavGroup__heading"
+                buttonContent={
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="m"
+                    responsive={false}
+                  >
+                    <EuiFlexItem
+                      grow={false}
+                    >
+                      <EuiIcon
+                        size="l"
+                        type="logoKibana"
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem>
+                      <EuiTitle
+                        size="xxs"
+                      >
+                        <h3
+                          className="euiCollapsibleNavGroup__title"
+                          id="generated-id__title"
+                        >
+                          Analytics
+                        </h3>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                }
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-kibana"
-                iconType="logoKibana"
+                id="generated-id"
                 initialIsOpen={true}
-                isCollapsible={true}
-                key="kibana"
+                isLoading={false}
+                isLoadingMessage={false}
                 onToggle={[Function]}
-                title="Analytics"
+                paddingSize="none"
               >
-                <EuiAccordion
-                  arrowDisplay="right"
-                  buttonClassName="euiCollapsibleNavGroup__heading"
-                  buttonContent={
-                    <EuiFlexGroup
-                      alignItems="center"
-                      gutterSize="m"
-                      responsive={false}
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <EuiIcon
-                          size="l"
-                          type="logoKibana"
-                        />
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiTitle
-                          size="xxs"
-                        >
-                          <h3
-                            className="euiCollapsibleNavGroup__title"
-                            id="mockId__title"
-                          >
-                            Analytics
-                          </h3>
-                        </EuiTitle>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  }
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                <div
+                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                   data-test-subj="collapsibleNavGroup-kibana"
-                  id="mockId"
-                  initialIsOpen={true}
-                  isLoading={false}
-                  isLoadingMessage={false}
                   onToggle={[Function]}
-                  paddingSize="none"
                 >
                   <div
-                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-kibana"
-                    onToggle={[Function]}
+                    className="euiAccordion__triggerWrapper"
                   >
-                    <div
-                      className="euiAccordion__triggerWrapper"
+                    <button
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      id="generated-id"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-controls="mockId"
-                        aria-expanded={true}
-                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                        id="mockId"
-                        onClick={[Function]}
-                        type="button"
+                      <span
+                        className="euiAccordion__iconWrapper"
                       >
-                        <span
-                          className="euiAccordion__iconWrapper"
+                        <EuiIcon
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          size="m"
+                          type="arrowRight"
                         >
-                          <EuiIcon
+                          <span
                             className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            data-euiicon-type="arrowRight"
                             size="m"
-                            type="arrowRight"
-                          >
-                            <span
-                              className="euiAccordion__icon euiAccordion__icon-isOpen"
-                              data-euiicon-type="arrowRight"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                        <span
-                          className="euiIEFlexWrapFix"
+                          />
+                        </EuiIcon>
+                      </span>
+                      <span
+                        className="euiIEFlexWrapFix"
+                      >
+                        <EuiFlexGroup
+                          alignItems="center"
+                          gutterSize="m"
+                          responsive={false}
                         >
-                          <EuiFlexGroup
-                            alignItems="center"
-                            gutterSize="m"
-                            responsive={false}
+                          <div
+                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                           >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                            <EuiFlexItem
+                              grow={false}
                             >
-                              <EuiFlexItem
-                                grow={false}
+                              <div
+                                className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <div
-                                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                                <EuiIcon
+                                  size="l"
+                                  type="logoKibana"
                                 >
-                                  <EuiIcon
+                                  <span
+                                    data-euiicon-type="logoKibana"
                                     size="l"
-                                    type="logoKibana"
-                                  >
-                                    <span
-                                      data-euiicon-type="logoKibana"
-                                      size="l"
-                                    />
-                                  </EuiIcon>
-                                </div>
-                              </EuiFlexItem>
-                              <EuiFlexItem>
-                                <div
-                                  className="euiFlexItem"
+                                  />
+                                </EuiIcon>
+                              </div>
+                            </EuiFlexItem>
+                            <EuiFlexItem>
+                              <div
+                                className="euiFlexItem"
+                              >
+                                <EuiTitle
+                                  size="xxs"
                                 >
-                                  <EuiTitle
-                                    size="xxs"
+                                  <h3
+                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                    id="generated-id__title"
                                   >
-                                    <h3
-                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Analytics
-                                    </h3>
-                                  </EuiTitle>
-                                </div>
-                              </EuiFlexItem>
-                            </div>
-                          </EuiFlexGroup>
-                        </span>
-                      </button>
-                    </div>
-                    <div
-                      aria-labelledby="mockId"
-                      className="euiAccordion__childWrapper"
-                      id="mockId"
-                      role="region"
-                      tabIndex={-1}
+                                    Analytics
+                                  </h3>
+                                </EuiTitle>
+                              </div>
+                            </EuiFlexItem>
+                          </div>
+                        </EuiFlexGroup>
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    aria-labelledby="generated-id"
+                    className="euiAccordion__childWrapper"
+                    id="generated-id"
+                    role="region"
+                    tabIndex={-1}
+                  >
+                    <EuiResizeObserver
+                      onResize={[Function]}
                     >
-                      <EuiResizeObserver
-                        onResize={[Function]}
-                      >
-                        <div>
+                      <div>
+                        <div
+                          className=""
+                        >
                           <div
-                            className=""
+                            className="euiCollapsibleNavGroup__children"
                           >
-                            <div
-                              className="euiCollapsibleNavGroup__children"
+                            <EuiListGroup
+                              aria-label="Primary navigation links, Analytics"
+                              color="subdued"
+                              gutterSize="none"
+                              listItems={
+                                Array [
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "discover",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "discover",
+                                    "onClick": [Function],
+                                  },
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "visualize",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "visualize",
+                                    "onClick": [Function],
+                                  },
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "dashboard",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "dashboard",
+                                    "onClick": [Function],
+                                  },
+                                ]
+                              }
+                              maxWidth="none"
+                              size="s"
                             >
-                              <EuiListGroup
+                              <ul
                                 aria-label="Primary navigation links, Analytics"
-                                color="subdued"
-                                gutterSize="none"
-                                listItems={
-                                  Array [
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "discover",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "discover",
-                                      "onClick": [Function],
-                                    },
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "visualize",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "visualize",
-                                      "onClick": [Function],
-                                    },
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "dashboard",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "dashboard",
-                                      "onClick": [Function],
-                                    },
-                                  ]
+                                className="euiListGroup"
+                                style={
+                                  Object {
+                                    "maxWidth": "none",
+                                  }
                                 }
-                                maxWidth="none"
-                                size="s"
                               >
-                                <ul
-                                  aria-label="Primary navigation links, Analytics"
-                                  className="euiListGroup"
-                                  style={
-                                    Object {
-                                      "maxWidth": "none",
-                                    }
-                                  }
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="discover"
+                                  isActive={false}
+                                  key="title-0"
+                                  label="discover"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
                                 >
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="discover"
-                                    isActive={false}
-                                    key="title-0"
-                                    label="discover"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="discover"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="discover"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="discover"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="discover"
-                                        >
-                                          discover
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="visualize"
-                                    isActive={false}
-                                    key="title-1"
-                                    label="visualize"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                        discover
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="visualize"
+                                  isActive={false}
+                                  key="title-1"
+                                  label="visualize"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
+                                >
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="visualize"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="visualize"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="visualize"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="visualize"
-                                        >
-                                          visualize
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="dashboard"
-                                    isActive={false}
-                                    key="title-2"
-                                    label="dashboard"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                        visualize
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="dashboard"
+                                  isActive={false}
+                                  key="title-2"
+                                  label="dashboard"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
+                                >
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="dashboard"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="dashboard"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="dashboard"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="dashboard"
-                                        >
-                                          dashboard
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                </ul>
-                              </EuiListGroup>
-                            </div>
+                                        dashboard
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                              </ul>
+                            </EuiListGroup>
                           </div>
                         </div>
-                      </EuiResizeObserver>
-                    </div>
+                      </div>
+                    </EuiResizeObserver>
                   </div>
-                </EuiAccordion>
-              </EuiCollapsibleNavGroup>
-              <EuiCollapsibleNavGroup
+                </div>
+              </EuiAccordion>
+            </EuiCollapsibleNavGroup>
+            <EuiCollapsibleNavGroup
+              data-test-subj="collapsibleNavGroup-observability"
+              iconType="logoObservability"
+              initialIsOpen={true}
+              isCollapsible={true}
+              key="observability"
+              onToggle={[Function]}
+              title="Observability"
+            >
+              <EuiAccordion
+                arrowDisplay="right"
+                buttonClassName="euiCollapsibleNavGroup__heading"
+                buttonContent={
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="m"
+                    responsive={false}
+                  >
+                    <EuiFlexItem
+                      grow={false}
+                    >
+                      <EuiIcon
+                        size="l"
+                        type="logoObservability"
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem>
+                      <EuiTitle
+                        size="xxs"
+                      >
+                        <h3
+                          className="euiCollapsibleNavGroup__title"
+                          id="generated-id__title"
+                        >
+                          Observability
+                        </h3>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                }
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-observability"
-                iconType="logoObservability"
+                id="generated-id"
                 initialIsOpen={true}
-                isCollapsible={true}
-                key="observability"
+                isLoading={false}
+                isLoadingMessage={false}
                 onToggle={[Function]}
-                title="Observability"
+                paddingSize="none"
               >
-                <EuiAccordion
-                  arrowDisplay="right"
-                  buttonClassName="euiCollapsibleNavGroup__heading"
-                  buttonContent={
-                    <EuiFlexGroup
-                      alignItems="center"
-                      gutterSize="m"
-                      responsive={false}
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <EuiIcon
-                          size="l"
-                          type="logoObservability"
-                        />
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiTitle
-                          size="xxs"
-                        >
-                          <h3
-                            className="euiCollapsibleNavGroup__title"
-                            id="mockId__title"
-                          >
-                            Observability
-                          </h3>
-                        </EuiTitle>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  }
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                <div
+                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                   data-test-subj="collapsibleNavGroup-observability"
-                  id="mockId"
-                  initialIsOpen={true}
-                  isLoading={false}
-                  isLoadingMessage={false}
                   onToggle={[Function]}
-                  paddingSize="none"
                 >
                   <div
-                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-observability"
-                    onToggle={[Function]}
+                    className="euiAccordion__triggerWrapper"
                   >
-                    <div
-                      className="euiAccordion__triggerWrapper"
+                    <button
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      id="generated-id"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-controls="mockId"
-                        aria-expanded={true}
-                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                        id="mockId"
-                        onClick={[Function]}
-                        type="button"
+                      <span
+                        className="euiAccordion__iconWrapper"
                       >
-                        <span
-                          className="euiAccordion__iconWrapper"
+                        <EuiIcon
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          size="m"
+                          type="arrowRight"
                         >
-                          <EuiIcon
+                          <span
                             className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            data-euiicon-type="arrowRight"
                             size="m"
-                            type="arrowRight"
-                          >
-                            <span
-                              className="euiAccordion__icon euiAccordion__icon-isOpen"
-                              data-euiicon-type="arrowRight"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                        <span
-                          className="euiIEFlexWrapFix"
+                          />
+                        </EuiIcon>
+                      </span>
+                      <span
+                        className="euiIEFlexWrapFix"
+                      >
+                        <EuiFlexGroup
+                          alignItems="center"
+                          gutterSize="m"
+                          responsive={false}
                         >
-                          <EuiFlexGroup
-                            alignItems="center"
-                            gutterSize="m"
-                            responsive={false}
+                          <div
+                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                           >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                            <EuiFlexItem
+                              grow={false}
                             >
-                              <EuiFlexItem
-                                grow={false}
+                              <div
+                                className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <div
-                                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                                <EuiIcon
+                                  size="l"
+                                  type="logoObservability"
                                 >
-                                  <EuiIcon
+                                  <span
+                                    data-euiicon-type="logoObservability"
                                     size="l"
-                                    type="logoObservability"
-                                  >
-                                    <span
-                                      data-euiicon-type="logoObservability"
-                                      size="l"
-                                    />
-                                  </EuiIcon>
-                                </div>
-                              </EuiFlexItem>
-                              <EuiFlexItem>
-                                <div
-                                  className="euiFlexItem"
+                                  />
+                                </EuiIcon>
+                              </div>
+                            </EuiFlexItem>
+                            <EuiFlexItem>
+                              <div
+                                className="euiFlexItem"
+                              >
+                                <EuiTitle
+                                  size="xxs"
                                 >
-                                  <EuiTitle
-                                    size="xxs"
+                                  <h3
+                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                    id="generated-id__title"
                                   >
-                                    <h3
-                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Observability
-                                    </h3>
-                                  </EuiTitle>
-                                </div>
-                              </EuiFlexItem>
-                            </div>
-                          </EuiFlexGroup>
-                        </span>
-                      </button>
-                    </div>
-                    <div
-                      aria-labelledby="mockId"
-                      className="euiAccordion__childWrapper"
-                      id="mockId"
-                      role="region"
-                      tabIndex={-1}
+                                    Observability
+                                  </h3>
+                                </EuiTitle>
+                              </div>
+                            </EuiFlexItem>
+                          </div>
+                        </EuiFlexGroup>
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    aria-labelledby="generated-id"
+                    className="euiAccordion__childWrapper"
+                    id="generated-id"
+                    role="region"
+                    tabIndex={-1}
+                  >
+                    <EuiResizeObserver
+                      onResize={[Function]}
                     >
-                      <EuiResizeObserver
-                        onResize={[Function]}
-                      >
-                        <div>
+                      <div>
+                        <div
+                          className=""
+                        >
                           <div
-                            className=""
+                            className="euiCollapsibleNavGroup__children"
                           >
-                            <div
-                              className="euiCollapsibleNavGroup__children"
+                            <EuiListGroup
+                              aria-label="Primary navigation links, Observability"
+                              color="subdued"
+                              gutterSize="none"
+                              listItems={
+                                Array [
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "metrics",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "metrics",
+                                    "onClick": [Function],
+                                  },
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "logs",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "logs",
+                                    "onClick": [Function],
+                                  },
+                                ]
+                              }
+                              maxWidth="none"
+                              size="s"
                             >
-                              <EuiListGroup
+                              <ul
                                 aria-label="Primary navigation links, Observability"
-                                color="subdued"
-                                gutterSize="none"
-                                listItems={
-                                  Array [
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "metrics",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "metrics",
-                                      "onClick": [Function],
-                                    },
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "logs",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "logs",
-                                      "onClick": [Function],
-                                    },
-                                  ]
+                                className="euiListGroup"
+                                style={
+                                  Object {
+                                    "maxWidth": "none",
+                                  }
                                 }
-                                maxWidth="none"
-                                size="s"
                               >
-                                <ul
-                                  aria-label="Primary navigation links, Observability"
-                                  className="euiListGroup"
-                                  style={
-                                    Object {
-                                      "maxWidth": "none",
-                                    }
-                                  }
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="metrics"
+                                  isActive={false}
+                                  key="title-0"
+                                  label="metrics"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
                                 >
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="metrics"
-                                    isActive={false}
-                                    key="title-0"
-                                    label="metrics"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="metrics"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="metrics"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="metrics"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="metrics"
-                                        >
-                                          metrics
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="logs"
-                                    isActive={false}
-                                    key="title-1"
-                                    label="logs"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                        metrics
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="logs"
+                                  isActive={false}
+                                  key="title-1"
+                                  label="logs"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
+                                >
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="logs"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="logs"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="logs"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="logs"
-                                        >
-                                          logs
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                </ul>
-                              </EuiListGroup>
-                            </div>
+                                        logs
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                              </ul>
+                            </EuiListGroup>
                           </div>
                         </div>
-                      </EuiResizeObserver>
-                    </div>
+                      </div>
+                    </EuiResizeObserver>
                   </div>
-                </EuiAccordion>
-              </EuiCollapsibleNavGroup>
-              <EuiCollapsibleNavGroup
+                </div>
+              </EuiAccordion>
+            </EuiCollapsibleNavGroup>
+            <EuiCollapsibleNavGroup
+              data-test-subj="collapsibleNavGroup-securitySolution"
+              iconType="logoSecurity"
+              initialIsOpen={true}
+              isCollapsible={true}
+              key="securitySolution"
+              onToggle={[Function]}
+              title="Security"
+            >
+              <EuiAccordion
+                arrowDisplay="right"
+                buttonClassName="euiCollapsibleNavGroup__heading"
+                buttonContent={
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="m"
+                    responsive={false}
+                  >
+                    <EuiFlexItem
+                      grow={false}
+                    >
+                      <EuiIcon
+                        size="l"
+                        type="logoSecurity"
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem>
+                      <EuiTitle
+                        size="xxs"
+                      >
+                        <h3
+                          className="euiCollapsibleNavGroup__title"
+                          id="generated-id__title"
+                        >
+                          Security
+                        </h3>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                }
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-securitySolution"
-                iconType="logoSecurity"
+                id="generated-id"
                 initialIsOpen={true}
-                isCollapsible={true}
-                key="securitySolution"
+                isLoading={false}
+                isLoadingMessage={false}
                 onToggle={[Function]}
-                title="Security"
+                paddingSize="none"
               >
-                <EuiAccordion
-                  arrowDisplay="right"
-                  buttonClassName="euiCollapsibleNavGroup__heading"
-                  buttonContent={
-                    <EuiFlexGroup
-                      alignItems="center"
-                      gutterSize="m"
-                      responsive={false}
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <EuiIcon
-                          size="l"
-                          type="logoSecurity"
-                        />
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiTitle
-                          size="xxs"
-                        >
-                          <h3
-                            className="euiCollapsibleNavGroup__title"
-                            id="mockId__title"
-                          >
-                            Security
-                          </h3>
-                        </EuiTitle>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  }
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                <div
+                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                   data-test-subj="collapsibleNavGroup-securitySolution"
-                  id="mockId"
-                  initialIsOpen={true}
-                  isLoading={false}
-                  isLoadingMessage={false}
                   onToggle={[Function]}
-                  paddingSize="none"
                 >
                   <div
-                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-securitySolution"
-                    onToggle={[Function]}
+                    className="euiAccordion__triggerWrapper"
                   >
-                    <div
-                      className="euiAccordion__triggerWrapper"
+                    <button
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      id="generated-id"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-controls="mockId"
-                        aria-expanded={true}
-                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                        id="mockId"
-                        onClick={[Function]}
-                        type="button"
+                      <span
+                        className="euiAccordion__iconWrapper"
                       >
-                        <span
-                          className="euiAccordion__iconWrapper"
+                        <EuiIcon
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          size="m"
+                          type="arrowRight"
                         >
-                          <EuiIcon
+                          <span
                             className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            data-euiicon-type="arrowRight"
                             size="m"
-                            type="arrowRight"
-                          >
-                            <span
-                              className="euiAccordion__icon euiAccordion__icon-isOpen"
-                              data-euiicon-type="arrowRight"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                        <span
-                          className="euiIEFlexWrapFix"
+                          />
+                        </EuiIcon>
+                      </span>
+                      <span
+                        className="euiIEFlexWrapFix"
+                      >
+                        <EuiFlexGroup
+                          alignItems="center"
+                          gutterSize="m"
+                          responsive={false}
                         >
-                          <EuiFlexGroup
-                            alignItems="center"
-                            gutterSize="m"
-                            responsive={false}
+                          <div
+                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                           >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                            <EuiFlexItem
+                              grow={false}
                             >
-                              <EuiFlexItem
-                                grow={false}
+                              <div
+                                className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <div
-                                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                                <EuiIcon
+                                  size="l"
+                                  type="logoSecurity"
                                 >
-                                  <EuiIcon
+                                  <span
+                                    data-euiicon-type="logoSecurity"
                                     size="l"
-                                    type="logoSecurity"
-                                  >
-                                    <span
-                                      data-euiicon-type="logoSecurity"
-                                      size="l"
-                                    />
-                                  </EuiIcon>
-                                </div>
-                              </EuiFlexItem>
-                              <EuiFlexItem>
-                                <div
-                                  className="euiFlexItem"
+                                  />
+                                </EuiIcon>
+                              </div>
+                            </EuiFlexItem>
+                            <EuiFlexItem>
+                              <div
+                                className="euiFlexItem"
+                              >
+                                <EuiTitle
+                                  size="xxs"
                                 >
-                                  <EuiTitle
-                                    size="xxs"
+                                  <h3
+                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                    id="generated-id__title"
                                   >
-                                    <h3
-                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Security
-                                    </h3>
-                                  </EuiTitle>
-                                </div>
-                              </EuiFlexItem>
-                            </div>
-                          </EuiFlexGroup>
-                        </span>
-                      </button>
-                    </div>
-                    <div
-                      aria-labelledby="mockId"
-                      className="euiAccordion__childWrapper"
-                      id="mockId"
-                      role="region"
-                      tabIndex={-1}
+                                    Security
+                                  </h3>
+                                </EuiTitle>
+                              </div>
+                            </EuiFlexItem>
+                          </div>
+                        </EuiFlexGroup>
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    aria-labelledby="generated-id"
+                    className="euiAccordion__childWrapper"
+                    id="generated-id"
+                    role="region"
+                    tabIndex={-1}
+                  >
+                    <EuiResizeObserver
+                      onResize={[Function]}
                     >
-                      <EuiResizeObserver
-                        onResize={[Function]}
-                      >
-                        <div>
+                      <div>
+                        <div
+                          className=""
+                        >
                           <div
-                            className=""
+                            className="euiCollapsibleNavGroup__children"
                           >
-                            <div
-                              className="euiCollapsibleNavGroup__children"
+                            <EuiListGroup
+                              aria-label="Primary navigation links, Security"
+                              color="subdued"
+                              gutterSize="none"
+                              listItems={
+                                Array [
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "siem",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "siem",
+                                    "onClick": [Function],
+                                  },
+                                ]
+                              }
+                              maxWidth="none"
+                              size="s"
                             >
-                              <EuiListGroup
+                              <ul
                                 aria-label="Primary navigation links, Security"
-                                color="subdued"
-                                gutterSize="none"
-                                listItems={
-                                  Array [
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "siem",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "siem",
-                                      "onClick": [Function],
-                                    },
-                                  ]
+                                className="euiListGroup"
+                                style={
+                                  Object {
+                                    "maxWidth": "none",
+                                  }
                                 }
-                                maxWidth="none"
-                                size="s"
                               >
-                                <ul
-                                  aria-label="Primary navigation links, Security"
-                                  className="euiListGroup"
-                                  style={
-                                    Object {
-                                      "maxWidth": "none",
-                                    }
-                                  }
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="siem"
+                                  isActive={false}
+                                  key="title-0"
+                                  label="siem"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
                                 >
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="siem"
-                                    isActive={false}
-                                    key="title-0"
-                                    label="siem"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="siem"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="siem"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="siem"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="siem"
-                                        >
-                                          siem
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                </ul>
-                              </EuiListGroup>
-                            </div>
+                                        siem
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                              </ul>
+                            </EuiListGroup>
                           </div>
                         </div>
-                      </EuiResizeObserver>
-                    </div>
+                      </div>
+                    </EuiResizeObserver>
                   </div>
-                </EuiAccordion>
-              </EuiCollapsibleNavGroup>
-              <EuiCollapsibleNavGroup
+                </div>
+              </EuiAccordion>
+            </EuiCollapsibleNavGroup>
+            <EuiCollapsibleNavGroup
+              data-test-subj="collapsibleNavGroup-management"
+              iconType="managementApp"
+              initialIsOpen={true}
+              isCollapsible={true}
+              key="management"
+              onToggle={[Function]}
+              title="Management"
+            >
+              <EuiAccordion
+                arrowDisplay="right"
+                buttonClassName="euiCollapsibleNavGroup__heading"
+                buttonContent={
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="m"
+                    responsive={false}
+                  >
+                    <EuiFlexItem
+                      grow={false}
+                    >
+                      <EuiIcon
+                        size="l"
+                        type="managementApp"
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem>
+                      <EuiTitle
+                        size="xxs"
+                      >
+                        <h3
+                          className="euiCollapsibleNavGroup__title"
+                          id="generated-id__title"
+                        >
+                          Management
+                        </h3>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                }
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-management"
-                iconType="managementApp"
+                id="generated-id"
                 initialIsOpen={true}
-                isCollapsible={true}
-                key="management"
+                isLoading={false}
+                isLoadingMessage={false}
                 onToggle={[Function]}
-                title="Management"
+                paddingSize="none"
               >
-                <EuiAccordion
-                  arrowDisplay="right"
-                  buttonClassName="euiCollapsibleNavGroup__heading"
-                  buttonContent={
-                    <EuiFlexGroup
-                      alignItems="center"
-                      gutterSize="m"
-                      responsive={false}
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <EuiIcon
-                          size="l"
-                          type="managementApp"
-                        />
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiTitle
-                          size="xxs"
-                        >
-                          <h3
-                            className="euiCollapsibleNavGroup__title"
-                            id="mockId__title"
-                          >
-                            Management
-                          </h3>
-                        </EuiTitle>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  }
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                <div
+                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                   data-test-subj="collapsibleNavGroup-management"
-                  id="mockId"
-                  initialIsOpen={true}
-                  isLoading={false}
-                  isLoadingMessage={false}
                   onToggle={[Function]}
-                  paddingSize="none"
                 >
                   <div
-                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-management"
-                    onToggle={[Function]}
+                    className="euiAccordion__triggerWrapper"
                   >
-                    <div
-                      className="euiAccordion__triggerWrapper"
+                    <button
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      id="generated-id"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-controls="mockId"
-                        aria-expanded={true}
-                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                        id="mockId"
-                        onClick={[Function]}
-                        type="button"
+                      <span
+                        className="euiAccordion__iconWrapper"
                       >
-                        <span
-                          className="euiAccordion__iconWrapper"
+                        <EuiIcon
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          size="m"
+                          type="arrowRight"
                         >
-                          <EuiIcon
+                          <span
                             className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            data-euiicon-type="arrowRight"
                             size="m"
-                            type="arrowRight"
-                          >
-                            <span
-                              className="euiAccordion__icon euiAccordion__icon-isOpen"
-                              data-euiicon-type="arrowRight"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                        <span
-                          className="euiIEFlexWrapFix"
+                          />
+                        </EuiIcon>
+                      </span>
+                      <span
+                        className="euiIEFlexWrapFix"
+                      >
+                        <EuiFlexGroup
+                          alignItems="center"
+                          gutterSize="m"
+                          responsive={false}
                         >
-                          <EuiFlexGroup
-                            alignItems="center"
-                            gutterSize="m"
-                            responsive={false}
+                          <div
+                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                           >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                            <EuiFlexItem
+                              grow={false}
                             >
-                              <EuiFlexItem
-                                grow={false}
+                              <div
+                                className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <div
-                                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                                <EuiIcon
+                                  size="l"
+                                  type="managementApp"
                                 >
-                                  <EuiIcon
+                                  <span
+                                    data-euiicon-type="managementApp"
                                     size="l"
-                                    type="managementApp"
-                                  >
-                                    <span
-                                      data-euiicon-type="managementApp"
-                                      size="l"
-                                    />
-                                  </EuiIcon>
-                                </div>
-                              </EuiFlexItem>
-                              <EuiFlexItem>
-                                <div
-                                  className="euiFlexItem"
+                                  />
+                                </EuiIcon>
+                              </div>
+                            </EuiFlexItem>
+                            <EuiFlexItem>
+                              <div
+                                className="euiFlexItem"
+                              >
+                                <EuiTitle
+                                  size="xxs"
                                 >
-                                  <EuiTitle
-                                    size="xxs"
+                                  <h3
+                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                    id="generated-id__title"
                                   >
-                                    <h3
-                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Management
-                                    </h3>
-                                  </EuiTitle>
-                                </div>
-                              </EuiFlexItem>
-                            </div>
-                          </EuiFlexGroup>
-                        </span>
-                      </button>
-                    </div>
-                    <div
-                      aria-labelledby="mockId"
-                      className="euiAccordion__childWrapper"
-                      id="mockId"
-                      role="region"
-                      tabIndex={-1}
+                                    Management
+                                  </h3>
+                                </EuiTitle>
+                              </div>
+                            </EuiFlexItem>
+                          </div>
+                        </EuiFlexGroup>
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    aria-labelledby="generated-id"
+                    className="euiAccordion__childWrapper"
+                    id="generated-id"
+                    role="region"
+                    tabIndex={-1}
+                  >
+                    <EuiResizeObserver
+                      onResize={[Function]}
                     >
-                      <EuiResizeObserver
-                        onResize={[Function]}
-                      >
-                        <div>
+                      <div>
+                        <div
+                          className=""
+                        >
                           <div
-                            className=""
+                            className="euiCollapsibleNavGroup__children"
                           >
-                            <div
-                              className="euiCollapsibleNavGroup__children"
+                            <EuiListGroup
+                              aria-label="Primary navigation links, Management"
+                              color="subdued"
+                              gutterSize="none"
+                              listItems={
+                                Array [
+                                  Object {
+                                    "data-test-subj": "collapsibleNavAppLink",
+                                    "href": "monitoring",
+                                    "isActive": false,
+                                    "isDisabled": undefined,
+                                    "label": "monitoring",
+                                    "onClick": [Function],
+                                  },
+                                ]
+                              }
+                              maxWidth="none"
+                              size="s"
                             >
-                              <EuiListGroup
+                              <ul
                                 aria-label="Primary navigation links, Management"
-                                color="subdued"
-                                gutterSize="none"
-                                listItems={
-                                  Array [
-                                    Object {
-                                      "data-test-subj": "collapsibleNavAppLink",
-                                      "href": "monitoring",
-                                      "isActive": false,
-                                      "isDisabled": undefined,
-                                      "label": "monitoring",
-                                      "onClick": [Function],
-                                    },
-                                  ]
+                                className="euiListGroup"
+                                style={
+                                  Object {
+                                    "maxWidth": "none",
+                                  }
                                 }
-                                maxWidth="none"
-                                size="s"
                               >
-                                <ul
-                                  aria-label="Primary navigation links, Management"
-                                  className="euiListGroup"
-                                  style={
-                                    Object {
-                                      "maxWidth": "none",
-                                    }
-                                  }
+                                <EuiListGroupItem
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  href="monitoring"
+                                  isActive={false}
+                                  key="title-0"
+                                  label="monitoring"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  wrapText={false}
                                 >
-                                  <EuiListGroupItem
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink"
-                                    href="monitoring"
-                                    isActive={false}
-                                    key="title-0"
-                                    label="monitoring"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    wrapText={false}
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink"
+                                      href="monitoring"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
                                     >
-                                      <a
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="monitoring"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="monitoring"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="monitoring"
-                                        >
-                                          monitoring
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                </ul>
-                              </EuiListGroup>
-                            </div>
+                                        monitoring
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                              </ul>
+                            </EuiListGroup>
                           </div>
                         </div>
-                      </EuiResizeObserver>
-                    </div>
+                      </div>
+                    </EuiResizeObserver>
                   </div>
-                </EuiAccordion>
-              </EuiCollapsibleNavGroup>
-              <EuiCollapsibleNavGroup
+                </div>
+              </EuiAccordion>
+            </EuiCollapsibleNavGroup>
+            <EuiCollapsibleNavGroup
+              data-test-subj="collapsibleNavGroup-noCategory"
+              key="0"
+            >
+              <div
+                className="euiCollapsibleNavGroup"
                 data-test-subj="collapsibleNavGroup-noCategory"
-                key="0"
+                id="generated-id"
               >
                 <div
-                  className="euiCollapsibleNavGroup"
-                  data-test-subj="collapsibleNavGroup-noCategory"
-                  id="mockId"
+                  className="euiCollapsibleNavGroup__children"
                 >
-                  <div
-                    className="euiCollapsibleNavGroup__children"
+                  <EuiListGroup
+                    flush={true}
                   >
-                    <EuiListGroup
-                      flush={true}
+                    <ul
+                      className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
                     >
-                      <ul
-                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                      <EuiListGroupItem
+                        color="text"
+                        data-test-subj="collapsibleNavAppLink"
+                        href="canvas"
+                        isActive={false}
+                        label="canvas"
+                        onClick={[Function]}
+                        size="s"
                       >
-                        <EuiListGroupItem
-                          color="text"
-                          data-test-subj="collapsibleNavAppLink"
-                          href="canvas"
-                          isActive={false}
-                          label="canvas"
-                          onClick={[Function]}
-                          size="s"
+                        <li
+                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                         >
-                          <li
-                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          <a
+                            className="euiListGroupItem__button"
+                            data-test-subj="collapsibleNavAppLink"
+                            href="canvas"
+                            onClick={[Function]}
+                            rel="noreferrer"
                           >
-                            <a
-                              className="euiListGroupItem__button"
-                              data-test-subj="collapsibleNavAppLink"
-                              href="canvas"
-                              onClick={[Function]}
-                              rel="noreferrer"
+                            <span
+                              className="euiListGroupItem__label"
+                              title="canvas"
                             >
-                              <span
-                                className="euiListGroupItem__label"
-                                title="canvas"
-                              >
-                                canvas
-                              </span>
-                            </a>
-                          </li>
-                        </EuiListGroupItem>
-                      </ul>
-                    </EuiListGroup>
-                  </div>
+                              canvas
+                            </span>
+                          </a>
+                        </li>
+                      </EuiListGroupItem>
+                    </ul>
+                  </EuiListGroup>
                 </div>
-              </EuiCollapsibleNavGroup>
-              <EuiShowFor
-                sizes={
-                  Array [
-                    "l",
-                    "xl",
-                  ]
-                }
-              >
-                <EuiCollapsibleNavGroup>
+              </div>
+            </EuiCollapsibleNavGroup>
+            <EuiShowFor
+              sizes={
+                Array [
+                  "l",
+                  "xl",
+                ]
+              }
+            >
+              <EuiCollapsibleNavGroup>
+                <div
+                  className="euiCollapsibleNavGroup"
+                  id="generated-id"
+                >
                   <div
-                    className="euiCollapsibleNavGroup"
-                    id="mockId"
+                    className="euiCollapsibleNavGroup__children"
                   >
-                    <div
-                      className="euiCollapsibleNavGroup__children"
+                    <EuiListGroup
+                      flush={true}
                     >
-                      <EuiListGroup
-                        flush={true}
-                      >
-                        <ul
-                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                        >
-                          <EuiListGroupItem
-                            aria-label="Dock primary navigation"
-                            buttonRef={
-                              Object {
-                                "current": <button
-                                  aria-label="Dock primary navigation"
-                                  class="euiListGroupItem__button"
-                                  data-test-subj="collapsible-nav-lock"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiListGroupItem__icon"
-                                    color="inherit"
-                                    data-euiicon-type="lockOpen"
-                                  />
-                                  <span
-                                    class="euiListGroupItem__label"
-                                    title="Dock navigation"
-                                  >
-                                    Dock navigation
-                                  </span>
-                                </button>,
-                              }
-                            }
-                            color="subdued"
-                            data-test-subj="collapsible-nav-lock"
-                            iconType="lockOpen"
-                            label="Dock navigation"
-                            onClick={[Function]}
-                            size="xs"
-                          >
-                            <li
-                              className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                            >
-                              <button
+                      <ul
+                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                      >
+                        <EuiListGroupItem
+                          aria-label="Dock primary navigation"
+                          buttonRef={
+                            Object {
+                              "current": <button
                                 aria-label="Dock primary navigation"
-                                className="euiListGroupItem__button"
+                                class="euiListGroupItem__button"
                                 data-test-subj="collapsible-nav-lock"
-                                disabled={false}
-                                onClick={[Function]}
                                 type="button"
                               >
-                                <EuiIcon
-                                  className="euiListGroupItem__icon"
+                                <span
+                                  class="euiListGroupItem__icon"
                                   color="inherit"
-                                  type="lockOpen"
-                                >
-                                  <span
-                                    className="euiListGroupItem__icon"
-                                    color="inherit"
-                                    data-euiicon-type="lockOpen"
-                                  />
-                                </EuiIcon>
+                                  data-euiicon-type="lockOpen"
+                                />
                                 <span
-                                  className="euiListGroupItem__label"
+                                  class="euiListGroupItem__label"
                                   title="Dock navigation"
                                 >
                                   Dock navigation
                                 </span>
-                              </button>
-                            </li>
-                          </EuiListGroupItem>
-                        </ul>
-                      </EuiListGroup>
-                    </div>
+                              </button>,
+                            }
+                          }
+                          color="subdued"
+                          data-test-subj="collapsible-nav-lock"
+                          iconType="lockOpen"
+                          label="Dock navigation"
+                          onClick={[Function]}
+                          size="xs"
+                        >
+                          <li
+                            className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
+                          >
+                            <button
+                              aria-label="Dock primary navigation"
+                              className="euiListGroupItem__button"
+                              data-test-subj="collapsible-nav-lock"
+                              disabled={false}
+                              onClick={[Function]}
+                              type="button"
+                            >
+                              <EuiIcon
+                                className="euiListGroupItem__icon"
+                                color="inherit"
+                                type="lockOpen"
+                              >
+                                <span
+                                  className="euiListGroupItem__icon"
+                                  color="inherit"
+                                  data-euiicon-type="lockOpen"
+                                />
+                              </EuiIcon>
+                              <span
+                                className="euiListGroupItem__label"
+                                title="Dock navigation"
+                              >
+                                Dock navigation
+                              </span>
+                            </button>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
                   </div>
-                </EuiCollapsibleNavGroup>
-              </EuiShowFor>
-            </div>
-          </EuiFlexItem>
-          <EuiScreenReaderOnly
-            showOnFocus={true}
-          >
-            <EuiButtonEmpty
-              className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-              iconType="cross"
-              onClick={[Function]}
-              size="xs"
-              textProps={
-                Object {
-                  "className": "euiCollapsibleNav__closeButtonText",
-                }
-              }
-            >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-              >
-                <EuiButtonContent
-                  className="euiButtonEmpty__content"
-                  iconSide="left"
-                  iconSize="s"
-                  iconType="cross"
-                  textProps={
-                    Object {
-                      "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                    }
-                  }
-                >
-                  <span
-                    className="euiButtonContent euiButtonEmpty__content"
-                  >
-                    <EuiIcon
-                      className="euiButtonContent__icon"
-                      color="inherit"
-                      size="s"
-                      type="cross"
-                    >
-                      <span
-                        className="euiButtonContent__icon"
-                        color="inherit"
-                        data-euiicon-type="cross"
-                        size="s"
-                      />
-                    </EuiIcon>
-                    <span
-                      className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                    >
-                      <EuiI18n
-                        default="close"
-                        token="euiCollapsibleNav.closeButtonLabel"
-                      >
-                        close
-                      </EuiI18n>
-                    </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonEmpty>
-          </EuiScreenReaderOnly>
-        </nav>
-      </div>
-    </EuiFocusTrap>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </EuiShowFor>
+          </div>
+        </EuiFlexItem>
+      </nav>
+    </EuiFlyout>
   </EuiCollapsibleNav>
 </CollapsibleNav>
 `;
@@ -2770,42 +2706,57 @@ exports[`CollapsibleNav renders the default nav 3`] = `
     isOpen={false}
     onClose={[Function]}
   >
-    <EuiWindowEvent
-      event="keydown"
-      handler={[Function]}
-    />
-    <EuiFocusTrap
-      clickOutsideDisables={true}
-      disabled={true}
+    <EuiFlyout
+      aria-label="Primary"
+      as="nav"
+      className="euiCollapsibleNav"
+      closeButtonPosition="outside"
+      data-test-subj="collapsibleNav"
+      hideCloseButton={true}
+      id="collapsibe-nav"
+      onClose={[Function]}
+      outsideClickCloses={true}
+      ownFocus={true}
+      paddingSize="none"
+      pushMinBreakpoint="l"
+      role={null}
+      side="left"
+      size={320}
+      type="push"
     >
-      <div
-        data-eui="EuiFocusTrap"
+      <nav
+        data-eui="EuiFlyout"
+        data-test-subj="collapsibleNav"
+        role={null}
       >
-        <nav
-          aria-label="Primary"
-          className="euiCollapsibleNav euiCollapsibleNav--isDocked"
-          data-test-subj="collapsibleNav"
-          id="collapsibe-nav"
+        <EuiFlexItem
+          grow={false}
+          style={
+            Object {
+              "flexShrink": 0,
+            }
+          }
         >
-          <EuiFlexItem
-            grow={false}
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
             style={
               Object {
                 "flexShrink": 0,
               }
             }
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <EuiCollapsibleNavGroup
+              background="light"
+              className="eui-yScroll"
               style={
                 Object {
-                  "flexShrink": 0,
+                  "maxHeight": "40vh",
                 }
               }
             >
-              <EuiCollapsibleNavGroup
-                background="light"
-                className="eui-yScroll"
+              <div
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                id="generated-id"
                 style={
                   Object {
                     "maxHeight": "40vh",
@@ -2813,423 +2764,351 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                 }
               >
                 <div
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                  id="mockId"
-                  style={
-                    Object {
-                      "maxHeight": "40vh",
-                    }
-                  }
+                  className="euiCollapsibleNavGroup__children"
                 >
-                  <div
-                    className="euiCollapsibleNavGroup__children"
+                  <EuiListGroup
+                    aria-label="Pinned links"
+                    color="text"
+                    gutterSize="none"
+                    listItems={
+                      Array [
+                        Object {
+                          "data-test-subj": "homeLink",
+                          "href": "/",
+                          "iconType": "home",
+                          "label": "Home",
+                          "onClick": [Function],
+                        },
+                      ]
+                    }
+                    maxWidth="none"
+                    size="s"
                   >
-                    <EuiListGroup
+                    <ul
                       aria-label="Pinned links"
-                      color="text"
-                      gutterSize="none"
-                      listItems={
-                        Array [
-                          Object {
-                            "data-test-subj": "homeLink",
-                            "href": "/",
-                            "iconType": "home",
-                            "label": "Home",
-                            "onClick": [Function],
-                          },
-                        ]
+                      className="euiListGroup"
+                      style={
+                        Object {
+                          "maxWidth": "none",
+                        }
                       }
-                      maxWidth="none"
-                      size="s"
                     >
-                      <ul
-                        aria-label="Pinned links"
-                        className="euiListGroup"
-                        style={
-                          Object {
-                            "maxWidth": "none",
-                          }
-                        }
+                      <EuiListGroupItem
+                        color="text"
+                        data-test-subj="homeLink"
+                        href="/"
+                        iconType="home"
+                        key="title-0"
+                        label="Home"
+                        onClick={[Function]}
+                        showToolTip={false}
+                        size="s"
+                        wrapText={false}
                       >
-                        <EuiListGroupItem
-                          color="text"
-                          data-test-subj="homeLink"
-                          href="/"
-                          iconType="home"
-                          key="title-0"
-                          label="Home"
-                          onClick={[Function]}
-                          showToolTip={false}
-                          size="s"
-                          wrapText={false}
+                        <li
+                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                         >
-                          <li
-                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          <a
+                            className="euiListGroupItem__button"
+                            data-test-subj="homeLink"
+                            href="/"
+                            onClick={[Function]}
+                            rel="noreferrer"
                           >
-                            <a
-                              className="euiListGroupItem__button"
-                              data-test-subj="homeLink"
-                              href="/"
-                              onClick={[Function]}
-                              rel="noreferrer"
+                            <EuiIcon
+                              className="euiListGroupItem__icon"
+                              color="inherit"
+                              type="home"
                             >
-                              <EuiIcon
+                              <span
                                 className="euiListGroupItem__icon"
                                 color="inherit"
-                                type="home"
-                              >
-                                <span
-                                  className="euiListGroupItem__icon"
-                                  color="inherit"
-                                  data-euiicon-type="home"
-                                />
-                              </EuiIcon>
-                              <span
-                                className="euiListGroupItem__label"
-                                title="Home"
-                              >
-                                Home
-                              </span>
-                            </a>
-                          </li>
-                        </EuiListGroupItem>
-                      </ul>
-                    </EuiListGroup>
-                  </div>
+                                data-euiicon-type="home"
+                              />
+                            </EuiIcon>
+                            <span
+                              className="euiListGroupItem__label"
+                              title="Home"
+                            >
+                              Home
+                            </span>
+                          </a>
+                        </li>
+                      </EuiListGroupItem>
+                    </ul>
+                  </EuiListGroup>
                 </div>
-              </EuiCollapsibleNavGroup>
-            </div>
-          </EuiFlexItem>
-          <EuiCollapsibleNavGroup
-            background="light"
+              </div>
+            </EuiCollapsibleNavGroup>
+          </div>
+        </EuiFlexItem>
+        <EuiCollapsibleNavGroup
+          background="light"
+          data-test-subj="collapsibleNavGroup-recentlyViewed"
+          initialIsOpen={true}
+          isCollapsible={true}
+          key="recentlyViewed"
+          onToggle={[Function]}
+          title="Recently viewed"
+        >
+          <EuiAccordion
+            arrowDisplay="right"
+            buttonClassName="euiCollapsibleNavGroup__heading"
+            buttonContent={
+              <EuiFlexGroup
+                alignItems="center"
+                gutterSize="m"
+                responsive={false}
+              >
+                <EuiFlexItem>
+                  <EuiTitle
+                    size="xxs"
+                  >
+                    <h3
+                      className="euiCollapsibleNavGroup__title"
+                      id="generated-id__title"
+                    >
+                      Recently viewed
+                    </h3>
+                  </EuiTitle>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            }
+            className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
             data-test-subj="collapsibleNavGroup-recentlyViewed"
+            id="generated-id"
             initialIsOpen={true}
-            isCollapsible={true}
-            key="recentlyViewed"
+            isLoading={false}
+            isLoadingMessage={false}
             onToggle={[Function]}
-            title="Recently viewed"
+            paddingSize="none"
           >
-            <EuiAccordion
-              arrowDisplay="right"
-              buttonClassName="euiCollapsibleNavGroup__heading"
-              buttonContent={
-                <EuiFlexGroup
-                  alignItems="center"
-                  gutterSize="m"
-                  responsive={false}
-                >
-                  <EuiFlexItem>
-                    <EuiTitle
-                      size="xxs"
-                    >
-                      <h3
-                        className="euiCollapsibleNavGroup__title"
-                        id="mockId__title"
-                      >
-                        Recently viewed
-                      </h3>
-                    </EuiTitle>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              }
-              className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+            <div
+              className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
               data-test-subj="collapsibleNavGroup-recentlyViewed"
-              id="mockId"
-              initialIsOpen={true}
-              isLoading={false}
-              isLoadingMessage={false}
               onToggle={[Function]}
-              paddingSize="none"
             >
               <div
-                className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                data-test-subj="collapsibleNavGroup-recentlyViewed"
-                onToggle={[Function]}
+                className="euiAccordion__triggerWrapper"
               >
-                <div
-                  className="euiAccordion__triggerWrapper"
+                <button
+                  aria-controls="generated-id"
+                  aria-expanded={true}
+                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                  id="generated-id"
+                  onClick={[Function]}
+                  type="button"
                 >
-                  <button
-                    aria-controls="mockId"
-                    aria-expanded={true}
-                    className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                    id="mockId"
-                    onClick={[Function]}
-                    type="button"
+                  <span
+                    className="euiAccordion__iconWrapper"
                   >
-                    <span
-                      className="euiAccordion__iconWrapper"
+                    <EuiIcon
+                      className="euiAccordion__icon euiAccordion__icon-isOpen"
+                      size="m"
+                      type="arrowRight"
                     >
-                      <EuiIcon
+                      <span
                         className="euiAccordion__icon euiAccordion__icon-isOpen"
+                        data-euiicon-type="arrowRight"
                         size="m"
-                        type="arrowRight"
-                      >
-                        <span
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          data-euiicon-type="arrowRight"
-                          size="m"
-                        />
-                      </EuiIcon>
-                    </span>
-                    <span
-                      className="euiIEFlexWrapFix"
+                      />
+                    </EuiIcon>
+                  </span>
+                  <span
+                    className="euiIEFlexWrapFix"
+                  >
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
                     >
-                      <EuiFlexGroup
-                        alignItems="center"
-                        gutterSize="m"
-                        responsive={false}
+                      <div
+                        className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                       >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        >
-                          <EuiFlexItem>
-                            <div
-                              className="euiFlexItem"
+                        <EuiFlexItem>
+                          <div
+                            className="euiFlexItem"
+                          >
+                            <EuiTitle
+                              size="xxs"
                             >
-                              <EuiTitle
-                                size="xxs"
+                              <h3
+                                className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                id="generated-id__title"
                               >
-                                <h3
-                                  className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                  id="mockId__title"
-                                >
-                                  Recently viewed
-                                </h3>
-                              </EuiTitle>
-                            </div>
-                          </EuiFlexItem>
-                        </div>
-                      </EuiFlexGroup>
-                    </span>
-                  </button>
-                </div>
-                <div
-                  aria-labelledby="mockId"
-                  className="euiAccordion__childWrapper"
-                  id="mockId"
-                  role="region"
-                  tabIndex={-1}
+                                Recently viewed
+                              </h3>
+                            </EuiTitle>
+                          </div>
+                        </EuiFlexItem>
+                      </div>
+                    </EuiFlexGroup>
+                  </span>
+                </button>
+              </div>
+              <div
+                aria-labelledby="generated-id"
+                className="euiAccordion__childWrapper"
+                id="generated-id"
+                role="region"
+                tabIndex={-1}
+              >
+                <EuiResizeObserver
+                  onResize={[Function]}
                 >
-                  <EuiResizeObserver
-                    onResize={[Function]}
-                  >
-                    <div>
+                  <div>
+                    <div
+                      className=""
+                    >
                       <div
-                        className=""
+                        className="euiCollapsibleNavGroup__children"
                       >
-                        <div
-                          className="euiCollapsibleNavGroup__children"
+                        <EuiText
+                          color="subdued"
+                          size="s"
+                          style={
+                            Object {
+                              "padding": "0 8px 8px",
+                            }
+                          }
                         >
-                          <EuiText
-                            color="subdued"
-                            size="s"
+                          <div
+                            className="euiText euiText--small"
                             style={
                               Object {
                                 "padding": "0 8px 8px",
                               }
                             }
                           >
-                            <div
-                              className="euiText euiText--small"
-                              style={
-                                Object {
-                                  "padding": "0 8px 8px",
-                                }
-                              }
+                            <EuiTextColor
+                              color="subdued"
+                              component="div"
                             >
-                              <EuiTextColor
-                                color="subdued"
-                                component="div"
+                              <div
+                                className="euiTextColor euiTextColor--subdued"
                               >
-                                <div
-                                  className="euiTextColor euiTextColor--subdued"
-                                >
-                                  <p>
-                                    No recently viewed items
-                                  </p>
-                                </div>
-                              </EuiTextColor>
-                            </div>
-                          </EuiText>
-                        </div>
+                                <p>
+                                  No recently viewed items
+                                </p>
+                              </div>
+                            </EuiTextColor>
+                          </div>
+                        </EuiText>
                       </div>
                     </div>
-                  </EuiResizeObserver>
-                </div>
+                  </div>
+                </EuiResizeObserver>
               </div>
-            </EuiAccordion>
-          </EuiCollapsibleNavGroup>
-          <EuiHorizontalRule
-            margin="none"
-          >
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full"
-            />
-          </EuiHorizontalRule>
-          <EuiFlexItem
-            className="eui-yScroll"
+            </div>
+          </EuiAccordion>
+        </EuiCollapsibleNavGroup>
+        <EuiHorizontalRule
+          margin="none"
+        >
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full"
+          />
+        </EuiHorizontalRule>
+        <EuiFlexItem
+          className="eui-yScroll"
+        >
+          <div
+            className="euiFlexItem eui-yScroll"
           >
-            <div
-              className="euiFlexItem eui-yScroll"
+            <EuiShowFor
+              sizes={
+                Array [
+                  "l",
+                  "xl",
+                ]
+              }
             >
-              <EuiShowFor
-                sizes={
-                  Array [
-                    "l",
-                    "xl",
-                  ]
-                }
-              >
-                <EuiCollapsibleNavGroup>
+              <EuiCollapsibleNavGroup>
+                <div
+                  className="euiCollapsibleNavGroup"
+                  id="generated-id"
+                >
                   <div
-                    className="euiCollapsibleNavGroup"
-                    id="mockId"
+                    className="euiCollapsibleNavGroup__children"
                   >
-                    <div
-                      className="euiCollapsibleNavGroup__children"
+                    <EuiListGroup
+                      flush={true}
                     >
-                      <EuiListGroup
-                        flush={true}
+                      <ul
+                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
                       >
-                        <ul
-                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                        >
-                          <EuiListGroupItem
-                            aria-label="Undock primary navigation"
-                            buttonRef={
-                              Object {
-                                "current": <button
-                                  aria-label="Undock primary navigation"
-                                  class="euiListGroupItem__button"
-                                  data-test-subj="collapsible-nav-lock"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiListGroupItem__icon"
-                                    color="inherit"
-                                    data-euiicon-type="lock"
-                                  />
-                                  <span
-                                    class="euiListGroupItem__label"
-                                    title="Undock navigation"
-                                  >
-                                    Undock navigation
-                                  </span>
-                                </button>,
-                              }
-                            }
-                            color="subdued"
-                            data-test-subj="collapsible-nav-lock"
-                            iconType="lock"
-                            label="Undock navigation"
-                            onClick={[Function]}
-                            size="xs"
-                          >
-                            <li
-                              className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                            >
-                              <button
+                        <EuiListGroupItem
+                          aria-label="Undock primary navigation"
+                          buttonRef={
+                            Object {
+                              "current": <button
                                 aria-label="Undock primary navigation"
-                                className="euiListGroupItem__button"
+                                class="euiListGroupItem__button"
                                 data-test-subj="collapsible-nav-lock"
-                                disabled={false}
-                                onClick={[Function]}
                                 type="button"
                               >
-                                <EuiIcon
-                                  className="euiListGroupItem__icon"
+                                <span
+                                  class="euiListGroupItem__icon"
                                   color="inherit"
-                                  type="lock"
-                                >
-                                  <span
-                                    className="euiListGroupItem__icon"
-                                    color="inherit"
-                                    data-euiicon-type="lock"
-                                  />
-                                </EuiIcon>
+                                  data-euiicon-type="lock"
+                                />
                                 <span
-                                  className="euiListGroupItem__label"
+                                  class="euiListGroupItem__label"
                                   title="Undock navigation"
                                 >
                                   Undock navigation
                                 </span>
-                              </button>
-                            </li>
-                          </EuiListGroupItem>
-                        </ul>
-                      </EuiListGroup>
-                    </div>
+                              </button>,
+                            }
+                          }
+                          color="subdued"
+                          data-test-subj="collapsible-nav-lock"
+                          iconType="lock"
+                          label="Undock navigation"
+                          onClick={[Function]}
+                          size="xs"
+                        >
+                          <li
+                            className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
+                          >
+                            <button
+                              aria-label="Undock primary navigation"
+                              className="euiListGroupItem__button"
+                              data-test-subj="collapsible-nav-lock"
+                              disabled={false}
+                              onClick={[Function]}
+                              type="button"
+                            >
+                              <EuiIcon
+                                className="euiListGroupItem__icon"
+                                color="inherit"
+                                type="lock"
+                              >
+                                <span
+                                  className="euiListGroupItem__icon"
+                                  color="inherit"
+                                  data-euiicon-type="lock"
+                                />
+                              </EuiIcon>
+                              <span
+                                className="euiListGroupItem__label"
+                                title="Undock navigation"
+                              >
+                                Undock navigation
+                              </span>
+                            </button>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
                   </div>
-                </EuiCollapsibleNavGroup>
-              </EuiShowFor>
-            </div>
-          </EuiFlexItem>
-          <EuiScreenReaderOnly
-            showOnFocus={true}
-          >
-            <EuiButtonEmpty
-              className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-              iconType="cross"
-              onClick={[Function]}
-              size="xs"
-              textProps={
-                Object {
-                  "className": "euiCollapsibleNav__closeButtonText",
-                }
-              }
-            >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-              >
-                <EuiButtonContent
-                  className="euiButtonEmpty__content"
-                  iconSide="left"
-                  iconSize="s"
-                  iconType="cross"
-                  textProps={
-                    Object {
-                      "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                    }
-                  }
-                >
-                  <span
-                    className="euiButtonContent euiButtonEmpty__content"
-                  >
-                    <EuiIcon
-                      className="euiButtonContent__icon"
-                      color="inherit"
-                      size="s"
-                      type="cross"
-                    >
-                      <span
-                        className="euiButtonContent__icon"
-                        color="inherit"
-                        data-euiicon-type="cross"
-                        size="s"
-                      />
-                    </EuiIcon>
-                    <span
-                      className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                    >
-                      <EuiI18n
-                        default="close"
-                        token="euiCollapsibleNav.closeButtonLabel"
-                      >
-                        close
-                      </EuiI18n>
-                    </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonEmpty>
-          </EuiScreenReaderOnly>
-        </nav>
-      </div>
-    </EuiFocusTrap>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </EuiShowFor>
+          </div>
+        </EuiFlexItem>
+      </nav>
+    </EuiFlyout>
   </EuiCollapsibleNav>
 </CollapsibleNav>
 `;
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index 6ad1e2d3a1cc6..5aee9ca1b7c08 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -4947,42 +4947,57 @@ exports[`Header renders 1`] = `
         isOpen={false}
         onClose={[Function]}
       >
-        <EuiWindowEvent
-          event="keydown"
-          handler={[Function]}
-        />
-        <EuiFocusTrap
-          clickOutsideDisables={true}
-          disabled={true}
+        <EuiFlyout
+          aria-label="Primary"
+          as="nav"
+          className="euiCollapsibleNav"
+          closeButtonPosition="outside"
+          data-test-subj="collapsibleNav"
+          hideCloseButton={true}
+          id="mockId"
+          onClose={[Function]}
+          outsideClickCloses={true}
+          ownFocus={true}
+          paddingSize="none"
+          pushMinBreakpoint="l"
+          role={null}
+          side="left"
+          size={320}
+          type="push"
         >
-          <div
-            data-eui="EuiFocusTrap"
+          <nav
+            data-eui="EuiFlyout"
+            data-test-subj="collapsibleNav"
+            role={null}
           >
-            <nav
-              aria-label="Primary"
-              className="euiCollapsibleNav euiCollapsibleNav--isDocked"
-              data-test-subj="collapsibleNav"
-              id="mockId"
+            <EuiFlexItem
+              grow={false}
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
-              <EuiFlexItem
-                grow={false}
+              <div
+                className="euiFlexItem euiFlexItem--flexGrowZero"
                 style={
                   Object {
                     "flexShrink": 0,
                   }
                 }
               >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                <EuiCollapsibleNavGroup
+                  background="light"
+                  className="eui-yScroll"
                   style={
                     Object {
-                      "flexShrink": 0,
+                      "maxHeight": "40vh",
                     }
                   }
                 >
-                  <EuiCollapsibleNavGroup
-                    background="light"
-                    className="eui-yScroll"
+                  <div
+                    className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                    id="mockId"
                     style={
                       Object {
                         "maxHeight": "40vh",
@@ -4990,109 +5005,109 @@ exports[`Header renders 1`] = `
                     }
                   >
                     <div
-                      className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                      id="mockId"
-                      style={
-                        Object {
-                          "maxHeight": "40vh",
-                        }
-                      }
+                      className="euiCollapsibleNavGroup__children"
                     >
-                      <div
-                        className="euiCollapsibleNavGroup__children"
+                      <EuiListGroup
+                        color="text"
+                        gutterSize="none"
+                        listItems={
+                          Array [
+                            Object {
+                              "data-test-subj": "collapsibleNavCustomNavLink",
+                              "href": "",
+                              "icon": undefined,
+                              "iconType": undefined,
+                              "isActive": false,
+                              "isDisabled": undefined,
+                              "label": "Manage cloud deployment",
+                              "onClick": [Function],
+                            },
+                          ]
+                        }
+                        maxWidth="none"
+                        size="s"
                       >
-                        <EuiListGroup
-                          color="text"
-                          gutterSize="none"
-                          listItems={
-                            Array [
-                              Object {
-                                "data-test-subj": "collapsibleNavCustomNavLink",
-                                "href": "",
-                                "icon": undefined,
-                                "iconType": undefined,
-                                "isActive": false,
-                                "isDisabled": undefined,
-                                "label": "Manage cloud deployment",
-                                "onClick": [Function],
-                              },
-                            ]
+                        <ul
+                          className="euiListGroup"
+                          style={
+                            Object {
+                              "maxWidth": "none",
+                            }
                           }
-                          maxWidth="none"
-                          size="s"
                         >
-                          <ul
-                            className="euiListGroup"
-                            style={
-                              Object {
-                                "maxWidth": "none",
-                              }
-                            }
+                          <EuiListGroupItem
+                            color="text"
+                            data-test-subj="collapsibleNavCustomNavLink"
+                            href=""
+                            isActive={false}
+                            key="title-0"
+                            label="Manage cloud deployment"
+                            onClick={[Function]}
+                            showToolTip={false}
+                            size="s"
+                            wrapText={false}
                           >
-                            <EuiListGroupItem
-                              color="text"
-                              data-test-subj="collapsibleNavCustomNavLink"
-                              href=""
-                              isActive={false}
-                              key="title-0"
-                              label="Manage cloud deployment"
-                              onClick={[Function]}
-                              showToolTip={false}
-                              size="s"
-                              wrapText={false}
+                            <li
+                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                             >
-                              <li
-                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                              <button
+                                className="euiListGroupItem__button"
+                                data-test-subj="collapsibleNavCustomNavLink"
+                                disabled={false}
+                                onClick={[Function]}
+                                type="button"
                               >
-                                <button
-                                  className="euiListGroupItem__button"
-                                  data-test-subj="collapsibleNavCustomNavLink"
-                                  disabled={false}
-                                  onClick={[Function]}
-                                  type="button"
+                                <span
+                                  className="euiListGroupItem__label"
+                                  title="Manage cloud deployment"
                                 >
-                                  <span
-                                    className="euiListGroupItem__label"
-                                    title="Manage cloud deployment"
-                                  >
-                                    Manage cloud deployment
-                                  </span>
-                                </button>
-                              </li>
-                            </EuiListGroupItem>
-                          </ul>
-                        </EuiListGroup>
-                      </div>
+                                  Manage cloud deployment
+                                </span>
+                              </button>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
                     </div>
-                  </EuiCollapsibleNavGroup>
-                </div>
-              </EuiFlexItem>
-              <EuiHorizontalRule
-                margin="none"
-              >
-                <hr
-                  className="euiHorizontalRule euiHorizontalRule--full"
-                />
-              </EuiHorizontalRule>
-              <EuiFlexItem
-                grow={false}
+                  </div>
+                </EuiCollapsibleNavGroup>
+              </div>
+            </EuiFlexItem>
+            <EuiHorizontalRule
+              margin="none"
+            >
+              <hr
+                className="euiHorizontalRule euiHorizontalRule--full"
+              />
+            </EuiHorizontalRule>
+            <EuiFlexItem
+              grow={false}
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
+            >
+              <div
+                className="euiFlexItem euiFlexItem--flexGrowZero"
                 style={
                   Object {
                     "flexShrink": 0,
                   }
                 }
               >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                <EuiCollapsibleNavGroup
+                  background="light"
+                  className="eui-yScroll"
                   style={
                     Object {
-                      "flexShrink": 0,
+                      "maxHeight": "40vh",
                     }
                   }
                 >
-                  <EuiCollapsibleNavGroup
-                    background="light"
-                    className="eui-yScroll"
+                  <div
+                    className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                    id="mockId"
                     style={
                       Object {
                         "maxHeight": "40vh",
@@ -5100,307 +5115,353 @@ exports[`Header renders 1`] = `
                     }
                   >
                     <div
-                      className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                      id="mockId"
-                      style={
-                        Object {
-                          "maxHeight": "40vh",
-                        }
-                      }
+                      className="euiCollapsibleNavGroup__children"
                     >
-                      <div
-                        className="euiCollapsibleNavGroup__children"
+                      <EuiListGroup
+                        aria-label="Pinned links"
+                        color="text"
+                        gutterSize="none"
+                        listItems={
+                          Array [
+                            Object {
+                              "data-test-subj": "homeLink",
+                              "href": "/",
+                              "iconType": "home",
+                              "label": "Home",
+                              "onClick": [Function],
+                            },
+                          ]
+                        }
+                        maxWidth="none"
+                        size="s"
                       >
-                        <EuiListGroup
+                        <ul
                           aria-label="Pinned links"
-                          color="text"
-                          gutterSize="none"
-                          listItems={
-                            Array [
-                              Object {
-                                "data-test-subj": "homeLink",
-                                "href": "/",
-                                "iconType": "home",
-                                "label": "Home",
-                                "onClick": [Function],
-                              },
-                            ]
+                          className="euiListGroup"
+                          style={
+                            Object {
+                              "maxWidth": "none",
+                            }
                           }
-                          maxWidth="none"
-                          size="s"
                         >
-                          <ul
-                            aria-label="Pinned links"
-                            className="euiListGroup"
-                            style={
-                              Object {
-                                "maxWidth": "none",
-                              }
-                            }
+                          <EuiListGroupItem
+                            color="text"
+                            data-test-subj="homeLink"
+                            href="/"
+                            iconType="home"
+                            key="title-0"
+                            label="Home"
+                            onClick={[Function]}
+                            showToolTip={false}
+                            size="s"
+                            wrapText={false}
                           >
-                            <EuiListGroupItem
-                              color="text"
-                              data-test-subj="homeLink"
-                              href="/"
-                              iconType="home"
-                              key="title-0"
-                              label="Home"
-                              onClick={[Function]}
-                              showToolTip={false}
-                              size="s"
-                              wrapText={false}
+                            <li
+                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                             >
-                              <li
-                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                              <a
+                                className="euiListGroupItem__button"
+                                data-test-subj="homeLink"
+                                href="/"
+                                onClick={[Function]}
+                                rel="noreferrer"
                               >
-                                <a
-                                  className="euiListGroupItem__button"
-                                  data-test-subj="homeLink"
-                                  href="/"
-                                  onClick={[Function]}
-                                  rel="noreferrer"
+                                <EuiIcon
+                                  className="euiListGroupItem__icon"
+                                  color="inherit"
+                                  type="home"
                                 >
-                                  <EuiIcon
+                                  <span
                                     className="euiListGroupItem__icon"
                                     color="inherit"
-                                    type="home"
-                                  >
-                                    <span
-                                      className="euiListGroupItem__icon"
-                                      color="inherit"
-                                      data-euiicon-type="home"
-                                    />
-                                  </EuiIcon>
-                                  <span
-                                    className="euiListGroupItem__label"
-                                    title="Home"
-                                  >
-                                    Home
-                                  </span>
-                                </a>
-                              </li>
-                            </EuiListGroupItem>
-                          </ul>
-                        </EuiListGroup>
-                      </div>
+                                    data-euiicon-type="home"
+                                  />
+                                </EuiIcon>
+                                <span
+                                  className="euiListGroupItem__label"
+                                  title="Home"
+                                >
+                                  Home
+                                </span>
+                              </a>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
                     </div>
-                  </EuiCollapsibleNavGroup>
-                </div>
-              </EuiFlexItem>
-              <EuiCollapsibleNavGroup
-                background="light"
+                  </div>
+                </EuiCollapsibleNavGroup>
+              </div>
+            </EuiFlexItem>
+            <EuiCollapsibleNavGroup
+              background="light"
+              data-test-subj="collapsibleNavGroup-recentlyViewed"
+              initialIsOpen={true}
+              isCollapsible={true}
+              key="recentlyViewed"
+              onToggle={[Function]}
+              title="Recently viewed"
+            >
+              <EuiAccordion
+                arrowDisplay="right"
+                buttonClassName="euiCollapsibleNavGroup__heading"
+                buttonContent={
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="m"
+                    responsive={false}
+                  >
+                    <EuiFlexItem>
+                      <EuiTitle
+                        size="xxs"
+                      >
+                        <h3
+                          className="euiCollapsibleNavGroup__title"
+                          id="mockId__title"
+                        >
+                          Recently viewed
+                        </h3>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                }
+                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-recentlyViewed"
+                id="mockId"
                 initialIsOpen={true}
-                isCollapsible={true}
-                key="recentlyViewed"
+                isLoading={false}
+                isLoadingMessage={false}
                 onToggle={[Function]}
-                title="Recently viewed"
+                paddingSize="none"
               >
-                <EuiAccordion
-                  arrowDisplay="right"
-                  buttonClassName="euiCollapsibleNavGroup__heading"
-                  buttonContent={
-                    <EuiFlexGroup
-                      alignItems="center"
-                      gutterSize="m"
-                      responsive={false}
-                    >
-                      <EuiFlexItem>
-                        <EuiTitle
-                          size="xxs"
-                        >
-                          <h3
-                            className="euiCollapsibleNavGroup__title"
-                            id="mockId__title"
-                          >
-                            Recently viewed
-                          </h3>
-                        </EuiTitle>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  }
-                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                <div
+                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
                   data-test-subj="collapsibleNavGroup-recentlyViewed"
-                  id="mockId"
-                  initialIsOpen={true}
-                  isLoading={false}
-                  isLoadingMessage={false}
                   onToggle={[Function]}
-                  paddingSize="none"
                 >
                   <div
-                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-recentlyViewed"
-                    onToggle={[Function]}
+                    className="euiAccordion__triggerWrapper"
                   >
-                    <div
-                      className="euiAccordion__triggerWrapper"
+                    <button
+                      aria-controls="mockId"
+                      aria-expanded={true}
+                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      id="mockId"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-controls="mockId"
-                        aria-expanded={true}
-                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                        id="mockId"
-                        onClick={[Function]}
-                        type="button"
+                      <span
+                        className="euiAccordion__iconWrapper"
                       >
-                        <span
-                          className="euiAccordion__iconWrapper"
+                        <EuiIcon
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          size="m"
+                          type="arrowRight"
                         >
-                          <EuiIcon
+                          <span
                             className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            data-euiicon-type="arrowRight"
                             size="m"
-                            type="arrowRight"
-                          >
-                            <span
-                              className="euiAccordion__icon euiAccordion__icon-isOpen"
-                              data-euiicon-type="arrowRight"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                        <span
-                          className="euiIEFlexWrapFix"
+                          />
+                        </EuiIcon>
+                      </span>
+                      <span
+                        className="euiIEFlexWrapFix"
+                      >
+                        <EuiFlexGroup
+                          alignItems="center"
+                          gutterSize="m"
+                          responsive={false}
                         >
-                          <EuiFlexGroup
-                            alignItems="center"
-                            gutterSize="m"
-                            responsive={false}
+                          <div
+                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                           >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                            >
-                              <EuiFlexItem>
-                                <div
-                                  className="euiFlexItem"
+                            <EuiFlexItem>
+                              <div
+                                className="euiFlexItem"
+                              >
+                                <EuiTitle
+                                  size="xxs"
                                 >
-                                  <EuiTitle
-                                    size="xxs"
+                                  <h3
+                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                    id="mockId__title"
                                   >
-                                    <h3
-                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Recently viewed
-                                    </h3>
-                                  </EuiTitle>
-                                </div>
-                              </EuiFlexItem>
-                            </div>
-                          </EuiFlexGroup>
-                        </span>
-                      </button>
-                    </div>
-                    <div
-                      aria-labelledby="mockId"
-                      className="euiAccordion__childWrapper"
-                      id="mockId"
-                      role="region"
-                      tabIndex={-1}
+                                    Recently viewed
+                                  </h3>
+                                </EuiTitle>
+                              </div>
+                            </EuiFlexItem>
+                          </div>
+                        </EuiFlexGroup>
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    aria-labelledby="mockId"
+                    className="euiAccordion__childWrapper"
+                    id="mockId"
+                    role="region"
+                    tabIndex={-1}
+                  >
+                    <EuiResizeObserver
+                      onResize={[Function]}
                     >
-                      <EuiResizeObserver
-                        onResize={[Function]}
-                      >
-                        <div>
+                      <div>
+                        <div
+                          className=""
+                        >
                           <div
-                            className=""
+                            className="euiCollapsibleNavGroup__children"
                           >
-                            <div
-                              className="euiCollapsibleNavGroup__children"
+                            <EuiListGroup
+                              aria-label="Recently viewed links"
+                              className="kbnCollapsibleNav__recentsListGroup"
+                              color="subdued"
+                              gutterSize="none"
+                              listItems={
+                                Array [
+                                  Object {
+                                    "aria-label": "dashboard, type: kibana",
+                                    "data-test-subj": "collapsibleNavAppLink--recent",
+                                    "href": "http://localhost/",
+                                    "label": "dashboard",
+                                    "onClick": [Function],
+                                    "title": "dashboard, type: kibana",
+                                  },
+                                ]
+                              }
+                              maxWidth="none"
+                              size="s"
                             >
-                              <EuiListGroup
+                              <ul
                                 aria-label="Recently viewed links"
-                                className="kbnCollapsibleNav__recentsListGroup"
-                                color="subdued"
-                                gutterSize="none"
-                                listItems={
-                                  Array [
-                                    Object {
-                                      "aria-label": "dashboard, type: kibana",
-                                      "data-test-subj": "collapsibleNavAppLink--recent",
-                                      "href": "http://localhost/",
-                                      "label": "dashboard",
-                                      "onClick": [Function],
-                                      "title": "dashboard, type: kibana",
-                                    },
-                                  ]
+                                className="euiListGroup kbnCollapsibleNav__recentsListGroup"
+                                style={
+                                  Object {
+                                    "maxWidth": "none",
+                                  }
                                 }
-                                maxWidth="none"
-                                size="s"
                               >
-                                <ul
-                                  aria-label="Recently viewed links"
-                                  className="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                  style={
-                                    Object {
-                                      "maxWidth": "none",
-                                    }
-                                  }
+                                <EuiListGroupItem
+                                  aria-label="dashboard, type: kibana"
+                                  color="subdued"
+                                  data-test-subj="collapsibleNavAppLink--recent"
+                                  href="http://localhost/"
+                                  key="title-0"
+                                  label="dashboard"
+                                  onClick={[Function]}
+                                  showToolTip={false}
+                                  size="s"
+                                  title="dashboard, type: kibana"
+                                  wrapText={false}
                                 >
-                                  <EuiListGroupItem
-                                    aria-label="dashboard, type: kibana"
-                                    color="subdued"
-                                    data-test-subj="collapsibleNavAppLink--recent"
-                                    href="http://localhost/"
-                                    key="title-0"
-                                    label="dashboard"
-                                    onClick={[Function]}
-                                    showToolTip={false}
-                                    size="s"
-                                    title="dashboard, type: kibana"
-                                    wrapText={false}
+                                  <li
+                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                   >
-                                    <li
-                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                    <a
+                                      aria-label="dashboard, type: kibana"
+                                      className="euiListGroupItem__button"
+                                      data-test-subj="collapsibleNavAppLink--recent"
+                                      href="http://localhost/"
+                                      onClick={[Function]}
+                                      rel="noreferrer"
+                                      title="dashboard, type: kibana"
                                     >
-                                      <a
-                                        aria-label="dashboard, type: kibana"
-                                        className="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink--recent"
-                                        href="http://localhost/"
-                                        onClick={[Function]}
-                                        rel="noreferrer"
-                                        title="dashboard, type: kibana"
+                                      <span
+                                        className="euiListGroupItem__label"
+                                        title="dashboard"
                                       >
-                                        <span
-                                          className="euiListGroupItem__label"
-                                          title="dashboard"
-                                        >
-                                          dashboard
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </EuiListGroupItem>
-                                </ul>
-                              </EuiListGroup>
-                            </div>
+                                        dashboard
+                                      </span>
+                                    </a>
+                                  </li>
+                                </EuiListGroupItem>
+                              </ul>
+                            </EuiListGroup>
                           </div>
                         </div>
-                      </EuiResizeObserver>
-                    </div>
+                      </div>
+                    </EuiResizeObserver>
                   </div>
-                </EuiAccordion>
-              </EuiCollapsibleNavGroup>
-              <EuiHorizontalRule
-                margin="none"
-              >
-                <hr
-                  className="euiHorizontalRule euiHorizontalRule--full"
-                />
-              </EuiHorizontalRule>
-              <EuiFlexItem
-                className="eui-yScroll"
+                </div>
+              </EuiAccordion>
+            </EuiCollapsibleNavGroup>
+            <EuiHorizontalRule
+              margin="none"
+            >
+              <hr
+                className="euiHorizontalRule euiHorizontalRule--full"
+              />
+            </EuiHorizontalRule>
+            <EuiFlexItem
+              className="eui-yScroll"
+            >
+              <div
+                className="euiFlexItem eui-yScroll"
               >
-                <div
-                  className="euiFlexItem eui-yScroll"
+                <EuiCollapsibleNavGroup
+                  data-test-subj="collapsibleNavGroup-noCategory"
+                  key="0"
                 >
-                  <EuiCollapsibleNavGroup
+                  <div
+                    className="euiCollapsibleNavGroup"
                     data-test-subj="collapsibleNavGroup-noCategory"
-                    key="0"
+                    id="mockId"
                   >
+                    <div
+                      className="euiCollapsibleNavGroup__children"
+                    >
+                      <EuiListGroup
+                        flush={true}
+                      >
+                        <ul
+                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                        >
+                          <EuiListGroupItem
+                            color="text"
+                            data-test-subj="collapsibleNavAppLink"
+                            href=""
+                            isActive={false}
+                            label="kibana"
+                            onClick={[Function]}
+                            size="s"
+                          >
+                            <li
+                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                            >
+                              <button
+                                className="euiListGroupItem__button"
+                                data-test-subj="collapsibleNavAppLink"
+                                disabled={false}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <span
+                                  className="euiListGroupItem__label"
+                                  title="kibana"
+                                >
+                                  kibana
+                                </span>
+                              </button>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
+                    </div>
+                  </div>
+                </EuiCollapsibleNavGroup>
+                <EuiShowFor
+                  sizes={
+                    Array [
+                      "l",
+                      "xl",
+                    ]
+                  }
+                >
+                  <EuiCollapsibleNavGroup>
                     <div
                       className="euiCollapsibleNavGroup"
-                      data-test-subj="collapsibleNavGroup-noCategory"
                       id="mockId"
                     >
                       <div
@@ -5413,29 +5474,63 @@ exports[`Header renders 1`] = `
                             className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
                           >
                             <EuiListGroupItem
-                              color="text"
-                              data-test-subj="collapsibleNavAppLink"
-                              href=""
-                              isActive={false}
-                              label="kibana"
+                              aria-label="Undock primary navigation"
+                              buttonRef={
+                                Object {
+                                  "current": <button
+                                    aria-label="Undock primary navigation"
+                                    class="euiListGroupItem__button"
+                                    data-test-subj="collapsible-nav-lock"
+                                    type="button"
+                                  >
+                                    <span
+                                      class="euiListGroupItem__icon"
+                                      color="inherit"
+                                      data-euiicon-type="lock"
+                                    />
+                                    <span
+                                      class="euiListGroupItem__label"
+                                      title="Undock navigation"
+                                    >
+                                      Undock navigation
+                                    </span>
+                                  </button>,
+                                }
+                              }
+                              color="subdued"
+                              data-test-subj="collapsible-nav-lock"
+                              iconType="lock"
+                              label="Undock navigation"
                               onClick={[Function]}
-                              size="s"
+                              size="xs"
                             >
                               <li
-                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                                className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
                               >
                                 <button
+                                  aria-label="Undock primary navigation"
                                   className="euiListGroupItem__button"
-                                  data-test-subj="collapsibleNavAppLink"
+                                  data-test-subj="collapsible-nav-lock"
                                   disabled={false}
                                   onClick={[Function]}
                                   type="button"
                                 >
+                                  <EuiIcon
+                                    className="euiListGroupItem__icon"
+                                    color="inherit"
+                                    type="lock"
+                                  >
+                                    <span
+                                      className="euiListGroupItem__icon"
+                                      color="inherit"
+                                      data-euiicon-type="lock"
+                                    />
+                                  </EuiIcon>
                                   <span
                                     className="euiListGroupItem__label"
-                                    title="kibana"
+                                    title="Undock navigation"
                                   >
-                                    kibana
+                                    Undock navigation
                                   </span>
                                 </button>
                               </li>
@@ -5445,163 +5540,11 @@ exports[`Header renders 1`] = `
                       </div>
                     </div>
                   </EuiCollapsibleNavGroup>
-                  <EuiShowFor
-                    sizes={
-                      Array [
-                        "l",
-                        "xl",
-                      ]
-                    }
-                  >
-                    <EuiCollapsibleNavGroup>
-                      <div
-                        className="euiCollapsibleNavGroup"
-                        id="mockId"
-                      >
-                        <div
-                          className="euiCollapsibleNavGroup__children"
-                        >
-                          <EuiListGroup
-                            flush={true}
-                          >
-                            <ul
-                              className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                            >
-                              <EuiListGroupItem
-                                aria-label="Undock primary navigation"
-                                buttonRef={
-                                  Object {
-                                    "current": <button
-                                      aria-label="Undock primary navigation"
-                                      class="euiListGroupItem__button"
-                                      data-test-subj="collapsible-nav-lock"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiListGroupItem__icon"
-                                        color="inherit"
-                                        data-euiicon-type="lock"
-                                      />
-                                      <span
-                                        class="euiListGroupItem__label"
-                                        title="Undock navigation"
-                                      >
-                                        Undock navigation
-                                      </span>
-                                    </button>,
-                                  }
-                                }
-                                color="subdued"
-                                data-test-subj="collapsible-nav-lock"
-                                iconType="lock"
-                                label="Undock navigation"
-                                onClick={[Function]}
-                                size="xs"
-                              >
-                                <li
-                                  className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                >
-                                  <button
-                                    aria-label="Undock primary navigation"
-                                    className="euiListGroupItem__button"
-                                    data-test-subj="collapsible-nav-lock"
-                                    disabled={false}
-                                    onClick={[Function]}
-                                    type="button"
-                                  >
-                                    <EuiIcon
-                                      className="euiListGroupItem__icon"
-                                      color="inherit"
-                                      type="lock"
-                                    >
-                                      <span
-                                        className="euiListGroupItem__icon"
-                                        color="inherit"
-                                        data-euiicon-type="lock"
-                                      />
-                                    </EuiIcon>
-                                    <span
-                                      className="euiListGroupItem__label"
-                                      title="Undock navigation"
-                                    >
-                                      Undock navigation
-                                    </span>
-                                  </button>
-                                </li>
-                              </EuiListGroupItem>
-                            </ul>
-                          </EuiListGroup>
-                        </div>
-                      </div>
-                    </EuiCollapsibleNavGroup>
-                  </EuiShowFor>
-                </div>
-              </EuiFlexItem>
-              <EuiScreenReaderOnly
-                showOnFocus={true}
-              >
-                <EuiButtonEmpty
-                  className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                  iconType="cross"
-                  onClick={[Function]}
-                  size="xs"
-                  textProps={
-                    Object {
-                      "className": "euiCollapsibleNav__closeButtonText",
-                    }
-                  }
-                >
-                  <button
-                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                    disabled={false}
-                    onClick={[Function]}
-                    type="button"
-                  >
-                    <EuiButtonContent
-                      className="euiButtonEmpty__content"
-                      iconSide="left"
-                      iconSize="s"
-                      iconType="cross"
-                      textProps={
-                        Object {
-                          "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                        }
-                      }
-                    >
-                      <span
-                        className="euiButtonContent euiButtonEmpty__content"
-                      >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="s"
-                          type="cross"
-                        >
-                          <span
-                            className="euiButtonContent__icon"
-                            color="inherit"
-                            data-euiicon-type="cross"
-                            size="s"
-                          />
-                        </EuiIcon>
-                        <span
-                          className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                        >
-                          <EuiI18n
-                            default="close"
-                            token="euiCollapsibleNav.closeButtonLabel"
-                          >
-                            close
-                          </EuiI18n>
-                        </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonEmpty>
-              </EuiScreenReaderOnly>
-            </nav>
-          </div>
-        </EuiFocusTrap>
+                </EuiShowFor>
+              </div>
+            </EuiFlexItem>
+          </nav>
+        </EuiFlyout>
       </EuiCollapsibleNav>
     </CollapsibleNav>
   </header>
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
index 7f338a859e7b4..460770744d53a 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
@@ -16,10 +16,6 @@ import { httpServiceMock } from '../../../http/http_service.mock';
 import { ChromeRecentlyAccessedHistoryItem } from '../../recently_accessed';
 import { CollapsibleNav } from './collapsible_nav';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
-  htmlIdGenerator: () => () => 'mockId',
-}));
-
 const { kibana, observability, security, management } = DEFAULT_APP_CATEGORIES;
 
 function mockLink({ title = 'discover', category }: Partial<ChromeNavLink>) {
diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx
index fdbdde8556eeb..a3a0197b4017e 100644
--- a/src/core/public/chrome/ui/header/header.test.tsx
+++ b/src/core/public/chrome/ui/header/header.test.tsx
@@ -99,7 +99,7 @@ describe('Header', () => {
 
     act(() => isLocked$.next(true));
     component.update();
-    expect(component.find('nav[aria-label="Primary"]').exists()).toBeTruthy();
+    expect(component.find('[data-test-subj="collapsibleNav"]').exists()).toBeTruthy();
     expect(component).toMatchSnapshot();
 
     act(() =>
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 67cdd24aae848..246ca83ef5ade 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -87,6 +87,7 @@ export function Header({
   const isVisible = useObservable(observables.isVisible$, false);
   const isLocked = useObservable(observables.isLocked$, false);
   const [isNavOpen, setIsNavOpen] = useState(false);
+  const [navId] = useState(htmlIdGenerator()());
   const breadcrumbsAppendExtension = useObservable(breadcrumbsAppendExtension$);
 
   if (!isVisible) {
@@ -99,7 +100,6 @@ export function Header({
   }
 
   const toggleCollapsibleNavRef = createRef<HTMLButtonElement & { euiAnimate: () => void }>();
-  const navId = htmlIdGenerator()();
   const className = classnames('hide-for-sharing', 'headerGlobalNav');
 
   const Breadcrumbs = (
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index f5a1c51ccbe15..fbd09f3096854 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -26,7 +26,7 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFlyout\\" role=\\"dialog\\"><button type=\\"button\\" data-test-subj=\\"euiFlyoutCloseButton\\"></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div>"`;
 
 exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = `
 Array [
@@ -59,4 +59,4 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFlyout\\" role=\\"dialog\\"><button type=\\"button\\" data-test-subj=\\"euiFlyoutCloseButton\\"></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div>"`;
diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss
index 3386fa73f328a..de138cdf402e6 100644
--- a/src/core/public/styles/_base.scss
+++ b/src/core/public/styles/_base.scss
@@ -26,7 +26,7 @@
 }
 
 .euiBody--collapsibleNavIsDocked .euiBottomBar {
-  margin-left: $euiCollapsibleNavWidth;
+  margin-left: 320px; // Hard-coded for now -- @cchaos
 }
 
 // Temporary fix for EuiPageHeader with a bottom border but no tabs or padding
diff --git a/src/plugins/console/public/application/components/welcome_panel.tsx b/src/plugins/console/public/application/components/welcome_panel.tsx
index eb746e313d228..8514d41c04a51 100644
--- a/src/plugins/console/public/application/components/welcome_panel.tsx
+++ b/src/plugins/console/public/application/components/welcome_panel.tsx
@@ -27,7 +27,7 @@ interface Props {
 
 export function WelcomePanel(props: Props) {
   return (
-    <EuiFlyout onClose={props.onDismiss} data-test-subj="welcomePanel" size="s">
+    <EuiFlyout onClose={props.onDismiss} data-test-subj="welcomePanel" size="s" ownFocus={false}>
       <EuiFlyoutHeader hasBorder>
         <EuiTitle size="m">
           <h2>
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
index 9f56740fdac22..afe339f3f43a2 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
@@ -603,7 +603,7 @@ exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = `
             }
           >
             <EuiPageBody>
-              <main
+              <div
                 className="euiPageBody euiPageBody--borderRadiusNone"
               >
                 <EuiPageContent
@@ -675,7 +675,7 @@ exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = `
                     </div>
                   </EuiPanel>
                 </EuiPageContent>
-              </main>
+              </div>
             </EuiPageBody>
           </div>
         </EuiPage>
@@ -950,7 +950,7 @@ exports[`DashboardEmptyScreen renders correctly with view mode 1`] = `
             }
           >
             <EuiPageBody>
-              <main
+              <div
                 className="euiPageBody euiPageBody--borderRadiusNone"
               >
                 <EuiPageContent
@@ -1035,7 +1035,7 @@ exports[`DashboardEmptyScreen renders correctly with view mode 1`] = `
                     </div>
                   </EuiPanel>
                 </EuiPageContent>
-              </main>
+              </div>
             </EuiPageBody>
           </div>
         </EuiPage>
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index a0a7e54d27532..0ab3f8a4e3466 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -176,27 +176,27 @@ exports[`Inspector Data View component should render empty state 1`] = `
       <div
         className="euiEmptyPrompt"
       >
+        <EuiTitle
+          size="m"
+        >
+          <h2
+            className="euiTitle euiTitle--medium"
+          >
+            <FormattedMessage
+              defaultMessage="No data available"
+              id="data.inspector.table.noDataAvailableTitle"
+              values={Object {}}
+            >
+              No data available
+            </FormattedMessage>
+          </h2>
+        </EuiTitle>
         <EuiTextColor
           color="subdued"
         >
           <span
             className="euiTextColor euiTextColor--subdued"
           >
-            <EuiTitle
-              size="m"
-            >
-              <h2
-                className="euiTitle euiTitle--medium"
-              >
-                <FormattedMessage
-                  defaultMessage="No data available"
-                  id="data.inspector.table.noDataAvailableTitle"
-                  values={Object {}}
-                >
-                  No data available
-                </FormattedMessage>
-              </h2>
-            </EuiTitle>
             <EuiSpacer
               size="m"
             >
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.test.tsx
index 60841799b1398..50be2473a441e 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.test.tsx
@@ -144,7 +144,9 @@ describe('Discover flyout', function () {
     expect(props.setExpandedDoc.mock.calls[0][0]._id).toBe('4');
   });
 
-  it('allows navigating with arrow keys through documents', () => {
+  // EuiFlyout is mocked in Jest environments.
+  // EUI team to reinstate `onKeyDown`: https://github.com/elastic/eui/issues/4883
+  it.skip('allows navigating with arrow keys through documents', () => {
     const props = getProps();
     const component = mountWithIntl(<DiscoverGridFlyout {...props} />);
     findTestSubject(component, 'docTableDetailsFlyout').simulate('keydown', { key: 'ArrowRight' });
diff --git a/src/plugins/discover/public/application/components/source_viewer/__snapshots__/source_viewer.test.tsx.snap b/src/plugins/discover/public/application/components/source_viewer/__snapshots__/source_viewer.test.tsx.snap
index f40dbbbae1f87..68786871825ac 100644
--- a/src/plugins/discover/public/application/components/source_viewer/__snapshots__/source_viewer.test.tsx.snap
+++ b/src/plugins/discover/public/application/components/source_viewer/__snapshots__/source_viewer.test.tsx.snap
@@ -147,27 +147,27 @@ exports[`Source Viewer component renders error state 1`] = `
         />
       </EuiIcon>
       <EuiSpacer
-        size="s"
+        size="m"
       >
         <div
-          className="euiSpacer euiSpacer--s"
+          className="euiSpacer euiSpacer--m"
         />
       </EuiSpacer>
+      <EuiTitle
+        size="m"
+      >
+        <h2
+          className="euiTitle euiTitle--medium"
+        >
+          An Error Occurred
+        </h2>
+      </EuiTitle>
       <EuiTextColor
         color="subdued"
       >
         <span
           className="euiTextColor euiTextColor--subdued"
         >
-          <EuiTitle
-            size="m"
-          >
-            <h2
-              className="euiTitle euiTitle--medium"
-            >
-              An Error Occurred
-            </h2>
-          </EuiTitle>
           <EuiSpacer
             size="m"
           >
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index 40170c39942e5..79c1a11cfef84 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -153,7 +153,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
           class="euiFormControlLayout__childrenWrapper"
         >
           <input
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             class="euiFieldText"
             data-test-subj="urlEditorUrlTemplate"
             id="generated-id"
@@ -164,7 +164,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       </div>
       <div
         class="euiFormHelpText euiFormRow__text"
-        id="generated-id-help"
+        id="generated-id-help-0"
       >
         <a
           class="euiLink euiLink--primary"
@@ -216,7 +216,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
           class="euiFormControlLayout__childrenWrapper"
         >
           <input
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             class="euiFieldText"
             data-test-subj="urlEditorLabelTemplate"
             id="generated-id"
@@ -227,7 +227,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       </div>
       <div
         class="euiFormHelpText euiFormRow__text"
-        id="generated-id-help"
+        id="generated-id-help-0"
       >
         <a
           class="euiLink euiLink--primary"
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
index ceb5b4f343568..5e5fbb7c5e99d 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
@@ -76,7 +76,7 @@ exports[`Header should render a different name, prompt, and beta tag if provided
                         label="Beta"
                       >
                         <span
-                          className="euiBetaBadge"
+                          className="euiBetaBadge euiBetaBadge--hollow"
                           title="Beta"
                         >
                           Beta
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
index e74bb671e7f4e..ba0f2aee0565f 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
@@ -140,62 +140,72 @@ exports[`ScriptingWarningCallOut should render normally 1`] = `
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <EuiText
-            size="s"
+          <EuiTextColor
+            color="default"
+            component="div"
           >
             <div
-              className="euiText euiText--small"
+              className="euiTextColor euiTextColor--default"
             >
-              <p>
-                <FormattedMessage
-                  defaultMessage="For greater flexibility and Painless script support, use {runtimeDocs}."
-                  id="indexPatternManagement.scriptedFieldsDeprecatedBody"
-                  values={
-                    Object {
-                      "runtimeDocs": <EuiLink
-                        target="_blank"
-                      >
-                        <FormattedMessage
-                          defaultMessage="runtime fields"
-                          id="indexPatternManagement.warningCallOutLabel.runtimeLink"
-                          values={Object {}}
-                        />
-                      </EuiLink>,
-                    }
-                  }
+              <EuiText
+                size="s"
+              >
+                <div
+                  className="euiText euiText--small"
                 >
-                  <span>
-                    For greater flexibility and Painless script support, use 
-                    <EuiLink
-                      target="_blank"
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="For greater flexibility and Painless script support, use {runtimeDocs}."
+                      id="indexPatternManagement.scriptedFieldsDeprecatedBody"
+                      values={
+                        Object {
+                          "runtimeDocs": <EuiLink
+                            target="_blank"
+                          >
+                            <FormattedMessage
+                              defaultMessage="runtime fields"
+                              id="indexPatternManagement.warningCallOutLabel.runtimeLink"
+                              values={Object {}}
+                            />
+                          </EuiLink>,
+                        }
+                      }
                     >
-                      <button
-                        className="euiLink euiLink--primary"
-                        disabled={false}
-                        type="button"
-                      >
-                        <FormattedMessage
-                          defaultMessage="runtime fields"
-                          id="indexPatternManagement.warningCallOutLabel.runtimeLink"
-                          values={Object {}}
+                      <span>
+                        For greater flexibility and Painless script support, use 
+                        <EuiLink
+                          target="_blank"
                         >
-                          <span>
-                            runtime fields
-                          </span>
-                        </FormattedMessage>
-                      </button>
-                    </EuiLink>
-                    .
-                  </span>
-                </FormattedMessage>
-              </p>
+                          <button
+                            className="euiLink euiLink--primary"
+                            disabled={false}
+                            type="button"
+                          >
+                            <FormattedMessage
+                              defaultMessage="runtime fields"
+                              id="indexPatternManagement.warningCallOutLabel.runtimeLink"
+                              values={Object {}}
+                            >
+                              <span>
+                                runtime fields
+                              </span>
+                            </FormattedMessage>
+                          </button>
+                        </EuiLink>
+                        .
+                      </span>
+                    </FormattedMessage>
+                  </p>
+                </div>
+              </EuiText>
             </div>
-          </EuiText>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index 5ad8205365146..67d2cf72c5375 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -329,6 +329,7 @@ exports[`InspectorPanel should render as expected 1`] = `
       >
         <div
           className="euiFlyoutBody__overflow"
+          tabIndex={0}
         >
           <div
             className="euiFlyoutBody__overflowContent"
diff --git a/src/plugins/kibana_react/public/page_template/solution_nav/__snapshots__/solution_nav.test.tsx.snap b/src/plugins/kibana_react/public/page_template/solution_nav/__snapshots__/solution_nav.test.tsx.snap
index 0267357709534..352e1c80b3266 100644
--- a/src/plugins/kibana_react/public/page_template/solution_nav/__snapshots__/solution_nav.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/solution_nav/__snapshots__/solution_nav.test.tsx.snap
@@ -59,6 +59,12 @@ exports[`KibanaPageTemplateSolutionNav accepts EuiSideNavProps 1`] = `
         },
       ]
     }
+    mobileBreakpoints={
+      Array [
+        "xs",
+        "s",
+      ]
+    }
     mobileTitle={
       <h2>
         <FormattedMessage
@@ -135,6 +141,12 @@ exports[`KibanaPageTemplateSolutionNav renders 1`] = `
         },
       ]
     }
+    mobileBreakpoints={
+      Array [
+        "xs",
+        "s",
+      ]
+    }
     mobileTitle={
       <h2>
         <FormattedMessage
@@ -215,6 +227,12 @@ exports[`KibanaPageTemplateSolutionNav renders with icon 1`] = `
         },
       ]
     }
+    mobileBreakpoints={
+      Array [
+        "xs",
+        "s",
+      ]
+    }
     mobileTitle={
       <h2>
         <KibanaPageTemplateSolutionNavAvatar
diff --git a/src/plugins/kibana_react/public/page_template/solution_nav/solution_nav.tsx b/src/plugins/kibana_react/public/page_template/solution_nav/solution_nav.tsx
index 4aa456f716dbd..bd9ee8eb4d0e8 100644
--- a/src/plugins/kibana_react/public/page_template/solution_nav/solution_nav.tsx
+++ b/src/plugins/kibana_react/public/page_template/solution_nav/solution_nav.tsx
@@ -17,7 +17,7 @@ import {
   KibanaPageTemplateSolutionNavAvatarProps,
 } from './solution_nav_avatar';
 
-export type KibanaPageTemplateSolutionNavProps = EuiSideNavProps<{}> & {
+export type KibanaPageTemplateSolutionNavProps = Partial<EuiSideNavProps<{}>> & {
   /**
    * Name of the solution, i.e. "Observability"
    */
diff --git a/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx b/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx
index 5b424c7e95f18..1af85da983085 100644
--- a/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx
+++ b/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx
@@ -20,7 +20,6 @@ import {
   EuiFlexItem,
   EuiFlexGroup,
   EuiIcon,
-  EuiOverlayMask,
 } from '@elastic/eui';
 
 import { SolutionName, ProjectStatus, ProjectID, Project, EnvironmentName } from '../../../common';
@@ -124,30 +123,32 @@ export const LabsFlyout = (props: Props) => {
   );
 
   return (
-    <EuiOverlayMask onClick={() => onClose()} headerZindexLocation="below">
-      <EuiFlyout onClose={onClose} hideCloseButton={true}>
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            <h2>
-              <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
-                <EuiFlexItem grow={false}>
-                  <EuiIcon type="beaker" size="l" />
-                </EuiFlexItem>
-                <EuiFlexItem>{strings.getTitleLabel()}</EuiFlexItem>
-              </EuiFlexGroup>
-            </h2>
-          </EuiTitle>
-          <EuiSpacer size="s" />
-          <EuiText size="s" color="subdued">
-            <p>{strings.getDescriptionMessage()}</p>
-          </EuiText>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody>
-          <ProjectList {...{ projects, solutions, onStatusChange }} />
-        </EuiFlyoutBody>
-        {footer}
-      </EuiFlyout>
-    </EuiOverlayMask>
+    <EuiFlyout
+      onClose={onClose}
+      hideCloseButton={true}
+      maskProps={{ headerZindexLocation: 'below' }}
+    >
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2>
+            <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
+              <EuiFlexItem grow={false}>
+                <EuiIcon type="beaker" size="l" />
+              </EuiFlexItem>
+              <EuiFlexItem>{strings.getTitleLabel()}</EuiFlexItem>
+            </EuiFlexGroup>
+          </h2>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        <EuiText size="s" color="subdued">
+          <p>{strings.getDescriptionMessage()}</p>
+        </EuiText>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <ProjectList {...{ projects, solutions, onStatusChange }} />
+      </EuiFlyoutBody>
+      {footer}
+    </EuiFlyout>
   );
 };
 
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
index 5239a92543539..5a8cd06b8ecc0 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
@@ -47,20 +47,30 @@ exports[`Intro component renders correctly 1`] = `
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <div>
-            <FormattedMessage
-              defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be."
-              id="savedObjectsManagement.view.howToModifyObjectDescription"
-              values={Object {}}
+          <EuiTextColor
+            color="default"
+            component="div"
+          >
+            <div
+              className="euiTextColor euiTextColor--default"
             >
-              Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be.
-            </FormattedMessage>
-          </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be."
+                  id="savedObjectsManagement.view.howToModifyObjectDescription"
+                  values={Object {}}
+                >
+                  Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be.
+                </FormattedMessage>
+              </div>
+            </div>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
index bddfe000008d4..f977c17df41d3 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
@@ -49,29 +49,39 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <div>
-            <FormattedMessage
-              defaultMessage="The index pattern associated with this object no longer exists."
-              id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
-              values={Object {}}
-            >
-              The index pattern associated with this object no longer exists.
-            </FormattedMessage>
-          </div>
-          <div>
-            <FormattedMessage
-              defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="savedObjectsManagement.view.howToFixErrorDescription"
-              values={Object {}}
+          <EuiTextColor
+            color="default"
+            component="div"
+          >
+            <div
+              className="euiTextColor euiTextColor--default"
             >
-              If you know what this error means, go ahead and fix it — otherwise click the delete button above.
-            </FormattedMessage>
-          </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="The index pattern associated with this object no longer exists."
+                  id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
+                  values={Object {}}
+                >
+                  The index pattern associated with this object no longer exists.
+                </FormattedMessage>
+              </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
+                  id="savedObjectsManagement.view.howToFixErrorDescription"
+                  values={Object {}}
+                >
+                  If you know what this error means, go ahead and fix it — otherwise click the delete button above.
+                </FormattedMessage>
+              </div>
+            </div>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
@@ -128,29 +138,39 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <div>
-            <FormattedMessage
-              defaultMessage="A field associated with this object no longer exists in the index pattern."
-              id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
-              values={Object {}}
-            >
-              A field associated with this object no longer exists in the index pattern.
-            </FormattedMessage>
-          </div>
-          <div>
-            <FormattedMessage
-              defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="savedObjectsManagement.view.howToFixErrorDescription"
-              values={Object {}}
+          <EuiTextColor
+            color="default"
+            component="div"
+          >
+            <div
+              className="euiTextColor euiTextColor--default"
             >
-              If you know what this error means, go ahead and fix it — otherwise click the delete button above.
-            </FormattedMessage>
-          </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="A field associated with this object no longer exists in the index pattern."
+                  id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
+                  values={Object {}}
+                >
+                  A field associated with this object no longer exists in the index pattern.
+                </FormattedMessage>
+              </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
+                  id="savedObjectsManagement.view.howToFixErrorDescription"
+                  values={Object {}}
+                >
+                  If you know what this error means, go ahead and fix it — otherwise click the delete button above.
+                </FormattedMessage>
+              </div>
+            </div>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
@@ -207,29 +227,39 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <div>
-            <FormattedMessage
-              defaultMessage="The saved search associated with this object no longer exists."
-              id="savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage"
-              values={Object {}}
-            >
-              The saved search associated with this object no longer exists.
-            </FormattedMessage>
-          </div>
-          <div>
-            <FormattedMessage
-              defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="savedObjectsManagement.view.howToFixErrorDescription"
-              values={Object {}}
+          <EuiTextColor
+            color="default"
+            component="div"
+          >
+            <div
+              className="euiTextColor euiTextColor--default"
             >
-              If you know what this error means, go ahead and fix it — otherwise click the delete button above.
-            </FormattedMessage>
-          </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="The saved search associated with this object no longer exists."
+                  id="savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage"
+                  values={Object {}}
+                >
+                  The saved search associated with this object no longer exists.
+                </FormattedMessage>
+              </div>
+              <div>
+                <FormattedMessage
+                  defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
+                  id="savedObjectsManagement.view.howToFixErrorDescription"
+                  values={Object {}}
+                >
+                  If you know what this error means, go ahead and fix it — otherwise click the delete button above.
+                </FormattedMessage>
+              </div>
+            </div>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
@@ -286,21 +316,31 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          <div />
-          <div>
-            <FormattedMessage
-              defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="savedObjectsManagement.view.howToFixErrorDescription"
-              values={Object {}}
+          <EuiTextColor
+            color="default"
+            component="div"
+          >
+            <div
+              className="euiTextColor euiTextColor--default"
             >
-              If you know what this error means, go ahead and fix it — otherwise click the delete button above.
-            </FormattedMessage>
-          </div>
+              <div />
+              <div>
+                <FormattedMessage
+                  defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
+                  id="savedObjectsManagement.view.howToFixErrorDescription"
+                  values={Object {}}
+                >
+                  If you know what this error means, go ahead and fix it — otherwise click the delete button above.
+                </FormattedMessage>
+              </div>
+            </div>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index a68e8891b5ad1..bd97f2e6bffb1 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -2,6 +2,7 @@
 
 exports[`Flyout conflicts should allow conflict resolution 1`] = `
 <EuiFlyout
+  data-test-subj="importSavedObjectsFlyout"
   onClose={[MockFunction]}
   size="s"
 >
@@ -277,6 +278,7 @@ exports[`Flyout conflicts should allow conflict resolution 2`] = `
 
 exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
 <EuiFlyout
+  data-test-subj="importSavedObjectsFlyout"
   onClose={[MockFunction]}
   size="s"
 >
@@ -548,6 +550,7 @@ Array [
 
 exports[`Flyout should render import step 1`] = `
 <EuiFlyout
+  data-test-subj="importSavedObjectsFlyout"
   onClose={[MockFunction]}
   size="s"
 >
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index 62e0cd0504e8e..f6c8d5fb69408 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -960,7 +960,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     }
 
     return (
-      <EuiFlyout onClose={close} size="s">
+      <EuiFlyout onClose={close} size="s" data-test-subj="importSavedObjectsFlyout">
         <EuiFlyoutHeader hasBorder>
           <EuiTitle size="m">
             <h2>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/color_picker.test.tsx b/src/plugins/vis_type_timeseries/public/application/components/color_picker.test.tsx
index 8e975f9904256..50d3e8c38e389 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/color_picker.test.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/color_picker.test.tsx
@@ -36,7 +36,7 @@ describe('ColorPicker', () => {
     const props = { ...defaultProps, value: '#68BC00' };
     component = mount(<ColorPicker {...props} />);
     component.find('.tvbColorPicker button').simulate('click');
-    const input = findTestSubject(component, 'topColorPickerInput');
+    const input = findTestSubject(component, 'euiColorPickerInput_top');
     expect(input.props().value).toBe('#68BC00');
   });
 
@@ -44,7 +44,7 @@ describe('ColorPicker', () => {
     const props = { ...defaultProps, value: 'rgba(85,66,177,1)' };
     component = mount(<ColorPicker {...props} />);
     component.find('.tvbColorPicker button').simulate('click');
-    const input = findTestSubject(component, 'topColorPickerInput');
+    const input = findTestSubject(component, 'euiColorPickerInput_top');
     expect(input.props().value).toBe('85,66,177,1');
   });
 
diff --git a/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap b/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
index 25ec05c83a8c6..56e2cb1b60f3c 100644
--- a/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
+++ b/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
@@ -14,7 +14,7 @@ exports[`VisualizationNoResults should render according to snapshot 1`] = `
       data-euiicon-type="visualizeApp"
     />
     <div
-      class="euiSpacer euiSpacer--s"
+      class="euiSpacer euiSpacer--m"
     />
     <span
       class="euiTextColor euiTextColor--subdued"
diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts
index e71f6bb3ebfee..7a99e5832448f 100644
--- a/test/accessibility/apps/management.ts
+++ b/test/accessibility/apps/management.ts
@@ -82,6 +82,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('Edit field type', async () => {
       await PageObjects.settings.clickEditFieldFormat();
       await a11y.testAppSnapshot();
+      await PageObjects.settings.clickCloseEditFieldFormatFlyout();
     });
 
     it('Advanced settings', async () => {
diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index 0278955c577a1..6ef0bfd5a09e8 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -419,14 +419,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'index-pattern-test-1'
         );
 
-        await testSubjects.click('pagination-button-next');
+        const flyout = await testSubjects.find('importSavedObjectsFlyout');
+
+        await (await flyout.findByTestSubject('pagination-button-next')).click();
 
         await PageObjects.savedObjects.setOverriddenIndexPatternValue(
           'missing-index-pattern-7',
           'index-pattern-test-2'
         );
 
-        await testSubjects.click('pagination-button-previous');
+        await (await flyout.findByTestSubject('pagination-button-previous')).click();
 
         const selectedIdForMissingIndexPattern1 = await testSubjects.getAttribute(
           'managementChangeIndexSelection-missing-index-pattern-1',
@@ -435,7 +437,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
         expect(selectedIdForMissingIndexPattern1).to.eql('f1e4c910-a2e6-11e7-bb30-233be9be6a20');
 
-        await testSubjects.click('pagination-button-next');
+        await (await flyout.findByTestSubject('pagination-button-next')).click();
 
         const selectedIdForMissingIndexPattern7 = await testSubjects.getAttribute(
           'managementChangeIndexSelection-missing-index-pattern-7',
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 88951bb04c956..cb8f198177017 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -739,6 +739,10 @@ export class SettingsPageObject extends FtrService {
     await this.testSubjects.click('editFieldFormat');
   }
 
+  async clickCloseEditFieldFormatFlyout() {
+    await this.testSubjects.click('euiFlyoutCloseButton');
+  }
+
   async associateIndexPattern(oldIndexPatternId: string, newIndexPatternTitle: string) {
     await this.find.clickByCssSelector(
       `select[data-test-subj="managementChangeIndexSelection-${oldIndexPatternId}"] >
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 6e263dd1cdbbf..7f1ea64bcd979 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -563,7 +563,7 @@ export class VisualBuilderPageObject extends FtrService {
 
   public async checkColorPickerPopUpIsPresent(): Promise<void> {
     this.log.debug(`Check color picker popup is present`);
-    await this.testSubjects.existOrFail('colorPickerPopover', { timeout: 5000 });
+    await this.testSubjects.existOrFail('euiColorPickerPopover', { timeout: 5000 });
   }
 
   public async changePanelPreview(nth: number = 0): Promise<void> {
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx
index 8549f09bba248..09fbf07b8ecbd 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx
@@ -5,10 +5,21 @@
  * 2.0.
  */
 
+import { ReactNode } from 'react';
+import { StyledComponent } from 'styled-components';
 import { EuiFlyout } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import {
+  euiStyled,
+  EuiTheme,
+} from '../../../../../../../../../../src/plugins/kibana_react/common';
 
-export const ResponsiveFlyout = euiStyled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+export const ResponsiveFlyout: StyledComponent<
+  typeof EuiFlyout,
+  EuiTheme,
+  { children?: ReactNode }
+> = euiStyled(EuiFlyout)`
   width: 100%;
 
   @media (min-width: 800px) {
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 34b6b333f3ef5..d567d3cf85f13 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -116,20 +116,13 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
                 size="xxl"
               />
               <div
-                className="euiSpacer euiSpacer--s"
+                className="euiSpacer euiSpacer--m"
               />
-              <span
-                className="euiTextColor euiTextColor--subdued"
+              <h2
+                className="euiTitle euiTitle--xsmall"
               >
-                <h2
-                  className="euiTitle euiTitle--xsmall"
-                >
-                  Import your assets to get started
-                </h2>
-                <div
-                  className="euiSpacer euiSpacer--m"
-                />
-              </span>
+                Import your assets to get started
+              </h2>
             </div>
           </div>
         </div>
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
index 18f86aca24302..dc66eef809050 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
@@ -80,7 +80,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        aria-describedby="generated-id-help"
+                        aria-describedby="generated-id-help-0"
                         className="euiFieldText canvasCustomElementForm__name"
                         data-test-subj="canvasCustomElementForm-name"
                         id="generated-id"
@@ -95,7 +95,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   </div>
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     40 characters remaining
                   </div>
@@ -119,7 +119,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   className="euiFormRow__fieldWrapper"
                 >
                   <textarea
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiTextArea euiTextArea--resizeVertical"
                     data-test-subj="canvasCustomElementForm-description"
                     id="generated-id"
@@ -131,7 +131,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   />
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     83 characters remaining
                   </div>
@@ -389,7 +389,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        aria-describedby="generated-id-help"
+                        aria-describedby="generated-id-help-0"
                         className="euiFieldText canvasCustomElementForm__name"
                         data-test-subj="canvasCustomElementForm-name"
                         id="generated-id"
@@ -404,7 +404,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   </div>
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     40 characters remaining
                   </div>
@@ -428,7 +428,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   className="euiFormRow__fieldWrapper"
                 >
                   <textarea
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiTextArea euiTextArea--resizeVertical"
                     data-test-subj="canvasCustomElementForm-description"
                     id="generated-id"
@@ -440,7 +440,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   />
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     100 characters remaining
                   </div>
@@ -695,7 +695,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        aria-describedby="generated-id-help"
+                        aria-describedby="generated-id-help-0"
                         className="euiFieldText canvasCustomElementForm__name"
                         data-test-subj="canvasCustomElementForm-name"
                         id="generated-id"
@@ -710,7 +710,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   </div>
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     32 characters remaining
                   </div>
@@ -734,7 +734,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   className="euiFormRow__fieldWrapper"
                 >
                   <textarea
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiTextArea euiTextArea--resizeVertical"
                     data-test-subj="canvasCustomElementForm-description"
                     id="generated-id"
@@ -746,7 +746,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   />
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     100 characters remaining
                   </div>
@@ -996,7 +996,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        aria-describedby="generated-id-help"
+                        aria-describedby="generated-id-help-0"
                         className="euiFieldText canvasCustomElementForm__name"
                         data-test-subj="canvasCustomElementForm-name"
                         id="generated-id"
@@ -1011,7 +1011,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   </div>
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     40 characters remaining
                   </div>
@@ -1035,7 +1035,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   className="euiFormRow__fieldWrapper"
                 >
                   <textarea
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiTextArea euiTextArea--resizeVertical"
                     data-test-subj="canvasCustomElementForm-description"
                     id="generated-id"
@@ -1047,7 +1047,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   />
                   <div
                     className="euiFormHelpText euiFormRow__text"
-                    id="generated-id-help"
+                    id="generated-id-help-0"
                   >
                     100 characters remaining
                   </div>
diff --git a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
index 6d170d78dd01d..836047959caee 100644
--- a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
@@ -39,9 +39,13 @@ exports[`Storyshots components/datasource/DatasourceComponent datasource with ex
     <div
       className="euiText euiText--small"
     >
-      <p>
-        The datasource has an argument controlled by an expression. Use the expression editor to modify the datasource.
-      </p>
+      <div
+        className="euiTextColor euiTextColor--default"
+      >
+        <p>
+          The datasource has an argument controlled by an expression. Use the expression editor to modify the datasource.
+        </p>
+      </div>
     </div>
   </div>
 </div>
diff --git a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
index 5e833944046a4..bc6430c4c0357 100644
--- a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
@@ -2,1103 +2,1088 @@
 
 exports[`Storyshots components/KeyboardShortcutsDoc default 1`] = `
 <div
-  data-eui="EuiFocusTrap"
+  data-eui="EuiFlyout"
+  role="dialog"
 >
+  <button
+    data-test-subj="euiFlyoutCloseButton"
+    onClick={[Function]}
+    type="button"
+  />
   <div
-    className="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
-    role="dialog"
-    tabIndex={0}
+    className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
   >
-    <button
-      aria-label="Closes keyboard shortcuts reference"
-      className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-      data-test-subj="euiFlyoutCloseButton"
-      disabled={false}
-      onClick={[Function]}
-      type="button"
+    <h2
+      className="euiTitle euiTitle--small"
     >
-      <span
-        aria-hidden="true"
-        className="euiButtonIcon__icon"
-        color="inherit"
-        data-euiicon-type="cross"
-        size="m"
-      />
-    </button>
-    <div
-      className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-    >
-      <h2
-        className="euiTitle euiTitle--small"
-      >
-        Keyboard shortcuts
-      </h2>
-    </div>
+      Keyboard shortcuts
+    </h2>
+  </div>
+  <div
+    className="euiFlyoutBody"
+  >
     <div
-      className="euiFlyoutBody"
+      className="euiFlyoutBody__overflow"
+      tabIndex={0}
     >
       <div
-        className="euiFlyoutBody__overflow"
+        className="euiFlyoutBody__overflowContent"
       >
         <div
-          className="euiFlyoutBody__overflowContent"
+          className="canvasKeyboardShortcut"
         >
-          <div
-            className="canvasKeyboardShortcut"
+          <h4
+            className="euiTitle euiTitle--xsmall"
+          >
+            Element controls
+          </h4>
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+          />
+          <dl
+            className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
           >
-            <h4
-              className="euiTitle euiTitle--xsmall"
-            >
-              Element controls
-            </h4>
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-            />
-            <dl
-              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-            >
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Cut
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      X
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Copy
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      C
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Paste
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      V
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Clone
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      D
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Delete
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      DEL
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      BACKSPACE
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Bring to front
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↑
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Bring forward
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↑
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Send backward
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↓
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Send to back
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↓
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Group
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      G
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Ungroup
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      U
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift up by 10px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ↑
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift down by 10px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ↓
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift left by 10px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ←
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift right by 10px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      →
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift up by 1px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↑
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift down by 1px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ↓
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift left by 1px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ←
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Shift right by 1px
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      →
-                    </code>
-                  </span>
-                </span>
-              </dd>
-            </dl>
-            <div
-              className="euiSpacer euiSpacer--l"
-            />
-          </div>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Cut
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    X
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Copy
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    C
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Paste
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    V
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Clone
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    D
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Delete
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    DEL
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    BACKSPACE
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Bring to front
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↑
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Bring forward
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↑
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Send backward
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↓
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Send to back
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↓
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Group
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    G
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Ungroup
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    U
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift up by 10px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ↑
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift down by 10px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ↓
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift left by 10px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ←
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift right by 10px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    →
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift up by 1px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↑
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift down by 1px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ↓
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift left by 1px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ←
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Shift right by 1px
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    →
+                  </code>
+                </span>
+              </span>
+            </dd>
+          </dl>
           <div
-            className="canvasKeyboardShortcut"
+            className="euiSpacer euiSpacer--l"
+          />
+        </div>
+        <div
+          className="canvasKeyboardShortcut"
+        >
+          <h4
+            className="euiTitle euiTitle--xsmall"
+          >
+            Expression controls
+          </h4>
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+          />
+          <dl
+            className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
           >
-            <h4
-              className="euiTitle euiTitle--xsmall"
-            >
-              Expression controls
-            </h4>
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-            />
-            <dl
-              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-            >
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Run whole expression
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ENTER
-                    </code>
-                  </span>
-                </span>
-              </dd>
-            </dl>
-            <div
-              className="euiSpacer euiSpacer--l"
-            />
-          </div>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Run whole expression
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ENTER
+                  </code>
+                </span>
+              </span>
+            </dd>
+          </dl>
           <div
-            className="canvasKeyboardShortcut"
+            className="euiSpacer euiSpacer--l"
+          />
+        </div>
+        <div
+          className="canvasKeyboardShortcut"
+        >
+          <h4
+            className="euiTitle euiTitle--xsmall"
           >
-            <h4
-              className="euiTitle euiTitle--xsmall"
-            >
-              Editor controls
-            </h4>
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-            />
-            <dl
-              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-            >
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Select multiple elements
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      CLICK
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Resize from center
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      DRAG
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Move, resize, and rotate without snapping
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      DRAG
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Select element below
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      CLICK
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Undo last action
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      Z
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Redo last action
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      SHIFT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      Z
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Go to previous page
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      [
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Go to next page
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ]
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Toggle edit mode
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      E
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Show grid
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      G
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Refresh workpad
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      R
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Zoom in
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      +
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Zoom out
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      -
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Reset zoom to 100%
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      CTRL
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      [
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Enter presentation mode
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      F
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      P
-                    </code>
-                  </span>
-                </span>
-              </dd>
-            </dl>
-            <div
-              className="euiSpacer euiSpacer--l"
-            />
-          </div>
+            Editor controls
+          </h4>
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+          />
+          <dl
+            className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
+          >
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Select multiple elements
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    CLICK
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Resize from center
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    DRAG
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Move, resize, and rotate without snapping
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    DRAG
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Select element below
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    CLICK
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Undo last action
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    Z
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Redo last action
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    SHIFT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    Z
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Go to previous page
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    [
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Go to next page
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ]
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Toggle edit mode
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    E
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Show grid
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    G
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Refresh workpad
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    R
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Zoom in
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    +
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Zoom out
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    -
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Reset zoom to 100%
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    CTRL
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    [
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Enter presentation mode
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    F
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    P
+                  </code>
+                </span>
+              </span>
+            </dd>
+          </dl>
           <div
-            className="canvasKeyboardShortcut"
+            className="euiSpacer euiSpacer--l"
+          />
+        </div>
+        <div
+          className="canvasKeyboardShortcut"
+        >
+          <h4
+            className="euiTitle euiTitle--xsmall"
+          >
+            Presentation controls
+          </h4>
+          <hr
+            className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+          />
+          <dl
+            className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
           >
-            <h4
-              className="euiTitle euiTitle--xsmall"
-            >
-              Presentation controls
-            </h4>
-            <hr
-              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-            />
-            <dl
-              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-            >
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Enter presentation mode
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      F
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      P
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Exit presentation mode
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ESC
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Go to previous page
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      [
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      BACKSPACE
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      ←
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Go to next page
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      ]
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      SPACE
-                    </code>
-                  </span>
-                </span>
-                <span>
-                   
-                  or
-                   
-                </span>
-                <span>
-                  <span>
-                    <code>
-                      →
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Refresh workpad
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      ALT
-                    </code>
-                  </span>
-                   
-                  <span>
-                    <code>
-                      R
-                    </code>
-                  </span>
-                </span>
-              </dd>
-              <dt
-                className="euiDescriptionList__title"
-              >
-                Toggle page cycling
-              </dt>
-              <dd
-                className="euiDescriptionList__description"
-              >
-                <span>
-                  <span>
-                    <code>
-                      P
-                    </code>
-                  </span>
-                </span>
-              </dd>
-            </dl>
-            <div
-              className="euiSpacer euiSpacer--l"
-            />
-          </div>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Enter presentation mode
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    F
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    P
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Exit presentation mode
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ESC
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Go to previous page
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    [
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    BACKSPACE
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    ←
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Go to next page
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    ]
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    SPACE
+                  </code>
+                </span>
+              </span>
+              <span>
+                 
+                or
+                 
+              </span>
+              <span>
+                <span>
+                  <code>
+                    →
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Refresh workpad
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    ALT
+                  </code>
+                </span>
+                 
+                <span>
+                  <code>
+                    R
+                  </code>
+                </span>
+              </span>
+            </dd>
+            <dt
+              className="euiDescriptionList__title"
+            >
+              Toggle page cycling
+            </dt>
+            <dd
+              className="euiDescriptionList__description"
+            >
+              <span>
+                <span>
+                  <code>
+                    P
+                  </code>
+                </span>
+              </span>
+            </dd>
+          </dl>
+          <div
+            className="euiSpacer euiSpacer--l"
+          />
         </div>
       </div>
     </div>
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index bbf8b5dcca896..6cd18b83c3351 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -94,16 +94,16 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
               size="xxl"
             />
             <div
-              className="euiSpacer euiSpacer--s"
+              className="euiSpacer euiSpacer--m"
             />
+            <h2
+              className="euiTitle euiTitle--small"
+            >
+              Add new elements
+            </h2>
             <span
               className="euiTextColor euiTextColor--subdued"
             >
-              <h2
-                className="euiTitle euiTitle--small"
-              >
-                Add new elements
-              </h2>
               <div
                 className="euiSpacer euiSpacer--m"
               />
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
index 010037bee4a0f..75ee0fcae78f3 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
@@ -37,7 +37,7 @@ exports[`Storyshots components/WorkpadHeader/ShareMenu/PDFPanel default 1`] = `
         >
           <button
             aria-checked={false}
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             aria-labelledby="generated-id"
             className="euiSwitch__button"
             data-test-subj="reportModeToggle"
@@ -80,7 +80,7 @@ exports[`Storyshots components/WorkpadHeader/ShareMenu/PDFPanel default 1`] = `
         </div>
         <div
           className="euiFormHelpText euiFormRow__text"
-          id="generated-id-help"
+          id="generated-id-help-0"
         >
           Remove borders and footer logo
         </div>
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
index 621a6bb211fe9..27f0d3610fb9f 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
@@ -294,7 +294,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  aria-describedby="generated-id-help"
+                                  aria-describedby="generated-id-help-0"
                                   class="euiFieldText euiFieldText--compressed"
                                   id="generated-id"
                                   type="text"
@@ -304,7 +304,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                             </div>
                             <div
                               class="euiFormHelpText euiFormRow__text"
-                              id="generated-id-help"
+                              id="generated-id-help-0"
                             >
                               Use shorthand notation, like 30s, 10m, or 1h
                             </div>
@@ -585,7 +585,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                       >
                         <button
                           aria-checked="false"
-                          aria-describedby="generated-id-help"
+                          aria-describedby="generated-id-help-0"
                           aria-labelledby="generated-id"
                           class="euiSwitch__button"
                           data-test-subj="hideToolbarSwitch"
@@ -623,7 +623,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                       </div>
                       <div
                         class="euiFormHelpText euiFormRow__text"
-                        id="generated-id-help"
+                        id="generated-id-help-0"
                       >
                         Hide the toolbar when the mouse is not within the Canvas?
                       </div>
@@ -640,4 +640,4 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--top\\" tabindex=\\"0\\" aria-live=\\"off\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><p id=\\"generated-id\\" class=\\"euiScreenReaderOnly\\">You are in a dialog. To close this dialog, hit escape.</p><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiContextMenuPanelTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Auto Play</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Toolbar</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><span data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></span><span data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></span></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--top\\" tabindex=\\"0\\" aria-live=\\"off\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><p id=\\"generated-id\\" class=\\"euiScreenReaderOnly\\">You are in a dialog. To close this dialog, hit escape.</p><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiContextMenuPanelTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Auto Play</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Toolbar</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help-0\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><span data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></span><span data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></span></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help-0\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
index f5823874db73e..b32ae3fc2f49f 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
@@ -101,7 +101,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
                   className="euiFormControlLayout__childrenWrapper"
                 >
                   <input
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
@@ -114,7 +114,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
               </div>
               <div
                 className="euiFormHelpText euiFormRow__text"
-                id="generated-id-help"
+                id="generated-id-help-0"
               >
                 Use shorthand notation, like 30s, 10m, or 1h
               </div>
@@ -264,7 +264,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
                   className="euiFormControlLayout__childrenWrapper"
                 >
                   <input
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
@@ -277,7 +277,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
               </div>
               <div
                 className="euiFormHelpText euiFormRow__text"
-                id="generated-id-help"
+                id="generated-id-help-0"
               >
                 Use shorthand notation, like 30s, 10m, or 1h
               </div>
@@ -427,7 +427,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
                   className="euiFormControlLayout__childrenWrapper"
                 >
                   <input
-                    aria-describedby="generated-id-help"
+                    aria-describedby="generated-id-help-0"
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
@@ -440,7 +440,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
               </div>
               <div
                 className="euiFormHelpText euiFormRow__text"
-                id="generated-id-help"
+                id="generated-id-help-0"
               >
                 Use shorthand notation, like 30s, 10m, or 1h
               </div>
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
index a8a3f584bbf51..1aafb9cc6b664 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
@@ -34,7 +34,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: off 1`
         >
           <button
             aria-checked={false}
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             aria-labelledby="generated-id"
             className="euiSwitch__button"
             data-test-subj="hideToolbarSwitch"
@@ -78,7 +78,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: off 1`
         </div>
         <div
           className="euiFormHelpText euiFormRow__text"
-          id="generated-id-help"
+          id="generated-id-help-0"
         >
           Hide the toolbar when the mouse is not within the Canvas?
         </div>
@@ -122,7 +122,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: on 1`]
         >
           <button
             aria-checked={true}
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             aria-labelledby="generated-id"
             className="euiSwitch__button"
             data-test-subj="hideToolbarSwitch"
@@ -166,7 +166,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: on 1`]
         </div>
         <div
           className="euiFormHelpText euiFormRow__text"
-          id="generated-id-help"
+          id="generated-id-help-0"
         >
           Hide the toolbar when the mouse is not within the Canvas?
         </div>
@@ -210,7 +210,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings contextual 1`] =
         >
           <button
             aria-checked={false}
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             aria-labelledby="generated-id"
             className="euiSwitch__button"
             data-test-subj="hideToolbarSwitch"
@@ -254,7 +254,7 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings contextual 1`] =
         </div>
         <div
           className="euiFormHelpText euiFormRow__text"
-          id="generated-id-help"
+          id="generated-id-help-0"
         >
           Hide the toolbar when the mouse is not within the Canvas?
         </div>
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
index 238cdcc2f8d9e..6c9df5cf2eba7 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
@@ -64,7 +64,7 @@ export const FilebeatConfigFlyout: FC<Props> = ({
   }, [username, index, ingestPipelineId, results]);
 
   return (
-    <EuiFlyout onClose={closeFlyout} hideCloseButton size={'m'}>
+    <EuiFlyout onClose={closeFlyout} hideCloseButton size={'m'} ownFocus={false}>
       <EuiFlyoutBody>
         <EuiFlexGroup>
           <Contents value={fileBeatConfig} username={username} index={index} />
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
index 36496b83b3123..3f6863175e29b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
@@ -43,7 +43,6 @@ export const PrivateSourcesSidebar = () => {
   return (
     <>
       <ViewContentHeader title={PAGE_TITLE} description={PAGE_DESCRIPTION} />
-      {/* @ts-expect-error: TODO, uncomment this once EUI 34.x lands in Kibana & `mobileBreakpoints` is a valid prop */}
       {id && <EuiSideNav items={navItems} mobileBreakpoints={[]} />}
     </>
   );
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/components/create_agent_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/components/create_agent_policy.tsx
index 33dbbb25c5d42..5992888564e7f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/components/create_agent_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/components/create_agent_policy.tsx
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
+import type { ReactNode } from 'react';
 import React, { useState } from 'react';
+import type { StyledComponent } from 'styled-components';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -29,7 +31,13 @@ import type { NewAgentPolicy, AgentPolicy } from '../../../../types';
 import { useCapabilities, useStartServices, sendCreateAgentPolicy } from '../../../../hooks';
 import { AgentPolicyForm, agentPolicyFormValidation } from '../../components';
 
-const FlyoutWithHigherZIndex = styled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+const FlyoutWithHigherZIndex: StyledComponent<
+  typeof EuiFlyout,
+  {},
+  { children?: ReactNode }
+> = styled(EuiFlyout)`
   z-index: ${(props) => props.theme.eui.euiZLevel5};
 `;
 
@@ -39,6 +47,7 @@ interface Props extends EuiFlyoutProps {
 
 export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
   onClose,
+  as,
   ...restOfProps
 }) => {
   const { notifications } = useStartServices();
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
index 6254a6512efb5..9595009347259 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
@@ -314,89 +314,99 @@ exports[`extend index management ilm summary extension should return extension w
         </span>
       </div>
       <EuiText
+        color="default"
         size="s"
       >
         <div
           className="euiText euiText--small"
         >
-          illegal_argument_exception
-          : 
-          setting [index.lifecycle.rollover_alias] for index [testy3] is empty or not defined
-          <EuiSpacer
-            size="s"
+          <EuiTextColor
+            color="default"
+            component="div"
           >
             <div
-              className="euiSpacer euiSpacer--s"
-            />
-          </EuiSpacer>
-          <EuiPopover
-            anchorPosition="downCenter"
-            button={
-              <EuiButtonEmpty
-                onClick={[Function]}
+              className="euiTextColor euiTextColor--default"
+            >
+              illegal_argument_exception
+              : 
+              setting [index.lifecycle.rollover_alias] for index [testy3] is empty or not defined
+              <EuiSpacer
+                size="s"
               >
-                <FormattedMessage
-                  defaultMessage="Stack trace"
-                  id="xpack.indexLifecycleMgmt.indexLifecycleMgmtSummary.stackTraceButton"
-                  values={Object {}}
+                <div
+                  className="euiSpacer euiSpacer--s"
                 />
-              </EuiButtonEmpty>
-            }
-            closePopover={[Function]}
-            display="inlineBlock"
-            hasArrow={true}
-            id="stackPopover"
-            isOpen={false}
-            ownFocus={true}
-            panelPaddingSize="m"
-          >
-            <div
-              className="euiPopover euiPopover--anchorDownCenter"
-              id="stackPopover"
-            >
-              <div
-                className="euiPopover__anchor"
+              </EuiSpacer>
+              <EuiPopover
+                anchorPosition="downCenter"
+                button={
+                  <EuiButtonEmpty
+                    onClick={[Function]}
+                  >
+                    <FormattedMessage
+                      defaultMessage="Stack trace"
+                      id="xpack.indexLifecycleMgmt.indexLifecycleMgmtSummary.stackTraceButton"
+                      values={Object {}}
+                    />
+                  </EuiButtonEmpty>
+                }
+                closePopover={[Function]}
+                display="inlineBlock"
+                hasArrow={true}
+                id="stackPopover"
+                isOpen={false}
+                ownFocus={true}
+                panelPaddingSize="m"
               >
-                <EuiButtonEmpty
-                  onClick={[Function]}
+                <div
+                  className="euiPopover euiPopover--anchorDownCenter"
+                  id="stackPopover"
                 >
-                  <button
-                    className="euiButtonEmpty euiButtonEmpty--primary"
-                    disabled={false}
-                    onClick={[Function]}
-                    type="button"
+                  <div
+                    className="euiPopover__anchor"
                   >
-                    <EuiButtonContent
-                      className="euiButtonEmpty__content"
-                      iconSide="left"
-                      iconSize="m"
-                      textProps={
-                        Object {
-                          "className": "euiButtonEmpty__text",
-                        }
-                      }
+                    <EuiButtonEmpty
+                      onClick={[Function]}
                     >
-                      <span
-                        className="euiButtonContent euiButtonEmpty__content"
+                      <button
+                        className="euiButtonEmpty euiButtonEmpty--primary"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
                       >
-                        <span
-                          className="euiButtonEmpty__text"
+                        <EuiButtonContent
+                          className="euiButtonEmpty__content"
+                          iconSide="left"
+                          iconSize="m"
+                          textProps={
+                            Object {
+                              "className": "euiButtonEmpty__text",
+                            }
+                          }
                         >
-                          <FormattedMessage
-                            defaultMessage="Stack trace"
-                            id="xpack.indexLifecycleMgmt.indexLifecycleMgmtSummary.stackTraceButton"
-                            values={Object {}}
+                          <span
+                            className="euiButtonContent euiButtonEmpty__content"
                           >
-                            Stack trace
-                          </FormattedMessage>
-                        </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonEmpty>
-              </div>
+                            <span
+                              className="euiButtonEmpty__text"
+                            >
+                              <FormattedMessage
+                                defaultMessage="Stack trace"
+                                id="xpack.indexLifecycleMgmt.indexLifecycleMgmtSummary.stackTraceButton"
+                                values={Object {}}
+                              >
+                                Stack trace
+                              </FormattedMessage>
+                            </span>
+                          </span>
+                        </EuiButtonContent>
+                      </button>
+                    </EuiButtonEmpty>
+                  </div>
+                </div>
+              </EuiPopover>
             </div>
-          </EuiPopover>
+          </EuiTextColor>
         </div>
       </EuiText>
     </div>
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
index 556ac35d0565e..4d2b47c8a6039 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
@@ -58,16 +58,16 @@ exports[`policy table should show empty state when there are not any policies 1`
       data-euiicon-type="managementApp"
     />
     <div
-      class="euiSpacer euiSpacer--s"
+      class="euiSpacer euiSpacer--m"
     />
+    <h1
+      class="euiTitle euiTitle--medium"
+    >
+      Create your first index lifecycle policy
+    </h1>
     <span
       class="euiTextColor euiTextColor--subdued"
     >
-      <h1
-        class="euiTitle euiTitle--medium"
-      >
-        Create your first index lifecycle policy
-      </h1>
       <div
         class="euiSpacer euiSpacer--m"
       />
@@ -82,9 +82,6 @@ exports[`policy table should show empty state when there are not any policies 1`
     <div
       class="euiSpacer euiSpacer--l"
     />
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
     <button
       class="euiButton euiButton--primary euiButton--fill"
       data-test-subj="createPolicyButton"
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
index 972ef99d7d7f6..4a34bd030429e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import { shallow } from 'enzyme';
+import { ReactWrapper, shallow } from 'enzyme';
+import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test/jest';
 import { EuiDataGrid } from '@elastic/eui';
 import { IAggType, IFieldFormat } from 'src/plugins/data/public';
@@ -83,6 +84,13 @@ function copyData(data: LensMultiTable): LensMultiTable {
   return JSON.parse(JSON.stringify(data));
 }
 
+async function waitForWrapperUpdate(wrapper: ReactWrapper) {
+  await act(async () => {
+    await new Promise((r) => setTimeout(r, 0));
+  });
+  wrapper.update();
+}
+
 describe('DatatableComponent', () => {
   let onDispatchEvent: jest.Mock;
 
@@ -149,7 +157,7 @@ describe('DatatableComponent', () => {
     ).toMatchSnapshot();
   });
 
-  test('it invokes executeTriggerActions with correct context on click on top value', () => {
+  test('it invokes executeTriggerActions with correct context on click on top value', async () => {
     const { args, data } = sampleArgs();
 
     const wrapper = mountWithIntl(
@@ -173,6 +181,8 @@ describe('DatatableComponent', () => {
 
     wrapper.find('[data-test-subj="dataGridRowCell"]').first().simulate('focus');
 
+    await waitForWrapperUpdate(wrapper);
+
     wrapper.find('[data-test-subj="lensDatatableFilterOut"]').first().simulate('click');
 
     expect(onDispatchEvent).toHaveBeenCalledWith({
@@ -192,7 +202,7 @@ describe('DatatableComponent', () => {
     });
   });
 
-  test('it invokes executeTriggerActions with correct context on click on timefield', () => {
+  test('it invokes executeTriggerActions with correct context on click on timefield', async () => {
     const { args, data } = sampleArgs();
 
     const wrapper = mountWithIntl(
@@ -216,6 +226,8 @@ describe('DatatableComponent', () => {
 
     wrapper.find('[data-test-subj="dataGridRowCell"]').at(1).simulate('focus');
 
+    await waitForWrapperUpdate(wrapper);
+
     wrapper.find('[data-test-subj="lensDatatableFilterFor"]').first().simulate('click');
 
     expect(onDispatchEvent).toHaveBeenCalledWith({
@@ -235,7 +247,7 @@ describe('DatatableComponent', () => {
     });
   });
 
-  test('it invokes executeTriggerActions with correct context on click on timefield from range', () => {
+  test('it invokes executeTriggerActions with correct context on click on timefield from range', async () => {
     const data: LensMultiTable = {
       type: 'lens_multitable',
       tables: {
@@ -298,6 +310,8 @@ describe('DatatableComponent', () => {
 
     wrapper.find('[data-test-subj="dataGridRowCell"]').at(0).simulate('focus');
 
+    await waitForWrapperUpdate(wrapper);
+
     wrapper.find('[data-test-subj="lensDatatableFilterFor"]').first().simulate('click');
 
     expect(onDispatchEvent).toHaveBeenCalledWith({
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 29ec3ddbfdc02..45e7055f4db2b 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -1417,19 +1417,29 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                               </span>
                             </div>
                             <EuiText
+                              color="default"
                               size="s"
                             >
                               <div
                                 className="euiText euiText--small"
                               >
-                                <ul>
-                                  <li
-                                    className="euiForm__error"
-                                    key="0"
+                                <EuiTextColor
+                                  color="default"
+                                  component="div"
+                                >
+                                  <div
+                                    className="euiTextColor euiTextColor--default"
                                   >
-                                    The supplied license has expired.
-                                  </li>
-                                </ul>
+                                    <ul>
+                                      <li
+                                        className="euiForm__error"
+                                        key="0"
+                                      >
+                                        The supplied license has expired.
+                                      </li>
+                                    </ul>
+                                  </div>
+                                </EuiTextColor>
                               </div>
                             </EuiText>
                           </div>
@@ -2149,19 +2159,29 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                               </span>
                             </div>
                             <EuiText
+                              color="default"
                               size="s"
                             >
                               <div
                                 className="euiText euiText--small"
                               >
-                                <ul>
-                                  <li
-                                    className="euiForm__error"
-                                    key="0"
+                                <EuiTextColor
+                                  color="default"
+                                  component="div"
+                                >
+                                  <div
+                                    className="euiTextColor euiTextColor--default"
                                   >
-                                    The supplied license is not valid for this product.
-                                  </li>
-                                </ul>
+                                    <ul>
+                                      <li
+                                        className="euiForm__error"
+                                        key="0"
+                                      >
+                                        The supplied license is not valid for this product.
+                                      </li>
+                                    </ul>
+                                  </div>
+                                </EuiTextColor>
                               </div>
                             </EuiText>
                           </div>
@@ -2881,19 +2901,29 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                               </span>
                             </div>
                             <EuiText
+                              color="default"
                               size="s"
                             >
                               <div
                                 className="euiText euiText--small"
                               >
-                                <ul>
-                                  <li
-                                    className="euiForm__error"
-                                    key="0"
+                                <EuiTextColor
+                                  color="default"
+                                  component="div"
+                                >
+                                  <div
+                                    className="euiTextColor euiTextColor--default"
                                   >
-                                    Error encountered uploading license: Check your license file.
-                                  </li>
-                                </ul>
+                                    <ul>
+                                      <li
+                                        className="euiForm__error"
+                                        key="0"
+                                      >
+                                        Error encountered uploading license: Check your license file.
+                                      </li>
+                                    </ul>
+                                  </div>
+                                </EuiTextColor>
                               </div>
                             </EuiText>
                           </div>
@@ -3613,19 +3643,29 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                               </span>
                             </div>
                             <EuiText
+                              color="default"
                               size="s"
                             >
                               <div
                                 className="euiText euiText--small"
                               >
-                                <ul>
-                                  <li
-                                    className="euiForm__error"
-                                    key="0"
+                                <EuiTextColor
+                                  color="default"
+                                  component="div"
+                                >
+                                  <div
+                                    className="euiTextColor euiTextColor--default"
                                   >
-                                    Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
-                                  </li>
-                                </ul>
+                                    <ul>
+                                      <li
+                                        className="euiForm__error"
+                                        key="0"
+                                      >
+                                        Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
+                                      </li>
+                                    </ul>
+                                  </div>
+                                </EuiTextColor>
                               </div>
                             </EuiText>
                           </div>
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
index d24ec2126aee8..766f1bda64d5e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
@@ -22,7 +22,6 @@ import {
   EuiFlyoutHeader,
   EuiForm,
   EuiFormRow,
-  EuiOverlayMask,
   EuiSelect,
   EuiTitle,
 } from '@elastic/eui';
@@ -129,188 +128,180 @@ export const EditActionFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }
   };
 
   return (
-    <EuiOverlayMask>
-      <EuiFlyout
-        onClose={closeFlyout}
-        hideCloseButton
-        aria-labelledby="analyticsEditFlyoutTitle"
-        data-test-subj="mlAnalyticsEditFlyout"
-      >
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            <h2 id="analyticsEditFlyoutTitle">
-              {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutTitle', {
-                defaultMessage: 'Edit {jobId}',
-                values: {
-                  jobId,
-                },
-              })}
-            </h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody>
-          <EuiForm>
-            <EuiFormRow
-              label={i18n.translate(
-                'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartLabel',
+    <EuiFlyout
+      onClose={closeFlyout}
+      hideCloseButton
+      aria-labelledby="analyticsEditFlyoutTitle"
+      data-test-subj="mlAnalyticsEditFlyout"
+    >
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="analyticsEditFlyoutTitle">
+            {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutTitle', {
+              defaultMessage: 'Edit {jobId}',
+              values: {
+                jobId,
+              },
+            })}
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiForm>
+          <EuiFormRow
+            label={i18n.translate(
+              'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartLabel',
+              {
+                defaultMessage: 'Allow lazy start',
+              }
+            )}
+          >
+            <EuiSelect
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartAriaLabel',
                 {
-                  defaultMessage: 'Allow lazy start',
+                  defaultMessage: 'Update allow lazy start.',
                 }
               )}
-            >
-              <EuiSelect
-                aria-label={i18n.translate(
-                  'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartAriaLabel',
-                  {
-                    defaultMessage: 'Update allow lazy start.',
-                  }
-                )}
-                data-test-subj="mlAnalyticsEditFlyoutAllowLazyStartInput"
-                options={[
-                  {
-                    value: 'true',
-                    text: i18n.translate(
-                      'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartTrueValue',
-                      {
-                        defaultMessage: 'True',
-                      }
-                    ),
-                  },
-                  {
-                    value: 'false',
-                    text: i18n.translate(
-                      'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartFalseValue',
-                      {
-                        defaultMessage: 'False',
-                      }
-                    ),
-                  },
-                ]}
-                value={allowLazyStart}
-                onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
-                  setAllowLazyStart(e.target.value)
-                }
-              />
-            </EuiFormRow>
-            <EuiFormRow
-              label={i18n.translate(
-                'xpack.ml.dataframe.analyticsList.editFlyout.descriptionLabel',
+              data-test-subj="mlAnalyticsEditFlyoutAllowLazyStartInput"
+              options={[
                 {
-                  defaultMessage: 'Description',
+                  value: 'true',
+                  text: i18n.translate(
+                    'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartTrueValue',
+                    {
+                      defaultMessage: 'True',
+                    }
+                  ),
+                },
+                {
+                  value: 'false',
+                  text: i18n.translate(
+                    'xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartFalseValue',
+                    {
+                      defaultMessage: 'False',
+                    }
+                  ),
+                },
+              ]}
+              value={allowLazyStart}
+              onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
+                setAllowLazyStart(e.target.value)
+              }
+            />
+          </EuiFormRow>
+          <EuiFormRow
+            label={i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.descriptionLabel', {
+              defaultMessage: 'Description',
+            })}
+          >
+            <EuiFieldText
+              data-test-subj="mlAnalyticsEditFlyoutDescriptionInput"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analyticsList.editFlyout.descriptionAriaLabel',
+                {
+                  defaultMessage: 'Update the job description.',
                 }
               )}
-            >
-              <EuiFieldText
-                data-test-subj="mlAnalyticsEditFlyoutDescriptionInput"
-                value={description}
-                onChange={(e) => setDescription(e.target.value)}
-                aria-label={i18n.translate(
-                  'xpack.ml.dataframe.analyticsList.editFlyout.descriptionAriaLabel',
-                  {
-                    defaultMessage: 'Update the job description.',
-                  }
-                )}
-              />
-            </EuiFormRow>
-            <EuiFormRow
-              helpText={
-                state !== DATA_FRAME_TASK_STATE.STOPPED &&
-                i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryHelpText', {
-                  defaultMessage: 'Model memory limit cannot be edited until the job has stopped.',
-                })
+            />
+          </EuiFormRow>
+          <EuiFormRow
+            helpText={
+              state !== DATA_FRAME_TASK_STATE.STOPPED &&
+              i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryHelpText', {
+                defaultMessage: 'Model memory limit cannot be edited until the job has stopped.',
+              })
+            }
+            label={i18n.translate(
+              'xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryLimitLabel',
+              {
+                defaultMessage: 'Model memory limit',
               }
-              label={i18n.translate(
-                'xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryLimitLabel',
+            )}
+            isInvalid={mmlValidationError !== undefined}
+            error={mmlValidationError}
+          >
+            <EuiFieldText
+              data-test-subj="mlAnalyticsEditFlyoutmodelMemoryLimitInput"
+              isInvalid={mmlValidationError !== undefined}
+              readOnly={state !== DATA_FRAME_TASK_STATE.STOPPED}
+              value={modelMemoryLimit}
+              onChange={(e) => setModelMemoryLimit(e.target.value)}
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryLimitAriaLabel',
                 {
-                  defaultMessage: 'Model memory limit',
+                  defaultMessage: 'Update the model memory limit.',
                 }
               )}
-              isInvalid={mmlValidationError !== undefined}
-              error={mmlValidationError}
-            >
-              <EuiFieldText
-                data-test-subj="mlAnalyticsEditFlyoutmodelMemoryLimitInput"
-                isInvalid={mmlValidationError !== undefined}
-                readOnly={state !== DATA_FRAME_TASK_STATE.STOPPED}
-                value={modelMemoryLimit}
-                onChange={(e) => setModelMemoryLimit(e.target.value)}
-                aria-label={i18n.translate(
-                  'xpack.ml.dataframe.analyticsList.editFlyout.modelMemoryLimitAriaLabel',
-                  {
-                    defaultMessage: 'Update the model memory limit.',
-                  }
-                )}
-              />
-            </EuiFormRow>
-            <EuiFormRow
-              helpText={
-                state !== DATA_FRAME_TASK_STATE.STOPPED &&
-                i18n.translate(
-                  'xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsHelpText',
-                  {
-                    defaultMessage:
-                      'Maximum number of threads cannot be edited until the job has stopped.',
-                  }
-                )
+            />
+          </EuiFormRow>
+          <EuiFormRow
+            helpText={
+              state !== DATA_FRAME_TASK_STATE.STOPPED &&
+              i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsHelpText', {
+                defaultMessage:
+                  'Maximum number of threads cannot be edited until the job has stopped.',
+              })
+            }
+            label={i18n.translate(
+              'xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsLabel',
+              {
+                defaultMessage: 'Maximum number of threads',
               }
-              label={i18n.translate(
-                'xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsLabel',
+            )}
+            isInvalid={maxNumThreads === 0}
+            error={
+              maxNumThreads === 0 &&
+              i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsError', {
+                defaultMessage: 'The minimum value is 1.',
+              })
+            }
+          >
+            <EuiFieldNumber
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsAriaLabel',
                 {
-                  defaultMessage: 'Maximum number of threads',
+                  defaultMessage:
+                    'Update the maximum number of threads to be used by the analysis.',
                 }
               )}
-              isInvalid={maxNumThreads === 0}
-              error={
-                maxNumThreads === 0 &&
-                i18n.translate('xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsError', {
-                  defaultMessage: 'The minimum value is 1.',
-                })
+              data-test-subj="mlAnalyticsEditFlyoutMaxNumThreadsLimitInput"
+              onChange={(e) =>
+                setMaxNumThreads(e.target.value === '' ? undefined : +e.target.value)
               }
+              step={1}
+              min={1}
+              readOnly={state !== DATA_FRAME_TASK_STATE.STOPPED}
+              value={maxNumThreads}
+            />
+          </EuiFormRow>
+        </EuiForm>
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
+              {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutCancelButtonText', {
+                defaultMessage: 'Cancel',
+              })}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              data-test-subj="mlAnalyticsEditFlyoutUpdateButton"
+              onClick={onSubmit}
+              fill
+              isDisabled={updateButtonDisabled}
             >
-              <EuiFieldNumber
-                aria-label={i18n.translate(
-                  'xpack.ml.dataframe.analyticsList.editFlyout.maxNumThreadsAriaLabel',
-                  {
-                    defaultMessage:
-                      'Update the maximum number of threads to be used by the analysis.',
-                  }
-                )}
-                data-test-subj="mlAnalyticsEditFlyoutMaxNumThreadsLimitInput"
-                onChange={(e) =>
-                  setMaxNumThreads(e.target.value === '' ? undefined : +e.target.value)
-                }
-                step={1}
-                min={1}
-                readOnly={state !== DATA_FRAME_TASK_STATE.STOPPED}
-                value={maxNumThreads}
-              />
-            </EuiFormRow>
-          </EuiForm>
-        </EuiFlyoutBody>
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
-                {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutCancelButtonText', {
-                  defaultMessage: 'Cancel',
-                })}
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                data-test-subj="mlAnalyticsEditFlyoutUpdateButton"
-                onClick={onSubmit}
-                fill
-                isDisabled={updateButtonDisabled}
-              >
-                {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutUpdateButtonText', {
-                  defaultMessage: 'Update',
-                })}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    </EuiOverlayMask>
+              {i18n.translate('xpack.ml.dataframe.analyticsList.editFlyoutUpdateButtonText', {
+                defaultMessage: 'Update',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
   );
 };
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/checker_errors.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/checker_errors.test.js.snap
index 5018bad317708..e3fa9da6639b3 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/checker_errors.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/checker_errors.test.js.snap
@@ -22,33 +22,37 @@ Array [
     <div
       class="euiText euiText--small"
     >
-      <p>
-        There were some errors encountered in trying to check Elasticsearch settings. You need administrator rights to check the settings and, if needed, to enable the monitoring collection setting.
-      </p>
-      <dl
-        class="euiDescriptionList euiDescriptionList--row"
+      <div
+        class="euiTextColor euiTextColor--default"
       >
-        <dt
-          class="euiDescriptionList__title"
+        <p>
+          There were some errors encountered in trying to check Elasticsearch settings. You need administrator rights to check the settings and, if needed, to enable the monitoring collection setting.
+        </p>
+        <dl
+          class="euiDescriptionList euiDescriptionList--row"
         >
-          403 Forbidden
-        </dt>
-        <dd
-          class="euiDescriptionList__description"
-        >
-          no access for you
-        </dd>
-        <dt
-          class="euiDescriptionList__title"
-        >
-          500 Internal Server Error
-        </dt>
-        <dd
-          class="euiDescriptionList__description"
-        >
-          An internal server error occurred
-        </dd>
-      </dl>
+          <dt
+            class="euiDescriptionList__title"
+          >
+            403 Forbidden
+          </dt>
+          <dd
+            class="euiDescriptionList__description"
+          >
+            no access for you
+          </dd>
+          <dt
+            class="euiDescriptionList__title"
+          >
+            500 Internal Server Error
+          </dt>
+          <dd
+            class="euiDescriptionList__description"
+          >
+            An internal server error occurred
+          </dd>
+        </dl>
+      </div>
     </div>
   </div>,
 ]
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
index fe277062bc95a..34a4c049dddcc 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
@@ -9,7 +9,7 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
   >
     No monitoring data found.
   </h1>
-  <main
+  <div
     class="euiPageBody euiPageBody--borderRadiusNone euiPageBody--restrictWidth-custom"
     style="max-width:600px"
   >
@@ -87,7 +87,7 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
         </span>
       </button>
     </div>
-  </main>
+  </div>
 </div>
 `;
 
@@ -100,7 +100,7 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
   >
     No monitoring data found.
   </h1>
-  <main
+  <div
     class="euiPageBody euiPageBody--borderRadiusNone euiPageBody--restrictWidth-custom"
     style="max-width:600px"
   >
@@ -178,6 +178,6 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
         </span>
       </button>
     </div>
-  </main>
+  </div>
 </div>
 `;
diff --git a/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap b/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
index 7f38a92beae8f..7b04e6410d996 100644
--- a/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
@@ -5,7 +5,7 @@ exports[`PageLoading should show a simple page loading component 1`] = `
   class="euiPage euiPage--paddingMedium euiPage--grow"
   style="height:calc(100vh - 50px)"
 >
-  <main
+  <div
     class="euiPageBody euiPageBody--borderRadiusNone"
   >
     <div
@@ -37,6 +37,6 @@ exports[`PageLoading should show a simple page loading component 1`] = `
         </div>
       </div>
     </div>
-  </main>
+  </div>
 </div>
 `;
diff --git a/x-pack/plugins/observability/public/components/app/cases/create/flyout.test.tsx b/x-pack/plugins/observability/public/components/app/cases/create/flyout.test.tsx
index c358067123747..f92f12c79a56d 100644
--- a/x-pack/plugins/observability/public/components/app/cases/create/flyout.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/cases/create/flyout.test.tsx
@@ -49,7 +49,7 @@ describe('CreateCaseFlyout', () => {
       </EuiThemeProvider>
     );
 
-    wrapper.find('.euiFlyout__closeButton').first().simulate('click');
+    wrapper.find(`[data-test-subj='euiFlyoutCloseButton']`).first().simulate('click');
     expect(onCloseFlyout).toBeCalled();
   });
 });
diff --git a/x-pack/plugins/observability/public/components/app/cases/create/flyout.tsx b/x-pack/plugins/observability/public/components/app/cases/create/flyout.tsx
index df29d02e8d830..b6cdcf3111672 100644
--- a/x-pack/plugins/observability/public/components/app/cases/create/flyout.tsx
+++ b/x-pack/plugins/observability/public/components/app/cases/create/flyout.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
-import styled from 'styled-components';
+import React, { memo, ReactNode } from 'react';
+import styled, { StyledComponent } from 'styled-components';
 import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eui';
 
 import * as i18n from '../translations';
@@ -20,7 +20,11 @@ export interface CreateCaseModalProps {
   onSuccess: (theCase: Case) => Promise<void>;
 }
 
-const StyledFlyout = styled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+const StyledFlyout: StyledComponent<typeof EuiFlyout, {}, { children?: ReactNode }> = styled(
+  EuiFlyout
+)`
   ${({ theme }) => `
     z-index: ${theme.eui.euiZModal};
   `}
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
index 5a7ce3502ce84..896aca79114d7 100644
--- a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
+++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiSideNavItemType, ExclusiveUnion } from '@elastic/eui';
+import { EuiSideNavItemType } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
@@ -28,13 +28,9 @@ export type WrappedPageTemplateProps = Pick<
   | 'pageContentProps'
   | 'pageHeader'
   | 'restrictWidth'
+  | 'template'
   | 'isEmptyState'
-> &
-  // recreate the exclusivity of bottomBar-related props
-  ExclusiveUnion<
-    { template?: 'default' } & Pick<KibanaPageTemplateProps, 'bottomBar' | 'bottomBarProps'>,
-    { template: KibanaPageTemplateProps['template'] }
-  >;
+>;
 
 export interface ObservabilityPageTemplateDependencies {
   currentAppId$: Observable<string | undefined>;
diff --git a/x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap b/x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap
index a6753211fba3b..01a8be98bc4be 100644
--- a/x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/__snapshots__/screen_capture_panel_content.test.tsx.snap
@@ -64,7 +64,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
           className="euiFormRow__fieldWrapper"
         >
           <EuiSwitch
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             checked={false}
             data-test-subj="reportModeToggle"
             id="generated-id"
@@ -84,7 +84,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
             >
               <button
                 aria-checked={false}
-                aria-describedby="generated-id-help"
+                aria-describedby="generated-id-help-0"
                 aria-labelledby="generated-id"
                 className="euiSwitch__button"
                 data-test-subj="reportModeToggle"
@@ -148,11 +148,12 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
           </EuiSwitch>
           <EuiFormHelpText
             className="euiFormRow__text"
-            id="generated-id-help"
+            id="generated-id-help-0"
+            key="0"
           >
             <div
               className="euiFormHelpText euiFormRow__text"
-              id="generated-id-help"
+              id="generated-id-help-0"
             >
               <FormattedMessage
                 defaultMessage="Remove borders and footer logo"
@@ -503,7 +504,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
           className="euiFormRow__fieldWrapper"
         >
           <EuiSwitch
-            aria-describedby="generated-id-help"
+            aria-describedby="generated-id-help-0"
             checked={false}
             data-test-subj="usePrintLayout"
             id="generated-id"
@@ -523,7 +524,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
             >
               <button
                 aria-checked={false}
-                aria-describedby="generated-id-help"
+                aria-describedby="generated-id-help-0"
                 aria-labelledby="generated-id"
                 className="euiSwitch__button"
                 data-test-subj="usePrintLayout"
@@ -587,11 +588,12 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
           </EuiSwitch>
           <EuiFormHelpText
             className="euiFormRow__text"
-            id="generated-id-help"
+            id="generated-id-help-0"
+            key="0"
           >
             <div
               className="euiFormHelpText euiFormRow__text"
-              id="generated-id-help"
+              id="generated-id-help-0"
             >
               <FormattedMessage
                 defaultMessage="Uses multiple pages, showing at most 2 visualizations per page"
diff --git a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
index 8c95363a843ec..cb36584960867 100644
--- a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
@@ -36,161 +36,68 @@ Array [
     ownFocus={true}
     size="s"
   >
-    <EuiWindowEvent
-      event="keydown"
-      handler={[Function]}
-    />
-    <EuiOverlayMask
-      headerZindexLocation="below"
-      onClick={[Function]}
+    <div
+      data-eui="EuiFlyout"
+      data-test-subj="reportInfoFlyout"
+      role="dialog"
     >
-      <Portal
-        containerInfo={
-          <div
-            class="euiOverlayMask euiOverlayMask--belowHeader"
-          />
-        }
+      <button
+        data-test-subj="euiFlyoutCloseButton"
+        onClick={[Function]}
+        type="button"
       />
-    </EuiOverlayMask>
-    <EuiFocusTrap
-      clickOutsideDisables={false}
-    >
-      <div
-        data-eui="EuiFocusTrap"
+      <EuiFlyoutHeader
+        hasBorder={true}
       >
         <div
-          aria-labelledby="flyoutTitle"
-          className="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
-          data-test-subj="reportInfoFlyout"
-          role="dialog"
-          tabIndex={0}
+          className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
         >
-          <EuiI18n
-            default="Close this dialog"
-            token="euiFlyout.closeAriaLabel"
+          <EuiTitle
+            size="m"
           >
-            <EuiButtonIcon
-              aria-label="Close this dialog"
-              className="euiFlyout__closeButton"
-              color="text"
-              data-test-subj="euiFlyoutCloseButton"
-              iconType="cross"
-              onClick={[Function]}
+            <h2
+              className="euiTitle euiTitle--medium"
+              id="flyoutTitle"
             >
-              <button
-                aria-label="Close this dialog"
-                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-                data-test-subj="euiFlyoutCloseButton"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-              >
-                <EuiIcon
-                  aria-hidden="true"
-                  className="euiButtonIcon__icon"
-                  color="inherit"
-                  size="m"
-                  type="cross"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="euiButtonIcon__icon"
-                    color="inherit"
-                    data-euiicon-type="cross"
-                    size="m"
-                  />
-                </EuiIcon>
-              </button>
-            </EuiButtonIcon>
-          </EuiI18n>
-          <EuiFlyoutHeader
-            hasBorder={true}
+              Unable to fetch report info
+            </h2>
+          </EuiTitle>
+        </div>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <div
+          className="euiFlyoutBody"
+        >
+          <div
+            className="euiFlyoutBody__overflow"
+            tabIndex={0}
           >
             <div
-              className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+              className="euiFlyoutBody__overflowContent"
             >
-              <EuiTitle
-                size="m"
-              >
-                <h2
-                  className="euiTitle euiTitle--medium"
-                  id="flyoutTitle"
-                >
-                  Unable to fetch report info
-                </h2>
-              </EuiTitle>
-            </div>
-          </EuiFlyoutHeader>
-          <EuiFlyoutBody>
-            <div
-              className="euiFlyoutBody"
-            >
-              <div
-                className="euiFlyoutBody__overflow"
-              >
+              <EuiText>
                 <div
-                  className="euiFlyoutBody__overflowContent"
+                  className="euiText euiText--medium"
                 >
-                  <EuiText>
-                    <div
-                      className="euiText euiText--medium"
-                    >
-                      Could not fetch the job info
-                    </div>
-                  </EuiText>
+                  Could not fetch the job info
                 </div>
-              </div>
+              </EuiText>
             </div>
-          </EuiFlyoutBody>
+          </div>
         </div>
-      </div>
-    </EuiFocusTrap>
+      </EuiFlyoutBody>
+    </div>
   </EuiFlyout>,
   <div
-    aria-labelledby="flyoutTitle"
-    className="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
+    data-eui="EuiFlyout"
     data-test-subj="reportInfoFlyout"
     role="dialog"
-    tabIndex={0}
   >
-    <EuiI18n
-      default="Close this dialog"
-      token="euiFlyout.closeAriaLabel"
-    >
-      <EuiButtonIcon
-        aria-label="Close this dialog"
-        className="euiFlyout__closeButton"
-        color="text"
-        data-test-subj="euiFlyoutCloseButton"
-        iconType="cross"
-        onClick={[Function]}
-      >
-        <button
-          aria-label="Close this dialog"
-          className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-          data-test-subj="euiFlyoutCloseButton"
-          disabled={false}
-          onClick={[Function]}
-          type="button"
-        >
-          <EuiIcon
-            aria-hidden="true"
-            className="euiButtonIcon__icon"
-            color="inherit"
-            size="m"
-            type="cross"
-          >
-            <span
-              aria-hidden="true"
-              className="euiButtonIcon__icon"
-              color="inherit"
-              data-euiicon-type="cross"
-              size="m"
-            />
-          </EuiIcon>
-        </button>
-      </EuiButtonIcon>
-    </EuiI18n>
+    <button
+      data-test-subj="euiFlyoutCloseButton"
+      onClick={[Function]}
+      type="button"
+    />
     <EuiFlyoutHeader
       hasBorder={true}
     >
@@ -215,6 +122,7 @@ Array [
       >
         <div
           className="euiFlyoutBody__overflow"
+          tabIndex={0}
         >
           <div
             className="euiFlyoutBody__overflowContent"
@@ -243,159 +151,66 @@ Array [
     ownFocus={true}
     size="s"
   >
-    <EuiWindowEvent
-      event="keydown"
-      handler={[Function]}
-    />
-    <EuiOverlayMask
-      headerZindexLocation="below"
-      onClick={[Function]}
+    <div
+      data-eui="EuiFlyout"
+      data-test-subj="reportInfoFlyout"
+      role="dialog"
     >
-      <Portal
-        containerInfo={
-          <div
-            class="euiOverlayMask euiOverlayMask--belowHeader"
-          />
-        }
+      <button
+        data-test-subj="euiFlyoutCloseButton"
+        onClick={[Function]}
+        type="button"
       />
-    </EuiOverlayMask>
-    <EuiFocusTrap
-      clickOutsideDisables={false}
-    >
-      <div
-        data-eui="EuiFocusTrap"
+      <EuiFlyoutHeader
+        hasBorder={true}
       >
         <div
-          aria-labelledby="flyoutTitle"
-          className="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
-          data-test-subj="reportInfoFlyout"
-          role="dialog"
-          tabIndex={0}
+          className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
         >
-          <EuiI18n
-            default="Close this dialog"
-            token="euiFlyout.closeAriaLabel"
+          <EuiTitle
+            size="m"
           >
-            <EuiButtonIcon
-              aria-label="Close this dialog"
-              className="euiFlyout__closeButton"
-              color="text"
-              data-test-subj="euiFlyoutCloseButton"
-              iconType="cross"
-              onClick={[Function]}
+            <h2
+              className="euiTitle euiTitle--medium"
+              id="flyoutTitle"
             >
-              <button
-                aria-label="Close this dialog"
-                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-                data-test-subj="euiFlyoutCloseButton"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-              >
-                <EuiIcon
-                  aria-hidden="true"
-                  className="euiButtonIcon__icon"
-                  color="inherit"
-                  size="m"
-                  type="cross"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="euiButtonIcon__icon"
-                    color="inherit"
-                    data-euiicon-type="cross"
-                    size="m"
-                  />
-                </EuiIcon>
-              </button>
-            </EuiButtonIcon>
-          </EuiI18n>
-          <EuiFlyoutHeader
-            hasBorder={true}
+              Job Info
+            </h2>
+          </EuiTitle>
+        </div>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <div
+          className="euiFlyoutBody"
+        >
+          <div
+            className="euiFlyoutBody__overflow"
+            tabIndex={0}
           >
             <div
-              className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-            >
-              <EuiTitle
-                size="m"
-              >
-                <h2
-                  className="euiTitle euiTitle--medium"
-                  id="flyoutTitle"
-                >
-                  Job Info
-                </h2>
-              </EuiTitle>
-            </div>
-          </EuiFlyoutHeader>
-          <EuiFlyoutBody>
-            <div
-              className="euiFlyoutBody"
+              className="euiFlyoutBody__overflowContent"
             >
-              <div
-                className="euiFlyoutBody__overflow"
-              >
+              <EuiText>
                 <div
-                  className="euiFlyoutBody__overflowContent"
-                >
-                  <EuiText>
-                    <div
-                      className="euiText euiText--medium"
-                    />
-                  </EuiText>
-                </div>
-              </div>
+                  className="euiText euiText--medium"
+                />
+              </EuiText>
             </div>
-          </EuiFlyoutBody>
+          </div>
         </div>
-      </div>
-    </EuiFocusTrap>
+      </EuiFlyoutBody>
+    </div>
   </EuiFlyout>,
   <div
-    aria-labelledby="flyoutTitle"
-    className="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
+    data-eui="EuiFlyout"
     data-test-subj="reportInfoFlyout"
     role="dialog"
-    tabIndex={0}
   >
-    <EuiI18n
-      default="Close this dialog"
-      token="euiFlyout.closeAriaLabel"
-    >
-      <EuiButtonIcon
-        aria-label="Close this dialog"
-        className="euiFlyout__closeButton"
-        color="text"
-        data-test-subj="euiFlyoutCloseButton"
-        iconType="cross"
-        onClick={[Function]}
-      >
-        <button
-          aria-label="Close this dialog"
-          className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-          data-test-subj="euiFlyoutCloseButton"
-          disabled={false}
-          onClick={[Function]}
-          type="button"
-        >
-          <EuiIcon
-            aria-hidden="true"
-            className="euiButtonIcon__icon"
-            color="inherit"
-            size="m"
-            type="cross"
-          >
-            <span
-              aria-hidden="true"
-              className="euiButtonIcon__icon"
-              color="inherit"
-              data-euiicon-type="cross"
-              size="m"
-            />
-          </EuiIcon>
-        </button>
-      </EuiButtonIcon>
-    </EuiI18n>
+    <button
+      data-test-subj="euiFlyoutCloseButton"
+      onClick={[Function]}
+      type="button"
+    />
     <EuiFlyoutHeader
       hasBorder={true}
     >
@@ -420,6 +235,7 @@ Array [
       >
         <div
           className="euiFlyoutBody__overflow"
+          tabIndex={0}
         >
           <div
             className="euiFlyoutBody__overflowContent"
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
index 749c1c8ccb4e2..48a0d18653053 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
@@ -12,7 +12,6 @@ import {
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
-  EuiOverlayMask,
   EuiTitle,
 } from '@elastic/eui';
 import React, { Fragment, useState } from 'react';
@@ -47,37 +46,39 @@ export const PrivilegeSummary = (props: Props) => {
         />
       </EuiButtonEmpty>
       {isOpen && (
-        <EuiOverlayMask headerZindexLocation="below">
-          <EuiFlyout onClose={() => setIsOpen(false)} size={flyoutSize}>
-            <EuiFlyoutHeader>
-              <EuiTitle size="m">
-                <h2>
-                  <FormattedMessage
-                    id="xpack.security.management.editRole.privilegeSummary.modalHeaderTitle"
-                    defaultMessage="Privilege summary"
-                  />
-                </h2>
-              </EuiTitle>
-            </EuiFlyoutHeader>
-            <EuiFlyoutBody>
-              <PrivilegeSummaryTable
-                role={props.role}
-                spaces={props.spaces}
-                kibanaPrivileges={props.kibanaPrivileges}
-                canCustomizeSubFeaturePrivileges={props.canCustomizeSubFeaturePrivileges}
-                spacesApiUi={props.spacesApiUi}
-              />
-            </EuiFlyoutBody>
-            <EuiFlyoutFooter>
-              <EuiButton onClick={() => setIsOpen(false)}>
+        <EuiFlyout
+          onClose={() => setIsOpen(false)}
+          size={flyoutSize}
+          maskProps={{ headerZindexLocation: 'below' }}
+        >
+          <EuiFlyoutHeader>
+            <EuiTitle size="m">
+              <h2>
                 <FormattedMessage
-                  id="xpack.security.management.editRole.privilegeSummary.closeSummaryButtonText"
-                  defaultMessage="Close"
+                  id="xpack.security.management.editRole.privilegeSummary.modalHeaderTitle"
+                  defaultMessage="Privilege summary"
                 />
-              </EuiButton>
-            </EuiFlyoutFooter>
-          </EuiFlyout>
-        </EuiOverlayMask>
+              </h2>
+            </EuiTitle>
+          </EuiFlyoutHeader>
+          <EuiFlyoutBody>
+            <PrivilegeSummaryTable
+              role={props.role}
+              spaces={props.spaces}
+              kibanaPrivileges={props.kibanaPrivileges}
+              canCustomizeSubFeaturePrivileges={props.canCustomizeSubFeaturePrivileges}
+              spacesApiUi={props.spacesApiUi}
+            />
+          </EuiFlyoutBody>
+          <EuiFlyoutFooter>
+            <EuiButton onClick={() => setIsOpen(false)}>
+              <FormattedMessage
+                id="xpack.security.management.editRole.privilegeSummary.closeSummaryButtonText"
+                defaultMessage="Close"
+              />
+            </EuiButton>
+          </EuiFlyoutFooter>
+        </EuiFlyout>
       )}
     </Fragment>
   );
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index b290cb301866d..8f62acd463e6a 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -20,7 +20,6 @@ import {
   EuiFlyoutHeader,
   EuiForm,
   EuiFormRow,
-  EuiOverlayMask,
   EuiSpacer,
   EuiText,
   EuiTitle,
@@ -93,64 +92,67 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
 
   public render() {
     return (
-      <EuiOverlayMask headerZindexLocation="below">
-        <EuiFlyout onClose={this.closeFlyout} size="m" maxWidth={true}>
-          <EuiFlyoutHeader hasBorder>
-            <EuiTitle size="m">
-              <h2>
-                <FormattedMessage
-                  id="xpack.security.management.editRole.spacePrivilegeForm.modalTitle"
-                  defaultMessage="Kibana privileges"
-                />
-              </h2>
-            </EuiTitle>
-          </EuiFlyoutHeader>
-          <EuiFlyoutBody>
-            <EuiErrorBoundary>{this.getForm()}</EuiErrorBoundary>
-          </EuiFlyoutBody>
-          <EuiFlyoutFooter>
-            {this.state.privilegeCalculator.hasSupersededInheritedPrivileges(
-              this.state.privilegeIndex
-            ) && (
-              <Fragment>
-                <EuiCallOut
-                  color="warning"
-                  iconType="alert"
-                  data-test-subj="spaceFormGlobalPermissionsSupersedeWarning"
-                  title={
-                    <FormattedMessage
-                      id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarningTitle"
-                      defaultMessage="Superseded by global privileges"
-                    />
-                  }
-                >
-                  <FormattedMessage
-                    id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarning"
-                    defaultMessage="Declared privileges are less permissive than configured global privileges. View the privilege summary to see effective privileges."
-                  />
-                </EuiCallOut>
-                <EuiSpacer size="s" />
-              </Fragment>
-            )}
-            <EuiFlexGroup justifyContent="spaceBetween">
-              <EuiFlexItem grow={false}>
-                <EuiButtonEmpty
-                  iconType="cross"
-                  onClick={this.closeFlyout}
-                  flush="left"
-                  data-test-subj={'cancelSpacePrivilegeButton'}
-                >
+      <EuiFlyout
+        onClose={this.closeFlyout}
+        size="m"
+        maxWidth={true}
+        maskProps={{ headerZindexLocation: 'below' }}
+      >
+        <EuiFlyoutHeader hasBorder>
+          <EuiTitle size="m">
+            <h2>
+              <FormattedMessage
+                id="xpack.security.management.editRole.spacePrivilegeForm.modalTitle"
+                defaultMessage="Kibana privileges"
+              />
+            </h2>
+          </EuiTitle>
+        </EuiFlyoutHeader>
+        <EuiFlyoutBody>
+          <EuiErrorBoundary>{this.getForm()}</EuiErrorBoundary>
+        </EuiFlyoutBody>
+        <EuiFlyoutFooter>
+          {this.state.privilegeCalculator.hasSupersededInheritedPrivileges(
+            this.state.privilegeIndex
+          ) && (
+            <Fragment>
+              <EuiCallOut
+                color="warning"
+                iconType="alert"
+                data-test-subj="spaceFormGlobalPermissionsSupersedeWarning"
+                title={
                   <FormattedMessage
-                    id="xpack.security.management.editRole.spacePrivilegeForm.cancelButton"
-                    defaultMessage="Cancel"
+                    id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarningTitle"
+                    defaultMessage="Superseded by global privileges"
                   />
-                </EuiButtonEmpty>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>{this.getSaveButton()}</EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlyoutFooter>
-        </EuiFlyout>
-      </EuiOverlayMask>
+                }
+              >
+                <FormattedMessage
+                  id="xpack.security.management.editRole.spacePrivilegeForm.supersededWarning"
+                  defaultMessage="Declared privileges are less permissive than configured global privileges. View the privilege summary to see effective privileges."
+                />
+              </EuiCallOut>
+              <EuiSpacer size="s" />
+            </Fragment>
+          )}
+          <EuiFlexGroup justifyContent="spaceBetween">
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty
+                iconType="cross"
+                onClick={this.closeFlyout}
+                flush="left"
+                data-test-subj={'cancelSpacePrivilegeButton'}
+              >
+                <FormattedMessage
+                  id="xpack.security.management.editRole.spacePrivilegeForm.cancelButton"
+                  defaultMessage="Cancel"
+                />
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>{this.getSaveButton()}</EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlyoutFooter>
+      </EuiFlyout>
     );
   }
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap b/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
index eb266ce93338c..f36a1bf477b06 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
@@ -58,33 +58,33 @@ exports[`<RolesGridPage /> renders permission denied if required 1`] = `
                   />
                 </EuiIcon>
                 <EuiSpacer
-                  size="s"
+                  size="m"
                 >
                   <div
-                    className="euiSpacer euiSpacer--s"
+                    className="euiSpacer euiSpacer--m"
                   />
                 </EuiSpacer>
+                <EuiTitle
+                  size="m"
+                >
+                  <h2
+                    className="euiTitle euiTitle--medium"
+                  >
+                    <FormattedMessage
+                      defaultMessage="You need permission to manage roles"
+                      id="xpack.security.management.roles.deniedPermissionTitle"
+                      values={Object {}}
+                    >
+                      You need permission to manage roles
+                    </FormattedMessage>
+                  </h2>
+                </EuiTitle>
                 <EuiTextColor
                   color="subdued"
                 >
                   <span
                     className="euiTextColor euiTextColor--subdued"
                   >
-                    <EuiTitle
-                      size="m"
-                    >
-                      <h2
-                        className="euiTitle euiTitle--medium"
-                      >
-                        <FormattedMessage
-                          defaultMessage="You need permission to manage roles"
-                          id="xpack.security.management.roles.deniedPermissionTitle"
-                          values={Object {}}
-                        >
-                          You need permission to manage roles
-                        </FormattedMessage>
-                      </h2>
-                    </EuiTitle>
                     <EuiSpacer
                       size="m"
                     >
diff --git a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
index bcb97538b4f05..2ee2337fc9aeb 100644
--- a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><main class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></main></div></body></html>"`;
+exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
 
-exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><main class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></main></div></body></html>"`;
+exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
index 55168401992f7..2e7f3d49e478f 100644
--- a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><main class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">We couldn&#x27;t log you in</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" data-test-subj=\\"logInButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in</span></span></a></div></div></div></div></main></div></body></html>"`;
+exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">We couldn&#x27;t log you in</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" data-test-subj=\\"logInButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in</span></span></a></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
index 1011d82eb1f73..8d31770cd9385 100644
--- a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><main class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></main></div></body></html>"`;
+exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
index a0e7e77f89b67..a89ddf3e0b250 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
@@ -12,7 +12,7 @@ import {
   TIMELINE_DATA_PROVIDERS_ACTION_MENU,
   IS_DRAGGING_DATA_PROVIDERS,
   TIMELINE_FLYOUT_HEADER,
-  TIMELINE_BOTTOM_BAR_CONTAINER,
+  TIMELINE_FLYOUT,
 } from '../../screens/timeline';
 import { HOSTS_NAMES_DRAGGABLE } from '../../screens/hosts/all_hosts';
 
@@ -47,7 +47,7 @@ describe('timeline data providers', () => {
   it('renders the data provider of a host dragged from the All Hosts widget on the hosts page', () => {
     dragAndDropFirstHostToTimeline();
     openTimelineUsingToggle();
-    cy.get(`${TIMELINE_BOTTOM_BAR_CONTAINER} ${TIMELINE_DROPPED_DATA_PROVIDERS}`)
+    cy.get(`${TIMELINE_FLYOUT} ${TIMELINE_DROPPED_DATA_PROVIDERS}`)
       .first()
       .invoke('text')
       .then((dataProviderText) => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/pagination.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/pagination.spec.ts
index 8b65f99eb04b8..b569ea7cc082f 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/pagination.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/pagination.spec.ts
@@ -6,13 +6,13 @@
  */
 
 import {
-  TIMELINE_BOTTOM_BAR_CONTAINER,
   TIMELINE_EVENT,
   TIMELINE_EVENTS_COUNT_NEXT_PAGE,
   TIMELINE_EVENTS_COUNT_PER_PAGE,
   TIMELINE_EVENTS_COUNT_PER_PAGE_BTN,
   TIMELINE_EVENTS_COUNT_PER_PAGE_OPTION,
   TIMELINE_EVENTS_COUNT_PREV_PAGE,
+  TIMELINE_FLYOUT,
 } from '../../screens/timeline';
 import { cleanKibana } from '../../tasks/common';
 
@@ -51,10 +51,10 @@ describe('Pagination', () => {
 
   it('should be able to go to next / previous page', () => {
     cy.intercept('POST', '/internal/bsearch').as('refetch');
-    cy.get(`${TIMELINE_BOTTOM_BAR_CONTAINER} ${TIMELINE_EVENTS_COUNT_NEXT_PAGE}`).first().click();
+    cy.get(`${TIMELINE_FLYOUT} ${TIMELINE_EVENTS_COUNT_NEXT_PAGE}`).first().click();
     cy.wait('@refetch').its('response.statusCode').should('eq', 200);
 
-    cy.get(`${TIMELINE_BOTTOM_BAR_CONTAINER} ${TIMELINE_EVENTS_COUNT_PREV_PAGE}`).first().click();
+    cy.get(`${TIMELINE_FLYOUT} ${TIMELINE_EVENTS_COUNT_PREV_PAGE}`).first().click();
     cy.wait('@refetch').its('response.statusCode').should('eq', 200);
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/screens/timeline.ts b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
index 25cd2357fe02b..63c4c1364fcd0 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
@@ -177,9 +177,11 @@ export const TIMELINE_EVENTS_COUNT_PER_PAGE_BTN = '[data-test-subj="local-events
 export const TIMELINE_EVENTS_COUNT_PER_PAGE_OPTION = (itemsPerPage: number) =>
   `[data-test-subj="items-per-page-option-${itemsPerPage}"]`;
 
-export const TIMELINE_EVENTS_COUNT_NEXT_PAGE = '[data-test-subj="pagination-button-next"]';
+export const TIMELINE_EVENTS_COUNT_NEXT_PAGE =
+  '[data-test-subj="timeline"] [data-test-subj="pagination-button-next"]';
 
-export const TIMELINE_EVENTS_COUNT_PREV_PAGE = '[data-test-subj="pagination-button-previous"]';
+export const TIMELINE_EVENTS_COUNT_PREV_PAGE =
+  '[data-test-subj="timeline"] [data-test-subj="pagination-button-previous"]';
 
 export const TIMELINE_FIELDS_BUTTON =
   '[data-test-subj="timeline"] [data-test-subj="show-field-browser"]';
@@ -236,7 +238,7 @@ export const TIMELINE_EDIT_MODAL_SAVE_BUTTON = '[data-test-subj="save-button"]';
 
 export const TIMELINE_EXIT_FULL_SCREEN_BUTTON = '[data-test-subj="exit-full-screen"]';
 
-export const TIMELINE_FLYOUT_WRAPPER = '[data-test-subj="flyout-pane-wrapper"]';
+export const TIMELINE_FLYOUT_WRAPPER = '[data-test-subj="flyout-pane"]';
 
 export const TIMELINE_FULL_SCREEN_BUTTON = '[data-test-subj="full-screen-active"]';
 
diff --git a/x-pack/plugins/security_solution/public/cases/components/create/flyout.test.tsx b/x-pack/plugins/security_solution/public/cases/components/create/flyout.test.tsx
index caa88a8fd1c2a..d22aafa450694 100644
--- a/x-pack/plugins/security_solution/public/cases/components/create/flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/create/flyout.test.tsx
@@ -50,7 +50,7 @@ describe('CreateCaseFlyout', () => {
       </TestProviders>
     );
 
-    wrapper.find('.euiFlyout__closeButton').first().simulate('click');
+    wrapper.find(`[data-test-subj='euiFlyoutCloseButton']`).first().simulate('click');
     expect(onCloseFlyout).toBeCalled();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx b/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
index 1023bfc8b0206..f01ae342f8547 100644
--- a/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
-import styled from 'styled-components';
+import React, { memo, ReactNode } from 'react';
+import styled, { StyledComponent } from 'styled-components';
 import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eui';
 
 import * as i18n from '../../translations';
@@ -20,7 +20,11 @@ export interface CreateCaseModalProps {
   onSuccess: (theCase: Case) => Promise<void>;
 }
 
-const StyledFlyout = styled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+const StyledFlyout: StyledComponent<typeof EuiFlyout, {}, { children?: ReactNode }> = styled(
+  EuiFlyout
+)`
   ${({ theme }) => `
     z-index: ${theme.eui.euiZModal};
   `}
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_comments.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_comments.tsx
index c13a1b011ccbd..87f7f5fe2f507 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_comments.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_comments.tsx
@@ -106,7 +106,7 @@ export const AddExceptionComments = memo(function AddExceptionComments({
       <EuiFlexGroup gutterSize={'none'}>
         <EuiFlexItem grow={false}>
           <MyAvatar
-            name={currentUser !== null ? currentUser.username.toUpperCase() ?? '' : ''}
+            name={currentUser != null ? currentUser.username.toUpperCase() ?? '' : ''}
             size="l"
           />
         </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
index 48d3cfb5abcc1..ef00bef841305 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
@@ -177,7 +177,7 @@ describe('useSecuritySolutionNavigation', () => {
           useSecuritySolutionNavigation()
         );
 
-        const caseNavItem = result.current?.items[0].items?.find(
+        const caseNavItem = (result.current?.items || [])[0].items?.find(
           (item) => item['data-test-subj'] === 'navigation-case'
         );
         expect(caseNavItem).toMatchInlineSnapshot(`
@@ -204,7 +204,7 @@ describe('useSecuritySolutionNavigation', () => {
           useSecuritySolutionNavigation()
         );
 
-        const caseNavItem = result.current?.items[0].items?.find(
+        const caseNavItem = (result.current?.items || [])[0].items?.find(
           (item) => item['data-test-subj'] === 'navigation-case'
         );
         expect(caseNavItem).toBeFalsy();
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
index e295ea145edcb..edfa410ee5237 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
@@ -154,6 +154,7 @@ export const EndpointDetailsFlyout = memo(() => {
       data-test-subj="endpointDetailsFlyout"
       size="m"
       paddingSize="l"
+      ownFocus={false}
     >
       {(show === 'policy_response' || show === 'isolate' || show === 'unisolate') && (
         <EndpointDetailsFlyoutHeader hostname={hostDetails?.host?.hostname} />
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index 51b60c8ff292b..7b3ae2e2b3b27 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -34,15 +34,8 @@ exports[`TrustedAppsGrid renders correctly initially 1`] = `
           <div
             class="euiEmptyPrompt"
           >
-            <span
-              class="euiTextColor euiTextColor--subdued"
-            >
-              <span>
-                No items found
-              </span>
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
+            <span>
+              No items found
             </span>
           </div>
         </div>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
index ec46985450d89..ad1d126e3c853 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
@@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n';
 import { EuiFocusTrap, EuiOutsideClickDetector } from '@elastic/eui';
 import React, { useEffect, useMemo, useCallback, useState, useRef } from 'react';
 import { useDispatch } from 'react-redux';
-import styled from 'styled-components';
 
 import { AppLeaveHandler } from '../../../../../../../src/core/public';
 import { TimelineId, TimelineStatus, TimelineTabs } from '../../../../common/types/timeline';
@@ -19,12 +18,6 @@ import { FlyoutBottomBar } from './bottom_bar';
 import { Pane } from './pane';
 import { getTimelineShowStatusByIdSelector } from './selectors';
 
-const Visible = styled.div<{ show?: boolean }>`
-  visibility: ${({ show }) => (show ? 'visible' : 'hidden')};
-`;
-
-Visible.displayName = 'Visible';
-
 interface OwnProps {
   timelineId: TimelineId;
   onAppLeave: (handler: AppLeaveHandler) => void;
@@ -124,9 +117,7 @@ const FlyoutComponent: React.FC<OwnProps> = ({ timelineId, onAppLeave }) => {
     <EuiOutsideClickDetector onOutsideClick={onOutsideClick}>
       <>
         <EuiFocusTrap disabled={!focusOwnership}>
-          <Visible show={show} data-test-subj="flyout-pane-wrapper">
-            <Pane timelineId={timelineId} />
-          </Visible>
+          <Pane timelineId={timelineId} visible={show} />
         </EuiFocusTrap>
         <FlyoutBottomBar activeTab={activeTab} timelineId={timelineId} showDataproviders={!show} />
       </>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
index 459706de36569..35a13aba471fd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
@@ -20,6 +20,7 @@ import { focusActiveTimelineButton } from '../../timeline/helpers';
 
 interface FlyoutPaneComponentProps {
   timelineId: TimelineId;
+  visible?: boolean;
 }
 
 const EuiFlyoutContainer = styled.div`
@@ -31,7 +32,10 @@ const EuiFlyoutContainer = styled.div`
   }
 `;
 
-const FlyoutPaneComponent: React.FC<FlyoutPaneComponentProps> = ({ timelineId }) => {
+const FlyoutPaneComponent: React.FC<FlyoutPaneComponentProps> = ({
+  timelineId,
+  visible = true,
+}) => {
   const dispatch = useDispatch();
   const handleClose = useCallback(() => {
     dispatch(timelineActions.showTimeline({ id: timelineId, show: false }));
@@ -39,7 +43,10 @@ const FlyoutPaneComponent: React.FC<FlyoutPaneComponentProps> = ({ timelineId })
   }, [dispatch, timelineId]);
 
   return (
-    <EuiFlyoutContainer data-test-subj="flyout-pane">
+    <EuiFlyoutContainer
+      data-test-subj="flyout-pane"
+      style={{ visibility: visible ? 'visible' : 'hidden' }}
+    >
       <EuiFlyout
         aria-label={i18n.TIMELINE_DESCRIPTION}
         className="timeline-flyout"
@@ -47,6 +54,8 @@ const FlyoutPaneComponent: React.FC<FlyoutPaneComponentProps> = ({ timelineId })
         hideCloseButton={true}
         onClose={handleClose}
         size="l"
+        ownFocus={false}
+        style={{ visibility: visible ? 'visible' : 'hidden' }}
       >
         <StatefulTimeline
           renderCellValue={DefaultCellRenderer}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
index b74a3e1860b17..4c8139a78b012 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
@@ -282,240 +282,195 @@ Array [
       onClose={[Function]}
       size="m"
     >
-      <EuiWindowEvent
-        event="keydown"
-        handler={[Function]}
-      />
-      <EuiFocusTrap
-        clickOutsideDisables={true}
+      <div
+        data-eui="EuiFlyout"
+        data-test-subj="timeline:details-panel:flyout"
+        role="dialog"
       >
-        <div
-          data-eui="EuiFocusTrap"
+        <button
+          data-test-subj="euiFlyoutCloseButton"
+          onClick={[Function]}
+          type="button"
+        />
+        <EventDetailsPanelComponent
+          browserFields={Object {}}
+          docValueFields={Array []}
+          expandedEvent={
+            Object {
+              "eventId": "my-id",
+              "indexName": "my-index",
+            }
+          }
+          handleOnEventClosed={[Function]}
+          isFlyoutView={true}
+          tabType="query"
+          timelineId="test"
         >
-          <div
-            className="euiFlyout euiFlyout--medium euiFlyout--paddingLarge c0"
-            data-test-subj="timeline:details-panel:flyout"
-            role="dialog"
-            tabIndex={0}
+          <EuiFlyoutHeader
+            hasBorder={true}
           >
-            <EuiI18n
-              default="Close this dialog"
-              token="euiFlyout.closeAriaLabel"
-            >
-              <EuiButtonIcon
-                aria-label="Close this dialog"
-                className="euiFlyout__closeButton"
-                color="text"
-                data-test-subj="euiFlyoutCloseButton"
-                iconType="cross"
-                onClick={[Function]}
-              >
-                <button
-                  aria-label="Close this dialog"
-                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-                  data-test-subj="euiFlyoutCloseButton"
-                  disabled={false}
-                  onClick={[Function]}
-                  type="button"
-                >
-                  <EuiIcon
-                    aria-hidden="true"
-                    className="euiButtonIcon__icon"
-                    color="inherit"
-                    size="m"
-                    type="cross"
-                  >
-                    <span
-                      aria-hidden="true"
-                      className="euiButtonIcon__icon"
-                      color="inherit"
-                      data-euiicon-type="cross"
-                      size="m"
-                    />
-                  </EuiIcon>
-                </button>
-              </EuiButtonIcon>
-            </EuiI18n>
-            <EventDetailsPanelComponent
-              browserFields={Object {}}
-              docValueFields={Array []}
-              expandedEvent={
-                Object {
-                  "eventId": "my-id",
-                  "indexName": "my-index",
-                }
-              }
-              handleOnEventClosed={[Function]}
-              isFlyoutView={true}
-              tabType="query"
-              timelineId="test"
+            <div
+              className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
             >
-              <EuiFlyoutHeader
-                hasBorder={true}
+              <ExpandableEventTitle
+                isAlert={false}
+                loading={true}
               >
-                <div
-                  className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+                <Styled(EuiFlexGroup)
+                  gutterSize="none"
+                  justifyContent="spaceBetween"
+                  wrap={true}
                 >
-                  <ExpandableEventTitle
-                    isAlert={false}
-                    loading={true}
+                  <EuiFlexGroup
+                    className="c1"
+                    gutterSize="none"
+                    justifyContent="spaceBetween"
+                    wrap={true}
                   >
-                    <Styled(EuiFlexGroup)
-                      gutterSize="none"
-                      justifyContent="spaceBetween"
-                      wrap={true}
+                    <div
+                      className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c1"
                     >
-                      <EuiFlexGroup
-                        className="c1"
-                        gutterSize="none"
-                        justifyContent="spaceBetween"
-                        wrap={true}
+                      <EuiFlexItem
+                        grow={false}
                       >
                         <div
-                          className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c1"
+                          className="euiFlexItem euiFlexItem--flexGrowZero"
                         >
-                          <EuiFlexItem
-                            grow={false}
-                          >
-                            <div
-                              className="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <EuiTitle
-                                size="s"
-                              />
-                            </div>
-                          </EuiFlexItem>
+                          <EuiTitle
+                            size="s"
+                          />
                         </div>
-                      </EuiFlexGroup>
-                    </Styled(EuiFlexGroup)>
-                  </ExpandableEventTitle>
-                </div>
-              </EuiFlyoutHeader>
-              <Styled(EuiFlyoutBody)>
-                <EuiFlyoutBody
-                  className="c2"
+                      </EuiFlexItem>
+                    </div>
+                  </EuiFlexGroup>
+                </Styled(EuiFlexGroup)>
+              </ExpandableEventTitle>
+            </div>
+          </EuiFlyoutHeader>
+          <Styled(EuiFlyoutBody)>
+            <EuiFlyoutBody
+              className="c2"
+            >
+              <div
+                className="euiFlyoutBody c2"
+              >
+                <div
+                  className="euiFlyoutBody__overflow"
+                  tabIndex={0}
                 >
                   <div
-                    className="euiFlyoutBody c2"
+                    className="euiFlyoutBody__overflowContent"
                   >
-                    <div
-                      className="euiFlyoutBody__overflow"
+                    <ExpandableEvent
+                      browserFields={Object {}}
+                      detailsData={null}
+                      event={
+                        Object {
+                          "eventId": "my-id",
+                          "indexName": "my-index",
+                        }
+                      }
+                      isAlert={false}
+                      loading={true}
+                      timelineId="test"
+                      timelineTabType="flyout"
                     >
-                      <div
-                        className="euiFlyoutBody__overflowContent"
+                      <EuiLoadingContent
+                        lines={10}
                       >
-                        <ExpandableEvent
-                          browserFields={Object {}}
-                          detailsData={null}
-                          event={
-                            Object {
-                              "eventId": "my-id",
-                              "indexName": "my-index",
-                            }
-                          }
-                          isAlert={false}
-                          loading={true}
-                          timelineId="test"
-                          timelineTabType="flyout"
+                        <span
+                          className="euiLoadingContent"
                         >
-                          <EuiLoadingContent
-                            lines={10}
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="0"
                           >
                             <span
-                              className="euiLoadingContent"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="0"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="1"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="2"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="3"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="4"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="5"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="6"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="7"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="8"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                              <span
-                                className="euiLoadingContent__singleLine"
-                                key="9"
-                              >
-                                <span
-                                  className="euiLoadingContent__singleLineBackground"
-                                />
-                              </span>
-                            </span>
-                          </EuiLoadingContent>
-                        </ExpandableEvent>
-                      </div>
-                    </div>
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="1"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="2"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="3"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="4"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="5"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="6"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="7"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="8"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                          <span
+                            className="euiLoadingContent__singleLine"
+                            key="9"
+                          >
+                            <span
+                              className="euiLoadingContent__singleLineBackground"
+                            />
+                          </span>
+                        </span>
+                      </EuiLoadingContent>
+                    </ExpandableEvent>
                   </div>
-                </EuiFlyoutBody>
-              </Styled(EuiFlyoutBody)>
-            </EventDetailsPanelComponent>
-          </div>
-        </div>
-      </EuiFocusTrap>
+                </div>
+              </div>
+            </EuiFlyoutBody>
+          </Styled(EuiFlyoutBody)>
+        </EventDetailsPanelComponent>
+      </div>
     </EuiFlyout>
   </Styled(EuiFlyout)>,
   .c1 {
@@ -554,249 +509,204 @@ Array [
     onClose={[Function]}
     size="m"
   >
-    <EuiWindowEvent
-      event="keydown"
-      handler={[Function]}
-    />
-    <EuiFocusTrap
-      clickOutsideDisables={true}
+    <div
+      data-eui="EuiFlyout"
+      data-test-subj="timeline:details-panel:flyout"
+      role="dialog"
     >
-      <div
-        data-eui="EuiFocusTrap"
+      <button
+        data-test-subj="euiFlyoutCloseButton"
+        onClick={[Function]}
+        type="button"
+      />
+      <EventDetailsPanelComponent
+        browserFields={Object {}}
+        docValueFields={Array []}
+        expandedEvent={
+          Object {
+            "eventId": "my-id",
+            "indexName": "my-index",
+          }
+        }
+        handleOnEventClosed={[Function]}
+        isFlyoutView={true}
+        tabType="query"
+        timelineId="test"
       >
-        <div
-          className="euiFlyout euiFlyout--medium euiFlyout--paddingLarge c0"
-          data-test-subj="timeline:details-panel:flyout"
-          role="dialog"
-          tabIndex={0}
+        <EuiFlyoutHeader
+          hasBorder={true}
         >
-          <EuiI18n
-            default="Close this dialog"
-            token="euiFlyout.closeAriaLabel"
-          >
-            <EuiButtonIcon
-              aria-label="Close this dialog"
-              className="euiFlyout__closeButton"
-              color="text"
-              data-test-subj="euiFlyoutCloseButton"
-              iconType="cross"
-              onClick={[Function]}
-            >
-              <button
-                aria-label="Close this dialog"
-                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-                data-test-subj="euiFlyoutCloseButton"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-              >
-                <EuiIcon
-                  aria-hidden="true"
-                  className="euiButtonIcon__icon"
-                  color="inherit"
-                  size="m"
-                  type="cross"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="euiButtonIcon__icon"
-                    color="inherit"
-                    data-euiicon-type="cross"
-                    size="m"
-                  />
-                </EuiIcon>
-              </button>
-            </EuiButtonIcon>
-          </EuiI18n>
-          <EventDetailsPanelComponent
-            browserFields={Object {}}
-            docValueFields={Array []}
-            expandedEvent={
-              Object {
-                "eventId": "my-id",
-                "indexName": "my-index",
-              }
-            }
-            handleOnEventClosed={[Function]}
-            isFlyoutView={true}
-            tabType="query"
-            timelineId="test"
+          <div
+            className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
           >
-            <EuiFlyoutHeader
-              hasBorder={true}
+            <ExpandableEventTitle
+              isAlert={false}
+              loading={true}
             >
-              <div
-                className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+              <Styled(EuiFlexGroup)
+                gutterSize="none"
+                justifyContent="spaceBetween"
+                wrap={true}
               >
-                <ExpandableEventTitle
-                  isAlert={false}
-                  loading={true}
+                <EuiFlexGroup
+                  className="c1"
+                  gutterSize="none"
+                  justifyContent="spaceBetween"
+                  wrap={true}
                 >
-                  <Styled(EuiFlexGroup)
-                    gutterSize="none"
-                    justifyContent="spaceBetween"
-                    wrap={true}
+                  <div
+                    className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c1"
                   >
-                    <EuiFlexGroup
-                      className="c1"
-                      gutterSize="none"
-                      justifyContent="spaceBetween"
-                      wrap={true}
+                    <EuiFlexItem
+                      grow={false}
                     >
                       <div
-                        className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c1"
+                        className="euiFlexItem euiFlexItem--flexGrowZero"
                       >
-                        <EuiFlexItem
-                          grow={false}
-                        >
-                          <div
-                            className="euiFlexItem euiFlexItem--flexGrowZero"
-                          >
-                            <EuiTitle
-                              size="s"
-                            />
-                          </div>
-                        </EuiFlexItem>
+                        <EuiTitle
+                          size="s"
+                        />
                       </div>
-                    </EuiFlexGroup>
-                  </Styled(EuiFlexGroup)>
-                </ExpandableEventTitle>
-              </div>
-            </EuiFlyoutHeader>
-            <Styled(EuiFlyoutBody)>
-              <EuiFlyoutBody
-                className="c2"
+                    </EuiFlexItem>
+                  </div>
+                </EuiFlexGroup>
+              </Styled(EuiFlexGroup)>
+            </ExpandableEventTitle>
+          </div>
+        </EuiFlyoutHeader>
+        <Styled(EuiFlyoutBody)>
+          <EuiFlyoutBody
+            className="c2"
+          >
+            <div
+              className="euiFlyoutBody c2"
+            >
+              <div
+                className="euiFlyoutBody__overflow"
+                tabIndex={0}
               >
                 <div
-                  className="euiFlyoutBody c2"
+                  className="euiFlyoutBody__overflowContent"
                 >
-                  <div
-                    className="euiFlyoutBody__overflow"
+                  <ExpandableEvent
+                    browserFields={Object {}}
+                    detailsData={null}
+                    event={
+                      Object {
+                        "eventId": "my-id",
+                        "indexName": "my-index",
+                      }
+                    }
+                    isAlert={false}
+                    loading={true}
+                    timelineId="test"
+                    timelineTabType="flyout"
                   >
-                    <div
-                      className="euiFlyoutBody__overflowContent"
+                    <EuiLoadingContent
+                      lines={10}
                     >
-                      <ExpandableEvent
-                        browserFields={Object {}}
-                        detailsData={null}
-                        event={
-                          Object {
-                            "eventId": "my-id",
-                            "indexName": "my-index",
-                          }
-                        }
-                        isAlert={false}
-                        loading={true}
-                        timelineId="test"
-                        timelineTabType="flyout"
+                      <span
+                        className="euiLoadingContent"
                       >
-                        <EuiLoadingContent
-                          lines={10}
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="0"
                         >
                           <span
-                            className="euiLoadingContent"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="0"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="1"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="2"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="3"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="4"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="5"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="6"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="7"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="8"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                            <span
-                              className="euiLoadingContent__singleLine"
-                              key="9"
-                            >
-                              <span
-                                className="euiLoadingContent__singleLineBackground"
-                              />
-                            </span>
-                          </span>
-                        </EuiLoadingContent>
-                      </ExpandableEvent>
-                    </div>
-                  </div>
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="1"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="2"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="3"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="4"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="5"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="6"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="7"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="8"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                        <span
+                          className="euiLoadingContent__singleLine"
+                          key="9"
+                        >
+                          <span
+                            className="euiLoadingContent__singleLineBackground"
+                          />
+                        </span>
+                      </span>
+                    </EuiLoadingContent>
+                  </ExpandableEvent>
                 </div>
-              </EuiFlyoutBody>
-            </Styled(EuiFlyoutBody)>
-          </EventDetailsPanelComponent>
-        </div>
-      </div>
-    </EuiFocusTrap>
+              </div>
+            </div>
+          </EuiFlyoutBody>
+        </Styled(EuiFlyoutBody)>
+      </EventDetailsPanelComponent>
+    </div>
   </EuiFlyout>,
-  .c1 {
+  .c0 {
   -webkit-flex: 0 1 auto;
   -ms-flex: 0 1 auto;
   flex: 0 1 auto;
   margin-top: 8px;
 }
 
-.c2 .euiFlyoutBody__overflow {
+.c1 .euiFlyoutBody__overflow {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -807,7 +717,7 @@ Array [
   overflow: hidden;
 }
 
-.c2 .euiFlyoutBody__overflow .euiFlyoutBody__overflowContent {
+.c1 .euiFlyoutBody__overflow .euiFlyoutBody__overflowContent {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -815,54 +725,16 @@ Array [
   padding: 4px 16px 50px;
 }
 
-.c0 {
-  z-index: 7000;
-}
-
 <div
-    className="euiFlyout euiFlyout--medium euiFlyout--paddingLarge c0"
+    data-eui="EuiFlyout"
     data-test-subj="timeline:details-panel:flyout"
     role="dialog"
-    tabIndex={0}
   >
-    <EuiI18n
-      default="Close this dialog"
-      token="euiFlyout.closeAriaLabel"
-    >
-      <EuiButtonIcon
-        aria-label="Close this dialog"
-        className="euiFlyout__closeButton"
-        color="text"
-        data-test-subj="euiFlyoutCloseButton"
-        iconType="cross"
-        onClick={[Function]}
-      >
-        <button
-          aria-label="Close this dialog"
-          className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-          data-test-subj="euiFlyoutCloseButton"
-          disabled={false}
-          onClick={[Function]}
-          type="button"
-        >
-          <EuiIcon
-            aria-hidden="true"
-            className="euiButtonIcon__icon"
-            color="inherit"
-            size="m"
-            type="cross"
-          >
-            <span
-              aria-hidden="true"
-              className="euiButtonIcon__icon"
-              color="inherit"
-              data-euiicon-type="cross"
-              size="m"
-            />
-          </EuiIcon>
-        </button>
-      </EuiButtonIcon>
-    </EuiI18n>
+    <button
+      data-test-subj="euiFlyoutCloseButton"
+      onClick={[Function]}
+      type="button"
+    />
     <EventDetailsPanelComponent
       browserFields={Object {}}
       docValueFields={Array []}
@@ -893,13 +765,13 @@ Array [
               wrap={true}
             >
               <EuiFlexGroup
-                className="c1"
+                className="c0"
                 gutterSize="none"
                 justifyContent="spaceBetween"
                 wrap={true}
               >
                 <div
-                  className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c1"
+                  className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
                 >
                   <EuiFlexItem
                     grow={false}
@@ -920,13 +792,14 @@ Array [
       </EuiFlyoutHeader>
       <Styled(EuiFlyoutBody)>
         <EuiFlyoutBody
-          className="c2"
+          className="c1"
         >
           <div
-            className="euiFlyoutBody c2"
+            className="euiFlyoutBody c1"
           >
             <div
               className="euiFlyoutBody__overflow"
+              tabIndex={0}
             >
               <div
                 className="euiFlyoutBody__overflowContent"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
index 177cd2e5ded41..629bdcca98640 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, ReactNode } from 'react';
 import { useDispatch } from 'react-redux';
 import { EuiFlyout, EuiFlyoutProps } from '@elastic/eui';
-import styled from 'styled-components';
+import styled, { StyledComponent } from 'styled-components';
 import { timelineActions, timelineSelectors } from '../../store/timeline';
 import { timelineDefaults } from '../../store/timeline/defaults';
 import { BrowserFields, DocValueFields } from '../../../common/containers/source';
@@ -18,7 +18,11 @@ import { EventDetailsPanel } from './event_details';
 import { HostDetailsPanel } from './host_details';
 import { NetworkDetailsPanel } from './network_details';
 
-const StyledEuiFlyout = styled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+const StyledEuiFlyout: StyledComponent<typeof EuiFlyout, {}, { children?: ReactNode }> = styled(
+  EuiFlyout
+)`
   z-index: ${({ theme }) => theme.eui.euiZLevel7};
 `;
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout.tsx
index 2f956db07f2ac..faa304678c0fa 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout.tsx
@@ -19,7 +19,6 @@ import {
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
-  EuiOverlayMask,
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
@@ -78,70 +77,68 @@ export const EditTransformFlyout: FC<EditTransformFlyoutProps> = ({ closeFlyout,
   const isUpdateButtonDisabled = !state.isFormValid || !state.isFormTouched;
 
   return (
-    <EuiOverlayMask>
-      <EuiFlyout
-        onClose={closeFlyout}
-        hideCloseButton
-        aria-labelledby="transformEditFlyoutTitle"
-        data-test-subj="transformEditFlyout"
-      >
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            <h2 id="transformEditFlyoutTitle">
-              {i18n.translate('xpack.transform.transformList.editFlyoutTitle', {
-                defaultMessage: 'Edit {transformId}',
-                values: {
-                  transformId: config.id,
-                },
+    <EuiFlyout
+      onClose={closeFlyout}
+      hideCloseButton
+      aria-labelledby="transformEditFlyoutTitle"
+      data-test-subj="transformEditFlyout"
+    >
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="transformEditFlyoutTitle">
+            {i18n.translate('xpack.transform.transformList.editFlyoutTitle', {
+              defaultMessage: 'Edit {transformId}',
+              values: {
+                transformId: config.id,
+              },
+            })}
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody banner={<EditTransformFlyoutCallout />}>
+        <EditTransformFlyoutForm editTransformFlyout={[state, dispatch]} />
+        {errorMessage !== undefined && (
+          <>
+            <EuiSpacer size="m" />
+            <EuiCallOut
+              title={i18n.translate(
+                'xpack.transform.transformList.editTransformGenericErrorMessage',
+                {
+                  defaultMessage:
+                    'An error occurred calling the API endpoint to update transforms.',
+                }
+              )}
+              color="danger"
+              iconType="alert"
+            >
+              <p>{errorMessage}</p>
+            </EuiCallOut>
+          </>
+        )}
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
+              {i18n.translate('xpack.transform.transformList.editFlyoutCancelButtonText', {
+                defaultMessage: 'Cancel',
               })}
-            </h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody banner={<EditTransformFlyoutCallout />}>
-          <EditTransformFlyoutForm editTransformFlyout={[state, dispatch]} />
-          {errorMessage !== undefined && (
-            <>
-              <EuiSpacer size="m" />
-              <EuiCallOut
-                title={i18n.translate(
-                  'xpack.transform.transformList.editTransformGenericErrorMessage',
-                  {
-                    defaultMessage:
-                      'An error occurred calling the API endpoint to update transforms.',
-                  }
-                )}
-                color="danger"
-                iconType="alert"
-              >
-                <p>{errorMessage}</p>
-              </EuiCallOut>
-            </>
-          )}
-        </EuiFlyoutBody>
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
-                {i18n.translate('xpack.transform.transformList.editFlyoutCancelButtonText', {
-                  defaultMessage: 'Cancel',
-                })}
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                data-test-subj="transformEditFlyoutUpdateButton"
-                onClick={submitFormHandler}
-                fill
-                isDisabled={isUpdateButtonDisabled}
-              >
-                {i18n.translate('xpack.transform.transformList.editFlyoutUpdateButtonText', {
-                  defaultMessage: 'Update',
-                })}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    </EuiOverlayMask>
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              data-test-subj="transformEditFlyoutUpdateButton"
+              onClick={submitFormHandler}
+              fill
+              isDisabled={isUpdateButtonDisabled}
+            >
+              {i18n.translate('xpack.transform.transformList.editFlyoutUpdateButtonText', {
+                defaultMessage: 'Update',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
   );
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
index 2d111d5405230..26f11fa3326ab 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
@@ -175,6 +175,7 @@ const AlertAdd = ({
         aria-labelledby="flyoutAlertAddTitle"
         size="m"
         maxWidth={620}
+        ownFocus={false}
       >
         <EuiFlyoutHeader hasBorder>
           <EuiTitle size="s" data-test-subj="addAlertFlyoutTitle">
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
index b1d2e53997e36..98414f82bf197 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
@@ -24,24 +24,28 @@ Array [
     <div
       class="euiText euiText--small"
     >
-      <p>
-        In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
-      </p>
-      <a
-        class="euiButton euiButton--primary"
-        href="/app/management/stack/license_management/home"
-        rel="noreferrer"
+      <div
+        class="euiTextColor euiTextColor--default"
       >
-        <span
-          class="euiButtonContent euiButton__content"
+        <p>
+          In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
+        </p>
+        <a
+          class="euiButton euiButton--primary"
+          href="/app/management/stack/license_management/home"
+          rel="noreferrer"
         >
           <span
-            class="euiButton__text"
+            class="euiButtonContent euiButton__content"
           >
-            Start free 14-day trial
+            <span
+              class="euiButton__text"
+            >
+              Start free 14-day trial
+            </span>
           </span>
-        </span>
-      </a>
+        </a>
+      </div>
     </div>
   </div>,
   <div
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
index e41366fadef84..e4672338485fa 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
@@ -81,69 +81,60 @@ exports[`ML Flyout component renders without errors 1`] = `
 
 exports[`ML Flyout component shows license info if no ml available 1`] = `
 <div
-  data-eui="EuiFocusTrap"
+  data-eui="EuiFlyout"
+  data-test-subj="uptimeMLFlyout"
+  role="dialog"
 >
+  <button
+    data-test-subj="euiFlyoutCloseButton"
+    type="button"
+  />
   <div
-    class="euiFlyout euiFlyout--small euiFlyout--paddingLarge"
-    data-test-subj="uptimeMLFlyout"
-    role="dialog"
-    tabindex="0"
+    class="euiFlyoutHeader"
   >
-    <button
-      aria-label="Close this dialog"
-      class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton"
-      data-test-subj="euiFlyoutCloseButton"
-      type="button"
+    <h2
+      class="euiTitle euiTitle--medium"
     >
-      <span
-        aria-hidden="true"
-        class="euiButtonIcon__icon"
-        color="inherit"
-        data-euiicon-type="cross"
-      />
-    </button>
+      Enable anomaly detection
+    </h2>
     <div
-      class="euiFlyoutHeader"
-    >
-      <h2
-        class="euiTitle euiTitle--medium"
-      >
-        Enable anomaly detection
-      </h2>
-      <div
-        class="euiSpacer euiSpacer--s"
-      />
-    </div>
+      class="euiSpacer euiSpacer--s"
+    />
+  </div>
+  <div
+    class="euiFlyoutBody"
+  >
     <div
-      class="euiFlyoutBody"
+      class="euiFlyoutBody__overflow"
+      tabindex="0"
     >
       <div
-        class="euiFlyoutBody__overflow"
+        class="euiFlyoutBody__overflowContent"
       >
         <div
-          class="euiFlyoutBody__overflowContent"
+          class="euiCallOut euiCallOut--primary license-info-trial"
+          data-test-subj="uptimeMLLicenseInfo"
         >
           <div
-            class="euiCallOut euiCallOut--primary license-info-trial"
-            data-test-subj="uptimeMLLicenseInfo"
+            class="euiCallOutHeader"
           >
-            <div
-              class="euiCallOutHeader"
+            <span
+              aria-hidden="true"
+              class="euiCallOutHeader__icon"
+              color="inherit"
+              data-euiicon-type="help"
+            />
+            <span
+              class="euiCallOutHeader__title"
             >
-              <span
-                aria-hidden="true"
-                class="euiCallOutHeader__icon"
-                color="inherit"
-                data-euiicon-type="help"
-              />
-              <span
-                class="euiCallOutHeader__title"
-              >
-                Start free 14-day trial
-              </span>
-            </div>
+              Start free 14-day trial
+            </span>
+          </div>
+          <div
+            class="euiText euiText--small"
+          >
             <div
-              class="euiText euiText--small"
+              class="euiTextColor euiTextColor--default"
             >
               <p>
                 In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
@@ -165,85 +156,85 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
               </a>
             </div>
           </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiText euiText--medium"
-          >
-            <p>
-              Here you can create a machine learning job to calculate anomaly scores on
+        </div>
+        <div
+          class="euiSpacer euiSpacer--l"
+        />
+        <div
+          class="euiText euiText--medium"
+        >
+          <p>
+            Here you can create a machine learning job to calculate anomaly scores on
     response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
     will show the expected bounds and annotate the graph with anomalies. You can also potentially
      identify periods of increased latency across geographical regions.
-            </p>
-            <p>
-              Once a job is created, you can manage it and see more details in the 
-              <a
-                class="euiLink euiLink--primary"
-                href="/app/ml"
-                rel="noreferrer"
-              >
-                Machine Learning jobs management page
-              </a>
-              .
-            </p>
-            <p>
-              <em>
-                Note: It might take a few minutes for the job to begin calculating results.
-              </em>
-            </p>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
+          </p>
+          <p>
+            Once a job is created, you can manage it and see more details in the 
+            <a
+              class="euiLink euiLink--primary"
+              href="/app/ml"
+              rel="noreferrer"
+            >
+              Machine Learning jobs management page
+            </a>
+            .
+          </p>
+          <p>
+            <em>
+              Note: It might take a few minutes for the job to begin calculating results.
+            </em>
+          </p>
         </div>
+        <div
+          class="euiSpacer euiSpacer--l"
+        />
       </div>
     </div>
+  </div>
+  <div
+    class="euiFlyoutFooter"
+  >
     <div
-      class="euiFlyoutFooter"
+      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexItem euiFlexItem--flexGrowZero"
       >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+        <button
+          class="euiButtonEmpty euiButtonEmpty--primary"
+          type="button"
         >
-          <button
-            class="euiButtonEmpty euiButtonEmpty--primary"
-            type="button"
+          <span
+            class="euiButtonContent euiButtonEmpty__content"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__text"
             >
-              <span
-                class="euiButtonEmpty__text"
-              >
-                Cancel
-              </span>
+              Cancel
             </span>
-          </button>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          </span>
+        </button>
+      </div>
+      <div
+        class="euiFlexItem euiFlexItem--flexGrowZero"
+      >
+        <button
+          class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+          data-test-subj="uptimeMLCreateJobBtn"
+          disabled=""
+          type="button"
         >
-          <button
-            class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
-            data-test-subj="uptimeMLCreateJobBtn"
-            disabled=""
-            type="button"
+          <span
+            class="euiButtonContent euiButton__content"
           >
             <span
-              class="euiButtonContent euiButton__content"
+              class="euiButton__text"
             >
-              <span
-                class="euiButton__text"
-              >
-                Create new job
-              </span>
+              Create new job
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
   </div>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
index 377a2c9389bbd..51753d2ce8bb3 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
@@ -145,51 +145,55 @@ exports[`PingListExpandedRow renders link to docs if body is not recorded but it
       <div
         class="euiText euiText--small"
       >
-        <dl
-          class="euiDescriptionList euiDescriptionList--row"
+        <div
+          class="euiTextColor euiTextColor--default"
         >
-          <dt
-            class="euiDescriptionList__title"
+          <dl
+            class="euiDescriptionList euiDescriptionList--row"
           >
-            Response Body
-          </dt>
-          <dd
-            class="euiDescriptionList__description"
-          >
-            <div
-              class="euiText euiText--medium"
+            <dt
+              class="euiDescriptionList__title"
             >
-              Body size is 1MB.
-            </div>
-            <div
-              class="euiSpacer euiSpacer--s"
-            />
-            <div
-              class="euiText euiText--medium"
+              Response Body
+            </dt>
+            <dd
+              class="euiDescriptionList__description"
             >
-              Body not recorded. Read our 
-              <a
-                class="euiLink euiLink--primary"
-                href="https://www.elastic.co/guide/en/beats/heartbeat/current/configuration-heartbeat-options.html#monitor-http-response"
-                rel="noopener"
-                target="_blank"
+              <div
+                class="euiText euiText--medium"
               >
-                docs
-                <span
-                  aria-label="External link"
-                  class="euiLink__externalIcon"
-                  data-euiicon-type="popout"
-                />
-                <span
-                  class="euiScreenReaderOnly"
+                Body size is 1MB.
+              </div>
+              <div
+                class="euiSpacer euiSpacer--s"
+              />
+              <div
+                class="euiText euiText--medium"
+              >
+                Body not recorded. Read our 
+                <a
+                  class="euiLink euiLink--primary"
+                  href="https://www.elastic.co/guide/en/beats/heartbeat/current/configuration-heartbeat-options.html#monitor-http-response"
+                  rel="noopener"
+                  target="_blank"
                 >
-                  (opens in a new tab or window)
-                </span>
-              </a>
-               for more information on recording response bodies.
-            </div>
-          </dd>
-        </dl>
+                  docs
+                  <span
+                    aria-label="External link"
+                    class="euiLink__externalIcon"
+                    data-euiicon-type="popout"
+                  />
+                  <span
+                    class="euiScreenReaderOnly"
+                  >
+                    (opens in a new tab or window)
+                  </span>
+                </a>
+                 for more information on recording response bodies.
+              </div>
+            </dd>
+          </dl>
+        </div>
       </div>
     </div>
   </div>
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
index 53e6583e00cc2..2242e692b4222 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, ReactNode } from 'react';
 
-import styled from 'styled-components';
+import styled, { StyledComponent } from 'styled-components';
 
 import {
   EuiFlyout,
@@ -49,7 +49,11 @@ export const RESPONSE_HEADERS = i18n.translate(
   }
 );
 
-const FlyoutContainer = styled(EuiFlyout)`
+// TODO: EUI team follow up on complex types and styled-components `styled`
+// https://github.com/elastic/eui/issues/4855
+const FlyoutContainer: StyledComponent<typeof EuiFlyout, {}, { children?: ReactNode }> = styled(
+  EuiFlyout
+)`
   z-index: ${(props) => props.theme.eui.euiZLevel5};
 `;
 
diff --git a/x-pack/test/functional/apps/lens/lens_tagging.ts b/x-pack/test/functional/apps/lens/lens_tagging.ts
index b659515a6031c..cbe04b26830d6 100644
--- a/x-pack/test/functional/apps/lens/lens_tagging.ts
+++ b/x-pack/test/functional/apps/lens/lens_tagging.ts
@@ -107,7 +107,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         `tag-searchbar-option-${PageObjects.tagManagement.testSubjFriendly(lensTag)}`
       );
       // click elsewhere to close the filter dropdown
-      const searchFilter = await find.byCssSelector('main .euiFieldSearch');
+      const searchFilter = await find.byCssSelector('.euiPageBody .euiFieldSearch');
       await searchFilter.click();
       // wait until the table refreshes
       await listingTable.waitUntilTableIsLoaded();
diff --git a/x-pack/test/functional/page_objects/graph_page.ts b/x-pack/test/functional/page_objects/graph_page.ts
index bd9e5100e0c57..b0389510e5ef5 100644
--- a/x-pack/test/functional/page_objects/graph_page.ts
+++ b/x-pack/test/functional/page_objects/graph_page.ts
@@ -201,7 +201,9 @@ export class GraphPageObject extends FtrService {
   }
 
   async getSearchFilter() {
-    const searchFilter = await this.find.allByCssSelector('main .euiFieldSearch');
+    const searchFilter = await this.find.allByCssSelector(
+      '[data-test-subj="graphLandingPage"] .euiFieldSearch'
+    );
     return searchFilter[0];
   }
 
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 9953ab3dfcead..0fc85f78ac90b 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -500,7 +500,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       await comboBox.setElement(formatInput, format);
     },
     async editDimensionColor(color: string) {
-      const colorPickerInput = await testSubjects.find('colorPickerAnchor');
+      const colorPickerInput = await testSubjects.find('~indexPattern-dimension-colorPicker');
       await colorPickerInput.type(color);
       await PageObjects.common.sleep(1000); // give time for debounced components to rerender
     },
@@ -873,7 +873,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
     },
     async assertColor(color: string) {
       // TODO: target dimensionTrigger color element after merging https://github.com/elastic/kibana/pull/76871
-      await testSubjects.getAttribute('colorPickerAnchor', color);
+      await testSubjects.getAttribute('~indexPattern-dimension-colorPicker', color);
     },
 
     /**
diff --git a/x-pack/test/functional/page_objects/space_selector_page.ts b/x-pack/test/functional/page_objects/space_selector_page.ts
index 9e05ae1f2c42b..313916fd3b07e 100644
--- a/x-pack/test/functional/page_objects/space_selector_page.ts
+++ b/x-pack/test/functional/page_objects/space_selector_page.ts
@@ -79,11 +79,11 @@ export class SpaceSelectorPageObject extends FtrService {
   }
 
   async clickColorPicker() {
-    await this.testSubjects.click('colorPickerAnchor');
+    await this.testSubjects.click('euiColorPickerAnchor');
   }
 
   async setColorinPicker(hexValue: string) {
-    await this.testSubjects.setValue('colorPickerAnchor', hexValue);
+    await this.testSubjects.setValue('euiColorPickerAnchor', hexValue);
   }
 
   async clickShowFeatures() {
diff --git a/x-pack/test/functional/page_objects/tag_management_page.ts b/x-pack/test/functional/page_objects/tag_management_page.ts
index b3f6622b04a57..253f91ff0496d 100644
--- a/x-pack/test/functional/page_objects/tag_management_page.ts
+++ b/x-pack/test/functional/page_objects/tag_management_page.ts
@@ -56,8 +56,7 @@ class TagModal extends FtrService {
       await this.testSubjects.setValue('createModalField-name', fields.name);
     }
     if (fields.color !== undefined) {
-      // EuiColorPicker does not allow to specify data-test-subj for the colorpicker input
-      await this.testSubjects.setValue('colorPickerAnchor', fields.color);
+      await this.testSubjects.setValue('~createModalField-color', fields.color);
     }
     if (fields.description !== undefined) {
       await this.testSubjects.click('createModalField-description');
@@ -75,7 +74,7 @@ class TagModal extends FtrService {
   async getFormValues(): Promise<Required<FillTagFormFields>> {
     return {
       name: await this.testSubjects.getAttribute('createModalField-name', 'value'),
-      color: await this.testSubjects.getAttribute('colorPickerAnchor', 'value'),
+      color: await this.testSubjects.getAttribute('~createModalField-color', 'value'),
       description: await this.testSubjects.getAttribute('createModalField-description', 'value'),
     };
   }
diff --git a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
index ffaa595c16bec..1bd95ca9f16e4 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
@@ -30,7 +30,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       );
     }
     // click elsewhere to close the filter dropdown
-    const searchFilter = await find.byCssSelector('main .euiFieldSearch');
+    const searchFilter = await find.byCssSelector('.euiPageBody .euiFieldSearch');
     await searchFilter.click();
     // wait until the table refreshes
     await listingTable.waitUntilTableIsLoaded();
diff --git a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
index 632610fee0f53..6494eba66a437 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
@@ -30,7 +30,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       );
     }
     // click elsewhere to close the filter dropdown
-    const searchFilter = await find.byCssSelector('main .euiFieldSearch');
+    const searchFilter = await find.byCssSelector('.euiPageBody .euiFieldSearch');
     await searchFilter.click();
   };
 
diff --git a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
index 9789b4146c05d..4bd95cd9a7f42 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
@@ -30,7 +30,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       );
     }
     // click elsewhere to close the filter dropdown
-    const searchFilter = await find.byCssSelector('main .euiFieldSearch');
+    const searchFilter = await find.byCssSelector('.euiPageBody .euiFieldSearch');
     await searchFilter.click();
     // wait until the table refreshes
     await listingTable.waitUntilTableIsLoaded();
diff --git a/yarn.lock b/yarn.lock
index 7b0cd4dfe67ac..64e01ac0475d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1436,10 +1436,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@33.0.0":
-  version "33.0.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-33.0.0.tgz#525cf5ea6e6ab16c32bb09766e9c23806640240f"
-  integrity sha512-BQ6GJxKVaOF7Fm+IvH2iFeeGnepzygDr4xmmZ8PH2BEfrtkxzGP9YDpqmr/Drg5beVynJ3+72k1AEQT/JE6NTw==
+"@elastic/eui@34.3.0":
+  version "34.3.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-34.3.0.tgz#5cd7d66c86d9644991c4391682f84824126361df"
+  integrity sha512-cUFh5H7Y95lzbsyRP1yL88mVVe5MAODOhV+O+8jYmuDQH6WrEiDhtSljTKfVYssbP7Bv+qFraVwyUj623dfr2w==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
@@ -1454,6 +1454,7 @@
     chroma-js "^2.1.0"
     classnames "^2.2.6"
     lodash "^4.17.21"
+    mdast-util-to-hast "^10.0.0"
     numeral "^2.0.6"
     prop-types "^15.6.0"
     react-ace "^7.0.5"
@@ -19027,7 +19028,7 @@ mdast-util-from-markdown@^0.8.0:
     parse-entities "^2.0.0"
     unist-util-stringify-position "^2.0.0"
 
-mdast-util-to-hast@10.0.1:
+mdast-util-to-hast@10.0.1, mdast-util-to-hast@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
   integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==
@@ -19041,20 +19042,6 @@ mdast-util-to-hast@10.0.1:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
-mdast-util-to-hast@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.0.tgz#744dfe7907bac0263398a68af5aba16d104a9a08"
-  integrity sha512-dRyAC5S4eDcIOdkz4jg0wXbUdlf+5YFu7KppJNHOsMaD7ql5bKIqVcvXYYkcrKjzUkfX8JsKFVMthsU8OWxQ+w==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    mdast-util-definitions "^4.0.0"
-    mdurl "^1.0.0"
-    unist-builder "^2.0.0"
-    unist-util-generated "^1.0.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^2.0.0"
-
 mdast-util-to-markdown@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.1.tgz#0e07d3f871e056bffc38a0cf50c7298b56d9e0d6"

From 1e7ef987bebc611fe4b8bc7bd8da194e924f75a0 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Wed, 23 Jun 2021 14:24:24 -0600
Subject: [PATCH 13/95] [Maps] fix save to maps for by_value map embeddables
 (#102968)

* [Maps] fix save to maps for by_value map embeddables

* show the save as dialog with the option to update Panel on dashboard

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../routes/map_page/saved_map/saved_map.ts       |  4 ++++
 .../public/routes/map_page/top_nav_config.tsx    | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
index f7e0012fdd9c2..45d3e0352acf6 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
@@ -241,6 +241,10 @@ export class SavedMap {
     return this._originatingApp;
   }
 
+  public getOriginatingAppName(): string | undefined {
+    return this._originatingApp ? this.getAppNameFromId(this._originatingApp) : undefined;
+  }
+
   public getAppNameFromId = (appId: string): string | undefined => {
     return this._getStateTransfer().getAppNameFromId(appId);
   };
diff --git a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
index 7ac8c3070eb9d..79bc820d67b46 100644
--- a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
@@ -151,9 +151,8 @@ export function getTopNavConfig({
         const saveModalProps = {
           onSave: async (
             props: OnSaveProps & {
-              returnToOrigin?: boolean;
               dashboardId?: string | null;
-              addToLibrary?: boolean;
+              addToLibrary: boolean;
             }
           ) => {
             try {
@@ -181,7 +180,7 @@ export function getTopNavConfig({
             await savedMap.save({
               ...props,
               newTags: selectedTags,
-              saveByReference: Boolean(props.addToLibrary),
+              saveByReference: props.addToLibrary,
             });
             // showSaveModal wrapper requires onSave to return an object with an id to close the modal after successful save
             return { id: 'id' };
@@ -204,8 +203,19 @@ export function getTopNavConfig({
           saveModal = (
             <SavedObjectSaveModalOrigin
               {...saveModalProps}
+              onSave={async (props: OnSaveProps) => {
+                return saveModalProps.onSave({ ...props, addToLibrary: true });
+              }}
               originatingApp={savedMap.getOriginatingApp()}
               getAppNameFromId={savedMap.getAppNameFromId}
+              returnToOriginSwitchLabel={
+                savedMap.isByValue()
+                  ? i18n.translate('xpack.maps.topNav.updatePanel', {
+                      defaultMessage: 'Update panel on {originatingAppName}',
+                      values: { originatingAppName: savedMap.getOriginatingAppName() },
+                    })
+                  : undefined
+              }
               options={tagSelector}
             />
           );

From 0669895137b903a15e86622a64d39f3f5a936355 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Wed, 23 Jun 2021 17:04:19 -0500
Subject: [PATCH 14/95] [canvas] Reduce bundle size by co-locating strings with
 components (#103013)

---
 x-pack/plugins/canvas/CONTRIBUTING.md         |    8 +-
 .../component/advanced_filter.tsx             |   18 +-
 .../component/dropdown_filter.tsx             |   14 +-
 x-pack/plugins/canvas/i18n/components.ts      | 1543 -----------------
 x-pack/plugins/canvas/i18n/index.ts           |    1 -
 .../arg_add_popover/arg_add_popover.tsx       |   11 +-
 .../components/arg_form/advanced_failure.js   |   19 +-
 .../components/arg_form/arg_simple_form.tsx   |   16 +-
 .../components/arg_form/pending_arg_value.js  |   10 +-
 .../components/arg_form/simple_failure.tsx    |   12 +-
 .../asset_manager/asset.component.tsx         |   38 +-
 .../asset_manager/asset_manager.component.tsx |   37 +-
 .../components/asset_picker/asset_picker.tsx  |   10 +-
 .../canvas_loading.component.tsx              |    9 +-
 .../color_manager/color_manager.tsx           |   19 +-
 .../custom_element_modal.tsx                  |   47 +-
 .../datasource/datasource_component.js        |   20 +-
 .../datasource_preview/datasource_preview.js  |   29 +-
 .../components/datasource/no_datasource.js    |   14 +-
 .../element_config/element_config.tsx         |   37 +-
 .../embeddable_flyout/flyout.component.tsx    |   15 +-
 .../canvas/public/components/error/error.tsx  |   15 +-
 .../expression/element_not_selected.js        |   13 +-
 .../components/expression/expression.tsx      |   39 +-
 .../components/expression_input/reference.ts  |   55 +-
 .../function_form_context_error.tsx           |   13 +-
 .../function_form/function_unknown.tsx        |   13 +-
 .../public/components/help_menu/help_menu.tsx |   11 +-
 .../keyboard_shortcuts_doc.tsx                |   20 +-
 .../public/components/page_config/index.js    |   13 +-
 .../components/page_config/page_config.js     |   29 +-
 .../page_manager/page_manager.component.tsx   |   23 +-
 .../components/page_preview/page_controls.tsx |   22 +-
 .../palette_picker/palette_picker.tsx         |   14 +-
 .../saved_elements_modal/element_controls.tsx |   21 +-
 .../saved_elements_modal.component.tsx        |   49 +-
 .../element_settings.component.tsx            |   20 +-
 .../components/sidebar/group_settings.tsx     |   16 +-
 .../sidebar/multi_element_settings.tsx        |   18 +-
 .../components/sidebar/sidebar_content.js     |   28 +-
 .../sidebar_header/sidebar_header.tsx         |   23 +-
 .../text_style_picker/text_style_picker.tsx   |   42 +-
 .../components/toolbar/toolbar.component.tsx  |   25 +-
 .../public/components/toolbar/tray/tray.tsx   |    9 +-
 .../components/var_config/delete_var.tsx      |   23 +-
 .../public/components/var_config/edit_var.tsx |   55 +-
 .../public/components/var_config/index.tsx    |   14 +-
 .../components/var_config/var_config.tsx      |   56 +-
 .../components/var_config/var_value_field.tsx |   17 +-
 .../workpad_color_picker.component.tsx        |    9 +-
 .../workpad_config.component.tsx              |   62 +-
 .../edit_menu/edit_menu.component.tsx         |   92 +-
 .../element_menu/element_menu.component.tsx   |   54 +-
 .../labs_control/labs_control.tsx             |   10 +-
 .../refresh_control.component.tsx             |   14 +-
 .../share_menu/flyout/flyout.component.tsx    |   34 +-
 .../share_menu/flyout/flyout.ts               |   27 +-
 .../share_menu/flyout/runtime_step.tsx        |   18 +-
 .../share_menu/flyout/snippets_step.tsx       |   82 +-
 .../share_menu/flyout/workpad_step.tsx        |   18 +-
 .../share_menu/share_menu.component.tsx       |   37 +-
 .../workpad_header/share_menu/share_menu.ts   |   13 +-
 .../view_menu/auto_refresh_controls.tsx       |   24 +-
 .../view_menu/custom_interval.tsx             |   23 +-
 .../view_menu/kiosk_controls.tsx              |   24 +-
 .../view_menu/view_menu.component.tsx         |   66 +-
 .../workpad_header.component.tsx              |   26 +-
 .../translations/translations/ja-JP.json      |   35 -
 .../translations/translations/zh-CN.json      |   35 -
 69 files changed, 1546 insertions(+), 1780 deletions(-)
 delete mode 100644 x-pack/plugins/canvas/i18n/components.ts

diff --git a/x-pack/plugins/canvas/CONTRIBUTING.md b/x-pack/plugins/canvas/CONTRIBUTING.md
index d3bff67771244..d8a657ea73c40 100644
--- a/x-pack/plugins/canvas/CONTRIBUTING.md
+++ b/x-pack/plugins/canvas/CONTRIBUTING.md
@@ -36,8 +36,8 @@ To keep the code terse, Canvas uses i18n "dictionaries": abstracted, static sing
 
 ```js
 
-// i18n/components.ts
-export const ComponentStrings = {
+// asset_manager.tsx
+const strings = {
   // ...
   AssetManager: {
     getCopyAssetMessage: (id: string) =>
@@ -52,10 +52,6 @@ export const ComponentStrings = {
   // ...
 };
 
-// asset_manager.tsx
-import { ComponentStrings } from '../../../i18n';
-const { AssetManager: strings } = ComponentStrings;
-
 const text = (
   <EuiText>
     {strings.getSpaceUsedText(percentageUsed)}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
index 4dfb4c3f09273..b5c009abc2768 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
@@ -5,12 +5,22 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import PropTypes from 'prop-types';
 import React, { FunctionComponent } from 'react';
-import { ComponentStrings } from '../../../../../i18n';
+import PropTypes from 'prop-types';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-const { AdvancedFilter: strings } = ComponentStrings;
+const strings = {
+  getApplyButtonLabel: () =>
+    i18n.translate('xpack.canvas.renderer.advancedFilter.applyButtonLabel', {
+      defaultMessage: 'Apply',
+      description: 'This refers to applying the filter to the Canvas workpad',
+    }),
+  getInputPlaceholder: () =>
+    i18n.translate('xpack.canvas.renderer.advancedFilter.inputPlaceholder', {
+      defaultMessage: 'Enter filter expression',
+    }),
+};
 
 export interface Props {
   /** Optional value for the component */
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
index 86517c897f02d..43f2e1ecc84f3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
@@ -5,12 +5,18 @@
  * 2.0.
  */
 
-import { EuiIcon } from '@elastic/eui';
-import PropTypes from 'prop-types';
 import React, { ChangeEvent, FocusEvent, FunctionComponent } from 'react';
-import { ComponentStrings } from '../../../../../i18n';
+import PropTypes from 'prop-types';
+import { EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-const { DropdownFilter: strings } = ComponentStrings;
+const strings = {
+  getMatchAllOptionLabel: () =>
+    i18n.translate('xpack.canvas.renderer.dropdownFilter.matchAllOptionLabel', {
+      defaultMessage: 'ANY',
+      description: 'The dropdown filter option to match any value in the field.',
+    }),
+};
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/i18n/components.ts b/x-pack/plugins/canvas/i18n/components.ts
deleted file mode 100644
index 6f011bb73e3b0..0000000000000
--- a/x-pack/plugins/canvas/i18n/components.ts
+++ /dev/null
@@ -1,1543 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import { BOLD_MD_TOKEN, CANVAS, HTML, JSON, PDF, URL, ZIP } from './constants';
-
-export const ComponentStrings = {
-  AddEmbeddableFlyout: {
-    getNoItemsText: () =>
-      i18n.translate('xpack.canvas.embedObject.noMatchingObjectsMessage', {
-        defaultMessage: 'No matching objects found.',
-      }),
-    getTitleText: () =>
-      i18n.translate('xpack.canvas.embedObject.titleText', {
-        defaultMessage: 'Add from Kibana',
-      }),
-  },
-  AdvancedFilter: {
-    getApplyButtonLabel: () =>
-      i18n.translate('xpack.canvas.renderer.advancedFilter.applyButtonLabel', {
-        defaultMessage: 'Apply',
-        description: 'This refers to applying the filter to the Canvas workpad',
-      }),
-    getInputPlaceholder: () =>
-      i18n.translate('xpack.canvas.renderer.advancedFilter.inputPlaceholder', {
-        defaultMessage: 'Enter filter expression',
-      }),
-  },
-  App: {
-    getLoadErrorMessage: (error: string) =>
-      i18n.translate('xpack.canvas.app.loadErrorMessage', {
-        defaultMessage: 'Message: {error}',
-        values: {
-          error,
-        },
-      }),
-    getLoadErrorTitle: () =>
-      i18n.translate('xpack.canvas.app.loadErrorTitle', {
-        defaultMessage: 'Canvas failed to load',
-      }),
-    getLoadingMessage: () =>
-      i18n.translate('xpack.canvas.app.loadingMessage', {
-        defaultMessage: 'Canvas is loading',
-      }),
-  },
-  ArgAddPopover: {
-    getAddAriaLabel: () =>
-      i18n.translate('xpack.canvas.argAddPopover.addAriaLabel', {
-        defaultMessage: 'Add argument',
-      }),
-  },
-  ArgFormAdvancedFailure: {
-    getApplyButtonLabel: () =>
-      i18n.translate('xpack.canvas.argFormAdvancedFailure.applyButtonLabel', {
-        defaultMessage: 'Apply',
-      }),
-    getResetButtonLabel: () =>
-      i18n.translate('xpack.canvas.argFormAdvancedFailure.resetButtonLabel', {
-        defaultMessage: 'Reset',
-      }),
-    getRowErrorMessage: () =>
-      i18n.translate('xpack.canvas.argFormAdvancedFailure.rowErrorMessage', {
-        defaultMessage: 'Invalid Expression',
-      }),
-  },
-  ArgFormArgSimpleForm: {
-    getRemoveAriaLabel: () =>
-      i18n.translate('xpack.canvas.argFormArgSimpleForm.removeAriaLabel', {
-        defaultMessage: 'Remove',
-      }),
-    getRequiredTooltip: () =>
-      i18n.translate('xpack.canvas.argFormArgSimpleForm.requiredTooltip', {
-        defaultMessage: 'This argument is required, you should specify a value.',
-      }),
-  },
-  ArgFormPendingArgValue: {
-    getLoadingMessage: () =>
-      i18n.translate('xpack.canvas.argFormPendingArgValue.loadingMessage', {
-        defaultMessage: 'Loading',
-      }),
-  },
-  ArgFormSimpleFailure: {
-    getFailureTooltip: () =>
-      i18n.translate('xpack.canvas.argFormSimpleFailure.failureTooltip', {
-        defaultMessage:
-          'The interface for this argument could not parse the value, so a fallback input is being used',
-      }),
-  },
-  Asset: {
-    getCopyAssetTooltip: () =>
-      i18n.translate('xpack.canvas.asset.copyAssetTooltip', {
-        defaultMessage: 'Copy id to clipboard',
-      }),
-    getCreateImageTooltip: () =>
-      i18n.translate('xpack.canvas.asset.createImageTooltip', {
-        defaultMessage: 'Create image element',
-      }),
-    getDeleteAssetTooltip: () =>
-      i18n.translate('xpack.canvas.asset.deleteAssetTooltip', {
-        defaultMessage: 'Delete',
-      }),
-    getDownloadAssetTooltip: () =>
-      i18n.translate('xpack.canvas.asset.downloadAssetTooltip', {
-        defaultMessage: 'Download',
-      }),
-    getThumbnailAltText: () =>
-      i18n.translate('xpack.canvas.asset.thumbnailAltText', {
-        defaultMessage: 'Asset thumbnail',
-      }),
-    getConfirmModalButtonLabel: () =>
-      i18n.translate('xpack.canvas.asset.confirmModalButtonLabel', {
-        defaultMessage: 'Remove',
-      }),
-    getConfirmModalMessageText: () =>
-      i18n.translate('xpack.canvas.asset.confirmModalDetail', {
-        defaultMessage: 'Are you sure you want to remove this asset?',
-      }),
-    getConfirmModalTitle: () =>
-      i18n.translate('xpack.canvas.asset.confirmModalTitle', {
-        defaultMessage: 'Remove Asset',
-      }),
-  },
-  AssetManager: {
-    getButtonLabel: () =>
-      i18n.translate('xpack.canvas.assetManager.manageButtonLabel', {
-        defaultMessage: 'Manage assets',
-      }),
-    getDescription: () =>
-      i18n.translate('xpack.canvas.assetModal.modalDescription', {
-        defaultMessage:
-          'Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.',
-      }),
-    getEmptyAssetsDescription: () =>
-      i18n.translate('xpack.canvas.assetModal.emptyAssetsDescription', {
-        defaultMessage: 'Import your assets to get started',
-      }),
-    getFilePickerPromptText: () =>
-      i18n.translate('xpack.canvas.assetModal.filePickerPromptText', {
-        defaultMessage: 'Select or drag and drop images',
-      }),
-    getLoadingText: () =>
-      i18n.translate('xpack.canvas.assetModal.loadingText', {
-        defaultMessage: 'Uploading images',
-      }),
-    getModalCloseButtonLabel: () =>
-      i18n.translate('xpack.canvas.assetModal.modalCloseButtonLabel', {
-        defaultMessage: 'Close',
-      }),
-    getModalTitle: () =>
-      i18n.translate('xpack.canvas.assetModal.modalTitle', {
-        defaultMessage: 'Manage workpad assets',
-      }),
-    getSpaceUsedText: (percentageUsed: number) =>
-      i18n.translate('xpack.canvas.assetModal.spacedUsedText', {
-        defaultMessage: '{percentageUsed}% space used',
-        values: {
-          percentageUsed,
-        },
-      }),
-    getCopyAssetMessage: (id: string) =>
-      i18n.translate('xpack.canvas.assetModal.copyAssetMessage', {
-        defaultMessage: `Copied '{id}' to clipboard`,
-        values: {
-          id,
-        },
-      }),
-  },
-  AssetPicker: {
-    getAssetAltText: () =>
-      i18n.translate('xpack.canvas.assetpicker.assetAltText', {
-        defaultMessage: 'Asset thumbnail',
-      }),
-  },
-  CanvasLoading: {
-    getLoadingLabel: () =>
-      i18n.translate('xpack.canvas.canvasLoading.loadingMessage', {
-        defaultMessage: 'Loading',
-      }),
-  },
-  ColorManager: {
-    getAddAriaLabel: () =>
-      i18n.translate('xpack.canvas.colorManager.addAriaLabel', {
-        defaultMessage: 'Add Color',
-      }),
-    getCodePlaceholder: () =>
-      i18n.translate('xpack.canvas.colorManager.codePlaceholder', {
-        defaultMessage: 'Color code',
-      }),
-    getRemoveAriaLabel: () =>
-      i18n.translate('xpack.canvas.colorManager.removeAriaLabel', {
-        defaultMessage: 'Remove Color',
-      }),
-  },
-  CustomElementModal: {
-    getCancelButtonLabel: () =>
-      i18n.translate('xpack.canvas.customElementModal.cancelButtonLabel', {
-        defaultMessage: 'Cancel',
-      }),
-    getCharactersRemainingDescription: (numberOfRemainingCharacter: number) =>
-      i18n.translate('xpack.canvas.customElementModal.remainingCharactersDescription', {
-        defaultMessage: '{numberOfRemainingCharacter} characters remaining',
-        values: {
-          numberOfRemainingCharacter,
-        },
-      }),
-    getDescriptionInputLabel: () =>
-      i18n.translate('xpack.canvas.customElementModal.descriptionInputLabel', {
-        defaultMessage: 'Description',
-      }),
-    getElementPreviewTitle: () =>
-      i18n.translate('xpack.canvas.customElementModal.elementPreviewTitle', {
-        defaultMessage: 'Element preview',
-      }),
-    getImageFilePickerPlaceholder: () =>
-      i18n.translate('xpack.canvas.customElementModal.imageFilePickerPlaceholder', {
-        defaultMessage: 'Select or drag and drop an image',
-      }),
-    getImageInputDescription: () =>
-      i18n.translate('xpack.canvas.customElementModal.imageInputDescription', {
-        defaultMessage:
-          'Take a screenshot of your element and upload it here. This can also be done after saving.',
-      }),
-    getImageInputLabel: () =>
-      i18n.translate('xpack.canvas.customElementModal.imageInputLabel', {
-        defaultMessage: 'Thumbnail image',
-      }),
-    getNameInputLabel: () =>
-      i18n.translate('xpack.canvas.customElementModal.nameInputLabel', {
-        defaultMessage: 'Name',
-      }),
-    getSaveButtonLabel: () =>
-      i18n.translate('xpack.canvas.customElementModal.saveButtonLabel', {
-        defaultMessage: 'Save',
-      }),
-  },
-  DatasourceDatasourceComponent: {
-    getChangeButtonLabel: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourceComponent.changeButtonLabel', {
-        defaultMessage: 'Change element data source',
-      }),
-    getExpressionArgDescription: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourceComponent.expressionArgDescription', {
-        defaultMessage:
-          'The datasource has an argument controlled by an expression. Use the expression editor to modify the datasource.',
-      }),
-    getPreviewButtonLabel: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourceComponent.previewButtonLabel', {
-        defaultMessage: 'Preview data',
-      }),
-    getSaveButtonLabel: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourceComponent.saveButtonLabel', {
-        defaultMessage: 'Save',
-      }),
-  },
-  DatasourceDatasourcePreview: {
-    getEmptyFirstLineDescription: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptyFirstLineDescription', {
-        defaultMessage: "We couldn't find any documents matching your search criteria.",
-      }),
-    getEmptySecondLineDescription: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptySecondLineDescription', {
-        defaultMessage: 'Check your datasource settings and try again.',
-      }),
-    getEmptyTitle: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptyTitle', {
-        defaultMessage: 'No documents found',
-      }),
-    getModalTitle: () =>
-      i18n.translate('xpack.canvas.datasourceDatasourcePreview.modalTitle', {
-        defaultMessage: 'Datasource preview',
-      }),
-  },
-  DatasourceNoDatasource: {
-    getPanelDescription: () =>
-      i18n.translate('xpack.canvas.datasourceNoDatasource.panelDescription', {
-        defaultMessage:
-          "This element does not have an attached data source. This is usually because the element is an image or other static asset. If that's not the case you might want to check your expression to make sure it is not malformed.",
-      }),
-    getPanelTitle: () =>
-      i18n.translate('xpack.canvas.datasourceNoDatasource.panelTitle', {
-        defaultMessage: 'No data source present',
-      }),
-  },
-  DropdownFilter: {
-    getMatchAllOptionLabel: () =>
-      i18n.translate('xpack.canvas.renderer.dropdownFilter.matchAllOptionLabel', {
-        defaultMessage: 'ANY',
-        description: 'The dropdown filter option to match any value in the field.',
-      }),
-  },
-  ElementConfig: {
-    getFailedLabel: () =>
-      i18n.translate('xpack.canvas.elementConfig.failedLabel', {
-        defaultMessage: 'Failed',
-        description:
-          'The label for the total number of elements in a workpad that have thrown an error or failed to load',
-      }),
-    getLoadedLabel: () =>
-      i18n.translate('xpack.canvas.elementConfig.loadedLabel', {
-        defaultMessage: 'Loaded',
-        description: 'The label for the number of elements in a workpad that have loaded',
-      }),
-    getProgressLabel: () =>
-      i18n.translate('xpack.canvas.elementConfig.progressLabel', {
-        defaultMessage: 'Progress',
-        description: 'The label for the percentage of elements that have finished loading',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.elementConfig.title', {
-        defaultMessage: 'Element status',
-        description:
-          '"Elements" refers to the individual text, images, or visualizations that you can add to a Canvas workpad',
-      }),
-    getTotalLabel: () =>
-      i18n.translate('xpack.canvas.elementConfig.totalLabel', {
-        defaultMessage: 'Total',
-        description: 'The label for the total number of elements in a workpad',
-      }),
-  },
-  ElementControls: {
-    getDeleteAriaLabel: () =>
-      i18n.translate('xpack.canvas.elementControls.deleteAriaLabel', {
-        defaultMessage: 'Delete element',
-      }),
-    getDeleteTooltip: () =>
-      i18n.translate('xpack.canvas.elementControls.deleteToolTip', {
-        defaultMessage: 'Delete',
-      }),
-    getEditAriaLabel: () =>
-      i18n.translate('xpack.canvas.elementControls.editAriaLabel', {
-        defaultMessage: 'Edit element',
-      }),
-    getEditTooltip: () =>
-      i18n.translate('xpack.canvas.elementControls.editToolTip', {
-        defaultMessage: 'Edit',
-      }),
-  },
-  ElementSettings: {
-    getDataTabLabel: () =>
-      i18n.translate('xpack.canvas.elementSettings.dataTabLabel', {
-        defaultMessage: 'Data',
-        description:
-          'This tab contains the settings for the data (i.e. Elasticsearch query) used as ' +
-          'the source for a Canvas element',
-      }),
-    getDisplayTabLabel: () =>
-      i18n.translate('xpack.canvas.elementSettings.displayTabLabel', {
-        defaultMessage: 'Display',
-        description: 'This tab contains the settings for how data is displayed in a Canvas element',
-      }),
-  },
-  Error: {
-    getDescription: () =>
-      i18n.translate('xpack.canvas.errorComponent.description', {
-        defaultMessage: 'Expression failed with the message:',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.errorComponent.title', {
-        defaultMessage: 'Whoops! Expression failed',
-      }),
-  },
-  Expression: {
-    getCancelButtonLabel: () =>
-      i18n.translate('xpack.canvas.expression.cancelButtonLabel', {
-        defaultMessage: 'Cancel',
-      }),
-    getCloseButtonLabel: () =>
-      i18n.translate('xpack.canvas.expression.closeButtonLabel', {
-        defaultMessage: 'Close',
-      }),
-    getLearnLinkText: () =>
-      i18n.translate('xpack.canvas.expression.learnLinkText', {
-        defaultMessage: 'Learn expression syntax',
-      }),
-    getMaximizeButtonLabel: () =>
-      i18n.translate('xpack.canvas.expression.maximizeButtonLabel', {
-        defaultMessage: 'Maximize editor',
-      }),
-    getMinimizeButtonLabel: () =>
-      i18n.translate('xpack.canvas.expression.minimizeButtonLabel', {
-        defaultMessage: 'Minimize Editor',
-      }),
-    getRunButtonLabel: () =>
-      i18n.translate('xpack.canvas.expression.runButtonLabel', {
-        defaultMessage: 'Run',
-      }),
-    getRunTooltip: () =>
-      i18n.translate('xpack.canvas.expression.runTooltip', {
-        defaultMessage: 'Run the expression',
-      }),
-  },
-  ExpressionElementNotSelected: {
-    getCloseButtonLabel: () =>
-      i18n.translate('xpack.canvas.expressionElementNotSelected.closeButtonLabel', {
-        defaultMessage: 'Close',
-      }),
-    getSelectDescription: () =>
-      i18n.translate('xpack.canvas.expressionElementNotSelected.selectDescription', {
-        defaultMessage: 'Select an element to show expression input',
-      }),
-  },
-  ExpressionInput: {
-    getArgReferenceAliasesDetail: (aliases: string) =>
-      i18n.translate('xpack.canvas.expressionInput.argReferenceAliasesDetail', {
-        defaultMessage: '{BOLD_MD_TOKEN}Aliases{BOLD_MD_TOKEN}: {aliases}',
-        values: {
-          BOLD_MD_TOKEN,
-          aliases,
-        },
-      }),
-    getArgReferenceDefaultDetail: (defaultVal: string) =>
-      i18n.translate('xpack.canvas.expressionInput.argReferenceDefaultDetail', {
-        defaultMessage: '{BOLD_MD_TOKEN}Default{BOLD_MD_TOKEN}: {defaultVal}',
-        values: {
-          BOLD_MD_TOKEN,
-          defaultVal,
-        },
-      }),
-    getArgReferenceRequiredDetail: (required: string) =>
-      i18n.translate('xpack.canvas.expressionInput.argReferenceRequiredDetail', {
-        defaultMessage: '{BOLD_MD_TOKEN}Required{BOLD_MD_TOKEN}: {required}',
-        values: {
-          BOLD_MD_TOKEN,
-          required,
-        },
-      }),
-    getArgReferenceTypesDetail: (types: string) =>
-      i18n.translate('xpack.canvas.expressionInput.argReferenceTypesDetail', {
-        defaultMessage: '{BOLD_MD_TOKEN}Types{BOLD_MD_TOKEN}: {types}',
-        values: {
-          BOLD_MD_TOKEN,
-          types,
-        },
-      }),
-    getFunctionReferenceAcceptsDetail: (acceptTypes: string) =>
-      i18n.translate('xpack.canvas.expressionInput.functionReferenceAccepts', {
-        defaultMessage: '{BOLD_MD_TOKEN}Accepts{BOLD_MD_TOKEN}: {acceptTypes}',
-        values: {
-          BOLD_MD_TOKEN,
-          acceptTypes,
-        },
-      }),
-    getFunctionReferenceReturnsDetail: (returnType: string) =>
-      i18n.translate('xpack.canvas.expressionInput.functionReferenceReturns', {
-        defaultMessage: '{BOLD_MD_TOKEN}Returns{BOLD_MD_TOKEN}: {returnType}',
-        values: {
-          BOLD_MD_TOKEN,
-          returnType,
-        },
-      }),
-  },
-  FunctionFormContextError: {
-    getContextErrorMessage: (errorMessage: string) =>
-      i18n.translate('xpack.canvas.functionForm.contextError', {
-        defaultMessage: 'ERROR: {errorMessage}',
-        values: {
-          errorMessage,
-        },
-      }),
-  },
-  FunctionFormFunctionUnknown: {
-    getUnknownArgumentTypeErrorMessage: (expressionType: string) =>
-      i18n.translate('xpack.canvas.functionForm.functionUnknown.unknownArgumentTypeError', {
-        defaultMessage: 'Unknown expression type "{expressionType}"',
-        values: {
-          expressionType,
-        },
-      }),
-  },
-  GroupSettings: {
-    getSaveGroupDescription: () =>
-      i18n.translate('xpack.canvas.groupSettings.saveGroupDescription', {
-        defaultMessage: 'Save this group as a new element to re-use it throughout your workpad.',
-      }),
-    getUngroupDescription: () =>
-      i18n.translate('xpack.canvas.groupSettings.ungroupDescription', {
-        defaultMessage: 'Ungroup ({uKey}) to edit individual element settings.',
-        values: {
-          uKey: 'U',
-        },
-      }),
-  },
-  HelpMenu: {
-    getDocumentationLinkLabel: () =>
-      i18n.translate('xpack.canvas.helpMenu.documentationLinkLabel', {
-        defaultMessage: '{CANVAS} documentation',
-        values: {
-          CANVAS,
-        },
-      }),
-    getHelpMenuDescription: () =>
-      i18n.translate('xpack.canvas.helpMenu.description', {
-        defaultMessage: 'For {CANVAS} specific information',
-        values: {
-          CANVAS,
-        },
-      }),
-    getKeyboardShortcutsLinkLabel: () =>
-      i18n.translate('xpack.canvas.helpMenu.keyboardShortcutsLinkLabel', {
-        defaultMessage: 'Keyboard shortcuts',
-      }),
-  },
-  KeyboardShortcutsDoc: {
-    getFlyoutCloseButtonAriaLabel: () =>
-      i18n.translate('xpack.canvas.keyboardShortcutsDoc.flyout.closeButtonAriaLabel', {
-        defaultMessage: 'Closes keyboard shortcuts reference',
-      }),
-    getShortcutSeparator: () =>
-      i18n.translate('xpack.canvas.keyboardShortcutsDoc.shortcutListSeparator', {
-        defaultMessage: 'or',
-        description:
-          'Separates which keyboard shortcuts can be used for a single action. Example: "{shortcut1} or {shortcut2} or {shortcut3}"',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.keyboardShortcutsDoc.flyoutHeaderTitle', {
-        defaultMessage: 'Keyboard shortcuts',
-      }),
-  },
-  LabsControl: {
-    getLabsButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderLabsControlSettings.labsButtonLabel', {
-        defaultMessage: 'Labs',
-      }),
-    getAriaLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderLabsControlSettings.labsAriaLabel', {
-        defaultMessage: 'View labs projects',
-      }),
-    getTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeaderLabsControlSettings.labsTooltip', {
-        defaultMessage: 'View labs projects',
-      }),
-  },
-  Link: {
-    getErrorMessage: (message: string) =>
-      i18n.translate('xpack.canvas.link.errorMessage', {
-        defaultMessage: 'LINK ERROR: {message}',
-        values: {
-          message,
-        },
-      }),
-  },
-  MultiElementSettings: {
-    getMultipleElementsActionsDescription: () =>
-      i18n.translate('xpack.canvas.groupSettings.multipleElementsActionsDescription', {
-        defaultMessage:
-          'Deselect these elements to edit their individual settings, press ({gKey}) to group them, or save this selection as a new ' +
-          'element to re-use it throughout your workpad.',
-        values: {
-          gKey: 'G',
-        },
-      }),
-    getMultipleElementsDescription: () =>
-      i18n.translate('xpack.canvas.groupSettings.multipleElementsDescription', {
-        defaultMessage: 'Multiple elements are currently selected.',
-      }),
-  },
-  PageConfig: {
-    getBackgroundColorDescription: () =>
-      i18n.translate('xpack.canvas.pageConfig.backgroundColorDescription', {
-        defaultMessage: 'Accepts HEX, RGB or HTML color names',
-      }),
-    getBackgroundColorLabel: () =>
-      i18n.translate('xpack.canvas.pageConfig.backgroundColorLabel', {
-        defaultMessage: 'Background',
-      }),
-    getNoTransitionDropDownOptionLabel: () =>
-      i18n.translate('xpack.canvas.pageConfig.transitions.noneDropDownOptionLabel', {
-        defaultMessage: 'None',
-        description:
-          'This is the option the user should choose if they do not want any page transition (i.e. fade in, fade out, etc) to ' +
-          'be applied to the current page.',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.pageConfig.title', {
-        defaultMessage: 'Page settings',
-      }),
-    getTransitionLabel: () =>
-      i18n.translate('xpack.canvas.pageConfig.transitionLabel', {
-        defaultMessage: 'Transition',
-        description:
-          'This refers to the transition effect, such as fade in or rotate,  applied to a page in presentation mode.',
-      }),
-    getTransitionPreviewLabel: () =>
-      i18n.translate('xpack.canvas.pageConfig.transitionPreviewLabel', {
-        defaultMessage: 'Preview',
-        description: 'This is the label for a preview of the transition effect selected.',
-      }),
-  },
-  PageManager: {
-    getPageNumberAriaLabel: (pageNumber: number) =>
-      i18n.translate('xpack.canvas.pageManager.pageNumberAriaLabel', {
-        defaultMessage: 'Load page number {pageNumber}',
-        values: {
-          pageNumber,
-        },
-      }),
-    getAddPageTooltip: () =>
-      i18n.translate('xpack.canvas.pageManager.addPageTooltip', {
-        defaultMessage: 'Add a new page to this workpad',
-      }),
-    getConfirmRemoveTitle: () =>
-      i18n.translate('xpack.canvas.pageManager.confirmRemoveTitle', {
-        defaultMessage: 'Remove Page',
-      }),
-    getConfirmRemoveDescription: () =>
-      i18n.translate('xpack.canvas.pageManager.confirmRemoveDescription', {
-        defaultMessage: 'Are you sure you want to remove this page?',
-      }),
-    getConfirmRemoveButtonLabel: () =>
-      i18n.translate('xpack.canvas.pageManager.removeButtonLabel', {
-        defaultMessage: 'Remove',
-      }),
-  },
-  PagePreviewPageControls: {
-    getClonePageAriaLabel: () =>
-      i18n.translate('xpack.canvas.pagePreviewPageControls.clonePageAriaLabel', {
-        defaultMessage: 'Clone page',
-      }),
-    getClonePageTooltip: () =>
-      i18n.translate('xpack.canvas.pagePreviewPageControls.clonePageTooltip', {
-        defaultMessage: 'Clone',
-      }),
-    getDeletePageAriaLabel: () =>
-      i18n.translate('xpack.canvas.pagePreviewPageControls.deletePageAriaLabel', {
-        defaultMessage: 'Delete page',
-      }),
-    getDeletePageTooltip: () =>
-      i18n.translate('xpack.canvas.pagePreviewPageControls.deletePageTooltip', {
-        defaultMessage: 'Delete',
-      }),
-  },
-  PalettePicker: {
-    getEmptyPaletteLabel: () =>
-      i18n.translate('xpack.canvas.palettePicker.emptyPaletteLabel', {
-        defaultMessage: 'None',
-      }),
-    getNoPaletteFoundErrorTitle: () =>
-      i18n.translate('xpack.canvas.palettePicker.noPaletteFoundErrorTitle', {
-        defaultMessage: 'Color palette not found',
-      }),
-  },
-  SavedElementsModal: {
-    getAddNewElementDescription: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.addNewElementDescription', {
-        defaultMessage: 'Group and save workpad elements to create new elements',
-      }),
-    getAddNewElementTitle: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.addNewElementTitle', {
-        defaultMessage: 'Add new elements',
-      }),
-    getCancelButtonLabel: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.cancelButtonLabel', {
-        defaultMessage: 'Cancel',
-      }),
-    getDeleteButtonLabel: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.deleteButtonLabel', {
-        defaultMessage: 'Delete',
-      }),
-    getDeleteElementDescription: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.deleteElementDescription', {
-        defaultMessage: 'Are you sure you want to delete this element?',
-      }),
-    getDeleteElementTitle: (elementName: string) =>
-      i18n.translate('xpack.canvas.savedElementsModal.deleteElementTitle', {
-        defaultMessage: `Delete element '{elementName}'?`,
-        values: {
-          elementName,
-        },
-      }),
-    getEditElementTitle: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.editElementTitle', {
-        defaultMessage: 'Edit element',
-      }),
-    getElementsTitle: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.elementsTitle', {
-        defaultMessage: 'Elements',
-        description: 'Title for the "Elements" tab when adding a new element',
-      }),
-    getFindElementPlaceholder: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.findElementPlaceholder', {
-        defaultMessage: 'Find element',
-      }),
-    getModalTitle: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.modalTitle', {
-        defaultMessage: 'My elements',
-      }),
-    getMyElementsTitle: () =>
-      i18n.translate('xpack.canvas.savedElementsModal.myElementsTitle', {
-        defaultMessage: 'My elements',
-        description: 'Title for the "My elements" tab when adding a new element',
-      }),
-    getSavedElementsModalCloseButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeader.addElementModalCloseButtonLabel', {
-        defaultMessage: 'Close',
-      }),
-  },
-  ShareWebsiteFlyout: {
-    getRuntimeStepTitle: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.downloadRuntimeTitle', {
-        defaultMessage: 'Download runtime',
-      }),
-    getSnippentsStepTitle: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.addSnippetsTitle', {
-        defaultMessage: 'Add snippets to website',
-      }),
-    getStepsDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.description', {
-        defaultMessage:
-          'Follow these steps to share a static version of this workpad on an external website. It will be a visual snapshot of the current workpad, and will not have access to live data.',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.flyoutTitle', {
-        defaultMessage: 'Share on a website',
-      }),
-    getUnsupportedRendererWarning: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.unsupportedRendererWarning', {
-        defaultMessage:
-          'This workpad contains render functions that are not supported by the {CANVAS} Shareable Workpad Runtime. These elements will not be rendered:',
-        values: {
-          CANVAS,
-        },
-      }),
-    getWorkpadStepTitle: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.downloadWorkpadTitle', {
-        defaultMessage: 'Download workpad',
-      }),
-  },
-  ShareWebsiteRuntimeStep: {
-    getDownloadLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.runtimeStep.downloadLabel', {
-        defaultMessage: 'Download runtime',
-      }),
-    getStepDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.runtimeStep.description', {
-        defaultMessage:
-          'In order to render a Shareable Workpad, you also need to include the {CANVAS} Shareable Workpad Runtime. You can skip this step if the runtime is already included on your website.',
-        values: {
-          CANVAS,
-        },
-      }),
-  },
-  ShareWebsiteSnippetsStep: {
-    getAutoplayParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.autoplayParameterDescription', {
-        defaultMessage: 'Should the runtime automatically move through the pages of the workpad?',
-      }),
-    getCallRuntimeLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.callRuntimeLabel', {
-        defaultMessage: 'Call Runtime',
-      }),
-    getHeightParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.heightParameterDescription', {
-        defaultMessage: 'The height of the Workpad. Defaults to the Workpad height.',
-      }),
-    getIncludeRuntimeLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.includeRuntimeLabel', {
-        defaultMessage: 'Include Runtime',
-      }),
-    getIntervalParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.intervalParameterDescription', {
-        defaultMessage:
-          'The interval upon which the pages will advance in time format, (e.g. {twoSeconds}, {oneMinute})',
-        values: {
-          twoSeconds: '2s',
-          oneMinute: '1m',
-        },
-      }),
-    getPageParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.pageParameterDescription', {
-        defaultMessage: 'The page to display. Defaults to the page specified by the Workpad.',
-      }),
-    getParametersDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.parametersDescription', {
-        defaultMessage:
-          'There are a number of inline parameters to configure the Shareable Workpad.',
-      }),
-    getParametersTitle: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.parametersLabel', {
-        defaultMessage: 'Parameters',
-      }),
-    getPlaceholderLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.placeholderLabel', {
-        defaultMessage: 'Placeholder',
-      }),
-    getRequiredLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.requiredLabel', {
-        defaultMessage: 'required',
-      }),
-    getShareableParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.shareableParameterDescription', {
-        defaultMessage: 'The type of shareable. In this case, a {CANVAS} Workpad.',
-        values: {
-          CANVAS,
-        },
-      }),
-    getSnippetsStepDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.description', {
-        defaultMessage:
-          'The Workpad is placed within the {HTML} of the site by using an {HTML} placeholder. Parameters for the runtime are included inline. See the full list of parameters below. You can include more than one workpad on the page.',
-        values: {
-          HTML,
-        },
-      }),
-    getToolbarParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.toolbarParameterDescription', {
-        defaultMessage: 'Should the toolbar be hidden?',
-      }),
-    getUrlParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.urlParameterDescription', {
-        defaultMessage: 'The {URL} of the Shareable Workpad {JSON} file.',
-        values: {
-          URL,
-          JSON,
-        },
-      }),
-    getWidthParameterDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.widthParameterDescription', {
-        defaultMessage: 'The width of the Workpad. Defaults to the Workpad width.',
-      }),
-  },
-  ShareWebsiteWorkpadStep: {
-    getDownloadLabel: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.workpadStep.downloadLabel', {
-        defaultMessage: 'Download workpad',
-      }),
-    getStepDescription: () =>
-      i18n.translate('xpack.canvas.shareWebsiteFlyout.workpadStep.description', {
-        defaultMessage:
-          'The workpad will be exported as a single {JSON} file for sharing in another site.',
-        values: {
-          JSON,
-        },
-      }),
-  },
-  SidebarContent: {
-    getGroupedElementSidebarTitle: () =>
-      i18n.translate('xpack.canvas.sidebarContent.groupedElementSidebarTitle', {
-        defaultMessage: 'Grouped element',
-        description:
-          'The title displayed when a grouped element is selected. "elements" refer to the different visualizations, images, ' +
-          'text, etc that can be added in a Canvas workpad. These elements can be grouped into a larger "grouped element" ' +
-          'that contains multiple individual elements.',
-      }),
-    getMultiElementSidebarTitle: () =>
-      i18n.translate('xpack.canvas.sidebarContent.multiElementSidebarTitle', {
-        defaultMessage: 'Multiple elements',
-        description:
-          'The title displayed when multiple elements are selected. "elements" refer to the different visualizations, images, ' +
-          'text, etc that can be added in a Canvas workpad.',
-      }),
-    getSingleElementSidebarTitle: () =>
-      i18n.translate('xpack.canvas.sidebarContent.singleElementSidebarTitle', {
-        defaultMessage: 'Selected element',
-        description:
-          'The title displayed when a single element are selected. "element" refer to the different visualizations, images, ' +
-          'text, etc that can be added in a Canvas workpad.',
-      }),
-  },
-  SidebarHeader: {
-    getBringForwardAriaLabel: () =>
-      i18n.translate('xpack.canvas.sidebarHeader.bringForwardArialLabel', {
-        defaultMessage: 'Move element up one layer',
-      }),
-    getBringToFrontAriaLabel: () =>
-      i18n.translate('xpack.canvas.sidebarHeader.bringToFrontArialLabel', {
-        defaultMessage: 'Move element to top layer',
-      }),
-    getSendBackwardAriaLabel: () =>
-      i18n.translate('xpack.canvas.sidebarHeader.sendBackwardArialLabel', {
-        defaultMessage: 'Move element down one layer',
-      }),
-    getSendToBackAriaLabel: () =>
-      i18n.translate('xpack.canvas.sidebarHeader.sendToBackArialLabel', {
-        defaultMessage: 'Move element to bottom layer',
-      }),
-  },
-  TextStylePicker: {
-    getAlignCenterOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.alignCenterOption', {
-        defaultMessage: 'Align center',
-      }),
-    getAlignLeftOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.alignLeftOption', {
-        defaultMessage: 'Align left',
-      }),
-    getAlignRightOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.alignRightOption', {
-        defaultMessage: 'Align right',
-      }),
-    getAlignmentOptionsControlLegend: () =>
-      i18n.translate('xpack.canvas.textStylePicker.alignmentOptionsControl', {
-        defaultMessage: 'Alignment options',
-      }),
-    getFontColorLabel: () =>
-      i18n.translate('xpack.canvas.textStylePicker.fontColorLabel', {
-        defaultMessage: 'Font Color',
-      }),
-    getStyleBoldOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.styleBoldOption', {
-        defaultMessage: 'Bold',
-      }),
-    getStyleItalicOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.styleItalicOption', {
-        defaultMessage: 'Italic',
-      }),
-    getStyleUnderlineOption: () =>
-      i18n.translate('xpack.canvas.textStylePicker.styleUnderlineOption', {
-        defaultMessage: 'Underline',
-      }),
-    getStyleOptionsControlLegend: () =>
-      i18n.translate('xpack.canvas.textStylePicker.styleOptionsControl', {
-        defaultMessage: 'Style options',
-      }),
-  },
-  TimePicker: {
-    getApplyButtonLabel: () =>
-      i18n.translate('xpack.canvas.timePicker.applyButtonLabel', {
-        defaultMessage: 'Apply',
-      }),
-  },
-  Toolbar: {
-    getEditorButtonLabel: () =>
-      i18n.translate('xpack.canvas.toolbar.editorButtonLabel', {
-        defaultMessage: 'Expression editor',
-      }),
-    getNextPageAriaLabel: () =>
-      i18n.translate('xpack.canvas.toolbar.nextPageAriaLabel', {
-        defaultMessage: 'Next Page',
-      }),
-    getPageButtonLabel: (pageNum: number, totalPages: number) =>
-      i18n.translate('xpack.canvas.toolbar.pageButtonLabel', {
-        defaultMessage: 'Page {pageNum}{rest}',
-        values: {
-          pageNum,
-          rest: totalPages > 1 ? ` of ${totalPages}` : '',
-        },
-      }),
-    getPreviousPageAriaLabel: () =>
-      i18n.translate('xpack.canvas.toolbar.previousPageAriaLabel', {
-        defaultMessage: 'Previous Page',
-      }),
-    getWorkpadManagerCloseButtonLabel: () =>
-      i18n.translate('xpack.canvas.toolbar.workpadManagerCloseButtonLabel', {
-        defaultMessage: 'Close',
-      }),
-    getErrorMessage: (message: string) =>
-      i18n.translate('xpack.canvas.toolbar.errorMessage', {
-        defaultMessage: 'TOOLBAR ERROR: {message}',
-        values: {
-          message,
-        },
-      }),
-  },
-  ToolbarTray: {
-    getCloseTrayAriaLabel: () =>
-      i18n.translate('xpack.canvas.toolbarTray.closeTrayAriaLabel', {
-        defaultMessage: 'Close tray',
-      }),
-  },
-  VarConfig: {
-    getAddButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.addButtonLabel', {
-        defaultMessage: 'Add a variable',
-      }),
-    getAddTooltipLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.addTooltipLabel', {
-        defaultMessage: 'Add a variable',
-      }),
-    getCopyActionButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.copyActionButtonLabel', {
-        defaultMessage: 'Copy snippet',
-      }),
-    getCopyActionTooltipLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.copyActionTooltipLabel', {
-        defaultMessage: 'Copy variable syntax to clipboard',
-      }),
-    getCopyNotificationDescription: () =>
-      i18n.translate('xpack.canvas.varConfig.copyNotificationDescription', {
-        defaultMessage: 'Variable syntax copied to clipboard',
-      }),
-    getDeleteActionButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.deleteActionButtonLabel', {
-        defaultMessage: 'Delete variable',
-      }),
-    getDeleteNotificationDescription: () =>
-      i18n.translate('xpack.canvas.varConfig.deleteNotificationDescription', {
-        defaultMessage: 'Variable successfully deleted',
-      }),
-    getEditActionButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.editActionButtonLabel', {
-        defaultMessage: 'Edit variable',
-      }),
-    getEmptyDescription: () =>
-      i18n.translate('xpack.canvas.varConfig.emptyDescription', {
-        defaultMessage:
-          'This workpad has no variables currently. You may add variables to store and edit common values. These variables can then be used in elements or within the expression editor.',
-      }),
-    getTableNameLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.tableNameLabel', {
-        defaultMessage: 'Name',
-      }),
-    getTableTypeLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.tableTypeLabel', {
-        defaultMessage: 'Type',
-      }),
-    getTableValueLabel: () =>
-      i18n.translate('xpack.canvas.varConfig.tableValueLabel', {
-        defaultMessage: 'Value',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.varConfig.titleLabel', {
-        defaultMessage: 'Variables',
-      }),
-    getTitleTooltip: () =>
-      i18n.translate('xpack.canvas.varConfig.titleTooltip', {
-        defaultMessage: 'Add variables to store and edit common values',
-      }),
-  },
-  VarConfigDeleteVar: {
-    getCancelButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfigDeleteVar.cancelButtonLabel', {
-        defaultMessage: 'Cancel',
-      }),
-    getDeleteButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfigDeleteVar.deleteButtonLabel', {
-        defaultMessage: 'Delete variable',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.varConfigDeleteVar.titleLabel', {
-        defaultMessage: 'Delete variable?',
-      }),
-    getWarningDescription: () =>
-      i18n.translate('xpack.canvas.varConfigDeleteVar.warningDescription', {
-        defaultMessage:
-          'Deleting this variable may adversely affect the workpad. Are you sure you wish to continue?',
-      }),
-  },
-  VarConfigEditVar: {
-    getAddTitle: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.addTitleLabel', {
-        defaultMessage: 'Add variable',
-      }),
-    getCancelButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.cancelButtonLabel', {
-        defaultMessage: 'Cancel',
-      }),
-    getDuplicateNameError: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.duplicateNameError', {
-        defaultMessage: 'Variable name already in use',
-      }),
-    getEditTitle: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.editTitleLabel', {
-        defaultMessage: 'Edit variable',
-      }),
-    getEditWarning: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.editWarning', {
-        defaultMessage: 'Editing a variable in use may adversely affect your workpad',
-      }),
-    getNameFieldLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.nameFieldLabel', {
-        defaultMessage: 'Name',
-      }),
-    getSaveButtonLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.saveButtonLabel', {
-        defaultMessage: 'Save changes',
-      }),
-    getTypeBooleanLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.typeBooleanLabel', {
-        defaultMessage: 'Boolean',
-      }),
-    getTypeFieldLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.typeFieldLabel', {
-        defaultMessage: 'Type',
-      }),
-    getTypeNumberLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.typeNumberLabel', {
-        defaultMessage: 'Number',
-      }),
-    getTypeStringLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.typeStringLabel', {
-        defaultMessage: 'String',
-      }),
-    getValueFieldLabel: () =>
-      i18n.translate('xpack.canvas.varConfigEditVar.valueFieldLabel', {
-        defaultMessage: 'Value',
-      }),
-  },
-  VarConfigVarValueField: {
-    getBooleanOptionsLegend: () =>
-      i18n.translate('xpack.canvas.varConfigVarValueField.booleanOptionsLegend', {
-        defaultMessage: 'Boolean value',
-      }),
-    getFalseOption: () =>
-      i18n.translate('xpack.canvas.varConfigVarValueField.falseOption', {
-        defaultMessage: 'False',
-      }),
-    getTrueOption: () =>
-      i18n.translate('xpack.canvas.varConfigVarValueField.trueOption', {
-        defaultMessage: 'True',
-      }),
-  },
-  WorkpadConfig: {
-    getApplyStylesheetButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.applyStylesheetButtonLabel', {
-        defaultMessage: `Apply stylesheet`,
-        description:
-          '"stylesheet" refers to the collection of CSS style rules entered by the user.',
-      }),
-    getBackgroundColorLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.backgroundColorLabel', {
-        defaultMessage: 'Background color',
-      }),
-    getFlipDimensionAriaLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.swapDimensionsAriaLabel', {
-        defaultMessage: `Swap the page's width and height`,
-      }),
-    getFlipDimensionTooltip: () =>
-      i18n.translate('xpack.canvas.workpadConfig.swapDimensionsTooltip', {
-        defaultMessage: 'Swap the width and height',
-      }),
-    getGlobalCSSLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.globalCSSLabel', {
-        defaultMessage: `Global CSS overrides`,
-      }),
-    getGlobalCSSTooltip: () =>
-      i18n.translate('xpack.canvas.workpadConfig.globalCSSTooltip', {
-        defaultMessage: `Apply styles to all pages in this workpad`,
-      }),
-    getNameLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.nameLabel', {
-        defaultMessage: 'Name',
-      }),
-    getPageHeightLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.heightLabel', {
-        defaultMessage: 'Height',
-      }),
-    getPageSizeBadgeAriaLabel: (sizeName: string) =>
-      i18n.translate('xpack.canvas.workpadConfig.pageSizeBadgeAriaLabel', {
-        defaultMessage: `Preset page size: {sizeName}`,
-        values: {
-          sizeName,
-        },
-      }),
-    getPageSizeBadgeOnClickAriaLabel: (sizeName: string) =>
-      i18n.translate('xpack.canvas.workpadConfig.pageSizeBadgeOnClickAriaLabel', {
-        defaultMessage: `Set page size to {sizeName}`,
-        values: {
-          sizeName,
-        },
-      }),
-    getPageWidthLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.widthLabel', {
-        defaultMessage: 'Width',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.workpadConfig.title', {
-        defaultMessage: 'Workpad settings',
-      }),
-    getUSLetterButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadConfig.USLetterButtonLabel', {
-        defaultMessage: 'US Letter',
-        description: 'This is referring to the dimensions of U.S. standard letter paper.',
-      }),
-  },
-  WorkpadHeader: {
-    getAddElementButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeader.addElementButtonLabel', {
-        defaultMessage: 'Add element',
-      }),
-    getFullScreenButtonAriaLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeader.fullscreenButtonAriaLabel', {
-        defaultMessage: 'View fullscreen',
-      }),
-    getFullScreenTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeader.fullscreenTooltip', {
-        defaultMessage: 'Enter fullscreen mode',
-      }),
-    getHideEditControlTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeader.hideEditControlTooltip', {
-        defaultMessage: 'Hide editing controls',
-      }),
-    getNoWritePermissionTooltipText: () =>
-      i18n.translate('xpack.canvas.workpadHeader.noWritePermissionTooltip', {
-        defaultMessage: "You don't have permission to edit this workpad",
-      }),
-    getShowEditControlTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeader.showEditControlTooltip', {
-        defaultMessage: 'Show editing controls',
-      }),
-  },
-  WorkpadHeaderAutoRefreshControls: {
-    getDisableTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.disableTooltip', {
-        defaultMessage: 'Disable auto-refresh',
-      }),
-    getIntervalFormLabelText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.intervalFormLabel', {
-        defaultMessage: 'Change auto-refresh interval',
-      }),
-    getRefreshListDurationManualText: () =>
-      i18n.translate(
-        'xpack.canvas.workpadHeaderAutoRefreshControls.refreshListDurationManualText',
-        {
-          defaultMessage: 'Manually',
-        }
-      ),
-    getRefreshListTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.refreshListTitle', {
-        defaultMessage: 'Refresh elements',
-      }),
-  },
-  WorkpadHeaderCustomInterval: {
-    getButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderCustomInterval.confirmButtonLabel', {
-        defaultMessage: 'Set',
-      }),
-    getFormDescription: () =>
-      i18n.translate('xpack.canvas.workpadHeaderCustomInterval.formDescription', {
-        defaultMessage:
-          'Use shorthand notation, like {secondsExample}, {minutesExample}, or {hoursExample}',
-        values: {
-          secondsExample: '30s',
-          minutesExample: '10m',
-          hoursExample: '1h',
-        },
-      }),
-    getFormLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderCustomInterval.formLabel', {
-        defaultMessage: 'Set a custom interval',
-      }),
-  },
-  WorkpadHeaderEditMenu: {
-    getAlignmentMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.alignmentMenuItemLabel', {
-        defaultMessage: 'Alignment',
-        description:
-          'This refers to the vertical (i.e. left, center, right) and horizontal (i.e. top, middle, bottom) ' +
-          'alignment options of the selected elements',
-      }),
-    getBottomAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.bottomAlignMenuItemLabel', {
-        defaultMessage: 'Bottom',
-      }),
-    getCenterAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.centerAlignMenuItemLabel', {
-        defaultMessage: 'Center',
-        description: 'This refers to alignment centered horizontally.',
-      }),
-    getCreateElementModalTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.createElementModalTitle', {
-        defaultMessage: 'Create new element',
-      }),
-    getDistributionMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.distributionMenutItemLabel', {
-        defaultMessage: 'Distribution',
-        description:
-          'This refers to the options to evenly spacing the selected elements horizontall or vertically.',
-      }),
-    getEditMenuButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.editMenuButtonLabel', {
-        defaultMessage: 'Edit',
-      }),
-    getEditMenuLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.editMenuLabel', {
-        defaultMessage: 'Edit options',
-      }),
-    getGroupMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.groupMenuItemLabel', {
-        defaultMessage: 'Group',
-        description: 'This refers to grouping multiple selected elements.',
-      }),
-    getHorizontalDistributionMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.horizontalDistributionMenutItemLabel', {
-        defaultMessage: 'Horizontal',
-      }),
-    getLeftAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.leftAlignMenuItemLabel', {
-        defaultMessage: 'Left',
-      }),
-    getMiddleAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.middleAlignMenuItemLabel', {
-        defaultMessage: 'Middle',
-        description: 'This refers to alignment centered vertically.',
-      }),
-    getOrderMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.orderMenuItemLabel', {
-        defaultMessage: 'Order',
-        description: 'Refers to the order of the elements displayed on the page from front to back',
-      }),
-    getRedoMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.redoMenuItemLabel', {
-        defaultMessage: 'Redo',
-      }),
-    getRightAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.rightAlignMenuItemLabel', {
-        defaultMessage: 'Right',
-      }),
-    getSaveElementMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.savedElementMenuItemLabel', {
-        defaultMessage: 'Save as new element',
-      }),
-    getTopAlignMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.topAlignMenuItemLabel', {
-        defaultMessage: 'Top',
-      }),
-    getUndoMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.undoMenuItemLabel', {
-        defaultMessage: 'Undo',
-      }),
-    getUngroupMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.ungroupMenuItemLabel', {
-        defaultMessage: 'Ungroup',
-        description: 'This refers to ungrouping a grouped element',
-      }),
-    getVerticalDistributionMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderEditMenu.verticalDistributionMenutItemLabel', {
-        defaultMessage: 'Vertical',
-      }),
-  },
-  WorkpadHeaderElementMenu: {
-    getAssetsMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.manageAssetsMenuItemLabel', {
-        defaultMessage: 'Manage assets',
-      }),
-    getChartMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.chartMenuItemLabel', {
-        defaultMessage: 'Chart',
-      }),
-    getElementMenuButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.elementMenuButtonLabel', {
-        defaultMessage: 'Add element',
-      }),
-    getElementMenuLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.elementMenuLabel', {
-        defaultMessage: 'Add an element',
-      }),
-    getEmbedObjectMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.embedObjectMenuItemLabel', {
-        defaultMessage: 'Add from Kibana',
-      }),
-    getFilterMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.filterMenuItemLabel', {
-        defaultMessage: 'Filter',
-      }),
-    getImageMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.imageMenuItemLabel', {
-        defaultMessage: 'Image',
-      }),
-    getMyElementsMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.myElementsMenuItemLabel', {
-        defaultMessage: 'My elements',
-      }),
-    getOtherMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.otherMenuItemLabel', {
-        defaultMessage: 'Other',
-      }),
-    getProgressMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.progressMenuItemLabel', {
-        defaultMessage: 'Progress',
-      }),
-    getShapeMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.shapeMenuItemLabel', {
-        defaultMessage: 'Shape',
-      }),
-    getTextMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderElementMenu.textMenuItemLabel', {
-        defaultMessage: 'Text',
-      }),
-  },
-  WorkpadHeaderKioskControls: {
-    getCycleFormLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderKioskControl.cycleFormLabel', {
-        defaultMessage: 'Change cycling interval',
-      }),
-    getCycleToggleSwitch: () =>
-      i18n.translate('xpack.canvas.workpadHeaderKioskControl.cycleToggleSwitch', {
-        defaultMessage: 'Cycle slides automatically',
-      }),
-    getTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderKioskControl.controlTitle', {
-        defaultMessage: 'Cycle fullscreen pages',
-      }),
-    getAutoplayListDurationManualText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderKioskControl.autoplayListDurationManual', {
-        defaultMessage: 'Manually',
-      }),
-    getDisableTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeaderKioskControl.disableTooltip', {
-        defaultMessage: 'Disable auto-play',
-      }),
-  },
-  WorkpadHeaderRefreshControlSettings: {
-    getRefreshAriaLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderRefreshControlSettings.refreshAriaLabel', {
-        defaultMessage: 'Refresh Elements',
-      }),
-    getRefreshTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeaderRefreshControlSettings.refreshTooltip', {
-        defaultMessage: 'Refresh data',
-      }),
-  },
-  WorkpadHeaderShareMenu: {
-    getCopyPDFMessage: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.copyPDFMessage', {
-        defaultMessage: 'The {PDF} generation {URL} was copied to your clipboard.',
-        values: {
-          PDF,
-          URL,
-        },
-      }),
-    getCopyShareConfigMessage: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.copyShareConfigMessage', {
-        defaultMessage: 'Copied share markup to clipboard',
-      }),
-    getShareableZipErrorTitle: (workpadName: string) =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWebsiteErrorTitle', {
-        defaultMessage:
-          "Failed to create {ZIP} file for '{workpadName}'. The workpad may be too large. You'll need to download the files separately.",
-        values: {
-          ZIP,
-          workpadName,
-        },
-      }),
-    getShareDownloadJSONTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareDownloadJSONTitle', {
-        defaultMessage: 'Download as {JSON}',
-        values: {
-          JSON,
-        },
-      }),
-    getShareDownloadPDFTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareDownloadPDFTitle', {
-        defaultMessage: '{PDF} reports',
-        values: {
-          PDF,
-        },
-      }),
-    getShareMenuButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareMenuButtonLabel', {
-        defaultMessage: 'Share',
-      }),
-    getShareWebsiteTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWebsiteTitle', {
-        defaultMessage: 'Share on a website',
-      }),
-    getShareWorkpadMessage: () =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWorkpadMessage', {
-        defaultMessage: 'Share this workpad',
-      }),
-    getUnknownExportErrorMessage: (type: string) =>
-      i18n.translate('xpack.canvas.workpadHeaderShareMenu.unknownExportErrorMessage', {
-        defaultMessage: 'Unknown export type: {type}',
-        values: {
-          type,
-        },
-      }),
-  },
-  WorkpadHeaderViewMenu: {
-    getAutoplayOffMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.autoplayOffMenuItemLabel', {
-        defaultMessage: 'Turn autoplay off',
-      }),
-    getAutoplayOnMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.autoplayOnMenuItemLabel', {
-        defaultMessage: 'Turn autoplay on',
-      }),
-    getAutoplaySettingsMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.autoplaySettingsMenuItemLabel', {
-        defaultMessage: 'Autoplay settings',
-      }),
-    getFullscreenMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.fullscreenMenuLabel', {
-        defaultMessage: 'Enter fullscreen mode',
-      }),
-    getHideEditModeLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.hideEditModeLabel', {
-        defaultMessage: 'Hide editing controls',
-      }),
-    getRefreshMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.refreshMenuItemLabel', {
-        defaultMessage: 'Refresh data',
-      }),
-    getRefreshSettingsMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.refreshSettingsMenuItemLabel', {
-        defaultMessage: 'Auto refresh settings',
-      }),
-    getShowEditModeLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.showEditModeLabel', {
-        defaultMessage: 'Show editing controls',
-      }),
-    getViewMenuButtonLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.viewMenuButtonLabel', {
-        defaultMessage: 'View',
-      }),
-    getViewMenuLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.viewMenuLabel', {
-        defaultMessage: 'View options',
-      }),
-    getZoomControlsAriaLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomControlsAriaLabel', {
-        defaultMessage: 'Zoom controls',
-      }),
-    getZoomControlsTooltip: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomControlsTooltip', {
-        defaultMessage: 'Zoom controls',
-      }),
-    getZoomFitToWindowText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomFitToWindowText', {
-        defaultMessage: 'Fit to window',
-      }),
-    getZoomInText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomInText', {
-        defaultMessage: 'Zoom in',
-      }),
-    getZoomMenuItemLabel: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomMenuItemLabel', {
-        defaultMessage: 'Zoom',
-      }),
-    getZoomOutText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomOutText', {
-        defaultMessage: 'Zoom out',
-      }),
-    getZoomPanelTitle: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomPanelTitle', {
-        defaultMessage: 'Zoom',
-      }),
-    getZoomPercentage: (scale: number) =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomResetText', {
-        defaultMessage: '{scalePercentage}%',
-        values: {
-          scalePercentage: scale * 100,
-        },
-      }),
-    getZoomResetText: () =>
-      i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomPrecentageValue', {
-        defaultMessage: 'Reset',
-      }),
-  },
-};
diff --git a/x-pack/plugins/canvas/i18n/index.ts b/x-pack/plugins/canvas/i18n/index.ts
index 14c9e5d221b79..d35b915ea7fb6 100644
--- a/x-pack/plugins/canvas/i18n/index.ts
+++ b/x-pack/plugins/canvas/i18n/index.ts
@@ -6,7 +6,6 @@
  */
 
 export * from './capabilities';
-export * from './components';
 export * from './constants';
 export * from './errors';
 export * from './expression_types';
diff --git a/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
index 194d2d8b3ddf5..d9df1e4661fbf 100644
--- a/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
@@ -8,15 +8,20 @@
 import React, { MouseEventHandler, FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 // @ts-expect-error untyped local
 import { Popover, PopoverChildrenProps } from '../popover';
 import { ArgAdd } from '../arg_add';
 // @ts-expect-error untyped local
 import { Arg } from '../../expression_types/arg';
 
-import { ComponentStrings } from '../../../i18n';
-
-const { ArgAddPopover: strings } = ComponentStrings;
+const strings = {
+  getAddAriaLabel: () =>
+    i18n.translate('xpack.canvas.argAddPopover.addAriaLabel', {
+      defaultMessage: 'Add argument',
+    }),
+};
 
 interface ArgOptions {
   arg: Arg;
diff --git a/x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js b/x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js
index c40e74186e87e..14f47553002ac 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js
+++ b/x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js
@@ -9,12 +9,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { compose, withProps, withPropsOnChange } from 'recompose';
 import { EuiTextArea, EuiButton, EuiButtonEmpty, EuiFormRow, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { fromExpression, toExpression } from '@kbn/interpreter/common';
-import { createStatefulPropHoc } from '../../components/enhance/stateful_prop';
 
-import { ComponentStrings } from '../../../i18n';
+import { createStatefulPropHoc } from '../../components/enhance/stateful_prop';
 
-const { ArgFormAdvancedFailure: strings } = ComponentStrings;
+const strings = {
+  getApplyButtonLabel: () =>
+    i18n.translate('xpack.canvas.argFormAdvancedFailure.applyButtonLabel', {
+      defaultMessage: 'Apply',
+    }),
+  getResetButtonLabel: () =>
+    i18n.translate('xpack.canvas.argFormAdvancedFailure.resetButtonLabel', {
+      defaultMessage: 'Reset',
+    }),
+  getRowErrorMessage: () =>
+    i18n.translate('xpack.canvas.argFormAdvancedFailure.rowErrorMessage', {
+      defaultMessage: 'Invalid Expression',
+    }),
+};
 
 export const AdvancedFailureComponent = (props) => {
   const {
diff --git a/x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx b/x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx
index 2ae772cdc197a..84b87373c1c5a 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx
@@ -8,12 +8,20 @@
 import React, { ReactNode, MouseEventHandler } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { TooltipIcon, IconType } from '../tooltip_icon';
-
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
 
-const { ArgFormArgSimpleForm: strings } = ComponentStrings;
+import { TooltipIcon, IconType } from '../tooltip_icon';
 
+const strings = {
+  getRemoveAriaLabel: () =>
+    i18n.translate('xpack.canvas.argFormArgSimpleForm.removeAriaLabel', {
+      defaultMessage: 'Remove',
+    }),
+  getRequiredTooltip: () =>
+    i18n.translate('xpack.canvas.argFormArgSimpleForm.requiredTooltip', {
+      defaultMessage: 'This argument is required, you should specify a value.',
+    }),
+};
 interface Props {
   children?: ReactNode;
   required?: boolean;
diff --git a/x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js b/x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js
index ff390a770f80e..f933230f39928 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js
+++ b/x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js
@@ -7,11 +7,17 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
+
 import { Loading } from '../loading';
 import { ArgLabel } from './arg_label';
 
-const { ArgFormPendingArgValue: strings } = ComponentStrings;
+const strings = {
+  getLoadingMessage: () =>
+    i18n.translate('xpack.canvas.argFormPendingArgValue.loadingMessage', {
+      defaultMessage: 'Loading',
+    }),
+};
 
 export class PendingArgValue extends React.PureComponent {
   static propTypes = {
diff --git a/x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx b/x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx
index cc4e92679a870..57173fa413e8f 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx
@@ -6,11 +6,17 @@
  */
 
 import React from 'react';
-import { TooltipIcon, IconType } from '../tooltip_icon';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../i18n';
+import { TooltipIcon, IconType } from '../tooltip_icon';
 
-const { ArgFormSimpleFailure: strings } = ComponentStrings;
+const strings = {
+  getFailureTooltip: () =>
+    i18n.translate('xpack.canvas.argFormSimpleFailure.failureTooltip', {
+      defaultMessage:
+        'The interface for this argument could not parse the value, so a fallback input is being used',
+    }),
+};
 
 // This is what is being generated by render() from the Arg class. It is called in FunctionForm
 export const SimpleFailure = () => (
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset.component.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset.component.tsx
index 8f9d90ccbe1d8..024137f640636 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset.component.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset.component.tsx
@@ -17,6 +17,7 @@ import {
   EuiTextColor,
   EuiToolTip,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { useNotifyService } from '../../services';
 
@@ -25,9 +26,40 @@ import { Clipboard } from '../clipboard';
 import { Download } from '../download';
 import { AssetType } from '../../../types';
 
-import { ComponentStrings } from '../../../i18n';
-
-const { Asset: strings } = ComponentStrings;
+const strings = {
+  getCopyAssetTooltip: () =>
+    i18n.translate('xpack.canvas.asset.copyAssetTooltip', {
+      defaultMessage: 'Copy id to clipboard',
+    }),
+  getCreateImageTooltip: () =>
+    i18n.translate('xpack.canvas.asset.createImageTooltip', {
+      defaultMessage: 'Create image element',
+    }),
+  getDeleteAssetTooltip: () =>
+    i18n.translate('xpack.canvas.asset.deleteAssetTooltip', {
+      defaultMessage: 'Delete',
+    }),
+  getDownloadAssetTooltip: () =>
+    i18n.translate('xpack.canvas.asset.downloadAssetTooltip', {
+      defaultMessage: 'Download',
+    }),
+  getThumbnailAltText: () =>
+    i18n.translate('xpack.canvas.asset.thumbnailAltText', {
+      defaultMessage: 'Asset thumbnail',
+    }),
+  getConfirmModalButtonLabel: () =>
+    i18n.translate('xpack.canvas.asset.confirmModalButtonLabel', {
+      defaultMessage: 'Remove',
+    }),
+  getConfirmModalMessageText: () =>
+    i18n.translate('xpack.canvas.asset.confirmModalDetail', {
+      defaultMessage: 'Are you sure you want to remove this asset?',
+    }),
+  getConfirmModalTitle: () =>
+    i18n.translate('xpack.canvas.asset.confirmModalTitle', {
+      defaultMessage: 'Remove Asset',
+    }),
+};
 
 export interface Props {
   /** The asset to be rendered */
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.component.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.component.tsx
index 7795aa9671b83..7b004d5ab5099 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.component.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.component.tsx
@@ -24,14 +24,47 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { ASSET_MAX_SIZE } from '../../../common/lib/constants';
 import { Loading } from '../loading';
 import { Asset } from './asset';
 import { AssetType } from '../../../types';
-import { ComponentStrings } from '../../../i18n';
 
-const { AssetManager: strings } = ComponentStrings;
+const strings = {
+  getDescription: () =>
+    i18n.translate('xpack.canvas.assetModal.modalDescription', {
+      defaultMessage:
+        'Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.',
+    }),
+  getEmptyAssetsDescription: () =>
+    i18n.translate('xpack.canvas.assetModal.emptyAssetsDescription', {
+      defaultMessage: 'Import your assets to get started',
+    }),
+  getFilePickerPromptText: () =>
+    i18n.translate('xpack.canvas.assetModal.filePickerPromptText', {
+      defaultMessage: 'Select or drag and drop images',
+    }),
+  getLoadingText: () =>
+    i18n.translate('xpack.canvas.assetModal.loadingText', {
+      defaultMessage: 'Uploading images',
+    }),
+  getModalCloseButtonLabel: () =>
+    i18n.translate('xpack.canvas.assetModal.modalCloseButtonLabel', {
+      defaultMessage: 'Close',
+    }),
+  getModalTitle: () =>
+    i18n.translate('xpack.canvas.assetModal.modalTitle', {
+      defaultMessage: 'Manage workpad assets',
+    }),
+  getSpaceUsedText: (percentageUsed: number) =>
+    i18n.translate('xpack.canvas.assetModal.spacedUsedText', {
+      defaultMessage: '{percentageUsed}% space used',
+      values: {
+        percentageUsed,
+      },
+    }),
+};
 
 export interface Props {
   /** The assets to display within the modal */
diff --git a/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
index c2e2d8a053247..4bf13577aff53 100644
--- a/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
@@ -8,12 +8,16 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGrid, EuiFlexItem, EuiLink, EuiImage, EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { CanvasAsset } from '../../../types';
 
-import { ComponentStrings } from '../../../i18n';
-
-const { AssetPicker: strings } = ComponentStrings;
+const strings = {
+  getAssetAltText: () =>
+    i18n.translate('xpack.canvas.assetpicker.assetAltText', {
+      defaultMessage: 'Asset thumbnail',
+    }),
+};
 
 interface Props {
   assets: CanvasAsset[];
diff --git a/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx b/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx
index 38e62f46c945a..8f55c31933291 100644
--- a/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx
+++ b/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx
@@ -7,9 +7,14 @@
 
 import React, { FC } from 'react';
 import { EuiPanel, EuiLoadingChart, EuiSpacer, EuiText } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n/components';
+import { i18n } from '@kbn/i18n';
 
-const { CanvasLoading: strings } = ComponentStrings;
+const strings = {
+  getLoadingLabel: () =>
+    i18n.translate('xpack.canvas.canvasLoading.loadingMessage', {
+      defaultMessage: 'Loading',
+    }),
+};
 
 export const CanvasLoading: FC<{ msg?: string }> = ({
   msg = `${strings.getLoadingLabel()}...`,
diff --git a/x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx b/x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx
index ae5cfac85bdc9..50c679c2a1e51 100644
--- a/x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx
+++ b/x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx
@@ -9,11 +9,24 @@ import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon, EuiFieldText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import tinycolor from 'tinycolor2';
-import { ColorDot } from '../color_dot/color_dot';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../i18n/components';
+import { ColorDot } from '../color_dot/color_dot';
 
-const { ColorManager: strings } = ComponentStrings;
+const strings = {
+  getAddAriaLabel: () =>
+    i18n.translate('xpack.canvas.colorManager.addAriaLabel', {
+      defaultMessage: 'Add Color',
+    }),
+  getCodePlaceholder: () =>
+    i18n.translate('xpack.canvas.colorManager.codePlaceholder', {
+      defaultMessage: 'Color code',
+    }),
+  getRemoveAriaLabel: () =>
+    i18n.translate('xpack.canvas.colorManager.removeAriaLabel', {
+      defaultMessage: 'Remove Color',
+    }),
+};
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
index 5d9cccba924a9..86d9cab4eeea1 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
@@ -26,16 +26,57 @@ import {
   EuiTextArea,
   EuiTitle,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
 import { encode } from '../../../common/lib/dataurl';
 import { ElementCard } from '../element_card';
-import { ComponentStrings } from '../../../i18n/components';
 
 const MAX_NAME_LENGTH = 40;
 const MAX_DESCRIPTION_LENGTH = 100;
 
-const { CustomElementModal: strings } = ComponentStrings;
-
+const strings = {
+  getCancelButtonLabel: () =>
+    i18n.translate('xpack.canvas.customElementModal.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    }),
+  getCharactersRemainingDescription: (numberOfRemainingCharacter: number) =>
+    i18n.translate('xpack.canvas.customElementModal.remainingCharactersDescription', {
+      defaultMessage: '{numberOfRemainingCharacter} characters remaining',
+      values: {
+        numberOfRemainingCharacter,
+      },
+    }),
+  getDescriptionInputLabel: () =>
+    i18n.translate('xpack.canvas.customElementModal.descriptionInputLabel', {
+      defaultMessage: 'Description',
+    }),
+  getElementPreviewTitle: () =>
+    i18n.translate('xpack.canvas.customElementModal.elementPreviewTitle', {
+      defaultMessage: 'Element preview',
+    }),
+  getImageFilePickerPlaceholder: () =>
+    i18n.translate('xpack.canvas.customElementModal.imageFilePickerPlaceholder', {
+      defaultMessage: 'Select or drag and drop an image',
+    }),
+  getImageInputDescription: () =>
+    i18n.translate('xpack.canvas.customElementModal.imageInputDescription', {
+      defaultMessage:
+        'Take a screenshot of your element and upload it here. This can also be done after saving.',
+    }),
+  getImageInputLabel: () =>
+    i18n.translate('xpack.canvas.customElementModal.imageInputLabel', {
+      defaultMessage: 'Thumbnail image',
+    }),
+  getNameInputLabel: () =>
+    i18n.translate('xpack.canvas.customElementModal.nameInputLabel', {
+      defaultMessage: 'Name',
+    }),
+  getSaveButtonLabel: () =>
+    i18n.translate('xpack.canvas.customElementModal.saveButtonLabel', {
+      defaultMessage: 'Save',
+    }),
+};
 interface Props {
   /**
    * initial value of the name of the custom element
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js
index faddc3a60b990..f09ce4c925820 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js
@@ -18,13 +18,27 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { isEqual } from 'lodash';
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
+
 import { getDefaultIndex } from '../../lib/es_service';
 import { DatasourceSelector } from './datasource_selector';
 import { DatasourcePreview } from './datasource_preview';
 
-const { DatasourceDatasourceComponent: strings } = ComponentStrings;
-
+const strings = {
+  getExpressionArgDescription: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourceComponent.expressionArgDescription', {
+      defaultMessage:
+        'The datasource has an argument controlled by an expression. Use the expression editor to modify the datasource.',
+    }),
+  getPreviewButtonLabel: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourceComponent.previewButtonLabel', {
+      defaultMessage: 'Preview data',
+    }),
+  getSaveButtonLabel: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourceComponent.saveButtonLabel', {
+      defaultMessage: 'Save',
+    }),
+};
 export class DatasourceComponent extends PureComponent {
   static propTypes = {
     args: PropTypes.object.isRequired,
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
index a55f73a087467..2eb42c5cb98dc 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
@@ -18,12 +18,33 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
 import { Datatable } from '../../datatable';
 import { Error } from '../../error';
-import { ComponentStrings } from '../../../../i18n';
 
-const { DatasourceDatasourcePreview: strings } = ComponentStrings;
-const { DatasourceDatasourceComponent: datasourceStrings } = ComponentStrings;
+const strings = {
+  getEmptyFirstLineDescription: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptyFirstLineDescription', {
+      defaultMessage: "We couldn't find any documents matching your search criteria.",
+    }),
+  getEmptySecondLineDescription: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptySecondLineDescription', {
+      defaultMessage: 'Check your datasource settings and try again.',
+    }),
+  getEmptyTitle: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourcePreview.emptyTitle', {
+      defaultMessage: 'No documents found',
+    }),
+  getModalTitle: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourcePreview.modalTitle', {
+      defaultMessage: 'Datasource preview',
+    }),
+  getSaveButtonLabel: () =>
+    i18n.translate('xpack.canvas.datasourceDatasourcePreview.saveButtonLabel', {
+      defaultMessage: 'Save',
+    }),
+};
 
 export const DatasourcePreview = ({ done, datatable }) => (
   <EuiModal onClose={done} maxWidth="1000px" className="canvasModal--fixedSize">
@@ -37,7 +58,7 @@ export const DatasourcePreview = ({ done, datatable }) => (
             id="xpack.canvas.datasourceDatasourcePreview.modalDescription"
             defaultMessage="The following data will be available to the selected element upon clicking {saveLabel} in the sidebar."
             values={{
-              saveLabel: <strong>{datasourceStrings.getSaveButtonLabel()}</strong>,
+              saveLabel: <strong>{strings.getSaveButtonLabel()}</strong>,
             }}
           />
         </p>
diff --git a/x-pack/plugins/canvas/public/components/datasource/no_datasource.js b/x-pack/plugins/canvas/public/components/datasource/no_datasource.js
index ef86361a4a3a0..f496d493e9d94 100644
--- a/x-pack/plugins/canvas/public/components/datasource/no_datasource.js
+++ b/x-pack/plugins/canvas/public/components/datasource/no_datasource.js
@@ -8,9 +8,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../i18n';
-const { DatasourceNoDatasource: strings } = ComponentStrings;
+const strings = {
+  getPanelDescription: () =>
+    i18n.translate('xpack.canvas.datasourceNoDatasource.panelDescription', {
+      defaultMessage:
+        "This element does not have an attached data source. This is usually because the element is an image or other static asset. If that's not the case you might want to check your expression to make sure it is not malformed.",
+    }),
+  getPanelTitle: () =>
+    i18n.translate('xpack.canvas.datasourceNoDatasource.panelTitle', {
+      defaultMessage: 'No data source present',
+    }),
+};
 
 export const NoDatasource = () => (
   <div className="canvasDataSource__section">
diff --git a/x-pack/plugins/canvas/public/components/element_config/element_config.tsx b/x-pack/plugins/canvas/public/components/element_config/element_config.tsx
index 683c12f13f0f9..bf09ac3c5ab77 100644
--- a/x-pack/plugins/canvas/public/components/element_config/element_config.tsx
+++ b/x-pack/plugins/canvas/public/components/element_config/element_config.tsx
@@ -5,13 +5,42 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiStat, EuiAccordion } from '@elastic/eui';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { ComponentStrings } from '../../../i18n';
+import PropTypes from 'prop-types';
+import { EuiFlexGroup, EuiFlexItem, EuiStat, EuiAccordion } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { State } from '../../../types';
 
-const { ElementConfig: strings } = ComponentStrings;
+const strings = {
+  getFailedLabel: () =>
+    i18n.translate('xpack.canvas.elementConfig.failedLabel', {
+      defaultMessage: 'Failed',
+      description:
+        'The label for the total number of elements in a workpad that have thrown an error or failed to load',
+    }),
+  getLoadedLabel: () =>
+    i18n.translate('xpack.canvas.elementConfig.loadedLabel', {
+      defaultMessage: 'Loaded',
+      description: 'The label for the number of elements in a workpad that have loaded',
+    }),
+  getProgressLabel: () =>
+    i18n.translate('xpack.canvas.elementConfig.progressLabel', {
+      defaultMessage: 'Progress',
+      description: 'The label for the percentage of elements that have finished loading',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.elementConfig.title', {
+      defaultMessage: 'Element status',
+      description:
+        '"Elements" refers to the individual text, images, or visualizations that you can add to a Canvas workpad',
+    }),
+  getTotalLabel: () =>
+    i18n.translate('xpack.canvas.elementConfig.totalLabel', {
+      defaultMessage: 'Total',
+      description: 'The label for the total number of elements in a workpad',
+    }),
+};
 
 interface Props {
   elementStats: State['transient']['elementStats'];
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
index c86b1d6405e24..716f757b7c25e 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
@@ -7,15 +7,24 @@
 
 import React, { FC } from 'react';
 import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import {
   SavedObjectFinderUi,
   SavedObjectMetaData,
 } from '../../../../../../src/plugins/saved_objects/public/';
-import { ComponentStrings } from '../../../i18n';
 import { useServices } from '../../services';
 
-const { AddEmbeddableFlyout: strings } = ComponentStrings;
-
+const strings = {
+  getNoItemsText: () =>
+    i18n.translate('xpack.canvas.embedObject.noMatchingObjectsMessage', {
+      defaultMessage: 'No matching objects found.',
+    }),
+  getTitleText: () =>
+    i18n.translate('xpack.canvas.embedObject.titleText', {
+      defaultMessage: 'Add from Kibana',
+    }),
+};
 export interface Props {
   onClose: () => void;
   onSelect: (id: string, embeddableType: string) => void;
diff --git a/x-pack/plugins/canvas/public/components/error/error.tsx b/x-pack/plugins/canvas/public/components/error/error.tsx
index b4cc85ba336e9..cb2c2cd5d58c1 100644
--- a/x-pack/plugins/canvas/public/components/error/error.tsx
+++ b/x-pack/plugins/canvas/public/components/error/error.tsx
@@ -8,18 +8,27 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { ComponentStrings } from '../../../i18n';
+
 import { ShowDebugging } from './show_debugging';
 
+const strings = {
+  getDescription: () =>
+    i18n.translate('xpack.canvas.errorComponent.description', {
+      defaultMessage: 'Expression failed with the message:',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.errorComponent.title', {
+      defaultMessage: 'Whoops! Expression failed',
+    }),
+};
 export interface Props {
   payload: {
     error: Error;
   };
 }
 
-const { Error: strings } = ComponentStrings;
-
 export const Error: FC<Props> = ({ payload }) => {
   const message = get(payload, 'error.message');
 
diff --git a/x-pack/plugins/canvas/public/components/expression/element_not_selected.js b/x-pack/plugins/canvas/public/components/expression/element_not_selected.js
index c7c8c1b063cf1..5f717af6101c1 100644
--- a/x-pack/plugins/canvas/public/components/expression/element_not_selected.js
+++ b/x-pack/plugins/canvas/public/components/expression/element_not_selected.js
@@ -8,9 +8,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiButton } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
 
-const { ExpressionElementNotSelected: strings } = ComponentStrings;
+const strings = {
+  getCloseButtonLabel: () =>
+    i18n.translate('xpack.canvas.expressionElementNotSelected.closeButtonLabel', {
+      defaultMessage: 'Close',
+    }),
+  getSelectDescription: () =>
+    i18n.translate('xpack.canvas.expressionElementNotSelected.selectDescription', {
+      defaultMessage: 'Select an element to show expression input',
+    }),
+};
 
 export const ElementNotSelected = ({ done }) => (
   <div>
diff --git a/x-pack/plugins/canvas/public/components/expression/expression.tsx b/x-pack/plugins/canvas/public/components/expression/expression.tsx
index 74fdefc322cc9..ff3fed32c0ac0 100644
--- a/x-pack/plugins/canvas/public/components/expression/expression.tsx
+++ b/x-pack/plugins/canvas/public/components/expression/expression.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { FC, MutableRefObject } from 'react';
+import React, { FC, MutableRefObject, useRef } from 'react';
 import PropTypes from 'prop-types';
 import {
   EuiPanel,
@@ -17,17 +17,46 @@ import {
   EuiLink,
   EuiPortal,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 // @ts-expect-error
 import { Shortcuts } from 'react-shortcuts';
-import { ComponentStrings } from '../../../i18n';
+
 import { ExpressionInput } from '../expression_input';
 import { ToolTipShortcut } from '../tool_tip_shortcut';
 import { ExpressionFunction } from '../../../types';
 import { FormState } from './';
 
-const { Expression: strings } = ComponentStrings;
-
-const { useRef } = React;
+const strings = {
+  getCancelButtonLabel: () =>
+    i18n.translate('xpack.canvas.expression.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    }),
+  getCloseButtonLabel: () =>
+    i18n.translate('xpack.canvas.expression.closeButtonLabel', {
+      defaultMessage: 'Close',
+    }),
+  getLearnLinkText: () =>
+    i18n.translate('xpack.canvas.expression.learnLinkText', {
+      defaultMessage: 'Learn expression syntax',
+    }),
+  getMaximizeButtonLabel: () =>
+    i18n.translate('xpack.canvas.expression.maximizeButtonLabel', {
+      defaultMessage: 'Maximize editor',
+    }),
+  getMinimizeButtonLabel: () =>
+    i18n.translate('xpack.canvas.expression.minimizeButtonLabel', {
+      defaultMessage: 'Minimize Editor',
+    }),
+  getRunButtonLabel: () =>
+    i18n.translate('xpack.canvas.expression.runButtonLabel', {
+      defaultMessage: 'Run',
+    }),
+  getRunTooltip: () =>
+    i18n.translate('xpack.canvas.expression.runTooltip', {
+      defaultMessage: 'Run the expression',
+    }),
+};
 
 const shortcut = (
   ref: MutableRefObject<ExpressionInput | null>,
diff --git a/x-pack/plugins/canvas/public/components/expression_input/reference.ts b/x-pack/plugins/canvas/public/components/expression_input/reference.ts
index 95d27360aafc9..94a369e6cb8d8 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/reference.ts
+++ b/x-pack/plugins/canvas/public/components/expression_input/reference.ts
@@ -5,13 +5,64 @@
  * 2.0.
  */
 
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
 import {
   ExpressionFunction,
   ExpressionFunctionParameter,
 } from '../../../../../../src/plugins/expressions';
 
-const { ExpressionInput: strings } = ComponentStrings;
+import { BOLD_MD_TOKEN } from '../../../i18n/constants';
+
+const strings = {
+  getArgReferenceAliasesDetail: (aliases: string) =>
+    i18n.translate('xpack.canvas.expressionInput.argReferenceAliasesDetail', {
+      defaultMessage: '{BOLD_MD_TOKEN}Aliases{BOLD_MD_TOKEN}: {aliases}',
+      values: {
+        BOLD_MD_TOKEN,
+        aliases,
+      },
+    }),
+  getArgReferenceDefaultDetail: (defaultVal: string) =>
+    i18n.translate('xpack.canvas.expressionInput.argReferenceDefaultDetail', {
+      defaultMessage: '{BOLD_MD_TOKEN}Default{BOLD_MD_TOKEN}: {defaultVal}',
+      values: {
+        BOLD_MD_TOKEN,
+        defaultVal,
+      },
+    }),
+  getArgReferenceRequiredDetail: (required: string) =>
+    i18n.translate('xpack.canvas.expressionInput.argReferenceRequiredDetail', {
+      defaultMessage: '{BOLD_MD_TOKEN}Required{BOLD_MD_TOKEN}: {required}',
+      values: {
+        BOLD_MD_TOKEN,
+        required,
+      },
+    }),
+  getArgReferenceTypesDetail: (types: string) =>
+    i18n.translate('xpack.canvas.expressionInput.argReferenceTypesDetail', {
+      defaultMessage: '{BOLD_MD_TOKEN}Types{BOLD_MD_TOKEN}: {types}',
+      values: {
+        BOLD_MD_TOKEN,
+        types,
+      },
+    }),
+  getFunctionReferenceAcceptsDetail: (acceptTypes: string) =>
+    i18n.translate('xpack.canvas.expressionInput.functionReferenceAccepts', {
+      defaultMessage: '{BOLD_MD_TOKEN}Accepts{BOLD_MD_TOKEN}: {acceptTypes}',
+      values: {
+        BOLD_MD_TOKEN,
+        acceptTypes,
+      },
+    }),
+  getFunctionReferenceReturnsDetail: (returnType: string) =>
+    i18n.translate('xpack.canvas.expressionInput.functionReferenceReturns', {
+      defaultMessage: '{BOLD_MD_TOKEN}Returns{BOLD_MD_TOKEN}: {returnType}',
+      values: {
+        BOLD_MD_TOKEN,
+        returnType,
+      },
+    }),
+};
 
 /**
  * Given an expression function, this function returns a markdown string
diff --git a/x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx b/x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx
index a022f98d14e1a..2ee709edbf91c 100644
--- a/x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx
+++ b/x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx
@@ -7,16 +7,23 @@
 
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
-import { ComponentStrings } from '../../../i18n/components';
+import { i18n } from '@kbn/i18n';
 
+const strings = {
+  getContextErrorMessage: (errorMessage: string) =>
+    i18n.translate('xpack.canvas.functionForm.contextError', {
+      defaultMessage: 'ERROR: {errorMessage}',
+      values: {
+        errorMessage,
+      },
+    }),
+};
 interface Props {
   context: {
     error: string;
   };
 }
 
-const { FunctionFormContextError: strings } = ComponentStrings;
-
 export const FunctionFormContextError: FunctionComponent<Props> = ({ context }) => (
   <div className="canvasFunctionForm canvasFunctionForm--error">
     {strings.getContextErrorMessage(context.error)}
diff --git a/x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx b/x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx
index b3054e280bbe5..cd7e2f27912a1 100644
--- a/x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx
+++ b/x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx
@@ -7,13 +7,22 @@
 
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
+
+const strings = {
+  getUnknownArgumentTypeErrorMessage: (expressionType: string) =>
+    i18n.translate('xpack.canvas.functionForm.functionUnknown.unknownArgumentTypeError', {
+      defaultMessage: 'Unknown expression type "{expressionType}"',
+      values: {
+        expressionType,
+      },
+    }),
+};
 
 interface Props {
   /** the type of the argument */
   argType: string;
 }
-const { FunctionFormFunctionUnknown: strings } = ComponentStrings;
 
 export const FunctionUnknown: FunctionComponent<Props> = ({ argType }) => (
   <div className="canvasFunctionForm canvasFunctionForm--unknown-expression">
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
index b10103e1824e5..2877ccf41056d 100644
--- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
@@ -7,11 +7,13 @@
 
 import React, { FC, useState, lazy, Suspense } from 'react';
 import { EuiButtonEmpty, EuiPortal, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { ExpressionFunction } from 'src/plugins/expressions';
-import { ComponentStrings } from '../../../i18n';
+
 import { KeyboardShortcutsDoc } from '../keyboard_shortcuts_doc';
 
 let FunctionReferenceGenerator: null | React.LazyExoticComponent<any> = null;
+
 if (process.env.NODE_ENV === 'development') {
   FunctionReferenceGenerator = lazy(() =>
     import('../function_reference_generator').then((module) => ({
@@ -20,7 +22,12 @@ if (process.env.NODE_ENV === 'development') {
   );
 }
 
-const { HelpMenu: strings } = ComponentStrings;
+const strings = {
+  getKeyboardShortcutsLinkLabel: () =>
+    i18n.translate('xpack.canvas.helpMenu.keyboardShortcutsLinkLabel', {
+      defaultMessage: 'Keyboard shortcuts',
+    }),
+};
 
 interface Props {
   functionRegistry: Record<string, ExpressionFunction>;
diff --git a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx
index 0c98ea70b5b9d..a71976006d51c 100644
--- a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx
+++ b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx
@@ -17,14 +17,30 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { keymap } from '../../lib/keymap';
 import { ShortcutMap, ShortcutNameSpace } from '../../../types/shortcuts';
 import { getClientPlatform } from '../../lib/get_client_platform';
 import { getId } from '../../lib/get_id';
 import { getPrettyShortcut } from '../../lib/get_pretty_shortcut';
-import { ComponentStrings } from '../../../i18n/components';
 
-const { KeyboardShortcutsDoc: strings } = ComponentStrings;
+const strings = {
+  getFlyoutCloseButtonAriaLabel: () =>
+    i18n.translate('xpack.canvas.keyboardShortcutsDoc.flyout.closeButtonAriaLabel', {
+      defaultMessage: 'Closes keyboard shortcuts reference',
+    }),
+  getShortcutSeparator: () =>
+    i18n.translate('xpack.canvas.keyboardShortcutsDoc.shortcutListSeparator', {
+      defaultMessage: 'or',
+      description:
+        'Separates which keyboard shortcuts can be used for a single action. Example: "{shortcut1} or {shortcut2} or {shortcut3}"',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.keyboardShortcutsDoc.flyoutHeaderTitle', {
+      defaultMessage: 'Keyboard shortcuts',
+    }),
+};
 
 interface DescriptionListItem {
   title: string;
diff --git a/x-pack/plugins/canvas/public/components/page_config/index.js b/x-pack/plugins/canvas/public/components/page_config/index.js
index 59f0ac99fd73b..898ac60e68e38 100644
--- a/x-pack/plugins/canvas/public/components/page_config/index.js
+++ b/x-pack/plugins/canvas/public/components/page_config/index.js
@@ -7,13 +7,22 @@
 
 import { connect } from 'react-redux';
 import { get } from 'lodash';
+import { i18n } from '@kbn/i18n';
+
 import { transitionsRegistry } from '../../lib/transitions_registry';
 import { getSelectedPageIndex, getPages } from '../../state/selectors/workpad';
 import { stylePage, setPageTransition } from '../../state/actions/pages';
-import { ComponentStrings } from '../../../i18n';
 import { PageConfig as Component } from './page_config';
 
-const { PageConfig: strings } = ComponentStrings;
+const strings = {
+  getNoTransitionDropDownOptionLabel: () =>
+    i18n.translate('xpack.canvas.pageConfig.transitions.noneDropDownOptionLabel', {
+      defaultMessage: 'None',
+      description:
+        'This is the option the user should choose if they do not want any page transition (i.e. fade in, fade out, etc) to ' +
+        'be applied to the current page.',
+    }),
+};
 
 const mapStateToProps = (state) => {
   const pageIndex = getSelectedPageIndex(state);
diff --git a/x-pack/plugins/canvas/public/components/page_config/page_config.js b/x-pack/plugins/canvas/public/components/page_config/page_config.js
index bc7d92de2273c..8b0c2fedf3af3 100644
--- a/x-pack/plugins/canvas/public/components/page_config/page_config.js
+++ b/x-pack/plugins/canvas/public/components/page_config/page_config.js
@@ -16,10 +16,35 @@ import {
   EuiToolTip,
   EuiIcon,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { WorkpadColorPicker } from '../workpad_color_picker';
-import { ComponentStrings } from '../../../i18n';
 
-const { PageConfig: strings } = ComponentStrings;
+const strings = {
+  getBackgroundColorDescription: () =>
+    i18n.translate('xpack.canvas.pageConfig.backgroundColorDescription', {
+      defaultMessage: 'Accepts HEX, RGB or HTML color names',
+    }),
+  getBackgroundColorLabel: () =>
+    i18n.translate('xpack.canvas.pageConfig.backgroundColorLabel', {
+      defaultMessage: 'Background',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.pageConfig.title', {
+      defaultMessage: 'Page settings',
+    }),
+  getTransitionLabel: () =>
+    i18n.translate('xpack.canvas.pageConfig.transitionLabel', {
+      defaultMessage: 'Transition',
+      description:
+        'This refers to the transition effect, such as fade in or rotate,  applied to a page in presentation mode.',
+    }),
+  getTransitionPreviewLabel: () =>
+    i18n.translate('xpack.canvas.pageConfig.transitionPreviewLabel', {
+      defaultMessage: 'Preview',
+      description: 'This is the label for a preview of the transition effect selected.',
+    }),
+};
 
 export const PageConfig = ({
   pageIndex,
diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx b/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
index 06968d2e4be0a..9d1939db43fd5 100644
--- a/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
+++ b/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
@@ -8,7 +8,9 @@
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
 import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { DragDropContext, Droppable, Draggable, DragDropContextProps } from 'react-beautiful-dnd';
+
 // @ts-expect-error untyped dependency
 import Style from 'style-it';
 import { ConfirmModal } from '../confirm_modal';
@@ -16,11 +18,26 @@ import { RoutingLink } from '../routing';
 import { WorkpadRoutingContext } from '../../routes/workpad';
 import { PagePreview } from '../page_preview';
 
-import { ComponentStrings } from '../../../i18n';
 import { CanvasPage } from '../../../types';
 
-const { PageManager: strings } = ComponentStrings;
-
+const strings = {
+  getAddPageTooltip: () =>
+    i18n.translate('xpack.canvas.pageManager.addPageTooltip', {
+      defaultMessage: 'Add a new page to this workpad',
+    }),
+  getConfirmRemoveTitle: () =>
+    i18n.translate('xpack.canvas.pageManager.confirmRemoveTitle', {
+      defaultMessage: 'Remove Page',
+    }),
+  getConfirmRemoveDescription: () =>
+    i18n.translate('xpack.canvas.pageManager.confirmRemoveDescription', {
+      defaultMessage: 'Are you sure you want to remove this page?',
+    }),
+  getConfirmRemoveButtonLabel: () =>
+    i18n.translate('xpack.canvas.pageManager.removeButtonLabel', {
+      defaultMessage: 'Remove',
+    }),
+};
 export interface Props {
   isWriteable: boolean;
   onAddPage: () => void;
diff --git a/x-pack/plugins/canvas/public/components/page_preview/page_controls.tsx b/x-pack/plugins/canvas/public/components/page_preview/page_controls.tsx
index b29ef1e7fd087..5246fcf822a72 100644
--- a/x-pack/plugins/canvas/public/components/page_preview/page_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/page_preview/page_controls.tsx
@@ -8,10 +8,26 @@
 import React, { FC, ReactEventHandler } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../i18n';
-
-const { PagePreviewPageControls: strings } = ComponentStrings;
+const strings = {
+  getClonePageAriaLabel: () =>
+    i18n.translate('xpack.canvas.pagePreviewPageControls.clonePageAriaLabel', {
+      defaultMessage: 'Clone page',
+    }),
+  getClonePageTooltip: () =>
+    i18n.translate('xpack.canvas.pagePreviewPageControls.clonePageTooltip', {
+      defaultMessage: 'Clone',
+    }),
+  getDeletePageAriaLabel: () =>
+    i18n.translate('xpack.canvas.pagePreviewPageControls.deletePageAriaLabel', {
+      defaultMessage: 'Delete page',
+    }),
+  getDeletePageTooltip: () =>
+    i18n.translate('xpack.canvas.pagePreviewPageControls.deletePageTooltip', {
+      defaultMessage: 'Delete',
+    }),
+};
 
 interface Props {
   pageId: string;
diff --git a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.tsx b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.tsx
index 7ad7bcd8c49c2..dcc77b75f25c3 100644
--- a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.tsx
@@ -8,10 +8,20 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiColorPalettePicker, EuiColorPalettePickerPaletteProps } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { palettes, ColorPalette } from '../../../common/lib/palettes';
-import { ComponentStrings } from '../../../i18n';
 
-const { PalettePicker: strings } = ComponentStrings;
+const strings = {
+  getEmptyPaletteLabel: () =>
+    i18n.translate('xpack.canvas.palettePicker.emptyPaletteLabel', {
+      defaultMessage: 'None',
+    }),
+  getNoPaletteFoundErrorTitle: () =>
+    i18n.translate('xpack.canvas.palettePicker.noPaletteFoundErrorTitle', {
+      defaultMessage: 'Color palette not found',
+    }),
+};
 
 interface RequiredProps {
   id?: string;
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx
index 220ea193c902e..ad0a0053f55af 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx
@@ -8,9 +8,26 @@
 import React, { FunctionComponent, MouseEvent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n/components';
+import { i18n } from '@kbn/i18n';
 
-const { ElementControls: strings } = ComponentStrings;
+const strings = {
+  getDeleteAriaLabel: () =>
+    i18n.translate('xpack.canvas.elementControls.deleteAriaLabel', {
+      defaultMessage: 'Delete element',
+    }),
+  getDeleteTooltip: () =>
+    i18n.translate('xpack.canvas.elementControls.deleteToolTip', {
+      defaultMessage: 'Delete',
+    }),
+  getEditAriaLabel: () =>
+    i18n.translate('xpack.canvas.elementControls.editAriaLabel', {
+      defaultMessage: 'Edit element',
+    }),
+  getEditTooltip: () =>
+    i18n.translate('xpack.canvas.elementControls.editToolTip', {
+      defaultMessage: 'Edit',
+    }),
+};
 
 interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.component.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.component.tsx
index bc0039245f432..ee14e89dc4b7d 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.component.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.component.tsx
@@ -25,14 +25,59 @@ import {
   EuiSpacer,
   EuiButton,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { sortBy } from 'lodash';
-import { ComponentStrings } from '../../../i18n';
 import { CustomElement } from '../../../types';
 import { ConfirmModal } from '../confirm_modal/confirm_modal';
 import { CustomElementModal } from '../custom_element_modal';
 import { ElementGrid } from './element_grid';
 
-const { SavedElementsModal: strings } = ComponentStrings;
+const strings = {
+  getAddNewElementDescription: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.addNewElementDescription', {
+      defaultMessage: 'Group and save workpad elements to create new elements',
+    }),
+  getAddNewElementTitle: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.addNewElementTitle', {
+      defaultMessage: 'Add new elements',
+    }),
+  getCancelButtonLabel: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    }),
+  getDeleteButtonLabel: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.deleteButtonLabel', {
+      defaultMessage: 'Delete',
+    }),
+  getDeleteElementDescription: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.deleteElementDescription', {
+      defaultMessage: 'Are you sure you want to delete this element?',
+    }),
+  getDeleteElementTitle: (elementName: string) =>
+    i18n.translate('xpack.canvas.savedElementsModal.deleteElementTitle', {
+      defaultMessage: `Delete element '{elementName}'?`,
+      values: {
+        elementName,
+      },
+    }),
+  getEditElementTitle: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.editElementTitle', {
+      defaultMessage: 'Edit element',
+    }),
+  getFindElementPlaceholder: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.findElementPlaceholder', {
+      defaultMessage: 'Find element',
+    }),
+  getModalTitle: () =>
+    i18n.translate('xpack.canvas.savedElementsModal.modalTitle', {
+      defaultMessage: 'My elements',
+    }),
+  getSavedElementsModalCloseButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeader.addElementModalCloseButtonLabel', {
+      defaultMessage: 'Close',
+    }),
+};
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.component.tsx b/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.component.tsx
index cc0ad5a728b17..e8f2c7a559f58 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.component.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.component.tsx
@@ -8,12 +8,28 @@
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiTabbedContent } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 // @ts-expect-error unconverted component
 import { Datasource } from '../../datasource';
 // @ts-expect-error unconverted component
 import { FunctionFormList } from '../../function_form_list';
 import { PositionedElement } from '../../../../types';
-import { ComponentStrings } from '../../../../i18n';
+
+const strings = {
+  getDataTabLabel: () =>
+    i18n.translate('xpack.canvas.elementSettings.dataTabLabel', {
+      defaultMessage: 'Data',
+      description:
+        'This tab contains the settings for the data (i.e. Elasticsearch query) used as ' +
+        'the source for a Canvas element',
+    }),
+  getDisplayTabLabel: () =>
+    i18n.translate('xpack.canvas.elementSettings.displayTabLabel', {
+      defaultMessage: 'Display',
+      description: 'This tab contains the settings for how data is displayed in a Canvas element',
+    }),
+};
 
 interface Props {
   /**
@@ -22,8 +38,6 @@ interface Props {
   element: PositionedElement;
 }
 
-const { ElementSettings: strings } = ComponentStrings;
-
 export const ElementSettings: FunctionComponent<Props> = ({ element }) => {
   const tabs = [
     {
diff --git a/x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx
index e13cf338a2bdc..9d95a6978ff50 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx
@@ -7,9 +7,21 @@
 
 import React, { FunctionComponent } from 'react';
 import { EuiText } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n/components';
+import { i18n } from '@kbn/i18n';
 
-const { GroupSettings: strings } = ComponentStrings;
+const strings = {
+  getSaveGroupDescription: () =>
+    i18n.translate('xpack.canvas.groupSettings.saveGroupDescription', {
+      defaultMessage: 'Save this group as a new element to re-use it throughout your workpad.',
+    }),
+  getUngroupDescription: () =>
+    i18n.translate('xpack.canvas.groupSettings.ungroupDescription', {
+      defaultMessage: 'Ungroup ({uKey}) to edit individual element settings.',
+      values: {
+        uKey: 'U',
+      },
+    }),
+};
 
 export const GroupSettings: FunctionComponent = () => (
   <div className="canvasSidebar__panel canvasSidebar__panel--isEmpty">
diff --git a/x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx
index f3bd11f603243..0d73e6397adcc 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx
@@ -7,9 +7,23 @@
 
 import React, { FunctionComponent } from 'react';
 import { EuiText } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n/components';
+import { i18n } from '@kbn/i18n';
 
-const { MultiElementSettings: strings } = ComponentStrings;
+const strings = {
+  getMultipleElementsActionsDescription: () =>
+    i18n.translate('xpack.canvas.groupSettings.multipleElementsActionsDescription', {
+      defaultMessage:
+        'Deselect these elements to edit their individual settings, press ({gKey}) to group them, or save this selection as a new ' +
+        'element to re-use it throughout your workpad.',
+      values: {
+        gKey: 'G',
+      },
+    }),
+  getMultipleElementsDescription: () =>
+    i18n.translate('xpack.canvas.groupSettings.multipleElementsDescription', {
+      defaultMessage: 'Multiple elements are currently selected.',
+    }),
+};
 
 export const MultiElementSettings: FunctionComponent = () => (
   <div className="canvasSidebar__panel canvasSidebar__panel--isEmpty">
diff --git a/x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js b/x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js
index a284fc3278436..7292a98fa91ae 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js
+++ b/x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js
@@ -9,15 +9,39 @@ import React, { Fragment } from 'react';
 import { connect } from 'react-redux';
 import { compose, branch, renderComponent } from 'recompose';
 import { EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { getSelectedToplevelNodes, getSelectedElementId } from '../../state/selectors/workpad';
 import { SidebarHeader } from '../sidebar_header';
-import { ComponentStrings } from '../../../i18n';
 import { MultiElementSettings } from './multi_element_settings';
 import { GroupSettings } from './group_settings';
 import { GlobalConfig } from './global_config';
 import { ElementSettings } from './element_settings';
 
-const { SidebarContent: strings } = ComponentStrings;
+const strings = {
+  getGroupedElementSidebarTitle: () =>
+    i18n.translate('xpack.canvas.sidebarContent.groupedElementSidebarTitle', {
+      defaultMessage: 'Grouped element',
+      description:
+        'The title displayed when a grouped element is selected. "elements" refer to the different visualizations, images, ' +
+        'text, etc that can be added in a Canvas workpad. These elements can be grouped into a larger "grouped element" ' +
+        'that contains multiple individual elements.',
+    }),
+  getMultiElementSidebarTitle: () =>
+    i18n.translate('xpack.canvas.sidebarContent.multiElementSidebarTitle', {
+      defaultMessage: 'Multiple elements',
+      description:
+        'The title displayed when multiple elements are selected. "elements" refer to the different visualizations, images, ' +
+        'text, etc that can be added in a Canvas workpad.',
+    }),
+  getSingleElementSidebarTitle: () =>
+    i18n.translate('xpack.canvas.sidebarContent.singleElementSidebarTitle', {
+      defaultMessage: 'Selected element',
+      description:
+        'The title displayed when a single element are selected. "element" refer to the different visualizations, images, ' +
+        'text, etc that can be added in a Canvas workpad.',
+    }),
+};
 
 const mapStateToProps = (state) => ({
   selectedToplevelNodes: getSelectedToplevelNodes(state),
diff --git a/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx b/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx
index d4f8c7642830d..4ba3a7f90f64b 100644
--- a/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx
@@ -8,11 +8,30 @@
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { ToolTipShortcut } from '../tool_tip_shortcut/';
-import { ComponentStrings } from '../../../i18n/components';
 import { ShortcutStrings } from '../../../i18n/shortcuts';
 
-const { SidebarHeader: strings } = ComponentStrings;
+const strings = {
+  getBringForwardAriaLabel: () =>
+    i18n.translate('xpack.canvas.sidebarHeader.bringForwardArialLabel', {
+      defaultMessage: 'Move element up one layer',
+    }),
+  getBringToFrontAriaLabel: () =>
+    i18n.translate('xpack.canvas.sidebarHeader.bringToFrontArialLabel', {
+      defaultMessage: 'Move element to top layer',
+    }),
+  getSendBackwardAriaLabel: () =>
+    i18n.translate('xpack.canvas.sidebarHeader.sendBackwardArialLabel', {
+      defaultMessage: 'Move element down one layer',
+    }),
+  getSendToBackAriaLabel: () =>
+    i18n.translate('xpack.canvas.sidebarHeader.sendToBackArialLabel', {
+      defaultMessage: 'Move element to bottom layer',
+    }),
+};
+
 const shortcutHelp = ShortcutStrings.getShortcutHelp();
 
 interface Props {
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
index 51b9cf7d60262..8d4a1506ad8a2 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
@@ -8,13 +8,51 @@
 import React, { FC, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiSelect, EuiSpacer, EuiButtonGroup } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FontValue } from 'src/plugins/expressions';
-import { ComponentStrings } from '../../../i18n';
+
 import { FontPicker } from '../font_picker';
 import { ColorPickerPopover } from '../color_picker_popover';
 import { fontSizes } from './font_sizes';
 
-const { TextStylePicker: strings } = ComponentStrings;
+const strings = {
+  getAlignCenterOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.alignCenterOption', {
+      defaultMessage: 'Align center',
+    }),
+  getAlignLeftOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.alignLeftOption', {
+      defaultMessage: 'Align left',
+    }),
+  getAlignRightOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.alignRightOption', {
+      defaultMessage: 'Align right',
+    }),
+  getAlignmentOptionsControlLegend: () =>
+    i18n.translate('xpack.canvas.textStylePicker.alignmentOptionsControl', {
+      defaultMessage: 'Alignment options',
+    }),
+  getFontColorLabel: () =>
+    i18n.translate('xpack.canvas.textStylePicker.fontColorLabel', {
+      defaultMessage: 'Font Color',
+    }),
+  getStyleBoldOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.styleBoldOption', {
+      defaultMessage: 'Bold',
+    }),
+  getStyleItalicOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.styleItalicOption', {
+      defaultMessage: 'Italic',
+    }),
+  getStyleUnderlineOption: () =>
+    i18n.translate('xpack.canvas.textStylePicker.styleUnderlineOption', {
+      defaultMessage: 'Underline',
+    }),
+  getStyleOptionsControlLegend: () =>
+    i18n.translate('xpack.canvas.textStylePicker.styleOptionsControl', {
+      defaultMessage: 'Style options',
+    }),
+};
 
 export interface StyleProps {
   family?: FontValue;
diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx b/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
index 9e89ad4c4f27b..13cc4db7c6217 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
+++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
@@ -8,18 +8,39 @@
 import React, { FC, useState, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { PageManager } from '../page_manager';
 import { Expression } from '../expression';
 import { Tray } from './tray';
 
 import { CanvasElement } from '../../../types';
-import { ComponentStrings } from '../../../i18n';
 import { RoutingButtonIcon } from '../routing';
 
 import { WorkpadRoutingContext } from '../../routes/workpad';
 
-const { Toolbar: strings } = ComponentStrings;
+const strings = {
+  getEditorButtonLabel: () =>
+    i18n.translate('xpack.canvas.toolbar.editorButtonLabel', {
+      defaultMessage: 'Expression editor',
+    }),
+  getNextPageAriaLabel: () =>
+    i18n.translate('xpack.canvas.toolbar.nextPageAriaLabel', {
+      defaultMessage: 'Next Page',
+    }),
+  getPageButtonLabel: (pageNum: number, totalPages: number) =>
+    i18n.translate('xpack.canvas.toolbar.pageButtonLabel', {
+      defaultMessage: 'Page {pageNum}{rest}',
+      values: {
+        pageNum,
+        rest: totalPages > 1 ? ` of ${totalPages}` : '',
+      },
+    }),
+  getPreviousPageAriaLabel: () =>
+    i18n.translate('xpack.canvas.toolbar.previousPageAriaLabel', {
+      defaultMessage: 'Previous Page',
+    }),
+};
 
 type TrayType = 'pageManager' | 'expression';
 
diff --git a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx
index 0230eb86e121a..bc6eb455bb9b6 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx
+++ b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx
@@ -8,9 +8,14 @@
 import React, { ReactNode, MouseEventHandler } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../../i18n';
-const { ToolbarTray: strings } = ComponentStrings;
+const strings = {
+  getCloseTrayAriaLabel: () =>
+    i18n.translate('xpack.canvas.toolbarTray.closeTrayAriaLabel', {
+      defaultMessage: 'Close tray',
+    }),
+};
 
 interface Props {
   children: ReactNode;
diff --git a/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx b/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
index 69b3306d85ea5..f6ba2d7e28825 100644
--- a/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
@@ -15,10 +15,29 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { CanvasVariable } from '../../../types';
 
-import { ComponentStrings } from '../../../i18n';
-const { VarConfigDeleteVar: strings } = ComponentStrings;
+const strings = {
+  getCancelButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfigDeleteVar.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    }),
+  getDeleteButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfigDeleteVar.deleteButtonLabel', {
+      defaultMessage: 'Delete variable',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.varConfigDeleteVar.titleLabel', {
+      defaultMessage: 'Delete variable?',
+    }),
+  getWarningDescription: () =>
+    i18n.translate('xpack.canvas.varConfigDeleteVar.warningDescription', {
+      defaultMessage:
+        'Deleting this variable may adversely affect the workpad. Are you sure you wish to continue?',
+    }),
+};
 
 import './var_panel.scss';
 
diff --git a/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx b/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
index 64ec8af291448..35f9e67745aec 100644
--- a/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
@@ -20,12 +20,61 @@ import {
   EuiSpacer,
   EuiCallOut,
 } from '@elastic/eui';
-import { CanvasVariable } from '../../../types';
+import { i18n } from '@kbn/i18n';
 
+import { CanvasVariable } from '../../../types';
 import { VarValueField } from './var_value_field';
 
-import { ComponentStrings } from '../../../i18n';
-const { VarConfigEditVar: strings } = ComponentStrings;
+const strings = {
+  getAddTitle: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.addTitleLabel', {
+      defaultMessage: 'Add variable',
+    }),
+  getCancelButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    }),
+  getDuplicateNameError: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.duplicateNameError', {
+      defaultMessage: 'Variable name already in use',
+    }),
+  getEditTitle: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.editTitleLabel', {
+      defaultMessage: 'Edit variable',
+    }),
+  getEditWarning: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.editWarning', {
+      defaultMessage: 'Editing a variable in use may adversely affect your workpad',
+    }),
+  getNameFieldLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.nameFieldLabel', {
+      defaultMessage: 'Name',
+    }),
+  getSaveButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.saveButtonLabel', {
+      defaultMessage: 'Save changes',
+    }),
+  getTypeBooleanLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.typeBooleanLabel', {
+      defaultMessage: 'Boolean',
+    }),
+  getTypeFieldLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.typeFieldLabel', {
+      defaultMessage: 'Type',
+    }),
+  getTypeNumberLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.typeNumberLabel', {
+      defaultMessage: 'Number',
+    }),
+  getTypeStringLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.typeStringLabel', {
+      defaultMessage: 'String',
+    }),
+  getValueFieldLabel: () =>
+    i18n.translate('xpack.canvas.varConfigEditVar.valueFieldLabel', {
+      defaultMessage: 'Value',
+    }),
+};
 
 import './edit_var.scss';
 import './var_panel.scss';
diff --git a/x-pack/plugins/canvas/public/components/var_config/index.tsx b/x-pack/plugins/canvas/public/components/var_config/index.tsx
index 3f072e2f95140..db2a84e93a5dc 100644
--- a/x-pack/plugins/canvas/public/components/var_config/index.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/index.tsx
@@ -7,12 +7,22 @@
 
 import React, { FC } from 'react';
 import copy from 'copy-to-clipboard';
+import { i18n } from '@kbn/i18n';
+
 import { VarConfig as ChildComponent } from './var_config';
 import { useNotifyService } from '../../services';
-import { ComponentStrings } from '../../../i18n';
 import { CanvasVariable } from '../../../types';
 
-const { VarConfig: strings } = ComponentStrings;
+const strings = {
+  getCopyNotificationDescription: () =>
+    i18n.translate('xpack.canvas.varConfig.copyNotificationDescription', {
+      defaultMessage: 'Variable syntax copied to clipboard',
+    }),
+  getDeleteNotificationDescription: () =>
+    i18n.translate('xpack.canvas.varConfig.deleteNotificationDescription', {
+      defaultMessage: 'Variable successfully deleted',
+    }),
+};
 
 interface Props {
   variables: CanvasVariable[];
diff --git a/x-pack/plugins/canvas/public/components/var_config/var_config.tsx b/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
index 0fe506715d07d..dc8898e2132e7 100644
--- a/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
@@ -18,17 +18,15 @@ import {
   EuiSpacer,
   EuiButton,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { CanvasVariable } from '../../../types';
-import { ComponentStrings } from '../../../i18n';
 
 import { EditVar } from './edit_var';
 import { DeleteVar } from './delete_var';
 
 import './var_config.scss';
 
-const { VarConfig: strings } = ComponentStrings;
-
 enum PanelMode {
   List,
   Edit,
@@ -49,6 +47,58 @@ interface Props {
   onEditVar: (oldVar: CanvasVariable, newVar: CanvasVariable) => void;
 }
 
+const strings = {
+  getAddButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.addButtonLabel', {
+      defaultMessage: 'Add a variable',
+    }),
+  getAddTooltipLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.addTooltipLabel', {
+      defaultMessage: 'Add a variable',
+    }),
+  getCopyActionButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.copyActionButtonLabel', {
+      defaultMessage: 'Copy snippet',
+    }),
+  getCopyActionTooltipLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.copyActionTooltipLabel', {
+      defaultMessage: 'Copy variable syntax to clipboard',
+    }),
+  getDeleteActionButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.deleteActionButtonLabel', {
+      defaultMessage: 'Delete variable',
+    }),
+  getEditActionButtonLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.editActionButtonLabel', {
+      defaultMessage: 'Edit variable',
+    }),
+  getEmptyDescription: () =>
+    i18n.translate('xpack.canvas.varConfig.emptyDescription', {
+      defaultMessage:
+        'This workpad has no variables currently. You may add variables to store and edit common values. These variables can then be used in elements or within the expression editor.',
+    }),
+  getTableNameLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.tableNameLabel', {
+      defaultMessage: 'Name',
+    }),
+  getTableTypeLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.tableTypeLabel', {
+      defaultMessage: 'Type',
+    }),
+  getTableValueLabel: () =>
+    i18n.translate('xpack.canvas.varConfig.tableValueLabel', {
+      defaultMessage: 'Value',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.varConfig.titleLabel', {
+      defaultMessage: 'Variables',
+    }),
+  getTitleTooltip: () =>
+    i18n.translate('xpack.canvas.varConfig.titleTooltip', {
+      defaultMessage: 'Add variables to store and edit common values',
+    }),
+};
+
 export const VarConfig: FC<Props> = ({
   variables,
   onCopyVar,
diff --git a/x-pack/plugins/canvas/public/components/var_config/var_value_field.tsx b/x-pack/plugins/canvas/public/components/var_config/var_value_field.tsx
index c89164dc6efd4..1232ba3977d70 100644
--- a/x-pack/plugins/canvas/public/components/var_config/var_value_field.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/var_value_field.tsx
@@ -8,11 +8,24 @@
 import React, { FC } from 'react';
 import { EuiFieldText, EuiFieldNumber, EuiButtonGroup } from '@elastic/eui';
 import { htmlIdGenerator } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { CanvasVariable } from '../../../types';
 
-import { ComponentStrings } from '../../../i18n';
-const { VarConfigVarValueField: strings } = ComponentStrings;
+const strings = {
+  getBooleanOptionsLegend: () =>
+    i18n.translate('xpack.canvas.varConfigVarValueField.booleanOptionsLegend', {
+      defaultMessage: 'Boolean value',
+    }),
+  getFalseOption: () =>
+    i18n.translate('xpack.canvas.varConfigVarValueField.falseOption', {
+      defaultMessage: 'False',
+    }),
+  getTrueOption: () =>
+    i18n.translate('xpack.canvas.varConfigVarValueField.trueOption', {
+      defaultMessage: 'True',
+    }),
+};
 
 interface Props {
   type: CanvasVariable['type'];
diff --git a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.component.tsx b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.component.tsx
index cc6271e376c07..0561ac005519b 100644
--- a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.component.tsx
@@ -6,10 +6,15 @@
  */
 
 import React from 'react';
+import { i18n } from '@kbn/i18n';
 import { ColorPickerPopover, Props } from '../color_picker_popover';
-import { ComponentStrings } from '../../../i18n';
 
-const { WorkpadConfig: strings } = ComponentStrings;
+const strings = {
+  getBackgroundColorLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.backgroundColorLabel', {
+      defaultMessage: 'Background color',
+    }),
+};
 
 export const WorkpadColorPicker = (props: Props) => {
   return (
diff --git a/x-pack/plugins/canvas/public/components/workpad_config/workpad_config.component.tsx b/x-pack/plugins/canvas/public/components/workpad_config/workpad_config.component.tsx
index 2776280d17b32..18e3f2dac9777 100644
--- a/x-pack/plugins/canvas/public/components/workpad_config/workpad_config.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_config/workpad_config.component.tsx
@@ -22,14 +22,70 @@ import {
   EuiAccordion,
   EuiButton,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { VarConfig } from '../var_config';
-
 import { DEFAULT_WORKPAD_CSS } from '../../../common/lib/constants';
 import { CanvasVariable } from '../../../types';
-import { ComponentStrings } from '../../../i18n';
 
-const { WorkpadConfig: strings } = ComponentStrings;
+const strings = {
+  getApplyStylesheetButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.applyStylesheetButtonLabel', {
+      defaultMessage: `Apply stylesheet`,
+      description: '"stylesheet" refers to the collection of CSS style rules entered by the user.',
+    }),
+  getFlipDimensionAriaLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.swapDimensionsAriaLabel', {
+      defaultMessage: `Swap the page's width and height`,
+    }),
+  getFlipDimensionTooltip: () =>
+    i18n.translate('xpack.canvas.workpadConfig.swapDimensionsTooltip', {
+      defaultMessage: 'Swap the width and height',
+    }),
+  getGlobalCSSLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.globalCSSLabel', {
+      defaultMessage: `Global CSS overrides`,
+    }),
+  getGlobalCSSTooltip: () =>
+    i18n.translate('xpack.canvas.workpadConfig.globalCSSTooltip', {
+      defaultMessage: `Apply styles to all pages in this workpad`,
+    }),
+  getNameLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.nameLabel', {
+      defaultMessage: 'Name',
+    }),
+  getPageHeightLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.heightLabel', {
+      defaultMessage: 'Height',
+    }),
+  getPageSizeBadgeAriaLabel: (sizeName: string) =>
+    i18n.translate('xpack.canvas.workpadConfig.pageSizeBadgeAriaLabel', {
+      defaultMessage: `Preset page size: {sizeName}`,
+      values: {
+        sizeName,
+      },
+    }),
+  getPageSizeBadgeOnClickAriaLabel: (sizeName: string) =>
+    i18n.translate('xpack.canvas.workpadConfig.pageSizeBadgeOnClickAriaLabel', {
+      defaultMessage: `Set page size to {sizeName}`,
+      values: {
+        sizeName,
+      },
+    }),
+  getPageWidthLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.widthLabel', {
+      defaultMessage: 'Width',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.workpadConfig.title', {
+      defaultMessage: 'Workpad settings',
+    }),
+  getUSLetterButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadConfig.USLetterButtonLabel', {
+      defaultMessage: 'US Letter',
+      description: 'This is referring to the dimensions of U.S. standard letter paper.',
+    }),
+};
 
 export interface Props {
   size: {
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.component.tsx
index cb66eceac97c3..c78bdb2a78821 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.component.tsx
@@ -8,7 +8,8 @@
 import React, { Fragment, FunctionComponent, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonEmpty, EuiContextMenu, EuiIcon } from '@elastic/eui';
-import { ComponentStrings } from '../../../../i18n/components';
+import { i18n } from '@kbn/i18n';
+
 import { ShortcutStrings } from '../../../../i18n/shortcuts';
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { Popover, ClosePopoverFn } from '../../popover';
@@ -16,8 +17,95 @@ import { CustomElementModal } from '../../custom_element_modal';
 import { CONTEXT_MENU_TOP_BORDER_CLASSNAME } from '../../../../common/lib/constants';
 import { PositionedElement } from '../../../../types';
 
-const { WorkpadHeaderEditMenu: strings } = ComponentStrings;
 const shortcutHelp = ShortcutStrings.getShortcutHelp();
+const strings = {
+  getAlignmentMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.alignmentMenuItemLabel', {
+      defaultMessage: 'Alignment',
+      description:
+        'This refers to the vertical (i.e. left, center, right) and horizontal (i.e. top, middle, bottom) ' +
+        'alignment options of the selected elements',
+    }),
+  getBottomAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.bottomAlignMenuItemLabel', {
+      defaultMessage: 'Bottom',
+    }),
+  getCenterAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.centerAlignMenuItemLabel', {
+      defaultMessage: 'Center',
+      description: 'This refers to alignment centered horizontally.',
+    }),
+  getCreateElementModalTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.createElementModalTitle', {
+      defaultMessage: 'Create new element',
+    }),
+  getDistributionMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.distributionMenutItemLabel', {
+      defaultMessage: 'Distribution',
+      description:
+        'This refers to the options to evenly spacing the selected elements horizontall or vertically.',
+    }),
+  getEditMenuButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.editMenuButtonLabel', {
+      defaultMessage: 'Edit',
+    }),
+  getEditMenuLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.editMenuLabel', {
+      defaultMessage: 'Edit options',
+    }),
+  getGroupMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.groupMenuItemLabel', {
+      defaultMessage: 'Group',
+      description: 'This refers to grouping multiple selected elements.',
+    }),
+  getHorizontalDistributionMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.horizontalDistributionMenutItemLabel', {
+      defaultMessage: 'Horizontal',
+    }),
+  getLeftAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.leftAlignMenuItemLabel', {
+      defaultMessage: 'Left',
+    }),
+  getMiddleAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.middleAlignMenuItemLabel', {
+      defaultMessage: 'Middle',
+      description: 'This refers to alignment centered vertically.',
+    }),
+  getOrderMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.orderMenuItemLabel', {
+      defaultMessage: 'Order',
+      description: 'Refers to the order of the elements displayed on the page from front to back',
+    }),
+  getRedoMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.redoMenuItemLabel', {
+      defaultMessage: 'Redo',
+    }),
+  getRightAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.rightAlignMenuItemLabel', {
+      defaultMessage: 'Right',
+    }),
+  getSaveElementMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.savedElementMenuItemLabel', {
+      defaultMessage: 'Save as new element',
+    }),
+  getTopAlignMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.topAlignMenuItemLabel', {
+      defaultMessage: 'Top',
+    }),
+  getUndoMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.undoMenuItemLabel', {
+      defaultMessage: 'Undo',
+    }),
+  getUngroupMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.ungroupMenuItemLabel', {
+      defaultMessage: 'Ungroup',
+      description: 'This refers to ungrouping a grouped element',
+    }),
+  getVerticalDistributionMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderEditMenu.verticalDistributionMenutItemLabel', {
+      defaultMessage: 'Vertical',
+    }),
+};
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
index 19414f7c8d964..e1d69163e0761 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
@@ -14,8 +14,9 @@ import {
   EuiIcon,
   EuiContextMenuPanelItemDescriptor,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { CONTEXT_MENU_TOP_BORDER_CLASSNAME } from '../../../../common/lib';
-import { ComponentStrings } from '../../../../i18n/components';
 import { ElementSpec } from '../../../../types';
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { getId } from '../../../lib/get_id';
@@ -31,7 +32,56 @@ interface ElementTypeMeta {
   [key: string]: { name: string; icon: string };
 }
 
-export const { WorkpadHeaderElementMenu: strings } = ComponentStrings;
+const strings = {
+  getAssetsMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.manageAssetsMenuItemLabel', {
+      defaultMessage: 'Manage assets',
+    }),
+  getChartMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.chartMenuItemLabel', {
+      defaultMessage: 'Chart',
+    }),
+  getElementMenuButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.elementMenuButtonLabel', {
+      defaultMessage: 'Add element',
+    }),
+  getElementMenuLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.elementMenuLabel', {
+      defaultMessage: 'Add an element',
+    }),
+  getEmbedObjectMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.embedObjectMenuItemLabel', {
+      defaultMessage: 'Add from Kibana',
+    }),
+  getFilterMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.filterMenuItemLabel', {
+      defaultMessage: 'Filter',
+    }),
+  getImageMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.imageMenuItemLabel', {
+      defaultMessage: 'Image',
+    }),
+  getMyElementsMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.myElementsMenuItemLabel', {
+      defaultMessage: 'My elements',
+    }),
+  getOtherMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.otherMenuItemLabel', {
+      defaultMessage: 'Other',
+    }),
+  getProgressMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.progressMenuItemLabel', {
+      defaultMessage: 'Progress',
+    }),
+  getShapeMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.shapeMenuItemLabel', {
+      defaultMessage: 'Shape',
+    }),
+  getTextMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderElementMenu.textMenuItemLabel', {
+      defaultMessage: 'Text',
+    }),
+};
 
 // label and icon for the context menu item for each element type
 const elementTypeMeta: ElementTypeMeta = {
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
index eea59e6aa49f3..fde21c7c85c37 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
@@ -7,15 +7,21 @@
 
 import React, { useState } from 'react';
 import { EuiButtonEmpty, EuiNotificationBadge } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import {
   LazyLabsFlyout,
   withSuspense,
 } from '../../../../../../../src/plugins/presentation_util/public';
 
-import { ComponentStrings } from '../../../../i18n';
 import { useLabsService } from '../../../services';
-const { LabsControl: strings } = ComponentStrings;
+
+const strings = {
+  getLabsButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderLabsControlSettings.labsButtonLabel', {
+      defaultMessage: 'Labs',
+    }),
+};
 
 const Flyout = withSuspense(LazyLabsFlyout, null);
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.component.tsx
index dd9ddc2707ba6..7b1df158087b4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.component.tsx
@@ -8,10 +8,20 @@
 import React, { MouseEventHandler } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { ToolTipShortcut } from '../../tool_tip_shortcut';
 
-import { ComponentStrings } from '../../../../i18n';
-const { WorkpadHeaderRefreshControlSettings: strings } = ComponentStrings;
+const strings = {
+  getRefreshAriaLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderRefreshControlSettings.refreshAriaLabel', {
+      defaultMessage: 'Refresh Elements',
+    }),
+  getRefreshTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeaderRefreshControlSettings.refreshTooltip', {
+      defaultMessage: 'Refresh data',
+    }),
+};
 
 export interface Props {
   doRefresh: MouseEventHandler<HTMLButtonElement>;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.component.tsx
index 7c90a6fb045b7..5da009e050a27 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.component.tsx
@@ -21,16 +21,46 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { ComponentStrings } from '../../../../../i18n/components';
 import { ZIP, CANVAS, HTML } from '../../../../../i18n/constants';
 import { OnCloseFn } from '../share_menu.component';
 import { WorkpadStep } from './workpad_step';
 import { RuntimeStep } from './runtime_step';
 import { SnippetsStep } from './snippets_step';
 
-const { ShareWebsiteFlyout: strings } = ComponentStrings;
+const strings = {
+  getRuntimeStepTitle: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.downloadRuntimeTitle', {
+      defaultMessage: 'Download runtime',
+    }),
+  getSnippentsStepTitle: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.addSnippetsTitle', {
+      defaultMessage: 'Add snippets to website',
+    }),
+  getStepsDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.description', {
+      defaultMessage:
+        'Follow these steps to share a static version of this workpad on an external website. It will be a visual snapshot of the current workpad, and will not have access to live data.',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.flyoutTitle', {
+      defaultMessage: 'Share on a website',
+    }),
+  getUnsupportedRendererWarning: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.unsupportedRendererWarning', {
+      defaultMessage:
+        'This workpad contains render functions that are not supported by the {CANVAS} Shareable Workpad Runtime. These elements will not be rendered:',
+      values: {
+        CANVAS,
+      },
+    }),
+  getWorkpadStepTitle: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.downloadWorkpadTitle', {
+      defaultMessage: 'Download workpad',
+    }),
+};
 
 export type OnDownloadFn = (type: 'share' | 'shareRuntime' | 'shareZip') => void;
 export type OnCopyFn = () => void;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.ts
index 05d0070a5ea69..65c9d6598578d 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/flyout.ts
@@ -7,6 +7,8 @@
 
 import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
+import { i18n } from '@kbn/i18n';
+
 import {
   getWorkpad,
   getRenderedWorkpad,
@@ -24,14 +26,35 @@ import { arrayBufferFetch } from '../../../../../common/lib/fetch';
 import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../common/lib/constants';
 import { renderFunctionNames } from '../../../../../shareable_runtime/supported_renderers';
 
-import { ComponentStrings } from '../../../../../i18n/components';
 import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public/';
 import { OnCloseFn } from '../share_menu.component';
+import { ZIP } from '../../../../../i18n/constants';
 import { WithKibanaProps } from '../../../../index';
 
 export { OnDownloadFn, OnCopyFn } from './flyout.component';
 
-const { WorkpadHeaderShareMenu: strings } = ComponentStrings;
+const strings = {
+  getCopyShareConfigMessage: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.copyShareConfigMessage', {
+      defaultMessage: 'Copied share markup to clipboard',
+    }),
+  getShareableZipErrorTitle: (workpadName: string) =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWebsiteErrorTitle', {
+      defaultMessage:
+        "Failed to create {ZIP} file for '{workpadName}'. The workpad may be too large. You'll need to download the files separately.",
+      values: {
+        ZIP,
+        workpadName,
+      },
+    }),
+  getUnknownExportErrorMessage: (type: string) =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.unknownExportErrorMessage', {
+      defaultMessage: 'Unknown export type: {type}',
+      values: {
+        type,
+      },
+    }),
+};
 
 const getUnsupportedRenderers = (state: State) => {
   const renderers: string[] = [];
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx
index c686c403a9a45..8b2fe1a1c0394 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx
@@ -7,12 +7,26 @@
 
 import React, { FC } from 'react';
 import { EuiText, EuiSpacer, EuiButton } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../../../i18n/components';
+import { CANVAS } from '../../../../../i18n/constants';
 
 import { OnDownloadFn } from './flyout';
 
-const { ShareWebsiteRuntimeStep: strings } = ComponentStrings;
+const strings = {
+  getDownloadLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.runtimeStep.downloadLabel', {
+      defaultMessage: 'Download runtime',
+    }),
+  getStepDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.runtimeStep.description', {
+      defaultMessage:
+        'In order to render a Shareable Workpad, you also need to include the {CANVAS} Shareable Workpad Runtime. You can skip this step if the runtime is already included on your website.',
+      values: {
+        CANVAS,
+      },
+    }),
+};
 
 export const RuntimeStep: FC<{ onDownload: OnDownloadFn }> = ({ onDownload }) => (
   <EuiText size="s">
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx
index bc9f123c623f6..1bac3068e7dbb 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx
@@ -16,13 +16,91 @@ import {
   EuiDescriptionListDescription,
   EuiHorizontalRule,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../../../i18n/components';
+import { CANVAS, URL, JSON } from '../../../../../i18n/constants';
 
 import { Clipboard } from '../../../clipboard';
 import { OnCopyFn } from './flyout';
 
-const { ShareWebsiteSnippetsStep: strings } = ComponentStrings;
+const strings = {
+  getAutoplayParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.autoplayParameterDescription', {
+      defaultMessage: 'Should the runtime automatically move through the pages of the workpad?',
+    }),
+  getCallRuntimeLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.callRuntimeLabel', {
+      defaultMessage: 'Call Runtime',
+    }),
+  getHeightParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.heightParameterDescription', {
+      defaultMessage: 'The height of the Workpad. Defaults to the Workpad height.',
+    }),
+  getIncludeRuntimeLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.includeRuntimeLabel', {
+      defaultMessage: 'Include Runtime',
+    }),
+  getIntervalParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.intervalParameterDescription', {
+      defaultMessage:
+        'The interval upon which the pages will advance in time format, (e.g. {twoSeconds}, {oneMinute})',
+      values: {
+        twoSeconds: '2s',
+        oneMinute: '1m',
+      },
+    }),
+  getPageParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.pageParameterDescription', {
+      defaultMessage: 'The page to display. Defaults to the page specified by the Workpad.',
+    }),
+  getParametersDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.parametersDescription', {
+      defaultMessage: 'There are a number of inline parameters to configure the Shareable Workpad.',
+    }),
+  getParametersTitle: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.parametersLabel', {
+      defaultMessage: 'Parameters',
+    }),
+  getPlaceholderLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.placeholderLabel', {
+      defaultMessage: 'Placeholder',
+    }),
+  getRequiredLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.requiredLabel', {
+      defaultMessage: 'required',
+    }),
+  getShareableParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.shareableParameterDescription', {
+      defaultMessage: 'The type of shareable. In this case, a {CANVAS} Workpad.',
+      values: {
+        CANVAS,
+      },
+    }),
+  getSnippetsStepDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.description', {
+      defaultMessage:
+        'The Workpad is placed within the {HTML} of the site by using an {HTML} placeholder. Parameters for the runtime are included inline. See the full list of parameters below. You can include more than one workpad on the page.',
+      values: {
+        HTML,
+      },
+    }),
+  getToolbarParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.toolbarParameterDescription', {
+      defaultMessage: 'Should the toolbar be hidden?',
+    }),
+  getUrlParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.urlParameterDescription', {
+      defaultMessage: 'The {URL} of the Shareable Workpad {JSON} file.',
+      values: {
+        URL,
+        JSON,
+      },
+    }),
+  getWidthParameterDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.snippetsStep.widthParameterDescription', {
+      defaultMessage: 'The width of the Workpad. Defaults to the Workpad width.',
+    }),
+};
 
 const HTML = `<!-- ${strings.getIncludeRuntimeLabel()} -->
 <script src="kbn_canvas.js"></script>
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx
index c5a6a4478c765..3ab358d0fe324 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx
@@ -7,12 +7,26 @@
 
 import React, { FC } from 'react';
 import { EuiText, EuiSpacer, EuiButton } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-import { ComponentStrings } from '../../../../../i18n/components';
+import { JSON } from '../../../../../i18n/constants';
 
 import { OnDownloadFn } from './flyout';
 
-const { ShareWebsiteWorkpadStep: strings } = ComponentStrings;
+const strings = {
+  getDownloadLabel: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.workpadStep.downloadLabel', {
+      defaultMessage: 'Download workpad',
+    }),
+  getStepDescription: () =>
+    i18n.translate('xpack.canvas.shareWebsiteFlyout.workpadStep.description', {
+      defaultMessage:
+        'The workpad will be exported as a single {JSON} file for sharing in another site.',
+      values: {
+        JSON,
+      },
+    }),
+};
 
 export const WorkpadStep: FC<{ onDownload: OnDownloadFn }> = ({ onDownload }) => (
   <EuiText size="s">
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.component.tsx
index d4cb4d0736bb1..5ccc09bf3586b 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.component.tsx
@@ -5,18 +5,47 @@
  * 2.0.
  */
 
+import React, { FunctionComponent, useState } from 'react';
+import PropTypes from 'prop-types';
 import { EuiButtonEmpty, EuiContextMenu, EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { IBasePath } from 'kibana/public';
-import PropTypes from 'prop-types';
-import React, { FunctionComponent, useState } from 'react';
+
 import { ReportingStart } from '../../../../../reporting/public';
-import { ComponentStrings } from '../../../../i18n/components';
+import { PDF, JSON } from '../../../../i18n/constants';
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { ClosePopoverFn, Popover } from '../../popover';
 import { ShareWebsiteFlyout } from './flyout';
 import { CanvasWorkpadSharingData, getPdfJobParams } from './utils';
 
-const { WorkpadHeaderShareMenu: strings } = ComponentStrings;
+const strings = {
+  getShareDownloadJSONTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareDownloadJSONTitle', {
+      defaultMessage: 'Download as {JSON}',
+      values: {
+        JSON,
+      },
+    }),
+  getShareDownloadPDFTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareDownloadPDFTitle', {
+      defaultMessage: '{PDF} reports',
+      values: {
+        PDF,
+      },
+    }),
+  getShareMenuButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareMenuButtonLabel', {
+      defaultMessage: 'Share',
+    }),
+  getShareWebsiteTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWebsiteTitle', {
+      defaultMessage: 'Share on a website',
+    }),
+  getShareWorkpadMessage: () =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.shareWorkpadMessage', {
+      defaultMessage: 'Share this workpad',
+    }),
+};
 
 type CopyTypes = 'pdf' | 'reportingConfig';
 type ExportTypes = 'pdf' | 'json';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.ts
index fc4906817cf6f..ef13655b66aca 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.ts
@@ -7,14 +7,23 @@
 
 import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
-import { ComponentStrings } from '../../../../i18n';
+import { i18n } from '@kbn/i18n';
+
 import { CanvasWorkpad, State } from '../../../../types';
 import { downloadWorkpad } from '../../../lib/download_workpad';
 import { withServices, WithServicesProps } from '../../../services';
 import { getPages, getWorkpad } from '../../../state/selectors/workpad';
 import { Props as ComponentProps, ShareMenu as Component } from './share_menu.component';
 
-const { WorkpadHeaderShareMenu: strings } = ComponentStrings;
+const strings = {
+  getUnknownExportErrorMessage: (type: string) =>
+    i18n.translate('xpack.canvas.workpadHeaderShareMenu.unknownExportErrorMessage', {
+      defaultMessage: 'Unknown export type: {type}',
+      values: {
+        type,
+      },
+    }),
+};
 
 const mapStateToProps = (state: State) => ({
   workpad: getWorkpad(state),
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
index 1508f8683b8c1..6815ef351e0b8 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
@@ -22,14 +22,34 @@ import {
   EuiToolTip,
   htmlIdGenerator,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { timeDuration } from '../../../lib/time_duration';
+import { UnitStrings } from '../../../../i18n';
 import { CustomInterval } from './custom_interval';
 
-import { ComponentStrings, UnitStrings } from '../../../../i18n';
-const { WorkpadHeaderAutoRefreshControls: strings } = ComponentStrings;
 const { time: timeStrings } = UnitStrings;
 const { getSecondsText, getMinutesText, getHoursText } = timeStrings;
 
+const strings = {
+  getDisableTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.disableTooltip', {
+      defaultMessage: 'Disable auto-refresh',
+    }),
+  getIntervalFormLabelText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.intervalFormLabel', {
+      defaultMessage: 'Change auto-refresh interval',
+    }),
+  getRefreshListDurationManualText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.refreshListDurationManualText', {
+      defaultMessage: 'Manually',
+    }),
+  getRefreshListTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderAutoRefreshControls.refreshListTitle', {
+      defaultMessage: 'Refresh elements',
+    }),
+};
+
 interface Props {
   refreshInterval: number;
   setRefresh: (interval: number) => void;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
index d4d28d19131f0..284749340e440 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
@@ -8,12 +8,31 @@
 import React, { useState, ChangeEvent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiButton, EuiFieldText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { ButtonSize } from '@elastic/eui/src/components/button/button';
 import { FlexGroupGutterSize } from '@elastic/eui/src/components/flex/flex_group';
 import { getTimeInterval } from '../../../lib/time_interval';
 
-import { ComponentStrings } from '../../../../i18n';
-const { WorkpadHeaderCustomInterval: strings } = ComponentStrings;
+const strings = {
+  getButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderCustomInterval.confirmButtonLabel', {
+      defaultMessage: 'Set',
+    }),
+  getFormDescription: () =>
+    i18n.translate('xpack.canvas.workpadHeaderCustomInterval.formDescription', {
+      defaultMessage:
+        'Use shorthand notation, like {secondsExample}, {minutesExample}, or {hoursExample}',
+      values: {
+        secondsExample: '30s',
+        minutesExample: '10m',
+        hoursExample: '1h',
+      },
+    }),
+  getFormLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderCustomInterval.formLabel', {
+      defaultMessage: 'Set a custom interval',
+    }),
+};
 
 interface Props {
   gutterSize: FlexGroupGutterSize;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
index 55373d7a3515c..b8ed80c870f28 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
@@ -22,14 +22,34 @@ import {
   EuiFlexGroup,
   htmlIdGenerator,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import { timeDuration } from '../../../lib/time_duration';
+import { UnitStrings } from '../../../../i18n';
 import { CustomInterval } from './custom_interval';
 
-import { ComponentStrings, UnitStrings } from '../../../../i18n';
-const { WorkpadHeaderKioskControls: strings } = ComponentStrings;
 const { time: timeStrings } = UnitStrings;
 const { getSecondsText, getMinutesText } = timeStrings;
 
+const strings = {
+  getCycleFormLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderKioskControl.cycleFormLabel', {
+      defaultMessage: 'Change cycling interval',
+    }),
+  getTitle: () =>
+    i18n.translate('xpack.canvas.workpadHeaderKioskControl.controlTitle', {
+      defaultMessage: 'Cycle fullscreen pages',
+    }),
+  getAutoplayListDurationManualText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderKioskControl.autoplayListDurationManual', {
+      defaultMessage: 'Manually',
+    }),
+  getDisableTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeaderKioskControl.disableTooltip', {
+      defaultMessage: 'Disable auto-play',
+    }),
+};
+
 interface Props {
   autoplayInterval: number;
   onSetInterval: (interval: number) => void;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
index 8fb24c1f3c62e..168ddc690c4d4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
@@ -13,18 +13,80 @@ import {
   EuiIcon,
   EuiContextMenuPanelItemDescriptor,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
 import {
   MAX_ZOOM_LEVEL,
   MIN_ZOOM_LEVEL,
   CONTEXT_MENU_TOP_BORDER_CLASSNAME,
 } from '../../../../common/lib/constants';
-import { ComponentStrings } from '../../../../i18n/components';
+
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { Popover, ClosePopoverFn } from '../../popover';
 import { AutoRefreshControls } from './auto_refresh_controls';
 import { KioskControls } from './kiosk_controls';
 
-const { WorkpadHeaderViewMenu: strings } = ComponentStrings;
+const strings = {
+  getAutoplaySettingsMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.autoplaySettingsMenuItemLabel', {
+      defaultMessage: 'Autoplay settings',
+    }),
+  getFullscreenMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.fullscreenMenuLabel', {
+      defaultMessage: 'Enter fullscreen mode',
+    }),
+  getHideEditModeLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.hideEditModeLabel', {
+      defaultMessage: 'Hide editing controls',
+    }),
+  getRefreshMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.refreshMenuItemLabel', {
+      defaultMessage: 'Refresh data',
+    }),
+  getRefreshSettingsMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.refreshSettingsMenuItemLabel', {
+      defaultMessage: 'Auto refresh settings',
+    }),
+  getShowEditModeLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.showEditModeLabel', {
+      defaultMessage: 'Show editing controls',
+    }),
+  getViewMenuButtonLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.viewMenuButtonLabel', {
+      defaultMessage: 'View',
+    }),
+  getViewMenuLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.viewMenuLabel', {
+      defaultMessage: 'View options',
+    }),
+  getZoomFitToWindowText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomFitToWindowText', {
+      defaultMessage: 'Fit to window',
+    }),
+  getZoomInText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomInText', {
+      defaultMessage: 'Zoom in',
+    }),
+  getZoomMenuItemLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomMenuItemLabel', {
+      defaultMessage: 'Zoom',
+    }),
+  getZoomOutText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomOutText', {
+      defaultMessage: 'Zoom out',
+    }),
+  getZoomPercentage: (scale: number) =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomResetText', {
+      defaultMessage: '{scalePercentage}%',
+      values: {
+        scalePercentage: scale * 100,
+      },
+    }),
+  getZoomResetText: () =>
+    i18n.translate('xpack.canvas.workpadHeaderViewMenu.zoomPrecentageValue', {
+      defaultMessage: 'Reset',
+    }),
+};
 
 const QUICK_ZOOM_LEVELS = [0.5, 1, 2];
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
index 415d3ddf46709..5320a65a90408 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -10,7 +10,8 @@ import PropTypes from 'prop-types';
 // @ts-expect-error no @types definition
 import { Shortcuts } from 'react-shortcuts';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
-import { ComponentStrings } from '../../../i18n';
+import { i18n } from '@kbn/i18n';
+
 import { ToolTipShortcut } from '../tool_tip_shortcut/';
 import { RefreshControl } from './refresh_control';
 // @ts-expect-error untyped local
@@ -22,7 +23,28 @@ import { ViewMenu } from './view_menu';
 import { LabsControl } from './labs_control';
 import { CommitFn } from '../../../types';
 
-const { WorkpadHeader: strings } = ComponentStrings;
+const strings = {
+  getFullScreenButtonAriaLabel: () =>
+    i18n.translate('xpack.canvas.workpadHeader.fullscreenButtonAriaLabel', {
+      defaultMessage: 'View fullscreen',
+    }),
+  getFullScreenTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeader.fullscreenTooltip', {
+      defaultMessage: 'Enter fullscreen mode',
+    }),
+  getHideEditControlTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeader.hideEditControlTooltip', {
+      defaultMessage: 'Hide editing controls',
+    }),
+  getNoWritePermissionTooltipText: () =>
+    i18n.translate('xpack.canvas.workpadHeader.noWritePermissionTooltip', {
+      defaultMessage: "You don't have permission to edit this workpad",
+    }),
+  getShowEditControlTooltip: () =>
+    i18n.translate('xpack.canvas.workpadHeader.showEditControlTooltip', {
+      defaultMessage: 'Show editing controls',
+    }),
+};
 
 export interface Props {
   isWriteable: boolean;
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 17c31b8cd115e..e73bb19627b8f 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5976,9 +5976,6 @@
     "xpack.banners.settings.textColor.description": "バナーテキストの色を設定します。{subscriptionLink}",
     "xpack.banners.settings.textColor.title": "バナーテキスト色",
     "xpack.banners.settings.textContent.title": "バナーテキスト",
-    "xpack.canvas.app.loadErrorMessage": "メッセージ：{error}",
-    "xpack.canvas.app.loadErrorTitle": "Canvas の読み込みに失敗",
-    "xpack.canvas.app.loadingMessage": "Canvas を読み込み中",
     "xpack.canvas.appDescription": "データを完璧に美しく表現します。",
     "xpack.canvas.argAddPopover.addAriaLabel": "引数を追加",
     "xpack.canvas.argFormAdvancedFailure.applyButtonLabel": "適用",
@@ -5996,8 +5993,6 @@
     "xpack.canvas.asset.deleteAssetTooltip": "削除",
     "xpack.canvas.asset.downloadAssetTooltip": "ダウンロード",
     "xpack.canvas.asset.thumbnailAltText": "アセットのサムネイル",
-    "xpack.canvas.assetManager.manageButtonLabel": "アセットの管理",
-    "xpack.canvas.assetModal.copyAssetMessage": "「{id}」をクリップボードにコピーしました",
     "xpack.canvas.assetModal.emptyAssetsDescription": "アセットをインポートして開始します",
     "xpack.canvas.assetModal.filePickerPromptText": "画像を選択するかドラッグ &amp;amp; ドロップしてください",
     "xpack.canvas.assetModal.loadingText": "画像をアップロード中",
@@ -6020,7 +6015,6 @@
     "xpack.canvas.customElementModal.nameInputLabel": "名前",
     "xpack.canvas.customElementModal.remainingCharactersDescription": "残り {numberOfRemainingCharacter} 文字",
     "xpack.canvas.customElementModal.saveButtonLabel": "保存",
-    "xpack.canvas.datasourceDatasourceComponent.changeButtonLabel": "要素データソースの変更",
     "xpack.canvas.datasourceDatasourceComponent.expressionArgDescription": "データソースの引数は式で制御されます。式エディターを使用して、データソースを修正します。",
     "xpack.canvas.datasourceDatasourceComponent.previewButtonLabel": "データをプレビュー",
     "xpack.canvas.datasourceDatasourceComponent.saveButtonLabel": "保存",
@@ -6449,8 +6443,6 @@
     "xpack.canvas.groupSettings.saveGroupDescription": "ワークパッド全体で再利用できるように、このグループを新規エレメントとして保存します。",
     "xpack.canvas.groupSettings.ungroupDescription": "個々のエレメントの設定を編集できるように、 ({uKey}) のグループを解除します。",
     "xpack.canvas.helpMenu.appName": "Canvas",
-    "xpack.canvas.helpMenu.description": "{CANVAS} に関する情報",
-    "xpack.canvas.helpMenu.documentationLinkLabel": "{CANVAS} ドキュメント",
     "xpack.canvas.helpMenu.keyboardShortcutsLinkLabel": "キーボードショートカット",
     "xpack.canvas.home.myWorkpadsTabLabel": "マイワークパッド",
     "xpack.canvas.home.workpadTemplatesTabLabel": "テンプレート",
@@ -6517,7 +6509,6 @@
     "xpack.canvas.lib.palettes.yellowBlueLabel": "黄、青",
     "xpack.canvas.lib.palettes.yellowGreenLabel": "黄、緑",
     "xpack.canvas.lib.palettes.yellowRedLabel": "黄、赤",
-    "xpack.canvas.link.errorMessage": "リンクエラー：{message}",
     "xpack.canvas.pageConfig.backgroundColorDescription": "HEX、RGB、また HTML 色名が使用できます",
     "xpack.canvas.pageConfig.backgroundColorLabel": "背景",
     "xpack.canvas.pageConfig.title": "ページ設定",
@@ -6527,7 +6518,6 @@
     "xpack.canvas.pageManager.addPageTooltip": "新しいページをこのワークパッドに追加",
     "xpack.canvas.pageManager.confirmRemoveDescription": "このページを削除してよろしいですか？",
     "xpack.canvas.pageManager.confirmRemoveTitle": "ページを削除",
-    "xpack.canvas.pageManager.pageNumberAriaLabel": "ページ番号 {pageNumber} を読み込む",
     "xpack.canvas.pageManager.removeButtonLabel": "削除",
     "xpack.canvas.pagePreviewPageControls.clonePageAriaLabel": "ページのクローンを作成",
     "xpack.canvas.pagePreviewPageControls.clonePageTooltip": "クローンを作成",
@@ -6579,10 +6569,8 @@
     "xpack.canvas.savedElementsModal.deleteElementDescription": "このエレメントを削除してよろしいですか？",
     "xpack.canvas.savedElementsModal.deleteElementTitle": "要素'{elementName}'を削除しますか？",
     "xpack.canvas.savedElementsModal.editElementTitle": "エレメントを編集",
-    "xpack.canvas.savedElementsModal.elementsTitle": "エレメント",
     "xpack.canvas.savedElementsModal.findElementPlaceholder": "エレメントを検索",
     "xpack.canvas.savedElementsModal.modalTitle": "マイエレメント",
-    "xpack.canvas.savedElementsModal.myElementsTitle": "マイエレメント",
     "xpack.canvas.shareWebsiteFlyout.description": "外部 Web サイトでこのワークパッドの不動バージョンを共有するには、これらの手順に従ってください。現在のワークパッドのビジュアルスナップショットになり、ライブデータにはアクセスできません。",
     "xpack.canvas.shareWebsiteFlyout.flyoutCalloutDescription": "共有するには、このワークパッド、{CANVAS} シェアラブルワークパッドランタイム、サンプル {HTML} ファイルを含む {link} を使用します。",
     "xpack.canvas.shareWebsiteFlyout.flyoutTitle": "Webサイトで共有",
@@ -6637,13 +6625,10 @@
     "xpack.canvas.textStylePicker.styleItalicOption": "斜体",
     "xpack.canvas.textStylePicker.styleOptionsControl": "スタイルオプション",
     "xpack.canvas.textStylePicker.styleUnderlineOption": "下線",
-    "xpack.canvas.timePicker.applyButtonLabel": "適用",
     "xpack.canvas.toolbar.editorButtonLabel": "表現エディター",
-    "xpack.canvas.toolbar.errorMessage": "ツールバーエラー：{message}",
     "xpack.canvas.toolbar.nextPageAriaLabel": "次のページ",
     "xpack.canvas.toolbar.pageButtonLabel": "{pageNum}{rest} ページ",
     "xpack.canvas.toolbar.previousPageAriaLabel": "前のページ",
-    "xpack.canvas.toolbar.workpadManagerCloseButtonLabel": "閉じる",
     "xpack.canvas.toolbarTray.closeTrayAriaLabel": "トレイのクローンを作成",
     "xpack.canvas.transitions.fade.displayName": "フェード",
     "xpack.canvas.transitions.fade.help": "ページからページへフェードします",
@@ -6905,20 +6890,8 @@
     "xpack.canvas.units.quickRange.today": "今日",
     "xpack.canvas.units.quickRange.yesterday": "昨日",
     "xpack.canvas.useCloneWorkpad.clonedWorkpadName": "{workpadName} のコピー",
-    "xpack.canvas.varConfig.addButtonLabel": "変数の追加",
-    "xpack.canvas.varConfig.addTooltipLabel": "変数の追加",
-    "xpack.canvas.varConfig.copyActionButtonLabel": "スニペットをコピー",
-    "xpack.canvas.varConfig.copyActionTooltipLabel": "変数構文をクリップボードにコピー",
     "xpack.canvas.varConfig.copyNotificationDescription": "変数構文がクリップボードにコピーされました",
-    "xpack.canvas.varConfig.deleteActionButtonLabel": "変数の削除",
     "xpack.canvas.varConfig.deleteNotificationDescription": "変数の削除が正常に完了しました",
-    "xpack.canvas.varConfig.editActionButtonLabel": "変数の編集",
-    "xpack.canvas.varConfig.emptyDescription": "このワークパッドには現在変数がありません。変数を追加して、共通の値を格納したり、編集したりすることができます。これらの変数は、要素または式エディターで使用できます。",
-    "xpack.canvas.varConfig.tableNameLabel": "名前",
-    "xpack.canvas.varConfig.tableTypeLabel": "型",
-    "xpack.canvas.varConfig.tableValueLabel": "値",
-    "xpack.canvas.varConfig.titleLabel": "変数",
-    "xpack.canvas.varConfig.titleTooltip": "変数を追加して、共通の値を格納したり、編集したりします",
     "xpack.canvas.varConfigDeleteVar.cancelButtonLabel": "キャンセル",
     "xpack.canvas.varConfigDeleteVar.deleteButtonLabel": "変数の削除",
     "xpack.canvas.varConfigDeleteVar.titleLabel": "変数を削除しますか?",
@@ -6952,7 +6925,6 @@
     "xpack.canvas.workpadConfig.USLetterButtonLabel": "US レター",
     "xpack.canvas.workpadConfig.widthLabel": "幅",
     "xpack.canvas.workpadCreate.createButtonLabel": "ワークパッドを作成",
-    "xpack.canvas.workpadHeader.addElementButtonLabel": "エレメントを追加",
     "xpack.canvas.workpadHeader.addElementModalCloseButtonLabel": "閉じる",
     "xpack.canvas.workpadHeader.fullscreenButtonAriaLabel": "全画面表示",
     "xpack.canvas.workpadHeader.fullscreenTooltip": "全画面モードを開始します",
@@ -6999,10 +6971,8 @@
     "xpack.canvas.workpadHeaderElementMenu.textMenuItemLabel": "テキスト",
     "xpack.canvas.workpadHeaderKioskControl.controlTitle": "全画面ページのサイクル",
     "xpack.canvas.workpadHeaderKioskControl.cycleFormLabel": "サイクル間隔を変更",
-    "xpack.canvas.workpadHeaderKioskControl.cycleToggleSwitch": "スライドを自動的にサイクル",
     "xpack.canvas.workpadHeaderRefreshControlSettings.refreshAriaLabel": "エレメントを更新",
     "xpack.canvas.workpadHeaderRefreshControlSettings.refreshTooltip": "データを更新",
-    "xpack.canvas.workpadHeaderShareMenu.copyPDFMessage": "{PDF}生成{URL}がクリップボードにコピーされました。",
     "xpack.canvas.workpadHeaderShareMenu.copyShareConfigMessage": "共有マークアップがクリップボードにコピーされました",
     "xpack.canvas.workpadHeaderShareMenu.shareDownloadJSONTitle": "{JSON} をダウンロード",
     "xpack.canvas.workpadHeaderShareMenu.shareDownloadPDFTitle": "{PDF}レポート",
@@ -7012,8 +6982,6 @@
     "xpack.canvas.workpadHeaderShareMenu.shareWorkpadMessage": "このワークパッドを共有",
     "xpack.canvas.workpadHeaderShareMenu.unknownExportErrorMessage": "不明なエクスポートタイプ：{type}",
     "xpack.canvas.workpadHeaderShareMenu.unsupportedRendererWarning": "このワークパッドには、{CANVAS}シェアラブルワークパッドランタイムがサポートしていないレンダリング関数が含まれています。これらのエレメントはレンダリングされません：",
-    "xpack.canvas.workpadHeaderViewMenu.autoplayOffMenuItemLabel": "自動再生をオフにする",
-    "xpack.canvas.workpadHeaderViewMenu.autoplayOnMenuItemLabel": "自動再生をオンにする",
     "xpack.canvas.workpadHeaderViewMenu.autoplaySettingsMenuItemLabel": "自動再生設定",
     "xpack.canvas.workpadHeaderViewMenu.fullscreenMenuLabel": "全画面モードを開始します",
     "xpack.canvas.workpadHeaderViewMenu.hideEditModeLabel": "編集コントロールを非表示にします",
@@ -7022,13 +6990,10 @@
     "xpack.canvas.workpadHeaderViewMenu.showEditModeLabel": "編集コントロールを表示します",
     "xpack.canvas.workpadHeaderViewMenu.viewMenuButtonLabel": "表示",
     "xpack.canvas.workpadHeaderViewMenu.viewMenuLabel": "表示オプション",
-    "xpack.canvas.workpadHeaderViewMenu.zoomControlsAriaLabel": "ズームコントロール",
-    "xpack.canvas.workpadHeaderViewMenu.zoomControlsTooltip": "ズームコントロール",
     "xpack.canvas.workpadHeaderViewMenu.zoomFitToWindowText": "ウィンドウに合わせる",
     "xpack.canvas.workpadHeaderViewMenu.zoomInText": "ズームイン",
     "xpack.canvas.workpadHeaderViewMenu.zoomMenuItemLabel": "ズーム",
     "xpack.canvas.workpadHeaderViewMenu.zoomOutText": "ズームアウト",
-    "xpack.canvas.workpadHeaderViewMenu.zoomPanelTitle": "ズーム",
     "xpack.canvas.workpadHeaderViewMenu.zoomPrecentageValue": "リセット",
     "xpack.canvas.workpadHeaderViewMenu.zoomResetText": "{scalePercentage}%",
     "xpack.canvas.workpadImport.filePickerPlaceholder": "ワークパッド {JSON} ファイルをインポート",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 055ccbdde6ae8..51f6378f481e2 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -6015,9 +6015,6 @@
     "xpack.banners.settings.textColor.description": "设置横幅广告文本的颜色。{subscriptionLink}",
     "xpack.banners.settings.textColor.title": "横幅广告文本颜色",
     "xpack.banners.settings.textContent.title": "横幅广告文本",
-    "xpack.canvas.app.loadErrorMessage": "消息：{error}",
-    "xpack.canvas.app.loadErrorTitle": "Canvas 加载失败",
-    "xpack.canvas.app.loadingMessage": "Canvas 正在加载",
     "xpack.canvas.appDescription": "以最佳像素展示您的数据。",
     "xpack.canvas.argAddPopover.addAriaLabel": "添加参数",
     "xpack.canvas.argFormAdvancedFailure.applyButtonLabel": "应用",
@@ -6035,8 +6032,6 @@
     "xpack.canvas.asset.deleteAssetTooltip": "删除",
     "xpack.canvas.asset.downloadAssetTooltip": "下载",
     "xpack.canvas.asset.thumbnailAltText": "资产缩略图",
-    "xpack.canvas.assetManager.manageButtonLabel": "管理资产",
-    "xpack.canvas.assetModal.copyAssetMessage": "已将“{id}”复制到剪贴板",
     "xpack.canvas.assetModal.emptyAssetsDescription": "导入您的资产以开始",
     "xpack.canvas.assetModal.filePickerPromptText": "选择或拖放图像",
     "xpack.canvas.assetModal.loadingText": "正在上传图像",
@@ -6059,7 +6054,6 @@
     "xpack.canvas.customElementModal.nameInputLabel": "名称",
     "xpack.canvas.customElementModal.remainingCharactersDescription": "还剩 {numberOfRemainingCharacter} 个字符",
     "xpack.canvas.customElementModal.saveButtonLabel": "保存",
-    "xpack.canvas.datasourceDatasourceComponent.changeButtonLabel": "更改元素数据源",
     "xpack.canvas.datasourceDatasourceComponent.expressionArgDescription": "数据源包含由表达式控制的参数。使用表达式编辑器可修改数据源。",
     "xpack.canvas.datasourceDatasourceComponent.previewButtonLabel": "预览数据",
     "xpack.canvas.datasourceDatasourceComponent.saveButtonLabel": "保存",
@@ -6489,8 +6483,6 @@
     "xpack.canvas.groupSettings.saveGroupDescription": "将此组另存为新元素，以在整个 Workpad 重复使用。",
     "xpack.canvas.groupSettings.ungroupDescription": "取消分组 ({uKey}) 以编辑各个元素设置。",
     "xpack.canvas.helpMenu.appName": "Canvas",
-    "xpack.canvas.helpMenu.description": "有关 {CANVAS} 特定信息",
-    "xpack.canvas.helpMenu.documentationLinkLabel": "{CANVAS} 文档",
     "xpack.canvas.helpMenu.keyboardShortcutsLinkLabel": "快捷键",
     "xpack.canvas.home.myWorkpadsTabLabel": "我的 Workpad",
     "xpack.canvas.home.workpadTemplatesTabLabel": "模板",
@@ -6557,7 +6549,6 @@
     "xpack.canvas.lib.palettes.yellowBlueLabel": "黄、蓝",
     "xpack.canvas.lib.palettes.yellowGreenLabel": "黄、绿",
     "xpack.canvas.lib.palettes.yellowRedLabel": "黄、红",
-    "xpack.canvas.link.errorMessage": "链接错误：{message}",
     "xpack.canvas.pageConfig.backgroundColorDescription": "接受 HEX、RGB 或 HTML 颜色名称",
     "xpack.canvas.pageConfig.backgroundColorLabel": "背景",
     "xpack.canvas.pageConfig.title": "页面设置",
@@ -6567,7 +6558,6 @@
     "xpack.canvas.pageManager.addPageTooltip": "将新页面添加到此 Workpad",
     "xpack.canvas.pageManager.confirmRemoveDescription": "确定要移除此页面？",
     "xpack.canvas.pageManager.confirmRemoveTitle": "移除页面",
-    "xpack.canvas.pageManager.pageNumberAriaLabel": "加载页码 {pageNumber}",
     "xpack.canvas.pageManager.removeButtonLabel": "移除",
     "xpack.canvas.pagePreviewPageControls.clonePageAriaLabel": "克隆页面",
     "xpack.canvas.pagePreviewPageControls.clonePageTooltip": "克隆",
@@ -6619,10 +6609,8 @@
     "xpack.canvas.savedElementsModal.deleteElementDescription": "确定要删除此元素？",
     "xpack.canvas.savedElementsModal.deleteElementTitle": "删除元素“{elementName}”？",
     "xpack.canvas.savedElementsModal.editElementTitle": "编辑元素",
-    "xpack.canvas.savedElementsModal.elementsTitle": "元素",
     "xpack.canvas.savedElementsModal.findElementPlaceholder": "查找元素",
     "xpack.canvas.savedElementsModal.modalTitle": "我的元素",
-    "xpack.canvas.savedElementsModal.myElementsTitle": "我的元素",
     "xpack.canvas.shareWebsiteFlyout.description": "按照以下步骤在外部网站上共享此 Workpad 的静态版本。其将是当前 Workpad 的可视化快照，对实时数据没有访问权限。",
     "xpack.canvas.shareWebsiteFlyout.flyoutCalloutDescription": "要尝试共享，可以{link}，其包含此 Workpad、{CANVAS} Shareable Workpad Runtime 及示例 {HTML} 文件。",
     "xpack.canvas.shareWebsiteFlyout.flyoutTitle": "在网站上共享",
@@ -6677,13 +6665,10 @@
     "xpack.canvas.textStylePicker.styleItalicOption": "斜体",
     "xpack.canvas.textStylePicker.styleOptionsControl": "样式选项",
     "xpack.canvas.textStylePicker.styleUnderlineOption": "下划线",
-    "xpack.canvas.timePicker.applyButtonLabel": "应用",
     "xpack.canvas.toolbar.editorButtonLabel": "表达式编辑器",
-    "xpack.canvas.toolbar.errorMessage": "工具栏错误：{message}",
     "xpack.canvas.toolbar.nextPageAriaLabel": "下一页",
     "xpack.canvas.toolbar.pageButtonLabel": "第 {pageNum}{rest} 页",
     "xpack.canvas.toolbar.previousPageAriaLabel": "上一页",
-    "xpack.canvas.toolbar.workpadManagerCloseButtonLabel": "关闭",
     "xpack.canvas.toolbarTray.closeTrayAriaLabel": "关闭托盘",
     "xpack.canvas.transitions.fade.displayName": "淡化",
     "xpack.canvas.transitions.fade.help": "从一页淡入到下一页",
@@ -6949,20 +6934,8 @@
     "xpack.canvas.units.time.minutes": "{minutes, plural, other {# 分钟}}",
     "xpack.canvas.units.time.seconds": "{seconds, plural, other {# 秒}}",
     "xpack.canvas.useCloneWorkpad.clonedWorkpadName": "{workpadName} 副本",
-    "xpack.canvas.varConfig.addButtonLabel": "添加变量",
-    "xpack.canvas.varConfig.addTooltipLabel": "添加变量",
-    "xpack.canvas.varConfig.copyActionButtonLabel": "复制代码片段",
-    "xpack.canvas.varConfig.copyActionTooltipLabel": "将变量语法复制到剪贴板",
     "xpack.canvas.varConfig.copyNotificationDescription": "变量语法已复制到剪贴板",
-    "xpack.canvas.varConfig.deleteActionButtonLabel": "删除变量",
     "xpack.canvas.varConfig.deleteNotificationDescription": "变量已成功删除",
-    "xpack.canvas.varConfig.editActionButtonLabel": "编辑变量",
-    "xpack.canvas.varConfig.emptyDescription": "此 Workpad 当前没有变量。您可以添加变量以存储和编辑公用值。这样，便可以在元素中或表达式编辑器中使用这些变量。",
-    "xpack.canvas.varConfig.tableNameLabel": "名称",
-    "xpack.canvas.varConfig.tableTypeLabel": "类型",
-    "xpack.canvas.varConfig.tableValueLabel": "值",
-    "xpack.canvas.varConfig.titleLabel": "变量",
-    "xpack.canvas.varConfig.titleTooltip": "添加变量以存储和编辑公用值",
     "xpack.canvas.varConfigDeleteVar.cancelButtonLabel": "取消",
     "xpack.canvas.varConfigDeleteVar.deleteButtonLabel": "删除变量",
     "xpack.canvas.varConfigDeleteVar.titleLabel": "删除变量？",
@@ -6996,7 +6969,6 @@
     "xpack.canvas.workpadConfig.USLetterButtonLabel": "美国信函",
     "xpack.canvas.workpadConfig.widthLabel": "宽",
     "xpack.canvas.workpadCreate.createButtonLabel": "创建 Workpad",
-    "xpack.canvas.workpadHeader.addElementButtonLabel": "添加元素",
     "xpack.canvas.workpadHeader.addElementModalCloseButtonLabel": "关闭",
     "xpack.canvas.workpadHeader.cycleIntervalDaysText": "每 {days} {days, plural, other {天}}",
     "xpack.canvas.workpadHeader.cycleIntervalHoursText": "每 {hours} {hours, plural, other {小时}}",
@@ -7047,10 +7019,8 @@
     "xpack.canvas.workpadHeaderElementMenu.textMenuItemLabel": "文本",
     "xpack.canvas.workpadHeaderKioskControl.controlTitle": "循环播放全屏页面",
     "xpack.canvas.workpadHeaderKioskControl.cycleFormLabel": "更改循环播放时间间隔",
-    "xpack.canvas.workpadHeaderKioskControl.cycleToggleSwitch": "自动循环播放幻灯片",
     "xpack.canvas.workpadHeaderRefreshControlSettings.refreshAriaLabel": "刷新元素",
     "xpack.canvas.workpadHeaderRefreshControlSettings.refreshTooltip": "刷新数据",
-    "xpack.canvas.workpadHeaderShareMenu.copyPDFMessage": "{PDF} 生成 {URL} 已复制到您的剪贴板。",
     "xpack.canvas.workpadHeaderShareMenu.copyShareConfigMessage": "已将共享标记复制到剪贴板",
     "xpack.canvas.workpadHeaderShareMenu.shareDownloadJSONTitle": "下载为 {JSON}",
     "xpack.canvas.workpadHeaderShareMenu.shareDownloadPDFTitle": "{PDF} 报告",
@@ -7060,8 +7030,6 @@
     "xpack.canvas.workpadHeaderShareMenu.shareWorkpadMessage": "共享此 Workpad",
     "xpack.canvas.workpadHeaderShareMenu.unknownExportErrorMessage": "未知导出类型：{type}",
     "xpack.canvas.workpadHeaderShareMenu.unsupportedRendererWarning": "此 Workpad 包含 {CANVAS} Shareable Workpad Runtime 不支持的呈现函数。将不会呈现以下元素：",
-    "xpack.canvas.workpadHeaderViewMenu.autoplayOffMenuItemLabel": "关闭自动播放",
-    "xpack.canvas.workpadHeaderViewMenu.autoplayOnMenuItemLabel": "打开自动播放",
     "xpack.canvas.workpadHeaderViewMenu.autoplaySettingsMenuItemLabel": "自动播放设置",
     "xpack.canvas.workpadHeaderViewMenu.fullscreenMenuLabel": "进入全屏模式",
     "xpack.canvas.workpadHeaderViewMenu.hideEditModeLabel": "隐藏编辑控件",
@@ -7070,13 +7038,10 @@
     "xpack.canvas.workpadHeaderViewMenu.showEditModeLabel": "显示编辑控制",
     "xpack.canvas.workpadHeaderViewMenu.viewMenuButtonLabel": "查看",
     "xpack.canvas.workpadHeaderViewMenu.viewMenuLabel": "查看选项",
-    "xpack.canvas.workpadHeaderViewMenu.zoomControlsAriaLabel": "缩放控制",
-    "xpack.canvas.workpadHeaderViewMenu.zoomControlsTooltip": "缩放控制",
     "xpack.canvas.workpadHeaderViewMenu.zoomFitToWindowText": "适应窗口大小",
     "xpack.canvas.workpadHeaderViewMenu.zoomInText": "放大",
     "xpack.canvas.workpadHeaderViewMenu.zoomMenuItemLabel": "缩放",
     "xpack.canvas.workpadHeaderViewMenu.zoomOutText": "缩小",
-    "xpack.canvas.workpadHeaderViewMenu.zoomPanelTitle": "缩放",
     "xpack.canvas.workpadHeaderViewMenu.zoomPrecentageValue": "重置",
     "xpack.canvas.workpadHeaderViewMenu.zoomResetText": "{scalePercentage}%",
     "xpack.canvas.workpadImport.filePickerPlaceholder": "导入 Workpad {JSON} 文件",

From d5a760cfd9811d85d5c53eab44fc812a4b733263 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 23 Jun 2021 18:12:56 -0700
Subject: [PATCH 15/95] [test] Migrates visualize esArchive to kbnArchiver
 (#102850)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 test/functional/apps/context/index.js         |  10 +-
 .../apps/discover/_source_filters.ts          |   9 +-
 .../fixtures/es_archiver/visualize/data.json  | 388 --------------
 .../es_archiver/visualize/mappings.json       | 487 ------------------
 .../fixtures/kbn_archiver/visualize.json      |  70 +--
 .../test_suites/run_pipeline/index.ts         |   8 +-
 .../custom_visualizations/index.js            |   8 +-
 .../tests/vega/vega_map_visualization.ts      |   7 +-
 8 files changed, 69 insertions(+), 918 deletions(-)
 delete mode 100644 test/functional/fixtures/es_archiver/visualize/data.json
 delete mode 100644 test/functional/fixtures/es_archiver/visualize/mappings.json

diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js
index 7612dae338d9f..031171a58718b 100644
--- a/test/functional/apps/context/index.js
+++ b/test/functional/apps/context/index.js
@@ -15,16 +15,18 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
   describe('context app', function () {
     this.tags('ciGroup1');
 
-    before(async function () {
+    before(async () => {
       await browser.setWindowSize(1200, 800);
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.load('test/functional/fixtures/es_archiver/visualize');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('discover');
     });
 
-    after(function unloadMakelogs() {
-      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
     });
 
     loadTestFile(require.resolve('./_context_navigation'));
diff --git a/test/functional/apps/discover/_source_filters.ts b/test/functional/apps/discover/_source_filters.ts
index f3793dc3e0288..6c6979b39702c 100644
--- a/test/functional/apps/discover/_source_filters.ts
+++ b/test/functional/apps/discover/_source_filters.ts
@@ -23,8 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         defaultIndex: 'logstash-*',
       });
 
-      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('test/functional/fixtures/es_archiver/visualize_source-filters');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
 
       // and load a set of makelogs data
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
@@ -43,6 +42,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.common.sleep(1000);
     });
 
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+    });
+
     it('should not get the field referer', async function () {
       const fieldNames = await PageObjects.discover.getAllFieldNames();
       expect(fieldNames).to.not.contain('referer');
diff --git a/test/functional/fixtures/es_archiver/visualize/data.json b/test/functional/fixtures/es_archiver/visualize/data.json
deleted file mode 100644
index d48aa3e98d18a..0000000000000
--- a/test/functional/fixtures/es_archiver/visualize/data.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:logstash-*",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "index-pattern": {
-        "fieldAttrs": "{\"utc_time\":{\"customLabel\":\"UTC time\"}}",
-        "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}",
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
-        "timeFieldName": "@timestamp",
-        "title": "logstash-*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.11.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern"
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:logstash*",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "index-pattern": {
-        "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}",
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
-        "title": "logstash*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.11.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern"
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:long-window-logstash-*",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "index-pattern": {
-        "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}",
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
-        "timeFieldName": "@timestamp",
-        "title": "long-window-logstash-*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.11.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern"
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:Shared-Item-Visualization-AreaChart",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "logstash-*",
-          "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "visualization": {
-        "description": "AreaChart",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
-        },
-        "title": "Shared-Item Visualization AreaChart",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"New Visualization\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"smoothLines\":false,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}],\"listeners\":{}}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:Visualization-AreaChart",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "logstash-*",
-          "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "visualization": {
-        "description": "AreaChart",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
-        },
-        "title": "Visualization AreaChart",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"Visualization AreaChart\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"filter\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"lineWidth\":2,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"thresholdLine\":{\"show\":false,\"value\":10,\"width\":1,\"style\":\"full\",\"color\":\"#E7664C\"},\"labels\":{},\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"timeRange\":{\"from\":\"now-15m\",\"to\":\"now\"},\"useNormalizedEsInterval\":true,\"scaleMetricValues\":false,\"interval\":\"auto\",\"drop_partials\":false,\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:68305470-87bc-11e9-a991-3b492a7c3e09",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "logstash-*",
-          "name": "control_0_index_pattern",
-          "type": "index-pattern"
-        },
-        {
-          "id": "logstash-*",
-          "name": "control_1_index_pattern",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "updated_at": "2019-06-05T18:04:48.310Z",
-      "visualization": {
-        "description": "",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}"
-        },
-        "title": "chained input control",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"chained input control\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559757816862\",\"fieldName\":\"geo.src\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"},{\"id\":\"1559757836347\",\"fieldName\":\"clientip\",\"parent\":\"1559757816862\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_1_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:64983230-87bf-11e9-a991-3b492a7c3e09",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "logstash-*",
-          "name": "control_0_index_pattern",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "updated_at": "2019-06-05T18:26:10.771Z",
-      "visualization": {
-        "description": "",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}"
-        },
-        "title": "dynamic options input control",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"dynamic options input control\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559759127876\",\"fieldName\":\"geo.src\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:5d2de430-87c0-11e9-a991-3b492a7c3e09",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "logstash-*",
-          "name": "control_0_index_pattern",
-          "type": "index-pattern"
-        },
-        {
-          "id": "logstash-*",
-          "name": "control_1_index_pattern",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "updated_at": "2019-06-05T18:33:07.827Z",
-      "visualization": {
-        "description": "",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}"
-        },
-        "title": "chained input control with dynamic options",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"chained input control with dynamic options\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559759550755\",\"fieldName\":\"machine.os.raw\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"},{\"id\":\"1559759557302\",\"fieldName\":\"geo.src\",\"parent\":\"1559759550755\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_1_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:test_index*",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "index-pattern": {
-        "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]",
-        "title": "test_index*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.11.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern"
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:AreaChart-no-date-field",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "test_index*",
-          "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "visualization": {
-        "description": "AreaChart",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
-        },
-        "title": "AreaChart [no date field]",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"AreaChart [no date field]\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"addTooltip\":true,\"addLegend\":true,\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:log*",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "index-pattern": {
-        "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}",
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
-        "title": "log*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.11.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern"
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:AreaChart-no-time-filter",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-        {
-          "id": "log*",
-          "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-          "type": "index-pattern"
-        }
-      ],
-      "type": "visualization",
-      "visualization": {
-        "description": "AreaChart",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
-        },
-        "title": "AreaChart [no time filter]",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"title\":\"AreaChart [no time filter]\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"addTooltip\":true,\"addLegend\":true,\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
-      }
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "id": "visualization:VegaMap",
-    "index": ".kibana",
-    "source": {
-      "coreMigrationVersion": "7.14.0",
-      "migrationVersion": {
-        "visualization": "7.14.0"
-      },
-      "references": [
-      ],
-      "type": "visualization",
-      "visualization": {
-        "description": "VegaMap",
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}"
-        },
-        "title": "VegaMap",
-        "uiStateJSON": "{}",
-        "version": 1,
-        "visState": "{\"aggs\":[],\"params\":{\"spec\":\"{\\n  $schema: https://vega.github.io/schema/vega/v5.json\\n  config: {\\n    kibana: {type: \\\"map\\\", latitude: 25, longitude: -70, zoom: 3}\\n  }\\n  data: [\\n    {\\n      name: table\\n      url: {\\n        index: kibana_sample_data_flights\\n        %context%: true\\n        // Uncomment to enable time filtering\\n        // %timefield%: timestamp\\n        body: {\\n          size: 0\\n          aggs: {\\n            origins: {\\n              terms: {field: \\\"OriginAirportID\\\", size: 10000}\\n              aggs: {\\n                originLocation: {\\n                  top_hits: {\\n                    size: 1\\n                    _source: {\\n                      includes: [\\\"OriginLocation\\\", \\\"Origin\\\"]\\n                    }\\n                  }\\n                }\\n                distinations: {\\n                  terms: {field: \\\"DestAirportID\\\", size: 10000}\\n                  aggs: {\\n                    destLocation: {\\n                      top_hits: {\\n                        size: 1\\n                        _source: {\\n                          includes: [\\\"DestLocation\\\"]\\n                        }\\n                      }\\n                    }\\n                  }\\n                }\\n              }\\n            }\\n          }\\n        }\\n      }\\n      format: {property: \\\"aggregations.origins.buckets\\\"}\\n      transform: [\\n        {\\n          type: geopoint\\n          projection: projection\\n          fields: [\\n            originLocation.hits.hits[0]._source.OriginLocation.lon\\n            originLocation.hits.hits[0]._source.OriginLocation.lat\\n          ]\\n        }\\n      ]\\n    }\\n    {\\n      name: selectedDatum\\n      on: [\\n        {trigger: \\\"!selected\\\", remove: true}\\n        {trigger: \\\"selected\\\", insert: \\\"selected\\\"}\\n      ]\\n    }\\n  ]\\n  signals: [\\n    {\\n      name: selected\\n      value: null\\n      on: [\\n        {events: \\\"@airport:mouseover\\\", update: \\\"datum\\\"}\\n        {events: \\\"@airport:mouseout\\\", update: \\\"null\\\"}\\n      ]\\n    }\\n  ]\\n  scales: [\\n    {\\n      name: airportSize\\n      type: linear\\n      domain: {data: \\\"table\\\", field: \\\"doc_count\\\"}\\n      range: [\\n        {signal: \\\"zoom*zoom*0.2+1\\\"}\\n        {signal: \\\"zoom*zoom*10+1\\\"}\\n      ]\\n    }\\n  ]\\n  marks: [\\n    {\\n      type: group\\n      from: {\\n        facet: {\\n          name: facetedDatum\\n          data: selectedDatum\\n          field: distinations.buckets\\n        }\\n      }\\n      data: [\\n        {\\n          name: facetDatumElems\\n          source: facetedDatum\\n          transform: [\\n            {\\n              type: geopoint\\n              projection: projection\\n              fields: [\\n                destLocation.hits.hits[0]._source.DestLocation.lon\\n                destLocation.hits.hits[0]._source.DestLocation.lat\\n              ]\\n            }\\n            {type: \\\"formula\\\", expr: \\\"{x:parent.x, y:parent.y}\\\", as: \\\"source\\\"}\\n            {type: \\\"formula\\\", expr: \\\"{x:datum.x, y:datum.y}\\\", as: \\\"target\\\"}\\n            {type: \\\"linkpath\\\", shape: \\\"diagonal\\\"}\\n          ]\\n        }\\n      ]\\n      scales: [\\n        {\\n          name: lineThickness\\n          type: log\\n          clamp: true\\n          range: [1, 8]\\n        }\\n        {\\n          name: lineOpacity\\n          type: log\\n          clamp: true\\n          range: [0.2, 0.8]\\n        }\\n      ]\\n      marks: [\\n        {\\n          from: {data: \\\"facetDatumElems\\\"}\\n          type: path\\n          interactive: false\\n          encode: {\\n            update: {\\n              path: {field: \\\"path\\\"}\\n              stroke: {value: \\\"black\\\"}\\n              strokeWidth: {scale: \\\"lineThickness\\\", field: \\\"doc_count\\\"}\\n              strokeOpacity: {scale: \\\"lineOpacity\\\", field: \\\"doc_count\\\"}\\n            }\\n          }\\n        }\\n      ]\\n    }\\n    {\\n      name: airport\\n      type: symbol\\n      from: {data: \\\"table\\\"}\\n      encode: {\\n        update: {\\n          size: {scale: \\\"airportSize\\\", field: \\\"doc_count\\\"}\\n          xc: {signal: \\\"datum.x\\\"}\\n          yc: {signal: \\\"datum.y\\\"}\\n          tooltip: {\\n            signal: \\\"{title: datum.originLocation.hits.hits[0]._source.Origin + ' (' + datum.key + ')', connnections: length(datum.distinations.buckets), flights: datum.doc_count}\\\"\\n          }\\n        }\\n      }\\n    }\\n  ]\\n}\"},\"title\":\"[Flights] Airport Connections (Hover Over Airport)\",\"type\":\"vega\"}"
-      }
-    },
-    "type": "_doc"
-  }
-}
\ No newline at end of file
diff --git a/test/functional/fixtures/es_archiver/visualize/mappings.json b/test/functional/fixtures/es_archiver/visualize/mappings.json
deleted file mode 100644
index d032352d9a688..0000000000000
--- a/test/functional/fixtures/es_archiver/visualize/mappings.json
+++ /dev/null
@@ -1,487 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana_$KIBANA_PACKAGE_VERSION": {},
-      ".kibana": {}
-    },
-    "index": ".kibana_$KIBANA_PACKAGE_VERSION_001",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd",
-          "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
-          "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724",
-          "config": "c63748b75f39d0c54de12d12c1ccbc20",
-          "core-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
-          "coreMigrationVersion": "2f4316de49999235636386fe51dc06c1",
-          "dashboard": "40554caf09725935e2c02e02563a2d07",
-          "index-pattern": "45915a1ad866812242df474eb0479052",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "legacy-url-alias": "6155300fd11a00e23d5cbaa39f0fce0a",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "namespaces": "2f4316de49999235636386fe51dc06c1",
-          "originId": "2f4316de49999235636386fe51dc06c1",
-          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "db2c00e39b36f40930a3b9fc71c823e1",
-          "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
-          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-counter": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "url": "c7f66a0df8b1b52f17c28c4adb111105",
-          "usage-counters": "8cc260bdceffec4ffc3ad165c97dc1b4",
-          "visualization": "f819cf6636b75c9e76ba733a0c6ef355"
-        }
-      },
-      "dynamic": "strict",
-      "properties": {
-        "application_usage_daily": {
-          "dynamic": "false",
-          "properties": {
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "application_usage_totals": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "application_usage_transactional": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "config": {
-          "dynamic": "false",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            }
-          }
-        },
-        "core-usage-stats": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "coreMigrationVersion": {
-          "type": "keyword"
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "doc_values": false,
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "panelsJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "keyword"
-                },
-                "pause": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "boolean"
-                },
-                "section": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "integer"
-                },
-                "value": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "doc_values": false,
-              "index": false,
-              "type": "boolean"
-            },
-            "timeTo": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "dynamic": "false",
-          "properties": {
-            "title": {
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "legacy-url-alias": {
-          "dynamic": "false",
-          "properties": {
-            "disabled": {
-              "type": "boolean"
-            },
-            "sourceId": {
-              "type": "keyword"
-            },
-            "targetType": {
-              "type": "keyword"
-            }
-          }
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "index-pattern": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "visualization": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "namespaces": {
-          "type": "keyword"
-        },
-        "originId": {
-          "type": "keyword"
-        },
-        "query": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "filters": {
-              "enabled": false,
-              "type": "object"
-            },
-            "query": {
-              "properties": {
-                "language": {
-                  "type": "keyword"
-                },
-                "query": {
-                  "index": false,
-                  "type": "keyword"
-                }
-              }
-            },
-            "timefilter": {
-              "enabled": false,
-              "type": "object"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "sample-data-telemetry": {
-          "properties": {
-            "installCount": {
-              "type": "long"
-            },
-            "unInstallCount": {
-              "type": "long"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "grid": {
-              "enabled": false,
-              "type": "object"
-            },
-            "hideChart": {
-              "doc_values": false,
-              "index": false,
-              "type": "boolean"
-            },
-            "hits": {
-              "doc_values": false,
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "search-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "server": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "telemetry": {
-          "properties": {
-            "allowChangingOptInStatus": {
-              "type": "boolean"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "lastReported": {
-              "type": "date"
-            },
-            "lastVersionChecked": {
-              "type": "keyword"
-            },
-            "reportFailureCount": {
-              "type": "integer"
-            },
-            "reportFailureVersion": {
-              "type": "keyword"
-            },
-            "sendUsageFrom": {
-              "type": "keyword"
-            },
-            "userHasSeenNotice": {
-              "type": "boolean"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "ui-counter": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "ui-metric": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "usage-counters": {
-          "dynamic": "false",
-          "properties": {
-            "domainId": {
-              "type": "keyword"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "index": false,
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1",
-        "priority": "10",
-        "refresh_interval": "1s",
-        "routing_partition_size": "1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/functional/fixtures/kbn_archiver/visualize.json b/test/functional/fixtures/kbn_archiver/visualize.json
index 758841e8d81ef..660da856964b4 100644
--- a/test/functional/fixtures/kbn_archiver/visualize.json
+++ b/test/functional/fixtures/kbn_archiver/visualize.json
@@ -6,14 +6,14 @@
     "timeFieldName": "@timestamp",
     "title": "logstash-*"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "logstash-*",
   "migrationVersion": {
     "index-pattern": "7.11.0"
   },
   "references": [],
   "type": "index-pattern",
-  "version": "WzI2LDJd"
+  "version": "WzEzLDFd"
 }
 
 {
@@ -27,10 +27,10 @@
     "version": 1,
     "visState": "{\"title\":\"chained input control with dynamic options\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559759550755\",\"fieldName\":\"machine.os.raw\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"},{\"id\":\"1559759557302\",\"fieldName\":\"geo.src\",\"parent\":\"1559759550755\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_1_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "5d2de430-87c0-11e9-a991-3b492a7c3e09",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -46,7 +46,7 @@
   ],
   "type": "visualization",
   "updated_at": "2019-06-05T18:33:07.827Z",
-  "version": "WzMzLDJd"
+  "version": "WzIwLDFd"
 }
 
 {
@@ -60,10 +60,10 @@
     "version": 1,
     "visState": "{\"title\":\"dynamic options input control\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559759127876\",\"fieldName\":\"geo.src\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "64983230-87bf-11e9-a991-3b492a7c3e09",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -74,7 +74,7 @@
   ],
   "type": "visualization",
   "updated_at": "2019-06-05T18:26:10.771Z",
-  "version": "WzMyLDJd"
+  "version": "WzE5LDFd"
 }
 
 {
@@ -88,10 +88,10 @@
     "version": 1,
     "visState": "{\"title\":\"chained input control\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1559757816862\",\"fieldName\":\"geo.src\",\"parent\":\"\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_0_index_pattern\"},{\"id\":\"1559757836347\",\"fieldName\":\"clientip\",\"parent\":\"1559757816862\",\"label\":\"\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"dynamicOptions\":true,\"size\":5,\"order\":\"desc\"},\"indexPatternRefName\":\"control_1_index_pattern\"}],\"updateFiltersOnChange\":false,\"useTimeFilter\":false,\"pinFilters\":false},\"aggs\":[]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "68305470-87bc-11e9-a991-3b492a7c3e09",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -107,7 +107,7 @@
   ],
   "type": "visualization",
   "updated_at": "2019-06-05T18:04:48.310Z",
-  "version": "WzMxLDJd"
+  "version": "WzE4LDFd"
 }
 
 {
@@ -115,10 +115,14 @@
     "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]",
     "title": "test_index*"
   },
+  "coreMigrationVersion": "7.14.0",
   "id": "test_index*",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
   "references": [],
   "type": "index-pattern",
-  "version": "WzI1LDJd"
+  "version": "WzIxLDFd"
 }
 
 {
@@ -132,10 +136,10 @@
     "version": 1,
     "visState": "{\"title\":\"AreaChart [no date field]\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"addTooltip\":true,\"addLegend\":true,\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "AreaChart-no-date-field",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -145,7 +149,7 @@
     }
   ],
   "type": "visualization",
-  "version": "WzM0LDJd"
+  "version": "WzIyLDFd"
 }
 
 {
@@ -154,14 +158,14 @@
     "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
     "title": "log*"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "log*",
   "migrationVersion": {
     "index-pattern": "7.11.0"
   },
   "references": [],
   "type": "index-pattern",
-  "version": "WzM1LDJd"
+  "version": "WzIzLDFd"
 }
 
 {
@@ -175,10 +179,10 @@
     "version": 1,
     "visState": "{\"title\":\"AreaChart [no time filter]\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"addTooltip\":true,\"addLegend\":true,\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "AreaChart-no-time-filter",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -188,7 +192,7 @@
     }
   ],
   "type": "visualization",
-  "version": "WzM2LDJd"
+  "version": "WzI0LDFd"
 }
 
 {
@@ -202,10 +206,10 @@
     "version": 1,
     "visState": "{\"title\":\"New Visualization\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"smoothLines\":false,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}],\"listeners\":{}}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "Shared-Item-Visualization-AreaChart",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -215,7 +219,7 @@
     }
   ],
   "type": "visualization",
-  "version": "WzI5LDJd"
+  "version": "WzE2LDFd"
 }
 
 {
@@ -229,14 +233,14 @@
     "version": 1,
     "visState": "{\"aggs\":[],\"params\":{\"spec\":\"{\\n  $schema: https://vega.github.io/schema/vega/v5.json\\n  config: {\\n    kibana: {type: \\\"map\\\", latitude: 25, longitude: -70, zoom: 3}\\n  }\\n  data: [\\n    {\\n      name: table\\n      url: {\\n        index: kibana_sample_data_flights\\n        %context%: true\\n        // Uncomment to enable time filtering\\n        // %timefield%: timestamp\\n        body: {\\n          size: 0\\n          aggs: {\\n            origins: {\\n              terms: {field: \\\"OriginAirportID\\\", size: 10000}\\n              aggs: {\\n                originLocation: {\\n                  top_hits: {\\n                    size: 1\\n                    _source: {\\n                      includes: [\\\"OriginLocation\\\", \\\"Origin\\\"]\\n                    }\\n                  }\\n                }\\n                distinations: {\\n                  terms: {field: \\\"DestAirportID\\\", size: 10000}\\n                  aggs: {\\n                    destLocation: {\\n                      top_hits: {\\n                        size: 1\\n                        _source: {\\n                          includes: [\\\"DestLocation\\\"]\\n                        }\\n                      }\\n                    }\\n                  }\\n                }\\n              }\\n            }\\n          }\\n        }\\n      }\\n      format: {property: \\\"aggregations.origins.buckets\\\"}\\n      transform: [\\n        {\\n          type: geopoint\\n          projection: projection\\n          fields: [\\n            originLocation.hits.hits[0]._source.OriginLocation.lon\\n            originLocation.hits.hits[0]._source.OriginLocation.lat\\n          ]\\n        }\\n      ]\\n    }\\n    {\\n      name: selectedDatum\\n      on: [\\n        {trigger: \\\"!selected\\\", remove: true}\\n        {trigger: \\\"selected\\\", insert: \\\"selected\\\"}\\n      ]\\n    }\\n  ]\\n  signals: [\\n    {\\n      name: selected\\n      value: null\\n      on: [\\n        {events: \\\"@airport:mouseover\\\", update: \\\"datum\\\"}\\n        {events: \\\"@airport:mouseout\\\", update: \\\"null\\\"}\\n      ]\\n    }\\n  ]\\n  scales: [\\n    {\\n      name: airportSize\\n      type: linear\\n      domain: {data: \\\"table\\\", field: \\\"doc_count\\\"}\\n      range: [\\n        {signal: \\\"zoom*zoom*0.2+1\\\"}\\n        {signal: \\\"zoom*zoom*10+1\\\"}\\n      ]\\n    }\\n  ]\\n  marks: [\\n    {\\n      type: group\\n      from: {\\n        facet: {\\n          name: facetedDatum\\n          data: selectedDatum\\n          field: distinations.buckets\\n        }\\n      }\\n      data: [\\n        {\\n          name: facetDatumElems\\n          source: facetedDatum\\n          transform: [\\n            {\\n              type: geopoint\\n              projection: projection\\n              fields: [\\n                destLocation.hits.hits[0]._source.DestLocation.lon\\n                destLocation.hits.hits[0]._source.DestLocation.lat\\n              ]\\n            }\\n            {type: \\\"formula\\\", expr: \\\"{x:parent.x, y:parent.y}\\\", as: \\\"source\\\"}\\n            {type: \\\"formula\\\", expr: \\\"{x:datum.x, y:datum.y}\\\", as: \\\"target\\\"}\\n            {type: \\\"linkpath\\\", shape: \\\"diagonal\\\"}\\n          ]\\n        }\\n      ]\\n      scales: [\\n        {\\n          name: lineThickness\\n          type: log\\n          clamp: true\\n          range: [1, 8]\\n        }\\n        {\\n          name: lineOpacity\\n          type: log\\n          clamp: true\\n          range: [0.2, 0.8]\\n        }\\n      ]\\n      marks: [\\n        {\\n          from: {data: \\\"facetDatumElems\\\"}\\n          type: path\\n          interactive: false\\n          encode: {\\n            update: {\\n              path: {field: \\\"path\\\"}\\n              stroke: {value: \\\"black\\\"}\\n              strokeWidth: {scale: \\\"lineThickness\\\", field: \\\"doc_count\\\"}\\n              strokeOpacity: {scale: \\\"lineOpacity\\\", field: \\\"doc_count\\\"}\\n            }\\n          }\\n        }\\n      ]\\n    }\\n    {\\n      name: airport\\n      type: symbol\\n      from: {data: \\\"table\\\"}\\n      encode: {\\n        update: {\\n          size: {scale: \\\"airportSize\\\", field: \\\"doc_count\\\"}\\n          xc: {signal: \\\"datum.x\\\"}\\n          yc: {signal: \\\"datum.y\\\"}\\n          tooltip: {\\n            signal: \\\"{title: datum.originLocation.hits.hits[0]._source.Origin + ' (' + datum.key + ')', connnections: length(datum.distinations.buckets), flights: datum.doc_count}\\\"\\n          }\\n        }\\n      }\\n    }\\n  ]\\n}\"},\"title\":\"[Flights] Airport Connections (Hover Over Airport)\",\"type\":\"vega\"}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "VegaMap",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [],
   "type": "visualization",
-  "version": "WzM3LDJd"
+  "version": "WzI1LDFd"
 }
 
 {
@@ -250,10 +254,10 @@
     "version": 1,
     "visState": "{\"title\":\"Visualization AreaChart\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"filter\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"lineWidth\":2,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"thresholdLine\":{\"show\":false,\"value\":10,\"width\":1,\"style\":\"full\",\"color\":\"#E7664C\"},\"labels\":{},\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"timeRange\":{\"from\":\"now-15m\",\"to\":\"now\"},\"useNormalizedEsInterval\":true,\"scaleMetricValues\":false,\"interval\":\"auto\",\"drop_partials\":false,\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "Visualization-AreaChart",
   "migrationVersion": {
-    "visualization": "7.13.0"
+    "visualization": "7.14.0"
   },
   "references": [
     {
@@ -263,7 +267,7 @@
     }
   ],
   "type": "visualization",
-  "version": "WzMwLDJd"
+  "version": "WzE3LDFd"
 }
 
 {
@@ -272,14 +276,14 @@
     "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
     "title": "logstash*"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "logstash*",
   "migrationVersion": {
     "index-pattern": "7.11.0"
   },
   "references": [],
   "type": "index-pattern",
-  "version": "WzI3LDJd"
+  "version": "WzE0LDFd"
 }
 
 {
@@ -289,12 +293,12 @@
     "timeFieldName": "@timestamp",
     "title": "long-window-logstash-*"
   },
-  "coreMigrationVersion": "8.0.0",
+  "coreMigrationVersion": "7.14.0",
   "id": "long-window-logstash-*",
   "migrationVersion": {
     "index-pattern": "7.11.0"
   },
   "references": [],
   "type": "index-pattern",
-  "version": "WzI4LDJd"
+  "version": "WzE1LDFd"
 }
\ No newline at end of file
diff --git a/test/interpreter_functional/test_suites/run_pipeline/index.ts b/test/interpreter_functional/test_suites/run_pipeline/index.ts
index 9cf7e0deba2fa..f8c37bab02b86 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/index.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/index.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
 
     before(async () => {
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.load('test/functional/fixtures/es_archiver/visualize_embedding');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
       await kibanaServer.uiSettings.replace({
         'dateFormat:tz': 'Australia/North',
         defaultIndex: 'logstash-*',
@@ -32,6 +32,12 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
       await testSubjects.find('pluginContent');
     });
 
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+    });
+
     loadTestFile(require.resolve('./basic'));
     loadTestFile(require.resolve('./tag_cloud'));
     loadTestFile(require.resolve('./metric'));
diff --git a/test/plugin_functional/test_suites/custom_visualizations/index.js b/test/plugin_functional/test_suites/custom_visualizations/index.js
index 0998b97da67ff..22b0f21fb983a 100644
--- a/test/plugin_functional/test_suites/custom_visualizations/index.js
+++ b/test/plugin_functional/test_suites/custom_visualizations/index.js
@@ -14,7 +14,7 @@ export default function ({ getService, loadTestFile }) {
   describe('custom visualizations', function () {
     before(async () => {
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
       await kibanaServer.uiSettings.replace({
         'dateFormat:tz': 'Australia/North',
         defaultIndex: 'logstash-*',
@@ -22,6 +22,12 @@ export default function ({ getService, loadTestFile }) {
       await browser.setWindowSize(1300, 900);
     });
 
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+    });
+
     loadTestFile(require.resolve('./self_changing_vis'));
   });
 }
diff --git a/test/visual_regression/tests/vega/vega_map_visualization.ts b/test/visual_regression/tests/vega/vega_map_visualization.ts
index 96b08467e4a8f..d891e7f2bab6b 100644
--- a/test/visual_regression/tests/vega/vega_map_visualization.ts
+++ b/test/visual_regression/tests/vega/vega_map_visualization.ts
@@ -10,6 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'visualize', 'visChart', 'visEditor', 'vegaChart']);
   const visualTesting = getService('visualTesting');
 
@@ -18,12 +19,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await esArchiver.loadIfNeeded(
         'test/functional/fixtures/es_archiver/kibana_sample_data_flights'
       );
-      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
     });
 
     after(async () => {
       await esArchiver.unload('test/functional/fixtures/es_archiver/kibana_sample_data_flights');
-      await esArchiver.unload('test/functional/fixtures/es_archiver/visualize');
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
     });
 
     it('should show map with vega layer', async function () {

From 59423927cb561c88e52cd1940525f8629992f349 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Thu, 24 Jun 2021 04:49:04 +0100
Subject: [PATCH 16/95] chore(NA): moving @kbn/plugin-helpers into bazel
 (#103181)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../monorepo-packages.asciidoc                |  1 +
 package.json                                  |  2 +-
 packages/BUILD.bazel                          |  1 +
 packages/kbn-plugin-helpers/BUILD.bazel       | 97 +++++++++++++++++++
 packages/kbn-plugin-helpers/package.json      |  4 -
 packages/kbn-plugin-helpers/tsconfig.json     |  2 +-
 x-pack/package.json                           |  1 -
 yarn.lock                                     |  2 +-
 8 files changed, 102 insertions(+), 8 deletions(-)
 create mode 100644 packages/kbn-plugin-helpers/BUILD.bazel

diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
index 5d7ba22841aa1..ae5c0e9db1ef0 100644
--- a/docs/developer/getting-started/monorepo-packages.asciidoc
+++ b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -87,6 +87,7 @@ yarn kbn watch-bazel
 - @kbn/mapbox-gl
 - @kbn/monaco
 - @kbn/optimizer
+- @kbn/plugin-helpers
 - @kbn/rule-data-utils
 - @kbn/securitysolution-es-utils
 - @kbn/securitysolution-hook-utils
diff --git a/package.json b/package.json
index f99eb86a43cec..e4ffc0433baab 100644
--- a/package.json
+++ b/package.json
@@ -467,7 +467,7 @@
     "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
     "@kbn/optimizer": "link:bazel-bin/packages/kbn-optimizer",
     "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
-    "@kbn/plugin-helpers": "link:packages/kbn-plugin-helpers",
+    "@kbn/plugin-helpers": "link:bazel-bin/packages/kbn-plugin-helpers",
     "@kbn/pm": "link:packages/kbn-pm",
     "@kbn/storybook": "link:bazel-bin/packages/kbn-storybook",
     "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index d9e2f0e1f9985..42df6e0d9bcf9 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -31,6 +31,7 @@ filegroup(
       "//packages/kbn-monaco:build",
       "//packages/kbn-optimizer:build",
       "//packages/kbn-plugin-generator:build",
+      "//packages/kbn-plugin-helpers:build",
       "//packages/kbn-rule-data-utils:build",
       "//packages/kbn-securitysolution-list-constants:build",
       "//packages/kbn-securitysolution-io-ts-types:build",
diff --git a/packages/kbn-plugin-helpers/BUILD.bazel b/packages/kbn-plugin-helpers/BUILD.bazel
new file mode 100644
index 0000000000000..1a1f3453f768a
--- /dev/null
+++ b/packages/kbn-plugin-helpers/BUILD.bazel
@@ -0,0 +1,97 @@
+
+load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+
+PKG_BASE_NAME = "kbn-plugin-helpers"
+PKG_REQUIRE_NAME = "@kbn/plugin-helpers"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+  "README.md"
+]
+
+SRC_DEPS = [
+  "//packages/kbn-dev-utils",
+  "//packages/kbn-optimizer",
+  "//packages/kbn-utils",
+  "@npm//del",
+  "@npm//execa",
+  "@npm//extract-zip",
+  "@npm//globby",
+  "@npm//gulp-zip",
+  "@npm//inquirer",
+  "@npm//load-json-file",
+  "@npm//vinyl-fs",
+]
+
+TYPES_DEPS = [
+  "@npm//@types/extract-zip",
+  "@npm//@types/gulp-zip",
+  "@npm//@types/inquirer",
+  "@npm//@types/jest",
+  "@npm//@types/node",
+  "@npm//@types/vinyl-fs",
+]
+
+DEPS = SRC_DEPS + TYPES_DEPS
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+  ],
+)
+
+ts_project(
+  name = "tsc",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = DEPS,
+  declaration = True,
+  declaration_map = True,
+  incremental = True,
+  out_dir = "target",
+  source_map = True,
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_BASE_NAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = DEPS + [":tsc"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [
+    ":%s" % PKG_BASE_NAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 36a37075191a3..1f4df52a03304 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -11,9 +11,5 @@
   "types": "target/index.d.ts",
   "bin": {
     "plugin-helpers": "bin/plugin-helpers.js"
-  },
-  "scripts": {
-    "kbn:bootstrap": "rm -rf target && ../../node_modules/.bin/tsc",
-    "kbn:watch": "../../node_modules/.bin/tsc --watch"
   }
 }
\ No newline at end of file
diff --git a/packages/kbn-plugin-helpers/tsconfig.json b/packages/kbn-plugin-helpers/tsconfig.json
index 87d11843f398a..4348f1e1a7516 100644
--- a/packages/kbn-plugin-helpers/tsconfig.json
+++ b/packages/kbn-plugin-helpers/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "incremental": false,
+    "incremental": true,
     "outDir": "target",
     "target": "ES2018",
     "declaration": true,
diff --git a/x-pack/package.json b/x-pack/package.json
index 1397a3da81072..1af3d569e41ab 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -26,7 +26,6 @@
     "yarn": "^1.21.1"
   },
   "devDependencies": {
-    "@kbn/plugin-helpers": "link:../packages/kbn-plugin-helpers",
     "@kbn/test": "link:../packages/kbn-test"
   }
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 64e01ac0475d5..fb24b33a2c48a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2701,7 +2701,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/plugin-helpers@link:packages/kbn-plugin-helpers":
+"@kbn/plugin-helpers@link:bazel-bin/packages/kbn-plugin-helpers":
   version "0.0.0"
   uid ""
 

From 17adfacb1b2f4e9519f5b06af88a55fd2d862e8e Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Thu, 24 Jun 2021 04:50:49 +0100
Subject: [PATCH 17/95] chore(NA): moving @kbn/cli-dev-mode into bazel
 (#103067)

* chore(NA): moving @kbn/cli-dev-mode into bazel

* chore(NA): merge and solve conflicts with master
---
 .../monorepo-packages.asciidoc                |   1 +
 package.json                                  |   2 +-
 packages/BUILD.bazel                          |   1 +
 packages/kbn-cli-dev-mode/BUILD.bazel         | 103 ++++++++++++++++++
 packages/kbn-cli-dev-mode/package.json        |   5 -
 packages/kbn-cli-dev-mode/tsconfig.json       |   3 +-
 yarn.lock                                     |   2 +-
 7 files changed, 109 insertions(+), 8 deletions(-)
 create mode 100644 packages/kbn-cli-dev-mode/BUILD.bazel

diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
index ae5c0e9db1ef0..217645b903818 100644
--- a/docs/developer/getting-started/monorepo-packages.asciidoc
+++ b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -70,6 +70,7 @@ yarn kbn watch-bazel
 - @kbn/apm-utils
 - @kbn/babel-code-parser
 - @kbn/babel-preset
+- @kbn/cli-dev-mode
 - @kbn/config
 - @kbn/config-schema
 - @kbn/crypto
diff --git a/package.json b/package.json
index e4ffc0433baab..0d1d5ae020219 100644
--- a/package.json
+++ b/package.json
@@ -457,7 +457,7 @@
     "@jest/reporters": "^26.6.2",
     "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
     "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
-    "@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
+    "@kbn/cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode",
     "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils",
     "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
     "@kbn/es": "link:bazel-bin/packages/kbn-es",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 42df6e0d9bcf9..1094a2def3e70 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -12,6 +12,7 @@ filegroup(
       "//packages/kbn-apm-utils:build",
       "//packages/kbn-babel-code-parser:build",
       "//packages/kbn-babel-preset:build",
+      "//packages/kbn-cli-dev-mode:build",
       "//packages/kbn-common-utils:build",
       "//packages/kbn-config:build",
       "//packages/kbn-config-schema:build",
diff --git a/packages/kbn-cli-dev-mode/BUILD.bazel b/packages/kbn-cli-dev-mode/BUILD.bazel
new file mode 100644
index 0000000000000..ab1b6601f429b
--- /dev/null
+++ b/packages/kbn-cli-dev-mode/BUILD.bazel
@@ -0,0 +1,103 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+
+PKG_BASE_NAME = "kbn-cli-dev-mode"
+PKG_REQUIRE_NAME = "@kbn/cli-dev-mode"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = ["**/*.test.*"],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+  "README.md"
+]
+
+SRC_DEPS = [
+  "//packages/kbn-config",
+  "//packages/kbn-config-schema",
+  "//packages/kbn-dev-utils",
+  "//packages/kbn-logging",
+  "//packages/kbn-optimizer",
+  "//packages/kbn-server-http-tools",
+  "//packages/kbn-std",
+  "//packages/kbn-utils",
+  "@npm//@hapi/h2o2",
+  "@npm//@hapi/hapi",
+  "@npm//argsplit",
+  "@npm//chokidar",
+  "@npm//elastic-apm-node",
+  "@npm//execa",
+  "@npm//getopts",
+  "@npm//lodash",
+  "@npm//moment",
+  "@npm//rxjs",
+  "@npm//supertest",
+]
+
+TYPES_DEPS = [
+  "@npm//@types/hapi__h2o2",
+  "@npm//@types/hapi__hapi",
+  "@npm//@types/getopts",
+  "@npm//@types/jest",
+  "@npm//@types/lodash",
+  "@npm//@types/node",
+  "@npm//@types/supertest",
+]
+
+DEPS = SRC_DEPS + TYPES_DEPS
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+  ],
+)
+
+ts_project(
+  name = "tsc",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = DEPS,
+  declaration = True,
+  declaration_map = True,
+  incremental = True,
+  out_dir = "target",
+  source_map = True,
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_BASE_NAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = DEPS + [":tsc"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [
+    ":%s" % PKG_BASE_NAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-cli-dev-mode/package.json b/packages/kbn-cli-dev-mode/package.json
index cf6fcfd88a26d..ac86ee2ef369b 100644
--- a/packages/kbn-cli-dev-mode/package.json
+++ b/packages/kbn-cli-dev-mode/package.json
@@ -5,11 +5,6 @@
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true,
-  "scripts": {
-    "build": "../../node_modules/.bin/tsc",
-    "kbn:bootstrap": "yarn build",
-    "kbn:watch": "yarn build --watch"
-  },
   "kibana": {
     "devOnly": true
   }
diff --git a/packages/kbn-cli-dev-mode/tsconfig.json b/packages/kbn-cli-dev-mode/tsconfig.json
index 4436d27dbff88..0c71ad8e245d4 100644
--- a/packages/kbn-cli-dev-mode/tsconfig.json
+++ b/packages/kbn-cli-dev-mode/tsconfig.json
@@ -1,10 +1,11 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "incremental": false,
+    "incremental": true,
     "outDir": "./target",
     "declaration": true,
     "declarationMap": true,
+    "rootDir": "./src",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-cli-dev-mode/src",
     "types": [
diff --git a/yarn.lock b/yarn.lock
index fb24b33a2c48a..48c21914784dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2617,7 +2617,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/cli-dev-mode@link:packages/kbn-cli-dev-mode":
+"@kbn/cli-dev-mode@link:bazel-bin/packages/kbn-cli-dev-mode":
   version "0.0.0"
   uid ""
 

From da7cdb67b79dde5b8cca33242e1c60ea07db3713 Mon Sep 17 00:00:00 2001
From: Jason Stoltzfus <jastoltz24@gmail.com>
Date: Thu, 24 Jun 2021 01:02:46 -0400
Subject: [PATCH 18/95] [App Search] Fixed Documents view for Editor and
 Analyst roles (#103113)

* Updated search-ui version

1.6.0 adds the ability to authenticate without a search key, which
we need for this fix.

* Updated Documents page to not use a search key

This change updates the page to rely on basic authentication rather
than a search key.

As part of that, we needed to create a proxy endpoint for search-ui
to post to, rather than going directly to the ent-search API.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 package.json                                  |  4 +-
 .../search_experience/search_experience.tsx   |  9 ++--
 .../server/routes/app_search/search.ts        | 23 +++++++++
 yarn.lock                                     | 49 +++++++++----------
 4 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 0d1d5ae020219..ecedb64c343ec 100644
--- a/package.json
+++ b/package.json
@@ -109,10 +109,10 @@
     "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
-    "@elastic/react-search-ui": "^1.5.1",
+    "@elastic/react-search-ui": "^1.6.0",
     "@elastic/request-crypto": "1.1.4",
     "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
-    "@elastic/search-ui-app-search-connector": "^1.5.0",
+    "@elastic/search-ui-app-search-connector": "^1.6.0",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/accept": "^5.0.2",
     "@hapi/boom": "^9.1.1",
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.tsx
index 709dfc69905f0..8416974ad7a2e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.tsx
@@ -18,7 +18,7 @@ import { i18n } from '@kbn/i18n';
 
 import './search_experience.scss';
 
-import { externalUrl } from '../../../../shared/enterprise_search_url';
+import { HttpLogic } from '../../../../shared/http';
 import { useLocalStorage } from '../../../../shared/use_local_storage';
 import { EngineLogic } from '../../engine';
 
@@ -52,7 +52,8 @@ const DEFAULT_SORT_OPTIONS: SortOption[] = [
 
 export const SearchExperience: React.FC = () => {
   const { engine } = useValues(EngineLogic);
-  const endpointBase = externalUrl.enterpriseSearchUrl;
+  const { http } = useValues(HttpLogic);
+  const endpointBase = http.basePath.prepend('/api/app_search/search-ui');
 
   const [showCustomizationModal, setShowCustomizationModal] = useState(false);
   const openCustomizationModal = () => setShowCustomizationModal(true);
@@ -72,7 +73,9 @@ export const SearchExperience: React.FC = () => {
     cacheResponses: false,
     endpointBase,
     engineName: engine.name,
-    searchKey: engine.apiKey,
+    additionalHeaders: {
+      'kbn-xsrf': true,
+    },
   });
 
   const searchProviderConfig = buildSearchUIConfig(connector, engine.schema || {}, fields);
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts
index 016f71e7e65b8..216bffc683265 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts
@@ -14,6 +14,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import { skipBodyValidation } from '../../lib/route_config_helpers';
+
 import { RouteDependencies } from '../../plugin';
 
 export function registerSearchRoutes({
@@ -36,4 +38,25 @@ export function registerSearchRoutes({
       path: '/api/as/v1/engines/:engineName/search.json',
     })
   );
+
+  // For the Search UI routes below, Search UI always uses the full API path, like:
+  // "/api/as/v1/engines/{engineName}/search.json". We only have control over the base path
+  // in Search UI, so we created a common basepath of "/api/app_search/search-ui" here that
+  // Search UI can use.
+  //
+  // Search UI *also* uses the click tracking and query suggestion endpoints, however, since the
+  // App Search plugin doesn't use that portion of Search UI, we only set up a proxy for the search endpoint below.
+  router.post(
+    skipBodyValidation({
+      path: '/api/app_search/search-ui/api/as/v1/engines/{engineName}/search.json',
+      validate: {
+        params: schema.object({
+          engineName: schema.string(),
+        }),
+      },
+    }),
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/api/as/v1/engines/:engineName/search.json',
+    })
+  );
 }
diff --git a/yarn.lock b/yarn.lock
index 48c21914784dd..448c97ff82469 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1147,7 +1147,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.5.tgz#665450911c6031af38f81db530f387ec04cd9a98"
   integrity sha512-121rumjddw9c3NCQ55KGkyE1h/nzWhU/owjhw0l4mQrkzz4x9SGS1X8gFLraHwX7td3Yo4QTL+qj0NcIzN87BA==
@@ -1352,10 +1352,10 @@
   dependencies:
     "@elastic/apm-rum-core" "^5.11.0"
 
-"@elastic/app-search-javascript@^7.3.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@elastic/app-search-javascript/-/app-search-javascript-7.8.0.tgz#cbc7af6bcdd224518f7f595145d6ec744e0b165d"
-  integrity sha512-EsAa/E/dQwBO72nrQ9YrXudP9KVY0sVUOvqPKZ3hBj9Mr3+MtWMyIKcyMf09bzdayk4qE+moetYDe5ahVbiA+Q==
+"@elastic/app-search-javascript@^7.13.1":
+  version "7.13.1"
+  resolved "https://registry.yarnpkg.com/@elastic/app-search-javascript/-/app-search-javascript-7.13.1.tgz#07d84daa27e856ad14f3f840683288eab06577f4"
+  integrity sha512-ShzZtGWykLQ0+wXzfk6lJztv68fRcGa8rsLDxJLH/O/2CGY+PJDnj8Qu5lJPmsAPZlZgaB8u7l26YGVPOoaqSA==
   dependencies:
     object-hash "^1.3.0"
 
@@ -1539,22 +1539,22 @@
   resolved "https://registry.yarnpkg.com/@elastic/numeral/-/numeral-2.5.1.tgz#96acf39c3d599950646ef8ccfd24a3f057cf4932"
   integrity sha512-Tby6TKjixRFY+atVNeYUdGr9m0iaOq8230KTwn8BbUhkh7LwozfgKq0U98HRX7n63ZL62szl+cDKTYzh5WPCFQ==
 
-"@elastic/react-search-ui-views@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@elastic/react-search-ui-views/-/react-search-ui-views-1.5.1.tgz#766cd6b6049f7aa8ab711a6a3a4a060ee5fdd0ce"
-  integrity sha512-x4X2xc/69996IEId3VVBTwPICnx/sschnfQ6YmuU3+myRa+VUPkkAWIK/cBcyBW8TNsLtZHWZrjQYi24+H7YWA==
+"@elastic/react-search-ui-views@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/react-search-ui-views/-/react-search-ui-views-1.6.0.tgz#7211d47c29ef0636c853721491b9905ac7ae58da"
+  integrity sha512-VADJ18p8HoSPtxKEWFODzId08j0ahyHmHjXv1vP6O/PvtA+ECvi0gDSh/WgdRF792G0e+4d2Dke8LIhxaEvE+w==
   dependencies:
     downshift "^3.2.10"
     rc-pagination "^1.20.1"
     react-select "^2.4.4"
 
-"@elastic/react-search-ui@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@elastic/react-search-ui/-/react-search-ui-1.5.1.tgz#2c261226d2eda3834b4779fbeea5693958169ff2"
-  integrity sha512-SI7uOF+jI+Z2D+2otym+4eLBYnocmxa+NA6VPSBrADZXyn8oUEzA4MBtJtxHLtcj64Tj8Riv0tw3t9q3b8iF+w==
+"@elastic/react-search-ui@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/react-search-ui/-/react-search-ui-1.6.0.tgz#8d547d5e1f0a8eebe94798b29966f51643aa886f"
+  integrity sha512-bwSKuCQTQiBWr6QufQtZZGu6rcVYfoiUnyZbwZMS6ojedd5XY7FtMcE+QnR6/IIo0M2IUrxD74XtVNqkUhoCRg==
   dependencies:
-    "@elastic/react-search-ui-views" "1.5.1"
-    "@elastic/search-ui" "1.5.1"
+    "@elastic/react-search-ui-views" "1.6.0"
+    "@elastic/search-ui" "1.6.0"
 
 "@elastic/request-crypto@1.1.4":
   version "1.1.4"
@@ -1569,18 +1569,17 @@
   version "0.0.0"
   uid ""
 
-"@elastic/search-ui-app-search-connector@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/search-ui-app-search-connector/-/search-ui-app-search-connector-1.5.0.tgz#d379132c5015775acfaee5322ec019e9c0559ccc"
-  integrity sha512-lHuXBjaMaN1fsm1taQMR/7gfpAg4XOsvZOi8u1AoufUw9kGr6Xc00Gznj1qTyH0Qebi2aSmY0NBN6pdIEGvvGQ==
+"@elastic/search-ui-app-search-connector@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/search-ui-app-search-connector/-/search-ui-app-search-connector-1.6.0.tgz#faf1c4a384285648ef7b5ef9cd0e65de0341d2b0"
+  integrity sha512-6oNvqzo4nuutmCM0zEzYrV6VwG8j0ML43SkaG6UrFzLUd6DeWUVGNN+SLNAlfQDWBUjc2m5EGvgdk/0GOWDZeA==
   dependencies:
-    "@babel/runtime" "^7.5.4"
-    "@elastic/app-search-javascript" "^7.3.0"
+    "@elastic/app-search-javascript" "^7.13.1"
 
-"@elastic/search-ui@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@elastic/search-ui/-/search-ui-1.5.1.tgz#14c66a66f5e937ef5e24d6266620b49d986fb3ed"
-  integrity sha512-ssfvX1q76X1UwqYASWtBni4PZ+3SYk1PvHmOjpVf9BYai1OqZLGVaj8Sw+cE1ia56zl5In7viCfciC+CP31ovA==
+"@elastic/search-ui@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/search-ui/-/search-ui-1.6.0.tgz#8b2286cacff44735be96605b2929ca9b469c78de"
+  integrity sha512-i7htjET9uE4xngyzS8kX3DkSD5XNcr+3FS0Jjx3xRpKVc/dFst4bJyiSeRrQcq+2oBb4mEJJOCFaIrLZg3mdSA==
   dependencies:
     date-fns "^1.30.1"
     deep-equal "^1.0.1"

From 023b163ae0b5ea6b046a70ee0ec918be78554277 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:04:08 -0700
Subject: [PATCH 19/95] [App Search] Refactor empty engine polling to
 EngineLogic (#103041)

* Set up isEngineEmpty and isEngineSchemaEmpty selectors

+ update selector tests with mock engines to just an `engine` var (I saw Jason do this down below for `searchKey` and liked it, so I copied it)
+ update Documents & Search UI pages to new selectors

* Update EngineOverview to use isEngineEmpty + remove polling

- Per Casey, polling is primarily only needed to dynamically update from empty state to non-empty state, which we're going to handle at the engine level in the next commit

* Add empty engine polling behavior

- Now that both Engines Overview, Documents, and Search UI views have empty states that are hooked up to EngineLogic, this poll will update all of the above pages automatically when a new document comes in!

* [Misc UI polish] Add (+) icon to Index documents button

- to match other create page header buttons

* [PR feedback] Test improvements

Co-authored-by: Jason Stoltzfus <jastoltz24@gmail.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Jason Stoltzfus <jastoltz24@gmail.com>
---
 .../components/document_creation_button.tsx   |   2 +-
 .../components/documents/documents.test.tsx   |   1 -
 .../components/documents/documents.tsx        |   4 +-
 .../app_search/components/engine/constants.ts |  20 ++
 .../components/engine/engine_logic.test.ts    | 239 ++++++++++++++++--
 .../components/engine/engine_logic.ts         |  62 ++++-
 .../components/engine/engine_router.test.tsx  |  14 +-
 .../components/engine/engine_router.tsx       |  11 +-
 .../engine_overview/engine_overview.test.tsx  |  24 +-
 .../engine_overview/engine_overview.tsx       |  21 +-
 .../engine_overview_logic.test.ts             |  69 +----
 .../engine_overview/engine_overview_logic.ts  |  49 +---
 .../engine_overview_metrics.test.tsx          |  20 ++
 .../engine_overview_metrics.tsx               |  14 +-
 .../components/search_ui/search_ui.tsx        |   4 +-
 15 files changed, 379 insertions(+), 175 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/constants.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.tsx
index cded18094c5f2..482ee282cf464 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.tsx
@@ -21,7 +21,7 @@ export const DocumentCreationButton: React.FC = () => {
     <>
       <EuiButton
         fill
-        color="primary"
+        iconType="plusInCircle"
         data-test-subj="IndexDocumentsButton"
         onClick={showCreationModes}
       >
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
index b5b6dd453c9df..7e1b2acc81d18 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
@@ -22,7 +22,6 @@ import { Documents } from '.';
 describe('Documents', () => {
   const values = {
     isMetaEngine: false,
-    engine: { document_count: 1 },
     myRole: { canManageEngineDocuments: true },
   };
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.tsx
index 62c7759757bda..75044bfcc8fb7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.tsx
@@ -21,7 +21,7 @@ import { DOCUMENTS_TITLE } from './constants';
 import { SearchExperience } from './search_experience';
 
 export const Documents: React.FC = () => {
-  const { isMetaEngine, engine } = useValues(EngineLogic);
+  const { isMetaEngine, isEngineEmpty } = useValues(EngineLogic);
   const { myRole } = useValues(AppLogic);
 
   return (
@@ -32,7 +32,7 @@ export const Documents: React.FC = () => {
         rightSideItems:
           myRole.canManageEngineDocuments && !isMetaEngine ? [<DocumentCreationButton />] : [],
       }}
-      isEmptyState={!engine.document_count}
+      isEmptyState={isEngineEmpty}
       emptyState={<EmptyState />}
     >
       {isMetaEngine && (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/constants.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/constants.ts
new file mode 100644
index 0000000000000..9102f706fdbed
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/constants.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const POLLING_DURATION = 5000;
+
+export const POLLING_ERROR_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.engine.pollingErrorMessage',
+  { defaultMessage: 'Could not fetch engine data' }
+);
+
+export const POLLING_ERROR_TEXT = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.engine.pollingErrorDescription',
+  { defaultMessage: 'Please check your connection or manually reload the page.' }
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
index 2b60193d4f7d3..0189edbbf871f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
@@ -5,10 +5,15 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
+import { SchemaType } from '../../../shared/schema/types';
 import { ApiTokenTypes } from '../credentials/constants';
 
 import { EngineTypes } from './types';
@@ -16,8 +21,9 @@ import { EngineTypes } from './types';
 import { EngineLogic } from './';
 
 describe('EngineLogic', () => {
-  const { mount } = new LogicMounter(EngineLogic);
+  const { mount, unmount } = new LogicMounter(EngineLogic);
   const { http } = mockHttpValues;
+  const { flashErrorToast } = mockFlashMessageHelpers;
 
   const mockEngineData = {
     name: 'some-engine',
@@ -34,7 +40,7 @@ describe('EngineLogic', () => {
     sample: false,
     isMeta: false,
     invalidBoosts: false,
-    schema: {},
+    schema: { test: SchemaType.Text },
     apiTokens: [],
     apiKey: 'some-key',
   };
@@ -43,6 +49,8 @@ describe('EngineLogic', () => {
     dataLoading: true,
     engine: {},
     engineName: '',
+    isEngineEmpty: true,
+    isEngineSchemaEmpty: true,
     isMetaEngine: false,
     isSampleEngine: false,
     hasSchemaErrors: false,
@@ -50,6 +58,14 @@ describe('EngineLogic', () => {
     hasUnconfirmedSchemaFields: false,
     engineNotFound: false,
     searchKey: '',
+    intervalId: null,
+  };
+
+  const DEFAULT_VALUES_WITH_ENGINE = {
+    ...DEFAULT_VALUES,
+    engine: mockEngineData,
+    isEngineEmpty: false,
+    isEngineSchemaEmpty: false,
   };
 
   beforeEach(() => {
@@ -69,7 +85,7 @@ describe('EngineLogic', () => {
           EngineLogic.actions.setEngineData(mockEngineData);
 
           expect(EngineLogic.values).toEqual({
-            ...DEFAULT_VALUES,
+            ...DEFAULT_VALUES_WITH_ENGINE,
             engine: mockEngineData,
             dataLoading: false,
           });
@@ -154,6 +170,34 @@ describe('EngineLogic', () => {
         });
       });
     });
+
+    describe('onPollStart', () => {
+      it('should set intervalId', () => {
+        mount({ intervalId: null });
+        EngineLogic.actions.onPollStart(123);
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES,
+          intervalId: 123,
+        });
+      });
+
+      describe('onPollStop', () => {
+        // Note: This does have to be a separate action following stopPolling(), rather
+        // than using stopPolling: () => null as a reducer. If you do that, then the ID
+        // gets cleared before the actual poll interval does & the poll interval never clears :doh:
+
+        it('should reset intervalId', () => {
+          mount({ intervalId: 123 });
+          EngineLogic.actions.onPollStop();
+
+          expect(EngineLogic.values).toEqual({
+            ...DEFAULT_VALUES,
+            intervalId: null,
+          });
+        });
+      });
+    });
   });
 
   describe('listeners', () => {
@@ -170,28 +214,156 @@ describe('EngineLogic', () => {
         expect(EngineLogic.actions.setEngineData).toHaveBeenCalledWith(mockEngineData);
       });
 
-      it('handles errors', async () => {
+      it('handles 4xx errors', async () => {
         mount();
         jest.spyOn(EngineLogic.actions, 'setEngineNotFound');
-        http.get.mockReturnValue(Promise.reject('An error occured'));
+        http.get.mockReturnValue(Promise.reject({ response: { status: 404 } }));
 
         EngineLogic.actions.initializeEngine();
         await nextTick();
 
         expect(EngineLogic.actions.setEngineNotFound).toHaveBeenCalledWith(true);
       });
+
+      it('handles 5xx errors', async () => {
+        mount();
+        http.get.mockReturnValue(Promise.reject('An error occured'));
+
+        EngineLogic.actions.initializeEngine();
+        await nextTick();
+
+        expect(flashErrorToast).toHaveBeenCalledWith('Could not fetch engine data', {
+          text: expect.stringContaining('Please check your connection'),
+          toastLifeTimeMs: 3750,
+        });
+      });
+    });
+
+    describe('pollEmptyEngine', () => {
+      beforeEach(() => jest.useFakeTimers());
+      afterEach(() => jest.clearAllTimers());
+      afterAll(() => jest.useRealTimers());
+
+      it('starts a poll', () => {
+        mount();
+        jest.spyOn(global, 'setInterval');
+        jest.spyOn(EngineLogic.actions, 'onPollStart');
+
+        EngineLogic.actions.pollEmptyEngine();
+
+        expect(global.setInterval).toHaveBeenCalled();
+        expect(EngineLogic.actions.onPollStart).toHaveBeenCalled();
+      });
+
+      it('polls for engine data if the current engine is empty', () => {
+        mount({ engine: {} });
+        jest.spyOn(EngineLogic.actions, 'initializeEngine');
+
+        EngineLogic.actions.pollEmptyEngine();
+
+        jest.advanceTimersByTime(5000);
+        expect(EngineLogic.actions.initializeEngine).toHaveBeenCalledTimes(1);
+        jest.advanceTimersByTime(5000);
+        expect(EngineLogic.actions.initializeEngine).toHaveBeenCalledTimes(2);
+      });
+
+      it('cancels the poll if the current engine changed from empty to non-empty', () => {
+        mount({ engine: mockEngineData });
+        jest.spyOn(EngineLogic.actions, 'stopPolling');
+        jest.spyOn(EngineLogic.actions, 'initializeEngine');
+
+        EngineLogic.actions.pollEmptyEngine();
+
+        jest.advanceTimersByTime(5000);
+        expect(EngineLogic.actions.stopPolling).toHaveBeenCalled();
+        expect(EngineLogic.actions.initializeEngine).not.toHaveBeenCalled();
+      });
+
+      it('does not create new polls if one already exists', () => {
+        jest.spyOn(global, 'setInterval');
+        mount({ intervalId: 123 });
+
+        EngineLogic.actions.pollEmptyEngine();
+
+        expect(global.setInterval).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('stopPolling', () => {
+      it('clears the poll interval and unsets the intervalId', () => {
+        jest.spyOn(global, 'clearInterval');
+        mount({ intervalId: 123 });
+
+        EngineLogic.actions.stopPolling();
+
+        expect(global.clearInterval).toHaveBeenCalledWith(123);
+        expect(EngineLogic.values.intervalId).toEqual(null);
+      });
+
+      it('does not clearInterval if a poll has not been started', () => {
+        jest.spyOn(global, 'clearInterval');
+        mount({ intervalId: null });
+
+        EngineLogic.actions.stopPolling();
+
+        expect(global.clearInterval).not.toHaveBeenCalled();
+      });
     });
   });
 
   describe('selectors', () => {
+    describe('isEngineEmpty', () => {
+      it('returns true if the engine contains no documents', () => {
+        const engine = { ...mockEngineData, document_count: 0 };
+        mount({ engine });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
+          isEngineEmpty: true,
+        });
+      });
+
+      it('returns true if the engine is not yet initialized', () => {
+        mount({ engine: {} });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES,
+          isEngineEmpty: true,
+        });
+      });
+    });
+
+    describe('isEngineSchemaEmpty', () => {
+      it('returns true if the engine schema contains no fields', () => {
+        const engine = { ...mockEngineData, schema: {} };
+        mount({ engine });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
+          isEngineSchemaEmpty: true,
+        });
+      });
+
+      it('returns true if the engine is not yet initialized', () => {
+        mount({ engine: {} });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES,
+          isEngineSchemaEmpty: true,
+        });
+      });
+    });
+
     describe('isSampleEngine', () => {
       it('should be set based on engine.sample', () => {
-        const mockSampleEngine = { ...mockEngineData, sample: true };
-        mount({ engine: mockSampleEngine });
+        const engine = { ...mockEngineData, sample: true };
+        mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          engine: mockSampleEngine,
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
           isSampleEngine: true,
         });
       });
@@ -199,12 +371,12 @@ describe('EngineLogic', () => {
 
     describe('isMetaEngine', () => {
       it('should be set based on engine.type', () => {
-        const mockMetaEngine = { ...mockEngineData, type: EngineTypes.meta };
-        mount({ engine: mockMetaEngine });
+        const engine = { ...mockEngineData, type: EngineTypes.meta };
+        mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          engine: mockMetaEngine,
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
           isMetaEngine: true,
         });
       });
@@ -212,17 +384,17 @@ describe('EngineLogic', () => {
 
     describe('hasSchemaErrors', () => {
       it('should be set based on engine.activeReindexJob.numDocumentsWithErrors', () => {
-        const mockSchemaEngine = {
+        const engine = {
           ...mockEngineData,
           activeReindexJob: {
             numDocumentsWithErrors: 10,
           },
         };
-        mount({ engine: mockSchemaEngine });
+        mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          engine: mockSchemaEngine,
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
           hasSchemaErrors: true,
         });
       });
@@ -230,7 +402,7 @@ describe('EngineLogic', () => {
 
     describe('hasSchemaConflicts', () => {
       it('should be set based on engine.schemaConflicts', () => {
-        const mockSchemaEngine = {
+        const engine = {
           ...mockEngineData,
           schemaConflicts: {
             someSchemaField: {
@@ -241,11 +413,11 @@ describe('EngineLogic', () => {
             },
           },
         };
-        mount({ engine: mockSchemaEngine });
+        mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          engine: mockSchemaEngine,
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
           hasSchemaConflicts: true,
         });
       });
@@ -253,15 +425,15 @@ describe('EngineLogic', () => {
 
     describe('hasUnconfirmedSchemaFields', () => {
       it('should be set based on engine.unconfirmedFields', () => {
-        const mockUnconfirmedFieldsEngine = {
+        const engine = {
           ...mockEngineData,
           unconfirmedFields: ['new_field_1', 'new_field_2'],
         };
-        mount({ engine: mockUnconfirmedFieldsEngine });
+        mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          engine: mockUnconfirmedFieldsEngine,
+          ...DEFAULT_VALUES_WITH_ENGINE,
+          engine,
           hasUnconfirmedSchemaFields: true,
         });
       });
@@ -292,7 +464,7 @@ describe('EngineLogic', () => {
         mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
+          ...DEFAULT_VALUES_WITH_ENGINE,
           engine,
           searchKey: 'search-123xyz',
         });
@@ -312,11 +484,22 @@ describe('EngineLogic', () => {
         mount({ engine });
 
         expect(EngineLogic.values).toEqual({
-          ...DEFAULT_VALUES,
+          ...DEFAULT_VALUES_WITH_ENGINE,
           engine,
           searchKey: '',
         });
       });
     });
   });
+
+  describe('events', () => {
+    it('calls stopPolling before unmount', () => {
+      mount();
+      // Has to be a const to check state after unmount
+      const stopPollingSpy = jest.spyOn(EngineLogic.actions, 'stopPolling');
+
+      unmount();
+      expect(stopPollingSpy).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
index 5cbe89b364859..bfa77450176f6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
@@ -7,16 +7,20 @@
 
 import { kea, MakeLogicType } from 'kea';
 
+import { flashErrorToast } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
 import { ApiTokenTypes } from '../credentials/constants';
 import { ApiToken } from '../credentials/types';
 
+import { POLLING_DURATION, POLLING_ERROR_TITLE, POLLING_ERROR_TEXT } from './constants';
 import { EngineDetails, EngineTypes } from './types';
 
 interface EngineValues {
   dataLoading: boolean;
   engine: Partial<EngineDetails>;
   engineName: string;
+  isEngineEmpty: boolean;
+  isEngineSchemaEmpty: boolean;
   isMetaEngine: boolean;
   isSampleEngine: boolean;
   hasSchemaErrors: boolean;
@@ -24,6 +28,7 @@ interface EngineValues {
   hasUnconfirmedSchemaFields: boolean;
   engineNotFound: boolean;
   searchKey: string;
+  intervalId: number | null;
 }
 
 interface EngineActions {
@@ -32,6 +37,10 @@ interface EngineActions {
   setEngineNotFound(notFound: boolean): { notFound: boolean };
   clearEngine(): void;
   initializeEngine(): void;
+  pollEmptyEngine(): void;
+  onPollStart(intervalId: number): { intervalId: number };
+  stopPolling(): void;
+  onPollStop(): void;
 }
 
 export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
@@ -42,6 +51,10 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
     setEngineNotFound: (notFound) => ({ notFound }),
     clearEngine: true,
     initializeEngine: true,
+    pollEmptyEngine: true,
+    onPollStart: (intervalId) => ({ intervalId }),
+    stopPolling: true,
+    onPollStop: true,
   },
   reducers: {
     dataLoading: [
@@ -72,8 +85,20 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
         clearEngine: () => false,
       },
     ],
+    intervalId: [
+      null,
+      {
+        onPollStart: (_, { intervalId }) => intervalId,
+        onPollStop: () => null,
+      },
+    ],
   },
   selectors: ({ selectors }) => ({
+    isEngineEmpty: [() => [selectors.engine], (engine) => !engine.document_count],
+    isEngineSchemaEmpty: [
+      () => [selectors.engine],
+      (engine) => Object.keys(engine.schema || {}).length === 0,
+    ],
     isMetaEngine: [() => [selectors.engine], (engine) => engine?.type === EngineTypes.meta],
     isSampleEngine: [() => [selectors.engine], (engine) => !!engine?.sample],
     // Indexed engines
@@ -100,7 +125,9 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
     ],
   }),
   listeners: ({ actions, values }) => ({
-    initializeEngine: async () => {
+    initializeEngine: async (_, breakpoint) => {
+      breakpoint(); // Prevents errors if logic unmounts while fetching
+
       const { engineName } = values;
       const { http } = HttpLogic.values;
 
@@ -108,8 +135,39 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
         const response = await http.get(`/api/app_search/engines/${engineName}`);
         actions.setEngineData(response);
       } catch (error) {
-        actions.setEngineNotFound(true);
+        if (error?.response?.status >= 400 && error?.response?.status < 500) {
+          actions.setEngineNotFound(true);
+        } else {
+          flashErrorToast(POLLING_ERROR_TITLE, {
+            text: POLLING_ERROR_TEXT,
+            toastLifeTimeMs: POLLING_DURATION * 0.75,
+          });
+        }
       }
     },
+    pollEmptyEngine: () => {
+      if (values.intervalId) return; // Ensure we only have one poll at a time
+
+      const id = window.setInterval(() => {
+        if (values.isEngineEmpty && values.isEngineSchemaEmpty) {
+          actions.initializeEngine(); // Re-fetch engine data when engine is empty
+        } else {
+          actions.stopPolling();
+        }
+      }, POLLING_DURATION);
+
+      actions.onPollStart(id);
+    },
+    stopPolling: () => {
+      if (values.intervalId !== null) {
+        clearInterval(values.intervalId);
+        actions.onPollStop();
+      }
+    },
+  }),
+  events: ({ actions }) => ({
+    beforeUnmount: () => {
+      actions.stopPolling();
+    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
index ee1c0578debfc..ed35bfbe97842 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
@@ -41,7 +41,13 @@ describe('EngineRouter', () => {
     engineNotFound: false,
     myRole: {},
   };
-  const actions = { setEngineName: jest.fn(), initializeEngine: jest.fn(), clearEngine: jest.fn() };
+  const actions = {
+    setEngineName: jest.fn(),
+    initializeEngine: jest.fn(),
+    pollEmptyEngine: jest.fn(),
+    stopPolling: jest.fn(),
+    clearEngine: jest.fn(),
+  };
 
   beforeEach(() => {
     setMockValues(values);
@@ -58,12 +64,14 @@ describe('EngineRouter', () => {
       expect(actions.setEngineName).toHaveBeenCalledWith('some-engine');
     });
 
-    it('initializes/fetches engine API data', () => {
+    it('initializes/fetches engine API data and starts a poll for empty engines', () => {
       expect(actions.initializeEngine).toHaveBeenCalled();
+      expect(actions.pollEmptyEngine).toHaveBeenCalled();
     });
 
-    it('clears engine on unmount and on update', () => {
+    it('clears engine and stops polling on unmount / on engine change', () => {
       unmountHandler();
+      expect(actions.stopPolling).toHaveBeenCalled();
       expect(actions.clearEngine).toHaveBeenCalled();
     });
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
index 0f42483f44e0c..da8dd8467bb61 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -66,12 +66,19 @@ export const EngineRouter: React.FC = () => {
 
   const { engineName: engineNameFromUrl } = useParams() as { engineName: string };
   const { engineName, dataLoading, engineNotFound } = useValues(EngineLogic);
-  const { setEngineName, initializeEngine, clearEngine } = useActions(EngineLogic);
+  const { setEngineName, initializeEngine, pollEmptyEngine, stopPolling, clearEngine } = useActions(
+    EngineLogic
+  );
 
   useEffect(() => {
     setEngineName(engineNameFromUrl);
     initializeEngine();
-    return clearEngine;
+    pollEmptyEngine();
+
+    return () => {
+      stopPolling();
+      clearEngine();
+    };
   }, [engineNameFromUrl]);
 
   if (engineNotFound) {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
index edacd74e046a2..a2e0ba4fcd44d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -20,18 +19,14 @@ import { EngineOverview } from './';
 describe('EngineOverview', () => {
   const values = {
     dataLoading: false,
-    documentCount: 0,
     myRole: {},
+    isEngineEmpty: true,
     isMetaEngine: false,
   };
-  const actions = {
-    pollForOverviewMetrics: jest.fn(),
-  };
 
   beforeEach(() => {
     jest.clearAllMocks();
     setMockValues(values);
-    setMockActions(actions);
   });
 
   it('renders', () => {
@@ -39,21 +34,10 @@ describe('EngineOverview', () => {
     expect(wrapper.find('[data-test-subj="EngineOverview"]')).toHaveLength(1);
   });
 
-  it('initializes data on mount', () => {
-    shallow(<EngineOverview />);
-    expect(actions.pollForOverviewMetrics).toHaveBeenCalledTimes(1);
-  });
-
-  it('renders a loading page template if async data is still loading', () => {
-    setMockValues({ ...values, dataLoading: true });
-    const wrapper = shallow(<EngineOverview />);
-    expect(wrapper.prop('isLoading')).toEqual(true);
-  });
-
   describe('EmptyEngineOverview', () => {
     it('renders when the engine has no documents & the user can add documents', () => {
       const myRole = { canManageEngineDocuments: true, canViewEngineCredentials: true };
-      setMockValues({ ...values, myRole, documentCount: 0 });
+      setMockValues({ ...values, myRole });
       const wrapper = shallow(<EngineOverview />);
       expect(wrapper.find(EmptyEngineOverview)).toHaveLength(1);
     });
@@ -61,7 +45,7 @@ describe('EngineOverview', () => {
 
   describe('EngineOverviewMetrics', () => {
     it('renders when the engine has documents', () => {
-      setMockValues({ ...values, documentCount: 1 });
+      setMockValues({ ...values, isEngineEmpty: false });
       const wrapper = shallow(<EngineOverview />);
       expect(wrapper.find(EngineOverviewMetrics)).toHaveLength(1);
     });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
index 4c15ffd8b7f94..a3f98d8c13e8e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
@@ -5,38 +5,25 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 
-import { useActions, useValues } from 'kea';
+import { useValues } from 'kea';
 
 import { AppLogic } from '../../app_logic';
 import { EngineLogic } from '../engine';
-import { AppSearchPageTemplate } from '../layout';
 
 import { EmptyEngineOverview } from './engine_overview_empty';
 
 import { EngineOverviewMetrics } from './engine_overview_metrics';
 
-import { EngineOverviewLogic } from './';
-
 export const EngineOverview: React.FC = () => {
   const {
     myRole: { canManageEngineDocuments, canViewEngineCredentials },
   } = useValues(AppLogic);
-  const { isMetaEngine } = useValues(EngineLogic);
-
-  const { pollForOverviewMetrics } = useActions(EngineOverviewLogic);
-  const { dataLoading, documentCount } = useValues(EngineOverviewLogic);
-
-  useEffect(() => {
-    pollForOverviewMetrics();
-  }, []);
-
-  if (dataLoading) return <AppSearchPageTemplate isLoading />;
+  const { isEngineEmpty, isMetaEngine } = useValues(EngineLogic);
 
-  const engineHasDocuments = documentCount > 0;
   const canAddDocuments = canManageEngineDocuments && canViewEngineCredentials;
-  const showEngineOverview = engineHasDocuments || !canAddDocuments || isMetaEngine;
+  const showEngineOverview = !isEngineEmpty || !canAddDocuments || isMetaEngine;
 
   return (
     <div data-test-subj="EngineOverview">
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
index c9c1defd46032..cc677d2642702 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
@@ -20,7 +20,7 @@ import { nextTick } from '@kbn/test/jest';
 import { EngineOverviewLogic } from './';
 
 describe('EngineOverviewLogic', () => {
-  const { mount, unmount } = new LogicMounter(EngineOverviewLogic);
+  const { mount } = new LogicMounter(EngineOverviewLogic);
   const { http } = mockHttpValues;
   const { flashAPIErrors } = mockFlashMessageHelpers;
 
@@ -41,7 +41,6 @@ describe('EngineOverviewLogic', () => {
     queriesPerDay: [],
     totalClicks: 0,
     totalQueries: 0,
-    timeoutId: null,
   };
 
   beforeEach(() => {
@@ -54,10 +53,10 @@ describe('EngineOverviewLogic', () => {
   });
 
   describe('actions', () => {
-    describe('setPolledData', () => {
+    describe('onOverviewMetricsLoad', () => {
       it('should set all received data as top-level values and set dataLoading to false', () => {
         mount();
-        EngineOverviewLogic.actions.setPolledData(mockEngineMetrics);
+        EngineOverviewLogic.actions.onOverviewMetricsLoad(mockEngineMetrics);
 
         expect(EngineOverviewLogic.values).toEqual({
           ...DEFAULT_VALUES,
@@ -66,34 +65,20 @@ describe('EngineOverviewLogic', () => {
         });
       });
     });
-
-    describe('setTimeoutId', () => {
-      describe('timeoutId', () => {
-        it('should be set to the provided value', () => {
-          mount();
-          EngineOverviewLogic.actions.setTimeoutId(123);
-
-          expect(EngineOverviewLogic.values).toEqual({
-            ...DEFAULT_VALUES,
-            timeoutId: 123,
-          });
-        });
-      });
-    });
   });
 
   describe('listeners', () => {
-    describe('pollForOverviewMetrics', () => {
-      it('fetches data and calls onPollingSuccess', async () => {
+    describe('loadOverviewMetrics', () => {
+      it('fetches data and calls onOverviewMetricsLoad', async () => {
         mount();
-        jest.spyOn(EngineOverviewLogic.actions, 'onPollingSuccess');
+        jest.spyOn(EngineOverviewLogic.actions, 'onOverviewMetricsLoad');
         http.get.mockReturnValueOnce(Promise.resolve(mockEngineMetrics));
 
-        EngineOverviewLogic.actions.pollForOverviewMetrics();
+        EngineOverviewLogic.actions.loadOverviewMetrics();
         await nextTick();
 
         expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/some-engine/overview');
-        expect(EngineOverviewLogic.actions.onPollingSuccess).toHaveBeenCalledWith(
+        expect(EngineOverviewLogic.actions.onOverviewMetricsLoad).toHaveBeenCalledWith(
           mockEngineMetrics
         );
       });
@@ -102,47 +87,11 @@ describe('EngineOverviewLogic', () => {
         mount();
         http.get.mockReturnValue(Promise.reject('An error occurred'));
 
-        EngineOverviewLogic.actions.pollForOverviewMetrics();
+        EngineOverviewLogic.actions.loadOverviewMetrics();
         await nextTick();
 
         expect(flashAPIErrors).toHaveBeenCalledWith('An error occurred');
       });
     });
-
-    describe('onPollingSuccess', () => {
-      it('starts a polling timeout and sets data', async () => {
-        mount();
-        jest.useFakeTimers();
-        jest.spyOn(EngineOverviewLogic.actions, 'setTimeoutId');
-        jest.spyOn(EngineOverviewLogic.actions, 'setPolledData');
-
-        EngineOverviewLogic.actions.onPollingSuccess(mockEngineMetrics);
-
-        expect(setTimeout).toHaveBeenCalledWith(
-          EngineOverviewLogic.actions.pollForOverviewMetrics,
-          5000
-        );
-        expect(EngineOverviewLogic.actions.setTimeoutId).toHaveBeenCalledWith(expect.any(Number));
-        expect(EngineOverviewLogic.actions.setPolledData).toHaveBeenCalledWith(mockEngineMetrics);
-      });
-    });
-  });
-
-  describe('unmount', () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-      mount();
-    });
-
-    it('clears existing polling timeouts on unmount', () => {
-      EngineOverviewLogic.actions.setTimeoutId(123);
-      unmount();
-      expect(clearTimeout).toHaveBeenCalled();
-    });
-
-    it("does not clear timeout if one hasn't been set", () => {
-      unmount();
-      expect(clearTimeout).not.toHaveBeenCalled();
-    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.ts
index 78d5358fc4909..3f9c2e43a332b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.ts
@@ -11,8 +11,6 @@ import { flashAPIErrors } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
 import { EngineLogic } from '../engine';
 
-const POLLING_DURATION = 5000;
-
 interface EngineOverviewApiData {
   documentCount: number;
   startDate: string;
@@ -23,95 +21,74 @@ interface EngineOverviewApiData {
 }
 interface EngineOverviewValues extends EngineOverviewApiData {
   dataLoading: boolean;
-  timeoutId: number | null;
 }
 
 interface EngineOverviewActions {
-  setPolledData(engineMetrics: EngineOverviewApiData): EngineOverviewApiData;
-  setTimeoutId(timeoutId: number): { timeoutId: number };
-  pollForOverviewMetrics(): void;
-  onPollingSuccess(engineMetrics: EngineOverviewApiData): EngineOverviewApiData;
+  loadOverviewMetrics(): void;
+  onOverviewMetricsLoad(response: EngineOverviewApiData): EngineOverviewApiData;
 }
 
 export const EngineOverviewLogic = kea<MakeLogicType<EngineOverviewValues, EngineOverviewActions>>({
   path: ['enterprise_search', 'app_search', 'engine_overview_logic'],
   actions: () => ({
-    setPolledData: (engineMetrics) => engineMetrics,
-    setTimeoutId: (timeoutId) => ({ timeoutId }),
-    pollForOverviewMetrics: true,
-    onPollingSuccess: (engineMetrics) => engineMetrics,
+    loadOverviewMetrics: true,
+    onOverviewMetricsLoad: (engineMetrics) => engineMetrics,
   }),
   reducers: () => ({
     dataLoading: [
       true,
       {
-        setPolledData: () => false,
+        onOverviewMetricsLoad: () => false,
       },
     ],
     startDate: [
       '',
       {
-        setPolledData: (_, { startDate }) => startDate,
+        onOverviewMetricsLoad: (_, { startDate }) => startDate,
       },
     ],
     queriesPerDay: [
       [],
       {
-        setPolledData: (_, { queriesPerDay }) => queriesPerDay,
+        onOverviewMetricsLoad: (_, { queriesPerDay }) => queriesPerDay,
       },
     ],
     operationsPerDay: [
       [],
       {
-        setPolledData: (_, { operationsPerDay }) => operationsPerDay,
+        onOverviewMetricsLoad: (_, { operationsPerDay }) => operationsPerDay,
       },
     ],
     totalQueries: [
       0,
       {
-        setPolledData: (_, { totalQueries }) => totalQueries,
+        onOverviewMetricsLoad: (_, { totalQueries }) => totalQueries,
       },
     ],
     totalClicks: [
       0,
       {
-        setPolledData: (_, { totalClicks }) => totalClicks,
+        onOverviewMetricsLoad: (_, { totalClicks }) => totalClicks,
       },
     ],
     documentCount: [
       0,
       {
-        setPolledData: (_, { documentCount }) => documentCount,
-      },
-    ],
-    timeoutId: [
-      null,
-      {
-        setTimeoutId: (_, { timeoutId }) => timeoutId,
+        onOverviewMetricsLoad: (_, { documentCount }) => documentCount,
       },
     ],
   }),
   listeners: ({ actions }) => ({
-    pollForOverviewMetrics: async () => {
+    loadOverviewMetrics: async () => {
       const { http } = HttpLogic.values;
       const { engineName } = EngineLogic.values;
 
       try {
         const response = await http.get(`/api/app_search/engines/${engineName}/overview`);
-        actions.onPollingSuccess(response);
+        actions.onOverviewMetricsLoad(response);
       } catch (e) {
         flashAPIErrors(e);
       }
     },
-    onPollingSuccess: (engineMetrics) => {
-      const timeoutId = window.setTimeout(actions.pollForOverviewMetrics, POLLING_DURATION);
-      actions.setTimeoutId(timeoutId);
-      actions.setPolledData(engineMetrics);
-    },
-  }),
-  events: ({ values }) => ({
-    beforeUnmount() {
-      if (values.timeoutId !== null) clearTimeout(values.timeoutId);
-    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.test.tsx
index 620d913c5f9a7..14f182463d837 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.test.tsx
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
@@ -17,6 +19,19 @@ import { TotalStats, TotalCharts, RecentApiLogs } from './components';
 import { EngineOverviewMetrics } from './engine_overview_metrics';
 
 describe('EngineOverviewMetrics', () => {
+  const values = {
+    dataLoading: false,
+  };
+  const actions = {
+    loadOverviewMetrics: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues(values);
+    setMockActions(actions);
+  });
+
   it('renders', () => {
     const wrapper = shallow(<EngineOverviewMetrics />);
 
@@ -25,4 +40,9 @@ describe('EngineOverviewMetrics', () => {
     expect(wrapper.find(TotalCharts)).toHaveLength(1);
     expect(wrapper.find(RecentApiLogs)).toHaveLength(1);
   });
+
+  it('initializes data on mount', () => {
+    shallow(<EngineOverviewMetrics />);
+    expect(actions.loadOverviewMetrics).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
index b47ae21104ae9..3cc7138623735 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useEffect } from 'react';
+
+import { useActions, useValues } from 'kea';
 
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -15,7 +17,16 @@ import { AppSearchPageTemplate } from '../layout';
 
 import { TotalStats, TotalCharts, RecentApiLogs } from './components';
 
+import { EngineOverviewLogic } from './';
+
 export const EngineOverviewMetrics: React.FC = () => {
+  const { loadOverviewMetrics } = useActions(EngineOverviewLogic);
+  const { dataLoading } = useValues(EngineOverviewLogic);
+
+  useEffect(() => {
+    loadOverviewMetrics();
+  }, []);
+
   return (
     <AppSearchPageTemplate
       pageChrome={getEngineBreadcrumbs()}
@@ -24,6 +35,7 @@ export const EngineOverviewMetrics: React.FC = () => {
           defaultMessage: 'Engine overview',
         }),
       }}
+      isLoading={dataLoading}
     >
       <EuiFlexGroup>
         <EuiFlexItem grow={1}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.tsx
index 0ac59a33068ba..9f84bf4bd3b75 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.tsx
@@ -24,7 +24,7 @@ import { SearchUILogic } from './search_ui_logic';
 
 export const SearchUI: React.FC = () => {
   const { loadFieldData } = useActions(SearchUILogic);
-  const { engine } = useValues(EngineLogic);
+  const { isEngineSchemaEmpty } = useValues(EngineLogic);
 
   useEffect(() => {
     loadFieldData();
@@ -34,7 +34,7 @@ export const SearchUI: React.FC = () => {
     <AppSearchPageTemplate
       pageChrome={getEngineBreadcrumbs([SEARCH_UI_TITLE])}
       pageHeader={{ pageTitle: SEARCH_UI_TITLE }}
-      isEmptyState={Object.keys(engine.schema || {}).length === 0}
+      isEmptyState={isEngineSchemaEmpty}
       emptyState={<EmptyState />}
     >
       <EuiFlexGroup alignItems="flexStart">

From 91ca373000e483cf62135016105f256a73561cf9 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:11:17 -0700
Subject: [PATCH 20/95] Convert our full page Loading component to an
 Enterprise Search logo (#103189)

- while keeping our component-level LoadingOverlay to a spinner
---
 .../public/applications/shared/loading/loading.test.tsx   | 6 +++---
 .../public/applications/shared/loading/loading.tsx        | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
index 4ed242c6ed677..eb3e5f027a2d4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiLoadingSpinner } from '@elastic/eui';
+import { EuiLoadingLogo, EuiLoadingSpinner } from '@elastic/eui';
 
 import { Loading, LoadingOverlay } from './';
 
@@ -17,7 +17,7 @@ describe('Loading', () => {
   it('renders', () => {
     const wrapper = shallow(<Loading />);
     expect(wrapper.hasClass('enterpriseSearchLoading')).toBe(true);
-    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingLogo)).toHaveLength(1);
   });
 });
 
@@ -25,6 +25,6 @@ describe('LoadingOverlay', () => {
   it('renders', () => {
     const wrapper = shallow(<LoadingOverlay />);
     expect(wrapper.hasClass('enterpriseSearchLoadingOverlay')).toBe(true);
-    expect(wrapper.find(Loading)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(1);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.tsx
index 627d8386dc1c0..477cc27f5c8ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.tsx
@@ -7,18 +7,20 @@
 
 import React from 'react';
 
-import { EuiLoadingSpinner } from '@elastic/eui';
+import { EuiLoadingLogo, EuiLoadingSpinner } from '@elastic/eui';
 
 import './loading.scss';
 
 export const Loading: React.FC = () => (
   <div className="enterpriseSearchLoading">
-    <EuiLoadingSpinner size="xl" />
+    <EuiLoadingLogo size="xl" logo="logoEnterpriseSearch" />
   </div>
 );
 
 export const LoadingOverlay: React.FC = () => (
   <div className="enterpriseSearchLoadingOverlay">
-    <Loading />
+    <div className="enterpriseSearchLoading">
+      <EuiLoadingSpinner size="xl" />
+    </div>
   </div>
 );

From 2368e63668ebb12924177157ba237a8813c68936 Mon Sep 17 00:00:00 2001
From: Alexander Wert <AlexanderWert@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:27:05 +0200
Subject: [PATCH 21/95] Exploratory View Mobile: Renamed Latency and Throuput
 labels to align with metric names in APM (#102711)

---
 .../configurations/constants/labels.ts        |  4 ++--
 .../mobile/kpi_over_time_config.ts            | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
index 73739b7db12ef..eb8af4f26c01a 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
@@ -272,7 +272,7 @@ export const CARRIER_LOCATION = i18n.translate(
 export const RESPONSE_LATENCY = i18n.translate(
   'xpack.observability.expView.fieldLabels.responseLatency',
   {
-    defaultMessage: 'Response latency',
+    defaultMessage: 'Latency',
   }
 );
 
@@ -294,7 +294,7 @@ export const CPU_USAGE = i18n.translate('xpack.observability.expView.fieldLabels
 export const TRANSACTIONS_PER_MINUTE = i18n.translate(
   'xpack.observability.expView.fieldLabels.transactionPerMinute',
   {
-    defaultMessage: 'Transactions per minute',
+    defaultMessage: 'Throughput',
   }
 );
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/mobile/kpi_over_time_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/mobile/kpi_over_time_config.ts
index 2ed4d95760db7..9a2e86a8f7969 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/mobile/kpi_over_time_config.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/mobile/kpi_over_time_config.ts
@@ -71,18 +71,6 @@ export function getMobileKPIConfig({ indexPattern }: ConfigProps): DataSeries {
             id: TRANSACTION_DURATION,
             columnType: OPERATION_COLUMN,
           },
-          {
-            label: MEMORY_USAGE,
-            field: METRIC_SYSTEM_MEMORY_USAGE,
-            id: METRIC_SYSTEM_MEMORY_USAGE,
-            columnType: OPERATION_COLUMN,
-          },
-          {
-            label: CPU_USAGE,
-            field: METRIC_SYSTEM_CPU_USAGE,
-            id: METRIC_SYSTEM_CPU_USAGE,
-            columnType: OPERATION_COLUMN,
-          },
           {
             field: RECORDS_FIELD,
             id: RECORDS_FIELD,
@@ -95,6 +83,18 @@ export function getMobileKPIConfig({ indexPattern }: ConfigProps): DataSeries {
             ],
             timeScale: 'm',
           },
+          {
+            label: MEMORY_USAGE,
+            field: METRIC_SYSTEM_MEMORY_USAGE,
+            id: METRIC_SYSTEM_MEMORY_USAGE,
+            columnType: OPERATION_COLUMN,
+          },
+          {
+            label: CPU_USAGE,
+            field: METRIC_SYSTEM_CPU_USAGE,
+            id: METRIC_SYSTEM_CPU_USAGE,
+            columnType: OPERATION_COLUMN,
+          },
         ],
       },
     ],

From aee0585bc531d8460d3ea3f5028568910c160374 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 24 Jun 2021 09:35:33 +0200
Subject: [PATCH 22/95] [Lens] Do not reset columns on incomplete switch before
 closing flyout (#102876)

---
 .../dimension_panel/dimension_editor.tsx      |  9 +---
 .../dimension_panel/dimension_panel.test.tsx  | 32 ++++++-------
 .../operations/layer_helpers.test.ts          | 48 +++++++++++++++++++
 .../operations/layer_helpers.ts               | 42 +++++++++++-----
 .../test/functional/apps/lens/smokescreen.ts  |  4 +-
 5 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
index b35986c42054d..05100567c1b03 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -117,21 +117,14 @@ export function DimensionEditor(props: DimensionEditorProps) {
   const setStateWrapper = (
     setter: IndexPatternLayer | ((prevLayer: IndexPatternLayer) => IndexPatternLayer)
   ) => {
-    const prevOperationType =
-      operationDefinitionMap[state.layers[layerId].columns[columnId]?.operationType]?.input;
-
     const hypotheticalLayer = typeof setter === 'function' ? setter(state.layers[layerId]) : setter;
-    const hasIncompleteColumns = Boolean(hypotheticalLayer.incompleteColumns?.[columnId]);
     setState(
       (prevState) => {
         const layer = typeof setter === 'function' ? setter(prevState.layers[layerId]) : setter;
         return mergeLayer({ state: prevState, layerId, newLayer: layer });
       },
       {
-        isDimensionComplete:
-          prevOperationType === 'fullReference'
-            ? !hasIncompleteColumns
-            : Boolean(hypotheticalLayer.columns[columnId]),
+        isDimensionComplete: Boolean(hypotheticalLayer.columns[columnId]),
       }
     );
   };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index afcecdf5be9b8..d757d8573f25a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -908,20 +908,21 @@ describe('IndexPatternDimensionEditorPanel', () => {
       });
     });
 
-    it('should clean up when transitioning from incomplete reference-based operations to field operation', () => {
+    it('should keep current state and write incomplete column when transitioning from incomplete reference-based operations to field operation', () => {
+      const baseState = getStateWithColumns({
+        ...defaultProps.state.layers.first.columns,
+        col2: {
+          label: 'Counter rate',
+          dataType: 'number',
+          isBucketed: false,
+          operationType: 'counter_rate',
+          references: ['ref'],
+        },
+      });
       wrapper = mount(
         <IndexPatternDimensionEditorComponent
           {...defaultProps}
-          state={getStateWithColumns({
-            ...defaultProps.state.layers.first.columns,
-            col2: {
-              label: 'Counter rate',
-              dataType: 'number',
-              isBucketed: false,
-              operationType: 'counter_rate',
-              references: ['ref'],
-            },
-          })}
+          state={baseState}
           columnId={'col2'}
         />
       );
@@ -932,15 +933,12 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .simulate('click');
 
       // Now check that the dimension gets cleaned up on state update
-      expect(setState.mock.calls[0]).toEqual([
-        expect.any(Function),
-        { isDimensionComplete: false },
-      ]);
+      expect(setState.mock.calls[0]).toEqual([expect.any(Function), { isDimensionComplete: true }]);
       expect(setState.mock.calls[0][0](state)).toEqual({
-        ...state,
+        ...baseState,
         layers: {
           first: {
-            ...state.layers.first,
+            ...baseState.layers.first,
             incompleteColumns: {
               col2: { operationType: 'average' },
             },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
index 7de1318cbac61..9eedae6d82d43 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
@@ -1917,6 +1917,54 @@ describe('state_helpers', () => {
           })
         );
       });
+
+      it('should keep state and set incomplete column on incompatible switch', () => {
+        const layer: IndexPatternLayer = {
+          indexPatternId: '1',
+          columnOrder: ['metric', 'ref'],
+          columns: {
+            metric: {
+              dataType: 'number' as const,
+              isBucketed: false,
+              sourceField: 'source',
+              operationType: 'unique_count' as const,
+              filter: { language: 'kuery', query: 'bytes > 4000' },
+              timeShift: '3h',
+              label: 'Cardinality',
+              customLabel: true,
+            },
+            ref: {
+              label: 'Reference',
+              dataType: 'number',
+              isBucketed: false,
+              operationType: 'differences',
+              references: ['metric'],
+              filter: { language: 'kuery', query: 'bytes > 4000' },
+              timeShift: '3h',
+            },
+          },
+        };
+        const result = replaceColumn({
+          layer,
+          indexPattern,
+          columnId: 'ref',
+          op: 'sum',
+          visualizationGroups: [],
+        });
+        expect(result.columnOrder).toEqual(layer.columnOrder);
+        expect(result.columns).toEqual(layer.columns);
+        expect(result.incompleteColumns).toEqual({
+          ref: {
+            operationType: 'sum',
+            filter: {
+              language: 'kuery',
+              query: 'bytes > 4000',
+            },
+            timeScale: undefined,
+            timeShift: '3h',
+          },
+        });
+      });
     });
 
     it('should allow making a replacement on an operation that is being referenced, even if it ends up invalid', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
index fd3df9f97cecf..b5b1960b7b769 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
@@ -19,6 +19,7 @@ import {
   OperationType,
   IndexPatternColumn,
   RequiredReference,
+  OperationDefinition,
   GenericOperationDefinition,
 } from './definitions';
 import type {
@@ -532,20 +533,15 @@ export function replaceColumn({
       );
     }
 
-    // This logic comes after the transitions because they need to look at previous columns
-    if (previousDefinition.input === 'fullReference') {
-      (previousColumn as ReferenceBasedIndexPatternColumn).references.forEach((id: string) => {
-        tempLayer = deleteColumn({
-          layer: tempLayer,
-          columnId: id,
-          indexPattern,
-        });
-      });
-    }
-
     if (operationDefinition.input === 'none') {
       let newColumn = operationDefinition.buildColumn({ ...baseOptions, layer: tempLayer });
       newColumn = copyCustomLabel(newColumn, previousColumn);
+      tempLayer = removeOrphanedColumns(
+        previousDefinition,
+        previousColumn,
+        tempLayer,
+        indexPattern
+      );
 
       const newLayer = { ...tempLayer, columns: { ...tempLayer.columns, [columnId]: newColumn } };
       return updateDefaultLabels(
@@ -564,7 +560,6 @@ export function replaceColumn({
       } & ColumnAdvancedParams = { operationType: op };
       // if no field is available perform a full clean of the column from the layer
       if (previousDefinition.input === 'fullReference') {
-        tempLayer = deleteColumn({ layer: tempLayer, columnId, indexPattern });
         const previousReferenceId = (previousColumn as ReferenceBasedIndexPatternColumn)
           .references[0];
         const referenceColumn = layer.columns[previousReferenceId];
@@ -598,6 +593,8 @@ export function replaceColumn({
       };
     }
 
+    tempLayer = removeOrphanedColumns(previousDefinition, previousColumn, tempLayer, indexPattern);
+
     let newColumn = operationDefinition.buildColumn({ ...baseOptions, layer: tempLayer, field });
     if (!shouldResetLabel) {
       newColumn = copyCustomLabel(newColumn, previousColumn);
@@ -637,6 +634,27 @@ export function replaceColumn({
   }
 }
 
+function removeOrphanedColumns(
+  previousDefinition:
+    | OperationDefinition<IndexPatternColumn, 'field'>
+    | OperationDefinition<IndexPatternColumn, 'none'>
+    | OperationDefinition<IndexPatternColumn, 'fullReference'>,
+  previousColumn: IndexPatternColumn,
+  tempLayer: IndexPatternLayer,
+  indexPattern: IndexPattern
+) {
+  if (previousDefinition.input === 'fullReference') {
+    (previousColumn as ReferenceBasedIndexPatternColumn).references.forEach((id: string) => {
+      tempLayer = deleteColumn({
+        layer: tempLayer,
+        columnId: id,
+        indexPattern,
+      });
+    });
+  }
+  return tempLayer;
+}
+
 export function canTransition({
   layer,
   columnId,
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index ec32d7620fcf9..78900e6fabca4 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -604,7 +604,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       );
     });
 
-    it('should not leave an incomplete column in the visualization config with reference-based operations', async () => {
+    it('should revert to previous configuration and not leave an incomplete column in the visualization config with reference-based operations', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVisType('lens');
       await PageObjects.lens.goToTimeRange();
@@ -636,7 +636,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.lens.closeDimensionEditor();
 
       expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
-        undefined
+        'Moving average of Count of records'
       );
     });
 

From 01a486000e52128a173802f715d4fc347665ad7d Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Thu, 24 Jun 2021 10:50:09 +0300
Subject: [PATCH 23/95] [Search Sessions] Split tasks (#99967)

* cancel the previous session

* split to 3 tasks

* fixes

* cancellation

* updated tests

* split out and improve jest tests

* cleanup previous session properly

* don't fail delete and cancel if item was already cleaned up

* test

* test

* ignore resource_not_found_exception when deleting an already cleared \ expired async search

* jest

* update jest

* api int

* fix jest

* testssss

* Code review @dosant

* types

* remove any

* Fix merge

* type

* test

* jest

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 src/plugins/data/config.ts                    |  12 +-
 .../search/session/session_service.test.ts    |   8 +
 ... => check_non_persiseted_sessions.test.ts} | 295 ++--------------
 .../session/check_non_persiseted_sessions.ts  | 129 +++++++
 .../session/check_persisted_sessions.test.ts  |  76 +++++
 .../session/check_persisted_sessions.ts       |  72 ++++
 .../search/session/check_running_sessions.ts  | 257 --------------
 .../session/expire_persisted_sessions.ts      |  74 ++++
 .../session/get_search_session_page.test.ts   | 282 +++++++++++++++
 .../search/session/get_search_session_page.ts |  61 ++++
 .../server/search/session/index.ts            |   1 -
 .../server/search/session/monitoring_task.ts  | 119 -------
 .../search/session/session_service.test.ts    |   4 +
 .../server/search/session/session_service.ts  |  78 ++++-
 .../server/search/session/setup_task.ts       | 121 +++++++
 .../server/search/session/types.ts            |  47 +++
 .../session/update_session_status.test.ts     | 323 ++++++++++++++++++
 .../search/session/update_session_status.ts   | 128 +++++++
 .../server/search/session/utils.ts            |   9 +
 x-pack/test/api_integration/config.ts         |   1 +
 20 files changed, 1446 insertions(+), 651 deletions(-)
 rename x-pack/plugins/data_enhanced/server/search/session/{check_running_sessions.test.ts => check_non_persiseted_sessions.test.ts} (65%)
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
 delete mode 100644 x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
 delete mode 100644 x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
 create mode 100644 x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts

diff --git a/src/plugins/data/config.ts b/src/plugins/data/config.ts
index 9306b64019bbc..1b7bfbc09ad16 100644
--- a/src/plugins/data/config.ts
+++ b/src/plugins/data/config.ts
@@ -44,10 +44,20 @@ export const searchSessionsConfigSchema = schema.object({
    */
   pageSize: schema.number({ defaultValue: 100 }),
   /**
-   * trackingInterval controls how often we track search session objects progress
+   * trackingInterval controls how often we track persisted search session objects progress
    */
   trackingInterval: schema.duration({ defaultValue: '10s' }),
 
+  /**
+   * cleanupInterval controls how often we track non-persisted search session objects for cleanup
+   */
+  cleanupInterval: schema.duration({ defaultValue: '60s' }),
+
+  /**
+   * expireInterval controls how often we track persisted search session objects for expiration
+   */
+  expireInterval: schema.duration({ defaultValue: '60m' }),
+
   /**
    * monitoringTaskTimeout controls for how long task manager waits for search session monitoring task to complete before considering it timed out,
    * If tasks timeouts it receives cancel signal and next task starts in "trackingInterval" time
diff --git a/src/plugins/data/public/search/session/session_service.test.ts b/src/plugins/data/public/search/session/session_service.test.ts
index 39680c4948366..7f388a29cd454 100644
--- a/src/plugins/data/public/search/session/session_service.test.ts
+++ b/src/plugins/data/public/search/session/session_service.test.ts
@@ -98,6 +98,14 @@ describe('Session service', () => {
       expect(nowProvider.reset).toHaveBeenCalled();
     });
 
+    it("Can clear other apps' session", async () => {
+      sessionService.start();
+      expect(sessionService.getSessionId()).not.toBeUndefined();
+      currentAppId$.next('change');
+      sessionService.clear();
+      expect(sessionService.getSessionId()).toBeUndefined();
+    });
+
     it("Can start a new session in case there is other apps' stale session", async () => {
       const s1 = sessionService.start();
       expect(sessionService.getSessionId()).not.toBeUndefined();
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.test.ts
similarity index 65%
rename from x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.test.ts
rename to x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.test.ts
index c0a48d5d44862..0a80f1c06998f 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  checkRunningSessions as checkRunningSessions$,
-  CheckRunningSessionsDeps,
-} from './check_running_sessions';
+import { checkNonPersistedSessions as checkNonPersistedSessions$ } from './check_non_persiseted_sessions';
 import {
   SearchSessionStatus,
   SearchSessionSavedObjectAttributes,
@@ -16,22 +13,20 @@ import {
   EQL_SEARCH_STRATEGY,
 } from '../../../../../../src/plugins/data/common';
 import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { SearchSessionsConfig, SearchStatus } from './types';
+import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchStatus } from './types';
 import moment from 'moment';
 import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsDeleteOptions,
   SavedObjectsClientContract,
 } from '../../../../../../src/core/server';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
 
 jest.useFakeTimers();
 
-const checkRunningSessions = (deps: CheckRunningSessionsDeps, config: SearchSessionsConfig) =>
-  checkRunningSessions$(deps, config).toPromise();
+const checkNonPersistedSessions = (deps: CheckSearchSessionsDeps, config: SearchSessionsConfig) =>
+  checkNonPersistedSessions$(deps, config).toPromise();
 
-describe('getSearchStatus', () => {
+describe('checkNonPersistedSessions', () => {
   let mockClient: any;
   let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
   const config: SearchSessionsConfig = {
@@ -42,7 +37,9 @@ describe('getSearchStatus', () => {
     maxUpdateRetries: 3,
     defaultExpiration: moment.duration(7, 'd'),
     trackingInterval: moment.duration(10, 's'),
+    expireInterval: moment.duration(10, 'm'),
     monitoringTaskTimeout: moment.duration(5, 'm'),
+    cleanupInterval: moment.duration(10, 's'),
     management: {} as any,
   };
   const mockLogger: any = {
@@ -51,16 +48,6 @@ describe('getSearchStatus', () => {
     error: jest.fn(),
   };
 
-  const emptySO = {
-    attributes: {
-      persisted: false,
-      status: SearchSessionStatus.IN_PROGRESS,
-      created: moment().subtract(moment.duration(3, 'm')),
-      touched: moment().subtract(moment.duration(10, 's')),
-      idMapping: {},
-    },
-  };
-
   beforeEach(() => {
     savedObjectsClient = savedObjectsClientMock.create();
     mockClient = {
@@ -81,7 +68,7 @@ describe('getSearchStatus', () => {
       total: 0,
     } as any);
 
-    await checkRunningSessions(
+    await checkNonPersistedSessions(
       {
         savedObjectsClient,
         client: mockClient,
@@ -94,240 +81,7 @@ describe('getSearchStatus', () => {
     expect(savedObjectsClient.delete).not.toBeCalled();
   });
 
-  describe('pagination', () => {
-    test('fetches one page if not objects exist', async () => {
-      savedObjectsClient.find.mockResolvedValueOnce({
-        saved_objects: [],
-        total: 0,
-      } as any);
-
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(1);
-    });
-
-    test('fetches one page if less than page size object are returned', async () => {
-      savedObjectsClient.find.mockResolvedValueOnce({
-        saved_objects: [emptySO, emptySO],
-        total: 5,
-      } as any);
-
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(1);
-    });
-
-    test('fetches two pages if exactly page size objects are returned', async () => {
-      let i = 0;
-      savedObjectsClient.find.mockImplementation(() => {
-        return new Promise((resolve) => {
-          resolve({
-            saved_objects: i++ === 0 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [],
-            total: 5,
-            page: i,
-          } as any);
-        });
-      });
-
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(2);
-
-      // validate that page number increases
-      const { page: page1 } = savedObjectsClient.find.mock.calls[0][0];
-      const { page: page2 } = savedObjectsClient.find.mock.calls[1][0];
-      expect(page1).toBe(1);
-      expect(page2).toBe(2);
-    });
-
-    test('fetches two pages if page size +1 objects are returned', async () => {
-      let i = 0;
-      savedObjectsClient.find.mockImplementation(() => {
-        return new Promise((resolve) => {
-          resolve({
-            saved_objects: i++ === 0 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [emptySO],
-            total: 5,
-            page: i,
-          } as any);
-        });
-      });
-
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(2);
-    });
-
-    test('fetching is abortable', async () => {
-      let i = 0;
-      const abort$ = new Subject();
-      savedObjectsClient.find.mockImplementation(() => {
-        return new Promise((resolve) => {
-          if (++i === 2) {
-            abort$.next();
-          }
-          resolve({
-            saved_objects: i <= 5 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [],
-            total: 25,
-            page: i,
-          } as any);
-        });
-      });
-
-      await checkRunningSessions$(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      )
-        .pipe(takeUntil(abort$))
-        .toPromise();
-
-      jest.runAllTimers();
-
-      // if not for `abort$` then this would be called 6 times!
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(2);
-    });
-
-    test('sorting is by "touched"', async () => {
-      savedObjectsClient.find.mockResolvedValueOnce({
-        saved_objects: [],
-        total: 0,
-      } as any);
-
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.find).toHaveBeenCalledWith(
-        expect.objectContaining({ sortField: 'touched', sortOrder: 'asc' })
-      );
-    });
-
-    test('sessions fetched in the beginning are processed even if sessions in the end fail', async () => {
-      let i = 0;
-      savedObjectsClient.find.mockImplementation(() => {
-        return new Promise((resolve, reject) => {
-          if (++i === 2) {
-            reject(new Error('Fake find error...'));
-          }
-          resolve({
-            saved_objects:
-              i <= 5
-                ? [
-                    i === 1
-                      ? {
-                          id: '123',
-                          attributes: {
-                            persisted: false,
-                            status: SearchSessionStatus.IN_PROGRESS,
-                            created: moment().subtract(moment.duration(3, 'm')),
-                            touched: moment().subtract(moment.duration(2, 'm')),
-                            idMapping: {
-                              'map-key': {
-                                strategy: ENHANCED_ES_SEARCH_STRATEGY,
-                                id: 'async-id',
-                              },
-                            },
-                          },
-                        }
-                      : emptySO,
-                    emptySO,
-                    emptySO,
-                    emptySO,
-                    emptySO,
-                  ]
-                : [],
-            total: 25,
-            page: i,
-          } as any);
-        });
-      });
-
-      await checkRunningSessions$(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      ).toPromise();
-
-      jest.runAllTimers();
-
-      expect(savedObjectsClient.find).toHaveBeenCalledTimes(2);
-
-      // by checking that delete was called we validate that sessions from session that were successfully fetched were processed
-      expect(mockClient.asyncSearch.delete).toBeCalled();
-      const { id } = mockClient.asyncSearch.delete.mock.calls[0][0];
-      expect(id).toBe('async-id');
-    });
-  });
-
   describe('delete', () => {
-    test('doesnt delete a persisted session', async () => {
-      savedObjectsClient.find.mockResolvedValue({
-        saved_objects: [
-          {
-            id: '123',
-            attributes: {
-              persisted: true,
-              status: SearchSessionStatus.IN_PROGRESS,
-              created: moment().subtract(moment.duration(30, 'm')),
-              touched: moment().subtract(moment.duration(10, 'm')),
-              idMapping: {},
-            },
-          },
-        ],
-        total: 1,
-      } as any);
-      await checkRunningSessions(
-        {
-          savedObjectsClient,
-          client: mockClient,
-          logger: mockLogger,
-        },
-        config
-      );
-
-      expect(savedObjectsClient.bulkUpdate).not.toBeCalled();
-      expect(savedObjectsClient.delete).not.toBeCalled();
-    });
-
     test('doesnt delete a non persisted, recently touched session', async () => {
       savedObjectsClient.find.mockResolvedValue({
         saved_objects: [
@@ -336,6 +90,7 @@ describe('getSearchStatus', () => {
             attributes: {
               persisted: false,
               status: SearchSessionStatus.IN_PROGRESS,
+              expires: moment().add(moment.duration(3, 'm')),
               created: moment().subtract(moment.duration(3, 'm')),
               touched: moment().subtract(moment.duration(10, 's')),
               idMapping: {},
@@ -344,7 +99,7 @@ describe('getSearchStatus', () => {
         ],
         total: 1,
       } as any);
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -367,6 +122,7 @@ describe('getSearchStatus', () => {
               status: SearchSessionStatus.COMPLETE,
               created: moment().subtract(moment.duration(3, 'm')),
               touched: moment().subtract(moment.duration(1, 'm')),
+              expires: moment().add(moment.duration(3, 'm')),
               idMapping: {
                 'search-hash': {
                   id: 'search-id',
@@ -379,7 +135,7 @@ describe('getSearchStatus', () => {
         ],
         total: 1,
       } as any);
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -401,6 +157,7 @@ describe('getSearchStatus', () => {
             attributes: {
               persisted: false,
               status: SearchSessionStatus.IN_PROGRESS,
+              expires: moment().add(moment.duration(3, 'm')),
               created: moment().subtract(moment.duration(3, 'm')),
               touched: moment().subtract(moment.duration(2, 'm')),
               idMapping: {
@@ -415,7 +172,7 @@ describe('getSearchStatus', () => {
         total: 1,
       } as any);
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -441,6 +198,7 @@ describe('getSearchStatus', () => {
               status: SearchSessionStatus.IN_PROGRESS,
               created: moment().subtract(moment.duration(3, 'm')),
               touched: moment().subtract(moment.duration(2, 'm')),
+              expires: moment().add(moment.duration(3, 'm')),
               idMapping: {
                 'map-key': {
                   strategy: ENHANCED_ES_SEARCH_STRATEGY,
@@ -453,7 +211,7 @@ describe('getSearchStatus', () => {
         total: 1,
       } as any);
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -481,6 +239,7 @@ describe('getSearchStatus', () => {
             attributes: {
               persisted: false,
               status: SearchSessionStatus.COMPLETE,
+              expires: moment().add(moment.duration(3, 'm')),
               created: moment().subtract(moment.duration(30, 'm')),
               touched: moment().subtract(moment.duration(6, 'm')),
               idMapping: {
@@ -501,7 +260,7 @@ describe('getSearchStatus', () => {
         total: 1,
       } as any);
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -530,6 +289,7 @@ describe('getSearchStatus', () => {
             attributes: {
               persisted: false,
               status: SearchSessionStatus.COMPLETE,
+              expires: moment().add(moment.duration(3, 'm')),
               created: moment().subtract(moment.duration(30, 'm')),
               touched: moment().subtract(moment.duration(6, 'm')),
               idMapping: {
@@ -545,7 +305,7 @@ describe('getSearchStatus', () => {
         total: 1,
       } as any);
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -573,6 +333,7 @@ describe('getSearchStatus', () => {
           status: SearchSessionStatus.IN_PROGRESS,
           created: moment().subtract(moment.duration(3, 'm')),
           touched: moment().subtract(moment.duration(10, 's')),
+          expires: moment().add(moment.duration(3, 'm')),
           idMapping: {
             'search-hash': {
               id: 'search-id',
@@ -594,7 +355,7 @@ describe('getSearchStatus', () => {
         },
       });
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -614,6 +375,7 @@ describe('getSearchStatus', () => {
         id: '123',
         attributes: {
           status: SearchSessionStatus.ERROR,
+          expires: moment().add(moment.duration(3, 'm')),
           idMapping: {
             'search-hash': {
               id: 'search-id',
@@ -633,7 +395,7 @@ describe('getSearchStatus', () => {
         total: 1,
       } as any);
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -653,6 +415,7 @@ describe('getSearchStatus', () => {
         namespaces: ['awesome'],
         attributes: {
           status: SearchSessionStatus.IN_PROGRESS,
+          expires: moment().add(moment.duration(3, 'm')),
           touched: '123',
           idMapping: {
             'search-hash': {
@@ -676,7 +439,7 @@ describe('getSearchStatus', () => {
         },
       });
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -696,6 +459,7 @@ describe('getSearchStatus', () => {
       const so = {
         attributes: {
           status: SearchSessionStatus.IN_PROGRESS,
+          expires: moment().add(moment.duration(3, 'm')),
           touched: '123',
           idMapping: {
             'search-hash': {
@@ -719,7 +483,7 @@ describe('getSearchStatus', () => {
         },
       });
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
@@ -744,6 +508,7 @@ describe('getSearchStatus', () => {
       savedObjectsClient.bulkUpdate = jest.fn();
       const so = {
         attributes: {
+          expires: moment().add(moment.duration(3, 'm')),
           idMapping: {
             'search-hash': {
               id: 'search-id',
@@ -766,7 +531,7 @@ describe('getSearchStatus', () => {
         },
       });
 
-      await checkRunningSessions(
+      await checkNonPersistedSessions(
         {
           savedObjectsClient,
           client: mockClient,
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
new file mode 100644
index 0000000000000..8c75ce91cac6a
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
@@ -0,0 +1,129 @@
+/*
+ * 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 { SavedObjectsFindResult } from 'kibana/server';
+import moment from 'moment';
+import { EMPTY } from 'rxjs';
+import { catchError, concatMap } from 'rxjs/operators';
+import {
+  nodeBuilder,
+  ENHANCED_ES_SEARCH_STRATEGY,
+  SEARCH_SESSION_TYPE,
+  SearchSessionSavedObjectAttributes,
+  SearchSessionStatus,
+  KueryNode,
+} from '../../../../../../src/plugins/data/common';
+import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
+import { SearchSessionsConfig, CheckSearchSessionsDeps } from './types';
+import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
+
+export const SEARCH_SESSIONS_CLEANUP_TASK_TYPE = 'search_sessions_cleanup';
+export const SEARCH_SESSIONS_CLEANUP_TASK_ID = `data_enhanced_${SEARCH_SESSIONS_CLEANUP_TASK_TYPE}`;
+
+function isSessionStale(
+  session: SavedObjectsFindResult<SearchSessionSavedObjectAttributes>,
+  config: SearchSessionsConfig
+) {
+  const curTime = moment();
+  // Delete cancelled sessions immediately
+  if (session.attributes.status === SearchSessionStatus.CANCELLED) return true;
+  // Delete if a running session wasn't polled for in the last notTouchedInProgressTimeout OR
+  // if a completed \ errored \ canceled session wasn't saved for within notTouchedTimeout
+  return (
+    (session.attributes.status === SearchSessionStatus.IN_PROGRESS &&
+      curTime.diff(moment(session.attributes.touched), 'ms') >
+        config.notTouchedInProgressTimeout.asMilliseconds()) ||
+    (session.attributes.status !== SearchSessionStatus.IN_PROGRESS &&
+      curTime.diff(moment(session.attributes.touched), 'ms') >
+        config.notTouchedTimeout.asMilliseconds())
+  );
+}
+
+function checkNonPersistedSessionsPage(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig,
+  filter: KueryNode,
+  page: number
+) {
+  const { logger, client, savedObjectsClient } = deps;
+  logger.debug(`${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Fetching sessions from page ${page}`);
+  return getSearchSessionsPage$(deps, filter, config.pageSize, page).pipe(
+    concatMap(async (nonPersistedSearchSessions) => {
+      if (!nonPersistedSearchSessions.total) return nonPersistedSearchSessions;
+
+      logger.debug(
+        `${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Found ${nonPersistedSearchSessions.total} sessions, processing ${nonPersistedSearchSessions.saved_objects.length}`
+      );
+
+      const updatedSessions = await getAllSessionsStatusUpdates(deps, nonPersistedSearchSessions);
+      const deletedSessionIds: string[] = [];
+
+      await Promise.all(
+        nonPersistedSearchSessions.saved_objects.map(async (session) => {
+          if (isSessionStale(session, config)) {
+            // delete saved object to free up memory
+            // TODO: there's a potential rare edge case of deleting an object and then receiving a new trackId for that same session!
+            // Maybe we want to change state to deleted and cleanup later?
+            logger.debug(`Deleting stale session | ${session.id}`);
+            try {
+              deletedSessionIds.push(session.id);
+              await savedObjectsClient.delete(SEARCH_SESSION_TYPE, session.id, {
+                namespace: session.namespaces?.[0],
+              });
+            } catch (e) {
+              logger.error(
+                `${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Error while deleting session ${session.id}: ${e.message}`
+              );
+            }
+
+            // Send a delete request for each async search to ES
+            Object.keys(session.attributes.idMapping).map(async (searchKey: string) => {
+              const searchInfo = session.attributes.idMapping[searchKey];
+              if (searchInfo.strategy === ENHANCED_ES_SEARCH_STRATEGY) {
+                try {
+                  await client.asyncSearch.delete({ id: searchInfo.id });
+                } catch (e) {
+                  if (e.message !== 'resource_not_found_exception') {
+                    logger.error(
+                      `${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Error while deleting async_search ${searchInfo.id}: ${e.message}`
+                    );
+                  }
+                }
+              }
+            });
+          }
+        })
+      );
+
+      const nonDeletedSessions = updatedSessions.filter((updateSession) => {
+        return deletedSessionIds.indexOf(updateSession.id) === -1;
+      });
+
+      await bulkUpdateSessions(deps, nonDeletedSessions);
+
+      return nonPersistedSearchSessions;
+    })
+  );
+}
+
+export function checkNonPersistedSessions(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig
+) {
+  const { logger } = deps;
+
+  const filters = nodeBuilder.is(`${SEARCH_SESSION_TYPE}.attributes.persisted`, 'false');
+
+  return checkSearchSessionsByPage(checkNonPersistedSessionsPage, deps, config, filters).pipe(
+    catchError((e) => {
+      logger.error(
+        `${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Error while processing sessions: ${e?.message}`
+      );
+      return EMPTY;
+    })
+  );
+}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
new file mode 100644
index 0000000000000..e0b1b74b57d02
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
@@ -0,0 +1,76 @@
+/*
+ * 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 { checkPersistedSessionsProgress } from './check_persisted_sessions';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionsConfig } from './types';
+import moment from 'moment';
+import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+
+describe('checkPersistedSessionsProgress', () => {
+  let mockClient: any;
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  const config: SearchSessionsConfig = {
+    enabled: true,
+    pageSize: 5,
+    notTouchedInProgressTimeout: moment.duration(1, 'm'),
+    notTouchedTimeout: moment.duration(5, 'm'),
+    maxUpdateRetries: 3,
+    defaultExpiration: moment.duration(7, 'd'),
+    trackingInterval: moment.duration(10, 's'),
+    cleanupInterval: moment.duration(10, 's'),
+    expireInterval: moment.duration(10, 'm'),
+    monitoringTaskTimeout: moment.duration(5, 'm'),
+    management: {} as any,
+  };
+  const mockLogger: any = {
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  };
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    mockClient = {
+      asyncSearch: {
+        status: jest.fn(),
+        delete: jest.fn(),
+      },
+      eql: {
+        status: jest.fn(),
+        delete: jest.fn(),
+      },
+    };
+  });
+
+  test('fetches only running persisted sessions', async () => {
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [],
+      total: 0,
+    } as any);
+
+    await checkPersistedSessionsProgress(
+      {
+        savedObjectsClient,
+        client: mockClient,
+        logger: mockLogger,
+      },
+      config
+    );
+
+    const [findInput] = savedObjectsClient.find.mock.calls[0];
+
+    expect(findInput.filter.arguments[0].arguments[0].value).toBe(
+      'search-session.attributes.persisted'
+    );
+    expect(findInput.filter.arguments[0].arguments[1].value).toBe('true');
+    expect(findInput.filter.arguments[1].arguments[0].value).toBe(
+      'search-session.attributes.status'
+    );
+    expect(findInput.filter.arguments[1].arguments[1].value).toBe('in_progress');
+  });
+});
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
new file mode 100644
index 0000000000000..0d51e97952275
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
@@ -0,0 +1,72 @@
+/*
+ * 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 { EMPTY, Observable } from 'rxjs';
+import { catchError, concatMap } from 'rxjs/operators';
+import {
+  nodeBuilder,
+  SEARCH_SESSION_TYPE,
+  SearchSessionStatus,
+  KueryNode,
+} from '../../../../../../src/plugins/data/common';
+import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
+import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
+import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
+
+export const SEARCH_SESSIONS_TASK_TYPE = 'search_sessions_monitor';
+export const SEARCH_SESSIONS_TASK_ID = `data_enhanced_${SEARCH_SESSIONS_TASK_TYPE}`;
+
+function checkPersistedSessionsPage(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig,
+  filter: KueryNode,
+  page: number
+): Observable<SearchSessionsResponse> {
+  const { logger } = deps;
+  logger.debug(`${SEARCH_SESSIONS_TASK_TYPE} Fetching sessions from page ${page}`);
+  return getSearchSessionsPage$(deps, filter, config.pageSize, page).pipe(
+    concatMap(async (persistedSearchSessions) => {
+      if (!persistedSearchSessions.total) return persistedSearchSessions;
+
+      logger.debug(
+        `${SEARCH_SESSIONS_TASK_TYPE} Found ${persistedSearchSessions.total} sessions, processing ${persistedSearchSessions.saved_objects.length}`
+      );
+
+      const updatedSessions = await getAllSessionsStatusUpdates(deps, persistedSearchSessions);
+      await bulkUpdateSessions(deps, updatedSessions);
+
+      return persistedSearchSessions;
+    })
+  );
+}
+
+export function checkPersistedSessionsProgress(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig
+) {
+  const { logger } = deps;
+
+  const persistedSessionsFilter = nodeBuilder.and([
+    nodeBuilder.is(`${SEARCH_SESSION_TYPE}.attributes.persisted`, 'true'),
+    nodeBuilder.is(
+      `${SEARCH_SESSION_TYPE}.attributes.status`,
+      SearchSessionStatus.IN_PROGRESS.toString()
+    ),
+  ]);
+
+  return checkSearchSessionsByPage(
+    checkPersistedSessionsPage,
+    deps,
+    config,
+    persistedSessionsFilter
+  ).pipe(
+    catchError((e) => {
+      logger.error(`${SEARCH_SESSIONS_TASK_TYPE} Error while processing sessions: ${e?.message}`);
+      return EMPTY;
+    })
+  );
+}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts
deleted file mode 100644
index 6787d31ed2b74..0000000000000
--- a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts
+++ /dev/null
@@ -1,257 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  ElasticsearchClient,
-  Logger,
-  SavedObjectsClientContract,
-  SavedObjectsFindResult,
-  SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import moment from 'moment';
-import { EMPTY, from, Observable } from 'rxjs';
-import { catchError, concatMap } from 'rxjs/operators';
-import {
-  nodeBuilder,
-  ENHANCED_ES_SEARCH_STRATEGY,
-  SEARCH_SESSION_TYPE,
-  SearchSessionRequestInfo,
-  SearchSessionSavedObjectAttributes,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
-import { getSearchStatus } from './get_search_status';
-import { getSessionStatus } from './get_session_status';
-import { SearchSessionsConfig, SearchStatus } from './types';
-
-export interface CheckRunningSessionsDeps {
-  savedObjectsClient: SavedObjectsClientContract;
-  client: ElasticsearchClient;
-  logger: Logger;
-}
-
-function isSessionStale(
-  session: SavedObjectsFindResult<SearchSessionSavedObjectAttributes>,
-  config: SearchSessionsConfig,
-  logger: Logger
-) {
-  const curTime = moment();
-  // Delete if a running session wasn't polled for in the last notTouchedInProgressTimeout OR
-  // if a completed \ errored \ canceled session wasn't saved for within notTouchedTimeout
-  return (
-    (session.attributes.status === SearchSessionStatus.IN_PROGRESS &&
-      curTime.diff(moment(session.attributes.touched), 'ms') >
-        config.notTouchedInProgressTimeout.asMilliseconds()) ||
-    (session.attributes.status !== SearchSessionStatus.IN_PROGRESS &&
-      curTime.diff(moment(session.attributes.touched), 'ms') >
-        config.notTouchedTimeout.asMilliseconds())
-  );
-}
-
-async function updateSessionStatus(
-  session: SavedObjectsFindResult<SearchSessionSavedObjectAttributes>,
-  client: ElasticsearchClient,
-  logger: Logger
-) {
-  let sessionUpdated = false;
-
-  // Check statuses of all running searches
-  await Promise.all(
-    Object.keys(session.attributes.idMapping).map(async (searchKey: string) => {
-      const updateSearchRequest = (
-        currentStatus: Pick<SearchSessionRequestInfo, 'status' | 'error'>
-      ) => {
-        sessionUpdated = true;
-        session.attributes.idMapping[searchKey] = {
-          ...session.attributes.idMapping[searchKey],
-          ...currentStatus,
-        };
-      };
-
-      const searchInfo = session.attributes.idMapping[searchKey];
-      if (searchInfo.status === SearchStatus.IN_PROGRESS) {
-        try {
-          const currentStatus = await getSearchStatus(client, searchInfo.id);
-
-          if (currentStatus.status !== searchInfo.status) {
-            logger.debug(`search ${searchInfo.id} | status changed to ${currentStatus.status}`);
-            updateSearchRequest(currentStatus);
-          }
-        } catch (e) {
-          logger.error(e);
-          updateSearchRequest({
-            status: SearchStatus.ERROR,
-            error: e.message || e.meta.error?.caused_by?.reason,
-          });
-        }
-      }
-    })
-  );
-
-  // And only then derive the session's status
-  const sessionStatus = getSessionStatus(session.attributes);
-  if (sessionStatus !== session.attributes.status) {
-    const now = new Date().toISOString();
-    session.attributes.status = sessionStatus;
-    session.attributes.touched = now;
-    if (sessionStatus === SearchSessionStatus.COMPLETE) {
-      session.attributes.completed = now;
-    } else if (session.attributes.completed) {
-      session.attributes.completed = null;
-    }
-    sessionUpdated = true;
-  }
-
-  return sessionUpdated;
-}
-
-function getSavedSearchSessionsPage$(
-  { savedObjectsClient, logger }: CheckRunningSessionsDeps,
-  config: SearchSessionsConfig,
-  page: number
-) {
-  logger.debug(`Fetching saved search sessions page ${page}`);
-  return from(
-    savedObjectsClient.find<SearchSessionSavedObjectAttributes>({
-      page,
-      perPage: config.pageSize,
-      type: SEARCH_SESSION_TYPE,
-      namespaces: ['*'],
-      // process older sessions first
-      sortField: 'touched',
-      sortOrder: 'asc',
-      filter: nodeBuilder.or([
-        nodeBuilder.and([
-          nodeBuilder.is(
-            `${SEARCH_SESSION_TYPE}.attributes.status`,
-            SearchSessionStatus.IN_PROGRESS.toString()
-          ),
-          nodeBuilder.is(`${SEARCH_SESSION_TYPE}.attributes.persisted`, 'true'),
-        ]),
-        nodeBuilder.is(`${SEARCH_SESSION_TYPE}.attributes.persisted`, 'false'),
-      ]),
-    })
-  );
-}
-
-function checkRunningSessionsPage(
-  deps: CheckRunningSessionsDeps,
-  config: SearchSessionsConfig,
-  page: number
-) {
-  const { logger, client, savedObjectsClient } = deps;
-  return getSavedSearchSessionsPage$(deps, config, page).pipe(
-    concatMap(async (runningSearchSessionsResponse) => {
-      if (!runningSearchSessionsResponse.total) return;
-
-      logger.debug(
-        `Found ${runningSearchSessionsResponse.total} running sessions, processing ${runningSearchSessionsResponse.saved_objects.length} sessions from page ${page}`
-      );
-
-      const updatedSessions = new Array<
-        SavedObjectsFindResult<SearchSessionSavedObjectAttributes>
-      >();
-
-      await Promise.all(
-        runningSearchSessionsResponse.saved_objects.map(async (session) => {
-          const updated = await updateSessionStatus(session, client, logger);
-          let deleted = false;
-
-          if (!session.attributes.persisted) {
-            if (isSessionStale(session, config, logger)) {
-              // delete saved object to free up memory
-              // TODO: there's a potential rare edge case of deleting an object and then receiving a new trackId for that same session!
-              // Maybe we want to change state to deleted and cleanup later?
-              logger.debug(`Deleting stale session | ${session.id}`);
-              try {
-                await savedObjectsClient.delete(SEARCH_SESSION_TYPE, session.id, {
-                  namespace: session.namespaces?.[0],
-                });
-                deleted = true;
-              } catch (e) {
-                logger.error(
-                  `Error while deleting stale search session ${session.id}: ${e.message}`
-                );
-              }
-
-              // Send a delete request for each async search to ES
-              Object.keys(session.attributes.idMapping).map(async (searchKey: string) => {
-                const searchInfo = session.attributes.idMapping[searchKey];
-                if (searchInfo.strategy === ENHANCED_ES_SEARCH_STRATEGY) {
-                  try {
-                    await client.asyncSearch.delete({ id: searchInfo.id });
-                  } catch (e) {
-                    logger.error(
-                      `Error while deleting async_search ${searchInfo.id}: ${e.message}`
-                    );
-                  }
-                }
-              });
-            }
-          }
-
-          if (updated && !deleted) {
-            updatedSessions.push(session);
-          }
-        })
-      );
-
-      // Do a bulk update
-      if (updatedSessions.length) {
-        // If there's an error, we'll try again in the next iteration, so there's no need to check the output.
-        const updatedResponse = await savedObjectsClient.bulkUpdate<SearchSessionSavedObjectAttributes>(
-          updatedSessions.map((session) => ({
-            ...session,
-            namespace: session.namespaces?.[0],
-          }))
-        );
-
-        const success: Array<SavedObjectsUpdateResponse<SearchSessionSavedObjectAttributes>> = [];
-        const fail: Array<SavedObjectsUpdateResponse<SearchSessionSavedObjectAttributes>> = [];
-
-        updatedResponse.saved_objects.forEach((savedObjectResponse) => {
-          if ('error' in savedObjectResponse) {
-            fail.push(savedObjectResponse);
-            logger.error(
-              `Error while updating search session ${savedObjectResponse?.id}: ${savedObjectResponse.error?.message}`
-            );
-          } else {
-            success.push(savedObjectResponse);
-          }
-        });
-
-        logger.debug(`Updating search sessions: success: ${success.length}, fail: ${fail.length}`);
-      }
-
-      return runningSearchSessionsResponse;
-    })
-  );
-}
-
-export function checkRunningSessions(deps: CheckRunningSessionsDeps, config: SearchSessionsConfig) {
-  const { logger } = deps;
-
-  const checkRunningSessionsByPage = (nextPage = 1): Observable<void> =>
-    checkRunningSessionsPage(deps, config, nextPage).pipe(
-      concatMap((result) => {
-        if (!result || !result.saved_objects || result.saved_objects.length < config.pageSize) {
-          return EMPTY;
-        } else {
-          // TODO: while processing previous page session list might have been changed and we might skip a session,
-          // because it would appear now on a different "page".
-          // This isn't critical, as we would pick it up on a next task iteration, but maybe we could improve this somehow
-          return checkRunningSessionsByPage(result.page + 1);
-        }
-      })
-    );
-
-  return checkRunningSessionsByPage().pipe(
-    catchError((e) => {
-      logger.error(`Error while processing search sessions: ${e?.message}`);
-      return EMPTY;
-    })
-  );
-}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
new file mode 100644
index 0000000000000..e261c324f440f
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { EMPTY, Observable } from 'rxjs';
+import { catchError, concatMap } from 'rxjs/operators';
+import {
+  nodeBuilder,
+  SEARCH_SESSION_TYPE,
+  SearchSessionStatus,
+  KueryNode,
+} from '../../../../../../src/plugins/data/common';
+import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
+import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
+import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
+
+export const SEARCH_SESSIONS_EXPIRE_TASK_TYPE = 'search_sessions_expire';
+export const SEARCH_SESSIONS_EXPIRE_TASK_ID = `data_enhanced_${SEARCH_SESSIONS_EXPIRE_TASK_TYPE}`;
+
+function checkSessionExpirationPage(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig,
+  filter: KueryNode,
+  page: number
+): Observable<SearchSessionsResponse> {
+  const { logger } = deps;
+  logger.debug(`${SEARCH_SESSIONS_EXPIRE_TASK_TYPE} Fetching sessions from page ${page}`);
+  return getSearchSessionsPage$(deps, filter, config.pageSize, page).pipe(
+    concatMap(async (searchSessions) => {
+      if (!searchSessions.total) return searchSessions;
+
+      logger.debug(
+        `${SEARCH_SESSIONS_EXPIRE_TASK_TYPE} Found ${searchSessions.total} sessions, processing ${searchSessions.saved_objects.length}`
+      );
+
+      const updatedSessions = await getAllSessionsStatusUpdates(deps, searchSessions);
+      await bulkUpdateSessions(deps, updatedSessions);
+
+      return searchSessions;
+    })
+  );
+}
+
+export function checkPersistedCompletedSessionExpiration(
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig
+) {
+  const { logger } = deps;
+
+  const persistedSessionsFilter = nodeBuilder.and([
+    nodeBuilder.is(`${SEARCH_SESSION_TYPE}.attributes.persisted`, 'true'),
+    nodeBuilder.is(
+      `${SEARCH_SESSION_TYPE}.attributes.status`,
+      SearchSessionStatus.COMPLETE.toString()
+    ),
+  ]);
+
+  return checkSearchSessionsByPage(
+    checkSessionExpirationPage,
+    deps,
+    config,
+    persistedSessionsFilter
+  ).pipe(
+    catchError((e) => {
+      logger.error(
+        `${SEARCH_SESSIONS_EXPIRE_TASK_TYPE} Error while processing sessions: ${e?.message}`
+      );
+      return EMPTY;
+    })
+  );
+}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
new file mode 100644
index 0000000000000..df2b7d964642d
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
@@ -0,0 +1,282 @@
+/*
+ * 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 { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
+import {
+  SearchSessionStatus,
+  ENHANCED_ES_SEARCH_STRATEGY,
+} from '../../../../../../src/plugins/data/common';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionsConfig, SearchStatus } from './types';
+import moment from 'moment';
+import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { of, Subject, throwError } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+jest.useFakeTimers();
+
+describe('checkSearchSessionsByPage', () => {
+  const mockClient = {} as any;
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  const config: SearchSessionsConfig = {
+    enabled: true,
+    pageSize: 5,
+    management: {} as any,
+  } as any;
+  const mockLogger: any = {
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  };
+
+  const emptySO = {
+    attributes: {
+      persisted: false,
+      status: SearchSessionStatus.IN_PROGRESS,
+      created: moment().subtract(moment.duration(3, 'm')),
+      touched: moment().subtract(moment.duration(10, 's')),
+      idMapping: {},
+    },
+  };
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsClientMock.create();
+  });
+
+  describe('getSearchSessionsPage$', () => {
+    test('sorting is by "touched"', async () => {
+      savedObjectsClient.find.mockResolvedValueOnce({
+        saved_objects: [],
+        total: 0,
+      } as any);
+
+      await getSearchSessionsPage$(
+        {
+          savedObjectsClient,
+        } as any,
+        {
+          type: 'literal',
+        },
+        1,
+        1
+      );
+
+      expect(savedObjectsClient.find).toHaveBeenCalledWith(
+        expect.objectContaining({ sortField: 'touched', sortOrder: 'asc' })
+      );
+    });
+  });
+
+  describe('pagination', () => {
+    test('fetches one page if got empty response', async () => {
+      const checkFn = jest.fn().mockReturnValue(of(undefined));
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      ).toPromise();
+
+      expect(checkFn).toHaveBeenCalledTimes(1);
+    });
+
+    test('fetches one page if got response with no saved objects', async () => {
+      const checkFn = jest.fn().mockReturnValue(
+        of({
+          total: 0,
+        })
+      );
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      ).toPromise();
+
+      expect(checkFn).toHaveBeenCalledTimes(1);
+    });
+
+    test('fetches one page if less than page size object are returned', async () => {
+      const checkFn = jest.fn().mockReturnValue(
+        of({
+          saved_objects: [emptySO, emptySO],
+          total: 5,
+        })
+      );
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      ).toPromise();
+
+      expect(checkFn).toHaveBeenCalledTimes(1);
+    });
+
+    test('fetches two pages if exactly page size objects are returned', async () => {
+      let i = 0;
+
+      const checkFn = jest.fn().mockImplementation(() =>
+        of({
+          saved_objects: i++ === 0 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [],
+          total: 5,
+          page: i,
+        })
+      );
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      ).toPromise();
+
+      expect(checkFn).toHaveBeenCalledTimes(2);
+
+      // validate that page number increases
+      const page1 = checkFn.mock.calls[0][3];
+      const page2 = checkFn.mock.calls[1][3];
+      expect(page1).toBe(1);
+      expect(page2).toBe(2);
+    });
+
+    test('fetches two pages if page size +1 objects are returned', async () => {
+      let i = 0;
+
+      const checkFn = jest.fn().mockImplementation(() =>
+        of({
+          saved_objects: i++ === 0 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [emptySO],
+          total: i === 0 ? 5 : 1,
+          page: i,
+        })
+      );
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      ).toPromise();
+
+      expect(checkFn).toHaveBeenCalledTimes(2);
+    });
+
+    test('sessions fetched in the beginning are processed even if sessions in the end fail', async () => {
+      let i = 0;
+
+      const checkFn = jest.fn().mockImplementation(() => {
+        if (++i === 2) {
+          return throwError('Fake find error...');
+        }
+        return of({
+          saved_objects:
+            i <= 5
+              ? [
+                  i === 1
+                    ? {
+                        id: '123',
+                        attributes: {
+                          persisted: false,
+                          status: SearchSessionStatus.IN_PROGRESS,
+                          created: moment().subtract(moment.duration(3, 'm')),
+                          touched: moment().subtract(moment.duration(2, 'm')),
+                          idMapping: {
+                            'map-key': {
+                              strategy: ENHANCED_ES_SEARCH_STRATEGY,
+                              id: 'async-id',
+                              status: SearchStatus.IN_PROGRESS,
+                            },
+                          },
+                        },
+                      }
+                    : emptySO,
+                  emptySO,
+                  emptySO,
+                  emptySO,
+                  emptySO,
+                ]
+              : [],
+          total: 25,
+          page: i,
+        });
+      });
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      )
+        .toPromise()
+        .catch(() => {});
+
+      expect(checkFn).toHaveBeenCalledTimes(2);
+    });
+
+    test('fetching is abortable', async () => {
+      let i = 0;
+      const abort$ = new Subject();
+
+      const checkFn = jest.fn().mockImplementation(() => {
+        if (++i === 2) {
+          abort$.next();
+        }
+
+        return of({
+          saved_objects: i <= 5 ? [emptySO, emptySO, emptySO, emptySO, emptySO] : [],
+          total: 25,
+          page: i,
+        });
+      });
+
+      await checkSearchSessionsByPage(
+        checkFn,
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        config,
+        []
+      )
+        .pipe(takeUntil(abort$))
+        .toPromise()
+        .catch(() => {});
+
+      jest.runAllTimers();
+
+      // if not for `abort$` then this would be called 6 times!
+      expect(checkFn).toHaveBeenCalledTimes(2);
+    });
+  });
+});
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
new file mode 100644
index 0000000000000..74306bac39f7d
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { from, Observable, EMPTY } from 'rxjs';
+import { concatMap } from 'rxjs/operators';
+import {
+  SearchSessionSavedObjectAttributes,
+  SEARCH_SESSION_TYPE,
+  KueryNode,
+} from '../../../../../../src/plugins/data/common';
+import { CheckSearchSessionsDeps, CheckSearchSessionsFn, SearchSessionsConfig } from './types';
+
+export interface GetSessionsDeps {
+  savedObjectsClient: SavedObjectsClientContract;
+  logger: Logger;
+}
+
+export function getSearchSessionsPage$(
+  { savedObjectsClient }: GetSessionsDeps,
+  filter: KueryNode,
+  pageSize: number,
+  page: number
+) {
+  return from(
+    savedObjectsClient.find<SearchSessionSavedObjectAttributes>({
+      page,
+      perPage: pageSize,
+      type: SEARCH_SESSION_TYPE,
+      namespaces: ['*'],
+      // process older sessions first
+      sortField: 'touched',
+      sortOrder: 'asc',
+      filter,
+    })
+  );
+}
+
+export const checkSearchSessionsByPage = (
+  checkFn: CheckSearchSessionsFn,
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig,
+  filters: any,
+  nextPage = 1
+): Observable<void> =>
+  checkFn(deps, config, filters, nextPage).pipe(
+    concatMap((result) => {
+      if (!result || !result.saved_objects || result.saved_objects.length < config.pageSize) {
+        return EMPTY;
+      } else {
+        // TODO: while processing previous page session list might have been changed and we might skip a session,
+        // because it would appear now on a different "page".
+        // This isn't critical, as we would pick it up on a next task iteration, but maybe we could improve this somehow
+        return checkSearchSessionsByPage(checkFn, deps, config, filters, result.page + 1);
+      }
+    })
+  );
diff --git a/x-pack/plugins/data_enhanced/server/search/session/index.ts b/x-pack/plugins/data_enhanced/server/search/session/index.ts
index deadeb3f8f07a..1e6841211bb66 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/index.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/index.ts
@@ -6,4 +6,3 @@
  */
 
 export * from './session_service';
-export { registerSearchSessionsTask, scheduleSearchSessionsTasks } from './monitoring_task';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts b/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts
deleted file mode 100644
index 7b7b1412987be..0000000000000
--- a/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts
+++ /dev/null
@@ -1,119 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Duration } from 'moment';
-import { filter, takeUntil } from 'rxjs/operators';
-import { BehaviorSubject } from 'rxjs';
-import {
-  TaskManagerSetupContract,
-  TaskManagerStartContract,
-  RunContext,
-  TaskRunCreatorFunction,
-} from '../../../../task_manager/server';
-import { checkRunningSessions } from './check_running_sessions';
-import { CoreSetup, SavedObjectsClient, Logger } from '../../../../../../src/core/server';
-import { ConfigSchema } from '../../../config';
-import { SEARCH_SESSION_TYPE } from '../../../../../../src/plugins/data/common';
-import { DataEnhancedStartDependencies } from '../../type';
-
-export const SEARCH_SESSIONS_TASK_TYPE = 'search_sessions_monitor';
-export const SEARCH_SESSIONS_TASK_ID = `data_enhanced_${SEARCH_SESSIONS_TASK_TYPE}`;
-
-interface SearchSessionTaskDeps {
-  taskManager: TaskManagerSetupContract;
-  logger: Logger;
-  config: ConfigSchema;
-}
-
-function searchSessionRunner(
-  core: CoreSetup<DataEnhancedStartDependencies>,
-  { logger, config }: SearchSessionTaskDeps
-): TaskRunCreatorFunction {
-  return ({ taskInstance }: RunContext) => {
-    const aborted$ = new BehaviorSubject<boolean>(false);
-    return {
-      async run() {
-        const sessionConfig = config.search.sessions;
-        const [coreStart] = await core.getStartServices();
-        if (!sessionConfig.enabled) {
-          logger.debug('Search sessions are disabled. Skipping task.');
-          return;
-        }
-        if (aborted$.getValue()) return;
-
-        const internalRepo = coreStart.savedObjects.createInternalRepository([SEARCH_SESSION_TYPE]);
-        const internalSavedObjectsClient = new SavedObjectsClient(internalRepo);
-        await checkRunningSessions(
-          {
-            savedObjectsClient: internalSavedObjectsClient,
-            client: coreStart.elasticsearch.client.asInternalUser,
-            logger,
-          },
-          sessionConfig
-        )
-          .pipe(takeUntil(aborted$.pipe(filter((aborted) => aborted))))
-          .toPromise();
-
-        return {
-          state: {},
-        };
-      },
-      cancel: async () => {
-        aborted$.next(true);
-      },
-    };
-  };
-}
-
-export function registerSearchSessionsTask(
-  core: CoreSetup<DataEnhancedStartDependencies>,
-  deps: SearchSessionTaskDeps
-) {
-  deps.taskManager.registerTaskDefinitions({
-    [SEARCH_SESSIONS_TASK_TYPE]: {
-      title: 'Search Sessions Monitor',
-      createTaskRunner: searchSessionRunner(core, deps),
-      timeout: `${deps.config.search.sessions.monitoringTaskTimeout.asSeconds()}s`,
-    },
-  });
-}
-
-export async function unscheduleSearchSessionsTask(
-  taskManager: TaskManagerStartContract,
-  logger: Logger
-) {
-  try {
-    await taskManager.removeIfExists(SEARCH_SESSIONS_TASK_ID);
-    logger.debug(`Search sessions cleared`);
-  } catch (e) {
-    logger.error(`Error clearing task, received ${e.message}`);
-  }
-}
-
-export async function scheduleSearchSessionsTasks(
-  taskManager: TaskManagerStartContract,
-  logger: Logger,
-  trackingInterval: Duration
-) {
-  await taskManager.removeIfExists(SEARCH_SESSIONS_TASK_ID);
-
-  try {
-    await taskManager.ensureScheduled({
-      id: SEARCH_SESSIONS_TASK_ID,
-      taskType: SEARCH_SESSIONS_TASK_TYPE,
-      schedule: {
-        interval: `${trackingInterval.asSeconds()}s`,
-      },
-      state: {},
-      params: {},
-    });
-
-    logger.debug(`Search sessions task, scheduled to run`);
-  } catch (e) {
-    logger.error(`Error scheduling task, received ${e.message}`);
-  }
-}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
index 374dbee2384d5..dd1eafa5d60f8 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
@@ -79,7 +79,9 @@ describe('SearchSessionService', () => {
             maxUpdateRetries: MAX_UPDATE_RETRIES,
             defaultExpiration: moment.duration(7, 'd'),
             monitoringTaskTimeout: moment.duration(5, 'm'),
+            cleanupInterval: moment.duration(10, 's'),
             trackingInterval: moment.duration(10, 's'),
+            expireInterval: moment.duration(10, 'm'),
             management: {} as any,
           },
         },
@@ -157,7 +159,9 @@ describe('SearchSessionService', () => {
             maxUpdateRetries: MAX_UPDATE_RETRIES,
             defaultExpiration: moment.duration(7, 'd'),
             trackingInterval: moment.duration(10, 's'),
+            expireInterval: moment.duration(10, 'm'),
             monitoringTaskTimeout: moment.duration(5, 'm'),
+            cleanupInterval: moment.duration(10, 's'),
             management: {} as any,
           },
         },
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
index 81a12f607935d..0998c1f42e183 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
@@ -43,11 +43,26 @@ import { createRequestHash } from './utils';
 import { ConfigSchema } from '../../../config';
 import {
   registerSearchSessionsTask,
-  scheduleSearchSessionsTasks,
+  scheduleSearchSessionsTask,
   unscheduleSearchSessionsTask,
-} from './monitoring_task';
+} from './setup_task';
 import { SearchSessionsConfig, SearchStatus } from './types';
 import { DataEnhancedStartDependencies } from '../../type';
+import {
+  checkPersistedSessionsProgress,
+  SEARCH_SESSIONS_TASK_ID,
+  SEARCH_SESSIONS_TASK_TYPE,
+} from './check_persisted_sessions';
+import {
+  SEARCH_SESSIONS_CLEANUP_TASK_TYPE,
+  checkNonPersistedSessions,
+  SEARCH_SESSIONS_CLEANUP_TASK_ID,
+} from './check_non_persiseted_sessions';
+import {
+  SEARCH_SESSIONS_EXPIRE_TASK_TYPE,
+  SEARCH_SESSIONS_EXPIRE_TASK_ID,
+  checkPersistedCompletedSessionExpiration,
+} from './expire_persisted_sessions';
 
 export interface SearchSessionDependencies {
   savedObjectsClient: SavedObjectsClientContract;
@@ -89,11 +104,35 @@ export class SearchSessionService
   }
 
   public setup(core: CoreSetup<DataEnhancedStartDependencies>, deps: SetupDependencies) {
-    registerSearchSessionsTask(core, {
+    const taskDeps = {
       config: this.config,
       taskManager: deps.taskManager,
       logger: this.logger,
-    });
+    };
+
+    registerSearchSessionsTask(
+      core,
+      taskDeps,
+      SEARCH_SESSIONS_TASK_TYPE,
+      'persisted session progress',
+      checkPersistedSessionsProgress
+    );
+
+    registerSearchSessionsTask(
+      core,
+      taskDeps,
+      SEARCH_SESSIONS_CLEANUP_TASK_TYPE,
+      'non persisted session cleanup',
+      checkNonPersistedSessions
+    );
+
+    registerSearchSessionsTask(
+      core,
+      taskDeps,
+      SEARCH_SESSIONS_EXPIRE_TASK_TYPE,
+      'complete session expiration',
+      checkPersistedCompletedSessionExpiration
+    );
   }
 
   public async start(core: CoreStart, deps: StartDependencies) {
@@ -103,14 +142,37 @@ export class SearchSessionService
   public stop() {}
 
   private setupMonitoring = async (core: CoreStart, deps: StartDependencies) => {
+    const taskDeps = {
+      config: this.config,
+      taskManager: deps.taskManager,
+      logger: this.logger,
+    };
+
     if (this.sessionConfig.enabled) {
-      scheduleSearchSessionsTasks(
-        deps.taskManager,
-        this.logger,
+      scheduleSearchSessionsTask(
+        taskDeps,
+        SEARCH_SESSIONS_TASK_ID,
+        SEARCH_SESSIONS_TASK_TYPE,
         this.sessionConfig.trackingInterval
       );
+
+      scheduleSearchSessionsTask(
+        taskDeps,
+        SEARCH_SESSIONS_CLEANUP_TASK_ID,
+        SEARCH_SESSIONS_CLEANUP_TASK_TYPE,
+        this.sessionConfig.cleanupInterval
+      );
+
+      scheduleSearchSessionsTask(
+        taskDeps,
+        SEARCH_SESSIONS_EXPIRE_TASK_ID,
+        SEARCH_SESSIONS_EXPIRE_TASK_TYPE,
+        this.sessionConfig.expireInterval
+      );
     } else {
-      unscheduleSearchSessionsTask(deps.taskManager, this.logger);
+      unscheduleSearchSessionsTask(taskDeps, SEARCH_SESSIONS_TASK_ID);
+      unscheduleSearchSessionsTask(taskDeps, SEARCH_SESSIONS_CLEANUP_TASK_ID);
+      unscheduleSearchSessionsTask(taskDeps, SEARCH_SESSIONS_EXPIRE_TASK_ID);
     }
   };
 
diff --git a/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
new file mode 100644
index 0000000000000..a4c9b6039ff64
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
@@ -0,0 +1,121 @@
+/*
+ * 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 { Duration } from 'moment';
+import { filter, takeUntil } from 'rxjs/operators';
+import { BehaviorSubject } from 'rxjs';
+import { RunContext, TaskRunCreatorFunction } from '../../../../task_manager/server';
+import { CoreSetup, SavedObjectsClient } from '../../../../../../src/core/server';
+import { SEARCH_SESSION_TYPE } from '../../../../../../src/plugins/data/common';
+import { DataEnhancedStartDependencies } from '../../type';
+import {
+  SearchSessionTaskSetupDeps,
+  SearchSessionTaskStartDeps,
+  SearchSessionTaskFn,
+} from './types';
+
+export function searchSessionTaskRunner(
+  core: CoreSetup<DataEnhancedStartDependencies>,
+  deps: SearchSessionTaskSetupDeps,
+  title: string,
+  checkFn: SearchSessionTaskFn
+): TaskRunCreatorFunction {
+  const { logger, config } = deps;
+  return ({ taskInstance }: RunContext) => {
+    const aborted$ = new BehaviorSubject<boolean>(false);
+    return {
+      async run() {
+        try {
+          const sessionConfig = config.search.sessions;
+          const [coreStart] = await core.getStartServices();
+          if (!sessionConfig.enabled) {
+            logger.debug(`Search sessions are disabled. Skipping task ${title}.`);
+            return;
+          }
+          if (aborted$.getValue()) return;
+
+          const internalRepo = coreStart.savedObjects.createInternalRepository([
+            SEARCH_SESSION_TYPE,
+          ]);
+          const internalSavedObjectsClient = new SavedObjectsClient(internalRepo);
+          await checkFn(
+            {
+              logger,
+              client: coreStart.elasticsearch.client.asInternalUser,
+              savedObjectsClient: internalSavedObjectsClient,
+            },
+            sessionConfig
+          )
+            .pipe(takeUntil(aborted$.pipe(filter((aborted) => aborted))))
+            .toPromise();
+
+          return {
+            state: {},
+          };
+        } catch (e) {
+          logger.error(`An error occurred. Skipping task ${title}.`);
+        }
+      },
+      cancel: async () => {
+        aborted$.next(true);
+      },
+    };
+  };
+}
+
+export function registerSearchSessionsTask(
+  core: CoreSetup<DataEnhancedStartDependencies>,
+  deps: SearchSessionTaskSetupDeps,
+  taskType: string,
+  title: string,
+  checkFn: SearchSessionTaskFn
+) {
+  deps.taskManager.registerTaskDefinitions({
+    [taskType]: {
+      title,
+      createTaskRunner: searchSessionTaskRunner(core, deps, title, checkFn),
+      timeout: `${deps.config.search.sessions.monitoringTaskTimeout.asSeconds()}s`,
+    },
+  });
+}
+
+export async function unscheduleSearchSessionsTask(
+  { taskManager, logger }: SearchSessionTaskStartDeps,
+  taskId: string
+) {
+  try {
+    await taskManager.removeIfExists(taskId);
+    logger.debug(`${taskId} cleared`);
+  } catch (e) {
+    logger.error(`${taskId} Error clearing task ${e.message}`);
+  }
+}
+
+export async function scheduleSearchSessionsTask(
+  { taskManager, logger }: SearchSessionTaskStartDeps,
+  taskId: string,
+  taskType: string,
+  interval: Duration
+) {
+  await taskManager.removeIfExists(taskId);
+
+  try {
+    await taskManager.ensureScheduled({
+      id: taskId,
+      taskType,
+      schedule: {
+        interval: `${interval.asSeconds()}s`,
+      },
+      state: {},
+      params: {},
+    });
+
+    logger.debug(`${taskId} scheduled to run`);
+  } catch (e) {
+    logger.error(`${taskId} Error scheduling task ${e.message}`);
+  }
+}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/types.ts b/x-pack/plugins/data_enhanced/server/search/session/types.ts
index 0fa384e55f7d7..eadc3821c1043 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/types.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/types.ts
@@ -5,6 +5,18 @@
  * 2.0.
  */
 
+import {
+  ElasticsearchClient,
+  Logger,
+  SavedObjectsClientContract,
+  SavedObjectsFindResponse,
+} from 'kibana/server';
+import { Observable } from 'rxjs';
+import { KueryNode, SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '../../../../../../x-pack/plugins/task_manager/server';
 import { ConfigSchema } from '../../../config';
 
 export enum SearchStatus {
@@ -14,3 +26,38 @@ export enum SearchStatus {
 }
 
 export type SearchSessionsConfig = ConfigSchema['search']['sessions'];
+
+export interface CheckSearchSessionsDeps {
+  savedObjectsClient: SavedObjectsClientContract;
+  client: ElasticsearchClient;
+  logger: Logger;
+}
+
+export interface SearchSessionTaskSetupDeps {
+  taskManager: TaskManagerSetupContract;
+  logger: Logger;
+  config: ConfigSchema;
+}
+
+export interface SearchSessionTaskStartDeps {
+  taskManager: TaskManagerStartContract;
+  logger: Logger;
+  config: ConfigSchema;
+}
+
+export type SearchSessionTaskFn = (
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig
+) => Observable<void>;
+
+export type SearchSessionsResponse = SavedObjectsFindResponse<
+  SearchSessionSavedObjectAttributes,
+  unknown
+>;
+
+export type CheckSearchSessionsFn = (
+  deps: CheckSearchSessionsDeps,
+  config: SearchSessionsConfig,
+  filter: KueryNode,
+  page: number
+) => Observable<SearchSessionsResponse>;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
new file mode 100644
index 0000000000000..485a30fd54951
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
@@ -0,0 +1,323 @@
+/*
+ * 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 { bulkUpdateSessions, updateSessionStatus } from './update_session_status';
+import {
+  SearchSessionStatus,
+  SearchSessionSavedObjectAttributes,
+} from '../../../../../../src/plugins/data/common';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchStatus } from './types';
+import moment from 'moment';
+import {
+  SavedObjectsBulkUpdateObject,
+  SavedObjectsClientContract,
+  SavedObjectsFindResult,
+} from '../../../../../../src/core/server';
+
+describe('bulkUpdateSessions', () => {
+  let mockClient: any;
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  const mockLogger: any = {
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  };
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    mockClient = {
+      asyncSearch: {
+        status: jest.fn(),
+        delete: jest.fn(),
+      },
+      eql: {
+        status: jest.fn(),
+        delete: jest.fn(),
+      },
+    };
+  });
+
+  describe('updateSessionStatus', () => {
+    test('updates expired session', async () => {
+      const so: SavedObjectsFindResult<SearchSessionSavedObjectAttributes> = {
+        id: '123',
+        attributes: {
+          persisted: false,
+          status: SearchSessionStatus.IN_PROGRESS,
+          expires: moment().subtract(moment.duration(5, 'd')),
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+
+      const updated = await updateSessionStatus(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        so
+      );
+
+      expect(updated).toBeTruthy();
+      expect(so.attributes.status).toBe(SearchSessionStatus.EXPIRED);
+    });
+
+    test('does nothing if the search is still running', async () => {
+      const so = {
+        id: '123',
+        attributes: {
+          persisted: false,
+          status: SearchSessionStatus.IN_PROGRESS,
+          created: moment().subtract(moment.duration(3, 'm')),
+          touched: moment().subtract(moment.duration(10, 's')),
+          expires: moment().add(moment.duration(5, 'd')),
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+
+      mockClient.asyncSearch.status.mockResolvedValue({
+        body: {
+          is_partial: true,
+          is_running: true,
+        },
+      });
+
+      const updated = await updateSessionStatus(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        so
+      );
+
+      expect(updated).toBeFalsy();
+      expect(so.attributes.status).toBe(SearchSessionStatus.IN_PROGRESS);
+    });
+
+    test("doesn't re-check completed or errored searches", async () => {
+      const so = {
+        id: '123',
+        attributes: {
+          expires: moment().add(moment.duration(5, 'd')),
+          status: SearchSessionStatus.ERROR,
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.COMPLETE,
+            },
+            'another-search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.ERROR,
+            },
+          },
+        },
+      } as any;
+
+      const updated = await updateSessionStatus(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        so
+      );
+
+      expect(updated).toBeFalsy();
+      expect(mockClient.asyncSearch.status).not.toBeCalled();
+    });
+
+    test('updates to complete if the search is done', async () => {
+      savedObjectsClient.bulkUpdate = jest.fn();
+      const so = {
+        attributes: {
+          status: SearchSessionStatus.IN_PROGRESS,
+          touched: '123',
+          expires: moment().add(moment.duration(5, 'd')),
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+      mockClient.asyncSearch.status.mockResolvedValue({
+        body: {
+          is_partial: false,
+          is_running: false,
+          completion_status: 200,
+        },
+      });
+
+      const updated = await updateSessionStatus(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        so
+      );
+
+      expect(updated).toBeTruthy();
+
+      expect(mockClient.asyncSearch.status).toBeCalledWith({ id: 'search-id' });
+      expect(so.attributes.status).toBe(SearchSessionStatus.COMPLETE);
+      expect(so.attributes.status).toBe(SearchSessionStatus.COMPLETE);
+      expect(so.attributes.touched).not.toBe('123');
+      expect(so.attributes.completed).not.toBeUndefined();
+      expect(so.attributes.idMapping['search-hash'].status).toBe(SearchStatus.COMPLETE);
+      expect(so.attributes.idMapping['search-hash'].error).toBeUndefined();
+    });
+
+    test('updates to error if the search is errored', async () => {
+      savedObjectsClient.bulkUpdate = jest.fn();
+      const so = {
+        attributes: {
+          expires: moment().add(moment.duration(5, 'd')),
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+
+      mockClient.asyncSearch.status.mockResolvedValue({
+        body: {
+          is_partial: false,
+          is_running: false,
+          completion_status: 500,
+        },
+      });
+
+      const updated = await updateSessionStatus(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        so
+      );
+
+      expect(updated).toBeTruthy();
+      expect(so.attributes.status).toBe(SearchSessionStatus.ERROR);
+      expect(so.attributes.touched).not.toBe('123');
+      expect(so.attributes.idMapping['search-hash'].status).toBe(SearchStatus.ERROR);
+      expect(so.attributes.idMapping['search-hash'].error).toBe(
+        'Search completed with a 500 status'
+      );
+    });
+  });
+
+  describe('bulkUpdateSessions', () => {
+    test('does nothing if there are no open sessions', async () => {
+      await bulkUpdateSessions(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        []
+      );
+
+      expect(savedObjectsClient.bulkUpdate).not.toBeCalled();
+      expect(savedObjectsClient.delete).not.toBeCalled();
+    });
+
+    test('updates in space', async () => {
+      const so = {
+        namespaces: ['awesome'],
+        attributes: {
+          expires: moment().add(moment.duration(5, 'd')),
+          status: SearchSessionStatus.IN_PROGRESS,
+          touched: '123',
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+
+      savedObjectsClient.bulkUpdate = jest.fn().mockResolvedValue({
+        saved_objects: [so],
+      });
+
+      await bulkUpdateSessions(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        [so]
+      );
+
+      const [updateInput] = savedObjectsClient.bulkUpdate.mock.calls[0];
+      const updatedAttributes = updateInput[0] as SavedObjectsBulkUpdateObject;
+      expect(updatedAttributes.namespace).toBe('awesome');
+    });
+
+    test('logs failures', async () => {
+      const so = {
+        namespaces: ['awesome'],
+        attributes: {
+          expires: moment().add(moment.duration(5, 'd')),
+          status: SearchSessionStatus.IN_PROGRESS,
+          touched: '123',
+          idMapping: {
+            'search-hash': {
+              id: 'search-id',
+              strategy: 'cool',
+              status: SearchStatus.IN_PROGRESS,
+            },
+          },
+        },
+      } as any;
+
+      savedObjectsClient.bulkUpdate = jest.fn().mockResolvedValue({
+        saved_objects: [
+          {
+            error: 'nope',
+          },
+        ],
+      });
+
+      await bulkUpdateSessions(
+        {
+          savedObjectsClient,
+          client: mockClient,
+          logger: mockLogger,
+        },
+        [so]
+      );
+
+      expect(savedObjectsClient.bulkUpdate).toBeCalledTimes(1);
+      expect(mockLogger.error).toBeCalledTimes(1);
+    });
+  });
+});
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
new file mode 100644
index 0000000000000..1c484467bef63
--- /dev/null
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
@@ -0,0 +1,128 @@
+/*
+ * 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 { SavedObjectsFindResult, SavedObjectsUpdateResponse } from 'kibana/server';
+import {
+  SearchSessionRequestInfo,
+  SearchSessionSavedObjectAttributes,
+  SearchSessionStatus,
+} from '../../../../../../src/plugins/data/common';
+import { getSearchStatus } from './get_search_status';
+import { getSessionStatus } from './get_session_status';
+import { CheckSearchSessionsDeps, SearchSessionsResponse, SearchStatus } from './types';
+import { isSearchSessionExpired } from './utils';
+
+export async function updateSessionStatus(
+  { logger, client }: CheckSearchSessionsDeps,
+  session: SavedObjectsFindResult<SearchSessionSavedObjectAttributes>
+) {
+  let sessionUpdated = false;
+  const isExpired = isSearchSessionExpired(session);
+
+  if (!isExpired) {
+    // Check statuses of all running searches
+    await Promise.all(
+      Object.keys(session.attributes.idMapping).map(async (searchKey: string) => {
+        const updateSearchRequest = (
+          currentStatus: Pick<SearchSessionRequestInfo, 'status' | 'error'>
+        ) => {
+          sessionUpdated = true;
+          session.attributes.idMapping[searchKey] = {
+            ...session.attributes.idMapping[searchKey],
+            ...currentStatus,
+          };
+        };
+
+        const searchInfo = session.attributes.idMapping[searchKey];
+        if (searchInfo.status === SearchStatus.IN_PROGRESS) {
+          try {
+            const currentStatus = await getSearchStatus(client, searchInfo.id);
+
+            if (currentStatus.status !== searchInfo.status) {
+              logger.debug(`search ${searchInfo.id} | status changed to ${currentStatus.status}`);
+              updateSearchRequest(currentStatus);
+            }
+          } catch (e) {
+            logger.error(e);
+            updateSearchRequest({
+              status: SearchStatus.ERROR,
+              error: e.message || e.meta.error?.caused_by?.reason,
+            });
+          }
+        }
+      })
+    );
+  }
+
+  // And only then derive the session's status
+  const sessionStatus = isExpired
+    ? SearchSessionStatus.EXPIRED
+    : getSessionStatus(session.attributes);
+  if (sessionStatus !== session.attributes.status) {
+    const now = new Date().toISOString();
+    session.attributes.status = sessionStatus;
+    session.attributes.touched = now;
+    if (sessionStatus === SearchSessionStatus.COMPLETE) {
+      session.attributes.completed = now;
+    } else if (session.attributes.completed) {
+      session.attributes.completed = null;
+    }
+    sessionUpdated = true;
+  }
+
+  return sessionUpdated;
+}
+
+export async function getAllSessionsStatusUpdates(
+  deps: CheckSearchSessionsDeps,
+  searchSessions: SearchSessionsResponse
+) {
+  const updatedSessions = new Array<SavedObjectsFindResult<SearchSessionSavedObjectAttributes>>();
+
+  await Promise.all(
+    searchSessions.saved_objects.map(async (session) => {
+      const updated = await updateSessionStatus(deps, session);
+
+      if (updated) {
+        updatedSessions.push(session);
+      }
+    })
+  );
+
+  return updatedSessions;
+}
+
+export async function bulkUpdateSessions(
+  { logger, savedObjectsClient }: CheckSearchSessionsDeps,
+  updatedSessions: Array<SavedObjectsFindResult<SearchSessionSavedObjectAttributes>>
+) {
+  if (updatedSessions.length) {
+    // If there's an error, we'll try again in the next iteration, so there's no need to check the output.
+    const updatedResponse = await savedObjectsClient.bulkUpdate<SearchSessionSavedObjectAttributes>(
+      updatedSessions.map((session) => ({
+        ...session,
+        namespace: session.namespaces?.[0],
+      }))
+    );
+
+    const success: Array<SavedObjectsUpdateResponse<SearchSessionSavedObjectAttributes>> = [];
+    const fail: Array<SavedObjectsUpdateResponse<SearchSessionSavedObjectAttributes>> = [];
+
+    updatedResponse.saved_objects.forEach((savedObjectResponse) => {
+      if ('error' in savedObjectResponse) {
+        fail.push(savedObjectResponse);
+        logger.error(
+          `Error while updating search session ${savedObjectResponse?.id}: ${savedObjectResponse.error?.message}`
+        );
+      } else {
+        success.push(savedObjectResponse);
+      }
+    });
+
+    logger.debug(`Updating search sessions: success: ${success.length}, fail: ${fail.length}`);
+  }
+}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/utils.ts b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
index 7b1f1a7564626..55c875602694f 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/utils.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
@@ -7,6 +7,9 @@
 
 import { createHash } from 'crypto';
 import stringify from 'json-stable-stringify';
+import { SavedObjectsFindResult } from 'kibana/server';
+import moment from 'moment';
+import { SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
 
 /**
  * Generate the hash for this request so that, in the future, this hash can be used to look up
@@ -17,3 +20,9 @@ export function createRequestHash(keys: Record<any, any>) {
   const { preference, ...params } = keys;
   return createHash(`sha256`).update(stringify(params)).digest('hex');
 }
+
+export function isSearchSessionExpired(
+  session: SavedObjectsFindResult<SearchSessionSavedObjectAttributes>
+) {
+  return moment(session.attributes.expires).isBefore(moment());
+}
diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
index 6708a6d55f402..550148531e2ec 100644
--- a/x-pack/test/api_integration/config.ts
+++ b/x-pack/test/api_integration/config.ts
@@ -33,6 +33,7 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi
         '--xpack.data_enhanced.search.sessions.enabled=true', // enable WIP send to background UI
         '--xpack.data_enhanced.search.sessions.notTouchedTimeout=15s', // shorten notTouchedTimeout for quicker testing
         '--xpack.data_enhanced.search.sessions.trackingInterval=5s', // shorten trackingInterval for quicker testing
+        '--xpack.data_enhanced.search.sessions.cleanupInterval=5s', // shorten cleanupInterval for quicker testing
       ],
     },
     esTestCluster: {

From 6a1e4b8d4de7f50b3f2e42d2d44381ff120fd37a Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Thu, 24 Jun 2021 10:58:18 +0200
Subject: [PATCH 24/95] [ML] Functional tests - fix and re-enable close_jobs
 API tests (#103114)

This PR fixes and re-enables the close_jobs API tests after a backend change.
---
 .../apis/ml/jobs/close_jobs.ts                | 273 ++++++++----------
 1 file changed, 124 insertions(+), 149 deletions(-)

diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
index 4c639d3a166cd..40485205f9fb5 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
@@ -20,68 +20,6 @@ export default ({ getService }: FtrProviderContext) => {
 
   const testSetupJobConfigs = [SINGLE_METRIC_JOB_CONFIG, MULTI_METRIC_JOB_CONFIG];
 
-  const testDataList = [
-    {
-      testTitle: 'as ML Poweruser',
-      user: USER.ML_POWERUSER,
-      requestBody: {
-        jobIds: [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id],
-      },
-      expected: {
-        responseCode: 200,
-        responseBody: {
-          [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: true },
-          [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: true },
-        },
-      },
-    },
-  ];
-
-  const testDataListFailed = [
-    {
-      testTitle: 'as ML Poweruser',
-      user: USER.ML_POWERUSER,
-      requestBody: {
-        jobIds: [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id],
-      },
-      expected: {
-        responseCode: 200,
-
-        responseBody: {
-          [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { status: 409 } },
-          [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { status: 409 } },
-        },
-      },
-    },
-  ];
-
-  const testDataListUnauthorized = [
-    {
-      testTitle: 'as ML Unauthorized user',
-      user: USER.ML_UNAUTHORIZED,
-      requestBody: {
-        jobIds: [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id],
-      },
-      // Note that the jobs and datafeeds are loaded async so the actual error message is not deterministic.
-      expected: {
-        responseCode: 403,
-        error: 'Forbidden',
-      },
-    },
-    {
-      testTitle: 'as ML Viewer',
-      user: USER.ML_VIEWER,
-      requestBody: {
-        jobIds: [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id],
-      },
-      // Note that the jobs and datafeeds are loaded async so the actual error message is not deterministic.
-      expected: {
-        responseCode: 403,
-        error: 'Forbidden',
-      },
-    },
-  ];
-
   async function runCloseJobsRequest(
     user: USER,
     requestBody: object,
@@ -97,19 +35,22 @@ export default ({ getService }: FtrProviderContext) => {
     return body;
   }
 
-  // failing ES snapshot promotion after backend change, see https://github.com/elastic/kibana/issues/103023
-  describe.skip('close_jobs', function () {
+  async function startDatafeedsInRealtime() {
+    for (const job of testSetupJobConfigs) {
+      const datafeedId = `datafeed-${job.job_id}`;
+      await ml.api.startDatafeed(datafeedId, { start: '0' });
+      await ml.api.waitForDatafeedState(datafeedId, DATAFEED_STATE.STARTED);
+    }
+  }
+
+  describe('close_jobs', function () {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
-    after(async () => {
-      await ml.api.cleanMlIndices();
-    });
-
-    it('sets up jobs', async () => {
+    beforeEach(async () => {
       for (const job of testSetupJobConfigs) {
         const datafeedId = `datafeed-${job.job_id}`;
         await ml.api.createAnomalyDetectionJob(job);
@@ -119,98 +60,132 @@ export default ({ getService }: FtrProviderContext) => {
           datafeed_id: datafeedId,
           job_id: job.job_id,
         });
-        await ml.api.startDatafeed(datafeedId, { start: '0' });
-        await ml.api.waitForDatafeedState(datafeedId, DATAFEED_STATE.STARTED);
       }
     });
 
-    describe('rejects request', function () {
-      for (const testData of testDataListUnauthorized) {
-        describe('fails to close job ID supplied', function () {
-          it(`${testData.testTitle}`, async () => {
-            const body = await runCloseJobsRequest(
-              testData.user,
-              testData.requestBody,
-              testData.expected.responseCode
-            );
-
-            expect(body).to.have.property('error').eql(testData.expected.error);
-
-            // ensure jobs are still open
-            for (const id of testData.requestBody.jobIds) {
-              await ml.api.waitForJobState(id, JOB_STATE.OPENED);
-            }
-          });
-        });
+    afterEach(async () => {
+      for (const job of testSetupJobConfigs) {
+        await ml.api.deleteAnomalyDetectionJobES(job.job_id);
       }
+      await ml.api.cleanMlIndices();
     });
 
-    describe('close jobs fail because they are running', function () {
-      for (const testData of testDataListFailed) {
-        it(`${testData.testTitle}`, async () => {
-          const body = await runCloseJobsRequest(
-            testData.user,
-            testData.requestBody,
-            testData.expected.responseCode
-          );
-          const expectedResponse = testData.expected.responseBody;
-          const expectedRspJobIds = Object.keys(expectedResponse).sort((a, b) =>
-            a.localeCompare(b)
-          );
-          const actualRspJobIds = Object.keys(body).sort((a, b) => a.localeCompare(b));
-
-          expect(actualRspJobIds).to.have.length(expectedRspJobIds.length);
-          expect(actualRspJobIds).to.eql(expectedRspJobIds);
-
-          expectedRspJobIds.forEach((id) => {
-            expect(body[id].closed).to.eql(testData.expected.responseBody[id].closed);
-            expect(body[id].error.status).to.eql(testData.expected.responseBody[id].error.status);
-          });
-
-          // ensure jobs are still open
-          for (const id of testData.requestBody.jobIds) {
-            await ml.api.waitForJobState(id, JOB_STATE.OPENED);
-          }
-        });
+    it('rejects request for ML Unauthorized user', async () => {
+      await startDatafeedsInRealtime();
+
+      const jobIds = [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id];
+      const body = await runCloseJobsRequest(USER.ML_UNAUTHORIZED, { jobIds }, 403);
+
+      expect(body).to.have.property('error').eql('Forbidden');
+
+      // ensure jobs are still open
+      for (const id of jobIds) {
+        await ml.api.waitForJobState(id, JOB_STATE.OPENED);
+      }
+    });
+
+    it('rejects request for ML Viewer user', async () => {
+      await startDatafeedsInRealtime();
+
+      const jobIds = [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id];
+      const body = await runCloseJobsRequest(USER.ML_VIEWER, { jobIds }, 403);
+
+      expect(body).to.have.property('error').eql('Forbidden');
+
+      // ensure jobs are still open
+      for (const id of jobIds) {
+        await ml.api.waitForJobState(id, JOB_STATE.OPENED);
+      }
+    });
+
+    it('succeeds for ML Poweruser with datafeed started', async () => {
+      await startDatafeedsInRealtime();
+
+      const jobIds = [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id];
+      const body = await runCloseJobsRequest(USER.ML_POWERUSER, { jobIds }, 200);
+
+      const expectedRspBody = {
+        [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: true },
+        [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: true },
+      };
+      const expectedRspJobIds = Object.keys(expectedRspBody).sort((a, b) => a.localeCompare(b));
+      const actualRspJobIds = Object.keys(body).sort((a, b) => a.localeCompare(b));
+
+      expect(actualRspJobIds).to.have.length(expectedRspJobIds.length);
+      expect(actualRspJobIds).to.eql(expectedRspJobIds);
+
+      expectedRspJobIds.forEach((id) => {
+        expect(body[id].closed).to.eql(expectedRspBody[id].closed);
+      });
+
+      // datafeeds should be stopped automatically
+      for (const id of jobIds) {
+        await ml.api.waitForDatafeedState(`datafeed-${id}`, DATAFEED_STATE.STOPPED);
+      }
+
+      // ensure jobs are actually closed
+      for (const id of jobIds) {
+        await ml.api.waitForJobState(id, JOB_STATE.CLOSED);
       }
     });
 
-    describe('stops datafeeds', function () {
-      it('stops datafeeds', async () => {
-        for (const job of testSetupJobConfigs) {
-          const datafeedId = `datafeed-${job.job_id}`;
-          await ml.api.stopDatafeed(datafeedId);
-          await ml.api.waitForDatafeedState(datafeedId, DATAFEED_STATE.STOPPED);
-        }
+    it('succeeds for ML Poweruser with datafeed stopped', async () => {
+      const jobIds = [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id];
+      const body = await runCloseJobsRequest(USER.ML_POWERUSER, { jobIds }, 200);
+
+      const expectedRspBody = {
+        [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: true },
+        [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: true },
+      };
+      const expectedRspJobIds = Object.keys(expectedRspBody).sort((a, b) => a.localeCompare(b));
+      const actualRspJobIds = Object.keys(body).sort((a, b) => a.localeCompare(b));
+
+      expect(actualRspJobIds).to.have.length(expectedRspJobIds.length);
+      expect(actualRspJobIds).to.eql(expectedRspJobIds);
+
+      expectedRspJobIds.forEach((id) => {
+        expect(body[id].closed).to.eql(expectedRspBody[id].closed);
       });
+
+      // datafeeds should still be stopped
+      for (const id of jobIds) {
+        await ml.api.waitForDatafeedState(`datafeed-${id}`, DATAFEED_STATE.STOPPED);
+      }
+
+      // ensure jobs are actually closed
+      for (const id of jobIds) {
+        await ml.api.waitForJobState(id, JOB_STATE.CLOSED);
+      }
     });
 
-    describe('close jobs succeed', function () {
-      for (const testData of testDataList) {
-        it(`${testData.testTitle}`, async () => {
-          const body = await runCloseJobsRequest(
-            testData.user,
-            testData.requestBody,
-            testData.expected.responseCode
-          );
-          const expectedResponse = testData.expected.responseBody;
-          const expectedRspJobIds = Object.keys(expectedResponse).sort((a, b) =>
-            a.localeCompare(b)
-          );
-          const actualRspJobIds = Object.keys(body).sort((a, b) => a.localeCompare(b));
-
-          expect(actualRspJobIds).to.have.length(expectedRspJobIds.length);
-          expect(actualRspJobIds).to.eql(expectedRspJobIds);
-
-          expectedRspJobIds.forEach((id) => {
-            expect(body[id].closed).to.eql(testData.expected.responseBody[id].closed);
-          });
-
-          // ensure jobs are now closed
-          for (const id of testData.requestBody.jobIds) {
-            await ml.api.waitForJobState(id, JOB_STATE.CLOSED);
-          }
-        });
+    it('succeeds for ML Poweruser with job already closed', async () => {
+      const jobIds = [SINGLE_METRIC_JOB_CONFIG.job_id, MULTI_METRIC_JOB_CONFIG.job_id];
+      await runCloseJobsRequest(USER.ML_POWERUSER, { jobIds }, 200);
+
+      const body = await runCloseJobsRequest(USER.ML_POWERUSER, { jobIds }, 200);
+
+      const expectedRspBody = {
+        [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: true },
+        [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: true },
+      };
+      const expectedRspJobIds = Object.keys(expectedRspBody).sort((a, b) => a.localeCompare(b));
+      const actualRspJobIds = Object.keys(body).sort((a, b) => a.localeCompare(b));
+
+      expect(actualRspJobIds).to.have.length(expectedRspJobIds.length);
+      expect(actualRspJobIds).to.eql(expectedRspJobIds);
+
+      expectedRspJobIds.forEach((id) => {
+        expect(body[id].closed).to.eql(expectedRspBody[id].closed);
+      });
+
+      // datafeeds should still be stopped
+      for (const id of jobIds) {
+        await ml.api.waitForDatafeedState(`datafeed-${id}`, DATAFEED_STATE.STOPPED);
+      }
+
+      // jobs should still be closed
+      for (const id of jobIds) {
+        await ml.api.waitForJobState(id, JOB_STATE.CLOSED);
       }
     });
   });

From 8298b78a62fddda129e91323e2771b1039929671 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 24 Jun 2021 11:23:41 +0200
Subject: [PATCH 25/95] [Discover] Unskip and improve sidebar filter functional
 test (#102986)

---
 test/functional/apps/discover/_sidebar.ts     | 3 +--
 test/functional/page_objects/discover_page.ts | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/functional/apps/discover/_sidebar.ts b/test/functional/apps/discover/_sidebar.ts
index 8179f4e44e8b8..d8701261126c4 100644
--- a/test/functional/apps/discover/_sidebar.ts
+++ b/test/functional/apps/discover/_sidebar.ts
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
   const testSubjects = getService('testSubjects');
 
-  // Failing: See https://github.com/elastic/kibana/issues/101449
-  describe.skip('discover sidebar', function describeIndexTests() {
+  describe('discover sidebar', function describeIndexTests() {
     before(async function () {
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 65b899d2e2fb0..dc3a04568316e 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -448,7 +448,10 @@ export class DiscoverPageObject extends FtrService {
 
   public async closeSidebarFieldFilter() {
     await this.testSubjects.click('toggleFieldFilterButton');
-    await this.testSubjects.missingOrFail('filterSelectionPanel');
+
+    await this.retry.waitFor('sidebar filter closed', async () => {
+      return !(await this.testSubjects.exists('filterSelectionPanel'));
+    });
   }
 
   public async waitForChartLoadingComplete(renderCount: number) {

From 507ab0e8d042d80c7ad56160416bc1abf404b8ab Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 24 Jun 2021 11:29:23 +0200
Subject: [PATCH 26/95] [Discover] Add right permission for unmapped field test
 in cloud env (#102853)

---
 .../_indexpattern_with_unmapped_fields.ts         | 15 ++++++++++-----
 test/functional/config.js                         | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
index e986429a15d26..264885490cdfc 100644
--- a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
+++ b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
@@ -12,26 +12,31 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const log = getService('log');
+  const security = getService('security');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'timePicker', 'discover']);
 
   describe('index pattern with unmapped fields', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/unmapped_fields');
+      await security.testUser.setRoles(['kibana_admin', 'test-index-unmapped-fields']);
+      const fromTime = 'Jan 20, 2021 @ 00:00:00.000';
+      const toTime = 'Jan 25, 2021 @ 00:00:00.000';
+
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'test-index-unmapped-fields',
         'discover:searchFieldsFromSource': false,
+        'timepicker:timeDefaults': `{ "from": "${fromTime}", "to": "${toTime}"}`,
       });
-      log.debug('discover');
-      const fromTime = 'Jan 20, 2021 @ 00:00:00.000';
-      const toTime = 'Jan 25, 2021 @ 00:00:00.000';
+
       await PageObjects.common.navigateToApp('discover');
-      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
     });
 
     after(async () => {
       await esArchiver.unload('test/functional/fixtures/es_archiver/unmapped_fields');
+      await kibanaServer.uiSettings.unset('defaultIndex');
+      await kibanaServer.uiSettings.unset('discover:searchFieldsFromSource');
+      await kibanaServer.uiSettings.unset('timepicker:timeDefaults');
     });
 
     it('unmapped fields exist on a new saved search', async () => {
diff --git a/test/functional/config.js b/test/functional/config.js
index bab1148cf372a..b28a9fd36c1c0 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -292,6 +292,21 @@ export default async function ({ readConfigFile }) {
           kibana: [],
         },
 
+        'test-index-unmapped-fields': {
+          elasticsearch: {
+            cluster: [],
+            indices: [
+              {
+                names: ['test-index-unmapped-fields'],
+                privileges: ['read', 'view_index_metadata'],
+                field_security: { grant: ['*'], except: [] },
+              },
+            ],
+            run_as: [],
+          },
+          kibana: [],
+        },
+
         animals: {
           elasticsearch: {
             cluster: [],

From 1d2cebafd22017c9e6998c675b6010967fe9505a Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Thu, 24 Jun 2021 12:33:35 +0300
Subject: [PATCH 27/95] [VisTypePie] Use a different advanced setting for pie
 charts (#103049)

* Different switch for pie

* Remove unused translations

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/management/advanced-options.asciidoc     |  3 +
 .../server/collectors/management/schema.ts    |  4 ++
 .../server/collectors/management/types.ts     |  1 +
 src/plugins/telemetry/schema/oss_plugins.json |  6 ++
 src/plugins/vis_type_pie/common/index.ts      |  1 +
 src/plugins/vis_type_pie/kibana.json          |  2 +
 src/plugins/vis_type_pie/public/plugin.ts     |  4 +-
 src/plugins/vis_type_pie/server/index.ts      | 10 ++++
 src/plugins/vis_type_pie/server/plugin.ts     | 56 +++++++++++++++++++
 src/plugins/vis_type_vislib/public/plugin.ts  | 24 ++++----
 src/plugins/vis_type_xy/common/index.ts       |  2 +
 src/plugins/vis_type_xy/kibana.json           |  2 +
 src/plugins/vis_type_xy/public/plugin.ts      |  2 +-
 src/plugins/vis_type_xy/server/index.ts       | 10 ++++
 src/plugins/vis_type_xy/server/plugin.ts      | 56 +++++++++++++++++++
 .../visualizations/common/constants.ts        |  1 -
 src/plugins/visualizations/server/plugin.ts   | 23 +-------
 .../apps/dashboard/dashboard_state.ts         |  1 +
 test/functional/apps/dashboard/index.ts       |  2 +
 .../apps/getting_started/_shakespeare.ts      |  1 +
 test/functional/apps/getting_started/index.ts |  2 +
 test/functional/apps/visualize/index.ts       |  2 +
 test/functional/config.js                     |  1 +
 .../page_objects/visualize_chart_page.ts      |  3 +-
 .../functional/page_objects/visualize_page.ts |  1 +
 .../translations/translations/ja-JP.json      |  2 -
 .../translations/translations/zh-CN.json      |  2 -
 x-pack/test/functional/config.js              |  1 +
 28 files changed, 183 insertions(+), 42 deletions(-)
 create mode 100644 src/plugins/vis_type_pie/server/index.ts
 create mode 100644 src/plugins/vis_type_pie/server/plugin.ts
 create mode 100644 src/plugins/vis_type_xy/server/index.ts
 create mode 100644 src/plugins/vis_type_xy/server/plugin.ts

diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index 853180ec816e9..66a23ee189ae1 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -482,6 +482,9 @@ of buckets to try to represent.
 [[visualization-visualize-chartslibrary]]`visualization:visualize:legacyChartsLibrary`::
 Enables the legacy charts library for aggregation-based area, line, and bar charts in *Visualize*.
 
+[[visualization-visualize-pieChartslibrary]]`visualization:visualize:legacyPieChartsLibrary`::
+Enables the legacy charts library for aggregation-based pie charts in *Visualize*.
+
 [[visualization-colormapping]]`visualization:colorMapping`::
 **This setting is deprecated and will not be supported as of 8.0.**
 Maps values to specific colors in charts using the *Compatibility* palette.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index a6b79a9e2c009..ff637b6686612 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -396,6 +396,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
+  'visualization:visualize:legacyPieChartsLibrary': {
+    type: 'boolean',
+    _meta: { description: 'Non-default value of setting.' },
+  },
   'doc_table:legacy': {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
index 8448b359ce607..b59abc3aa7158 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -26,6 +26,7 @@ export interface UsageStats {
   'autocomplete:useTimeRange': boolean;
   'search:timeout': number;
   'visualization:visualize:legacyChartsLibrary': boolean;
+  'visualization:visualize:legacyPieChartsLibrary': boolean;
   'doc_table:legacy': boolean;
   'discover:modifyColumnsOnSwitch': boolean;
   'discover:searchFieldsFromSource': boolean;
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 99c6dcb40e57d..496335a3b0dc8 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -8594,6 +8594,12 @@
             "description": "Non-default value of setting."
           }
         },
+        "visualization:visualize:legacyPieChartsLibrary": {
+          "type": "boolean",
+          "_meta": {
+            "description": "Non-default value of setting."
+          }
+        },
         "doc_table:legacy": {
           "type": "boolean",
           "_meta": {
diff --git a/src/plugins/vis_type_pie/common/index.ts b/src/plugins/vis_type_pie/common/index.ts
index 1aa1680530b32..a02a2b2ba10f2 100644
--- a/src/plugins/vis_type_pie/common/index.ts
+++ b/src/plugins/vis_type_pie/common/index.ts
@@ -7,3 +7,4 @@
  */
 
 export const DEFAULT_PERCENT_DECIMALS = 2;
+export const LEGACY_PIE_CHARTS_LIBRARY = 'visualization:visualize:legacyPieChartsLibrary';
diff --git a/src/plugins/vis_type_pie/kibana.json b/src/plugins/vis_type_pie/kibana.json
index ee312fd19e8d5..eebefc42681b7 100644
--- a/src/plugins/vis_type_pie/kibana.json
+++ b/src/plugins/vis_type_pie/kibana.json
@@ -2,8 +2,10 @@
     "id": "visTypePie",
     "version": "kibana",
     "ui": true,
+    "server": true,
     "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection"],
     "requiredBundles": ["visDefaultEditor"],
+    "extraPublicDirs": ["common/index"],
     "owner": {
       "name": "Kibana App",
       "githubTeam": "kibana-app"
diff --git a/src/plugins/vis_type_pie/public/plugin.ts b/src/plugins/vis_type_pie/public/plugin.ts
index 440a3a75a2eb1..787f49c19aca3 100644
--- a/src/plugins/vis_type_pie/public/plugin.ts
+++ b/src/plugins/vis_type_pie/public/plugin.ts
@@ -12,7 +12,7 @@ import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
 import { ChartsPluginSetup } from '../../charts/public';
 import { UsageCollectionSetup } from '../../usage_collection/public';
 import { DataPublicPluginStart } from '../../data/public';
-import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
+import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 import { pieLabels as pieLabelsExpressionFunction } from './expression_functions/pie_labels';
 import { createPieVisFn } from './pie_fn';
 import { getPieVisRenderer } from './pie_renderer';
@@ -43,7 +43,7 @@ export class VisTypePiePlugin {
     core: CoreSetup<VisTypePiePluginStartDependencies>,
     { expressions, visualizations, charts, usageCollection }: VisTypePieSetupDependencies
   ) {
-    if (!core.uiSettings.get(LEGACY_CHARTS_LIBRARY, false)) {
+    if (!core.uiSettings.get(LEGACY_PIE_CHARTS_LIBRARY, false)) {
       const getStartDeps = async () => {
         const [coreStart, deps] = await core.getStartServices();
         return {
diff --git a/src/plugins/vis_type_pie/server/index.ts b/src/plugins/vis_type_pie/server/index.ts
new file mode 100644
index 0000000000000..201071fbb5fca
--- /dev/null
+++ b/src/plugins/vis_type_pie/server/index.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 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 { VisTypePieServerPlugin } from './plugin';
+
+export const plugin = () => new VisTypePieServerPlugin();
diff --git a/src/plugins/vis_type_pie/server/plugin.ts b/src/plugins/vis_type_pie/server/plugin.ts
new file mode 100644
index 0000000000000..48576bdff5d33
--- /dev/null
+++ b/src/plugins/vis_type_pie/server/plugin.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { schema } from '@kbn/config-schema';
+
+import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+
+import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
+
+export const getUiSettingsConfig: () => Record<string, UiSettingsParams<boolean>> = () => ({
+  // TODO: Remove this when vis_type_vislib is removed
+  // https://github.com/elastic/kibana/issues/56143
+  [LEGACY_PIE_CHARTS_LIBRARY]: {
+    name: i18n.translate('visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name', {
+      defaultMessage: 'Pie legacy charts library',
+    }),
+    requiresPageReload: true,
+    value: false,
+    description: i18n.translate(
+      'visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description',
+      {
+        defaultMessage: 'Enables legacy charts library for pie charts in visualize.',
+      }
+    ),
+    deprecation: {
+      message: i18n.translate(
+        'visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation',
+        {
+          defaultMessage:
+            'The legacy charts library for pie in visualize is deprecated and will not be supported as of 8.0.',
+        }
+      ),
+      docLinksKey: 'visualizationSettings',
+    },
+    category: ['visualization'],
+    schema: schema.boolean(),
+  },
+});
+
+export class VisTypePieServerPlugin implements Plugin<object, object> {
+  public setup(core: CoreSetup) {
+    core.uiSettings.register(getUiSettingsConfig());
+
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+}
diff --git a/src/plugins/vis_type_vislib/public/plugin.ts b/src/plugins/vis_type_vislib/public/plugin.ts
index 52faf8a74778c..cdc02aacafa3b 100644
--- a/src/plugins/vis_type_vislib/public/plugin.ts
+++ b/src/plugins/vis_type_vislib/public/plugin.ts
@@ -13,7 +13,8 @@ import { VisualizationsSetup } from '../../visualizations/public';
 import { ChartsPluginSetup } from '../../charts/public';
 import { DataPublicPluginStart } from '../../data/public';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
-import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
+import { LEGACY_CHARTS_LIBRARY } from '../../vis_type_xy/common/index';
+import { LEGACY_PIE_CHARTS_LIBRARY } from '../../vis_type_pie/common/index';
 
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
 import { createPieVisFn } from './pie_fn';
@@ -50,17 +51,18 @@ export class VisTypeVislibPlugin
     core: VisTypeVislibCoreSetup,
     { expressions, visualizations, charts }: VisTypeVislibPluginSetupDependencies
   ) {
-    if (!core.uiSettings.get(LEGACY_CHARTS_LIBRARY, false)) {
-      // Register only non-replaced vis types
-      convertedTypeDefinitions.forEach(visualizations.createBaseVisualization);
-      expressions.registerRenderer(getVislibVisRenderer(core, charts));
-      expressions.registerFunction(createVisTypeVislibVisFn());
-    } else {
-      // Register all vis types
-      visLibVisTypeDefinitions.forEach(visualizations.createBaseVisualization);
+    const typeDefinitions = !core.uiSettings.get(LEGACY_CHARTS_LIBRARY, false)
+      ? convertedTypeDefinitions
+      : visLibVisTypeDefinitions;
+    // register vislib XY axis charts
+    typeDefinitions.forEach(visualizations.createBaseVisualization);
+    expressions.registerRenderer(getVislibVisRenderer(core, charts));
+    expressions.registerFunction(createVisTypeVislibVisFn());
+
+    if (core.uiSettings.get(LEGACY_PIE_CHARTS_LIBRARY, false)) {
+      // register vislib pie chart
       visualizations.createBaseVisualization(pieVisTypeDefinition);
-      expressions.registerRenderer(getVislibVisRenderer(core, charts));
-      [createVisTypeVislibVisFn(), createPieVisFn()].forEach(expressions.registerFunction);
+      expressions.registerFunction(createPieVisFn());
     }
   }
 
diff --git a/src/plugins/vis_type_xy/common/index.ts b/src/plugins/vis_type_xy/common/index.ts
index f17bc8476d9a6..a80946f7c62fa 100644
--- a/src/plugins/vis_type_xy/common/index.ts
+++ b/src/plugins/vis_type_xy/common/index.ts
@@ -19,3 +19,5 @@ export enum ChartType {
  * Type of xy visualizations
  */
 export type XyVisType = ChartType | 'horizontal_bar';
+
+export const LEGACY_CHARTS_LIBRARY = 'visualization:visualize:legacyChartsLibrary';
diff --git a/src/plugins/vis_type_xy/kibana.json b/src/plugins/vis_type_xy/kibana.json
index 1d7fd6a0813b4..c25f035fb6d4b 100644
--- a/src/plugins/vis_type_xy/kibana.json
+++ b/src/plugins/vis_type_xy/kibana.json
@@ -2,8 +2,10 @@
   "id": "visTypeXy",
   "version": "kibana",
   "ui": true,
+  "server": true,
   "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection"],
   "requiredBundles": ["kibanaUtils", "visDefaultEditor"],
+  "extraPublicDirs": ["common/index"],
   "owner": {
     "name": "Kibana App",
     "githubTeam": "kibana-app"
diff --git a/src/plugins/vis_type_xy/public/plugin.ts b/src/plugins/vis_type_xy/public/plugin.ts
index e8d53127765b4..b595d3172f143 100644
--- a/src/plugins/vis_type_xy/public/plugin.ts
+++ b/src/plugins/vis_type_xy/public/plugin.ts
@@ -23,7 +23,7 @@ import {
 } from './services';
 
 import { visTypesDefinitions } from './vis_types';
-import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
+import { LEGACY_CHARTS_LIBRARY } from '../common/';
 import { xyVisRenderer } from './vis_renderer';
 
 import * as expressionFunctions from './expression_functions';
diff --git a/src/plugins/vis_type_xy/server/index.ts b/src/plugins/vis_type_xy/server/index.ts
new file mode 100644
index 0000000000000..a27ac49c0ea49
--- /dev/null
+++ b/src/plugins/vis_type_xy/server/index.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 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 { VisTypeXyServerPlugin } from './plugin';
+
+export const plugin = () => new VisTypeXyServerPlugin();
diff --git a/src/plugins/vis_type_xy/server/plugin.ts b/src/plugins/vis_type_xy/server/plugin.ts
new file mode 100644
index 0000000000000..46d6531204c24
--- /dev/null
+++ b/src/plugins/vis_type_xy/server/plugin.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { schema } from '@kbn/config-schema';
+
+import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+
+import { LEGACY_CHARTS_LIBRARY } from '../common';
+
+export const getUiSettingsConfig: () => Record<string, UiSettingsParams<boolean>> = () => ({
+  // TODO: Remove this when vis_type_vislib is removed
+  // https://github.com/elastic/kibana/issues/56143
+  [LEGACY_CHARTS_LIBRARY]: {
+    name: i18n.translate('visTypeXy.advancedSettings.visualization.legacyChartsLibrary.name', {
+      defaultMessage: 'XY axis legacy charts library',
+    }),
+    requiresPageReload: true,
+    value: false,
+    description: i18n.translate(
+      'visTypeXy.advancedSettings.visualization.legacyChartsLibrary.description',
+      {
+        defaultMessage: 'Enables legacy charts library for area, line and bar charts in visualize.',
+      }
+    ),
+    deprecation: {
+      message: i18n.translate(
+        'visTypeXy.advancedSettings.visualization.legacyChartsLibrary.deprecation',
+        {
+          defaultMessage:
+            'The legacy charts library for area, line and bar charts in visualize is deprecated and will not be supported as of 7.16.',
+        }
+      ),
+      docLinksKey: 'visualizationSettings',
+    },
+    category: ['visualization'],
+    schema: schema.boolean(),
+  },
+});
+
+export class VisTypeXyServerPlugin implements Plugin<object, object> {
+  public setup(core: CoreSetup) {
+    core.uiSettings.register(getUiSettingsConfig());
+
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+}
diff --git a/src/plugins/visualizations/common/constants.ts b/src/plugins/visualizations/common/constants.ts
index a33e74b498a2c..a8a0963ac8948 100644
--- a/src/plugins/visualizations/common/constants.ts
+++ b/src/plugins/visualizations/common/constants.ts
@@ -7,4 +7,3 @@
  */
 
 export const VISUALIZE_ENABLE_LABS_SETTING = 'visualize:enableLabs';
-export const LEGACY_CHARTS_LIBRARY = 'visualization:visualize:legacyChartsLibrary';
diff --git a/src/plugins/visualizations/server/plugin.ts b/src/plugins/visualizations/server/plugin.ts
index 1fec63f2bb45a..5a5a80b2689d6 100644
--- a/src/plugins/visualizations/server/plugin.ts
+++ b/src/plugins/visualizations/server/plugin.ts
@@ -18,7 +18,7 @@ import {
   Logger,
 } from '../../../core/server';
 
-import { VISUALIZE_ENABLE_LABS_SETTING, LEGACY_CHARTS_LIBRARY } from '../common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
 
 import { visualizationSavedObjectType } from './saved_objects';
 
@@ -58,27 +58,6 @@ export class VisualizationsPlugin
         category: ['visualization'],
         schema: schema.boolean(),
       },
-      // TODO: Remove this when vis_type_vislib is removed
-      // https://github.com/elastic/kibana/issues/56143
-      [LEGACY_CHARTS_LIBRARY]: {
-        name: i18n.translate(
-          'visualizations.advancedSettings.visualization.legacyChartsLibrary.name',
-          {
-            defaultMessage: 'Legacy charts library',
-          }
-        ),
-        requiresPageReload: true,
-        value: false,
-        description: i18n.translate(
-          'visualizations.advancedSettings.visualization.legacyChartsLibrary.description',
-          {
-            defaultMessage:
-              'Enables legacy charts library for area, line, bar, pie charts in visualize.',
-          }
-        ),
-        category: ['visualization'],
-        schema: schema.boolean(),
-      },
     });
 
     if (plugins.usageCollection) {
diff --git a/test/functional/apps/dashboard/dashboard_state.ts b/test/functional/apps/dashboard/dashboard_state.ts
index 047681e1a8ace..6c259f5a71efa 100644
--- a/test/functional/apps/dashboard/dashboard_state.ts
+++ b/test/functional/apps/dashboard/dashboard_state.ts
@@ -53,6 +53,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       if (isNewChartsLibraryEnabled) {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': false,
+          'visualization:visualize:legacyPieChartsLibrary': false,
         });
         await browser.refresh();
       }
diff --git a/test/functional/apps/dashboard/index.ts b/test/functional/apps/dashboard/index.ts
index 4b83b2ac92deb..e4dc04282e4ac 100644
--- a/test/functional/apps/dashboard/index.ts
+++ b/test/functional/apps/dashboard/index.ts
@@ -123,6 +123,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
         await loadLogstash();
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': false,
+          'visualization:visualize:legacyPieChartsLibrary': false,
         });
         await browser.refresh();
       });
@@ -131,6 +132,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
         await unloadLogstash();
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': true,
+          'visualization:visualize:legacyPieChartsLibrary': true,
         });
         await browser.refresh();
       });
diff --git a/test/functional/apps/getting_started/_shakespeare.ts b/test/functional/apps/getting_started/_shakespeare.ts
index 945c1fdcbdcf4..ae6841b85c98d 100644
--- a/test/functional/apps/getting_started/_shakespeare.ts
+++ b/test/functional/apps/getting_started/_shakespeare.ts
@@ -57,6 +57,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       if (isNewChartsLibraryEnabled) {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': false,
+          'visualization:visualize:legacyPieChartsLibrary': false,
         });
         await browser.refresh();
       }
diff --git a/test/functional/apps/getting_started/index.ts b/test/functional/apps/getting_started/index.ts
index b75a30037d065..4c1c052ef15a2 100644
--- a/test/functional/apps/getting_started/index.ts
+++ b/test/functional/apps/getting_started/index.ts
@@ -24,6 +24,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       before(async () => {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': false,
+          'visualization:visualize:legacyPieChartsLibrary': false,
         });
         await browser.refresh();
       });
@@ -31,6 +32,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       after(async () => {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': true,
+          'visualization:visualize:legacyPieChartsLibrary': true,
         });
         await browser.refresh();
       });
diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts
index cecd206abd1db..bc6160eba3846 100644
--- a/test/functional/apps/visualize/index.ts
+++ b/test/functional/apps/visualize/index.ts
@@ -31,6 +31,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       before(async () => {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': false,
+          'visualization:visualize:legacyPieChartsLibrary': false,
         });
         await browser.refresh();
       });
@@ -38,6 +39,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       after(async () => {
         await kibanaServer.uiSettings.update({
           'visualization:visualize:legacyChartsLibrary': true,
+          'visualization:visualize:legacyPieChartsLibrary': true,
         });
         await browser.refresh();
       });
diff --git a/test/functional/config.js b/test/functional/config.js
index b28a9fd36c1c0..670488003e56c 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -58,6 +58,7 @@ export default async function ({ readConfigFile }) {
         'accessibility:disableAnimations': true,
         'dateFormat:tz': 'UTC',
         'visualization:visualize:legacyChartsLibrary': true,
+        'visualization:visualize:legacyPieChartsLibrary': true,
       },
     },
 
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
index c8587f4ffd346..64b8c363fa6c2 100644
--- a/test/functional/page_objects/visualize_chart_page.ts
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -37,7 +37,8 @@ export class VisualizeChartPageObject extends FtrService {
   public async isNewChartsLibraryEnabled(): Promise<boolean> {
     const legacyChartsLibrary =
       Boolean(
-        await this.kibanaServer.uiSettings.get('visualization:visualize:legacyChartsLibrary')
+        (await this.kibanaServer.uiSettings.get('visualization:visualize:legacyChartsLibrary')) &&
+          (await this.kibanaServer.uiSettings.get('visualization:visualize:legacyPieChartsLibrary'))
       ) ?? true;
     const enabled = !legacyChartsLibrary;
     this.log.debug(`-- isNewChartsLibraryEnabled = ${enabled}`);
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index a11a254509e7a..e930406cdcce8 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -57,6 +57,7 @@ export class VisualizePageObject extends FtrService {
       defaultIndex: 'logstash-*',
       [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b',
       'visualization:visualize:legacyChartsLibrary': !isNewLibrary,
+      'visualization:visualize:legacyPieChartsLibrary': !isNewLibrary,
     });
   }
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e73bb19627b8f..87813b64f1f20 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4941,8 +4941,6 @@
     "visTypePie.editors.pie.showLabelsLabel": "ラベルを表示",
     "visTypePie.editors.pie.showTopLevelOnlyLabel": "トップレベルのみ表示",
     "visTypePie.editors.pie.showValuesLabel": "値を表示",
-    "visualizations.advancedSettings.visualization.legacyChartsLibrary.description": "Visualizeでエリア、折れ線、棒グラフのレガシーグラフライブラリを有効にします。",
-    "visualizations.advancedSettings.visualization.legacyChartsLibrary.name": "レガシーグラフライブラリ",
     "visualizations.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n            ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
     "visualizations.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
     "visualizations.disabledLabVisualizationLink": "ドキュメンテーションを表示",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 51f6378f481e2..4e98de541ce60 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4968,8 +4968,6 @@
     "visTypePie.editors.pie.showLabelsLabel": "显示标签",
     "visTypePie.editors.pie.showTopLevelOnlyLabel": "仅显示顶级",
     "visTypePie.editors.pie.showValuesLabel": "显示值",
-    "visualizations.advancedSettings.visualization.legacyChartsLibrary.description": "在 Visualize 中启用面积图、折线图和条形图的旧版图表库。",
-    "visualizations.advancedSettings.visualization.legacyChartsLibrary.name": "旧版图表库",
     "visualizations.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n            仅被视为生产就绪的可视化可供用户使用。",
     "visualizations.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
     "visualizations.disabledLabVisualizationLink": "阅读文档",
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index cf05bd6e15898..2c3a3c93e2a0a 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -103,6 +103,7 @@ export default async function ({ readConfigFile }) {
         'accessibility:disableAnimations': true,
         'dateFormat:tz': 'UTC',
         'visualization:visualize:legacyChartsLibrary': true,
+        'visualization:visualize:legacyPieChartsLibrary': true,
       },
     },
     // the apps section defines the urls that

From 59d422394aad7124cf07efbd651fed944e73f0e5 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 24 Jun 2021 11:43:33 +0200
Subject: [PATCH 28/95] [Lens] Move empty string handling into field formatter
 (#102877)

---
 .../common/field_formats/converters/string.ts |   7 ++
 .../vis_type_pie/public/utils/get_layers.ts   |   6 -
 .../public/components/detailed_tooltip.tsx    |   4 +-
 .../public/components/xy_settings.tsx         |   3 +-
 .../vis_type_xy/public/config/get_axis.ts     |   4 +-
 .../public/utils/get_series_name_fn.ts        |  13 +-
 .../components/table_actions.ts               |   6 +-
 .../heatmap_visualization/chart_component.tsx |   5 +-
 .../rename_columns.test.ts                    |  23 ----
 .../indexpattern_datasource/rename_columns.ts |  14 +--
 .../pie_visualization/render_function.tsx     |   3 +-
 .../legend_action_popover.tsx                 |   5 +-
 x-pack/plugins/lens/public/utils.test.ts      | 118 ------------------
 x-pack/plugins/lens/public/utils.ts           |  36 ------
 .../public/xy_visualization/expression.tsx    |   3 +-
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 .../discover/__snapshots__/reporting.snap     |   4 +-
 18 files changed, 23 insertions(+), 235 deletions(-)
 delete mode 100644 x-pack/plugins/lens/public/utils.test.ts

diff --git a/src/plugins/data/common/field_formats/converters/string.ts b/src/plugins/data/common/field_formats/converters/string.ts
index ec92d75910522..64367df5d90dd 100644
--- a/src/plugins/data/common/field_formats/converters/string.ts
+++ b/src/plugins/data/common/field_formats/converters/string.ts
@@ -13,6 +13,10 @@ import { FieldFormat } from '../field_format';
 import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types';
 import { shortenDottedString } from '../../utils';
 
+export const emptyLabel = i18n.translate('data.fieldFormats.string.emptyLabel', {
+  defaultMessage: '(empty)',
+});
+
 const TRANSFORM_OPTIONS = [
   {
     kind: false,
@@ -103,6 +107,9 @@ export class StringFormat extends FieldFormat {
   }
 
   textConvert: TextContextTypeConvert = (val) => {
+    if (val === '') {
+      return emptyLabel;
+    }
     switch (this.param('transform')) {
       case 'lower':
         return String(val).toLowerCase();
diff --git a/src/plugins/vis_type_pie/public/utils/get_layers.ts b/src/plugins/vis_type_pie/public/utils/get_layers.ts
index 27dcf2d379811..5a82871bf3688 100644
--- a/src/plugins/vis_type_pie/public/utils/get_layers.ts
+++ b/src/plugins/vis_type_pie/public/utils/get_layers.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { i18n } from '@kbn/i18n';
 import {
   Datum,
   PartitionFillLabel,
@@ -125,11 +124,6 @@ export const getLayers = (
       },
       showAccessor: (d: Datum) => d !== EMPTY_SLICE,
       nodeLabel: (d: unknown) => {
-        if (d === '') {
-          return i18n.translate('visTypePie.emptyLabelValue', {
-            defaultMessage: '(empty)',
-          });
-        }
         if (col.format) {
           const formattedLabel = formatter.deserialize(col.format).convert(d) ?? '';
           if (visParams.labels.truncate && formattedLabel.length <= visParams.labels.truncate) {
diff --git a/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx b/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
index c9ed82fcf58e5..fb6b4bb41d9ba 100644
--- a/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
+++ b/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
@@ -19,7 +19,6 @@ import {
 import { Aspects } from '../types';
 
 import './_detailed_tooltip.scss';
-import { fillEmptyValue } from '../utils/get_series_name_fn';
 import { COMPLEX_SPLIT_ACCESSOR, isRangeAggType } from '../utils/accessors';
 
 interface TooltipData {
@@ -100,8 +99,7 @@ export const getTooltipData = (
   return data;
 };
 
-const renderData = ({ label, value: rawValue }: TooltipData, index: number) => {
-  const value = fillEmptyValue(rawValue);
+const renderData = ({ label, value }: TooltipData, index: number) => {
   return label && value ? (
     <tr key={label + value + index}>
       <td className="detailedTooltip__label">
diff --git a/src/plugins/vis_type_xy/public/components/xy_settings.tsx b/src/plugins/vis_type_xy/public/components/xy_settings.tsx
index 8922f512522a0..8d6a7eecdfe52 100644
--- a/src/plugins/vis_type_xy/public/components/xy_settings.tsx
+++ b/src/plugins/vis_type_xy/public/components/xy_settings.tsx
@@ -29,7 +29,6 @@ import { renderEndzoneTooltip } from '../../../charts/public';
 
 import { getThemeService, getUISettings } from '../services';
 import { VisConfig } from '../types';
-import { fillEmptyValue } from '../utils/get_series_name_fn';
 
 declare global {
   interface Window {
@@ -134,7 +133,7 @@ export const XYSettings: FC<XYSettingsProps> = ({
   };
 
   const headerValueFormatter: TickFormatter<any> | undefined = xAxis.ticks?.formatter
-    ? (value) => fillEmptyValue(xAxis.ticks?.formatter?.(value)) ?? ''
+    ? (value) => xAxis.ticks?.formatter?.(value) ?? ''
     : undefined;
   const headerFormatter =
     isTimeChart && xDomain && adjustedXDomain
diff --git a/src/plugins/vis_type_xy/public/config/get_axis.ts b/src/plugins/vis_type_xy/public/config/get_axis.ts
index 08b17c882eea6..71d33cc20d057 100644
--- a/src/plugins/vis_type_xy/public/config/get_axis.ts
+++ b/src/plugins/vis_type_xy/public/config/get_axis.ts
@@ -27,7 +27,6 @@ import {
   YScaleType,
   SeriesParam,
 } from '../types';
-import { fillEmptyValue } from '../utils/get_series_name_fn';
 
 export function getAxis<S extends XScaleType | YScaleType>(
   { type, title: axisTitle, labels, scale: axisScale, ...axis }: CategoryAxis,
@@ -90,8 +89,7 @@ function getLabelFormatter(
   }
 
   return (value: any) => {
-    const formattedStringValue = `${formatter ? formatter(value) : value}`;
-    const finalValue = fillEmptyValue(formattedStringValue);
+    const finalValue = `${formatter ? formatter(value) : value}`;
 
     if (finalValue.length > truncate) {
       return `${finalValue.slice(0, truncate)}...`;
diff --git a/src/plugins/vis_type_xy/public/utils/get_series_name_fn.ts b/src/plugins/vis_type_xy/public/utils/get_series_name_fn.ts
index 0e54650e22f75..137f8a5558010 100644
--- a/src/plugins/vis_type_xy/public/utils/get_series_name_fn.ts
+++ b/src/plugins/vis_type_xy/public/utils/get_series_name_fn.ts
@@ -8,21 +8,10 @@
 
 import { memoize } from 'lodash';
 
-import { i18n } from '@kbn/i18n';
 import { XYChartSeriesIdentifier, SeriesName } from '@elastic/charts';
 
 import { VisConfig } from '../types';
 
-const emptyTextLabel = i18n.translate('visTypeXy.emptyTextColumnValue', {
-  defaultMessage: '(empty)',
-});
-
-/**
- * Returns empty values
- */
-export const fillEmptyValue = <T extends string | number | undefined>(value: T) =>
-  value === '' ? emptyTextLabel : value;
-
 function getSplitValues(
   splitAccessors: XYChartSeriesIdentifier['splitAccessors'],
   seriesAspects?: VisConfig['aspects']['series']
@@ -36,7 +25,7 @@ function getSplitValues(
     const split = (seriesAspects ?? []).find(({ accessor }) => accessor === key);
     splitValues.push(split?.formatter ? split?.formatter(value) : value);
   });
-  return splitValues.map(fillEmptyValue);
+  return splitValues;
 }
 
 export const getSeriesNameFn = (aspects: VisConfig['aspects'], multipleY = false) =>
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
index 0d44ae3aa6dec..8615ed6536316 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
@@ -15,8 +15,6 @@ import type {
   LensToggleAction,
 } from './types';
 import { ColumnConfig } from './table_basic';
-
-import { desanitizeFilterContext } from '../../utils';
 import { getOriginalId } from '../transpose_helpers';
 
 export const createGridResizeHandler = (
@@ -92,7 +90,7 @@ export const createGridFilterHandler = (
     timeFieldName,
   };
 
-  onClickValue(desanitizeFilterContext(data));
+  onClickValue(data);
 };
 
 export const createTransposeColumnFilterHandler = (
@@ -125,7 +123,7 @@ export const createTransposeColumnFilterHandler = (
     timeFieldName,
   };
 
-  onClickValue(desanitizeFilterContext(data));
+  onClickValue(data);
 };
 
 export const createGridSortingConfig = (
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
index 3048f3b3db580..8214d5ba129d4 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
@@ -21,7 +21,6 @@ import { VisualizationContainer } from '../visualization_container';
 import { HeatmapRenderProps } from './types';
 import './index.scss';
 import { LensBrushEvent, LensFilterEvent } from '../types';
-import { desanitizeFilterContext } from '../utils';
 import { EmptyPlaceholder } from '../shared_components';
 import { LensIconChartHeatmap } from '../assets/chart_heatmap';
 
@@ -117,7 +116,7 @@ export const HeatmapComponent: FC<HeatmapRenderProps> = ({
       })),
       timeFieldName,
     };
-    onClickValue(desanitizeFilterContext(context));
+    onClickValue(context);
   }) as ElementClickListener;
 
   const onBrushEnd = (e: HeatmapBrushEvent) => {
@@ -164,7 +163,7 @@ export const HeatmapComponent: FC<HeatmapRenderProps> = ({
         })),
         timeFieldName,
       };
-      onClickValue(desanitizeFilterContext(context));
+      onClickValue(context);
     }
   };
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.test.ts
index 0750b99db5f67..5654a599c5e27 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.test.ts
@@ -83,29 +83,6 @@ describe('rename_columns', () => {
     `);
   });
 
-  it('should replace "" with a visible value', () => {
-    const input: Datatable = {
-      type: 'datatable',
-      columns: [{ id: 'a', name: 'A', meta: { type: 'string' } }],
-      rows: [{ a: '' }],
-    };
-
-    const idMap = {
-      a: {
-        id: 'a',
-        label: 'Austrailia',
-      },
-    };
-
-    const result = renameColumns.fn(
-      input,
-      { idMap: JSON.stringify(idMap) },
-      createMockExecutionContext()
-    );
-
-    expect(result.rows[0].a).toEqual('(empty)');
-  });
-
   it('should keep columns which are not mapped', () => {
     const input: Datatable = {
       type: 'datatable',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.ts b/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.ts
index 89c63880248d0..a16756126c030 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/rename_columns.ts
@@ -49,9 +49,9 @@ export const renameColumns: ExpressionFunctionDefinition<
 
         Object.entries(row).forEach(([id, value]) => {
           if (id in idMap) {
-            mappedRow[idMap[id].id] = sanitizeValue(value);
+            mappedRow[idMap[id].id] = value;
           } else {
-            mappedRow[id] = sanitizeValue(value);
+            mappedRow[id] = value;
           }
         });
 
@@ -86,13 +86,3 @@ function getColumnName(originalColumn: OriginalColumn, newColumn: DatatableColum
 
   return originalColumn.label;
 }
-
-function sanitizeValue(value: unknown) {
-  if (value === '') {
-    return i18n.translate('xpack.lens.indexpattern.emptyTextColumnValue', {
-      defaultMessage: '(empty)',
-    });
-  }
-
-  return value;
-}
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
index f329cfe1bb8b9..2e5a06b4f705f 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
@@ -31,7 +31,6 @@ import { PieExpressionProps } from './types';
 import { getSliceValue, getFilterContext } from './render_helpers';
 import { EmptyPlaceholder } from '../shared_components';
 import './visualization.scss';
-import { desanitizeFilterContext } from '../utils';
 import {
   ChartsPluginSetup,
   PaletteRegistry,
@@ -254,7 +253,7 @@ export function PieComponent(
   const onElementClickHandler: ElementClickListener = (args) => {
     const context = getFilterContext(args[0][0] as LayerValue[], groups, firstTable);
 
-    onClickValue(desanitizeFilterContext(context));
+    onClickValue(context);
   };
 
   return (
diff --git a/x-pack/plugins/lens/public/shared_components/legend_action_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend_action_popover.tsx
index e344cb5289f51..5027629ef6ae5 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_action_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_action_popover.tsx
@@ -9,7 +9,6 @@ import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover, EuiContextMenu } from '@elastic/eui';
 import type { LensFilterEvent } from '../types';
-import { desanitizeFilterContext } from '../utils';
 
 export interface LegendActionPopoverProps {
   /**
@@ -45,7 +44,7 @@ export const LegendActionPopover: React.FunctionComponent<LegendActionPopoverPro
           icon: <EuiIcon type="plusInCircle" size="m" />,
           onClick: () => {
             setPopoverOpen(false);
-            onFilter(desanitizeFilterContext(context));
+            onFilter(context);
           },
         },
         {
@@ -56,7 +55,7 @@ export const LegendActionPopover: React.FunctionComponent<LegendActionPopoverPro
           icon: <EuiIcon type="minusInCircle" size="m" />,
           onClick: () => {
             setPopoverOpen(false);
-            onFilter(desanitizeFilterContext({ ...context, negate: true }));
+            onFilter({ ...context, negate: true });
           },
         },
       ],
diff --git a/x-pack/plugins/lens/public/utils.test.ts b/x-pack/plugins/lens/public/utils.test.ts
deleted file mode 100644
index 76597870b3beb..0000000000000
--- a/x-pack/plugins/lens/public/utils.test.ts
+++ /dev/null
@@ -1,118 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { LensFilterEvent } from './types';
-import { desanitizeFilterContext } from './utils';
-import { Datatable } from '../../../../src/plugins/expressions/common';
-
-describe('desanitizeFilterContext', () => {
-  it(`When filtered value equals '(empty)' replaces it with '' in table and in value.`, () => {
-    const table: Datatable = {
-      type: 'datatable',
-      rows: [
-        {
-          'f903668f-1175-4705-a5bd-713259d10326': 1589414640000,
-          '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '(empty)',
-          'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-        },
-        {
-          'f903668f-1175-4705-a5bd-713259d10326': 1589414670000,
-          'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 0,
-        },
-        {
-          'f903668f-1175-4705-a5bd-713259d10326': 1589414880000,
-          '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '123123123',
-          'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-        },
-        {
-          'f903668f-1175-4705-a5bd-713259d10326': 1589414910000,
-          '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '(empty)',
-          'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-        },
-      ],
-      columns: [
-        {
-          id: 'f903668f-1175-4705-a5bd-713259d10326',
-          name: 'order_date per 30 seconds',
-          meta: { type: 'date' },
-        },
-        {
-          id: '5d5446b2-72e8-4f86-91e0-88380f0fa14c',
-          name: 'Top values of customer_phone',
-          meta: { type: 'string' },
-        },
-        {
-          id: '9f0b6f88-c399-43a0-a993-0ad943c9af25',
-          name: 'Count of records',
-          meta: { type: 'number' },
-        },
-      ],
-    };
-
-    const contextWithEmptyValue: LensFilterEvent['data'] = {
-      data: [
-        {
-          row: 3,
-          column: 0,
-          value: 1589414910000,
-          table,
-        },
-        {
-          row: 0,
-          column: 1,
-          value: '(empty)',
-          table,
-        },
-      ],
-      timeFieldName: 'order_date',
-    };
-
-    const desanitizedFilterContext = desanitizeFilterContext(contextWithEmptyValue);
-
-    expect(desanitizedFilterContext).toEqual({
-      data: [
-        {
-          row: 3,
-          column: 0,
-          value: 1589414910000,
-          table,
-        },
-        {
-          value: '',
-          row: 0,
-          column: 1,
-          table: {
-            rows: [
-              {
-                'f903668f-1175-4705-a5bd-713259d10326': 1589414640000,
-                '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '',
-                'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-              },
-              {
-                'f903668f-1175-4705-a5bd-713259d10326': 1589414670000,
-                'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 0,
-              },
-              {
-                'f903668f-1175-4705-a5bd-713259d10326': 1589414880000,
-                '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '123123123',
-                'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-              },
-              {
-                'f903668f-1175-4705-a5bd-713259d10326': 1589414910000,
-                '5d5446b2-72e8-4f86-91e0-88380f0fa14c': '(empty)',
-                'col-1-9f0b6f88-c399-43a0-a993-0ad943c9af25': 1,
-              },
-            ],
-            columns: table.columns,
-            type: 'datatable',
-          },
-        },
-      ],
-      timeFieldName: 'order_date',
-    });
-  });
-});
diff --git a/x-pack/plugins/lens/public/utils.ts b/x-pack/plugins/lens/public/utils.ts
index 2706fe977c68e..1c4b2c67f96fc 100644
--- a/x-pack/plugins/lens/public/utils.ts
+++ b/x-pack/plugins/lens/public/utils.ts
@@ -9,42 +9,6 @@ import { i18n } from '@kbn/i18n';
 import { IndexPattern, IndexPatternsContract, TimefilterContract } from 'src/plugins/data/public';
 import { IUiSettingsClient } from 'kibana/public';
 import moment from 'moment-timezone';
-import { LensFilterEvent } from './types';
-
-/** replaces the value `(empty) to empty string for proper filtering` */
-export const desanitizeFilterContext = (
-  context: LensFilterEvent['data']
-): LensFilterEvent['data'] => {
-  const emptyTextValue = i18n.translate('xpack.lens.indexpattern.emptyTextColumnValue', {
-    defaultMessage: '(empty)',
-  });
-  const result: LensFilterEvent['data'] = {
-    ...context,
-    data: context.data.map((point) =>
-      point.value === emptyTextValue
-        ? {
-            ...point,
-            value: '',
-            table: {
-              ...point.table,
-              rows: point.table.rows.map((row, index) =>
-                index === point.row
-                  ? {
-                      ...row,
-                      [point.table.columns[point.column].id]: '',
-                    }
-                  : row
-              ),
-            },
-          }
-        : point
-    ),
-  };
-  if (context.timeFieldName) {
-    result.timeFieldName = context.timeFieldName;
-  }
-  return result;
-};
 
 export function getVisualizeGeoFieldMessage(fieldType: string) {
   return i18n.translate('xpack.lens.visualizeGeoFieldMessage', {
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
index 1de5cf6b30533..3fe98282a18b0 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -53,7 +53,6 @@ import {
   SeriesLayer,
 } from '../../../../../src/plugins/charts/public';
 import { EmptyPlaceholder } from '../shared_components';
-import { desanitizeFilterContext } from '../utils';
 import { fittingFunctionDefinitions, getFitOptions } from './fitting_functions';
 import { getAxesConfiguration, GroupsConfiguration, validateExtent } from './axes_configuration';
 import { getColorAssignments } from './color_assignment';
@@ -575,7 +574,7 @@ export function XYChart({
       })),
       timeFieldName: xDomain && isDateField ? xAxisFieldName : undefined,
     };
-    onClickValue(desanitizeFilterContext(context));
+    onClickValue(context);
   };
 
   const brushHandler: BrushEndListener = ({ x }) => {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 87813b64f1f20..837716ec9dd5a 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5055,7 +5055,6 @@
     "visTypeXy.editors.pointSeries.thresholdLine.valueLabel": "しきい値",
     "visTypeXy.editors.pointSeries.thresholdLine.widthLabel": "線の幅",
     "visTypeXy.editors.pointSeries.thresholdLineSettingsTitle": "しきい線",
-    "visTypeXy.emptyTextColumnValue": " (空) ",
     "visTypeXy.fittingFunctionsTitle.carry": "最後 (ギャップを最後の値で埋める) ",
     "visTypeXy.fittingFunctionsTitle.linear": "線形 (ギャップを線で埋める) ",
     "visTypeXy.fittingFunctionsTitle.lookahead": "次 (ギャップを次の値で埋める) ",
@@ -12574,7 +12573,6 @@
     "xpack.lens.indexPattern.emptyDimensionButton": "空のディメンション",
     "xpack.lens.indexPattern.emptyFieldsLabel": "空のフィールド",
     "xpack.lens.indexPattern.emptyFieldsLabelHelp": "空のフィールドには、フィルターに基づく最初の 500 件のドキュメントの値が含まれていませんでした。",
-    "xpack.lens.indexpattern.emptyTextColumnValue": " (空) ",
     "xpack.lens.indexPattern.existenceErrorAriaLabel": "存在の取り込みに失敗しました",
     "xpack.lens.indexPattern.existenceErrorLabel": "フィールド情報を読み込めません",
     "xpack.lens.indexPattern.existenceTimeoutAriaLabel": "存在の取り込みがタイムアウトしました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 4e98de541ce60..0192566db0731 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5083,7 +5083,6 @@
     "visTypeXy.editors.pointSeries.thresholdLine.valueLabel": "阈值",
     "visTypeXy.editors.pointSeries.thresholdLine.widthLabel": "线条宽度",
     "visTypeXy.editors.pointSeries.thresholdLineSettingsTitle": "阈值线条",
-    "visTypeXy.emptyTextColumnValue": " (空) ",
     "visTypeXy.fittingFunctionsTitle.carry": "最后一个 (使用最后一个值填充缺口) ",
     "visTypeXy.fittingFunctionsTitle.linear": "线 (使用线填充缺口) ",
     "visTypeXy.fittingFunctionsTitle.lookahead": "下一个 (使用下一个值填充缺口) ",
@@ -12744,7 +12743,6 @@
     "xpack.lens.indexPattern.emptyDimensionButton": "空维度",
     "xpack.lens.indexPattern.emptyFieldsLabel": "空字段",
     "xpack.lens.indexPattern.emptyFieldsLabelHelp": "空字段在基于您的筛选的前 500 个文档中不包含任何值。",
-    "xpack.lens.indexpattern.emptyTextColumnValue": " (空) ",
     "xpack.lens.indexPattern.existenceErrorAriaLabel": "现有内容提取失败",
     "xpack.lens.indexPattern.existenceErrorLabel": "无法加载字段信息",
     "xpack.lens.indexPattern.existenceTimeoutAriaLabel": "现有内容提取超时",
diff --git a/x-pack/test/functional/apps/discover/__snapshots__/reporting.snap b/x-pack/test/functional/apps/discover/__snapshots__/reporting.snap
index baa49cb6f9d81..c7666bf00dd53 100644
--- a/x-pack/test/functional/apps/discover/__snapshots__/reporting.snap
+++ b/x-pack/test/functional/apps/discover/__snapshots__/reporting.snap
@@ -65,7 +65,7 @@ exports[`discover Discover CSV Export Generate CSV: archived search generates a
 
 exports[`discover Discover CSV Export Generate CSV: new search generates a report from a new search with data: default 1`] = `
 "\\"_id\\",\\"_index\\",\\"_score\\",\\"_type\\",category,\\"category.keyword\\",currency,\\"customer_first_name\\",\\"customer_first_name.keyword\\",\\"customer_full_name\\",\\"customer_full_name.keyword\\",\\"customer_gender\\",\\"customer_id\\",\\"customer_last_name\\",\\"customer_last_name.keyword\\",\\"customer_phone\\",\\"day_of_week\\",\\"day_of_week_i\\",email,\\"geoip.city_name\\",\\"geoip.continent_name\\",\\"geoip.country_iso_code\\",\\"geoip.location\\",\\"geoip.region_name\\",manufacturer,\\"manufacturer.keyword\\",\\"order_date\\",\\"order_id\\",\\"products._id\\",\\"products._id.keyword\\",\\"products.base_price\\",\\"products.base_unit_price\\",\\"products.category\\",\\"products.category.keyword\\",\\"products.created_on\\",\\"products.discount_amount\\",\\"products.discount_percentage\\",\\"products.manufacturer\\",\\"products.manufacturer.keyword\\",\\"products.min_price\\",\\"products.price\\",\\"products.product_id\\",\\"products.product_name\\",\\"products.product_name.keyword\\",\\"products.quantity\\",\\"products.sku\\",\\"products.tax_amount\\",\\"products.taxful_price\\",\\"products.taxless_price\\",\\"products.unit_discount_amount\\",sku,\\"taxful_total_price\\",\\"taxless_total_price\\",\\"total_quantity\\",\\"total_unique_products\\",type,user
-3AMtOW0BH63Xcmy432DJ,ecommerce,\\"-\\",\\"-\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",EUR,\\"Sultan Al\\",\\"Sultan Al\\",\\"Sultan Al Boone\\",\\"Sultan Al Boone\\",MALE,19,Boone,Boone,,Saturday,5,\\"sultan al@boone-family.zzz\\",\\"Abu Dhabi\\",Asia,AE,\\"{
+3AMtOW0BH63Xcmy432DJ,ecommerce,\\"-\\",\\"-\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",EUR,\\"Sultan Al\\",\\"Sultan Al\\",\\"Sultan Al Boone\\",\\"Sultan Al Boone\\",MALE,19,Boone,Boone,\\"(empty)\\",Saturday,5,\\"sultan al@boone-family.zzz\\",\\"Abu Dhabi\\",Asia,AE,\\"{
   \\"\\"coordinates\\"\\": [
     54.4,
     24.5
@@ -77,7 +77,7 @@ exports[`discover Discover CSV Export Generate CSV: new search generates a repor
 
 exports[`discover Discover CSV Export Generate CSV: new search generates a report from a new search with data: discover:searchFieldsFromSource 1`] = `
 "\\"_id\\",\\"_index\\",\\"_score\\",\\"_type\\",category,\\"category.keyword\\",currency,\\"customer_first_name\\",\\"customer_first_name.keyword\\",\\"customer_full_name\\",\\"customer_full_name.keyword\\",\\"customer_gender\\",\\"customer_id\\",\\"customer_last_name\\",\\"customer_last_name.keyword\\",\\"customer_phone\\",\\"day_of_week\\",\\"day_of_week_i\\",email,\\"geoip.city_name\\",\\"geoip.continent_name\\",\\"geoip.country_iso_code\\",\\"geoip.location\\",\\"geoip.region_name\\",manufacturer,\\"manufacturer.keyword\\",\\"order_date\\",\\"order_id\\",\\"products._id\\",\\"products._id.keyword\\",\\"products.base_price\\",\\"products.base_unit_price\\",\\"products.category\\",\\"products.category.keyword\\",\\"products.created_on\\",\\"products.discount_amount\\",\\"products.discount_percentage\\",\\"products.manufacturer\\",\\"products.manufacturer.keyword\\",\\"products.min_price\\",\\"products.price\\",\\"products.product_id\\",\\"products.product_name\\",\\"products.product_name.keyword\\",\\"products.quantity\\",\\"products.sku\\",\\"products.tax_amount\\",\\"products.taxful_price\\",\\"products.taxless_price\\",\\"products.unit_discount_amount\\",sku,\\"taxful_total_price\\",\\"taxless_total_price\\",\\"total_quantity\\",\\"total_unique_products\\",type,user
-3AMtOW0BH63Xcmy432DJ,ecommerce,\\"-\\",\\"-\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",EUR,\\"Sultan Al\\",\\"Sultan Al\\",\\"Sultan Al Boone\\",\\"Sultan Al Boone\\",MALE,19,Boone,Boone,,Saturday,5,\\"sultan al@boone-family.zzz\\",\\"Abu Dhabi\\",Asia,AE,\\"{
+3AMtOW0BH63Xcmy432DJ,ecommerce,\\"-\\",\\"-\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",EUR,\\"Sultan Al\\",\\"Sultan Al\\",\\"Sultan Al Boone\\",\\"Sultan Al Boone\\",MALE,19,Boone,Boone,\\"(empty)\\",Saturday,5,\\"sultan al@boone-family.zzz\\",\\"Abu Dhabi\\",Asia,AE,\\"{
   \\"\\"coordinates\\"\\": [
     54.4,
     24.5

From 4c2449fd2860ad7757fd210788563f2bede86354 Mon Sep 17 00:00:00 2001
From: Ignacio Rivas <rivasign@gmail.com>
Date: Thu, 24 Jun 2021 11:55:28 +0200
Subject: [PATCH 29/95] [Ingest pipelines] add extract_device_type to user
 agent processor (#100986)

* testing layouts

* fix copy for beta badge

* replace hardcoded text with i18n strings

* avoid updating types and just replace label

* Small cr changes

* get rid of style prop and just use a smaller badge
---
 .../__jest__/processors/processor.helpers.tsx |   3 +
 .../__jest__/processors/user_agent.test.tsx   | 125 ++++++++++++++++++
 .../common_fields/properties_field.tsx        |  13 +-
 .../processor_form/processors/user_agent.tsx  |  62 ++++++++-
 4 files changed, 188 insertions(+), 15 deletions(-)
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
index 15e8c323b1308..5f6ace2069410 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
@@ -156,6 +156,9 @@ type TestSubject =
   | 'separatorValueField.input'
   | 'quoteValueField.input'
   | 'emptyValueField.input'
+  | 'extractDeviceTypeSwitch.input'
+  | 'propertiesValueField'
+  | 'regexFileField.input'
   | 'valueFieldInput'
   | 'mediaTypeSelectorField'
   | 'ignoreEmptyField.input'
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
new file mode 100644
index 0000000000000..fa1c24c9dfb39
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
@@ -0,0 +1,125 @@
+/*
+ * 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 { act } from 'react-dom/test-utils';
+import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+
+// Default parameter values automatically added to the user agent processor when saved
+const defaultUserAgentParameters = {
+  if: undefined,
+  regex_file: undefined,
+  properties: undefined,
+  description: undefined,
+  ignore_missing: undefined,
+  ignore_failure: undefined,
+  extract_device_type: undefined,
+};
+
+const USER_AGENT_TYPE = 'user_agent';
+
+describe('Processor: User Agent', () => {
+  let onUpdate: jest.Mock;
+  let testBed: SetupResult;
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  beforeEach(async () => {
+    onUpdate = jest.fn();
+
+    await act(async () => {
+      testBed = await setup({
+        value: {
+          processors: [],
+        },
+        onFlyoutOpen: jest.fn(),
+        onUpdate,
+      });
+    });
+
+    testBed.component.update();
+
+    // Open flyout to add new processor
+    testBed.actions.addProcessor();
+    // Add type (the other fields are not visible until a type is selected)
+    await testBed.actions.addProcessorType(USER_AGENT_TYPE);
+  });
+
+  test('prevents form submission if required fields are not provided', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Click submit button with only the processor type defined
+    await saveNewProcessor();
+
+    // Expect form error as "field" is required parameter
+    expect(form.getErrorsMessages()).toEqual(['A field value is required.']);
+  });
+
+  test('saves with just the default parameter value', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Add "field" value (required)
+    form.setInputValue('fieldNameField.input', 'field_1');
+    // Save the field
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, USER_AGENT_TYPE);
+    expect(processors[0][USER_AGENT_TYPE]).toEqual({
+      ...defaultUserAgentParameters,
+      field: 'field_1',
+    });
+  });
+
+  test('allows optional parameters to be set', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+      find,
+      component,
+    } = testBed;
+
+    // Add "field" value (required)
+    form.setInputValue('fieldNameField.input', 'field_1');
+
+    // Set optional parameteres
+    form.setInputValue('targetField.input', 'target_field');
+    form.setInputValue('regexFileField.input', 'hello*');
+    form.toggleEuiSwitch('ignoreMissingSwitch.input');
+    form.toggleEuiSwitch('ignoreFailureSwitch.input');
+    form.toggleEuiSwitch('extractDeviceTypeSwitch.input');
+    await act(async () => {
+      find('propertiesValueField').simulate('change', [{ label: 'os' }]);
+    });
+    component.update();
+
+    // Save the field with new changes
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, USER_AGENT_TYPE);
+    expect(processors[0][USER_AGENT_TYPE]).toEqual({
+      ...defaultUserAgentParameters,
+      field: 'field_1',
+      target_field: 'target_field',
+      properties: ['os'],
+      regex_file: 'hello*',
+      extract_device_type: true,
+      ignore_missing: true,
+      ignore_failure: true,
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/properties_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/properties_field.tsx
index dd52375a19436..c8a50cf64484e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/properties_field.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/properties_field.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FunctionComponent } from 'react';
+import { EuiComboBoxProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { ComboBoxField, FIELD_TYPES, UseField } from '../../../../../../../shared_imports';
 
 import { FieldsConfig, to } from '../shared';
@@ -29,10 +29,10 @@ const fieldsConfig: FieldsConfig = {
 
 interface Props {
   helpText?: React.ReactNode;
-  propertyOptions?: EuiComboBoxOptionOption[];
+  euiFieldProps?: EuiComboBoxProps<string>;
 }
 
-export const PropertiesField: FunctionComponent<Props> = ({ helpText, propertyOptions }) => {
+export const PropertiesField: FunctionComponent<Props> = ({ helpText, euiFieldProps }) => {
   return (
     <UseField
       config={{
@@ -41,12 +41,7 @@ export const PropertiesField: FunctionComponent<Props> = ({ helpText, propertyOp
       }}
       component={ComboBoxField}
       path="fields.properties"
-      componentProps={{
-        euiFieldProps: {
-          options: propertyOptions || [],
-          noSuggestions: !propertyOptions,
-        },
-      }}
+      componentProps={{ euiFieldProps }}
     />
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/user_agent.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/user_agent.tsx
index 893e52bcc0073..2b5a68f799b7e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/user_agent.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/user_agent.tsx
@@ -6,20 +6,20 @@
  */
 
 import React, { FunctionComponent } from 'react';
-import { EuiCode } from '@elastic/eui';
+import { EuiCode, EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
-import { FIELD_TYPES, UseField, Field } from '../../../../../../shared_imports';
+import { FIELD_TYPES, ToggleField, UseField, Field } from '../../../../../../shared_imports';
 
-import { FieldsConfig, from } from './shared';
+import { FieldsConfig, from, to } from './shared';
 import { IgnoreMissingField } from './common_fields/ignore_missing_field';
 import { FieldNameField } from './common_fields/field_name_field';
 import { TargetField } from './common_fields/target_field';
 import { PropertiesField } from './common_fields/properties_field';
 
-const propertyOptions: EuiComboBoxOptionOption[] = [
+const propertyOptions: Array<EuiComboBoxOptionOption<string>> = [
   { label: 'name' },
   { label: 'os' },
   { label: 'device' },
@@ -47,6 +47,18 @@ const fieldsConfig: FieldsConfig = {
       }
     ),
   },
+  extract_device_type: {
+    type: FIELD_TYPES.TOGGLE,
+    defaultValue: false,
+    deserializer: to.booleanOrUndef,
+    serializer: from.undefinedIfValue(false),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.userAgentForm.extractDeviceTypeFieldHelpText',
+      {
+        defaultMessage: 'Extracts device type from the user agent string.',
+      }
+    ),
+  },
 };
 
 export const UserAgent: FunctionComponent = () => {
@@ -59,7 +71,12 @@ export const UserAgent: FunctionComponent = () => {
         )}
       />
 
-      <UseField config={fieldsConfig.regex_file} component={Field} path="fields.regex_file" />
+      <UseField
+        config={fieldsConfig.regex_file}
+        component={Field}
+        path="fields.regex_file"
+        data-test-subj="regexFileField"
+      />
 
       <TargetField
         helpText={
@@ -78,7 +95,40 @@ export const UserAgent: FunctionComponent = () => {
           'xpack.ingestPipelines.pipelineEditor.userAgentForm.propertiesFieldHelpText',
           { defaultMessage: 'Properties added to the target field.' }
         )}
-        propertyOptions={propertyOptions}
+        euiFieldProps={{
+          options: propertyOptions,
+          noSuggestions: false,
+          'data-test-subj': 'propertiesValueField',
+        }}
+      />
+
+      <UseField
+        config={fieldsConfig.extract_device_type}
+        component={ToggleField}
+        path="fields.extract_device_type"
+        data-test-subj="extractDeviceTypeSwitch"
+        euiFieldProps={{
+          label: (
+            <EuiFlexGroup gutterSize="xs">
+              <EuiFlexItem grow={false}>
+                <FormattedMessage
+                  id="xpack.ingestPipelines.pipelineEditor.userAgentForm.extractDeviceNameFieldText"
+                  defaultMessage="Extract device type"
+                />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiBetaBadge
+                  size="s"
+                  label="Beta"
+                  tooltipContent={i18n.translate(
+                    'xpack.ingestPipelines.pipelineEditor.userAgentForm.extractDeviceNameTooltipText',
+                    { defaultMessage: 'This functionality is in beta and is subject to change.' }
+                  )}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          ),
+        }}
       />
 
       <IgnoreMissingField />

From 9a1f5a4a7a81603f1b11ff722c3c1c3707e00ca9 Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Thu, 24 Jun 2021 12:23:41 +0200
Subject: [PATCH 30/95] switching to peggy (#103169)

---
 packages/kbn-interpreter/BUILD.bazel                      | 8 ++++----
 .../grammar/{grammar.pegjs => grammar.peggy}              | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/kbn-interpreter/grammar/{grammar.pegjs => grammar.peggy} (100%)

diff --git a/packages/kbn-interpreter/BUILD.bazel b/packages/kbn-interpreter/BUILD.bazel
index 4492faabfdf81..c29faf65638ca 100644
--- a/packages/kbn-interpreter/BUILD.bazel
+++ b/packages/kbn-interpreter/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@npm//pegjs:index.bzl", "pegjs")
+load("@npm//peggy:index.bzl", "peggy")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
 
 PKG_BASE_NAME = "kbn-interpreter"
@@ -37,10 +37,10 @@ TYPES_DEPS = [
 
 DEPS = SRC_DEPS + TYPES_DEPS
 
-pegjs(
+peggy(
   name = "grammar",
   data = [
-    ":grammar/grammar.pegjs"
+    ":grammar/grammar.peggy"
   ],
   output_dir = True,
   args = [
@@ -48,7 +48,7 @@ pegjs(
     "expression,argument",
     "-o",
     "$(@D)/index.js",
-    "./%s/grammar/grammar.pegjs" % package_name()
+    "./%s/grammar/grammar.peggy" % package_name()
   ],
 )
 
diff --git a/packages/kbn-interpreter/grammar/grammar.pegjs b/packages/kbn-interpreter/grammar/grammar.peggy
similarity index 100%
rename from packages/kbn-interpreter/grammar/grammar.pegjs
rename to packages/kbn-interpreter/grammar/grammar.peggy

From fa71c6d7ac5abfcf79428fc120561d7cc9beb22f Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:31:30 +0100
Subject: [PATCH 31/95] [ML] Transforms: Converts management pages to new
 layout (#102648)

* [ML] Transforms: Converts management pages to new layout

* [ML] Fix vertical centering of error state in app

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/transform/public/app/app.tsx   |  36 ++--
 .../public/app/components/section_error.tsx   |  18 +-
 .../components/with_privileges.tsx            |  44 ++---
 .../clone_transform_section.tsx               |  77 +++++----
 .../create_transform_section.tsx              |  73 ++++----
 .../transform_list.test.tsx.snap              |  57 ++++---
 .../transform_list/transform_list.tsx         |  54 +++---
 .../transform_management_section.tsx          | 156 ++++++++++--------
 8 files changed, 287 insertions(+), 228 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/app.tsx b/x-pack/plugins/transform/public/app/app.tsx
index d4936783a0297..9219f29e4d9f0 100644
--- a/x-pack/plugins/transform/public/app/app.tsx
+++ b/x-pack/plugins/transform/public/app/app.tsx
@@ -10,7 +10,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
 import { ScopedHistory } from 'kibana/public';
 
-import { EuiErrorBoundary } from '@elastic/eui';
+import { EuiErrorBoundary, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
@@ -35,7 +35,7 @@ export const App: FC<{ history: ScopedHistory }> = ({ history }) => {
         title={
           <FormattedMessage
             id="xpack.transform.app.checkingPrivilegesErrorMessage"
-            defaultMessage="Error fetching user privileges from the server."
+            defaultMessage="Error fetching user privileges from the server"
           />
         }
         error={apiError}
@@ -44,21 +44,23 @@ export const App: FC<{ history: ScopedHistory }> = ({ history }) => {
   }
 
   return (
-    <div data-test-subj="transformApp">
-      <Router history={history}>
-        <Switch>
-          <Route
-            path={`/${SECTION_SLUG.CLONE_TRANSFORM}/:transformId`}
-            component={CloneTransformSection}
-          />
-          <Route
-            path={`/${SECTION_SLUG.CREATE_TRANSFORM}/:savedObjectId`}
-            component={CreateTransformSection}
-          />
-          <Route path={`/`} component={TransformManagementSection} />
-        </Switch>
-      </Router>
-    </div>
+    <EuiFlexGroup justifyContent="spaceAround" data-test-subj="transformApp">
+      <EuiFlexItem grow={true}>
+        <Router history={history}>
+          <Switch>
+            <Route
+              path={`/${SECTION_SLUG.CLONE_TRANSFORM}/:transformId`}
+              component={CloneTransformSection}
+            />
+            <Route
+              path={`/${SECTION_SLUG.CREATE_TRANSFORM}/:savedObjectId`}
+              component={CreateTransformSection}
+            />
+            <Route path={`/`} component={TransformManagementSection} />
+          </Switch>
+        </Router>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
 
diff --git a/x-pack/plugins/transform/public/app/components/section_error.tsx b/x-pack/plugins/transform/public/app/components/section_error.tsx
index 2af0c19fb8817..964c13d775d4b 100644
--- a/x-pack/plugins/transform/public/app/components/section_error.tsx
+++ b/x-pack/plugins/transform/public/app/components/section_error.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiCallOut } from '@elastic/eui';
+import { EuiEmptyPrompt, EuiPageContent } from '@elastic/eui';
 import React from 'react';
 
 interface Props {
@@ -23,9 +23,17 @@ export const SectionError: React.FunctionComponent<Props> = ({
   const errorMessage = error?.message ?? JSON.stringify(error, null, 2);
 
   return (
-    <EuiCallOut title={title} color="danger" iconType="alert" {...rest}>
-      <pre>{errorMessage}</pre>
-      {actions ? actions : null}
-    </EuiCallOut>
+    <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+      <EuiEmptyPrompt
+        iconType="alert"
+        title={<h2>{title}</h2>}
+        body={
+          <p>
+            <pre>{errorMessage}</pre>
+            {actions ? actions : null}
+          </p>
+        }
+      />
+    </EuiPageContent>
   );
 };
diff --git a/x-pack/plugins/transform/public/app/lib/authorization/components/with_privileges.tsx b/x-pack/plugins/transform/public/app/lib/authorization/components/with_privileges.tsx
index ef009e6a125e7..cdf4407b4233f 100644
--- a/x-pack/plugins/transform/public/app/lib/authorization/components/with_privileges.tsx
+++ b/x-pack/plugins/transform/public/app/lib/authorization/components/with_privileges.tsx
@@ -7,7 +7,7 @@
 
 import React, { useContext, FC } from 'react';
 
-import { EuiPageContent } from '@elastic/eui';
+import { EuiFlexItem, EuiFlexGroup, EuiPageContent } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
@@ -74,27 +74,31 @@ const MissingClusterPrivileges: FC<MissingClusterPrivilegesProps> = ({
   missingPrivileges,
   privilegesCount,
 }) => (
-  <EuiPageContent>
-    <NotAuthorizedSection
-      title={
-        <FormattedMessage
-          id="xpack.transform.app.deniedPrivilegeTitle"
-          defaultMessage="You're missing cluster privileges"
-        />
-      }
-      message={
-        <FormattedMessage
-          id="xpack.transform.app.deniedPrivilegeDescription"
-          defaultMessage="To use this section of Transforms, you must have {privilegesCount,
+  <EuiFlexGroup justifyContent="spaceAround">
+    <EuiFlexItem grow={false}>
+      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+        <NotAuthorizedSection
+          title={
+            <FormattedMessage
+              id="xpack.transform.app.deniedPrivilegeTitle"
+              defaultMessage="You're missing cluster privileges"
+            />
+          }
+          message={
+            <FormattedMessage
+              id="xpack.transform.app.deniedPrivilegeDescription"
+              defaultMessage="To use this section of Transforms, you must have {privilegesCount,
           plural, one {this cluster privilege} other {these cluster privileges}}: {missingPrivileges}."
-          values={{
-            missingPrivileges,
-            privilegesCount,
-          }}
+              values={{
+                missingPrivileges,
+                privilegesCount,
+              }}
+            />
+          }
         />
-      }
-    />
-  </EuiPageContent>
+      </EuiPageContent>
+    </EuiFlexItem>
+  </EuiFlexGroup>
 );
 
 export const PrivilegesWrapper: FC<{ privileges: string | string[] }> = ({
diff --git a/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx b/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx
index e4ecc0418d782..8aecf403186c5 100644
--- a/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx
+++ b/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx
@@ -15,12 +15,9 @@ import { i18n } from '@kbn/i18n';
 import {
   EuiButtonEmpty,
   EuiCallOut,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPageContent,
   EuiPageContentBody,
+  EuiPageHeader,
   EuiSpacer,
-  EuiTitle,
 } from '@elastic/eui';
 
 import { APP_CREATE_TRANSFORM_CLUSTER_PRIVILEGES } from '../../../../common/constants';
@@ -105,37 +102,38 @@ export const CloneTransformSection: FC<Props> = ({ match, location }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const docsLink = (
+    <EuiButtonEmpty
+      href={esTransform}
+      target="_blank"
+      iconType="help"
+      data-test-subj="documentationLink"
+    >
+      <FormattedMessage
+        id="xpack.transform.transformsWizard.transformDocsLinkText"
+        defaultMessage="Transform docs"
+      />
+    </EuiButtonEmpty>
+  );
+
   return (
     <PrivilegesWrapper privileges={APP_CREATE_TRANSFORM_CLUSTER_PRIVILEGES}>
-      <EuiPageContent data-test-subj="transformPageCloneTransform">
-        <EuiTitle size="l">
-          <EuiFlexGroup alignItems="center">
-            <EuiFlexItem grow={true}>
-              <h1>
-                <FormattedMessage
-                  id="xpack.transform.transformsWizard.cloneTransformTitle"
-                  defaultMessage="Clone transform"
-                />
-              </h1>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                href={esTransform}
-                target="_blank"
-                iconType="help"
-                data-test-subj="documentationLink"
-              >
-                <FormattedMessage
-                  id="xpack.transform.transformsWizard.transformDocsLinkText"
-                  defaultMessage="Transform docs"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiTitle>
-        <EuiPageContentBody>
-          <EuiSpacer size="l" />
-          {typeof errorMessage !== 'undefined' && (
+      <EuiPageHeader
+        pageTitle={
+          <FormattedMessage
+            id="xpack.transform.transformsWizard.cloneTransformTitle"
+            defaultMessage="Clone transform"
+          />
+        }
+        rightSideItems={[docsLink]}
+        bottomBorder
+      />
+
+      <EuiSpacer size="l" />
+
+      <EuiPageContentBody data-test-subj="transformPageCloneTransform">
+        {typeof errorMessage !== 'undefined' && (
+          <>
             <EuiCallOut
               title={i18n.translate('xpack.transform.clone.errorPromptTitle', {
                 defaultMessage: 'An error occurred getting the transform configuration.',
@@ -145,12 +143,13 @@ export const CloneTransformSection: FC<Props> = ({ match, location }) => {
             >
               <pre>{JSON.stringify(errorMessage)}</pre>
             </EuiCallOut>
-          )}
-          {searchItems !== undefined && isInitialized === true && transformConfig !== undefined && (
-            <Wizard cloneConfig={transformConfig} searchItems={searchItems} />
-          )}
-        </EuiPageContentBody>
-      </EuiPageContent>
+            <EuiSpacer size="l" />
+          </>
+        )}
+        {searchItems !== undefined && isInitialized === true && transformConfig !== undefined && (
+          <Wizard cloneConfig={transformConfig} searchItems={searchItems} />
+        )}
+      </EuiPageContentBody>
     </PrivilegesWrapper>
   );
 };
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/create_transform_section.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/create_transform_section.tsx
index b88eb8ce48601..d736bd60f2df6 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/create_transform_section.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/create_transform_section.tsx
@@ -13,12 +13,9 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiButtonEmpty,
   EuiCallOut,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPageContent,
   EuiPageContentBody,
+  EuiPageHeader,
   EuiSpacer,
-  EuiTitle,
 } from '@elastic/eui';
 
 import { APP_CREATE_TRANSFORM_CLUSTER_PRIVILEGES } from '../../../../common/constants';
@@ -42,42 +39,44 @@ export const CreateTransformSection: FC<Props> = ({ match }) => {
 
   const { error: searchItemsError, searchItems } = useSearchItems(match.params.savedObjectId);
 
+  const docsLink = (
+    <EuiButtonEmpty
+      href={esTransform}
+      target="_blank"
+      iconType="help"
+      data-test-subj="documentationLink"
+    >
+      <FormattedMessage
+        id="xpack.transform.transformsWizard.transformDocsLinkText"
+        defaultMessage="Transform docs"
+      />
+    </EuiButtonEmpty>
+  );
+
   return (
     <PrivilegesWrapper privileges={APP_CREATE_TRANSFORM_CLUSTER_PRIVILEGES}>
-      <EuiPageContent data-test-subj="transformPageCreateTransform">
-        <EuiTitle size="l">
-          <EuiFlexGroup alignItems="center">
-            <EuiFlexItem grow={true}>
-              <h1>
-                <FormattedMessage
-                  id="xpack.transform.transformsWizard.createTransformTitle"
-                  defaultMessage="Create transform"
-                />
-              </h1>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                href={esTransform}
-                target="_blank"
-                iconType="help"
-                data-test-subj="documentationLink"
-              >
-                <FormattedMessage
-                  id="xpack.transform.transformsWizard.transformDocsLinkText"
-                  defaultMessage="Transform docs"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiTitle>
-        <EuiPageContentBody>
-          <EuiSpacer size="l" />
-          {searchItemsError !== undefined && (
+      <EuiPageHeader
+        pageTitle={
+          <FormattedMessage
+            id="xpack.transform.transformsWizard.createTransformTitle"
+            defaultMessage="Create transform"
+          />
+        }
+        rightSideItems={[docsLink]}
+        bottomBorder
+      />
+
+      <EuiSpacer size="l" />
+
+      <EuiPageContentBody data-test-subj="transformPageCreateTransform">
+        {searchItemsError !== undefined && (
+          <>
             <EuiCallOut title={searchItemsError} color="danger" iconType="alert" />
-          )}
-          {searchItems !== undefined && <Wizard searchItems={searchItems} />}
-        </EuiPageContentBody>
-      </EuiPageContent>
+            <EuiSpacer size="l" />
+          </>
+        )}
+        {searchItems !== undefined && <Wizard searchItems={searchItems} />}
+      </EuiPageContentBody>
     </PrivilegesWrapper>
   );
 };
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
index e2de4c0ea1f6c..cf80421711355 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
@@ -1,23 +1,42 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Transform: Transform List <TransformList /> Minimal initialization 1`] = `
-<EuiEmptyPrompt
-  actions={
-    Array [
-      <EuiButtonEmpty
-        data-test-subj="transformCreateFirstButton"
-        isDisabled={true}
-        onClick={[MockFunction]}
-      >
-        Create your first transform
-      </EuiButtonEmpty>,
-    ]
-  }
-  data-test-subj="transformNoTransformsFound"
-  title={
-    <h2>
-      No transforms found
-    </h2>
-  }
-/>
+<EuiFlexGroup
+  justifyContent="spaceAround"
+>
+  <EuiFlexItem
+    grow={false}
+  >
+    <EuiSpacer
+      size="l"
+    />
+    <EuiPageContent
+      color="subdued"
+      horizontalPosition="center"
+      verticalPosition="center"
+    >
+      <EuiEmptyPrompt
+        actions={
+          Array [
+            <EuiButton
+              color="primary"
+              data-test-subj="transformCreateFirstButton"
+              fill={true}
+              isDisabled={true}
+              onClick={[MockFunction]}
+            >
+              Create your first transform
+            </EuiButton>,
+          ]
+        }
+        data-test-subj="transformNoTransformsFound"
+        title={
+          <h2>
+            No transforms found
+          </h2>
+        }
+      />
+    </EuiPageContent>
+  </EuiFlexItem>
+</EuiFlexGroup>
 `;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
index bacf8f9deccae..ab30f4793a315 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
@@ -10,12 +10,15 @@ import React, { MouseEventHandler, FC, useContext, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import {
+  EuiButton,
   EuiButtonEmpty,
   EuiButtonIcon,
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiPageContent,
   EuiPopover,
+  EuiSpacer,
   EuiTitle,
   EuiInMemoryTable,
   EuiSearchBarProps,
@@ -135,27 +138,36 @@ export const TransformList: FC<TransformListProps> = ({
 
   if (transforms.length === 0) {
     return (
-      <EuiEmptyPrompt
-        title={
-          <h2>
-            {i18n.translate('xpack.transform.list.emptyPromptTitle', {
-              defaultMessage: 'No transforms found',
-            })}
-          </h2>
-        }
-        actions={[
-          <EuiButtonEmpty
-            onClick={onCreateTransform}
-            isDisabled={disabled}
-            data-test-subj="transformCreateFirstButton"
-          >
-            {i18n.translate('xpack.transform.list.emptyPromptButtonText', {
-              defaultMessage: 'Create your first transform',
-            })}
-          </EuiButtonEmpty>,
-        ]}
-        data-test-subj="transformNoTransformsFound"
-      />
+      <EuiFlexGroup justifyContent="spaceAround">
+        <EuiFlexItem grow={false}>
+          <EuiSpacer size="l" />
+          <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+            <EuiEmptyPrompt
+              title={
+                <h2>
+                  {i18n.translate('xpack.transform.list.emptyPromptTitle', {
+                    defaultMessage: 'No transforms found',
+                  })}
+                </h2>
+              }
+              actions={[
+                <EuiButton
+                  color="primary"
+                  fill
+                  onClick={onCreateTransform}
+                  isDisabled={disabled}
+                  data-test-subj="transformCreateFirstButton"
+                >
+                  {i18n.translate('xpack.transform.list.emptyPromptButtonText', {
+                    defaultMessage: 'Create your first transform',
+                  })}
+                </EuiButton>,
+              ]}
+              data-test-subj="transformNoTransformsFound"
+            />
+          </EuiPageContent>
+        </EuiFlexItem>
+      </EuiFlexGroup>
     );
   }
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx
index cc4c502f21eb5..2479d34f1579a 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx
@@ -5,23 +5,21 @@
  * 2.0.
  */
 
-import React, { FC, Fragment, useEffect, useState } from 'react';
+import React, { FC, useEffect, useState } from 'react';
 
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
   EuiButtonEmpty,
-  EuiCallOut,
+  EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
   EuiLoadingContent,
   EuiModal,
   EuiPageContent,
   EuiPageContentBody,
+  EuiPageHeader,
   EuiSpacer,
-  EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 
 import { APP_GET_TRANSFORM_CLUSTER_PRIVILEGES } from '../../../../common/constants';
@@ -77,73 +75,91 @@ export const TransformManagement: FC = () => {
     setSavedObjectId(id);
   };
 
+  const docsLink = (
+    <EuiButtonEmpty
+      href={esTransform}
+      target="_blank"
+      iconType="help"
+      data-test-subj="documentationLink"
+    >
+      <FormattedMessage
+        id="xpack.transform.transformList.transformDocsLinkText"
+        defaultMessage="Transform docs"
+      />
+    </EuiButtonEmpty>
+  );
+
   return (
-    <Fragment>
-      <EuiPageContent data-test-subj="transformPageTransformList">
-        <EuiTitle size="l">
-          <EuiFlexGroup alignItems="center">
-            <EuiFlexItem grow={true}>
-              <h1 data-test-subj="transformAppTitle">
-                <FormattedMessage
-                  id="xpack.transform.transformList.transformTitle"
-                  defaultMessage="Transforms"
-                />
-              </h1>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                href={esTransform}
-                target="_blank"
-                iconType="help"
-                data-test-subj="documentationLink"
-              >
-                <FormattedMessage
-                  id="xpack.transform.transformList.transformDocsLinkText"
-                  defaultMessage="Transform docs"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <EuiTitle size="s">
-          <EuiText color="subdued">
+    <>
+      <EuiPageHeader
+        pageTitle={
+          <span data-test-subj="transformAppTitle">
             <FormattedMessage
-              id="xpack.transform.transformList.transformDescription"
-              defaultMessage="Use transforms to pivot existing Elasticsearch indices into summarized entity-centric indices or to create an indexed view of the latest documents for fast access."
+              id="xpack.transform.transformList.transformTitle"
+              defaultMessage="Transforms"
             />
-          </EuiText>
-        </EuiTitle>
-        <EuiPageContentBody>
-          <EuiSpacer size="l" />
-          {!isInitialized && <EuiLoadingContent lines={2} />}
-          {isInitialized && (
-            <>
-              <TransformStatsBar transformNodes={transformNodes} transformsList={transforms} />
-              <EuiSpacer size="s" />
-              {typeof errorMessage !== 'undefined' && (
-                <EuiCallOut
-                  title={i18n.translate('xpack.transform.list.errorPromptTitle', {
-                    defaultMessage: 'An error occurred getting the transform list.',
-                  })}
-                  color="danger"
-                  iconType="alert"
-                >
-                  <pre>{JSON.stringify(errorMessage)}</pre>
-                </EuiCallOut>
-              )}
-              {typeof errorMessage === 'undefined' && (
-                <TransformList
-                  onCreateTransform={onOpenModal}
-                  transformNodes={transformNodes}
-                  transforms={transforms}
-                  transformsLoading={transformsLoading}
-                />
-              )}
-            </>
-          )}
-        </EuiPageContentBody>
-      </EuiPageContent>
+          </span>
+        }
+        description={
+          <FormattedMessage
+            id="xpack.transform.transformList.transformDescription"
+            defaultMessage="Use transforms to pivot existing Elasticsearch indices into summarized entity-centric indices or to create an indexed view of the latest documents for fast access."
+          />
+        }
+        rightSideItems={[docsLink]}
+        bottomBorder
+      />
+
+      <EuiSpacer size="l" />
+
+      <EuiPageContentBody data-test-subj="transformPageTransformList">
+        {!isInitialized && <EuiLoadingContent lines={2} />}
+        {isInitialized && (
+          <>
+            <TransformStatsBar transformNodes={transformNodes} transformsList={transforms} />
+            <EuiSpacer size="s" />
+            {typeof errorMessage !== 'undefined' && (
+              <EuiFlexGroup justifyContent="spaceAround">
+                <EuiFlexItem grow={false}>
+                  <EuiSpacer size="l" />
+                  <EuiPageContent
+                    verticalPosition="center"
+                    horizontalPosition="center"
+                    color="danger"
+                  >
+                    <EuiEmptyPrompt
+                      iconType="alert"
+                      title={
+                        <h2>
+                          <FormattedMessage
+                            id="xpack.transform.list.errorPromptTitle"
+                            defaultMessage="An error occurred getting the transform list"
+                          />
+                        </h2>
+                      }
+                      body={
+                        <p>
+                          <pre>{JSON.stringify(errorMessage)}</pre>
+                        </p>
+                      }
+                      actions={[]}
+                    />
+                  </EuiPageContent>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            )}
+            {typeof errorMessage === 'undefined' && (
+              <TransformList
+                onCreateTransform={onOpenModal}
+                transformNodes={transformNodes}
+                transforms={transforms}
+                transformsLoading={transformsLoading}
+              />
+            )}
+          </>
+        )}
+      </EuiPageContentBody>
+
       {isSearchSelectionVisible && (
         <EuiModal
           onClose={onCloseModal}
@@ -153,7 +169,7 @@ export const TransformManagement: FC = () => {
           <SearchSelection onSearchSelected={onSearchSelected} />
         </EuiModal>
       )}
-    </Fragment>
+    </>
   );
 };
 

From d44f9fe6e6fa85ca411ac9c9e89c7e6711d09753 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 24 Jun 2021 06:29:53 -0500
Subject: [PATCH 32/95] Use observability plugin breadcrumbs in APM (#103168)

Both APM and Observability plugins have a `useBreadcrumbs` hook.

APM's takes the whole list of route definitions, creates the whole path of breadcrumbs, and has an effect to set the breadcrumbs and the page title.

The Observability plugin's `useBreadcrumbs` just takes an array of breadcrumb objects, adds onclick handlers for them, and has an effect to set the breadcrumbs and the page title.

Rename APM's `useBreadcrumbs` to `useApmBreadcrumbs`. It still constructs the path based on the routes and the current route, but then just calls out to the Observability plugin's `useBreadcrumbs` to do the breadcrumb and title setting.

Now all APM breadcrumbs begin with "Observability" which links to the Observability overview, but the rest of them remain the same.
---
 .../public/components/routing/app_root.tsx    |  4 +-
 .../apm_plugin/mock_apm_plugin_context.tsx    |  1 +
 ....test.tsx => use_apm_breadcrumbs.test.tsx} | 58 ++++---------------
 ..._breadcrumbs.ts => use_apm_breadcrumbs.ts} | 29 ++--------
 4 files changed, 18 insertions(+), 74 deletions(-)
 rename x-pack/plugins/apm/public/hooks/{use_breadcrumbs.test.tsx => use_apm_breadcrumbs.test.tsx} (79%)
 rename x-pack/plugins/apm/public/hooks/{use_breadcrumbs.ts => use_apm_breadcrumbs.ts} (85%)

diff --git a/x-pack/plugins/apm/public/components/routing/app_root.tsx b/x-pack/plugins/apm/public/components/routing/app_root.tsx
index 2bb387ae315ff..8fc59a01eeca0 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root.tsx
@@ -24,7 +24,7 @@ import {
 } from '../../context/apm_plugin/apm_plugin_context';
 import { LicenseProvider } from '../../context/license/license_context';
 import { UrlParamsProvider } from '../../context/url_params_context/url_params_context';
-import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
+import { useApmBreadcrumbs } from '../../hooks/use_apm_breadcrumbs';
 import { ApmPluginStartDeps } from '../../plugin';
 import { HeaderMenuPortal } from '../../../../observability/public';
 import { ApmHeaderActionMenu } from '../shared/apm_header_action_menu';
@@ -79,7 +79,7 @@ export function ApmAppRoot({
 }
 
 function MountApmHeaderActionMenu() {
-  useBreadcrumbs(apmRouteConfig);
+  useApmBreadcrumbs(apmRouteConfig);
   const { setHeaderActionMenu } = useApmPluginContext().appMountParameters;
 
   return (
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
index a16f81826636b..bcc1932dde7cb 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
@@ -44,6 +44,7 @@ const mockCore = {
       ml: {},
     },
     currentAppId$: new Observable(),
+    getUrlForApp: (appId: string) => '',
     navigateToUrl: (url: string) => {},
   },
   chrome: {
diff --git a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.test.tsx
similarity index 79%
rename from x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx
rename to x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.test.tsx
index 64990651b52bb..1cdb84c324750 100644
--- a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.test.tsx
@@ -15,14 +15,15 @@ import {
   mockApmPluginContextValue,
   MockApmPluginContextWrapper,
 } from '../context/apm_plugin/mock_apm_plugin_context';
-import { useBreadcrumbs } from './use_breadcrumbs';
+import { useApmBreadcrumbs } from './use_apm_breadcrumbs';
+import { useBreadcrumbs } from '../../../observability/public';
+
+jest.mock('../../../observability/public');
 
 function createWrapper(path: string) {
   return ({ children }: { children?: ReactNode }) => {
     const value = (produce(mockApmPluginContextValue, (draft) => {
       draft.core.application.navigateToUrl = (url: string) => Promise.resolve();
-      draft.core.chrome.docTitle.change = changeTitle;
-      draft.core.chrome.setBreadcrumbs = setBreadcrumbs;
     }) as unknown) as ApmPluginContextValue;
 
     return (
@@ -36,27 +37,18 @@ function createWrapper(path: string) {
 }
 
 function mountBreadcrumb(path: string) {
-  renderHook(() => useBreadcrumbs(apmRouteConfig), {
+  renderHook(() => useApmBreadcrumbs(apmRouteConfig), {
     wrapper: createWrapper(path),
   });
 }
 
-const changeTitle = jest.fn();
-const setBreadcrumbs = jest.fn();
-
-describe('useBreadcrumbs', () => {
-  it('changes the page title', () => {
-    mountBreadcrumb('/');
-
-    expect(changeTitle).toHaveBeenCalledWith(['APM']);
-  });
-
+describe('useApmBreadcrumbs', () => {
   test('/services/:serviceName/errors/:groupId', () => {
     mountBreadcrumb(
       '/services/opbeans-node/errors/myGroupId?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0'
     );
 
-    expect(setBreadcrumbs).toHaveBeenCalledWith(
+    expect(useBreadcrumbs).toHaveBeenCalledWith(
       expect.arrayContaining([
         expect.objectContaining({
           text: 'APM',
@@ -81,20 +73,12 @@ describe('useBreadcrumbs', () => {
         expect.objectContaining({ text: 'myGroupId', href: undefined }),
       ])
     );
-
-    expect(changeTitle).toHaveBeenCalledWith([
-      'myGroupId',
-      'Errors',
-      'opbeans-node',
-      'Services',
-      'APM',
-    ]);
   });
 
   test('/services/:serviceName/errors', () => {
     mountBreadcrumb('/services/opbeans-node/errors?kuery=myKuery');
 
-    expect(setBreadcrumbs).toHaveBeenCalledWith(
+    expect(useBreadcrumbs).toHaveBeenCalledWith(
       expect.arrayContaining([
         expect.objectContaining({
           text: 'APM',
@@ -111,19 +95,12 @@ describe('useBreadcrumbs', () => {
         expect.objectContaining({ text: 'Errors', href: undefined }),
       ])
     );
-
-    expect(changeTitle).toHaveBeenCalledWith([
-      'Errors',
-      'opbeans-node',
-      'Services',
-      'APM',
-    ]);
   });
 
   test('/services/:serviceName/transactions', () => {
     mountBreadcrumb('/services/opbeans-node/transactions?kuery=myKuery');
 
-    expect(setBreadcrumbs).toHaveBeenCalledWith(
+    expect(useBreadcrumbs).toHaveBeenCalledWith(
       expect.arrayContaining([
         expect.objectContaining({
           text: 'APM',
@@ -140,13 +117,6 @@ describe('useBreadcrumbs', () => {
         expect.objectContaining({ text: 'Transactions', href: undefined }),
       ])
     );
-
-    expect(changeTitle).toHaveBeenCalledWith([
-      'Transactions',
-      'opbeans-node',
-      'Services',
-      'APM',
-    ]);
   });
 
   test('/services/:serviceName/transactions/view?transactionName=my-transaction-name', () => {
@@ -154,7 +124,7 @@ describe('useBreadcrumbs', () => {
       '/services/opbeans-node/transactions/view?kuery=myKuery&transactionName=my-transaction-name'
     );
 
-    expect(setBreadcrumbs).toHaveBeenCalledWith(
+    expect(useBreadcrumbs).toHaveBeenCalledWith(
       expect.arrayContaining([
         expect.objectContaining({
           text: 'APM',
@@ -179,13 +149,5 @@ describe('useBreadcrumbs', () => {
         }),
       ])
     );
-
-    expect(changeTitle).toHaveBeenCalledWith([
-      'my-transaction-name',
-      'Transactions',
-      'opbeans-node',
-      'Services',
-      'APM',
-    ]);
   });
 });
diff --git a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.ts
similarity index 85%
rename from x-pack/plugins/apm/public/hooks/use_breadcrumbs.ts
rename to x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.ts
index d907c27319d26..d64bcadf79577 100644
--- a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/apm/public/hooks/use_apm_breadcrumbs.ts
@@ -7,14 +7,15 @@
 
 import { History, Location } from 'history';
 import { ChromeBreadcrumb } from 'kibana/public';
-import { MouseEvent, ReactNode, useEffect } from 'react';
+import { MouseEvent } from 'react';
 import {
+  match as Match,
   matchPath,
   RouteComponentProps,
   useHistory,
-  match as Match,
   useLocation,
 } from 'react-router-dom';
+import { useBreadcrumbs } from '../../../observability/public';
 import { APMRouteDefinition, BreadcrumbTitle } from '../application/routes';
 import { getAPMHref } from '../components/shared/Links/apm/APMLink';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
@@ -164,33 +165,17 @@ function routeDefinitionsToBreadcrumbs({
   return breadcrumbs;
 }
 
-/**
- * Get an array for a page title from a list of breadcrumbs
- */
-function getTitleFromBreadcrumbs(breadcrumbs: ChromeBreadcrumb[]): string[] {
-  function removeNonStrings(item: ReactNode): item is string {
-    return typeof item === 'string';
-  }
-
-  return breadcrumbs
-    .map(({ text }) => text)
-    .reverse()
-    .filter(removeNonStrings);
-}
-
 /**
  * Determine the breadcrumbs from the routes, set them, and update the page
  * title when the route changes.
  */
-export function useBreadcrumbs(routes: APMRouteDefinition[]) {
+export function useApmBreadcrumbs(routes: APMRouteDefinition[]) {
   const history = useHistory();
   const location = useLocation();
   const { search } = location;
   const { core } = useApmPluginContext();
   const { basePath } = core.http;
   const { navigateToUrl } = core.application;
-  const { docTitle, setBreadcrumbs } = core.chrome;
-  const changeTitle = docTitle.change;
 
   function wrappedGetAPMHref(path: string) {
     return getAPMHref({ basePath, path, search });
@@ -206,10 +191,6 @@ export function useBreadcrumbs(routes: APMRouteDefinition[]) {
     wrappedGetAPMHref,
     navigateToUrl,
   });
-  const title = getTitleFromBreadcrumbs(breadcrumbs);
 
-  useEffect(() => {
-    changeTitle(title);
-    setBreadcrumbs(breadcrumbs);
-  }, [breadcrumbs, changeTitle, location, title, setBreadcrumbs]);
+  useBreadcrumbs(breadcrumbs);
 }

From 7a3d61fb671fe549444dcb266b46d4664d8f3dc5 Mon Sep 17 00:00:00 2001
From: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
Date: Thu, 24 Jun 2021 13:45:39 +0200
Subject: [PATCH 33/95] [load testing] adjust ES heap size (#101906)

* [load testing] increase es heap to 2g

* update default simulation

* [heap size] 4g

* [heap size] 6g

* [load testing] es heap size 8g

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/test/load/config.ts | 1 +
 x-pack/test/load/runner.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/load/config.ts b/x-pack/test/load/config.ts
index 514440fd73f46..8f8708d155fb1 100644
--- a/x-pack/test/load/config.ts
+++ b/x-pack/test/load/config.ts
@@ -30,6 +30,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     esTestCluster: {
       ...xpackFunctionalTestsConfig.get('esTestCluster'),
       serverArgs: [...xpackFunctionalTestsConfig.get('esTestCluster.serverArgs')],
+      esJavaOpts: '-Xms8g -Xmx8g',
     },
 
     kbnTestServer: {
diff --git a/x-pack/test/load/runner.ts b/x-pack/test/load/runner.ts
index 3e7a4817eeef1..2d379391b2089 100644
--- a/x-pack/test/load/runner.ts
+++ b/x-pack/test/load/runner.ts
@@ -18,7 +18,7 @@ const simulationPackage = 'org.kibanaLoadTest.simulation';
 const simulationFIleExtension = '.scala';
 const gatlingProjectRootPath: string =
   process.env.GATLING_PROJECT_PATH || resolve(REPO_ROOT, '../kibana-load-testing');
-const simulationEntry: string = process.env.GATLING_SIMULATIONS || 'DemoJourney';
+const simulationEntry: string = process.env.GATLING_SIMULATIONS || 'branch.DemoJourney';
 
 if (!Fs.existsSync(gatlingProjectRootPath)) {
   throw createFlagError(

From 9b9c47b269a437dad69ddb384b2ea6b124a60e5b Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 24 Jun 2021 14:45:15 +0200
Subject: [PATCH 34/95] [Fleet] Fix double policy header layout (#103076)

* Fix double policy header layout

- Use the default page title without tabs while loading the
  add integration view

* remove unused import

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../fleet/public/applications/fleet/app.tsx   | 30 +++++++++-----
 .../fleet/layouts/{ => default}/default.tsx   | 35 +++-------------
 .../layouts/default/default_page_title.tsx    | 40 +++++++++++++++++++
 .../fleet/layouts/default/index.ts            |  9 +++++
 .../applications/fleet/layouts/index.tsx      |  2 +-
 5 files changed, 75 insertions(+), 41 deletions(-)
 rename x-pack/plugins/fleet/public/applications/fleet/layouts/{ => default}/default.tsx (65%)
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/layouts/default/default_page_title.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/layouts/default/index.ts

diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index c4cc4d92f5d95..8be6232733def 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
+import type { FunctionComponent } from 'react';
 import React, { memo, useEffect, useState } from 'react';
 import type { AppMountParameters } from 'kibana/public';
 import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel, EuiPortal } from '@elastic/eui';
 import type { History } from 'history';
 import { createHashHistory } from 'history';
-import { Router, Redirect, Route, Switch } from 'react-router-dom';
+import { Router, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
@@ -39,7 +40,7 @@ import { Error, Loading, SettingFlyout, FleetSetupLoading } from './components';
 import type { UIExtensionsStorage } from './types';
 
 import { FLEET_ROUTING_PATHS } from './constants';
-import { DefaultLayout, WithoutHeaderLayout } from './layouts';
+import { DefaultLayout, DefaultPageTitle, WithoutHeaderLayout, WithHeaderLayout } from './layouts';
 import { AgentPolicyApp } from './sections/agent_policy';
 import { DataStreamApp } from './sections/data_stream';
 import { AgentsApp } from './sections/agents';
@@ -48,11 +49,18 @@ import { EnrollmentTokenListPage } from './sections/agents/enrollment_token_list
 
 const FEEDBACK_URL = 'https://ela.st/fleet-feedback';
 
-const ErrorLayout = ({ children }: { children: JSX.Element }) => (
+const ErrorLayout: FunctionComponent<{ isAddIntegrationsPath: boolean }> = ({
+  isAddIntegrationsPath,
+  children,
+}) => (
   <EuiErrorBoundary>
-    <DefaultLayout>
-      <WithoutHeaderLayout>{children}</WithoutHeaderLayout>
-    </DefaultLayout>
+    {isAddIntegrationsPath ? (
+      <WithHeaderLayout leftColumn={<DefaultPageTitle />}>{children}</WithHeaderLayout>
+    ) : (
+      <DefaultLayout>
+        <WithoutHeaderLayout>{children}</WithoutHeaderLayout>
+      </DefaultLayout>
+    )}
   </EuiErrorBoundary>
 );
 
@@ -71,6 +79,8 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
   const [isInitialized, setIsInitialized] = useState(false);
   const [initializationError, setInitializationError] = useState<Error | null>(null);
 
+  const isAddIntegrationsPath = !!useRouteMatch(FLEET_ROUTING_PATHS.add_integration_to_policy);
+
   useEffect(() => {
     (async () => {
       setIsPermissionsLoading(false);
@@ -109,7 +119,7 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
 
   if (isPermissionsLoading || permissionsError) {
     return (
-      <ErrorLayout>
+      <ErrorLayout isAddIntegrationsPath={isAddIntegrationsPath}>
         {isPermissionsLoading ? (
           <Loading />
         ) : permissionsError === 'REQUEST_ERROR' ? (
@@ -168,7 +178,7 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
 
   if (!isInitialized || initializationError) {
     return (
-      <ErrorLayout>
+      <ErrorLayout isAddIntegrationsPath={isAddIntegrationsPath}>
         {initializationError ? (
           <Error
             title={
@@ -314,9 +324,7 @@ export const AppRoutes = memo(
 
           {/* TODO: Move this route to the Integrations app */}
           <Route path={FLEET_ROUTING_PATHS.add_integration_to_policy}>
-            <DefaultLayout>
-              <CreatePackagePolicyPage />
-            </DefaultLayout>
+            <CreatePackagePolicyPage />
           </Route>
 
           <Redirect to={FLEET_ROUTING_PATHS.agents} />
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/default.tsx
similarity index 65%
rename from x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx
rename to x-pack/plugins/fleet/public/applications/fleet/layouts/default/default.tsx
index f312ff374d792..c6ef212b3995e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/default.tsx
@@ -6,12 +6,13 @@
  */
 
 import React from 'react';
-import { EuiText, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import type { Section } from '../sections';
-import { useLink, useConfig } from '../hooks';
-import { WithHeaderLayout } from '../../../layouts';
+import type { Section } from '../../sections';
+import { useLink, useConfig } from '../../hooks';
+import { WithHeaderLayout } from '../../../../layouts';
+
+import { DefaultPageTitle } from './default_page_title';
 
 interface Props {
   section?: Section;
@@ -24,31 +25,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({ section, childre
 
   return (
     <WithHeaderLayout
-      leftColumn={
-        <EuiFlexGroup direction="column" gutterSize="m">
-          <EuiFlexItem>
-            <EuiFlexGroup responsive={false} gutterSize="s" alignItems="center">
-              <EuiFlexItem grow={false}>
-                <EuiTitle size="l">
-                  <h1>
-                    <FormattedMessage id="xpack.fleet.overviewPageTitle" defaultMessage="Fleet" />
-                  </h1>
-                </EuiTitle>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiText color="subdued">
-              <p>
-                <FormattedMessage
-                  id="xpack.fleet.overviewPageSubtitle"
-                  defaultMessage="Centralized management for Elastic Agents"
-                />
-              </p>
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      }
+      leftColumn={<DefaultPageTitle />}
       tabs={[
         {
           name: (
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/default/default_page_title.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/default_page_title.tsx
new file mode 100644
index 0000000000000..e525a059b7837
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/default_page_title.tsx
@@ -0,0 +1,40 @@
+/*
+ * 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 type { FunctionComponent } from 'react';
+import React from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiText } from '@elastic/eui';
+
+export const DefaultPageTitle: FunctionComponent = () => {
+  return (
+    <EuiFlexGroup direction="column" gutterSize="m">
+      <EuiFlexItem>
+        <EuiFlexGroup responsive={false} gutterSize="s" alignItems="center">
+          <EuiFlexItem grow={false}>
+            <EuiTitle size="l">
+              <h1>
+                <FormattedMessage id="xpack.fleet.overviewPageTitle" defaultMessage="Fleet" />
+              </h1>
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiText color="subdued">
+          <p>
+            <FormattedMessage
+              id="xpack.fleet.overviewPageSubtitle"
+              defaultMessage="Centralized management for Elastic Agents"
+            />
+          </p>
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/default/index.ts b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/index.ts
new file mode 100644
index 0000000000000..9b0d3ee06138f
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/default/index.ts
@@ -0,0 +1,9 @@
+/*
+ * 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 { DefaultLayout } from './default';
+export { DefaultPageTitle } from './default_page_title';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
index 71cb8d3aeeb36..0c07f1ffecb79 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
@@ -7,4 +7,4 @@
 
 export * from '../../../layouts';
 
-export { DefaultLayout } from './default';
+export { DefaultLayout, DefaultPageTitle } from './default';

From 2a8f3eb2f921cfb1d6a5faaac59cbac5aac24910 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 24 Jun 2021 14:45:35 +0200
Subject: [PATCH 35/95] [Fleet] Fix staleness bug in "Add agent" flyout
 (#103095)

* * Fix stale enrollment api token bug
* Refactored naming

* raise the state of the selected enrollment api key to parent to avoid state sync issues

* removed consts for onKeyChange and selectedApiKeyId

* fix typo

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...advanced_agent_authentication_settings.tsx | 38 ++++++++----------
 .../agent_policy_selection.tsx                | 40 ++++++++++---------
 .../managed_instructions.tsx                  | 11 ++---
 .../agent_enrollment_flyout/steps.tsx         | 12 ++++--
 4 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/advanced_agent_authentication_settings.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/advanced_agent_authentication_settings.tsx
index 25602b7e108fd..96fab27a55050 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/advanced_agent_authentication_settings.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/advanced_agent_authentication_settings.tsx
@@ -21,20 +21,19 @@ import {
 
 interface Props {
   agentPolicyId?: string;
+  selectedApiKeyId?: string;
   onKeyChange: (key?: string) => void;
 }
 
 export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
   agentPolicyId,
+  selectedApiKeyId,
   onKeyChange,
 }) => {
   const { notifications } = useStartServices();
   const [enrollmentAPIKeys, setEnrollmentAPIKeys] = useState<GetEnrollmentAPIKeysResponse['list']>(
     []
   );
-  // TODO: Remove this piece of state since we don't need it here. The currently selected enrollment API key only
-  // needs to live on the form
-  const [selectedEnrollmentApiKey, setSelectedEnrollmentApiKey] = useState<undefined | string>();
   const [isLoadingEnrollmentKey, setIsLoadingEnrollmentKey] = useState(false);
   const [isAuthenticationSettingsOpen, setIsAuthenticationSettingsOpen] = useState<boolean>(false);
 
@@ -51,7 +50,7 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
           return;
         }
         setEnrollmentAPIKeys([res.data.item]);
-        setSelectedEnrollmentApiKey(res.data.item.id);
+        onKeyChange(res.data.item.id);
         notifications.toasts.addSuccess(
           i18n.translate('xpack.fleet.newEnrollmentKey.keyCreatedToasts', {
             defaultMessage: 'Enrollment token created',
@@ -66,15 +65,6 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
     }
   };
 
-  useEffect(
-    function triggerOnKeyChangeEffect() {
-      if (onKeyChange) {
-        onKeyChange(selectedEnrollmentApiKey);
-      }
-    },
-    [onKeyChange, selectedEnrollmentApiKey]
-  );
-
   useEffect(
     function useEnrollmentKeysForAgentPolicyEffect() {
       if (!agentPolicyId) {
@@ -97,9 +87,13 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
             throw new Error('No data while fetching enrollment API keys');
           }
 
-          setEnrollmentAPIKeys(
-            res.data.list.filter((key) => key.policy_id === agentPolicyId && key.active === true)
+          const enrollmentAPIKeysResponse = res.data.list.filter(
+            (key) => key.policy_id === agentPolicyId && key.active === true
           );
+
+          setEnrollmentAPIKeys(enrollmentAPIKeysResponse);
+          // Default to the first enrollment key if there is one.
+          onKeyChange(enrollmentAPIKeysResponse[0]?.id);
         } catch (error) {
           notifications.toasts.addError(error, {
             title: 'Error',
@@ -108,21 +102,21 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
       }
       fetchEnrollmentAPIKeys();
     },
-    [agentPolicyId, notifications.toasts]
+    [onKeyChange, agentPolicyId, notifications.toasts]
   );
 
   useEffect(
     function useDefaultEnrollmentKeyForAgentPolicyEffect() {
       if (
-        !selectedEnrollmentApiKey &&
+        !selectedApiKeyId &&
         enrollmentAPIKeys.length > 0 &&
         enrollmentAPIKeys[0].policy_id === agentPolicyId
       ) {
         const enrollmentAPIKeyId = enrollmentAPIKeys[0].id;
-        setSelectedEnrollmentApiKey(enrollmentAPIKeyId);
+        onKeyChange(enrollmentAPIKeyId);
       }
     },
-    [enrollmentAPIKeys, selectedEnrollmentApiKey, agentPolicyId]
+    [enrollmentAPIKeys, selectedApiKeyId, agentPolicyId, onKeyChange]
   );
   return (
     <>
@@ -139,14 +133,14 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
       {isAuthenticationSettingsOpen && (
         <>
           <EuiSpacer size="m" />
-          {enrollmentAPIKeys.length && selectedEnrollmentApiKey ? (
+          {enrollmentAPIKeys.length && selectedApiKeyId ? (
             <EuiSelect
               fullWidth
               options={enrollmentAPIKeys.map((key) => ({
                 value: key.id,
                 text: key.name,
               }))}
-              value={selectedEnrollmentApiKey || undefined}
+              value={selectedApiKeyId || undefined}
               prepend={
                 <EuiText>
                   <FormattedMessage
@@ -156,7 +150,7 @@ export const AdvancedAgentAuthenticationSettings: FunctionComponent<Props> = ({
                 </EuiText>
               }
               onChange={(e) => {
-                setSelectedEnrollmentApiKey(e.target.value);
+                onKeyChange(e.target.value);
               }}
             />
           ) : (
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
index f92b2d4825935..d9d1aa2e77f86 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -22,6 +22,7 @@ type Props = {
 } & (
   | {
       withKeySelection: true;
+      selectedApiKeyId?: string;
       onKeyChange?: (key?: string) => void;
     }
   | {
@@ -31,9 +32,9 @@ type Props = {
 
 const resolveAgentId = (
   agentPolicies?: AgentPolicy[],
-  selectedAgentId?: string
+  selectedAgentPolicyId?: string
 ): undefined | string => {
-  if (agentPolicies && agentPolicies.length && !selectedAgentId) {
+  if (agentPolicies && agentPolicies.length && !selectedAgentPolicyId) {
     if (agentPolicies.length === 1) {
       return agentPolicies[0].id;
     }
@@ -44,33 +45,33 @@ const resolveAgentId = (
     }
   }
 
-  return selectedAgentId;
+  return selectedAgentPolicyId;
 };
 
 export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
-  const { withKeySelection, agentPolicies, onAgentPolicyChange, excludeFleetServer } = props;
-  const onKeyChange = props.withKeySelection && props.onKeyChange;
-  const [selectedAgentId, setSelectedAgentId] = useState<undefined | string>(
+  const { agentPolicies, onAgentPolicyChange, excludeFleetServer } = props;
+
+  const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<undefined | string>(
     () => resolveAgentId(agentPolicies, undefined) // no agent id selected yet
   );
 
   useEffect(
     function triggerOnAgentPolicyChangeEffect() {
       if (onAgentPolicyChange) {
-        onAgentPolicyChange(selectedAgentId);
+        onAgentPolicyChange(selectedAgentPolicyId);
       }
     },
-    [selectedAgentId, onAgentPolicyChange]
+    [selectedAgentPolicyId, onAgentPolicyChange]
   );
 
   useEffect(
     function useDefaultAgentPolicyEffect() {
-      const resolvedId = resolveAgentId(agentPolicies, selectedAgentId);
-      if (resolvedId !== selectedAgentId) {
-        setSelectedAgentId(resolvedId);
+      const resolvedId = resolveAgentId(agentPolicies, selectedAgentPolicyId);
+      if (resolvedId !== selectedAgentPolicyId) {
+        setSelectedAgentPolicyId(resolvedId);
       }
     },
-    [agentPolicies, selectedAgentId]
+    [agentPolicies, selectedAgentPolicyId]
   );
 
   return (
@@ -90,25 +91,26 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
           value: agentPolicy.id,
           text: agentPolicy.name,
         }))}
-        value={selectedAgentId || undefined}
-        onChange={(e) => setSelectedAgentId(e.target.value)}
+        value={selectedAgentPolicyId || undefined}
+        onChange={(e) => setSelectedAgentPolicyId(e.target.value)}
         aria-label={i18n.translate('xpack.fleet.enrollmentStepAgentPolicy.policySelectAriaLabel', {
           defaultMessage: 'Agent policy',
         })}
       />
       <EuiSpacer size="m" />
-      {selectedAgentId && (
+      {selectedAgentPolicyId && (
         <AgentPolicyPackageBadges
-          agentPolicyId={selectedAgentId}
+          agentPolicyId={selectedAgentPolicyId}
           excludeFleetServer={excludeFleetServer}
         />
       )}
-      {withKeySelection && onKeyChange && (
+      {props.withKeySelection && props.onKeyChange && (
         <>
           <EuiSpacer />
           <AdvancedAgentAuthenticationSettings
-            onKeyChange={onKeyChange}
-            agentPolicyId={selectedAgentId}
+            selectedApiKeyId={props.selectedApiKeyId}
+            onKeyChange={props.onKeyChange}
+            agentPolicyId={selectedAgentPolicyId}
           />
         </>
       )}
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx
index 919f0c3052db9..efae8db377f7f 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -62,10 +62,10 @@ export const ManagedInstructions = React.memo<Props>(
   ({ agentPolicy, agentPolicies, viewDataStepContent }) => {
     const fleetStatus = useFleetStatus();
 
-    const [selectedAPIKeyId, setSelectedAPIKeyId] = useState<string | undefined>();
+    const [selectedApiKeyId, setSelectedAPIKeyId] = useState<string | undefined>();
     const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState<boolean>(false);
 
-    const apiKey = useGetOneEnrollmentAPIKey(selectedAPIKeyId);
+    const apiKey = useGetOneEnrollmentAPIKey(selectedApiKeyId);
     const settings = useGetSettings();
     const fleetServerInstructions = useFleetServerInstructions(apiKey?.data?.item?.policy_id);
 
@@ -84,10 +84,11 @@ export const ManagedInstructions = React.memo<Props>(
         !agentPolicy
           ? AgentPolicySelectionStep({
               agentPolicies,
+              selectedApiKeyId,
               setSelectedAPIKeyId,
               setIsFleetServerPolicySelected,
             })
-          : AgentEnrollmentKeySelectionStep({ agentPolicy, setSelectedAPIKeyId }),
+          : AgentEnrollmentKeySelectionStep({ agentPolicy, selectedApiKeyId, setSelectedAPIKeyId }),
       ];
       if (isFleetServerPolicySelected) {
         baseSteps.push(
@@ -101,7 +102,7 @@ export const ManagedInstructions = React.memo<Props>(
           title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
             defaultMessage: 'Enroll and start the Elastic Agent',
           }),
-          children: selectedAPIKeyId && apiKey.data && (
+          children: selectedApiKeyId && apiKey.data && (
             <ManualInstructions apiKey={apiKey.data.item} fleetServerHosts={fleetServerHosts} />
           ),
         });
@@ -115,7 +116,7 @@ export const ManagedInstructions = React.memo<Props>(
     }, [
       agentPolicy,
       agentPolicies,
-      selectedAPIKeyId,
+      selectedApiKeyId,
       apiKey.data,
       isFleetServerPolicySelected,
       settings.data?.item?.fleet_server_hosts,
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps.tsx
index 03cff88e63969..8b12994473e34 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps.tsx
@@ -49,14 +49,16 @@ export const DownloadStep = () => {
 
 export const AgentPolicySelectionStep = ({
   agentPolicies,
-  setSelectedAPIKeyId,
   setSelectedPolicyId,
-  setIsFleetServerPolicySelected,
+  selectedApiKeyId,
+  setSelectedAPIKeyId,
   excludeFleetServer,
+  setIsFleetServerPolicySelected,
 }: {
   agentPolicies?: AgentPolicy[];
-  setSelectedAPIKeyId?: (key?: string) => void;
   setSelectedPolicyId?: (policyId?: string) => void;
+  selectedApiKeyId?: string;
+  setSelectedAPIKeyId?: (key?: string) => void;
   setIsFleetServerPolicySelected?: (selected: boolean) => void;
   excludeFleetServer?: boolean;
 }) => {
@@ -99,6 +101,7 @@ export const AgentPolicySelectionStep = ({
       <EnrollmentStepAgentPolicy
         agentPolicies={regularAgentPolicies}
         withKeySelection={setSelectedAPIKeyId ? true : false}
+        selectedApiKeyId={selectedApiKeyId}
         onKeyChange={setSelectedAPIKeyId}
         onAgentPolicyChange={onAgentPolicyChange}
         excludeFleetServer={excludeFleetServer}
@@ -109,9 +112,11 @@ export const AgentPolicySelectionStep = ({
 
 export const AgentEnrollmentKeySelectionStep = ({
   agentPolicy,
+  selectedApiKeyId,
   setSelectedAPIKeyId,
 }: {
   agentPolicy: AgentPolicy;
+  selectedApiKeyId?: string;
   setSelectedAPIKeyId: (key?: string) => void;
 }) => {
   return {
@@ -132,6 +137,7 @@ export const AgentEnrollmentKeySelectionStep = ({
         <EuiSpacer size="l" />
         <AdvancedAgentAuthenticationSettings
           agentPolicyId={agentPolicy.id}
+          selectedApiKeyId={selectedApiKeyId}
           onKeyChange={setSelectedAPIKeyId}
         />
       </>

From a50d94908c3202ba462aac8421b3f9acb333f4d2 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Thu, 24 Jun 2021 07:57:49 -0500
Subject: [PATCH 36/95] [Enterprise Search] Add User management feature
 (#103173)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rename method to close both flyouts

This is shared with the forthcoming user flyouts

closeRoleMappingFlyout -> closeUsersAndRolesFlyout

* Add logic for elasticsearch users and single user role mappings

* Add logic for various form states

- Showing and hiding flyouts
- Select and text input values
- User created state to turn flyout into a success message state

* Add User server routes

* Add logic for saving a user

* Add User components

* Add User list and User flyout to RoleMappings view

* Fix path

* Rename things

- Users & roles -> Users and roles
- roleId -> roleMappingId (matches other places in code)
- also added a missing prop to the actions col

* Set default group when modal closed

The UI sets the default group on page load but did not cover the case where the user has chosen a group in a previous interaction and the closed the flyout. This commit adds a method that resets that state when the flyout is closed

Part of porting of https://github.com/elastic/ent-search/pull/3865

Specifically:
https://github.com/elastic/ent-search/commit/a4131b95dab7c0df97bd78e660f25e09ac3e7cec

* Adds tooltip for external attribute

This was missed from the design

Part of porting of https://github.com/elastic/ent-search/pull/3865

Specifically:
https://github.com/elastic/ent-search/commit/03aa349cab4fb32069b64ab8c51a7252ba52e805

* Fix invitations link

* Fix incorrect role type

Role-> RoleTypes
🤷🏽‍♀️

* Add EuiPortal to Flyout

Wasn’t needed in ent-search; already done for RomeMappingFlyout. Hide whitespace changes plskthx

* Auth provider deprecation warning in mapping UI

Since we're moving fully into Kibana, we're losing our concept of auth providers. In 8.0, role mappings the specify an auth provider will no
longer work, so this adds a small deprecation warning in the role mappings table.

https://github.com/elastic/ent-search/pull/3885

* Email is no longer required

After a slack discussion, it was determined that email should be optional.

This commit also fixes another instance of the App Search role type being wrong.

* Existing users’ usernames should not be editable

* Use EuiLink instead of anchor

* Add validation tests

* Change URL for users_and_roles

Need to change folder and file names but will punt until after 7.14FF

I did throw in updating the logic file path

* Remove unused import

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../app_search/components/layout/nav.test.tsx |   4 +-
 .../app_search/components/layout/nav.tsx      |   4 +-
 .../components/role_mappings/role_mapping.tsx |   4 +-
 .../role_mappings/role_mappings.test.tsx      |  42 ++-
 .../role_mappings/role_mappings.tsx           |  31 ++
 .../role_mappings/role_mappings_logic.test.ts | 274 +++++++++++++++-
 .../role_mappings/role_mappings_logic.ts      | 181 ++++++++++-
 .../components/role_mappings/user.test.tsx    | 124 +++++++
 .../components/role_mappings/user.tsx         | 106 ++++++
 .../applications/app_search/index.test.tsx    |   2 +-
 .../public/applications/app_search/index.tsx  |   6 +-
 .../public/applications/app_search/routes.ts  |   2 +-
 .../shared/role_mapping/constants.ts          |  18 +-
 .../role_mapping/role_mapping_flyout.test.tsx |   4 +-
 .../role_mapping/role_mapping_flyout.tsx      |  10 +-
 .../role_mapping/role_mappings_table.test.tsx |  12 +-
 .../role_mapping/role_mappings_table.tsx      |  42 ++-
 .../role_mapping/user_added_info.test.tsx     | 100 +++++-
 .../shared/role_mapping/user_added_info.tsx   |   6 +-
 .../shared/role_mapping/user_flyout.tsx       |  39 ++-
 .../role_mapping/user_invitation_callout.tsx  |   2 +-
 .../role_mapping/user_selector.test.tsx       |   3 +-
 .../shared/role_mapping/user_selector.tsx     |   5 +-
 .../shared/role_mapping/users_table.tsx       |   5 +-
 .../components/layout/nav.test.tsx            |   4 +-
 .../components/layout/nav.tsx                 |   6 +-
 .../workplace_search/constants.ts             |   2 +-
 .../applications/workplace_search/index.tsx   |   4 +-
 .../applications/workplace_search/routes.ts   |   2 +-
 .../views/role_mappings/role_mapping.tsx      |   4 +-
 .../role_mappings/role_mappings.test.tsx      |  40 ++-
 .../views/role_mappings/role_mappings.tsx     |  31 ++
 .../role_mappings/role_mappings_logic.test.ts | 302 ++++++++++++++++--
 .../role_mappings/role_mappings_logic.ts      | 192 ++++++++++-
 .../views/role_mappings/user.test.tsx         | 123 +++++++
 .../views/role_mappings/user.tsx              | 103 ++++++
 .../routes/app_search/role_mappings.test.ts   |  49 +++
 .../server/routes/app_search/role_mappings.ts |  26 ++
 .../workplace_search/role_mappings.test.ts    |  49 +++
 .../routes/workplace_search/role_mappings.ts  |  29 ++
 40 files changed, 1868 insertions(+), 124 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx
index c9f5452e254e1..ce4a118bef095 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx
@@ -100,8 +100,8 @@ describe('useAppSearchNav', () => {
           },
           {
             id: 'usersRoles',
-            name: 'Users & roles',
-            href: '/role_mappings',
+            name: 'Users and roles',
+            href: '/users_and_roles',
           },
         ],
       },
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx
index c3b8ec642233b..793a36f48fe82 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx
@@ -13,7 +13,7 @@ import { generateNavLink } from '../../../shared/layout';
 import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 
 import { AppLogic } from '../../app_logic';
-import { ENGINES_PATH, SETTINGS_PATH, CREDENTIALS_PATH, ROLE_MAPPINGS_PATH } from '../../routes';
+import { ENGINES_PATH, SETTINGS_PATH, CREDENTIALS_PATH, USERS_AND_ROLES_PATH } from '../../routes';
 import { CREDENTIALS_TITLE } from '../credentials';
 import { useEngineNav } from '../engine/engine_nav';
 import { ENGINES_TITLE } from '../engines';
@@ -57,7 +57,7 @@ export const useAppSearchNav = () => {
     navItems.push({
       id: 'usersRoles',
       name: ROLE_MAPPINGS_TITLE,
-      ...generateNavLink({ to: ROLE_MAPPINGS_PATH }),
+      ...generateNavLink({ to: USERS_AND_ROLES_PATH }),
     });
   }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
index b6a9dd72cfd05..dbebd8e46a219 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
@@ -28,7 +28,7 @@ export const RoleMapping: React.FC = () => {
     handleAuthProviderChange,
     handleRoleChange,
     handleSaveMapping,
-    closeRoleMappingFlyout,
+    closeUsersAndRolesFlyout,
   } = useActions(RoleMappingsLogic);
 
   const {
@@ -68,7 +68,7 @@ export const RoleMapping: React.FC = () => {
     <RoleMappingFlyout
       disabled={attributeValueInvalid || !hasEngineAssignment}
       isNew={isNew}
-      closeRoleMappingFlyout={closeRoleMappingFlyout}
+      closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
       handleSaveMapping={handleSaveMapping}
     >
       <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
index 308022ccb2e5a..64bf41a50a2f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
@@ -12,26 +12,39 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
-import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+import {
+  RoleMappingsTable,
+  RoleMappingsHeading,
+  UsersHeading,
+  UsersEmptyPrompt,
+} from '../../../shared/role_mapping';
+import {
+  asRoleMapping,
+  asSingleUserRoleMapping,
+} from '../../../shared/role_mapping/__mocks__/roles';
 
 import { RoleMapping } from './role_mapping';
 import { RoleMappings } from './role_mappings';
+import { User } from './user';
 
 describe('RoleMappings', () => {
   const initializeRoleMappings = jest.fn();
   const initializeRoleMapping = jest.fn();
+  const initializeSingleUserRoleMapping = jest.fn();
   const handleDeleteMapping = jest.fn();
   const mockValues = {
-    roleMappings: [wsRoleMapping],
+    roleMappings: [asRoleMapping],
     dataLoading: false,
     multipleAuthProvidersConfig: false,
+    singleUserRoleMappings: [asSingleUserRoleMapping],
+    singleUserRoleMappingFlyoutOpen: false,
   };
 
   beforeEach(() => {
     setMockActions({
       initializeRoleMappings,
       initializeRoleMapping,
+      initializeSingleUserRoleMapping,
       handleDeleteMapping,
     });
     setMockValues(mockValues);
@@ -50,10 +63,31 @@ describe('RoleMappings', () => {
     expect(wrapper.find(RoleMapping)).toHaveLength(1);
   });
 
-  it('handles onClick', () => {
+  it('renders User flyout', () => {
+    setMockValues({ ...mockValues, singleUserRoleMappingFlyoutOpen: true });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(User)).toHaveLength(1);
+  });
+
+  it('handles RoleMappingsHeading onClick', () => {
     const wrapper = shallow(<RoleMappings />);
     wrapper.find(RoleMappingsHeading).prop('onClick')();
 
     expect(initializeRoleMapping).toHaveBeenCalled();
   });
+
+  it('handles UsersHeading onClick', () => {
+    const wrapper = shallow(<RoleMappings />);
+    wrapper.find(UsersHeading).prop('onClick')();
+
+    expect(initializeSingleUserRoleMapping).toHaveBeenCalled();
+  });
+
+  it('handles empty users state', () => {
+    setMockValues({ ...mockValues, singleUserRoleMappings: [] });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(UsersEmptyPrompt)).toHaveLength(1);
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
index 03e2ae67eca9e..3e692aa48623e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
@@ -9,11 +9,16 @@ import React, { useEffect } from 'react';
 
 import { useActions, useValues } from 'kea';
 
+import { EuiSpacer } from '@elastic/eui';
+
 import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
 import {
   RoleMappingsTable,
   RoleMappingsHeading,
   RolesEmptyPrompt,
+  UsersTable,
+  UsersHeading,
+  UsersEmptyPrompt,
 } from '../../../shared/role_mapping';
 import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 
@@ -23,6 +28,7 @@ import { AppSearchPageTemplate } from '../layout';
 import { ROLE_MAPPINGS_ENGINE_ACCESS_HEADING } from './constants';
 import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
+import { User } from './user';
 
 const ROLES_DOCS_LINK = `${DOCS_PREFIX}/security-and-users.html`;
 
@@ -31,14 +37,17 @@ export const RoleMappings: React.FC = () => {
     enableRoleBasedAccess,
     initializeRoleMappings,
     initializeRoleMapping,
+    initializeSingleUserRoleMapping,
     handleDeleteMapping,
     resetState,
   } = useActions(RoleMappingsLogic);
   const {
     roleMappings,
+    singleUserRoleMappings,
     multipleAuthProvidersConfig,
     dataLoading,
     roleMappingFlyoutOpen,
+    singleUserRoleMappingFlyoutOpen,
   } = useValues(RoleMappingsLogic);
 
   useEffect(() => {
@@ -46,6 +55,8 @@ export const RoleMappings: React.FC = () => {
     return resetState;
   }, []);
 
+  const hasUsers = singleUserRoleMappings.length > 0;
+
   const rolesEmptyState = (
     <RolesEmptyPrompt
       productName={APP_SEARCH_PLUGIN.NAME}
@@ -72,6 +83,23 @@ export const RoleMappings: React.FC = () => {
     </section>
   );
 
+  const usersTable = (
+    <UsersTable
+      accessItemKey="engines"
+      singleUserRoleMappings={singleUserRoleMappings}
+      initializeSingleUserRoleMapping={initializeSingleUserRoleMapping}
+      handleDeleteMapping={handleDeleteMapping}
+    />
+  );
+
+  const usersSection = (
+    <>
+      <UsersHeading onClick={() => initializeSingleUserRoleMapping()} />
+      <EuiSpacer />
+      {hasUsers ? usersTable : <UsersEmptyPrompt />}
+    </>
+  );
+
   return (
     <AppSearchPageTemplate
       pageChrome={[ROLE_MAPPINGS_TITLE]}
@@ -81,7 +109,10 @@ export const RoleMappings: React.FC = () => {
       emptyState={rolesEmptyState}
     >
       {roleMappingFlyoutOpen && <RoleMapping />}
+      {singleUserRoleMappingFlyoutOpen && <User />}
       {roleMappingsSection}
+      <EuiSpacer size="xxl" />
+      {usersSection}
     </AppSearchPageTemplate>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
index 6985f213d1dd5..16b44e9ec1f11 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
@@ -15,11 +15,18 @@ import { engines } from '../../__mocks__/engines.mock';
 
 import { nextTick } from '@kbn/test/jest';
 
-import { asRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
+
+import {
+  asRoleMapping,
+  asSingleUserRoleMapping,
+} from '../../../shared/role_mapping/__mocks__/roles';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
 
 import { RoleMappingsLogic } from './role_mappings_logic';
 
+const emptyUser = { username: '', email: '' };
+
 describe('RoleMappingsLogic', () => {
   const { http } = mockHttpValues;
   const { clearFlashMessages, flashAPIErrors, setSuccessMessage } = mockFlashMessageHelpers;
@@ -28,6 +35,8 @@ describe('RoleMappingsLogic', () => {
     attributes: [],
     availableAuthProviders: [],
     elasticsearchRoles: [],
+    elasticsearchUser: emptyUser,
+    elasticsearchUsers: [],
     roleMapping: null,
     roleMappingFlyoutOpen: false,
     roleMappings: [],
@@ -43,6 +52,12 @@ describe('RoleMappingsLogic', () => {
     selectedAuthProviders: [ANY_AUTH_PROVIDER],
     selectedOptions: [],
     roleMappingErrors: [],
+    singleUserRoleMapping: null,
+    singleUserRoleMappings: [],
+    singleUserRoleMappingFlyoutOpen: false,
+    userCreated: false,
+    userFormIsNewUser: true,
+    userFormUserIsExisting: true,
   };
 
   const mappingsServerProps = {
@@ -53,6 +68,8 @@ describe('RoleMappingsLogic', () => {
     availableEngines: engines,
     elasticsearchRoles: [],
     hasAdvancedRoles: false,
+    singleUserRoleMappings: [asSingleUserRoleMapping],
+    elasticsearchUsers,
   };
 
   beforeEach(() => {
@@ -83,7 +100,19 @@ describe('RoleMappingsLogic', () => {
           elasticsearchRoles: mappingsServerProps.elasticsearchRoles,
           selectedEngines: new Set(),
           selectedOptions: [],
+          elasticsearchUsers,
+          elasticsearchUser: elasticsearchUsers[0],
+          singleUserRoleMappings: [asSingleUserRoleMapping],
+        });
+      });
+
+      it('handles fallback if no elasticsearch users present', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData({
+          ...mappingsServerProps,
+          elasticsearchUsers: [],
         });
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(emptyUser);
       });
     });
 
@@ -94,6 +123,26 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
     });
 
+    describe('setElasticsearchUser', () => {
+      it('sets user', () => {
+        RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(elasticsearchUsers[0]);
+      });
+
+      it('handles fallback if no user present', () => {
+        RoleMappingsLogic.actions.setElasticsearchUser(undefined);
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(emptyUser);
+      });
+    });
+
+    it('setSingleUserRoleMapping', () => {
+      RoleMappingsLogic.actions.setSingleUserRoleMapping(asSingleUserRoleMapping);
+
+      expect(RoleMappingsLogic.values.singleUserRoleMapping).toEqual(asSingleUserRoleMapping);
+    });
+
     it('handleRoleChange', () => {
       RoleMappingsLogic.actions.handleRoleChange('dev');
 
@@ -152,6 +201,12 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    it('setUserExistingRadioValue', () => {
+      RoleMappingsLogic.actions.setUserExistingRadioValue(false);
+
+      expect(RoleMappingsLogic.values.userFormUserIsExisting).toEqual(false);
+    });
+
     describe('handleAttributeSelectorChange', () => {
       const elasticsearchRoles = ['foo', 'bar'];
 
@@ -174,6 +229,8 @@ describe('RoleMappingsLogic', () => {
           attributeName: 'role',
           elasticsearchRoles,
           selectedEngines: new Set(),
+          elasticsearchUsers,
+          singleUserRoleMappings: [asSingleUserRoleMapping],
         });
       });
 
@@ -260,16 +317,59 @@ describe('RoleMappingsLogic', () => {
       expect(clearFlashMessages).toHaveBeenCalled();
     });
 
-    it('closeRoleMappingFlyout', () => {
+    it('openSingleUserRoleMappingFlyout', () => {
+      mount(mappingsServerProps);
+      RoleMappingsLogic.actions.openSingleUserRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.singleUserRoleMappingFlyoutOpen).toEqual(true);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
+
+    it('closeUsersAndRolesFlyout', () => {
       mount({
         ...mappingsServerProps,
         roleMappingFlyoutOpen: true,
       });
-      RoleMappingsLogic.actions.closeRoleMappingFlyout();
+      RoleMappingsLogic.actions.closeUsersAndRolesFlyout();
 
       expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(false);
       expect(clearFlashMessages).toHaveBeenCalled();
     });
+
+    it('setElasticsearchUsernameValue', () => {
+      const username = 'newName';
+      RoleMappingsLogic.actions.setElasticsearchUsernameValue(username);
+
+      expect(RoleMappingsLogic.values).toEqual({
+        ...DEFAULT_VALUES,
+        elasticsearchUser: {
+          ...RoleMappingsLogic.values.elasticsearchUser,
+          username,
+        },
+      });
+    });
+
+    it('setElasticsearchEmailValue', () => {
+      const email = 'newEmail@foo.cats';
+      RoleMappingsLogic.actions.setElasticsearchEmailValue(email);
+
+      expect(RoleMappingsLogic.values).toEqual({
+        ...DEFAULT_VALUES,
+        elasticsearchUser: {
+          ...RoleMappingsLogic.values.elasticsearchUser,
+          email,
+        },
+      });
+    });
+
+    it('setUserCreated', () => {
+      RoleMappingsLogic.actions.setUserCreated();
+
+      expect(RoleMappingsLogic.values).toEqual({
+        ...DEFAULT_VALUES,
+        userCreated: true,
+      });
+    });
   });
 
   describe('listeners', () => {
@@ -335,6 +435,39 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    describe('initializeSingleUserRoleMapping', () => {
+      let setElasticsearchUserSpy: jest.MockedFunction<any>;
+      let setRoleMappingSpy: jest.MockedFunction<any>;
+      let setSingleUserRoleMappingSpy: jest.MockedFunction<any>;
+      beforeEach(() => {
+        setElasticsearchUserSpy = jest.spyOn(RoleMappingsLogic.actions, 'setElasticsearchUser');
+        setRoleMappingSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMapping');
+        setSingleUserRoleMappingSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setSingleUserRoleMapping'
+        );
+      });
+
+      it('should handle the new user state and only set an empty mapping', () => {
+        RoleMappingsLogic.actions.initializeSingleUserRoleMapping();
+
+        expect(setElasticsearchUserSpy).not.toHaveBeenCalled();
+        expect(setRoleMappingSpy).not.toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalledWith(undefined);
+      });
+
+      it('should handle an existing user state and set mapping', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        RoleMappingsLogic.actions.initializeSingleUserRoleMapping(
+          asSingleUserRoleMapping.roleMapping.id
+        );
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalled();
+        expect(setRoleMappingSpy).toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalledWith(asSingleUserRoleMapping);
+      });
+    });
+
     describe('handleSaveMapping', () => {
       const body = {
         roleType: 'owner',
@@ -430,6 +563,94 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    describe('handleSaveUser', () => {
+      it('calls API and refreshes list when new mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
+        const setUserCreatedSpy = jest.spyOn(RoleMappingsLogic.actions, 'setUserCreated');
+        const setSingleUserRoleMappingSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setSingleUserRoleMapping'
+        );
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+
+        http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.handleSaveUser();
+
+        expect(http.post).toHaveBeenCalledWith('/api/app_search/single_user_role_mapping', {
+          body: JSON.stringify({
+            roleMapping: {
+              engines: [],
+              roleType: 'owner',
+              accessAllEngines: true,
+            },
+            elasticsearchUser: {
+              username: elasticsearchUsers[0].username,
+              email: elasticsearchUsers[0].email,
+            },
+          }),
+        });
+        await nextTick();
+
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
+        expect(setUserCreatedSpy).toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalled();
+      });
+
+      it('calls API and refreshes list when existing mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
+        RoleMappingsLogic.actions.setSingleUserRoleMapping(asSingleUserRoleMapping);
+        RoleMappingsLogic.actions.handleAccessAllEnginesChange(false);
+
+        http.put.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.handleSaveUser();
+
+        expect(http.post).toHaveBeenCalledWith('/api/app_search/single_user_role_mapping', {
+          body: JSON.stringify({
+            roleMapping: {
+              engines: [],
+              roleType: 'owner',
+              accessAllEngines: false,
+              id: asSingleUserRoleMapping.roleMapping.id,
+            },
+            elasticsearchUser: {
+              username: '',
+              email: '',
+            },
+          }),
+        });
+        await nextTick();
+
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
+      });
+
+      it('handles error', async () => {
+        const setRoleMappingErrorsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setRoleMappingErrors'
+        );
+
+        http.post.mockReturnValue(
+          Promise.reject({
+            body: {
+              attributes: {
+                errors: ['this is an error'],
+              },
+            },
+          })
+        );
+        RoleMappingsLogic.actions.handleSaveUser();
+        await nextTick();
+
+        expect(setRoleMappingErrorsSpy).toHaveBeenCalledWith(['this is an error']);
+      });
+    });
+
     describe('handleDeleteMapping', () => {
       const roleMappingId = 'r1';
 
@@ -458,5 +679,52 @@ describe('RoleMappingsLogic', () => {
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
     });
+
+    describe('handleUsernameSelectChange', () => {
+      it('sets elasticsearchUser when match found', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.handleUsernameSelectChange(elasticsearchUsers[0].username);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(elasticsearchUsers[0]);
+      });
+
+      it('does not set elasticsearchUser when no match found', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.handleUsernameSelectChange('bogus');
+
+        expect(setElasticsearchUserSpy).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('setUserExistingRadioValue', () => {
+      it('handles existing user', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.setUserExistingRadioValue(true);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(elasticsearchUsers[0]);
+      });
+
+      it('handles new user', () => {
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.setUserExistingRadioValue(false);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(emptyUser);
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
index e2ef75897528c..0b57e1d08a294 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
@@ -16,7 +16,7 @@ import {
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
-import { AttributeName } from '../../../shared/types';
+import { AttributeName, SingleUserRoleMapping, ElasticsearchUser } from '../../../shared/types';
 import { ASRoleMapping, RoleTypes } from '../../types';
 import { roleHasScopedEngines } from '../../utils/role/has_scoped_engines';
 import { Engine } from '../engine/types';
@@ -27,20 +27,25 @@ import {
   ROLE_MAPPING_UPDATED_MESSAGE,
 } from './constants';
 
+type UserMapping = SingleUserRoleMapping<ASRoleMapping>;
+
 interface RoleMappingsServerDetails {
   roleMappings: ASRoleMapping[];
   attributes: string[];
   authProviders: string[];
   availableEngines: Engine[];
   elasticsearchRoles: string[];
+  elasticsearchUsers: ElasticsearchUser[];
   hasAdvancedRoles: boolean;
   multipleAuthProvidersConfig: boolean;
+  singleUserRoleMappings: UserMapping[];
 }
 
 const getFirstAttributeName = (roleMapping: ASRoleMapping) =>
   Object.entries(roleMapping.rules)[0][0] as AttributeName;
 const getFirstAttributeValue = (roleMapping: ASRoleMapping) =>
   Object.entries(roleMapping.rules)[0][1] as AttributeName;
+const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 
 interface RoleMappingsActions {
   handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
@@ -53,21 +58,34 @@ interface RoleMappingsActions {
   handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
   handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
   handleRoleChange(roleType: RoleTypes): { roleType: RoleTypes };
+  handleUsernameSelectChange(username: string): { username: string };
   handleSaveMapping(): void;
+  handleSaveUser(): void;
   initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
+  initializeSingleUserRoleMapping(roleMappingId?: string): { roleMappingId?: string };
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMapping(roleMapping: ASRoleMapping): { roleMapping: ASRoleMapping };
+  setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
   setRoleMappings({
     roleMappings,
   }: {
     roleMappings: ASRoleMapping[];
   }): { roleMappings: ASRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
+  setElasticsearchUser(
+    elasticsearchUser?: ElasticsearchUser
+  ): { elasticsearchUser: ElasticsearchUser };
   openRoleMappingFlyout(): void;
-  closeRoleMappingFlyout(): void;
+  openSingleUserRoleMappingFlyout(): void;
+  closeUsersAndRolesFlyout(): void;
   setRoleMappingErrors(errors: string[]): { errors: string[] };
   enableRoleBasedAccess(): void;
+  setUserExistingRadioValue(userFormUserIsExisting: boolean): { userFormUserIsExisting: boolean };
+  setElasticsearchUsernameValue(username: string): { username: string };
+  setElasticsearchEmailValue(email: string): { email: string };
+  setUserCreated(): void;
+  setUserFormIsNewUser(userFormIsNewUser: boolean): { userFormIsNewUser: boolean };
 }
 
 interface RoleMappingsValues {
@@ -79,27 +97,38 @@ interface RoleMappingsValues {
   availableEngines: Engine[];
   dataLoading: boolean;
   elasticsearchRoles: string[];
+  elasticsearchUsers: ElasticsearchUser[];
+  elasticsearchUser: ElasticsearchUser;
   hasAdvancedRoles: boolean;
   multipleAuthProvidersConfig: boolean;
   roleMapping: ASRoleMapping | null;
   roleMappings: ASRoleMapping[];
+  singleUserRoleMapping: UserMapping | null;
+  singleUserRoleMappings: UserMapping[];
   roleType: RoleTypes;
   selectedAuthProviders: string[];
   selectedEngines: Set<string>;
   roleMappingFlyoutOpen: boolean;
+  singleUserRoleMappingFlyoutOpen: boolean;
   selectedOptions: EuiComboBoxOptionOption[];
   roleMappingErrors: string[];
+  userFormUserIsExisting: boolean;
+  userCreated: boolean;
+  userFormIsNewUser: boolean;
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
-  path: ['enterprise_search', 'app_search', 'role_mappings'],
+  path: ['enterprise_search', 'app_search', 'users_and_roles'],
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMapping: (roleMapping: ASRoleMapping) => ({ roleMapping }),
+    setElasticsearchUser: (elasticsearchUser: ElasticsearchUser) => ({ elasticsearchUser }),
+    setSingleUserRoleMapping: (singleUserRoleMapping: UserMapping) => ({ singleUserRoleMapping }),
     setRoleMappings: ({ roleMappings }: { roleMappings: ASRoleMapping[] }) => ({ roleMappings }),
     setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string) => ({ value }),
     handleRoleChange: (roleType: RoleTypes) => ({ roleType }),
+    handleUsernameSelectChange: (username: string) => ({ username }),
     handleEngineSelectionChange: (engineNames: string[]) => ({ engineNames }),
     handleAttributeSelectorChange: (value: string, firstElasticsearchRole: string) => ({
       value,
@@ -108,13 +137,21 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     handleAttributeValueChange: (value: string) => ({ value }),
     handleAccessAllEnginesChange: (selected: boolean) => ({ selected }),
     enableRoleBasedAccess: true,
+    openSingleUserRoleMappingFlyout: true,
+    setUserExistingRadioValue: (userFormUserIsExisting: boolean) => ({ userFormUserIsExisting }),
     resetState: true,
     initializeRoleMappings: true,
+    initializeSingleUserRoleMapping: (roleMappingId?: string) => ({ roleMappingId }),
     initializeRoleMapping: (roleMappingId) => ({ roleMappingId }),
     handleDeleteMapping: (roleMappingId: string) => ({ roleMappingId }),
     handleSaveMapping: true,
+    handleSaveUser: true,
     openRoleMappingFlyout: true,
-    closeRoleMappingFlyout: false,
+    closeUsersAndRolesFlyout: false,
+    setElasticsearchUsernameValue: (username: string) => ({ username }),
+    setElasticsearchEmailValue: (email: string) => ({ email }),
+    setUserCreated: true,
+    setUserFormIsNewUser: (userFormIsNewUser: boolean) => ({ userFormIsNewUser }),
   },
   reducers: {
     dataLoading: [
@@ -134,6 +171,13 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         resetState: () => [],
       },
     ],
+    singleUserRoleMappings: [
+      [],
+      {
+        setRoleMappingsData: (_, { singleUserRoleMappings }) => singleUserRoleMappings,
+        resetState: () => [],
+      },
+    ],
     multipleAuthProvidersConfig: [
       false,
       {
@@ -165,6 +209,14 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       [],
       {
         setRoleMappingsData: (_, { elasticsearchRoles }) => elasticsearchRoles,
+        closeUsersAndRolesFlyout: () => [ANY_AUTH_PROVIDER],
+      },
+    ],
+    elasticsearchUsers: [
+      [],
+      {
+        setRoleMappingsData: (_, { elasticsearchUsers }) => elasticsearchUsers,
+        resetState: () => [],
       },
     ],
     roleMapping: [
@@ -172,7 +224,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       {
         setRoleMapping: (_, { roleMapping }) => roleMapping,
         resetState: () => null,
-        closeRoleMappingFlyout: () => null,
+        closeUsersAndRolesFlyout: () => null,
       },
     ],
     roleType: [
@@ -188,6 +240,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setRoleMapping: (_, { roleMapping }) => roleMapping.accessAllEngines,
         handleRoleChange: (_, { roleType }) => !roleHasScopedEngines(roleType),
         handleAccessAllEnginesChange: (_, { selected }) => selected,
+        closeUsersAndRolesFlyout: () => true,
       },
     ],
     attributeValue: [
@@ -198,7 +251,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           value === 'role' ? firstElasticsearchRole : '',
         handleAttributeValueChange: (_, { value }) => value,
         resetState: () => '',
-        closeRoleMappingFlyout: () => '',
+        closeUsersAndRolesFlyout: () => '',
       },
     ],
     attributeName: [
@@ -207,7 +260,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setRoleMapping: (_, { roleMapping }) => getFirstAttributeName(roleMapping),
         handleAttributeSelectorChange: (_, { value }) => value,
         resetState: () => 'username',
-        closeRoleMappingFlyout: () => 'username',
+        closeUsersAndRolesFlyout: () => 'username',
       },
     ],
     selectedEngines: [
@@ -222,6 +275,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
 
           return newSelectedEngineNames;
         },
+        closeUsersAndRolesFlyout: () => new Set(),
       },
     ],
     availableAuthProviders: [
@@ -251,17 +305,68 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       false,
       {
         openRoleMappingFlyout: () => true,
-        closeRoleMappingFlyout: () => false,
+        closeUsersAndRolesFlyout: () => false,
         initializeRoleMappings: () => false,
         initializeRoleMapping: () => true,
       },
     ],
+    singleUserRoleMappingFlyoutOpen: [
+      false,
+      {
+        openSingleUserRoleMappingFlyout: () => true,
+        closeUsersAndRolesFlyout: () => false,
+        initializeSingleUserRoleMapping: () => true,
+      },
+    ],
+    singleUserRoleMapping: [
+      null,
+      {
+        setSingleUserRoleMapping: (_, { singleUserRoleMapping }) => singleUserRoleMapping || null,
+        closeUsersAndRolesFlyout: () => null,
+      },
+    ],
     roleMappingErrors: [
       [],
       {
         setRoleMappingErrors: (_, { errors }) => errors,
         handleSaveMapping: () => [],
-        closeRoleMappingFlyout: () => [],
+        closeUsersAndRolesFlyout: () => [],
+      },
+    ],
+    userFormUserIsExisting: [
+      true,
+      {
+        setUserExistingRadioValue: (_, { userFormUserIsExisting }) => userFormUserIsExisting,
+        closeUsersAndRolesFlyout: () => true,
+      },
+    ],
+    elasticsearchUser: [
+      emptyUser,
+      {
+        setRoleMappingsData: (_, { elasticsearchUsers }) => elasticsearchUsers[0] || emptyUser,
+        setElasticsearchUser: (_, { elasticsearchUser }) => elasticsearchUser || emptyUser,
+        setElasticsearchUsernameValue: (state, { username }) => ({
+          ...state,
+          username,
+        }),
+        setElasticsearchEmailValue: (state, { email }) => ({
+          ...state,
+          email,
+        }),
+        closeUsersAndRolesFlyout: () => emptyUser,
+      },
+    ],
+    userCreated: [
+      false,
+      {
+        setUserCreated: () => true,
+        closeUsersAndRolesFlyout: () => false,
+      },
+    ],
+    userFormIsNewUser: [
+      true,
+      {
+        setUserFormIsNewUser: (_, { userFormIsNewUser }) => userFormIsNewUser,
       },
     ],
   },
@@ -303,6 +408,17 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const roleMapping = values.roleMappings.find(({ id }) => id === roleMappingId);
       if (roleMapping) actions.setRoleMapping(roleMapping);
     },
+    initializeSingleUserRoleMapping: ({ roleMappingId }) => {
+      const singleUserRoleMapping = values.singleUserRoleMappings.find(
+        ({ roleMapping }) => roleMapping.id === roleMappingId
+      );
+      if (singleUserRoleMapping) {
+        actions.setElasticsearchUser(singleUserRoleMapping.elasticsearchUser);
+        actions.setRoleMapping(singleUserRoleMapping.roleMapping);
+      }
+      actions.setSingleUserRoleMapping(singleUserRoleMapping);
+      actions.setUserFormIsNewUser(!singleUserRoleMapping);
+    },
     handleDeleteMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
       const route = `/api/app_search/role_mappings/${roleMappingId}`;
@@ -357,11 +473,56 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     resetState: () => {
       clearFlashMessages();
     },
-    closeRoleMappingFlyout: () => {
+    handleSaveUser: async () => {
+      const { http } = HttpLogic.values;
+      const {
+        roleType,
+        singleUserRoleMapping,
+        accessAllEngines,
+        selectedEngines,
+        elasticsearchUser: { email, username },
+      } = values;
+
+      const body = JSON.stringify({
+        roleMapping: {
+          engines: accessAllEngines ? [] : Array.from(selectedEngines),
+          roleType,
+          accessAllEngines,
+          id: singleUserRoleMapping?.roleMapping?.id,
+        },
+        elasticsearchUser: {
+          username,
+          email,
+        },
+      });
+
+      try {
+        const response = await http.post('/api/app_search/single_user_role_mapping', { body });
+        actions.setSingleUserRoleMapping(response);
+        actions.setUserCreated();
+        actions.initializeRoleMappings();
+      } catch (e) {
+        actions.setRoleMappingErrors(e?.body?.attributes?.errors);
+      }
+    },
+    closeUsersAndRolesFlyout: () => {
       clearFlashMessages();
+      const firstUser = values.elasticsearchUsers[0];
+      actions.setElasticsearchUser(firstUser);
     },
     openRoleMappingFlyout: () => {
       clearFlashMessages();
     },
+    openSingleUserRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
+    setUserExistingRadioValue: ({ userFormUserIsExisting }) => {
+      const firstUser = values.elasticsearchUsers[0];
+      actions.setElasticsearchUser(userFormUserIsExisting ? firstUser : emptyUser);
+    },
+    handleUsernameSelectChange: ({ username }) => {
+      const user = values.elasticsearchUsers.find((u) => u.username === username);
+      if (user) actions.setElasticsearchUser(user);
+    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
new file mode 100644
index 0000000000000..88103532bd149
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
@@ -0,0 +1,124 @@
+/*
+ * 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 '../../../__mocks__/react_router';
+import '../../../__mocks__/shallow_useeffect.mock';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
+import { engines } from '../../__mocks__/engines.mock';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { UserFlyout, UserAddedInfo, UserInvitationCallout } from '../../../shared/role_mapping';
+import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
+import { wsSingleUserRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+
+import { EngineAssignmentSelector } from './engine_assignment_selector';
+import { User } from './user';
+
+describe('User', () => {
+  const handleSaveUser = jest.fn();
+  const closeUsersAndRolesFlyout = jest.fn();
+  const setUserExistingRadioValue = jest.fn();
+  const setElasticsearchUsernameValue = jest.fn();
+  const setElasticsearchEmailValue = jest.fn();
+  const handleRoleChange = jest.fn();
+  const handleUsernameSelectChange = jest.fn();
+
+  const mockValues = {
+    availableEngines: [],
+    singleUserRoleMapping: null,
+    userFormUserIsExisting: false,
+    elasticsearchUsers: [],
+    elasticsearchUser: {},
+    roleType: 'admin',
+    roleMappingErrors: [],
+    userCreated: false,
+    userFormIsNewUser: false,
+    hasAdvancedRoles: false,
+  };
+
+  beforeEach(() => {
+    setMockActions({
+      handleSaveUser,
+      closeUsersAndRolesFlyout,
+      setUserExistingRadioValue,
+      setElasticsearchUsernameValue,
+      setElasticsearchEmailValue,
+      handleRoleChange,
+      handleUsernameSelectChange,
+    });
+
+    setMockValues(mockValues);
+  });
+
+  it('renders', () => {
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout)).toHaveLength(1);
+  });
+
+  it('renders engine assignment selector when groups present', () => {
+    setMockValues({ ...mockValues, availableEngines: engines, hasAdvancedRoles: true });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(EngineAssignmentSelector)).toHaveLength(1);
+  });
+
+  it('renders userInvitationCallout', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserInvitationCallout)).toHaveLength(1);
+  });
+
+  it('renders user added info when user created', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      userCreated: true,
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserAddedInfo)).toHaveLength(1);
+  });
+
+  it('disables form when username value not present', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      elasticsearchUsers,
+      elasticsearchUser: {
+        username: null,
+        email: 'email@user.com',
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout).prop('disabled')).toEqual(true);
+  });
+
+  it('enables form when userFormUserIsExisting', () => {
+    setMockValues({
+      ...mockValues,
+      userFormUserIsExisting: true.valueOf,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      elasticsearchUsers,
+      elasticsearchUser: {
+        username: null,
+        email: 'email@user.com',
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout).prop('disabled')).toEqual(false);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
new file mode 100644
index 0000000000000..df231fac64df7
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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 React from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import { EuiForm } from '@elastic/eui';
+
+import { getAppSearchUrl } from '../../../shared/enterprise_search_url';
+import {
+  UserFlyout,
+  UserSelector,
+  UserAddedInfo,
+  UserInvitationCallout,
+} from '../../../shared/role_mapping';
+import { RoleTypes } from '../../types';
+
+import { EngineAssignmentSelector } from './engine_assignment_selector';
+import { RoleMappingsLogic } from './role_mappings_logic';
+
+const standardRoles = (['owner', 'admin'] as unknown) as RoleTypes[];
+const advancedRoles = (['dev', 'editor', 'analyst'] as unknown) as RoleTypes[];
+
+export const User: React.FC = () => {
+  const {
+    handleSaveUser,
+    closeUsersAndRolesFlyout,
+    setUserExistingRadioValue,
+    setElasticsearchUsernameValue,
+    setElasticsearchEmailValue,
+    handleRoleChange,
+    handleUsernameSelectChange,
+  } = useActions(RoleMappingsLogic);
+
+  const {
+    availableEngines,
+    singleUserRoleMapping,
+    hasAdvancedRoles,
+    userFormUserIsExisting,
+    elasticsearchUsers,
+    elasticsearchUser,
+    roleType,
+    roleMappingErrors,
+    userCreated,
+    userFormIsNewUser,
+  } = useValues(RoleMappingsLogic);
+
+  const roleTypes = hasAdvancedRoles ? [...standardRoles, ...advancedRoles] : standardRoles;
+  const hasEngines = availableEngines.length > 0;
+  const showEngineAssignmentSelector = hasEngines && hasAdvancedRoles;
+  const flyoutDisabled =
+    !userFormUserIsExisting && (!elasticsearchUser.email || !elasticsearchUser.username);
+
+  const userAddedInfo = singleUserRoleMapping && (
+    <UserAddedInfo
+      username={singleUserRoleMapping.elasticsearchUser.username}
+      email={singleUserRoleMapping.elasticsearchUser.email as string}
+      roleType={singleUserRoleMapping.roleMapping.roleType}
+    />
+  );
+
+  const userInvitationCallout = singleUserRoleMapping?.invitation && (
+    <UserInvitationCallout
+      isNew={userCreated}
+      invitationCode={singleUserRoleMapping!.invitation.code}
+      urlPrefix={getAppSearchUrl()}
+    />
+  );
+
+  const createUserForm = (
+    <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
+      <UserSelector
+        isNewUser={userFormIsNewUser}
+        elasticsearchUsers={elasticsearchUsers}
+        handleRoleChange={handleRoleChange}
+        elasticsearchUser={elasticsearchUser}
+        setUserExisting={setUserExistingRadioValue}
+        setElasticsearchEmailValue={setElasticsearchEmailValue}
+        setElasticsearchUsernameValue={setElasticsearchUsernameValue}
+        handleUsernameSelectChange={handleUsernameSelectChange}
+        userFormUserIsExisting={userFormUserIsExisting}
+        roleTypes={roleTypes}
+        roleType={roleType}
+      />
+      {showEngineAssignmentSelector && <EngineAssignmentSelector />}
+    </EuiForm>
+  );
+
+  return (
+    <UserFlyout
+      disabled={flyoutDisabled}
+      isComplete={userCreated}
+      isNew={userFormIsNewUser}
+      closeUserFlyout={closeUsersAndRolesFlyout}
+      handleSaveUser={handleSaveUser}
+    >
+      {userCreated ? userAddedInfo : createUserForm}
+      {userInvitationCallout}
+    </UserFlyout>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 2402a6ecc6401..00acea945177a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -196,6 +196,6 @@ describe('AppSearchNav', () => {
     setMockValues({ myRole: { canViewRoleMappings: true } });
     const wrapper = shallow(<AppSearchNav />);
 
-    expect(wrapper.find(SideNavLink).last().prop('to')).toEqual('/role_mappings');
+    expect(wrapper.find(SideNavLink).last().prop('to')).toEqual('/users_and_roles');
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 191758af26758..d7ddad5683f38 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -37,7 +37,7 @@ import {
   SETUP_GUIDE_PATH,
   SETTINGS_PATH,
   CREDENTIALS_PATH,
-  ROLE_MAPPINGS_PATH,
+  USERS_AND_ROLES_PATH,
   ENGINES_PATH,
   ENGINE_PATH,
   LIBRARY_PATH,
@@ -128,7 +128,7 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
         </Route>
       )}
       {canViewRoleMappings && (
-        <Route path={ROLE_MAPPINGS_PATH}>
+        <Route path={USERS_AND_ROLES_PATH}>
           <RoleMappings />
         </Route>
       )}
@@ -162,7 +162,7 @@ export const AppSearchNav: React.FC = () => {
         <SideNavLink to={CREDENTIALS_PATH}>{CREDENTIALS_TITLE}</SideNavLink>
       )}
       {canViewRoleMappings && (
-        <SideNavLink shouldShowActiveForSubroutes to={ROLE_MAPPINGS_PATH}>
+        <SideNavLink shouldShowActiveForSubroutes to={USERS_AND_ROLES_PATH}>
           {ROLE_MAPPINGS_TITLE}
         </SideNavLink>
       )}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
index d9d1935c648f7..f086a32bbf590 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
@@ -15,7 +15,7 @@ export const LIBRARY_PATH = '/library';
 export const SETTINGS_PATH = '/settings';
 export const CREDENTIALS_PATH = '/credentials';
 
-export const ROLE_MAPPINGS_PATH = '/role_mappings';
+export const USERS_AND_ROLES_PATH = '/users_and_roles';
 
 export const ENGINES_PATH = '/engines';
 export const ENGINE_CREATION_PATH = `${ENGINES_PATH}/new`; // This is safe from conflicting with an :engineName path because new is a reserved name
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
index 45cab32b67e08..215c76ffb7ef4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
@@ -136,7 +136,7 @@ export const FILTER_ROLE_MAPPINGS_PLACEHOLDER = i18n.translate(
 export const ROLE_MAPPINGS_TITLE = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.roleMappingsTitle',
   {
-    defaultMessage: 'Users & roles',
+    defaultMessage: 'Users and roles',
   }
 );
 
@@ -406,3 +406,19 @@ export const FILTER_USERS_LABEL = i18n.translate(
 export const NO_USERS_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.noUsersLabel', {
   defaultMessage: 'No matching users found',
 });
+
+export const EXTERNAL_ATTRIBUTE_TOOLTIP = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.externalAttributeTooltip',
+  {
+    defaultMessage:
+      'External attributes are defined by the identity provider, and varies from service to service.',
+  }
+);
+
+export const AUTH_PROVIDER_TOOLTIP = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.authProviderTooltip',
+  {
+    defaultMessage:
+      'Provider-specific role mapping is still applied, but configuration is now deprecated.',
+  }
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
index c0973bb2c9504..ffcf5508233fc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
@@ -20,13 +20,13 @@ import {
 import { RoleMappingFlyout } from './role_mapping_flyout';
 
 describe('RoleMappingFlyout', () => {
-  const closeRoleMappingFlyout = jest.fn();
+  const closeUsersAndRolesFlyout = jest.fn();
   const handleSaveMapping = jest.fn();
 
   const props = {
     isNew: true,
     disabled: false,
-    closeRoleMappingFlyout,
+    closeUsersAndRolesFlyout,
     handleSaveMapping,
   };
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
index bae991fef3655..4416a2de28011 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
@@ -36,7 +36,7 @@ interface Props {
   children: React.ReactNode;
   isNew: boolean;
   disabled: boolean;
-  closeRoleMappingFlyout(): void;
+  closeUsersAndRolesFlyout(): void;
   handleSaveMapping(): void;
 }
 
@@ -44,13 +44,13 @@ export const RoleMappingFlyout: React.FC<Props> = ({
   children,
   isNew,
   disabled,
-  closeRoleMappingFlyout,
+  closeUsersAndRolesFlyout,
   handleSaveMapping,
 }) => (
   <EuiPortal>
     <EuiFlyout
       ownFocus
-      onClose={closeRoleMappingFlyout}
+      onClose={closeUsersAndRolesFlyout}
       size="s"
       aria-labelledby="flyoutLargeTitle"
     >
@@ -71,7 +71,9 @@ export const RoleMappingFlyout: React.FC<Props> = ({
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
-            <EuiButtonEmpty onClick={closeRoleMappingFlyout}>{CANCEL_BUTTON_LABEL}</EuiButtonEmpty>
+            <EuiButtonEmpty onClick={closeUsersAndRolesFlyout}>
+              {CANCEL_BUTTON_LABEL}
+            </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
index 81a7c06020165..61043aa6ad9a8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
@@ -15,8 +15,6 @@ import { EuiInMemoryTable, EuiTableHeaderCell } from '@elastic/eui';
 
 import { engines } from '../../app_search/__mocks__/engines.mock';
 
-import { ANY_AUTH_PROVIDER_OPTION_LABEL } from './constants';
-
 import { RoleMappingsTable } from './role_mappings_table';
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
 
@@ -59,11 +57,13 @@ describe('RoleMappingsTable', () => {
   });
 
   it('renders auth provider display names', () => {
-    const wrapper = mount(<RoleMappingsTable {...props} />);
+    const roleMappingWithAuths = {
+      ...wsRoleMapping,
+      authProvider: ['saml', 'native'],
+    };
+    const wrapper = mount(<RoleMappingsTable {...props} roleMappings={[roleMappingWithAuths]} />);
 
-    expect(wrapper.find('[data-test-subj="AuthProviderDisplayValue"]').prop('children')).toEqual(
-      `${ANY_AUTH_PROVIDER_OPTION_LABEL}, other_auth`
-    );
+    expect(wrapper.find('[data-test-subj="ProviderSpecificList"]')).toHaveLength(1);
   });
 
   it('handles manage click', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
index eb9621c7a242c..4136d114d3420 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
@@ -7,14 +7,17 @@
 
 import React from 'react';
 
-import { EuiIconTip, EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui';
+import { EuiIconTip, EuiInMemoryTable, EuiBasicTableColumn, EuiLink } from '@elastic/eui';
 
 import { ASRoleMapping } from '../../app_search/types';
 import { WSRoleMapping } from '../../workplace_search/types';
+import { docLinks } from '../doc_links';
 import { RoleRules } from '../types';
 
 import './role_mappings_table.scss';
 
+const AUTH_PROVIDER_DOCUMENTATION_URL = `${docLinks.enterpriseSearchBase}/users-access.html`;
+
 import {
   ANY_AUTH_PROVIDER,
   ANY_AUTH_PROVIDER_OPTION_LABEL,
@@ -25,6 +28,8 @@ import {
   ATTRIBUTE_VALUE_LABEL,
   FILTER_ROLE_MAPPINGS_PLACEHOLDER,
   ROLE_MAPPINGS_NO_RESULTS_MESSAGE,
+  EXTERNAL_ATTRIBUTE_TOOLTIP,
+  AUTH_PROVIDER_TOOLTIP,
 } from './constants';
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
 
@@ -46,9 +51,6 @@ interface Props {
   handleDeleteMapping(roleMappingId: string): void;
 }
 
-const getAuthProviderDisplayValue = (authProvider: string) =>
-  authProvider === ANY_AUTH_PROVIDER ? ANY_AUTH_PROVIDER_OPTION_LABEL : authProvider;
-
 export const RoleMappingsTable: React.FC<Props> = ({
   accessItemKey,
   accessHeader,
@@ -69,7 +71,19 @@ export const RoleMappingsTable: React.FC<Props> = ({
 
   const attributeNameCol: EuiBasicTableColumn<SharedRoleMapping> = {
     field: 'attribute',
-    name: EXTERNAL_ATTRIBUTE_LABEL,
+    name: (
+      <span>
+        {EXTERNAL_ATTRIBUTE_LABEL}{' '}
+        <EuiIconTip
+          type="iInCircle"
+          color="subdued"
+          content={EXTERNAL_ATTRIBUTE_TOOLTIP}
+          iconProps={{
+            className: 'eui-alignTop',
+          }}
+        />
+      </span>
+    ),
     render: (_, { rules }: SharedRoleMapping) => getFirstAttributeName(rules),
   };
 
@@ -105,11 +119,19 @@ export const RoleMappingsTable: React.FC<Props> = ({
   const authProviderCol: EuiBasicTableColumn<SharedRoleMapping> = {
     field: 'authProvider',
     name: AUTH_PROVIDER_LABEL,
-    render: (_, { authProvider }: SharedRoleMapping) => (
-      <span data-test-subj="AuthProviderDisplayValue">
-        {authProvider.map(getAuthProviderDisplayValue).join(', ')}
-      </span>
-    ),
+    render: (_, { authProvider }: SharedRoleMapping) => {
+      if (authProvider[0] === ANY_AUTH_PROVIDER) {
+        return ANY_AUTH_PROVIDER_OPTION_LABEL;
+      }
+      return (
+        <span data-test-subj="ProviderSpecificList">
+          {authProvider.join(', ')}{' '}
+          <EuiLink href={AUTH_PROVIDER_DOCUMENTATION_URL} target="_blank">
+            <EuiIconTip type="alert" color="warning" content={AUTH_PROVIDER_TOOLTIP} />
+          </EuiLink>
+        </span>
+      );
+    },
   };
 
   const actionsCol: EuiBasicTableColumn<SharedRoleMapping> = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
index 30bdaa0010b58..57200b389591d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
@@ -9,8 +9,6 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiText } from '@elastic/eui';
-
 import { UserAddedInfo } from './';
 
 describe('UserAddedInfo', () => {
@@ -20,9 +18,103 @@ describe('UserAddedInfo', () => {
     roleType: 'user',
   };
 
-  it('renders', () => {
+  it('renders with email', () => {
     const wrapper = shallow(<UserAddedInfo {...props} />);
 
-    expect(wrapper.find(EuiText)).toHaveLength(6);
+    expect(wrapper).toMatchInlineSnapshot(`
+      <Fragment>
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Username
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          user1
+        </EuiText>
+        <EuiSpacer />
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Email
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          test@test.com
+        </EuiText>
+        <EuiSpacer />
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Role
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          user
+        </EuiText>
+        <EuiSpacer />
+      </Fragment>
+    `);
+  });
+
+  it('renders without email', () => {
+    const wrapper = shallow(<UserAddedInfo {...props} email="" />);
+
+    expect(wrapper).toMatchInlineSnapshot(`
+      <Fragment>
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Username
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          user1
+        </EuiText>
+        <EuiSpacer />
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Email
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          <EuiTextColor
+            color="subdued"
+          >
+            —
+          </EuiTextColor>
+        </EuiText>
+        <EuiSpacer />
+        <EuiText
+          size="s"
+        >
+          <strong>
+            Role
+          </strong>
+        </EuiText>
+        <EuiText
+          size="s"
+        >
+          user
+        </EuiText>
+        <EuiSpacer />
+      </Fragment>
+    `);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
index a12eae66262a0..37804414a94a9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiSpacer, EuiText, EuiTextColor } from '@elastic/eui';
 
 import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
 
@@ -19,6 +19,8 @@ interface Props {
   roleType: string;
 }
 
+const noItemsPlaceholder = <EuiTextColor color="subdued">&mdash;</EuiTextColor>;
+
 export const UserAddedInfo: React.FC<Props> = ({ username, email, roleType }) => (
   <>
     <EuiText size="s">
@@ -29,7 +31,7 @@ export const UserAddedInfo: React.FC<Props> = ({ username, email, roleType }) =>
     <EuiText size="s">
       <strong>{EMAIL_LABEL}</strong>
     </EuiText>
-    <EuiText size="s">{email}</EuiText>
+    <EuiText size="s">{email || noItemsPlaceholder}</EuiText>
     <EuiSpacer />
     <EuiText size="s">
       <strong>{ROLE_LABEL}</strong>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
index e13a56a716929..a3be5e295ddfe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
@@ -17,6 +17,7 @@ import {
   EuiFlyoutFooter,
   EuiFlyoutHeader,
   EuiIcon,
+  EuiPortal,
   EuiText,
   EuiTitle,
   EuiSpacer,
@@ -92,22 +93,26 @@ export const UserFlyout: React.FC<Props> = ({
   );
 
   return (
-    <EuiFlyout ownFocus onClose={closeUserFlyout} size="s" aria-labelledby="userFlyoutTitle">
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2 id="userFlyoutTitle">{isComplete ? IS_COMPLETE_HEADING : IS_EDITING_HEADING}</h2>
-        </EuiTitle>
-        {!isComplete && (
-          <EuiText size="xs">
-            <p>{IS_EDITING_DESCRIPTION}</p>
-          </EuiText>
-        )}
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>
-        {children}
-        <EuiSpacer />
-      </EuiFlyoutBody>
-      <EuiFlyoutFooter>{isComplete ? completedFooterAction : editingFooterActions}</EuiFlyoutFooter>
-    </EuiFlyout>
+    <EuiPortal>
+      <EuiFlyout ownFocus onClose={closeUserFlyout} size="s" aria-labelledby="userFlyoutTitle">
+        <EuiFlyoutHeader hasBorder>
+          <EuiTitle size="m">
+            <h2 id="userFlyoutTitle">{isComplete ? IS_COMPLETE_HEADING : IS_EDITING_HEADING}</h2>
+          </EuiTitle>
+          {!isComplete && (
+            <EuiText size="xs">
+              <p>{IS_EDITING_DESCRIPTION}</p>
+            </EuiText>
+          )}
+        </EuiFlyoutHeader>
+        <EuiFlyoutBody>
+          {children}
+          <EuiSpacer />
+        </EuiFlyoutBody>
+        <EuiFlyoutFooter>
+          {isComplete ? completedFooterAction : editingFooterActions}
+        </EuiFlyoutFooter>
+      </EuiFlyout>
+    </EuiPortal>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
index 8310077ad6f2e..d6d0ce7b050ab 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.tsx
@@ -23,7 +23,7 @@ interface Props {
 }
 
 export const UserInvitationCallout: React.FC<Props> = ({ isNew, invitationCode, urlPrefix }) => {
-  const link = urlPrefix + invitationCode;
+  const link = `${urlPrefix}/invitations/${invitationCode}`;
   const label = isNew ? NEW_INVITATION_LABEL : EXISTING_INVITATION_LABEL;
 
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
index 08ddc7ba5427f..60bac97d09835 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFormRow } from '@elastic/eui';
 
-import { Role as ASRole } from '../../app_search/types';
+import { RoleTypes as ASRole } from '../../app_search/types';
 
 import { REQUIRED_LABEL, USERNAME_NO_USERS_TEXT } from './constants';
 
@@ -107,6 +107,5 @@ describe('UserSelector', () => {
 
     expect(wrapper.find(EuiFormRow).at(0).prop('helpText')).toEqual(USERNAME_NO_USERS_TEXT);
     expect(wrapper.find(EuiFormRow).at(1).prop('helpText')).toEqual(REQUIRED_LABEL);
-    expect(wrapper.find(EuiFormRow).at(2).prop('helpText')).toEqual(REQUIRED_LABEL);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
index 70348bf29894a..d65f97265f6a3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { Role as ASRole } from '../../app_search/types';
+import { RoleTypes as ASRole } from '../../app_search/types';
 import { ElasticsearchUser } from '../../shared/types';
 import { Role as WSRole } from '../../workplace_search/types';
 
@@ -80,7 +80,7 @@ export const UserSelector: React.FC<Props> = ({
   );
 
   const emailInput = (
-    <EuiFormRow label={EMAIL_LABEL} helpText={!elasticsearchUser.email && REQUIRED_LABEL}>
+    <EuiFormRow label={EMAIL_LABEL}>
       <EuiFieldText
         name={EMAIL_LABEL}
         data-test-subj="EmailInput"
@@ -95,6 +95,7 @@ export const UserSelector: React.FC<Props> = ({
       <EuiFormRow label={USERNAME_LABEL} helpText={!elasticsearchUser.username && REQUIRED_LABEL}>
         <EuiFieldText
           name={USERNAME_LABEL}
+          disabled={!isNewUser}
           data-test-subj="UsernameInput"
           value={elasticsearchUser.username}
           onChange={(e) => setElasticsearchUsernameValue(e.target.value)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
index 86dc2c2626229..674796775b1d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
@@ -46,8 +46,8 @@ interface SharedRoleMapping extends ASRoleMapping, WSRoleMapping {
 interface Props {
   accessItemKey: 'groups' | 'engines';
   singleUserRoleMappings: Array<SingleUserRoleMapping<ASRoleMapping | WSRoleMapping>>;
-  initializeSingleUserRoleMapping(roleId: string): string;
-  handleDeleteMapping(roleId: string): string;
+  initializeSingleUserRoleMapping(roleMappingId: string): void;
+  handleDeleteMapping(roleMappingId: string): void;
 }
 
 const noItemsPlaceholder = <EuiTextColor color="subdued">&mdash;</EuiTextColor>;
@@ -110,6 +110,7 @@ export const UsersTable: React.FC<Props> = ({
     {
       field: 'id',
       name: '',
+      align: 'right',
       render: (_, { id, username }: SharedUser) => (
         <UsersAndRolesRowActions
           username={username}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
index f2601ff98db1d..04576e981e104 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
@@ -53,8 +53,8 @@ describe('useWorkplaceSearchNav', () => {
           },
           {
             id: 'usersRoles',
-            name: 'Users & roles',
-            href: '/role_mappings',
+            name: 'Users and roles',
+            href: '/users_and_roles',
           },
           {
             id: 'security',
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
index ce2f8bf7ef7e4..c8d821dcdae2e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
@@ -15,7 +15,7 @@ import { NAV } from '../../constants';
 import {
   SOURCES_PATH,
   SECURITY_PATH,
-  ROLE_MAPPINGS_PATH,
+  USERS_AND_ROLES_PATH,
   GROUPS_PATH,
   ORG_SETTINGS_PATH,
 } from '../../routes';
@@ -48,7 +48,7 @@ export const useWorkplaceSearchNav = () => {
     {
       id: 'usersRoles',
       name: NAV.ROLE_MAPPINGS,
-      ...generateNavLink({ to: ROLE_MAPPINGS_PATH }),
+      ...generateNavLink({ to: USERS_AND_ROLES_PATH }),
     },
     {
       id: 'security',
@@ -92,7 +92,7 @@ export const WorkplaceSearchNav: React.FC<Props> = ({
     <SideNavLink to={GROUPS_PATH} subNav={groupsSubNav}>
       {NAV.GROUPS}
     </SideNavLink>
-    <SideNavLink shouldShowActiveForSubroutes to={ROLE_MAPPINGS_PATH}>
+    <SideNavLink shouldShowActiveForSubroutes to={USERS_AND_ROLES_PATH}>
       {NAV.ROLE_MAPPINGS}
     </SideNavLink>
     <SideNavLink to={SECURITY_PATH}>{NAV.SECURITY}</SideNavLink>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index aa5419f12c7f3..cf459171a808a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -40,7 +40,7 @@ export const NAV = {
     defaultMessage: 'Content',
   }),
   ROLE_MAPPINGS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.roleMappings', {
-    defaultMessage: 'Users & roles',
+    defaultMessage: 'Users and roles',
   }),
   SECURITY: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.security', {
     defaultMessage: 'Security',
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index 8a1e9c0275322..05018be2934b4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -26,7 +26,7 @@ import {
   SOURCE_ADDED_PATH,
   PERSONAL_SOURCES_PATH,
   ORG_SETTINGS_PATH,
-  ROLE_MAPPINGS_PATH,
+  USERS_AND_ROLES_PATH,
   SECURITY_PATH,
   PERSONAL_SETTINGS_PATH,
   PERSONAL_PATH,
@@ -103,7 +103,7 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
       <Route path={GROUPS_PATH}>
         <GroupsRouter />
       </Route>
-      <Route path={ROLE_MAPPINGS_PATH}>
+      <Route path={USERS_AND_ROLES_PATH}>
         <RoleMappings />
       </Route>
       <Route path={SECURITY_PATH}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
index 3c564c1f912ec..b9309ffd94809 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -48,7 +48,7 @@ export const ENT_SEARCH_LICENSE_MANAGEMENT = `${docLinks.enterpriseSearchBase}/l
 
 export const PERSONAL_PATH = '/p';
 
-export const ROLE_MAPPINGS_PATH = '/role_mappings';
+export const USERS_AND_ROLES_PATH = '/users_and_roles';
 
 export const USERS_PATH = '/users';
 export const SECURITY_PATH = '/security';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
index cc773895bff1c..20211d40d7010 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
@@ -43,7 +43,7 @@ export const RoleMapping: React.FC = () => {
     handleAttributeSelectorChange,
     handleRoleChange,
     handleAuthProviderChange,
-    closeRoleMappingFlyout,
+    closeUsersAndRolesFlyout,
   } = useActions(RoleMappingsLogic);
 
   const {
@@ -70,7 +70,7 @@ export const RoleMapping: React.FC = () => {
     <RoleMappingFlyout
       disabled={attributeValueInvalid || !hasGroupAssignment}
       isNew={isNew}
-      closeRoleMappingFlyout={closeRoleMappingFlyout}
+      closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
       handleSaveMapping={handleSaveMapping}
     >
       <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
index 308022ccb2e5a..2e13f24a13eee 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
@@ -12,26 +12,39 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
-import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+import {
+  RoleMappingsTable,
+  RoleMappingsHeading,
+  UsersHeading,
+  UsersEmptyPrompt,
+} from '../../../shared/role_mapping';
+import {
+  wsRoleMapping,
+  wsSingleUserRoleMapping,
+} from '../../../shared/role_mapping/__mocks__/roles';
 
 import { RoleMapping } from './role_mapping';
 import { RoleMappings } from './role_mappings';
+import { User } from './user';
 
 describe('RoleMappings', () => {
   const initializeRoleMappings = jest.fn();
   const initializeRoleMapping = jest.fn();
+  const initializeSingleUserRoleMapping = jest.fn();
   const handleDeleteMapping = jest.fn();
   const mockValues = {
     roleMappings: [wsRoleMapping],
     dataLoading: false,
     multipleAuthProvidersConfig: false,
+    singleUserRoleMappings: [wsSingleUserRoleMapping],
+    singleUserRoleMappingFlyoutOpen: false,
   };
 
   beforeEach(() => {
     setMockActions({
       initializeRoleMappings,
       initializeRoleMapping,
+      initializeSingleUserRoleMapping,
       handleDeleteMapping,
     });
     setMockValues(mockValues);
@@ -50,10 +63,31 @@ describe('RoleMappings', () => {
     expect(wrapper.find(RoleMapping)).toHaveLength(1);
   });
 
-  it('handles onClick', () => {
+  it('renders User flyout', () => {
+    setMockValues({ ...mockValues, singleUserRoleMappingFlyoutOpen: true });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(User)).toHaveLength(1);
+  });
+
+  it('handles RoleMappingsHeading onClick', () => {
     const wrapper = shallow(<RoleMappings />);
     wrapper.find(RoleMappingsHeading).prop('onClick')();
 
     expect(initializeRoleMapping).toHaveBeenCalled();
   });
+
+  it('handles UsersHeading onClick', () => {
+    const wrapper = shallow(<RoleMappings />);
+    wrapper.find(UsersHeading).prop('onClick')();
+
+    expect(initializeSingleUserRoleMapping).toHaveBeenCalled();
+  });
+
+  it('handles empty users state', () => {
+    setMockValues({ ...mockValues, singleUserRoleMappings: [] });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(UsersEmptyPrompt)).toHaveLength(1);
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
index 01d32bec14ebd..df5d7e4267690 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
@@ -9,11 +9,16 @@ import React, { useEffect } from 'react';
 
 import { useActions, useValues } from 'kea';
 
+import { EuiSpacer } from '@elastic/eui';
+
 import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import {
   RoleMappingsTable,
   RoleMappingsHeading,
   RolesEmptyPrompt,
+  UsersTable,
+  UsersHeading,
+  UsersEmptyPrompt,
 } from '../../../shared/role_mapping';
 import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 import { WorkplaceSearchPageTemplate } from '../../components/layout';
@@ -23,26 +28,32 @@ import { ROLE_MAPPINGS_TABLE_HEADER } from './constants';
 
 import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
+import { User } from './user';
 
 export const RoleMappings: React.FC = () => {
   const {
     enableRoleBasedAccess,
     initializeRoleMappings,
     initializeRoleMapping,
+    initializeSingleUserRoleMapping,
     handleDeleteMapping,
   } = useActions(RoleMappingsLogic);
 
   const {
     roleMappings,
+    singleUserRoleMappings,
     dataLoading,
     multipleAuthProvidersConfig,
     roleMappingFlyoutOpen,
+    singleUserRoleMappingFlyoutOpen,
   } = useValues(RoleMappingsLogic);
 
   useEffect(() => {
     initializeRoleMappings();
   }, []);
 
+  const hasUsers = singleUserRoleMappings.length > 0;
+
   const rolesEmptyState = (
     <RolesEmptyPrompt
       productName={WORKPLACE_SEARCH_PLUGIN.NAME}
@@ -69,6 +80,23 @@ export const RoleMappings: React.FC = () => {
     </section>
   );
 
+  const usersTable = (
+    <UsersTable
+      accessItemKey="groups"
+      singleUserRoleMappings={singleUserRoleMappings}
+      initializeSingleUserRoleMapping={initializeSingleUserRoleMapping}
+      handleDeleteMapping={handleDeleteMapping}
+    />
+  );
+
+  const usersSection = (
+    <>
+      <UsersHeading onClick={() => initializeSingleUserRoleMapping()} />
+      <EuiSpacer />
+      {hasUsers ? usersTable : <UsersEmptyPrompt />}
+    </>
+  );
+
   return (
     <WorkplaceSearchPageTemplate
       pageChrome={[ROLE_MAPPINGS_TITLE]}
@@ -78,7 +106,10 @@ export const RoleMappings: React.FC = () => {
       emptyState={rolesEmptyState}
     >
       {roleMappingFlyoutOpen && <RoleMapping />}
+      {singleUserRoleMappingFlyoutOpen && <User />}
       {roleMappingsSection}
+      <EuiSpacer size="xxl" />
+      {usersSection}
     </WorkplaceSearchPageTemplate>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
index a4bbddbd23b49..c85e86ebcca2c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
@@ -15,11 +15,18 @@ import { groups } from '../../__mocks__/groups.mock';
 
 import { nextTick } from '@kbn/test/jest';
 
-import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
+
+import {
+  wsRoleMapping,
+  wsSingleUserRoleMapping,
+} from '../../../shared/role_mapping/__mocks__/roles';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
 
 import { RoleMappingsLogic } from './role_mappings_logic';
 
+const emptyUser = { username: '', email: '' };
+
 describe('RoleMappingsLogic', () => {
   const { http } = mockHttpValues;
   const { clearFlashMessages, flashAPIErrors } = mockFlashMessageHelpers;
@@ -28,6 +35,8 @@ describe('RoleMappingsLogic', () => {
     attributes: [],
     availableAuthProviders: [],
     elasticsearchRoles: [],
+    elasticsearchUser: emptyUser,
+    elasticsearchUsers: [],
     roleMapping: null,
     roleMappingFlyoutOpen: false,
     roleMappings: [],
@@ -42,6 +51,12 @@ describe('RoleMappingsLogic', () => {
     selectedAuthProviders: [ANY_AUTH_PROVIDER],
     selectedOptions: [],
     roleMappingErrors: [],
+    singleUserRoleMapping: null,
+    singleUserRoleMappings: [],
+    singleUserRoleMappingFlyoutOpen: false,
+    userCreated: false,
+    userFormIsNewUser: true,
+    userFormUserIsExisting: true,
   };
   const roleGroup = {
     id: '123',
@@ -59,6 +74,8 @@ describe('RoleMappingsLogic', () => {
     authProviders: [],
     availableGroups: [roleGroup, defaultGroup],
     elasticsearchRoles: [],
+    singleUserRoleMappings: [wsSingleUserRoleMapping],
+    elasticsearchUsers,
   };
 
   beforeEach(() => {
@@ -71,23 +88,36 @@ describe('RoleMappingsLogic', () => {
   });
 
   describe('actions', () => {
-    it('setRoleMappingsData', () => {
-      RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+    describe('setRoleMappingsData', () => {
+      it('sets data based on server response from the `mappings` (plural) endpoint', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
 
-      expect(RoleMappingsLogic.values.roleMappings).toEqual([wsRoleMapping]);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-      expect(RoleMappingsLogic.values.multipleAuthProvidersConfig).toEqual(true);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-      expect(RoleMappingsLogic.values.attributes).toEqual(mappingsServerProps.attributes);
-      expect(RoleMappingsLogic.values.availableGroups).toEqual(mappingsServerProps.availableGroups);
-      expect(RoleMappingsLogic.values.includeInAllGroups).toEqual(false);
-      expect(RoleMappingsLogic.values.elasticsearchRoles).toEqual(
-        mappingsServerProps.elasticsearchRoles
-      );
-      expect(RoleMappingsLogic.values.selectedOptions).toEqual([
-        { label: defaultGroup.name, value: defaultGroup.id },
-      ]);
-      expect(RoleMappingsLogic.values.selectedGroups).toEqual(new Set([defaultGroup.id]));
+        expect(RoleMappingsLogic.values.roleMappings).toEqual([wsRoleMapping]);
+        expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
+        expect(RoleMappingsLogic.values.multipleAuthProvidersConfig).toEqual(true);
+        expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
+        expect(RoleMappingsLogic.values.attributes).toEqual(mappingsServerProps.attributes);
+        expect(RoleMappingsLogic.values.availableGroups).toEqual(
+          mappingsServerProps.availableGroups
+        );
+        expect(RoleMappingsLogic.values.includeInAllGroups).toEqual(false);
+        expect(RoleMappingsLogic.values.elasticsearchRoles).toEqual(
+          mappingsServerProps.elasticsearchRoles
+        );
+        expect(RoleMappingsLogic.values.selectedOptions).toEqual([
+          { label: defaultGroup.name, value: defaultGroup.id },
+        ]);
+        expect(RoleMappingsLogic.values.selectedGroups).toEqual(new Set([defaultGroup.id]));
+      });
+
+      it('handles fallback if no elasticsearch users present', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData({
+          ...mappingsServerProps,
+          elasticsearchUsers: [],
+        });
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(emptyUser);
+      });
     });
 
     it('setRoleMappings', () => {
@@ -97,6 +127,26 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
     });
 
+    describe('setElasticsearchUser', () => {
+      it('sets user', () => {
+        RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(elasticsearchUsers[0]);
+      });
+
+      it('handles fallback if no user present', () => {
+        RoleMappingsLogic.actions.setElasticsearchUser(undefined);
+
+        expect(RoleMappingsLogic.values.elasticsearchUser).toEqual(emptyUser);
+      });
+    });
+
+    it('setSingleUserRoleMapping', () => {
+      RoleMappingsLogic.actions.setSingleUserRoleMapping(wsSingleUserRoleMapping);
+
+      expect(RoleMappingsLogic.values.singleUserRoleMapping).toEqual(wsSingleUserRoleMapping);
+    });
+
     it('handleRoleChange', () => {
       RoleMappingsLogic.actions.handleRoleChange('user');
 
@@ -133,6 +183,12 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values.includeInAllGroups).toEqual(true);
     });
 
+    it('setUserExistingRadioValue', () => {
+      RoleMappingsLogic.actions.setUserExistingRadioValue(false);
+
+      expect(RoleMappingsLogic.values.userFormUserIsExisting).toEqual(false);
+    });
+
     describe('handleAttributeSelectorChange', () => {
       const elasticsearchRoles = ['foo', 'bar'];
 
@@ -228,16 +284,50 @@ describe('RoleMappingsLogic', () => {
       expect(clearFlashMessages).toHaveBeenCalled();
     });
 
-    it('closeRoleMappingFlyout', () => {
+    it('openSingleUserRoleMappingFlyout', () => {
+      mount(mappingsServerProps);
+      RoleMappingsLogic.actions.openSingleUserRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.singleUserRoleMappingFlyoutOpen).toEqual(true);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
+
+    it('closeUsersAndRolesFlyout', () => {
       mount({
         ...mappingsServerProps,
         roleMappingFlyoutOpen: true,
       });
-      RoleMappingsLogic.actions.closeRoleMappingFlyout();
+      RoleMappingsLogic.actions.closeUsersAndRolesFlyout();
 
       expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(false);
       expect(clearFlashMessages).toHaveBeenCalled();
     });
+
+    it('setElasticsearchUsernameValue', () => {
+      const username = 'newName';
+      RoleMappingsLogic.actions.setElasticsearchUsernameValue(username);
+
+      expect(RoleMappingsLogic.values.elasticsearchUser).toEqual({
+        ...RoleMappingsLogic.values.elasticsearchUser,
+        username,
+      });
+    });
+
+    it('setElasticsearchEmailValue', () => {
+      const email = 'newEmail@foo.cats';
+      RoleMappingsLogic.actions.setElasticsearchEmailValue(email);
+
+      expect(RoleMappingsLogic.values.elasticsearchUser).toEqual({
+        ...RoleMappingsLogic.values.elasticsearchUser,
+        email,
+      });
+    });
+
+    it('setUserCreated', () => {
+      RoleMappingsLogic.actions.setUserCreated();
+
+      expect(RoleMappingsLogic.values.userCreated).toEqual(true);
+    });
   });
 
   describe('listeners', () => {
@@ -303,6 +393,39 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    describe('initializeSingleUserRoleMapping', () => {
+      let setElasticsearchUserSpy: jest.MockedFunction<any>;
+      let setRoleMappingSpy: jest.MockedFunction<any>;
+      let setSingleUserRoleMappingSpy: jest.MockedFunction<any>;
+      beforeEach(() => {
+        setElasticsearchUserSpy = jest.spyOn(RoleMappingsLogic.actions, 'setElasticsearchUser');
+        setRoleMappingSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMapping');
+        setSingleUserRoleMappingSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setSingleUserRoleMapping'
+        );
+      });
+
+      it('should handle the new user state and only set an empty mapping', () => {
+        RoleMappingsLogic.actions.initializeSingleUserRoleMapping();
+
+        expect(setElasticsearchUserSpy).not.toHaveBeenCalled();
+        expect(setRoleMappingSpy).not.toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalledWith(undefined);
+      });
+
+      it('should handle an existing user state and set mapping', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        RoleMappingsLogic.actions.initializeSingleUserRoleMapping(
+          wsSingleUserRoleMapping.roleMapping.id
+        );
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalled();
+        expect(setRoleMappingSpy).toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalledWith(wsSingleUserRoleMapping);
+      });
+    });
+
     describe('handleSaveMapping', () => {
       it('calls API and refreshes list when new mapping', async () => {
         const initializeRoleMappingsSpy = jest.spyOn(
@@ -381,6 +504,100 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
+    describe('handleSaveUser', () => {
+      it('calls API and refreshes list when new mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
+        const setUserCreatedSpy = jest.spyOn(RoleMappingsLogic.actions, 'setUserCreated');
+        const setSingleUserRoleMappingSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setSingleUserRoleMapping'
+        );
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+
+        http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.handleSaveUser();
+
+        expect(http.post).toHaveBeenCalledWith(
+          '/api/workplace_search/org/single_user_role_mapping',
+          {
+            body: JSON.stringify({
+              roleMapping: {
+                groups: [defaultGroup.id],
+                roleType: 'admin',
+                allGroups: false,
+              },
+              elasticsearchUser: {
+                username: elasticsearchUsers[0].username,
+                email: elasticsearchUsers[0].email,
+              },
+            }),
+          }
+        );
+        await nextTick();
+
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
+        expect(setUserCreatedSpy).toHaveBeenCalled();
+        expect(setSingleUserRoleMappingSpy).toHaveBeenCalled();
+      });
+
+      it('calls API and refreshes list when existing mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
+        RoleMappingsLogic.actions.setSingleUserRoleMapping(wsSingleUserRoleMapping);
+        RoleMappingsLogic.actions.handleAllGroupsSelectionChange(true);
+
+        http.put.mockReturnValue(Promise.resolve(mappingsServerProps));
+        RoleMappingsLogic.actions.handleSaveUser();
+
+        expect(http.post).toHaveBeenCalledWith(
+          '/api/workplace_search/org/single_user_role_mapping',
+          {
+            body: JSON.stringify({
+              roleMapping: {
+                groups: [],
+                roleType: 'admin',
+                allGroups: true,
+                id: wsSingleUserRoleMapping.roleMapping.id,
+              },
+              elasticsearchUser: {
+                username: '',
+                email: '',
+              },
+            }),
+          }
+        );
+        await nextTick();
+
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
+      });
+
+      it('handles error', async () => {
+        const setRoleMappingErrorsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setRoleMappingErrors'
+        );
+
+        http.post.mockReturnValue(
+          Promise.reject({
+            body: {
+              attributes: {
+                errors: ['this is an error'],
+              },
+            },
+          })
+        );
+        RoleMappingsLogic.actions.handleSaveUser();
+        await nextTick();
+
+        expect(setRoleMappingErrorsSpy).toHaveBeenCalledWith(['this is an error']);
+      });
+    });
+
     describe('handleDeleteMapping', () => {
       const roleMappingId = 'r1';
 
@@ -410,5 +627,52 @@ describe('RoleMappingsLogic', () => {
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
     });
+
+    describe('handleUsernameSelectChange', () => {
+      it('sets elasticsearchUser when match found', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.handleUsernameSelectChange(elasticsearchUsers[0].username);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(elasticsearchUsers[0]);
+      });
+
+      it('does not set elasticsearchUser when no match found', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.handleUsernameSelectChange('bogus');
+
+        expect(setElasticsearchUserSpy).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('setUserExistingRadioValue', () => {
+      it('handles existing user', () => {
+        RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.setUserExistingRadioValue(true);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(elasticsearchUsers[0]);
+      });
+
+      it('handles new user', () => {
+        const setElasticsearchUserSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setElasticsearchUser'
+        );
+        RoleMappingsLogic.actions.setUserExistingRadioValue(false);
+
+        expect(setElasticsearchUserSpy).toHaveBeenCalledWith(emptyUser);
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
index 76b41b2f383eb..7f26c8738786c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
@@ -16,7 +16,7 @@ import {
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
-import { AttributeName } from '../../../shared/types';
+import { AttributeName, SingleUserRoleMapping, ElasticsearchUser } from '../../../shared/types';
 import { RoleGroup, WSRoleMapping, Role } from '../../types';
 
 import {
@@ -26,19 +26,24 @@ import {
   DEFAULT_GROUP_NAME,
 } from './constants';
 
+type UserMapping = SingleUserRoleMapping<WSRoleMapping>;
+
 interface RoleMappingsServerDetails {
   roleMappings: WSRoleMapping[];
   attributes: string[];
   authProviders: string[];
   availableGroups: RoleGroup[];
+  elasticsearchUsers: ElasticsearchUser[];
   elasticsearchRoles: string[];
   multipleAuthProvidersConfig: boolean;
+  singleUserRoleMappings: UserMapping[];
 }
 
 const getFirstAttributeName = (roleMapping: WSRoleMapping): AttributeName =>
   Object.entries(roleMapping.rules)[0][0] as AttributeName;
 const getFirstAttributeValue = (roleMapping: WSRoleMapping): string =>
   Object.entries(roleMapping.rules)[0][1] as string;
+const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 
 interface RoleMappingsActions {
   handleAllGroupsSelectionChange(selected: boolean): { selected: boolean };
@@ -51,21 +56,35 @@ interface RoleMappingsActions {
   handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
   handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
   handleRoleChange(roleType: Role): { roleType: Role };
+  handleUsernameSelectChange(username: string): { username: string };
   handleSaveMapping(): void;
+  handleSaveUser(): void;
   initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
+  initializeSingleUserRoleMapping(roleMappingId?: string): { roleMappingId?: string };
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMapping(roleMapping: WSRoleMapping): { roleMapping: WSRoleMapping };
+  setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
   setRoleMappings({
     roleMappings,
   }: {
     roleMappings: WSRoleMapping[];
   }): { roleMappings: WSRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
+  setElasticsearchUser(
+    elasticsearchUser?: ElasticsearchUser
+  ): { elasticsearchUser: ElasticsearchUser };
+  setDefaultGroup(availableGroups: RoleGroup[]): { availableGroups: RoleGroup[] };
   openRoleMappingFlyout(): void;
-  closeRoleMappingFlyout(): void;
+  openSingleUserRoleMappingFlyout(): void;
+  closeUsersAndRolesFlyout(): void;
   setRoleMappingErrors(errors: string[]): { errors: string[] };
   enableRoleBasedAccess(): void;
+  setUserExistingRadioValue(userFormUserIsExisting: boolean): { userFormUserIsExisting: boolean };
+  setElasticsearchUsernameValue(username: string): { username: string };
+  setElasticsearchEmailValue(email: string): { email: string };
+  setUserCreated(): void;
+  setUserFormIsNewUser(userFormIsNewUser: boolean): { userFormIsNewUser: boolean };
 }
 
 interface RoleMappingsValues {
@@ -77,26 +96,37 @@ interface RoleMappingsValues {
   availableGroups: RoleGroup[];
   dataLoading: boolean;
   elasticsearchRoles: string[];
+  elasticsearchUsers: ElasticsearchUser[];
+  elasticsearchUser: ElasticsearchUser;
   multipleAuthProvidersConfig: boolean;
   roleMapping: WSRoleMapping | null;
   roleMappings: WSRoleMapping[];
+  singleUserRoleMapping: UserMapping | null;
+  singleUserRoleMappings: UserMapping[];
   roleType: Role;
   selectedAuthProviders: string[];
   selectedGroups: Set<string>;
   roleMappingFlyoutOpen: boolean;
+  singleUserRoleMappingFlyoutOpen: boolean;
   selectedOptions: EuiComboBoxOptionOption[];
   roleMappingErrors: string[];
+  userFormUserIsExisting: boolean;
+  userCreated: boolean;
+  userFormIsNewUser: boolean;
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
-  path: ['enterprise_search', 'workplace_search', 'role_mappings'],
+  path: ['enterprise_search', 'workplace_search', 'users_and_roles'],
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMapping: (roleMapping: WSRoleMapping) => ({ roleMapping }),
+    setElasticsearchUser: (elasticsearchUser: ElasticsearchUser) => ({ elasticsearchUser }),
+    setSingleUserRoleMapping: (singleUserRoleMapping: UserMapping) => ({ singleUserRoleMapping }),
     setRoleMappings: ({ roleMappings }: { roleMappings: WSRoleMapping[] }) => ({ roleMappings }),
     setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string[]) => ({ value }),
     handleRoleChange: (roleType: Role) => ({ roleType }),
+    handleUsernameSelectChange: (username: string) => ({ username }),
     handleGroupSelectionChange: (groupIds: string[]) => ({ groupIds }),
     handleAttributeSelectorChange: (value: string, firstElasticsearchRole: string) => ({
       value,
@@ -105,13 +135,22 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     handleAttributeValueChange: (value: string) => ({ value }),
     handleAllGroupsSelectionChange: (selected: boolean) => ({ selected }),
     enableRoleBasedAccess: true,
+    openSingleUserRoleMappingFlyout: true,
+    setUserExistingRadioValue: (userFormUserIsExisting: boolean) => ({ userFormUserIsExisting }),
     resetState: true,
     initializeRoleMappings: true,
+    initializeSingleUserRoleMapping: (roleMappingId?: string) => ({ roleMappingId }),
     initializeRoleMapping: (roleMappingId?: string) => ({ roleMappingId }),
     handleDeleteMapping: (roleMappingId: string) => ({ roleMappingId }),
     handleSaveMapping: true,
+    handleSaveUser: true,
+    setDefaultGroup: (availableGroups: RoleGroup[]) => ({ availableGroups }),
     openRoleMappingFlyout: true,
-    closeRoleMappingFlyout: false,
+    closeUsersAndRolesFlyout: false,
+    setElasticsearchUsernameValue: (username: string) => ({ username }),
+    setElasticsearchEmailValue: (email: string) => ({ email }),
+    setUserCreated: true,
+    setUserFormIsNewUser: (userFormIsNewUser: boolean) => ({ userFormIsNewUser }),
   },
   reducers: {
     dataLoading: [
@@ -131,6 +170,13 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         resetState: () => [],
       },
     ],
+    singleUserRoleMappings: [
+      [],
+      {
+        setRoleMappingsData: (_, { singleUserRoleMappings }) => singleUserRoleMappings,
+        resetState: () => [],
+      },
+    ],
     multipleAuthProvidersConfig: [
       false,
       {
@@ -154,6 +200,13 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       [],
       {
         setRoleMappingsData: (_, { elasticsearchRoles }) => elasticsearchRoles,
+        closeUsersAndRolesFlyout: () => [ANY_AUTH_PROVIDER],
+      },
+    ],
+    elasticsearchUsers: [
+      [],
+      {
+        setRoleMappingsData: (_, { elasticsearchUsers }) => elasticsearchUsers,
       },
     ],
     roleMapping: [
@@ -161,7 +214,14 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       {
         setRoleMapping: (_, { roleMapping }) => roleMapping,
         resetState: () => null,
-        closeRoleMappingFlyout: () => null,
+        closeUsersAndRolesFlyout: () => null,
+      },
+    ],
+    singleUserRoleMapping: [
+      null,
+      {
+        setSingleUserRoleMapping: (_, { singleUserRoleMapping }) => singleUserRoleMapping || null,
+        closeUsersAndRolesFlyout: () => null,
       },
     ],
     roleType: [
@@ -176,6 +236,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       {
         setRoleMapping: (_, { roleMapping }) => roleMapping.allGroups,
         handleAllGroupsSelectionChange: (_, { selected }) => selected,
+        closeUsersAndRolesFlyout: () => false,
       },
     ],
     attributeValue: [
@@ -186,7 +247,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           value === 'role' ? firstElasticsearchRole : '',
         handleAttributeValueChange: (_, { value }) => value,
         resetState: () => '',
-        closeRoleMappingFlyout: () => '',
+        closeUsersAndRolesFlyout: () => '',
       },
     ],
     attributeName: [
@@ -195,7 +256,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setRoleMapping: (_, { roleMapping }) => getFirstAttributeName(roleMapping),
         handleAttributeSelectorChange: (_, { value }) => value,
         resetState: () => 'username',
-        closeRoleMappingFlyout: () => 'username',
+        closeUsersAndRolesFlyout: () => 'username',
       },
     ],
     selectedGroups: [
@@ -207,6 +268,12 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
               .filter((group) => group.name === DEFAULT_GROUP_NAME)
               .map((group) => group.id)
           ),
+        setDefaultGroup: (_, { availableGroups }) =>
+          new Set(
+            availableGroups
+              .filter((group) => group.name === DEFAULT_GROUP_NAME)
+              .map((group) => group.id)
+          ),
         setRoleMapping: (_, { roleMapping }) =>
           new Set(roleMapping.groups.map((group: RoleGroup) => group.id)),
         handleGroupSelectionChange: (_, { groupIds }) => {
@@ -215,6 +282,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
 
           return newSelectedGroupNames;
         },
+        closeUsersAndRolesFlyout: () => new Set(),
       },
     ],
     availableAuthProviders: [
@@ -244,17 +312,61 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       false,
       {
         openRoleMappingFlyout: () => true,
-        closeRoleMappingFlyout: () => false,
+        closeUsersAndRolesFlyout: () => false,
         initializeRoleMappings: () => false,
         initializeRoleMapping: () => true,
       },
     ],
+    singleUserRoleMappingFlyoutOpen: [
+      false,
+      {
+        openSingleUserRoleMappingFlyout: () => true,
+        closeUsersAndRolesFlyout: () => false,
+        initializeSingleUserRoleMapping: () => true,
+      },
+    ],
     roleMappingErrors: [
       [],
       {
         setRoleMappingErrors: (_, { errors }) => errors,
         handleSaveMapping: () => [],
-        closeRoleMappingFlyout: () => [],
+        closeUsersAndRolesFlyout: () => [],
+      },
+    ],
+    userFormUserIsExisting: [
+      true,
+      {
+        setUserExistingRadioValue: (_, { userFormUserIsExisting }) => userFormUserIsExisting,
+        closeUsersAndRolesFlyout: () => true,
+      },
+    ],
+    elasticsearchUser: [
+      emptyUser,
+      {
+        setRoleMappingsData: (_, { elasticsearchUsers }) => elasticsearchUsers[0] || emptyUser,
+        setElasticsearchUser: (_, { elasticsearchUser }) => elasticsearchUser || emptyUser,
+        setElasticsearchUsernameValue: (state, { username }) => ({
+          ...state,
+          username,
+        }),
+        setElasticsearchEmailValue: (state, { email }) => ({
+          ...state,
+          email,
+        }),
+        closeUsersAndRolesFlyout: () => emptyUser,
+      },
+    ],
+    userCreated: [
+      false,
+      {
+        setUserCreated: () => true,
+        closeUsersAndRolesFlyout: () => false,
+      },
+    ],
+    userFormIsNewUser: [
+      true,
+      {
+        setUserFormIsNewUser: (_, { userFormIsNewUser }) => userFormIsNewUser,
       },
     ],
   },
@@ -296,6 +408,18 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const roleMapping = values.roleMappings.find(({ id }) => id === roleMappingId);
       if (roleMapping) actions.setRoleMapping(roleMapping);
     },
+    initializeSingleUserRoleMapping: ({ roleMappingId }) => {
+      const singleUserRoleMapping = values.singleUserRoleMappings.find(
+        ({ roleMapping }) => roleMapping.id === roleMappingId
+      );
+
+      if (singleUserRoleMapping) {
+        actions.setElasticsearchUser(singleUserRoleMapping.elasticsearchUser);
+        actions.setRoleMapping(singleUserRoleMapping.roleMapping);
+      }
+      actions.setSingleUserRoleMapping(singleUserRoleMapping);
+      actions.setUserFormIsNewUser(!singleUserRoleMapping);
+    },
     handleDeleteMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
       const route = `/api/workplace_search/org/role_mappings/${roleMappingId}`;
@@ -349,11 +473,59 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     resetState: () => {
       clearFlashMessages();
     },
-    closeRoleMappingFlyout: () => {
+    handleSaveUser: async () => {
+      const { http } = HttpLogic.values;
+      const {
+        roleType,
+        singleUserRoleMapping,
+        includeInAllGroups,
+        selectedGroups,
+        elasticsearchUser: { email, username },
+      } = values;
+
+      const body = JSON.stringify({
+        roleMapping: {
+          groups: includeInAllGroups ? [] : Array.from(selectedGroups),
+          roleType,
+          allGroups: includeInAllGroups,
+          id: singleUserRoleMapping?.roleMapping?.id,
+        },
+        elasticsearchUser: {
+          username,
+          email,
+        },
+      });
+
+      try {
+        const response = await http.post('/api/workplace_search/org/single_user_role_mapping', {
+          body,
+        });
+        actions.setSingleUserRoleMapping(response);
+        actions.setUserCreated();
+        actions.initializeRoleMappings();
+      } catch (e) {
+        actions.setRoleMappingErrors(e?.body?.attributes?.errors);
+      }
+    },
+    closeUsersAndRolesFlyout: () => {
       clearFlashMessages();
+      const firstUser = values.elasticsearchUsers[0];
+      actions.setElasticsearchUser(firstUser);
+      actions.setDefaultGroup(values.availableGroups);
     },
     openRoleMappingFlyout: () => {
       clearFlashMessages();
     },
+    openSingleUserRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
+    setUserExistingRadioValue: ({ userFormUserIsExisting }) => {
+      const firstUser = values.elasticsearchUsers[0];
+      actions.setElasticsearchUser(userFormUserIsExisting ? firstUser : emptyUser);
+    },
+    handleUsernameSelectChange: ({ username }) => {
+      const user = values.elasticsearchUsers.find((u) => u.username === username);
+      if (user) actions.setElasticsearchUser(user);
+    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
new file mode 100644
index 0000000000000..32ee1a7f22875
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
@@ -0,0 +1,123 @@
+/*
+ * 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 '../../../__mocks__/react_router';
+import '../../../__mocks__/shallow_useeffect.mock';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
+import { groups } from '../../__mocks__/groups.mock';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { UserFlyout, UserAddedInfo, UserInvitationCallout } from '../../../shared/role_mapping';
+import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
+import { wsSingleUserRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
+
+import { GroupAssignmentSelector } from './group_assignment_selector';
+import { User } from './user';
+
+describe('User', () => {
+  const handleSaveUser = jest.fn();
+  const closeUsersAndRolesFlyout = jest.fn();
+  const setUserExistingRadioValue = jest.fn();
+  const setElasticsearchUsernameValue = jest.fn();
+  const setElasticsearchEmailValue = jest.fn();
+  const handleRoleChange = jest.fn();
+  const handleUsernameSelectChange = jest.fn();
+
+  const mockValues = {
+    availableGroups: [],
+    singleUserRoleMapping: null,
+    userFormUserIsExisting: false,
+    elasticsearchUsers: [],
+    elasticsearchUser: {},
+    roleType: 'admin',
+    roleMappingErrors: [],
+    userCreated: false,
+    userFormIsNewUser: false,
+  };
+
+  beforeEach(() => {
+    setMockActions({
+      handleSaveUser,
+      closeUsersAndRolesFlyout,
+      setUserExistingRadioValue,
+      setElasticsearchUsernameValue,
+      setElasticsearchEmailValue,
+      handleRoleChange,
+      handleUsernameSelectChange,
+    });
+
+    setMockValues(mockValues);
+  });
+
+  it('renders', () => {
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout)).toHaveLength(1);
+  });
+
+  it('renders group assignment selector when groups present', () => {
+    setMockValues({ ...mockValues, availableGroups: groups });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(GroupAssignmentSelector)).toHaveLength(1);
+  });
+
+  it('renders userInvitationCallout', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserInvitationCallout)).toHaveLength(1);
+  });
+
+  it('renders user added info when user created', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      userCreated: true,
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserAddedInfo)).toHaveLength(1);
+  });
+
+  it('disables form when username value not present', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      elasticsearchUsers,
+      elasticsearchUser: {
+        username: null,
+        email: 'email@user.com',
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout).prop('disabled')).toEqual(true);
+  });
+
+  it('enables form when userFormUserIsExisting', () => {
+    setMockValues({
+      ...mockValues,
+      userFormUserIsExisting: true.valueOf,
+      singleUserRoleMapping: wsSingleUserRoleMapping,
+      elasticsearchUsers,
+      elasticsearchUser: {
+        username: null,
+        email: 'email@user.com',
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(UserFlyout).prop('disabled')).toEqual(false);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
new file mode 100644
index 0000000000000..bfb32ee31c121
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
@@ -0,0 +1,103 @@
+/*
+ * 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 React from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import { EuiForm } from '@elastic/eui';
+
+import { getWorkplaceSearchUrl } from '../../../shared/enterprise_search_url';
+import {
+  UserFlyout,
+  UserSelector,
+  UserAddedInfo,
+  UserInvitationCallout,
+} from '../../../shared/role_mapping';
+import { Role } from '../../types';
+
+import { GroupAssignmentSelector } from './group_assignment_selector';
+import { RoleMappingsLogic } from './role_mappings_logic';
+
+const roleTypes = (['admin', 'user'] as unknown) as Role[];
+
+export const User: React.FC = () => {
+  const {
+    handleSaveUser,
+    closeUsersAndRolesFlyout,
+    setUserExistingRadioValue,
+    setElasticsearchUsernameValue,
+    setElasticsearchEmailValue,
+    handleRoleChange,
+    handleUsernameSelectChange,
+  } = useActions(RoleMappingsLogic);
+
+  const {
+    availableGroups,
+    singleUserRoleMapping,
+    userFormUserIsExisting,
+    elasticsearchUsers,
+    elasticsearchUser,
+    roleType,
+    roleMappingErrors,
+    userCreated,
+    userFormIsNewUser,
+  } = useValues(RoleMappingsLogic);
+
+  const showGroupAssignmentSelector = availableGroups.length > 0;
+  const hasAvailableUsers = elasticsearchUsers.length > 0;
+  const flyoutDisabled =
+    (!userFormUserIsExisting || !hasAvailableUsers) && !elasticsearchUser.username;
+
+  const userAddedInfo = singleUserRoleMapping && (
+    <UserAddedInfo
+      username={singleUserRoleMapping.elasticsearchUser.username}
+      email={singleUserRoleMapping.elasticsearchUser.email as string}
+      roleType={singleUserRoleMapping.roleMapping.roleType}
+    />
+  );
+
+  const userInvitationCallout = singleUserRoleMapping?.invitation && (
+    <UserInvitationCallout
+      isNew={userCreated}
+      invitationCode={singleUserRoleMapping!.invitation.code}
+      urlPrefix={getWorkplaceSearchUrl()}
+    />
+  );
+
+  const createUserForm = (
+    <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
+      <UserSelector
+        isNewUser={userFormIsNewUser}
+        elasticsearchUsers={elasticsearchUsers}
+        handleRoleChange={handleRoleChange}
+        elasticsearchUser={elasticsearchUser}
+        setUserExisting={setUserExistingRadioValue}
+        setElasticsearchEmailValue={setElasticsearchEmailValue}
+        setElasticsearchUsernameValue={setElasticsearchUsernameValue}
+        handleUsernameSelectChange={handleUsernameSelectChange}
+        userFormUserIsExisting={userFormUserIsExisting}
+        roleTypes={roleTypes}
+        roleType={roleType}
+      />
+      {showGroupAssignmentSelector && <GroupAssignmentSelector />}
+    </EuiForm>
+  );
+
+  return (
+    <UserFlyout
+      disabled={flyoutDisabled}
+      isComplete={userCreated}
+      isNew={userFormIsNewUser}
+      closeUserFlyout={closeUsersAndRolesFlyout}
+      handleSaveUser={handleSaveUser}
+    >
+      {userCreated ? userAddedInfo : createUserForm}
+      {userInvitationCallout}
+    </UserFlyout>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
index 7d9f08627516b..dfb9765f834b6 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.test.ts
@@ -11,6 +11,7 @@ import {
   registerEnableRoleMappingsRoute,
   registerRoleMappingsRoute,
   registerRoleMappingRoute,
+  registerUserRoute,
 } from './role_mappings';
 
 const roleMappingBaseSchema = {
@@ -160,4 +161,52 @@ describe('role mappings routes', () => {
       });
     });
   });
+
+  describe('POST /api/app_search/single_user_role_mapping', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'post',
+        path: '/api/app_search/single_user_role_mapping',
+      });
+
+      registerUserRoute({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    describe('validates', () => {
+      it('correctly', () => {
+        const request = {
+          body: {
+            roleMapping: {
+              engines: ['foo', 'bar'],
+              roleType: 'admin',
+              accessAllEngines: true,
+              id: '123asf',
+            },
+            elasticsearchUser: {
+              username: 'user2@elastic.co',
+              email: 'user2',
+            },
+          },
+        };
+        mockRouter.shouldValidate(request);
+      });
+
+      it('missing required fields', () => {
+        const request = { body: {} };
+        mockRouter.shouldThrow(request);
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/as/role_mappings/upsert_single_user_role_mapping',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
index da620be2ea950..d90a005cb2532 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/role_mappings.ts
@@ -93,8 +93,34 @@ export function registerRoleMappingRoute({
   );
 }
 
+export function registerUserRoute({ router, enterpriseSearchRequestHandler }: RouteDependencies) {
+  router.post(
+    {
+      path: '/api/app_search/single_user_role_mapping',
+      validate: {
+        body: schema.object({
+          roleMapping: schema.object({
+            engines: schema.arrayOf(schema.string()),
+            roleType: schema.string(),
+            accessAllEngines: schema.boolean(),
+            id: schema.maybe(schema.string()),
+          }),
+          elasticsearchUser: schema.object({
+            username: schema.string(),
+            email: schema.string(),
+          }),
+        }),
+      },
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/as/role_mappings/upsert_single_user_role_mapping',
+    })
+  );
+}
+
 export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
   registerEnableRoleMappingsRoute(dependencies);
   registerRoleMappingsRoute(dependencies);
   registerRoleMappingRoute(dependencies);
+  registerUserRoute(dependencies);
 };
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
index aa0e9983166c0..ef8f1bd63f5d3 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.test.ts
@@ -11,6 +11,7 @@ import {
   registerOrgEnableRoleMappingsRoute,
   registerOrgRoleMappingsRoute,
   registerOrgRoleMappingRoute,
+  registerOrgUserRoute,
 } from './role_mappings';
 
 describe('role mappings routes', () => {
@@ -128,4 +129,52 @@ describe('role mappings routes', () => {
       });
     });
   });
+
+  describe('POST /api/workplace_search/org/single_user_role_mapping', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'post',
+        path: '/api/workplace_search/org/single_user_role_mapping',
+      });
+
+      registerOrgUserRoute({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    describe('validates', () => {
+      it('correctly', () => {
+        const request = {
+          body: {
+            roleMapping: {
+              groups: ['foo', 'bar'],
+              roleType: 'admin',
+              allGroups: true,
+              id: '123asf',
+            },
+            elasticsearchUser: {
+              username: 'user2@elastic.co',
+              email: 'user2',
+            },
+          },
+        };
+        mockRouter.shouldValidate(request);
+      });
+
+      it('missing required fields', () => {
+        const request = { body: {} };
+        mockRouter.shouldThrow(request);
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/ws/org/role_mappings/upsert_single_user_role_mapping',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
index cea7bcb311ce8..e6f4919ed2a2f 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/role_mappings.ts
@@ -93,8 +93,37 @@ export function registerOrgRoleMappingRoute({
   );
 }
 
+export function registerOrgUserRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.post(
+    {
+      path: '/api/workplace_search/org/single_user_role_mapping',
+      validate: {
+        body: schema.object({
+          roleMapping: schema.object({
+            groups: schema.arrayOf(schema.string()),
+            roleType: schema.string(),
+            allGroups: schema.boolean(),
+            id: schema.maybe(schema.string()),
+          }),
+          elasticsearchUser: schema.object({
+            username: schema.string(),
+            email: schema.string(),
+          }),
+        }),
+      },
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/ws/org/role_mappings/upsert_single_user_role_mapping',
+    })
+  );
+}
+
 export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
   registerOrgEnableRoleMappingsRoute(dependencies);
   registerOrgRoleMappingsRoute(dependencies);
   registerOrgRoleMappingRoute(dependencies);
+  registerOrgUserRoute(dependencies);
 };

From 9b56549c6c26a1f86c44e709b12c4e295aaebda3 Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Thu, 24 Jun 2021 09:05:26 -0400
Subject: [PATCH 37/95] [Cases] Including owner when patching a comment Closes
 #102732 (#103020)

* Including owner when patching a comment

* Fixing tests
---
 .../cases/public/containers/api.test.tsx      | 31 +++++----
 x-pack/plugins/cases/public/containers/api.ts | 26 ++++---
 .../containers/use_update_comment.test.tsx    | 67 +++++++++----------
 .../public/containers/use_update_comment.tsx  | 13 ++--
 4 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx
index abdee387a2c42..30a76e28e7485 100644
--- a/x-pack/plugins/cases/public/containers/api.test.tsx
+++ b/x-pack/plugins/cases/public/containers/api.test.tsx
@@ -363,13 +363,14 @@ describe('Case Configuration API', () => {
     });
 
     test('check url, method, signal', async () => {
-      await patchComment(
-        basicCase.id,
-        basicCase.comments[0].id,
-        'updated comment',
-        basicCase.comments[0].version,
-        abortCtrl.signal
-      );
+      await patchComment({
+        caseId: basicCase.id,
+        commentId: basicCase.comments[0].id,
+        commentUpdate: 'updated comment',
+        version: basicCase.comments[0].version,
+        signal: abortCtrl.signal,
+        owner: SECURITY_SOLUTION_OWNER,
+      });
       expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/${basicCase.id}/comments`, {
         method: 'PATCH',
         body: JSON.stringify({
@@ -377,19 +378,21 @@ describe('Case Configuration API', () => {
           type: CommentType.user,
           id: basicCase.comments[0].id,
           version: basicCase.comments[0].version,
+          owner: SECURITY_SOLUTION_OWNER,
         }),
         signal: abortCtrl.signal,
       });
     });
 
     test('happy path', async () => {
-      const resp = await patchComment(
-        basicCase.id,
-        basicCase.comments[0].id,
-        'updated comment',
-        basicCase.comments[0].version,
-        abortCtrl.signal
-      );
+      const resp = await patchComment({
+        caseId: basicCase.id,
+        commentId: basicCase.comments[0].id,
+        commentUpdate: 'updated comment',
+        version: basicCase.comments[0].version,
+        signal: abortCtrl.signal,
+        owner: SECURITY_SOLUTION_OWNER,
+      });
       expect(resp).toEqual(basicCase);
     });
   });
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 1a2a92850a4ad..b144a874cfc53 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -283,14 +283,23 @@ export const postComment = async (
   return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
 };
 
-export const patchComment = async (
-  caseId: string,
-  commentId: string,
-  commentUpdate: string,
-  version: string,
-  signal: AbortSignal,
-  subCaseId?: string
-): Promise<Case> => {
+export const patchComment = async ({
+  caseId,
+  commentId,
+  commentUpdate,
+  version,
+  signal,
+  owner,
+  subCaseId,
+}: {
+  caseId: string;
+  commentId: string;
+  commentUpdate: string;
+  version: string;
+  signal: AbortSignal;
+  owner: string;
+  subCaseId?: string;
+}): Promise<Case> => {
   const response = await KibanaServices.get().http.fetch<CaseResponse>(getCaseCommentsUrl(caseId), {
     method: 'PATCH',
     body: JSON.stringify({
@@ -298,6 +307,7 @@ export const patchComment = async (
       type: CommentType.user,
       id: commentId,
       version,
+      owner,
     }),
     ...(subCaseId ? { query: { subCaseId } } : {}),
     signal,
diff --git a/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
index b936eb126f0d4..14cc4dfab3599 100644
--- a/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
@@ -5,10 +5,13 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useUpdateComment, UseUpdateComment } from './use_update_comment';
 import { basicCase, basicCaseCommentPatch, basicSubCaseId } from './mock';
 import * as api from './api';
+import { TestProviders } from '../common/mock';
+import { SECURITY_SOLUTION_OWNER } from '../../common';
 
 jest.mock('./api');
 jest.mock('../common/lib/kibana');
@@ -25,6 +28,12 @@ describe('useUpdateComment', () => {
     updateCase,
     version: basicCase.comments[0].version,
   };
+
+  const renderHookUseUpdateComment = () =>
+    renderHook<string, UseUpdateComment>(() => useUpdateComment(), {
+      wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+    });
+
   beforeEach(() => {
     jest.clearAllMocks();
     jest.restoreAllMocks();
@@ -32,9 +41,7 @@ describe('useUpdateComment', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
       expect(result.current).toEqual({
         isLoadingIds: [],
@@ -48,21 +55,20 @@ describe('useUpdateComment', () => {
     const spyOnPatchComment = jest.spyOn(api, 'patchComment');
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
 
       result.current.patchComment(sampleUpdate);
       await waitForNextUpdate();
-      expect(spyOnPatchComment).toBeCalledWith(
-        basicCase.id,
-        basicCase.comments[0].id,
-        'updated comment',
-        basicCase.comments[0].version,
-        abortCtrl.signal,
-        undefined
-      );
+      expect(spyOnPatchComment).toBeCalledWith({
+        caseId: basicCase.id,
+        commentId: basicCase.comments[0].id,
+        commentUpdate: 'updated comment',
+        version: basicCase.comments[0].version,
+        signal: abortCtrl.signal,
+        owner: SECURITY_SOLUTION_OWNER,
+        subCaseId: undefined,
+      });
     });
   });
 
@@ -70,29 +76,26 @@ describe('useUpdateComment', () => {
     const spyOnPatchComment = jest.spyOn(api, 'patchComment');
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
 
       result.current.patchComment({ ...sampleUpdate, subCaseId: basicSubCaseId });
       await waitForNextUpdate();
-      expect(spyOnPatchComment).toBeCalledWith(
-        basicCase.id,
-        basicCase.comments[0].id,
-        'updated comment',
-        basicCase.comments[0].version,
-        abortCtrl.signal,
-        basicSubCaseId
-      );
+      expect(spyOnPatchComment).toBeCalledWith({
+        caseId: basicCase.id,
+        commentId: basicCase.comments[0].id,
+        commentUpdate: 'updated comment',
+        version: basicCase.comments[0].version,
+        signal: abortCtrl.signal,
+        owner: SECURITY_SOLUTION_OWNER,
+        subCaseId: basicSubCaseId,
+      });
     });
   });
 
   it('patch comment', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
       result.current.patchComment(sampleUpdate);
       await waitForNextUpdate();
@@ -108,9 +111,7 @@ describe('useUpdateComment', () => {
 
   it('set isLoading to true when posting case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
       result.current.patchComment(sampleUpdate);
 
@@ -125,9 +126,7 @@ describe('useUpdateComment', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseUpdateComment>(() =>
-        useUpdateComment()
-      );
+      const { result, waitForNextUpdate } = renderHookUseUpdateComment();
       await waitForNextUpdate();
       result.current.patchComment(sampleUpdate);
 
diff --git a/x-pack/plugins/cases/public/containers/use_update_comment.tsx b/x-pack/plugins/cases/public/containers/use_update_comment.tsx
index 478d7ebf1fc32..3c307d86ac7bc 100644
--- a/x-pack/plugins/cases/public/containers/use_update_comment.tsx
+++ b/x-pack/plugins/cases/public/containers/use_update_comment.tsx
@@ -7,6 +7,7 @@
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
 import { useToasts } from '../common/lib/kibana';
+import { useOwnerContext } from '../components/owner_context/use_owner_context';
 import { patchComment } from './api';
 import * as i18n from './translations';
 import { Case } from './types';
@@ -72,6 +73,9 @@ export const useUpdateComment = (): UseUpdateComment => {
   const toasts = useToasts();
   const isCancelledRef = useRef(false);
   const abortCtrlRef = useRef(new AbortController());
+  // this hook guarantees that there will be at least one value in the owner array, we'll
+  // just use the first entry just in case there are more than one entry
+  const owner = useOwnerContext()[0];
 
   const dispatchUpdateComment = useCallback(
     async ({
@@ -89,14 +93,15 @@ export const useUpdateComment = (): UseUpdateComment => {
         abortCtrlRef.current = new AbortController();
         dispatch({ type: 'FETCH_INIT', payload: commentId });
 
-        const response = await patchComment(
+        const response = await patchComment({
           caseId,
           commentId,
           commentUpdate,
           version,
-          abortCtrlRef.current.signal,
-          subCaseId
-        );
+          signal: abortCtrlRef.current.signal,
+          subCaseId,
+          owner,
+        });
 
         if (!isCancelledRef.current) {
           updateCase(response);

From 1ef5a6aa05e9b4bd0fb96809b979877e7081f654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Thu, 24 Jun 2021 15:06:07 +0200
Subject: [PATCH 38/95] [Fleet][Logs UI] Prevent double loading of entries in
 `<LogStream />` component. (#102980)

* Use better loading indicator for `useLogSource`

* Use clearer name for the loading entries flag

* Reuse query object if its value persists
---
 .../public/components/log_stream/log_stream.tsx     |  6 +++---
 .../public/containers/logs/log_stream/index.ts      | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
index 0087d559a42e6..ff9b749911c84 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
@@ -112,7 +112,7 @@ Read more at https://github.com/elastic/kibana/blob/master/src/plugins/kibana_re
 
   const {
     derivedIndexPattern,
-    isLoadingSourceConfiguration,
+    isLoading: isLoadingSource,
     loadSource,
     sourceConfiguration,
   } = useLogSource({
@@ -138,7 +138,7 @@ Read more at https://github.com/elastic/kibana/blob/master/src/plugins/kibana_re
     hasMoreAfter,
     hasMoreBefore,
     isLoadingMore,
-    isReloading,
+    isReloading: isLoadingEntries,
   } = useLogStream({
     sourceId,
     startTimestamp,
@@ -198,7 +198,7 @@ Read more at https://github.com/elastic/kibana/blob/master/src/plugins/kibana_re
       items={streamItems}
       scale="medium"
       wrap={true}
-      isReloading={isLoadingSourceConfiguration || isReloading}
+      isReloading={isLoadingSource || isLoadingEntries}
       isLoadingMore={isLoadingMore}
       hasMoreBeforeStart={hasMoreBefore}
       hasMoreAfterEnd={hasMoreAfter}
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
index 021aa8f79fe59..4cdeb678c432b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import { isEqual } from 'lodash';
 import createContainer from 'constate';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
 import useSetState from 'react-use/lib/useSetState';
 import { esQuery } from '../../../../../../../src/plugins/data/public';
@@ -65,6 +66,12 @@ export function useLogStream({
   const prevStartTimestamp = usePrevious(startTimestamp);
   const prevEndTimestamp = usePrevious(endTimestamp);
 
+  const cachedQuery = useRef(query);
+
+  if (!isEqual(query, cachedQuery)) {
+    cachedQuery.current = query;
+  }
+
   useEffect(() => {
     if (prevStartTimestamp && prevStartTimestamp > startTimestamp) {
       setState({ hasMoreBefore: true });
@@ -82,10 +89,10 @@ export function useLogStream({
       sourceId,
       startTimestamp,
       endTimestamp,
-      query,
+      query: cachedQuery.current,
       columnOverrides: columns,
     }),
-    [columns, endTimestamp, query, sourceId, startTimestamp]
+    [columns, endTimestamp, cachedQuery, sourceId, startTimestamp]
   );
 
   const {

From 0a2042eed55100f46766faefd03aeab2dc3607c3 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Thu, 24 Jun 2021 15:14:48 +0200
Subject: [PATCH 39/95] Prevent showing filter on unfilterable fields (#103241)

---
 .../discover_grid/discover_grid_cell_actions.test.tsx    | 9 ++++++++-
 .../discover_grid/discover_grid_cell_actions.tsx         | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.test.tsx
index 965d3cb6a30c4..de3c55ad7a869 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.test.tsx
@@ -9,14 +9,21 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { FilterInBtn, FilterOutBtn } from './discover_grid_cell_actions';
+import { FilterInBtn, FilterOutBtn, buildCellActions } from './discover_grid_cell_actions';
 import { DiscoverGridContext } from './discover_grid_context';
 
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { esHits } from '../../../__mocks__/es_hits';
 import { EuiButton } from '@elastic/eui';
+import { IndexPatternField } from 'src/plugins/data/common';
 
 describe('Discover cell actions ', function () {
+  it('should not show cell actions for unfilterable fields', async () => {
+    expect(
+      buildCellActions({ name: 'foo', filterable: false } as IndexPatternField)
+    ).toBeUndefined();
+  });
+
   it('triggers filter function when FilterInBtn is clicked', async () => {
     const contextMock = {
       expanded: undefined,
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
index 4e9218f0881cd..ab80cd3e7b461 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
@@ -79,7 +79,7 @@ export const FilterOutBtn = ({
 };
 
 export function buildCellActions(field: IndexPatternField) {
-  if (!field.aggregatable && !field.searchable) {
+  if (!field.filterable) {
     return undefined;
   }
 

From 4e38dfee1430889667b5333ac25a00a8ef2ce89e Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Thu, 24 Jun 2021 14:15:44 +0100
Subject: [PATCH 40/95] skip flaky suite (#98240)

---
 test/api_integration/apis/ui_counters/ui_counters.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
index 2be6ea4341fb0..019dcfd621655 100644
--- a/test/api_integration/apis/ui_counters/ui_counters.ts
+++ b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -56,7 +56,8 @@ export default function ({ getService }: FtrProviderContext) {
     return savedObject;
   };
 
-  describe('UI Counters API', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/98240
+  describe.skip('UI Counters API', () => {
     const dayDate = moment().format('DDMMYYYY');
     before(async () => await esArchiver.emptyKibanaIndex());
 

From 4266957a0df426cb88e9f8313e18d1f8c26b8652 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 24 Jun 2021 15:20:28 +0200
Subject: [PATCH 41/95] fix filter input debouncing (#103087)

---
 .../lens/public/indexpattern_datasource/query_input.tsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
index a67199a9d3432..1b418ee3b408f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { isEqual } from 'lodash';
 import { QueryStringInput, Query } from '../../../../../src/plugins/data/public';
 import { useDebouncedValue } from '../shared_components';
 
@@ -36,7 +37,11 @@ export const QueryInput = ({
       bubbleSubmitEvent={false}
       indexPatterns={[indexPatternTitle]}
       query={inputValue}
-      onChange={handleInputChange}
+      onChange={(newQuery) => {
+        if (!isEqual(newQuery, inputValue)) {
+          handleInputChange(newQuery);
+        }
+      }}
       onSubmit={() => {
         if (inputValue.query) {
           onSubmit();

From b1b182bdec007528722d2de5a12c2dde7a09c1d3 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 24 Jun 2021 15:23:39 +0200
Subject: [PATCH 42/95] [Lens] Add new error case for mixed x axes (#102861)

---
 .../xy_visualization/visualization.test.ts    | 53 +++++++++++++++++++
 .../public/xy_visualization/visualization.tsx | 36 +++++++++++--
 2 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
index f2840b6d3844b..dee0e5763dee4 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
@@ -872,6 +872,59 @@ describe('xy_visualization', () => {
         },
       ]);
     });
+
+    it('should return an error if string and date histogram xAccessors (multiple layers) are used together', () => {
+      // current incompatibility is only for date and numeric histograms as xAccessors
+      const datasourceLayers = {
+        first: mockDatasource.publicAPIMock,
+        second: createMockDatasource('testDatasource').publicAPIMock,
+      };
+      datasourceLayers.first.getOperationForColumnId = jest.fn((id: string) =>
+        id === 'a'
+          ? (({
+              dataType: 'date',
+              scale: 'interval',
+            } as unknown) as Operation)
+          : null
+      );
+      datasourceLayers.second.getOperationForColumnId = jest.fn((id: string) =>
+        id === 'e'
+          ? (({
+              dataType: 'string',
+              scale: 'ordinal',
+            } as unknown) as Operation)
+          : null
+      );
+      expect(
+        xyVisualization.getErrorMessages(
+          {
+            ...exampleState(),
+            layers: [
+              {
+                layerId: 'first',
+                seriesType: 'area',
+                splitAccessor: 'd',
+                xAccessor: 'a',
+                accessors: ['b'],
+              },
+              {
+                layerId: 'second',
+                seriesType: 'area',
+                splitAccessor: 'd',
+                xAccessor: 'e',
+                accessors: ['b'],
+              },
+            ],
+          },
+          datasourceLayers
+        )
+      ).toEqual([
+        {
+          shortMessage: 'Wrong data type for Horizontal axis.',
+          longMessage: 'Data type mismatch for the Horizontal axis, use a different function.',
+        },
+      ]);
+    });
   });
 
   describe('#getWarningMessages', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
index ad2c9fd713985..bd20ed300bf61 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
@@ -542,8 +542,15 @@ function checkXAccessorCompatibility(
   datasourceLayers: Record<string, DatasourcePublicAPI>
 ) {
   const errors = [];
-  const hasDateHistogramSet = state.layers.some(checkIntervalOperation('date', datasourceLayers));
-  const hasNumberHistogram = state.layers.some(checkIntervalOperation('number', datasourceLayers));
+  const hasDateHistogramSet = state.layers.some(
+    checkScaleOperation('interval', 'date', datasourceLayers)
+  );
+  const hasNumberHistogram = state.layers.some(
+    checkScaleOperation('interval', 'number', datasourceLayers)
+  );
+  const hasOrdinalAxis = state.layers.some(
+    checkScaleOperation('ordinal', undefined, datasourceLayers)
+  );
   if (state.layers.length > 1 && hasDateHistogramSet && hasNumberHistogram) {
     errors.push({
       shortMessage: i18n.translate('xpack.lens.xyVisualization.dataTypeFailureXShort', {
@@ -560,11 +567,28 @@ function checkXAccessorCompatibility(
       }),
     });
   }
+  if (state.layers.length > 1 && (hasDateHistogramSet || hasNumberHistogram) && hasOrdinalAxis) {
+    errors.push({
+      shortMessage: i18n.translate('xpack.lens.xyVisualization.dataTypeFailureXShort', {
+        defaultMessage: `Wrong data type for {axis}.`,
+        values: {
+          axis: getAxisName('x', { isHorizontal: isHorizontalChart(state.layers) }),
+        },
+      }),
+      longMessage: i18n.translate('xpack.lens.xyVisualization.dataTypeFailureXOrdinalLong', {
+        defaultMessage: `Data type mismatch for the {axis}, use a different function.`,
+        values: {
+          axis: getAxisName('x', { isHorizontal: isHorizontalChart(state.layers) }),
+        },
+      }),
+    });
+  }
   return errors;
 }
 
-function checkIntervalOperation(
-  dataType: 'date' | 'number',
+function checkScaleOperation(
+  scaleType: 'ordinal' | 'interval' | 'ratio',
+  dataType: 'date' | 'number' | 'string' | undefined,
   datasourceLayers: Record<string, DatasourcePublicAPI>
 ) {
   return (layer: XYLayerConfig) => {
@@ -573,6 +597,8 @@ function checkIntervalOperation(
       return false;
     }
     const operation = datasourceAPI?.getOperationForColumnId(layer.xAccessor);
-    return Boolean(operation?.dataType === dataType && operation.scale === 'interval');
+    return Boolean(
+      operation && (!dataType || operation.dataType === dataType) && operation.scale === scaleType
+    );
   };
 }

From b70b34f88417bf0efea5f8979a660bce2dc8dbcc Mon Sep 17 00:00:00 2001
From: Christos Nasikas <christos.nasikas@elastic.co>
Date: Thu, 24 Jun 2021 16:31:18 +0300
Subject: [PATCH 43/95] [Cases] Fix push to external service error when
 connector's mapping does not exists (#102894)

Co-authored-by: Jonathan Buttner <jonathan.buttner@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../plugins/cases/server/client/cases/push.ts | 14 +++--
 .../case_api_integration/common/lib/utils.ts  | 27 +++++++++
 .../tests/trial/cases/push_case.ts            | 59 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index 6b4f038871626..9e2066984a9da 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -110,20 +110,24 @@ export const push = async (
       alertsInfo,
     });
 
-    const connectorMappings = await casesClientInternal.configuration.getMappings({
+    const getMappingsResponse = await casesClientInternal.configuration.getMappings({
       connector: theCase.connector,
     });
 
-    if (connectorMappings.length === 0) {
-      throw new Error('Connector mapping has not been created');
-    }
+    const mappings =
+      getMappingsResponse.length === 0
+        ? await casesClientInternal.configuration.createMappings({
+            connector: theCase.connector,
+            owner: theCase.owner,
+          })
+        : getMappingsResponse[0].attributes.mappings;
 
     const externalServiceIncident = await createIncident({
       actionsClient,
       theCase,
       userActions,
       connector: connector as ActionConnector,
-      mappings: connectorMappings[0].attributes.mappings,
+      mappings,
       alerts,
       casesConnectors,
     });
diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts
index 921589b2341dd..6b59d9780a513 100644
--- a/x-pack/test/case_api_integration/common/lib/utils.ts
+++ b/x-pack/test/case_api_integration/common/lib/utils.ts
@@ -46,6 +46,7 @@ import {
   CasesConfigurationsResponse,
   CaseUserActionsResponse,
   AlertResponse,
+  ConnectorMappings,
   CasesByAlertId,
 } from '../../../../plugins/cases/common/api';
 import { getPostCaseRequest, postCollectionReq, postCommentGenAlertReq } from './mock';
@@ -578,6 +579,32 @@ export const ensureSavedObjectIsAuthorized = (
   entities.forEach((entity) => expect(owners.includes(entity.owner)).to.be(true));
 };
 
+interface ConnectorMappingsSavedObject {
+  'cases-connector-mappings': ConnectorMappings;
+}
+
+/**
+ * Returns connector mappings saved objects from Elasticsearch directly.
+ */
+export const getConnectorMappingsFromES = async ({ es }: { es: KibanaClient }) => {
+  const mappings: ApiResponse<
+    estypes.SearchResponse<ConnectorMappingsSavedObject>
+  > = await es.search({
+    index: '.kibana',
+    body: {
+      query: {
+        term: {
+          type: {
+            value: 'cases-connector-mappings',
+          },
+        },
+      },
+    },
+  });
+
+  return mappings;
+};
+
 export const createCaseWithConnector = async ({
   supertest,
   configureReq = {},
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
index 8a58c59718feb..374053dd3b8b7 100644
--- a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
@@ -28,12 +28,19 @@ import {
   deleteAllCaseItems,
   superUserSpace1Auth,
   createCaseWithConnector,
+  createConnector,
+  getServiceNowConnector,
+  getConnectorMappingsFromES,
 } from '../../../../common/lib/utils';
 import {
   ExternalServiceSimulator,
   getExternalServiceSimulatorPath,
 } from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
-import { CaseStatuses, CaseUserActionResponse } from '../../../../../../plugins/cases/common/api';
+import {
+  CaseConnector,
+  CaseStatuses,
+  CaseUserActionResponse,
+} from '../../../../../../plugins/cases/common/api';
 import {
   globalRead,
   noKibanaPrivileges,
@@ -95,6 +102,56 @@ export default ({ getService }: FtrProviderContext): void => {
       ).to.equal(true);
     });
 
+    it('should create the mappings when pushing a case', async () => {
+      // create a connector but not a configuration so that the mapping will not be present
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+      });
+
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      const postedCase = await createCase(
+        supertest,
+        {
+          ...getPostCaseRequest(),
+          connector: {
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: {
+              urgency: '2',
+              impact: '2',
+              severity: '2',
+              category: 'software',
+              subcategory: 'os',
+            },
+          } as CaseConnector,
+        },
+        200
+      );
+
+      // there should be no mappings initially
+      let mappings = await getConnectorMappingsFromES({ es });
+      expect(mappings.body.hits.hits.length).to.eql(0);
+
+      await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+
+      // the mappings should now be created after the push
+      mappings = await getConnectorMappingsFromES({ es });
+      expect(mappings.body.hits.hits.length).to.be(1);
+      expect(
+        mappings.body.hits.hits[0]._source?.['cases-connector-mappings'].mappings.length
+      ).to.be.above(0);
+    });
+
     it('pushes a comment appropriately', async () => {
       const { postedCase, connector } = await createCaseWithConnector({
         supertest,

From b8234729854b8d394ea1f6784a3535e6feb82c35 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Thu, 24 Jun 2021 15:32:12 +0200
Subject: [PATCH 44/95] [Lens] Add continuity icons to palette configuration
 (#103240)

---
 .../coloring/palette_configuration.tsx        | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.tsx b/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.tsx
index f71bda986a8bb..ae7204d9f93e7 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.tsx
+++ b/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { FC } from 'react';
 import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public';
 import {
   EuiFormRow,
@@ -39,6 +39,17 @@ import {
 } from './utils';
 const idPrefix = htmlIdGenerator()();
 
+const ContinuityOption: FC<{ iconType: string }> = ({ children, iconType }) => {
+  return (
+    <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiIcon type={iconType} />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>{children}</EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
 /**
  * Some name conventions here:
  * * `displayStops` => It's an additional transformation of `stops` into a [0, N] domain for the EUIPaletteDisplay component.
@@ -141,41 +152,45 @@ export function CustomizablePalette({
             options={[
               {
                 value: 'above',
-                inputDisplay: i18n.translate(
-                  'xpack.lens.table.dynamicColoring.continuity.aboveLabel',
-                  {
-                    defaultMessage: 'Above range',
-                  }
+                inputDisplay: (
+                  <ContinuityOption iconType="continuityAbove">
+                    {i18n.translate('xpack.lens.table.dynamicColoring.continuity.aboveLabel', {
+                      defaultMessage: 'Above range',
+                    })}
+                  </ContinuityOption>
                 ),
                 'data-test-subj': 'continuity-above',
               },
               {
                 value: 'below',
-                inputDisplay: i18n.translate(
-                  'xpack.lens.table.dynamicColoring.continuity.belowLabel',
-                  {
-                    defaultMessage: 'Below range',
-                  }
+                inputDisplay: (
+                  <ContinuityOption iconType="continuityBelow">
+                    {i18n.translate('xpack.lens.table.dynamicColoring.continuity.belowLabel', {
+                      defaultMessage: 'Below range',
+                    })}
+                  </ContinuityOption>
                 ),
                 'data-test-subj': 'continuity-below',
               },
               {
                 value: 'all',
-                inputDisplay: i18n.translate(
-                  'xpack.lens.table.dynamicColoring.continuity.allLabel',
-                  {
-                    defaultMessage: 'Above and below range',
-                  }
+                inputDisplay: (
+                  <ContinuityOption iconType="continuityAboveBelow">
+                    {i18n.translate('xpack.lens.table.dynamicColoring.continuity.allLabel', {
+                      defaultMessage: 'Above and below range',
+                    })}
+                  </ContinuityOption>
                 ),
                 'data-test-subj': 'continuity-all',
               },
               {
                 value: 'none',
-                inputDisplay: i18n.translate(
-                  'xpack.lens.table.dynamicColoring.continuity.noneLabel',
-                  {
-                    defaultMessage: 'Within range',
-                  }
+                inputDisplay: (
+                  <ContinuityOption iconType="continuityWithin">
+                    {i18n.translate('xpack.lens.table.dynamicColoring.continuity.noneLabel', {
+                      defaultMessage: 'Within range',
+                    })}
+                  </ContinuityOption>
                 ),
                 'data-test-subj': 'continuity-none',
               },

From fdd878410ececb575bebf0575355908ed614059f Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Thu, 24 Jun 2021 15:34:57 +0200
Subject: [PATCH 45/95] Add missing i18n (#103245)

---
 .../components/sidebar/discover_field_search.tsx     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx
index e11c1716efe6b..4abfa6ecea55a 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx
@@ -204,15 +204,21 @@ export function DiscoverFieldSearch({ onChange, value, types, useNewFieldsApi }:
     return [
       {
         id: `${id}-any`,
-        label: 'any',
+        label: i18n.translate('discover.fieldChooser.filter.toggleButton.any', {
+          defaultMessage: 'any',
+        }),
       },
       {
         id: `${id}-true`,
-        label: 'yes',
+        label: i18n.translate('discover.fieldChooser.filter.toggleButton.yes', {
+          defaultMessage: 'yes',
+        }),
       },
       {
         id: `${id}-false`,
-        label: 'no',
+        label: i18n.translate('discover.fieldChooser.filter.toggleButton.no', {
+          defaultMessage: 'no',
+        }),
       },
     ];
   };

From cc6a64514d9bad6c0ff5dbb9e4c0231939eedde4 Mon Sep 17 00:00:00 2001
From: Patrick Mueller <patrick.mueller@elastic.co>
Date: Thu, 24 Jun 2021 10:06:01 -0400
Subject: [PATCH 46/95] [alerting][actions] add task scheduled date and delay
 to event log - 2 (#103172)

resolves #98634

This adds a new object property to the event log kibana object named
task, with two properties to track the time the task was scheduled to
run, and the delay between when it was supposed to run and when it
actually started. This task property is only added to the appropriate
events.

	task: schema.maybe(
	  schema.object({
	    scheduled: ecsDate(),
	    schedule_delay: ecsNumber(),
	  })
	),

Note that these changes were previously merged to master in https://github.com/elastic/kibana/pull/102252 which had to be reverted - this PR contains the same commits, plus some additional ones to resolve the tests that were broken during the bad merge.
---
 .../server/lib/action_executor.test.ts        |  90 ++
 .../actions/server/lib/action_executor.ts     |  19 +
 .../server/lib/task_runner_factory.test.ts    |  16 +-
 .../actions/server/lib/task_runner_factory.ts |   5 +
 .../create_execution_handler.test.ts          |   1 -
 .../task_runner/create_execution_handler.ts   |   1 -
 .../server/task_runner/task_runner.test.ts    | 187 ++--
 .../server/task_runner/task_runner.ts         |  17 +-
 x-pack/plugins/event_log/README.md            |   4 +
 .../plugins/event_log/generated/mappings.json |  14 +-
 x-pack/plugins/event_log/generated/schemas.ts |   7 +-
 x-pack/plugins/event_log/scripts/mappings.js  |  11 +
 .../plugins/event_log/server/event_logger.ts  |   2 +-
 .../tests/alerting/alerts.ts                  |   1 -
 .../tests/alerting/event_log.ts               |   2 +-
 .../spaces_only/tests/actions/execute.ts      |   2 +
 .../spaces_only/tests/alerting/event_log.ts   | 918 +++++++++---------
 17 files changed, 791 insertions(+), 506 deletions(-)

diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index 37d461d6b2a50..440de161490aa 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -109,6 +109,96 @@ test('successfully executes', async () => {
   });
 
   expect(loggerMock.debug).toBeCalledWith('executing action test:1: 1');
+  expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+    Array [
+      Array [
+        Object {
+          "event": Object {
+            "action": "execute-start",
+          },
+          "kibana": Object {
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": "some-namespace",
+                "rel": "primary",
+                "type": "action",
+                "type_id": "test",
+              },
+            ],
+          },
+          "message": "action started: test:1: 1",
+        },
+      ],
+      Array [
+        Object {
+          "event": Object {
+            "action": "execute",
+            "outcome": "success",
+          },
+          "kibana": Object {
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": "some-namespace",
+                "rel": "primary",
+                "type": "action",
+                "type_id": "test",
+              },
+            ],
+          },
+          "message": "action executed: test:1: 1",
+        },
+      ],
+    ]
+  `);
+});
+
+test('successfully executes as a task', async () => {
+  const actionType: jest.Mocked<ActionType> = {
+    id: 'test',
+    name: 'Test',
+    minimumLicenseRequired: 'basic',
+    executor: jest.fn(),
+  };
+  const actionSavedObject = {
+    id: '1',
+    type: 'action',
+    attributes: {
+      actionTypeId: 'test',
+      config: {
+        bar: true,
+      },
+      secrets: {
+        baz: true,
+      },
+    },
+    references: [],
+  };
+  const actionResult = {
+    id: actionSavedObject.id,
+    name: actionSavedObject.id,
+    ...pick(actionSavedObject.attributes, 'actionTypeId', 'config'),
+    isPreconfigured: false,
+  };
+  actionsClient.get.mockResolvedValueOnce(actionResult);
+  encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValueOnce(actionSavedObject);
+  actionTypeRegistry.get.mockReturnValueOnce(actionType);
+
+  const scheduleDelay = 10000; // milliseconds
+  const scheduled = new Date(Date.now() - scheduleDelay);
+  await actionExecutor.execute({
+    ...executeParams,
+    taskInfo: {
+      scheduled,
+    },
+  });
+
+  const eventTask = eventLogger.logEvent.mock.calls[0][0]?.kibana?.task;
+  expect(eventTask).toBeDefined();
+  expect(eventTask?.scheduled).toBe(scheduled.toISOString());
+  expect(eventTask?.schedule_delay).toBeGreaterThanOrEqual(scheduleDelay * 1000 * 1000);
+  expect(eventTask?.schedule_delay).toBeLessThanOrEqual(2 * scheduleDelay * 1000 * 1000);
 });
 
 test('provides empty config when config and / or secrets is empty', async () => {
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index e9e7b17288611..9e62b123951df 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -25,6 +25,9 @@ import { ActionsClient } from '../actions_client';
 import { ActionExecutionSource } from './action_execution_source';
 import { RelatedSavedObjects } from './related_saved_objects';
 
+// 1,000,000 nanoseconds in 1 millisecond
+const Millis2Nanos = 1000 * 1000;
+
 export interface ActionExecutorContext {
   logger: Logger;
   spaces?: SpacesServiceStart;
@@ -39,11 +42,16 @@ export interface ActionExecutorContext {
   preconfiguredActions: PreConfiguredAction[];
 }
 
+export interface TaskInfo {
+  scheduled: Date;
+}
+
 export interface ExecuteOptions<Source = unknown> {
   actionId: string;
   request: KibanaRequest;
   params: Record<string, unknown>;
   source?: ActionExecutionSource<Source>;
+  taskInfo?: TaskInfo;
   relatedSavedObjects?: RelatedSavedObjects;
 }
 
@@ -71,6 +79,7 @@ export class ActionExecutor {
     params,
     request,
     source,
+    taskInfo,
     relatedSavedObjects,
   }: ExecuteOptions): Promise<ActionTypeExecutorResult<unknown>> {
     if (!this.isInitialized) {
@@ -143,9 +152,19 @@ export class ActionExecutor {
         const actionLabel = `${actionTypeId}:${actionId}: ${name}`;
         logger.debug(`executing action ${actionLabel}`);
 
+        const task = taskInfo
+          ? {
+              task: {
+                scheduled: taskInfo.scheduled.toISOString(),
+                schedule_delay: Millis2Nanos * (Date.now() - taskInfo.scheduled.getTime()),
+              },
+            }
+          : {};
+
         const event: IEvent = {
           event: { action: EVENT_LOG_ACTIONS.execute },
           kibana: {
+            ...task,
             saved_objects: [
               {
                 rel: SAVED_OBJECT_REL_PRIMARY,
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
index 2292994e3ccfd..495d638951b56 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -133,6 +133,9 @@ test('executes the task by calling the executor with proper parameters', async (
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
+    taskInfo: {
+      scheduled: new Date(),
+    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];
@@ -255,6 +258,9 @@ test('uses API key when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
+    taskInfo: {
+      scheduled: new Date(),
+    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];
@@ -300,6 +306,9 @@ test('uses relatedSavedObjects when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
+    taskInfo: {
+      scheduled: new Date(),
+    },
   });
 });
 
@@ -323,7 +332,6 @@ test('sanitizes invalid relatedSavedObjects when provided', async () => {
   });
 
   await taskRunner.run();
-
   expect(mockedActionExecutor.execute).toHaveBeenCalledWith({
     actionId: '2',
     params: { baz: true },
@@ -334,6 +342,9 @@ test('sanitizes invalid relatedSavedObjects when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
+    taskInfo: {
+      scheduled: new Date(),
+    },
   });
 });
 
@@ -363,6 +374,9 @@ test(`doesn't use API key when not provided`, async () => {
     request: expect.objectContaining({
       headers: {},
     }),
+    taskInfo: {
+      scheduled: new Date(),
+    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
index 0515963ab82f4..64169de728f75 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
@@ -72,6 +72,10 @@ export class TaskRunnerFactory {
       getUnsecuredSavedObjectsClient,
     } = this.taskRunnerContext!;
 
+    const taskInfo = {
+      scheduled: taskInstance.runAt,
+    };
+
     return {
       async run() {
         const { spaceId, actionTaskParamsId } = taskInstance.params as Record<string, string>;
@@ -118,6 +122,7 @@ export class TaskRunnerFactory {
             actionId,
             request: fakeRequest,
             ...getSourceFromReferences(references),
+            taskInfo,
             relatedSavedObjects: validatedRelatedSavedObjects(logger, relatedSavedObjects),
           });
         } catch (e) {
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
index 033ffcceb6a0a..1dcd19119b6fd 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -195,7 +195,6 @@ test('enqueues execution per selected action', async () => {
             "id": "1",
             "license": "basic",
             "name": "name-of-alert",
-            "namespace": "test1",
             "ruleset": "alerts",
           },
         },
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
index 968fff540dc03..3004ed599128e 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -209,7 +209,6 @@ export function createExecutionHandler<
           license: alertType.minimumLicenseRequired,
           category: alertType.id,
           ruleset: alertType.producer,
-          ...namespace,
           name: alertName,
         },
       };
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 8ab267a5610d3..88d1b1b24a4ec 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
@@ -282,13 +282,16 @@ describe('Task Runner', () => {
               "type_id": "test",
             },
           ],
+          "task": Object {
+            "schedule_delay": 0,
+            "scheduled": "1970-01-01T00:00:00.000Z",
+          },
         },
         "message": "alert execution start: \\"1\\"",
         "rule": Object {
           "category": "test",
           "id": "1",
           "license": "basic",
-          "namespace": undefined,
           "ruleset": "alerts",
         },
       }
@@ -394,6 +397,10 @@ describe('Task Runner', () => {
         kind: 'alert',
       },
       kibana: {
+        task: {
+          schedule_delay: 0,
+          scheduled: '1970-01-01T00:00:00.000Z',
+        },
         saved_objects: [
           {
             id: '1',
@@ -409,7 +416,6 @@ describe('Task Runner', () => {
         category: 'test',
         id: '1',
         license: 'basic',
-        namespace: undefined,
         ruleset: 'alerts',
       },
     });
@@ -518,6 +524,10 @@ describe('Task Runner', () => {
         alerting: {
           status: 'active',
         },
+        task: {
+          schedule_delay: 0,
+          scheduled: '1970-01-01T00:00:00.000Z',
+        },
         saved_objects: [
           {
             id: '1',
@@ -534,7 +544,6 @@ describe('Task Runner', () => {
         id: '1',
         license: 'basic',
         name: 'alert-name',
-        namespace: undefined,
         ruleset: 'alerts',
       },
     });
@@ -603,6 +612,10 @@ describe('Task Runner', () => {
         kind: 'alert',
       },
       kibana: {
+        task: {
+          schedule_delay: 0,
+          scheduled: '1970-01-01T00:00:00.000Z',
+        },
         saved_objects: [
           {
             id: '1',
@@ -618,7 +631,6 @@ describe('Task Runner', () => {
         category: 'test',
         id: '1',
         license: 'basic',
-        namespace: undefined,
         ruleset: 'alerts',
       },
     });
@@ -700,6 +712,10 @@ describe('Task Runner', () => {
         alerting: {
           status: 'active',
         },
+        task: {
+          schedule_delay: 0,
+          scheduled: '1970-01-01T00:00:00.000Z',
+        },
         saved_objects: [
           {
             id: '1',
@@ -716,7 +732,6 @@ describe('Task Runner', () => {
         id: '1',
         license: 'basic',
         name: 'alert-name',
-        namespace: undefined,
         ruleset: 'alerts',
       },
     });
@@ -854,13 +869,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -897,7 +915,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -926,6 +943,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -933,7 +954,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1151,13 +1171,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1194,7 +1217,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1231,7 +1253,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1273,7 +1294,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1302,6 +1322,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -1309,7 +1333,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1433,13 +1456,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1476,7 +1502,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1513,7 +1538,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1555,7 +1579,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1597,7 +1620,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1626,6 +1648,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -1633,7 +1659,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -1968,13 +1993,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2012,7 +2040,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2049,7 +2076,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2078,6 +2104,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -2085,7 +2115,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2294,13 +2323,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2333,13 +2365,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution failure: test:1: 'alert-name'",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2397,13 +2432,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2436,13 +2474,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "test:1: execution failed",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2508,13 +2549,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2547,13 +2591,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "test:1: execution failed",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2619,13 +2666,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2658,13 +2708,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "test:1: execution failed",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2729,13 +2782,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -2768,13 +2824,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "test:1: execution failed",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3007,13 +3066,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3050,7 +3112,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3087,7 +3148,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3124,7 +3184,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3161,7 +3220,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3190,6 +3248,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -3197,7 +3259,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3291,13 +3352,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3334,7 +3398,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3371,7 +3434,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3400,6 +3462,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -3407,7 +3473,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3493,13 +3558,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3534,7 +3602,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3569,7 +3636,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3598,6 +3664,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -3605,7 +3675,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3686,13 +3755,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3729,7 +3801,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3766,7 +3837,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3795,6 +3865,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -3802,7 +3876,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3885,13 +3958,16 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert execution start: \\"1\\"",
             "rule": Object {
               "category": "test",
               "id": "1",
               "license": "basic",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3925,7 +4001,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3959,7 +4034,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
@@ -3988,6 +4062,10 @@ describe('Task Runner', () => {
                   "type_id": "test",
                 },
               ],
+              "task": Object {
+                "schedule_delay": 0,
+                "scheduled": "1970-01-01T00:00:00.000Z",
+              },
             },
             "message": "alert executed: test:1: 'alert-name'",
             "rule": Object {
@@ -3995,7 +4073,6 @@ describe('Task Runner', () => {
               "id": "1",
               "license": "basic",
               "name": "alert-name",
-              "namespace": undefined,
               "ruleset": "alerts",
             },
           },
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 b712b6237c8a7..c66c054bc8ac3 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -54,6 +54,9 @@ import { getEsErrorMessage } from '../lib/errors';
 
 const FALLBACK_RETRY_INTERVAL = '5m';
 
+// 1,000,000 nanoseconds in 1 millisecond
+const Millis2Nanos = 1000 * 1000;
+
 type Event = Exclude<IEvent, undefined>;
 
 interface AlertTaskRunResult {
@@ -489,15 +492,17 @@ export class TaskRunner<
       schedule: taskSchedule,
     } = this.taskInstance;
 
-    const runDate = new Date().toISOString();
-    this.logger.debug(`executing alert ${this.alertType.id}:${alertId} at ${runDate}`);
+    const runDate = new Date();
+    const runDateString = runDate.toISOString();
+    this.logger.debug(`executing alert ${this.alertType.id}:${alertId} at ${runDateString}`);
 
     const namespace = this.context.spaceIdToNamespace(spaceId);
     const eventLogger = this.context.eventLogger;
+    const scheduleDelay = runDate.getTime() - this.taskInstance.runAt.getTime();
     const event: IEvent = {
       // explicitly set execute timestamp so it will be before other events
       // generated here (new-instance, schedule-action, etc)
-      '@timestamp': runDate,
+      '@timestamp': runDateString,
       event: {
         action: EVENT_LOG_ACTIONS.execute,
         kind: 'alert',
@@ -513,13 +518,16 @@ export class TaskRunner<
             namespace,
           },
         ],
+        task: {
+          scheduled: this.taskInstance.runAt.toISOString(),
+          schedule_delay: Millis2Nanos * scheduleDelay,
+        },
       },
       rule: {
         id: alertId,
         license: this.alertType.minimumLicenseRequired,
         category: this.alertType.id,
         ruleset: this.alertType.producer,
-        namespace,
       },
     };
 
@@ -814,7 +822,6 @@ function generateNewAndRecoveredInstanceEvents<
         license: ruleType.minimumLicenseRequired,
         category: ruleType.id,
         ruleset: ruleType.producer,
-        namespace,
         name: rule.name,
       },
     };
diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md
index ffbd20dd6f2be..682bf2660c78b 100644
--- a/x-pack/plugins/event_log/README.md
+++ b/x-pack/plugins/event_log/README.md
@@ -127,6 +127,10 @@ Below is a document in the expected structure, with descriptions of the fields:
   // Custom fields that are not part of ECS.
   kibana: {
     server_uuid: "UUID of kibana server, for diagnosing multi-Kibana scenarios",
+    task: {
+      scheduled: "ISO date of when the task for this event was supposed to start",
+      schedule_delay: "delay in nanoseconds between when this task was supposed to start and when it actually started",
+    },
     alerting: {
       instance_id: "alert instance id, for relevant documents",
       action_group_id: "alert action group, for relevant documents",
diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json
index 3eadcc21257b0..0f5f4af2052ee 100644
--- a/x-pack/plugins/event_log/generated/mappings.json
+++ b/x-pack/plugins/event_log/generated/mappings.json
@@ -214,10 +214,6 @@
                 "version": {
                     "ignore_above": 1024,
                     "type": "keyword"
-                },
-                "namespace": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
                 }
             }
         },
@@ -241,6 +237,16 @@
                     "type": "keyword",
                     "ignore_above": 1024
                 },
+                "task": {
+                    "properties": {
+                        "scheduled": {
+                            "type": "date"
+                        },
+                        "schedule_delay": {
+                            "type": "long"
+                        }
+                    }
+                },
                 "alerting": {
                     "properties": {
                         "instance_id": {
diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts
index 2a066ca0bd15b..556ddec5a7001 100644
--- a/x-pack/plugins/event_log/generated/schemas.ts
+++ b/x-pack/plugins/event_log/generated/schemas.ts
@@ -91,7 +91,6 @@ export const EventSchema = schema.maybe(
         ruleset: ecsString(),
         uuid: ecsString(),
         version: ecsString(),
-        namespace: ecsString(),
       })
     ),
     user: schema.maybe(
@@ -102,6 +101,12 @@ export const EventSchema = schema.maybe(
     kibana: schema.maybe(
       schema.object({
         server_uuid: ecsString(),
+        task: schema.maybe(
+          schema.object({
+            scheduled: ecsDate(),
+            schedule_delay: ecsNumber(),
+          })
+        ),
         alerting: schema.maybe(
           schema.object({
             instance_id: ecsString(),
diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js
index f2020e76b46ba..93fe053bd0cdf 100644
--- a/x-pack/plugins/event_log/scripts/mappings.js
+++ b/x-pack/plugins/event_log/scripts/mappings.js
@@ -17,6 +17,17 @@ exports.EcsCustomPropertyMappings = {
         type: 'keyword',
         ignore_above: 1024,
       },
+      // task specific fields
+      task: {
+        properties: {
+          scheduled: {
+            type: 'date',
+          },
+          schedule_delay: {
+            type: 'long',
+          },
+        },
+      },
       // alerting specific fields
       alerting: {
         properties: {
diff --git a/x-pack/plugins/event_log/server/event_logger.ts b/x-pack/plugins/event_log/server/event_logger.ts
index 4af69de0f47a0..b985a173ccdbf 100644
--- a/x-pack/plugins/event_log/server/event_logger.ts
+++ b/x-pack/plugins/event_log/server/event_logger.ts
@@ -88,7 +88,7 @@ export class EventLogger implements IEventLogger {
     try {
       validatedEvent = validateEvent(this.eventLogService, event);
     } catch (err) {
-      this.systemLogger.warn(`invalid event logged: ${err.message}`);
+      this.systemLogger.warn(`invalid event logged: ${err.message}; ${JSON.stringify(event)})`);
       return;
     }
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
index e9ed14fbcddcd..b3d83ae22f330 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
@@ -1304,7 +1304,6 @@ instanceStateValue: true
       license: 'basic',
       category: ruleObject.alertInfo.ruleTypeId,
       ruleset: ruleObject.alertInfo.producer,
-      namespace: spaceId,
       name: ruleObject.alertInfo.name,
     });
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
index 5d13d641367a4..940203a9b1f8c 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
@@ -81,12 +81,12 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
         errorMessage: 'Unable to decrypt attribute "apiKey"',
         status: 'error',
         reason: 'decrypt',
+        shouldHaveTask: true,
         rule: {
           id: alertId,
           category: response.body.rule_type_id,
           license: 'basic',
           ruleset: 'alertsFixture',
-          namespace: spaceId,
         },
       });
     });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
index d494c99c80e8f..38f3a17f317c2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
@@ -406,6 +406,8 @@ export default function ({ getService }: FtrProviderContext) {
       expect(startExecuteEvent?.message).to.eql(startMessage);
     }
 
+    expect(executeEvent?.kibana?.task).to.eql(undefined);
+
     if (errorMessage) {
       expect(executeEvent?.error?.message).to.eql(errorMessage);
     }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
index fae5958d7827a..9bf7baf95d8d2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
@@ -24,476 +24,512 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
 
     after(() => objectRemover.removeAll());
 
-    it('should generate expected events for normal operation', async () => {
-      const { body: createdAction } = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`)
-        .set('kbn-xsrf', 'foo')
-        .send({
-          name: 'MY action',
-          connector_type_id: 'test.noop',
-          config: {},
-          secrets: {},
-        })
-        .expect(200);
-
-      // pattern of when the alert should fire
-      const pattern = {
-        instance: [false, true, true],
-      };
-
-      const response = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`)
-        .set('kbn-xsrf', 'foo')
-        .send(
-          getTestAlertData({
-            rule_type_id: 'test.patternFiring',
-            schedule: { interval: '1s' },
-            throttle: null,
-            params: {
-              pattern,
-            },
-            actions: [
-              {
-                id: createdAction.id,
-                group: 'default',
-                params: {},
-              },
-            ],
-          })
-        );
-
-      expect(response.status).to.eql(200);
-      const alertId = response.body.id;
-      objectRemover.add(Spaces.space1.id, alertId, 'rule', 'alerting');
-
-      // get the events we're expecting
-      const events = await retry.try(async () => {
-        return await getEventLog({
-          getService,
-          spaceId: Spaces.space1.id,
-          type: 'alert',
-          id: alertId,
-          provider: 'alerting',
-          actions: new Map([
-            // make sure the counts of the # of events per type are as expected
-            ['execute-start', { gte: 4 }],
-            ['execute', { gte: 4 }],
-            ['execute-action', { equal: 2 }],
-            ['new-instance', { equal: 1 }],
-            ['active-instance', { gte: 1 }],
-            ['recovered-instance', { equal: 1 }],
-          ]),
-        });
-      });
-
-      // get the filtered events only with action 'new-instance'
-      const filteredEvents = await retry.try(async () => {
-        return await getEventLog({
-          getService,
-          spaceId: Spaces.space1.id,
-          type: 'alert',
-          id: alertId,
-          provider: 'alerting',
-          actions: new Map([['new-instance', { equal: 1 }]]),
-          filter: 'event.action:(new-instance)',
-        });
-      });
+    for (const space of [Spaces.default, Spaces.space1]) {
+      describe(`in space ${space.id}`, () => {
+        it('should generate expected events for normal operation', async () => {
+          const { body: createdAction } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'MY action',
+              connector_type_id: 'test.noop',
+              config: {},
+              secrets: {},
+            })
+            .expect(200);
+
+          // pattern of when the alert should fire
+          const pattern = {
+            instance: [false, true, true],
+          };
+
+          const response = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerting/rule`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                rule_type_id: 'test.patternFiring',
+                schedule: { interval: '1s' },
+                throttle: null,
+                params: {
+                  pattern,
+                },
+                actions: [
+                  {
+                    id: createdAction.id,
+                    group: 'default',
+                    params: {},
+                  },
+                ],
+              })
+            );
 
-      expect(getEventsByAction(filteredEvents, 'execute').length).equal(0);
-      expect(getEventsByAction(filteredEvents, 'execute-action').length).equal(0);
-      expect(getEventsByAction(events, 'new-instance').length).equal(1);
-
-      const executeEvents = getEventsByAction(events, 'execute');
-      const executeStartEvents = getEventsByAction(events, 'execute-start');
-      const executeActionEvents = getEventsByAction(events, 'execute-action');
-      const newInstanceEvents = getEventsByAction(events, 'new-instance');
-      const recoveredInstanceEvents = getEventsByAction(events, 'recovered-instance');
-
-      // make sure the events are in the right temporal order
-      const executeTimes = getTimestamps(executeEvents);
-      const executeStartTimes = getTimestamps(executeStartEvents);
-      const executeActionTimes = getTimestamps(executeActionEvents);
-      const newInstanceTimes = getTimestamps(newInstanceEvents);
-      const recoveredInstanceTimes = getTimestamps(recoveredInstanceEvents);
-
-      expect(executeTimes[0] < newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[1] <= newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[2] > newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[1] <= executeActionTimes[0]).to.be(true);
-      expect(executeTimes[2] > executeActionTimes[0]).to.be(true);
-      expect(executeStartTimes.length === executeTimes.length).to.be(true);
-      executeStartTimes.forEach((est, index) => expect(est === executeTimes[index]).to.be(true));
-      expect(recoveredInstanceTimes[0] > newInstanceTimes[0]).to.be(true);
-
-      // validate each event
-      let executeCount = 0;
-      const executeStatuses = ['ok', 'active', 'active'];
-      for (const event of events) {
-        switch (event?.event?.action) {
-          case 'execute-start':
-            validateEvent(event, {
-              spaceId: Spaces.space1.id,
-              savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-              ],
-              message: `alert execution start: "${alertId}"`,
-              rule: {
-                id: alertId,
-                category: response.body.rule_type_id,
-                license: 'basic',
-                ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
-              },
+          expect(response.status).to.eql(200);
+          const alertId = response.body.id;
+          objectRemover.add(space.id, alertId, 'rule', 'alerting');
+
+          // get the events we're expecting
+          const events = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'alert',
+              id: alertId,
+              provider: 'alerting',
+              actions: new Map([
+                // make sure the counts of the # of events per type are as expected
+                ['execute-start', { gte: 4 }],
+                ['execute', { gte: 4 }],
+                ['execute-action', { equal: 2 }],
+                ['new-instance', { equal: 1 }],
+                ['active-instance', { gte: 1 }],
+                ['recovered-instance', { equal: 1 }],
+              ]),
             });
-            break;
-          case 'execute':
-            validateEvent(event, {
-              spaceId: Spaces.space1.id,
-              savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-              ],
-              outcome: 'success',
-              message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
-              status: executeStatuses[executeCount++],
-              rule: {
-                id: alertId,
-                category: response.body.rule_type_id,
-                license: 'basic',
-                ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
-                name: response.body.name,
-              },
+          });
+
+          // get the filtered events only with action 'new-instance'
+          const filteredEvents = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'alert',
+              id: alertId,
+              provider: 'alerting',
+              actions: new Map([['new-instance', { equal: 1 }]]),
+              filter: 'event.action:(new-instance)',
             });
-            break;
-          case 'execute-action':
+          });
+
+          expect(getEventsByAction(filteredEvents, 'execute').length).equal(0);
+          expect(getEventsByAction(filteredEvents, 'execute-action').length).equal(0);
+          expect(getEventsByAction(events, 'new-instance').length).equal(1);
+
+          const executeEvents = getEventsByAction(events, 'execute');
+          const executeStartEvents = getEventsByAction(events, 'execute-start');
+          const executeActionEvents = getEventsByAction(events, 'execute-action');
+          const newInstanceEvents = getEventsByAction(events, 'new-instance');
+          const recoveredInstanceEvents = getEventsByAction(events, 'recovered-instance');
+
+          // make sure the events are in the right temporal order
+          const executeTimes = getTimestamps(executeEvents);
+          const executeStartTimes = getTimestamps(executeStartEvents);
+          const executeActionTimes = getTimestamps(executeActionEvents);
+          const newInstanceTimes = getTimestamps(newInstanceEvents);
+          const recoveredInstanceTimes = getTimestamps(recoveredInstanceEvents);
+
+          expect(executeTimes[0] < newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[1] <= newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[2] > newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[1] <= executeActionTimes[0]).to.be(true);
+          expect(executeTimes[2] > executeActionTimes[0]).to.be(true);
+          expect(executeStartTimes.length === executeTimes.length).to.be(true);
+          executeStartTimes.forEach((est, index) =>
+            expect(est === executeTimes[index]).to.be(true)
+          );
+          expect(recoveredInstanceTimes[0] > newInstanceTimes[0]).to.be(true);
+
+          // validate each event
+          let executeCount = 0;
+          const executeStatuses = ['ok', 'active', 'active'];
+          for (const event of events) {
+            switch (event?.event?.action) {
+              case 'execute-start':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                  ],
+                  message: `alert execution start: "${alertId}"`,
+                  shouldHaveTask: true,
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                  },
+                });
+                break;
+              case 'execute':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                  ],
+                  outcome: 'success',
+                  message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
+                  status: executeStatuses[executeCount++],
+                  shouldHaveTask: true,
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                    name: response.body.name,
+                  },
+                });
+                break;
+              case 'execute-action':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                    { type: 'action', id: createdAction.id, type_id: 'test.noop' },
+                  ],
+                  message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup: 'default' action: test.noop:${createdAction.id}`,
+                  instanceId: 'instance',
+                  actionGroupId: 'default',
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                    name: response.body.name,
+                  },
+                });
+                break;
+              case 'new-instance':
+                validateInstanceEvent(event, `created new instance: 'instance'`, false);
+                break;
+              case 'recovered-instance':
+                validateInstanceEvent(event, `instance 'instance' has recovered`, true);
+                break;
+              case 'active-instance':
+                validateInstanceEvent(
+                  event,
+                  `active instance: 'instance' in actionGroup: 'default'`,
+                  false
+                );
+                break;
+              // this will get triggered as we add new event actions
+              default:
+                throw new Error(`unexpected event action "${event?.event?.action}"`);
+            }
+          }
+
+          const actionEvents = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'action',
+              id: createdAction.id,
+              provider: 'actions',
+              actions: new Map([['execute', { gte: 1 }]]),
+            });
+          });
+
+          for (const event of actionEvents) {
+            switch (event?.event?.action) {
+              case 'execute':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'action', id: createdAction.id, rel: 'primary', type_id: 'test.noop' },
+                  ],
+                  message: `action executed: test.noop:${createdAction.id}: MY action`,
+                  outcome: 'success',
+                  shouldHaveTask: true,
+                  rule: undefined,
+                });
+                break;
+            }
+          }
+
+          function validateInstanceEvent(
+            event: IValidatedEvent,
+            subMessage: string,
+            shouldHaveEventEnd: boolean
+          ) {
             validateEvent(event, {
-              spaceId: Spaces.space1.id,
+              spaceId: space.id,
               savedObjects: [
                 { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-                { type: 'action', id: createdAction.id, type_id: 'test.noop' },
               ],
-              message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup: 'default' action: test.noop:${createdAction.id}`,
+              message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
               instanceId: 'instance',
               actionGroupId: 'default',
+              shouldHaveEventEnd,
               rule: {
                 id: alertId,
                 category: response.body.rule_type_id,
                 license: 'basic',
                 ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
                 name: response.body.name,
               },
             });
-            break;
-          case 'new-instance':
-            validateInstanceEvent(event, `created new instance: 'instance'`, false);
-            break;
-          case 'recovered-instance':
-            validateInstanceEvent(event, `instance 'instance' has recovered`, true);
-            break;
-          case 'active-instance':
-            validateInstanceEvent(
-              event,
-              `active instance: 'instance' in actionGroup: 'default'`,
-              false
-            );
-            break;
-          // this will get triggered as we add new event actions
-          default:
-            throw new Error(`unexpected event action "${event?.event?.action}"`);
-        }
-      }
-
-      function validateInstanceEvent(
-        event: IValidatedEvent,
-        subMessage: string,
-        shouldHaveEventEnd: boolean
-      ) {
-        validateEvent(event, {
-          spaceId: Spaces.space1.id,
-          savedObjects: [
-            { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-          ],
-          message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
-          instanceId: 'instance',
-          actionGroupId: 'default',
-          shouldHaveEventEnd,
-          rule: {
-            id: alertId,
-            category: response.body.rule_type_id,
-            license: 'basic',
-            ruleset: 'alertsFixture',
-            namespace: Spaces.space1.id,
-            name: response.body.name,
-          },
+          }
         });
-      }
-    });
-
-    it('should generate expected events for normal operation with subgroups', async () => {
-      const { body: createdAction } = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`)
-        .set('kbn-xsrf', 'foo')
-        .send({
-          name: 'MY action',
-          connector_type_id: 'test.noop',
-          config: {},
-          secrets: {},
-        })
-        .expect(200);
-
-      // pattern of when the alert should fire
-      const [firstSubgroup, secondSubgroup] = [uuid.v4(), uuid.v4()];
-      const pattern = {
-        instance: [false, firstSubgroup, secondSubgroup],
-      };
-
-      const response = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`)
-        .set('kbn-xsrf', 'foo')
-        .send(
-          getTestAlertData({
-            rule_type_id: 'test.patternFiring',
-            schedule: { interval: '1s' },
-            throttle: null,
-            params: {
-              pattern,
-            },
-            actions: [
-              {
-                id: createdAction.id,
-                group: 'default',
-                params: {},
-              },
-            ],
-          })
-        );
-
-      expect(response.status).to.eql(200);
-      const alertId = response.body.id;
-      objectRemover.add(Spaces.space1.id, alertId, 'rule', 'alerting');
-
-      // get the events we're expecting
-      const events = await retry.try(async () => {
-        return await getEventLog({
-          getService,
-          spaceId: Spaces.space1.id,
-          type: 'alert',
-          id: alertId,
-          provider: 'alerting',
-          actions: new Map([
-            // make sure the counts of the # of events per type are as expected
-            ['execute-start', { gte: 4 }],
-            ['execute', { gte: 4 }],
-            ['execute-action', { equal: 2 }],
-            ['new-instance', { equal: 1 }],
-            ['active-instance', { gte: 2 }],
-            ['recovered-instance', { equal: 1 }],
-          ]),
-        });
-      });
 
-      const executeEvents = getEventsByAction(events, 'execute');
-      const executeStartEvents = getEventsByAction(events, 'execute-start');
-      const executeActionEvents = getEventsByAction(events, 'execute-action');
-      const newInstanceEvents = getEventsByAction(events, 'new-instance');
-      const recoveredInstanceEvents = getEventsByAction(events, 'recovered-instance');
-
-      // make sure the events are in the right temporal order
-      const executeTimes = getTimestamps(executeEvents);
-      const executeStartTimes = getTimestamps(executeStartEvents);
-      const executeActionTimes = getTimestamps(executeActionEvents);
-      const newInstanceTimes = getTimestamps(newInstanceEvents);
-      const recoveredInstanceTimes = getTimestamps(recoveredInstanceEvents);
-
-      expect(executeTimes[0] < newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[1] <= newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[2] > newInstanceTimes[0]).to.be(true);
-      expect(executeTimes[1] <= executeActionTimes[0]).to.be(true);
-      expect(executeTimes[2] > executeActionTimes[0]).to.be(true);
-      expect(executeStartTimes.length === executeTimes.length).to.be(true);
-      executeStartTimes.forEach((est, index) => expect(est === executeTimes[index]).to.be(true));
-      expect(recoveredInstanceTimes[0] > newInstanceTimes[0]).to.be(true);
-
-      // validate each event
-      let executeCount = 0;
-      const executeStatuses = ['ok', 'active', 'active'];
-      for (const event of events) {
-        switch (event?.event?.action) {
-          case 'execute-start':
-            validateEvent(event, {
-              spaceId: Spaces.space1.id,
-              savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-              ],
-              message: `alert execution start: "${alertId}"`,
-              rule: {
-                id: alertId,
-                category: response.body.rule_type_id,
-                license: 'basic',
-                ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
-              },
-            });
-            break;
-          case 'execute':
-            validateEvent(event, {
-              spaceId: Spaces.space1.id,
-              savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-              ],
-              outcome: 'success',
-              message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
-              status: executeStatuses[executeCount++],
-              rule: {
-                id: alertId,
-                category: response.body.rule_type_id,
-                license: 'basic',
-                ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
-                name: response.body.name,
-              },
+        it('should generate expected events for normal operation with subgroups', async () => {
+          const { body: createdAction } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'MY action',
+              connector_type_id: 'test.noop',
+              config: {},
+              secrets: {},
+            })
+            .expect(200);
+
+          // pattern of when the alert should fire
+          const [firstSubgroup, secondSubgroup] = [uuid.v4(), uuid.v4()];
+          const pattern = {
+            instance: [false, firstSubgroup, secondSubgroup],
+          };
+
+          const response = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerting/rule`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                rule_type_id: 'test.patternFiring',
+                schedule: { interval: '1s' },
+                throttle: null,
+                params: {
+                  pattern,
+                },
+                actions: [
+                  {
+                    id: createdAction.id,
+                    group: 'default',
+                    params: {},
+                  },
+                ],
+              })
+            );
+
+          expect(response.status).to.eql(200);
+          const alertId = response.body.id;
+          objectRemover.add(space.id, alertId, 'rule', 'alerting');
+
+          // get the events we're expecting
+          const events = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'alert',
+              id: alertId,
+              provider: 'alerting',
+              actions: new Map([
+                // make sure the counts of the # of events per type are as expected
+                ['execute-start', { gte: 4 }],
+                ['execute', { gte: 4 }],
+                ['execute-action', { equal: 2 }],
+                ['new-instance', { equal: 1 }],
+                ['active-instance', { gte: 2 }],
+                ['recovered-instance', { equal: 1 }],
+              ]),
             });
-            break;
-          case 'execute-action':
-            expect(
-              [firstSubgroup, secondSubgroup].includes(event?.kibana?.alerting?.action_subgroup!)
-            ).to.be(true);
+          });
+
+          const executeEvents = getEventsByAction(events, 'execute');
+          const executeStartEvents = getEventsByAction(events, 'execute-start');
+          const executeActionEvents = getEventsByAction(events, 'execute-action');
+          const newInstanceEvents = getEventsByAction(events, 'new-instance');
+          const recoveredInstanceEvents = getEventsByAction(events, 'recovered-instance');
+
+          // make sure the events are in the right temporal order
+          const executeTimes = getTimestamps(executeEvents);
+          const executeStartTimes = getTimestamps(executeStartEvents);
+          const executeActionTimes = getTimestamps(executeActionEvents);
+          const newInstanceTimes = getTimestamps(newInstanceEvents);
+          const recoveredInstanceTimes = getTimestamps(recoveredInstanceEvents);
+
+          expect(executeTimes[0] < newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[1] <= newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[2] > newInstanceTimes[0]).to.be(true);
+          expect(executeTimes[1] <= executeActionTimes[0]).to.be(true);
+          expect(executeTimes[2] > executeActionTimes[0]).to.be(true);
+          expect(executeStartTimes.length === executeTimes.length).to.be(true);
+          executeStartTimes.forEach((est, index) =>
+            expect(est === executeTimes[index]).to.be(true)
+          );
+          expect(recoveredInstanceTimes[0] > newInstanceTimes[0]).to.be(true);
+
+          // validate each event
+          let executeCount = 0;
+          const executeStatuses = ['ok', 'active', 'active'];
+          for (const event of events) {
+            switch (event?.event?.action) {
+              case 'execute-start':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                  ],
+                  message: `alert execution start: "${alertId}"`,
+                  shouldHaveTask: true,
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                  },
+                });
+                break;
+              case 'execute':
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                  ],
+                  outcome: 'success',
+                  message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
+                  status: executeStatuses[executeCount++],
+                  shouldHaveTask: true,
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                    name: response.body.name,
+                  },
+                });
+                break;
+              case 'execute-action':
+                expect(
+                  [firstSubgroup, secondSubgroup].includes(
+                    event?.kibana?.alerting?.action_subgroup!
+                  )
+                ).to.be(true);
+                validateEvent(event, {
+                  spaceId: space.id,
+                  savedObjects: [
+                    { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                    { type: 'action', id: createdAction.id, type_id: 'test.noop' },
+                  ],
+                  message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})' action: test.noop:${createdAction.id}`,
+                  instanceId: 'instance',
+                  actionGroupId: 'default',
+                  rule: {
+                    id: alertId,
+                    category: response.body.rule_type_id,
+                    license: 'basic',
+                    ruleset: 'alertsFixture',
+                    name: response.body.name,
+                  },
+                });
+                break;
+              case 'new-instance':
+                validateInstanceEvent(event, `created new instance: 'instance'`, false);
+                break;
+              case 'recovered-instance':
+                validateInstanceEvent(event, `instance 'instance' has recovered`, true);
+                break;
+              case 'active-instance':
+                expect(
+                  [firstSubgroup, secondSubgroup].includes(
+                    event?.kibana?.alerting?.action_subgroup!
+                  )
+                ).to.be(true);
+                validateInstanceEvent(
+                  event,
+                  `active instance: 'instance' in actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})'`,
+                  false
+                );
+                break;
+              // this will get triggered as we add new event actions
+              default:
+                throw new Error(`unexpected event action "${event?.event?.action}"`);
+            }
+          }
+
+          function validateInstanceEvent(
+            event: IValidatedEvent,
+            subMessage: string,
+            shouldHaveEventEnd: boolean
+          ) {
             validateEvent(event, {
-              spaceId: Spaces.space1.id,
+              spaceId: space.id,
               savedObjects: [
                 { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-                { type: 'action', id: createdAction.id, type_id: 'test.noop' },
               ],
-              message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})' action: test.noop:${createdAction.id}`,
+              message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
               instanceId: 'instance',
               actionGroupId: 'default',
+              shouldHaveEventEnd,
               rule: {
                 id: alertId,
                 category: response.body.rule_type_id,
                 license: 'basic',
                 ruleset: 'alertsFixture',
-                namespace: Spaces.space1.id,
                 name: response.body.name,
               },
             });
-            break;
-          case 'new-instance':
-            validateInstanceEvent(event, `created new instance: 'instance'`, false);
-            break;
-          case 'recovered-instance':
-            validateInstanceEvent(event, `instance 'instance' has recovered`, true);
-            break;
-          case 'active-instance':
-            expect(
-              [firstSubgroup, secondSubgroup].includes(event?.kibana?.alerting?.action_subgroup!)
-            ).to.be(true);
-            validateInstanceEvent(
-              event,
-              `active instance: 'instance' in actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})'`,
-              false
-            );
-            break;
-          // this will get triggered as we add new event actions
-          default:
-            throw new Error(`unexpected event action "${event?.event?.action}"`);
-        }
-      }
-
-      function validateInstanceEvent(
-        event: IValidatedEvent,
-        subMessage: string,
-        shouldHaveEventEnd: boolean
-      ) {
-        validateEvent(event, {
-          spaceId: Spaces.space1.id,
-          savedObjects: [
-            { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-          ],
-          message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
-          instanceId: 'instance',
-          actionGroupId: 'default',
-          shouldHaveEventEnd,
-          rule: {
-            id: alertId,
-            category: response.body.rule_type_id,
-            license: 'basic',
-            ruleset: 'alertsFixture',
-            namespace: Spaces.space1.id,
-            name: response.body.name,
-          },
-        });
-      }
-    });
-
-    it('should generate events for execution errors', async () => {
-      const response = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`)
-        .set('kbn-xsrf', 'foo')
-        .send(
-          getTestAlertData({
-            rule_type_id: 'test.throw',
-            schedule: { interval: '1s' },
-            throttle: null,
-          })
-        );
-
-      expect(response.status).to.eql(200);
-      const alertId = response.body.id;
-      objectRemover.add(Spaces.space1.id, alertId, 'rule', 'alerting');
-
-      const events = await retry.try(async () => {
-        return await getEventLog({
-          getService,
-          spaceId: Spaces.space1.id,
-          type: 'alert',
-          id: alertId,
-          provider: 'alerting',
-          actions: new Map([
-            ['execute-start', { gte: 1 }],
-            ['execute', { gte: 1 }],
-          ]),
+          }
         });
-      });
 
-      const startEvent = events[0];
-      const executeEvent = events[1];
-
-      expect(startEvent).to.be.ok();
-      expect(executeEvent).to.be.ok();
-
-      validateEvent(startEvent, {
-        spaceId: Spaces.space1.id,
-        savedObjects: [
-          { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
-        ],
-        message: `alert execution start: "${alertId}"`,
-        rule: {
-          id: alertId,
-          category: response.body.rule_type_id,
-          license: 'basic',
-          ruleset: 'alertsFixture',
-          namespace: Spaces.space1.id,
-        },
-      });
+        it('should generate events for execution errors', async () => {
+          const response = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerting/rule`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                rule_type_id: 'test.throw',
+                schedule: { interval: '1s' },
+                throttle: null,
+              })
+            );
+
+          expect(response.status).to.eql(200);
+          const alertId = response.body.id;
+          objectRemover.add(space.id, alertId, 'rule', 'alerting');
+
+          const events = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'alert',
+              id: alertId,
+              provider: 'alerting',
+              actions: new Map([
+                ['execute-start', { gte: 1 }],
+                ['execute', { gte: 1 }],
+              ]),
+            });
+          });
 
-      validateEvent(executeEvent, {
-        spaceId: Spaces.space1.id,
-        savedObjects: [{ type: 'alert', id: alertId, rel: 'primary', type_id: 'test.throw' }],
-        outcome: 'failure',
-        message: `alert execution failure: test.throw:${alertId}: 'abc'`,
-        errorMessage: 'this alert is intended to fail',
-        status: 'error',
-        reason: 'execute',
-        rule: {
-          id: alertId,
-          category: response.body.rule_type_id,
-          license: 'basic',
-          ruleset: 'alertsFixture',
-          namespace: Spaces.space1.id,
-        },
+          const startEvent = events[0];
+          const executeEvent = events[1];
+
+          expect(startEvent).to.be.ok();
+          expect(executeEvent).to.be.ok();
+
+          validateEvent(startEvent, {
+            spaceId: space.id,
+            savedObjects: [
+              { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+            ],
+            message: `alert execution start: "${alertId}"`,
+            shouldHaveTask: true,
+            rule: {
+              id: alertId,
+              category: response.body.rule_type_id,
+              license: 'basic',
+              ruleset: 'alertsFixture',
+            },
+          });
+
+          validateEvent(executeEvent, {
+            spaceId: space.id,
+            savedObjects: [{ type: 'alert', id: alertId, rel: 'primary', type_id: 'test.throw' }],
+            outcome: 'failure',
+            message: `alert execution failure: test.throw:${alertId}: 'abc'`,
+            errorMessage: 'this alert is intended to fail',
+            status: 'error',
+            reason: 'execute',
+            shouldHaveTask: true,
+            rule: {
+              id: alertId,
+              category: response.body.rule_type_id,
+              license: 'basic',
+              ruleset: 'alertsFixture',
+            },
+          });
+        });
       });
-    });
+    }
   });
 }
 
@@ -510,12 +546,13 @@ interface ValidateEventLogParams {
   outcome?: string;
   message: string;
   shouldHaveEventEnd?: boolean;
+  shouldHaveTask?: boolean;
   errorMessage?: string;
   status?: string;
   actionGroupId?: string;
   instanceId?: string;
   reason?: string;
-  rule: {
+  rule?: {
     id: string;
     name?: string;
     version?: string;
@@ -529,7 +566,7 @@ interface ValidateEventLogParams {
 }
 
 export function validateEvent(event: IValidatedEvent, params: ValidateEventLogParams): void {
-  const { spaceId, savedObjects, outcome, message, errorMessage, rule } = params;
+  const { spaceId, savedObjects, outcome, message, errorMessage, rule, shouldHaveTask } = params;
   const { status, actionGroupId, instanceId, reason, shouldHaveEventEnd } = params;
 
   if (status) {
@@ -587,6 +624,16 @@ export function validateEvent(event: IValidatedEvent, params: ValidateEventLogPa
 
   expect(event?.rule).to.eql(rule);
 
+  if (shouldHaveTask) {
+    const task = event?.kibana?.task;
+    expect(task).to.be.ok();
+    expect(typeof Date.parse(typeof task?.scheduled)).to.be('number');
+    expect(typeof task?.schedule_delay).to.be('number');
+    expect(task?.schedule_delay).to.be.greaterThan(-1);
+  } else {
+    expect(event?.kibana?.task).to.be(undefined);
+  }
+
   if (errorMessage) {
     expect(event?.error?.message).to.eql(errorMessage);
   }
@@ -602,12 +649,13 @@ function getTimestamps(events: IValidatedEvent[]) {
 
 function isSavedObjectInEvent(
   event: IValidatedEvent,
-  namespace: string,
+  spaceId: string,
   type: string,
   id: string,
   rel?: string
 ): boolean {
   const savedObjects = event?.kibana?.saved_objects ?? [];
+  const namespace = spaceId === 'default' ? undefined : spaceId;
 
   for (const savedObject of savedObjects) {
     if (

From be1c5bbd72feed9544ad11e17c49fec3b2189104 Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Thu, 24 Jun 2021 16:52:55 +0200
Subject: [PATCH 47/95] Don't import react-intl directly to reduce bundle sizes
 (#102497)

---
 packages/elastic-eslint-config-kibana/.eslintrc.js           | 5 +++++
 packages/kbn-i18n/src/react/index.tsx                        | 1 +
 packages/kbn-i18n/src/react/provider.tsx                     | 2 ++
 .../components/field_format_editor/editors/url/url.test.tsx  | 2 +-
 .../select_anomaly_severity.test.tsx                         | 2 +-
 .../public/search/sessions_mgmt/__mocks__/index.tsx          | 2 +-
 .../public/search/sessions_mgmt/lib/get_columns.tsx          | 2 +-
 .../connected_search_session_indicator.test.tsx              | 2 +-
 .../search_session_indicator.test.tsx                        | 2 +-
 .../relevance_tuning/relevance_tuning_callouts.tsx           | 3 +--
 .../ml/anomaly_detection/anomalies_table/anomalies_table.tsx | 2 +-
 .../components/node_details/tabs/properties/table.tsx        | 2 +-
 .../components/annotations/annotation_flyout/index.test.tsx  | 2 +-
 .../scatterplot_matrix/scatterplot_matrix.test.tsx           | 2 +-
 .../components/source_selection/source_selection.test.tsx    | 2 +-
 .../core_web_vitals/__stories__/core_vitals.stories.tsx      | 2 +-
 .../__stories__/field_value_selection.stories.tsx            | 2 +-
 .../observability/public/pages/alerts/alerts.stories.tsx     | 2 +-
 x-pack/plugins/observability/public/utils/test_helper.tsx    | 2 +-
 .../public/components/screen_capture_panel_content.test.tsx  | 2 +-
 .../security_solution/public/resolver/view/submenu.tsx       | 2 +-
 .../transform/public/app/hooks/use_index_data.test.tsx       | 2 +-
 .../components/action_discover/discover_action_name.test.tsx | 2 +-
 .../swimlane/steps/swimlane_connection.tsx                   | 2 +-
 .../sections/action_connector_form/action_type_menu.tsx      | 2 +-
 25 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
index a8c2e9546510e..3220a01184004 100644
--- a/packages/elastic-eslint-config-kibana/.eslintrc.js
+++ b/packages/elastic-eslint-config-kibana/.eslintrc.js
@@ -75,6 +75,11 @@ module.exports = {
           to: '@kbn/test',
           disallowedMessage: `import from the root of @kbn/test instead`
         },
+        {
+          from: 'react-intl',
+          to: '@kbn/i18n/react',
+          disallowedMessage: `import from @kbn/i18n/react instead`
+        }
       ],
     ],
   },
diff --git a/packages/kbn-i18n/src/react/index.tsx b/packages/kbn-i18n/src/react/index.tsx
index 08fa7173978d9..bc0a164d412af 100644
--- a/packages/kbn-i18n/src/react/index.tsx
+++ b/packages/kbn-i18n/src/react/index.tsx
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line @kbn/eslint/module_migration
 import { InjectedIntl as _InjectedIntl, InjectedIntlProps as _InjectedIntlProps } from 'react-intl';
 export type { InjectedIntl, InjectedIntlProps } from 'react-intl';
 
diff --git a/packages/kbn-i18n/src/react/provider.tsx b/packages/kbn-i18n/src/react/provider.tsx
index 2d88125291aa0..fc0f6769c7160 100644
--- a/packages/kbn-i18n/src/react/provider.tsx
+++ b/packages/kbn-i18n/src/react/provider.tsx
@@ -8,6 +8,8 @@
 
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
+
+// eslint-disable-next-line @kbn/eslint/module_migration
 import { IntlProvider } from 'react-intl';
 
 import * as i18n from '../core';
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
index 9f299a433aab1..1000d9d2b8650 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { FieldFormat } from 'src/plugins/data/public';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { UrlFormatEditor } from './url';
 import { coreMock } from 'src/core/public/mocks';
 import { createKibanaReactContext } from '../../../../../../kibana_react/public';
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/select_anomaly_severity.test.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/select_anomaly_severity.test.tsx
index 7b56eaa4721de..8c8f0aa8b9b24 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/select_anomaly_severity.test.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/select_anomaly_severity.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { ANOMALY_SEVERITY } from '../../../../common/ml_constants';
 import { SelectAnomalySeverity } from './select_anomaly_severity';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/__mocks__/index.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/__mocks__/index.tsx
index ee43a3c1a21e2..d52ca5b45613a 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/__mocks__/index.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/__mocks__/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { UrlGeneratorsStart } from '../../../../../../../src/plugins/share/public/url_generators';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
index d8d2fa0aeac59..7dd4966124e96 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
@@ -16,10 +16,10 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { CoreStart } from 'kibana/public';
 import { capitalize } from 'lodash';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
 import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
 import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../';
 import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index a16557b50700e..893f352b5d828 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -22,7 +22,7 @@ import {
 import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { TOUR_RESTORE_STEP_KEY, TOUR_TAKING_TOO_LONG_STEP_KEY } from './search_session_tour';
 import userEvent from '@testing-library/user-event';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { createSearchUsageCollectorMock } from '../../../../../../../src/plugins/data/public/search/collectors/mocks';
 
 const coreStart = coreMock.createStart();
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
index ff9e27cad1869..310379f90c789 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
@@ -9,7 +9,7 @@ import React, { ReactNode } from 'react';
 import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SearchSessionIndicator } from './search_session_indicator';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
 
 function Container({ children }: { children?: ReactNode }) {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.tsx
index c981d35ff20cb..bdbc414a22eaa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.tsx
@@ -7,12 +7,11 @@
 
 import React from 'react';
 
-import { FormattedMessage } from 'react-intl';
-
 import { useValues } from 'kea';
 
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 import { EuiLinkTo } from '../../../shared/react_router_helpers';
 import { DOCS_PREFIX, ENGINE_SCHEMA_PATH } from '../../routes';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
index 8c8a5ae56c3ba..98f3c82818dd2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
@@ -26,7 +26,7 @@ import {
   EuiText,
   OnTimeChangeProps,
 } from '@elastic/eui';
-import { FormattedDate, FormattedMessage } from 'react-intl';
+import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 import { datemathToEpochMillis } from '../../../../../../../utils/datemath';
 import { SnapshotMetricType } from '../../../../../../../../common/inventory_models/types';
 import { withTheme } from '../../../../../../../../../../../src/plugins/kibana_react/common';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/table.tsx
index 1d465698dcb45..053e50ff87049 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/table.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { first } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 interface Row {
   name: string;
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
index 05d400c5bb0ad..bf4b33350b382 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
@@ -9,7 +9,7 @@ import useObservable from 'react-use/lib/useObservable';
 import mockAnnotations from '../annotations_table/__mocks__/mock_annotations.json';
 import React from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
 import { Annotation } from '../../../../../common/types/annotations';
 import { AnnotationUpdatesService } from '../../../services/annotations_service';
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.test.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.test.tsx
index 10deaa1c2d489..d0e70c38c23b4 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, waitFor, screen } from '@testing-library/react';
 
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
 import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
index 8e7aecf429ad0..7e90a4e3ed44a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, fireEvent, waitFor, screen } from '@testing-library/react';
 
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
 import {
   getIndexPatternAndSavedSearch,
diff --git a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
index d84e637da087e..5f5cf2cb4da21 100644
--- a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentType } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { Observable } from 'rxjs';
 import { CoreStart } from 'src/core/public';
 import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
index 665010be3aff2..80a25b82eb8cb 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentType, useEffect, useState } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { Observable } from 'rxjs';
 import { CoreStart } from 'src/core/public';
 import { text } from '@storybook/addon-knobs';
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
index ba714a679f1e5..ccc85d7f40187 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
@@ -7,7 +7,7 @@
 
 import { StoryContext } from '@storybook/react';
 import React, { ComponentType } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { MemoryRouter } from 'react-router-dom';
 import { AlertsPage } from '.';
 import { HttpSetup } from '../../../../../../src/core/public';
diff --git a/x-pack/plugins/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability/public/utils/test_helper.tsx
index feacb011e0701..ce71a5640515b 100644
--- a/x-pack/plugins/observability/public/utils/test_helper.tsx
+++ b/x-pack/plugins/observability/public/utils/test_helper.tsx
@@ -8,7 +8,7 @@
 import { render as testLibRender } from '@testing-library/react';
 import { AppMountParameters, CoreStart } from 'kibana/public';
 import React from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { of } from 'rxjs';
 import {
   KibanaContextProvider,
diff --git a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx b/x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx
index 84a6dcc3c0ba3..a023eae512d54 100644
--- a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx
+++ b/x-pack/plugins/reporting/public/components/screen_capture_panel_content.test.tsx
@@ -7,7 +7,7 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { coreMock } from '../../../../../src/core/public/mocks';
 import { BaseParams } from '../../common/types';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
index 77f97b947d824..1315a7d6c45d9 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useContext, useCallback } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { useDispatch } from 'react-redux';
 import { EuiI18nNumber } from '@elastic/eui';
 import { EventStats } from '../../../common/endpoint/types';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
index c3dc9ab4bb8a1..68f6fea3aa943 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
 import '@testing-library/jest-dom/extend-expect';
 import { render, screen, waitFor } from '@testing-library/react';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
index 8dba93399792c..dc6fae40ee0d1 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 import React from 'react';
-import { IntlProvider } from 'react-intl';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
 import { render, waitFor, screen } from '@testing-library/react';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
index cd29037e3535f..05b6d8d63f1cf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/steps/swimlane_connection.tsx
@@ -14,7 +14,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { useCallback } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from '@kbn/i18n/react';
 import * as i18n from '../translations';
 import { useKibana } from '../../../../../common/lib/kibana';
 import { useGetApplication } from '../use_get_application';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
index 4428d635c6493..cc7e08bc73d15 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { EuiFlexItem, EuiCard, EuiIcon, EuiFlexGrid, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiToolTip } from '@elastic/eui';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { ActionType, ActionTypeIndex, ActionTypeRegistryContract } from '../../../types';
 import { loadActionTypes } from '../../lib/action_connector_api';
 import { actionTypeCompare } from '../../lib/action_type_compare';

From f2937720aa8e370d35890c3bdad1b2bd40839394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Thu, 24 Jun 2021 10:53:15 -0400
Subject: [PATCH 48/95] [APM] Link to Fleet APM Server Configuration when
 managed by Elastic Agent w/Fleet (#100816)

* Register tutorial on APM plugin

* using files from apm

* removing tutorial from apm_oss

* removing export

* fixing i18n

* adding fleet section

* adding fleet information on APM tutorial

* adding fleet typing

* fixing i18n

* adding fleet information on APM tutorial

* checks apm fleet integration when pushing button

* adding fleet information on APM tutorial

* refactoring

* registering status check callback

* addin custom component registration function

* fixing TS issue

* addressing PR comments

* fixing tests

* adding i18n

* fixing issues

* adding unit test

* adding unit test

* addressing PR comments

* fixing TS issue

* moving tutorial to a common directory

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../home/common/instruction_variant.ts        |   6 +
 .../home/public/application/application.tsx   |  10 +-
 .../components/tutorial/instruction.js        |  34 ++++-
 .../components/tutorial/instruction_set.js    |   2 +
 .../components/tutorial/tutorial.js           |  41 ++++--
 .../components/tutorial/tutorial.test.js      | 113 ++++++++++++++++
 .../tutorials/tutorial_service.mock.ts        |   4 +
 .../tutorials/tutorial_service.test.tsx       |  40 ++++++
 .../services/tutorials/tutorial_service.ts    |  21 +++
 src/plugins/home/server/index.ts              |   7 +-
 .../services/tutorials/lib/tutorial_schema.ts |   4 +-
 .../illustration_integrations_darkmode.svg    |   1 +
 .../illustration_integrations_lightmode.svg   |   1 +
 x-pack/plugins/apm/public/plugin.ts           |  50 +++++--
 .../apm_observability_overview_fetchers.ts    |   2 -
 .../tutorial/tutorial_apm_fleet_check.ts      |  20 +++
 .../tutorial_fleet_instructions/index.tsx     | 122 ++++++++++++++++++
 x-pack/plugins/apm/server/routes/fleet.ts     |  36 ++++++
 .../get_global_apm_server_route_repository.ts |   4 +-
 .../apm/server/tutorial/envs/elastic_cloud.ts |  18 ++-
 .../apm/server/tutorial/envs/on_prem.ts       |  39 +++---
 x-pack/plugins/apm/server/tutorial/index.ts   |  12 +-
 .../instructions/apm_agent_instructions.ts    |   5 +-
 23 files changed, 535 insertions(+), 57 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg
 create mode 100644 x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg
 create mode 100644 x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts
 create mode 100644 x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
 create mode 100644 x-pack/plugins/apm/server/routes/fleet.ts

diff --git a/src/plugins/home/common/instruction_variant.ts b/src/plugins/home/common/instruction_variant.ts
index 310ee23460a08..f27b2c97bdc1e 100644
--- a/src/plugins/home/common/instruction_variant.ts
+++ b/src/plugins/home/common/instruction_variant.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { i18n } from '@kbn/i18n';
+
 export const INSTRUCTION_VARIANT = {
   ESC: 'esc',
   OSX: 'osx',
@@ -24,6 +26,7 @@ export const INSTRUCTION_VARIANT = {
   DOTNET: 'dotnet',
   LINUX: 'linux',
   PHP: 'php',
+  FLEET: 'fleet',
 };
 
 const DISPLAY_MAP = {
@@ -44,6 +47,9 @@ const DISPLAY_MAP = {
   [INSTRUCTION_VARIANT.DOTNET]: '.NET',
   [INSTRUCTION_VARIANT.LINUX]: 'Linux',
   [INSTRUCTION_VARIANT.PHP]: 'PHP',
+  [INSTRUCTION_VARIANT.FLEET]: i18n.translate('home.tutorial.instruction_variant.fleet', {
+    defaultMessage: 'Elastic APM (beta) in Fleet',
+  }),
 };
 
 /**
diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index 9ab720b47ab92..18f3089c14d11 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { ScopedHistory, CoreStart } from 'kibana/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider, RedirectAppLinks } from '../../../kibana_react/public';
 // @ts-ignore
 import { HomeApp } from './components/home_app';
 import { getServices } from './kibana_services';
@@ -44,9 +44,11 @@ export const renderApp = async (
   });
 
   render(
-    <KibanaContextProvider services={{ ...coreStart }}>
-      <HomeApp directories={directories} solutions={solutions} />
-    </KibanaContextProvider>,
+    <RedirectAppLinks application={coreStart.application}>
+      <KibanaContextProvider services={{ ...coreStart }}>
+        <HomeApp directories={directories} solutions={solutions} />
+      </KibanaContextProvider>
+    </RedirectAppLinks>,
     element
   );
 
diff --git a/src/plugins/home/public/application/components/tutorial/instruction.js b/src/plugins/home/public/application/components/tutorial/instruction.js
index 42c22b057b1e2..373f8c318a504 100644
--- a/src/plugins/home/public/application/components/tutorial/instruction.js
+++ b/src/plugins/home/public/application/components/tutorial/instruction.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { Suspense, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Content } from './content';
 
@@ -17,11 +17,23 @@ import {
   EuiSpacer,
   EuiCopy,
   EuiButton,
+  EuiLoadingSpinner,
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
-export function Instruction({ commands, paramValues, textPost, textPre, replaceTemplateStrings }) {
+import { getServices } from '../../kibana_services';
+
+export function Instruction({
+  commands,
+  paramValues,
+  textPost,
+  textPre,
+  replaceTemplateStrings,
+  customComponentName,
+}) {
+  const { tutorialService, http, uiSettings, getBasePath } = getServices();
+
   let pre;
   if (textPre) {
     pre = <Content text={replaceTemplateStrings(textPre)} />;
@@ -36,6 +48,13 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT
       </div>
     );
   }
+  const customComponent = tutorialService.getCustomComponent(customComponentName);
+  //Memoize the custom component so it wont rerender everytime
+  const LazyCustomComponent = useMemo(() => {
+    if (customComponent) {
+      return React.lazy(() => customComponent());
+    }
+  }, [customComponent]);
 
   let copyButton;
   let commandBlock;
@@ -79,6 +98,16 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT
 
       {post}
 
+      {LazyCustomComponent && (
+        <Suspense fallback={<EuiLoadingSpinner />}>
+          <LazyCustomComponent
+            basePath={getBasePath()}
+            isDarkTheme={uiSettings.get('theme:darkMode')}
+            http={http}
+          />
+        </Suspense>
+      )}
+
       <EuiSpacer />
     </div>
   );
@@ -90,4 +119,5 @@ Instruction.propTypes = {
   textPost: PropTypes.string,
   textPre: PropTypes.string,
   replaceTemplateStrings: PropTypes.func.isRequired,
+  customComponentName: PropTypes.string,
 };
diff --git a/src/plugins/home/public/application/components/tutorial/instruction_set.js b/src/plugins/home/public/application/components/tutorial/instruction_set.js
index f16e276ed4c56..da368120d493c 100644
--- a/src/plugins/home/public/application/components/tutorial/instruction_set.js
+++ b/src/plugins/home/public/application/components/tutorial/instruction_set.js
@@ -186,6 +186,7 @@ class InstructionSetUi extends React.Component {
           textPre={instruction.textPre}
           textPost={instruction.textPost}
           replaceTemplateStrings={this.props.replaceTemplateStrings}
+          customComponentName={instruction.customComponentName}
         />
       );
       return {
@@ -298,6 +299,7 @@ const statusCheckConfigShape = PropTypes.shape({
   title: PropTypes.string,
   text: PropTypes.string,
   btnLabel: PropTypes.string,
+  customStatusCheck: PropTypes.string,
 });
 
 InstructionSetUi.propTypes = {
diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.js b/src/plugins/home/public/application/components/tutorial/tutorial.js
index 81a75d8881e2d..92bbb92fa0850 100644
--- a/src/plugins/home/public/application/components/tutorial/tutorial.js
+++ b/src/plugins/home/public/application/components/tutorial/tutorial.js
@@ -67,7 +67,6 @@ class TutorialUi extends React.Component {
 
   async componentDidMount() {
     const tutorial = await this.props.getTutorial(this.props.tutorialId);
-
     if (!this._isMounted) {
       return;
     }
@@ -172,15 +171,39 @@ class TutorialUi extends React.Component {
     const instructionSet = this.getInstructionSets()[instructionSetIndex];
     const esHitsCheckConfig = _.get(instructionSet, `statusCheck.esHitsCheck`);
 
-    if (esHitsCheckConfig) {
-      const statusCheckState = await this.fetchEsHitsStatus(esHitsCheckConfig);
+    //Checks if a custom status check callback  was registered in the CLIENT
+    //that matches the same name registered in the SERVER (customStatusCheckName)
+    const customStatusCheckCallback = getServices().tutorialService.getCustomStatusCheck(
+      this.state.tutorial.customStatusCheckName
+    );
 
-      this.setState((prevState) => ({
-        statusCheckStates: {
-          ...prevState.statusCheckStates,
-          [instructionSetIndex]: statusCheckState,
-        },
-      }));
+    const [esHitsStatusCheck, customStatusCheck] = await Promise.all([
+      ...(esHitsCheckConfig ? [this.fetchEsHitsStatus(esHitsCheckConfig)] : []),
+      ...(customStatusCheckCallback
+        ? [this.fetchCustomStatusCheck(customStatusCheckCallback)]
+        : []),
+    ]);
+
+    const nextStatusCheckState =
+      esHitsStatusCheck === StatusCheckStates.HAS_DATA ||
+      customStatusCheck === StatusCheckStates.HAS_DATA
+        ? StatusCheckStates.HAS_DATA
+        : StatusCheckStates.NO_DATA;
+
+    this.setState((prevState) => ({
+      statusCheckStates: {
+        ...prevState.statusCheckStates,
+        [instructionSetIndex]: nextStatusCheckState,
+      },
+    }));
+  };
+
+  fetchCustomStatusCheck = async (customStatusCheckCallback) => {
+    try {
+      const response = await customStatusCheckCallback();
+      return response ? StatusCheckStates.HAS_DATA : StatusCheckStates.NO_DATA;
+    } catch (e) {
+      return StatusCheckStates.ERROR;
     }
   };
 
diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.test.js b/src/plugins/home/public/application/components/tutorial/tutorial.test.js
index 490ecfd8edd78..e9c0b49451e23 100644
--- a/src/plugins/home/public/application/components/tutorial/tutorial.test.js
+++ b/src/plugins/home/public/application/components/tutorial/tutorial.test.js
@@ -13,12 +13,23 @@ import { Tutorial } from './tutorial';
 
 jest.mock('../../kibana_services', () => ({
   getServices: () => ({
+    http: {
+      post: jest.fn().mockImplementation(async () => ({ count: 1 })),
+    },
     getBasePath: jest.fn(() => 'path'),
     chrome: {
       setBreadcrumbs: () => {},
     },
     tutorialService: {
       getModuleNotices: () => [],
+      getCustomComponent: jest.fn(),
+      getCustomStatusCheck: (name) => {
+        const customStatusCheckMock = {
+          custom_status_check_has_data: async () => true,
+          custom_status_check_no_data: async () => false,
+        };
+        return customStatusCheckMock[name];
+      },
     },
   }),
 }));
@@ -54,6 +65,7 @@ const tutorial = {
   elasticCloud: buildInstructionSet('elasticCloud'),
   onPrem: buildInstructionSet('onPrem'),
   onPremElasticCloud: buildInstructionSet('onPremElasticCloud'),
+  customStatusCheckName: 'custom_status_check_has_data',
 };
 const loadTutorialPromise = Promise.resolve(tutorial);
 const getTutorial = () => {
@@ -143,3 +155,104 @@ test('should render ELASTIC_CLOUD instructions when isCloudEnabled is true', asy
   component.update();
   expect(component).toMatchSnapshot(); // eslint-disable-line
 });
+
+describe('custom status check', () => {
+  test('should return has_data when custom status check callback is set and returns true', async () => {
+    const component = mountWithIntl(
+      <Tutorial.WrappedComponent
+        addBasePath={addBasePath}
+        isCloudEnabled={true}
+        getTutorial={getTutorial}
+        replaceTemplateStrings={replaceTemplateStrings}
+        tutorialId={'my_testing_tutorial'}
+        bulkCreate={() => {}}
+      />
+    );
+    await loadTutorialPromise;
+    component.update();
+    await component.instance().checkInstructionSetStatus(0);
+    expect(component.state('statusCheckStates')[0]).toEqual('has_data');
+  });
+  test('should return no_data when custom status check callback is set and returns false', async () => {
+    const tutorialWithCustomStatusCheckNoData = {
+      ...tutorial,
+      customStatusCheckName: 'custom_status_check_no_data',
+    };
+    const component = mountWithIntl(
+      <Tutorial.WrappedComponent
+        addBasePath={addBasePath}
+        isCloudEnabled={true}
+        getTutorial={async () => tutorialWithCustomStatusCheckNoData}
+        replaceTemplateStrings={replaceTemplateStrings}
+        tutorialId={'my_testing_tutorial'}
+        bulkCreate={() => {}}
+      />
+    );
+    await loadTutorialPromise;
+    component.update();
+    await component.instance().checkInstructionSetStatus(0);
+    expect(component.state('statusCheckStates')[0]).toEqual('NO_DATA');
+  });
+
+  test('should return no_data when custom status check callback is not defined', async () => {
+    const tutorialWithoutCustomStatusCheck = {
+      ...tutorial,
+      customStatusCheckName: undefined,
+    };
+    const component = mountWithIntl(
+      <Tutorial.WrappedComponent
+        addBasePath={addBasePath}
+        isCloudEnabled={true}
+        getTutorial={async () => tutorialWithoutCustomStatusCheck}
+        replaceTemplateStrings={replaceTemplateStrings}
+        tutorialId={'my_testing_tutorial'}
+        bulkCreate={() => {}}
+      />
+    );
+    await loadTutorialPromise;
+    component.update();
+    await component.instance().checkInstructionSetStatus(0);
+    expect(component.state('statusCheckStates')[0]).toEqual('NO_DATA');
+  });
+
+  test('should return has_data if esHits or customStatusCheck returns true', async () => {
+    const { instructionSets } = tutorial.elasticCloud;
+    const tutorialWithStatusCheckAndCustomStatusCheck = {
+      ...tutorial,
+      customStatusCheckName: undefined,
+      elasticCloud: {
+        instructionSets: [
+          {
+            ...instructionSets[0],
+            statusCheck: {
+              title: 'check status',
+              text: 'check status',
+              esHitsCheck: {
+                index: 'foo',
+                query: {
+                  bool: {
+                    filter: [{ term: { 'processor.event': 'onboarding' } }],
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    };
+    const component = mountWithIntl(
+      <Tutorial.WrappedComponent
+        addBasePath={addBasePath}
+        isCloudEnabled={true}
+        getTutorial={async () => tutorialWithStatusCheckAndCustomStatusCheck}
+        replaceTemplateStrings={replaceTemplateStrings}
+        tutorialId={'my_testing_tutorial'}
+        bulkCreate={() => {}}
+      />
+    );
+    await loadTutorialPromise;
+    component.update();
+    await component.instance().checkInstructionSetStatus(0);
+    expect(component.state('statusCheckStates')[0]).toEqual('has_data');
+  });
+});
diff --git a/src/plugins/home/public/services/tutorials/tutorial_service.mock.ts b/src/plugins/home/public/services/tutorials/tutorial_service.mock.ts
index ac48168a360d4..0c109d61912ca 100644
--- a/src/plugins/home/public/services/tutorials/tutorial_service.mock.ts
+++ b/src/plugins/home/public/services/tutorials/tutorial_service.mock.ts
@@ -15,6 +15,8 @@ const createSetupMock = (): jest.Mocked<TutorialServiceSetup> => {
     registerDirectoryNotice: jest.fn(),
     registerDirectoryHeaderLink: jest.fn(),
     registerModuleNotice: jest.fn(),
+    registerCustomStatusCheck: jest.fn(),
+    registerCustomComponent: jest.fn(),
   };
   return setup;
 };
@@ -26,6 +28,8 @@ const createMock = (): jest.Mocked<PublicMethodsOf<TutorialService>> => {
     getDirectoryNotices: jest.fn(() => []),
     getDirectoryHeaderLinks: jest.fn(() => []),
     getModuleNotices: jest.fn(() => []),
+    getCustomStatusCheck: jest.fn(),
+    getCustomComponent: jest.fn(),
   };
   service.setup.mockImplementation(createSetupMock);
   return service;
diff --git a/src/plugins/home/public/services/tutorials/tutorial_service.test.tsx b/src/plugins/home/public/services/tutorials/tutorial_service.test.tsx
index 69d24b66ec6bf..a88cf526e3716 100644
--- a/src/plugins/home/public/services/tutorials/tutorial_service.test.tsx
+++ b/src/plugins/home/public/services/tutorials/tutorial_service.test.tsx
@@ -138,4 +138,44 @@ describe('TutorialService', () => {
       expect(service.getModuleNotices()).toEqual(notices);
     });
   });
+
+  describe('custom status check', () => {
+    test('returns undefined when name is customStatusCheckName is empty', () => {
+      const service = new TutorialService();
+      expect(service.getCustomStatusCheck('')).toBeUndefined();
+    });
+    test('returns undefined when custom status check was not registered', () => {
+      const service = new TutorialService();
+      expect(service.getCustomStatusCheck('foo')).toBeUndefined();
+    });
+    test('returns custom status check', () => {
+      const service = new TutorialService();
+      const callback = jest.fn();
+      service.setup().registerCustomStatusCheck('foo', callback);
+      const customStatusCheckCallback = service.getCustomStatusCheck('foo');
+      expect(customStatusCheckCallback).toBeDefined();
+      customStatusCheckCallback();
+      expect(callback).toHaveBeenCalled();
+    });
+  });
+
+  describe('custom component', () => {
+    test('returns undefined when name is customComponentName is empty', () => {
+      const service = new TutorialService();
+      expect(service.getCustomComponent('')).toBeUndefined();
+    });
+    test('returns undefined when custom component was not registered', () => {
+      const service = new TutorialService();
+      expect(service.getCustomComponent('foo')).toBeUndefined();
+    });
+    test('returns custom component', async () => {
+      const service = new TutorialService();
+      const customComponent = <div>foo</div>;
+      service.setup().registerCustomComponent('foo', async () => customComponent);
+      const customStatusCheckCallback = service.getCustomComponent('foo');
+      expect(customStatusCheckCallback).toBeDefined();
+      const result = await customStatusCheckCallback();
+      expect(result).toEqual(customComponent);
+    });
+  });
 });
diff --git a/src/plugins/home/public/services/tutorials/tutorial_service.ts b/src/plugins/home/public/services/tutorials/tutorial_service.ts
index 8ba766d34da53..839b0702a499e 100644
--- a/src/plugins/home/public/services/tutorials/tutorial_service.ts
+++ b/src/plugins/home/public/services/tutorials/tutorial_service.ts
@@ -22,6 +22,9 @@ export type TutorialModuleNoticeComponent = React.FC<{
   moduleName: string;
 }>;
 
+type CustomStatusCheckCallback = () => Promise<boolean>;
+type CustomComponent = () => Promise<React.ReactNode>;
+
 export class TutorialService {
   private tutorialVariables: TutorialVariables = {};
   private tutorialDirectoryNotices: { [key: string]: TutorialDirectoryNoticeComponent } = {};
@@ -29,6 +32,8 @@ export class TutorialService {
     [key: string]: TutorialDirectoryHeaderLinkComponent;
   } = {};
   private tutorialModuleNotices: { [key: string]: TutorialModuleNoticeComponent } = {};
+  private customStatusCheck: Record<string, CustomStatusCheckCallback> = {};
+  private customComponent: Record<string, CustomComponent> = {};
 
   public setup() {
     return {
@@ -74,6 +79,14 @@ export class TutorialService {
         }
         this.tutorialModuleNotices[id] = component;
       },
+
+      registerCustomStatusCheck: (name: string, fnCallback: CustomStatusCheckCallback) => {
+        this.customStatusCheck[name] = fnCallback;
+      },
+
+      registerCustomComponent: (name: string, component: CustomComponent) => {
+        this.customComponent[name] = component;
+      },
     };
   }
 
@@ -92,6 +105,14 @@ export class TutorialService {
   public getModuleNotices() {
     return Object.values(this.tutorialModuleNotices);
   }
+
+  public getCustomStatusCheck(customStatusCheckName: string) {
+    return this.customStatusCheck[customStatusCheckName];
+  }
+
+  public getCustomComponent(customComponentName: string) {
+    return this.customComponent[customComponentName];
+  }
 }
 
 export type TutorialServiceSetup = ReturnType<TutorialService['setup']>;
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index 840a5944a1343..9523766596fed 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -27,4 +27,9 @@ export const plugin = (initContext: PluginInitializerContext) => new HomeServerP
 
 export { INSTRUCTION_VARIANT } from '../common/instruction_variant';
 export { TutorialsCategory } from './services/tutorials';
-export type { ArtifactsSchema } from './services/tutorials';
+export type {
+  ArtifactsSchema,
+  TutorialSchema,
+  InstructionSetSchema,
+  InstructionsSchema,
+} from './services/tutorials';
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts b/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
index 5efbe067f6ece..76b045173a876 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
@@ -56,6 +56,7 @@ const instructionSchema = schema.object({
   textPre: schema.maybe(schema.string()),
   commands: schema.maybe(schema.arrayOf(schema.string())),
   textPost: schema.maybe(schema.string()),
+  customComponentName: schema.maybe(schema.string()),
 });
 export type Instruction = TypeOf<typeof instructionSchema>;
 
@@ -100,7 +101,7 @@ const instructionsSchema = schema.object({
   instructionSets: schema.arrayOf(instructionSetSchema),
   params: schema.maybe(schema.arrayOf(paramSchema)),
 });
-export type InstructionsSchema = TypeOf<typeof instructionSchema>;
+export type InstructionsSchema = TypeOf<typeof instructionsSchema>;
 
 const tutorialIdRegExp = /^[a-zA-Z0-9-]+$/;
 export const tutorialSchema = schema.object({
@@ -152,6 +153,7 @@ export const tutorialSchema = schema.object({
   // saved objects used by data module.
   savedObjects: schema.maybe(schema.arrayOf(schema.any())),
   savedObjectsInstallMsg: schema.maybe(schema.string()),
+  customStatusCheckName: schema.maybe(schema.string()),
 });
 
 export type TutorialSchema = TypeOf<typeof tutorialSchema>;
diff --git a/x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg b/x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg
new file mode 100644
index 0000000000000..b1f86be19a080
--- /dev/null
+++ b/x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="400" viewBox="0 0 800 400"><defs><clipPath id="a"><rect x="256.95" y="139.77" width="216.16" height="119.98" fill="#00bfb3"/></clipPath><clipPath id="b"><path d="M639.21,279.81l-45.48.88-43.52-.59C535,267.81,526.28,252,526.28,230.94a67,67,0,1,1,112.93,48.87" fill="#fa744e"/></clipPath></defs><title>Kibana-integrations-darkmode</title><path d="M249.27,92.3c.4,0,.8,0,1.21,0a69.24,69.24,0,0,1,39,12,13.26,13.26,0,0,1,3.29-3.59,74,74,0,0,0-42.32-13.26c-.41,0-.81,0-1.21,0Z" fill="#424854"/><path d="M323.06,145.46a74.17,74.17,0,0,0-11.71-26.34,13.33,13.33,0,0,1-3.58,3.32A69.29,69.29,0,0,1,318.2,145.9" fill="#424854"/><circle cx="300.74" cy="111.25" r="10.12" fill="#424854"/><path d="M221.89,215.86A62.33,62.33,0,0,1,250.6,98.27V80.11a80.45,80.45,0,0,0-58.35,135.75Z" fill="#fec514"/><path d="M219.29,214.45a62.24,62.24,0,0,1-30.9-53.85H170.23a80.29,80.29,0,0,0,20.65,53.85Z" fill="#fa744e"/><path d="M278,374.91a.67.67,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.53-.38-.59-.77-.78C278,374.12,277.73,374.46,278,374.91Z" fill="#424854"/><path d="M275.58,380.29a12.72,12.72,0,0,0,.32-1.45.62.62,0,0,0-.57-.71.65.65,0,0,0-.75.51,2.06,2.06,0,0,1-.25.57,1,1,0,0,0,.05,1.32C274.71,380.93,275.13,380.91,275.58,380.29Z" fill="#424854"/><path d="M277.59,372.44a1.77,1.77,0,0,0,.15-.42.78.78,0,0,0,.58-.33,1,1,0,0,0-.13-1.24,1.25,1.25,0,0,0-1.44.14.81.81,0,0,0,.05.72.49.49,0,0,0-.14.11.81.81,0,0,0-.18.7C276.69,372.58,277.13,372.59,277.59,372.44Z" fill="#424854"/><path d="M277.23,368.14a.66.66,0,0,0,.68.21c.46-.12.49-.56.54-1-.38-.23-.74-.55-1.15-.17a.62.62,0,0,0-.09.12,1.63,1.63,0,0,0-1.14-.52.69.69,0,0,0-.59.77c0,.62.44,1.08.91,1A1.12,1.12,0,0,0,277.23,368.14Z" fill="#424854"/><path d="M274.27,376.23c-.23.27-.14.48.43.94a.61.61,0,0,0,.39-1A.64.64,0,0,0,274.27,376.23Z" fill="#424854"/><path d="M274.64,368.12a.72.72,0,0,0-.25-1,.66.66,0,0,0-.94.25c-.26.37-.26.73,0,.89A1.15,1.15,0,0,0,274.64,368.12Z" fill="#424854"/><path d="M273.26,366.33a.22.22,0,0,0-.08-.27c-.05,0-.21,0-.24.07s-.05.19,0,.24A.2.2,0,0,0,273.26,366.33Z" fill="#424854"/><path d="M278.38,334.6a.64.64,0,0,0,.77-.46.49.49,0,0,0-.42-.66.89.89,0,0,0-.65.23C278,333.87,278.09,334.52,278.38,334.6Z" fill="#424854"/><path d="M277.52,324.81c-.3-.1-.57.11-.66.47a.43.43,0,0,0,.43.56c.22,0,.81,0,.85-.28S277.74,324.88,277.52,324.81Z" fill="#424854"/><path d="M282.37,318.15c-.64-.23-1.34.23-1.63,1.09a1.14,1.14,0,0,0,.7,1.46,1.5,1.5,0,0,0,1.82-.83A1.58,1.58,0,0,0,282.37,318.15Z" fill="#424854"/><path d="M284.17,347.55a1.43,1.43,0,0,0-.52-1.33.94.94,0,0,0-1.19.68c-.15.42.17.85.75,1.05A.69.69,0,0,0,284.17,347.55Z" fill="#424854"/><path d="M277.22,338.22c.16-.11,0-.46-.05-.53a.47.47,0,0,0-.47-.08c-.13.08-.09.37,0,.48S277.06,338.33,277.22,338.22Z" fill="#424854"/><path d="M283.19,350.37a2.11,2.11,0,0,0,.4-.68c.07-.39-.38-.7-.81-.66a.62.62,0,0,0-.53.72A.82.82,0,0,0,283.19,350.37Z" fill="#424854"/><path d="M282.31,352a.58.58,0,0,0,.07-.34.78.78,0,0,0-.77-.62.69.69,0,0,0-.66.71.76.76,0,0,0,.81.67l.07,0a.45.45,0,0,0,.22.17.39.39,0,0,0,.43-.19A.36.36,0,0,0,282.31,352Z" fill="#424854"/><path d="M283.56,322.17a.66.66,0,0,0-.87.43.72.72,0,0,0,.48.86.66.66,0,0,0,.77-.48A.6.6,0,0,0,283.56,322.17Z" fill="#424854"/><path d="M281.17,339.12c0,.05.14.3.21.3s.43,0,.47-.25-.27-.35-.33-.33A.55.55,0,0,0,281.17,339.12Z" fill="#424854"/><path d="M276.57,348.84c0-.62-.52-1.24-1-1.21a1.05,1.05,0,0,0-.78,1.09,1,1,0,0,0,1,.82C276.31,349.52,276.57,349.28,276.57,348.84Z" fill="#424854"/><path d="M277.75,352.57a1.39,1.39,0,0,0-1-1.2,1.49,1.49,0,0,0-1.61.88,1.34,1.34,0,0,0,.77,1.65,1.6,1.6,0,0,0,.89-.16.31.31,0,0,0,0,.1c0,.64.61,1.08,1.44,1.05a1,1,0,0,0,1.07-1.09,1.38,1.38,0,0,0-1.43-1.25Z" fill="#424854"/><path d="M281,337.15a3.88,3.88,0,0,0-2.28-.31,1.15,1.15,0,0,0-.32.17.87.87,0,0,0,.24,1.57,5,5,0,0,0,1.43.31,1.35,1.35,0,0,0,1.22-1A.55.55,0,0,0,281,337.15Z" fill="#424854"/><path d="M282,342.25a.81.81,0,0,0,.41-1.17.7.7,0,0,0-1.17.12,1,1,0,0,0,.06.83A.79.79,0,0,0,282,342.25Z" fill="#424854"/><path d="M280.34,344.16a.85.85,0,0,0-.68-.75.67.67,0,0,0-.63.65.76.76,0,0,0,.66.75A.74.74,0,0,0,280.34,344.16Z" fill="#424854"/><path d="M281.13,346.64a.89.89,0,0,0,0-.66c-.17-.37-.49-.39-1.21-.14,0,.39-.21.84.32,1.07A.66.66,0,0,0,281.13,346.64Z" fill="#424854"/><path d="M272.79,361.36a1.23,1.23,0,0,0-1,1.22,1.33,1.33,0,0,0,1.5,1,.94.94,0,0,0,.88-1.07A1.2,1.2,0,0,0,272.79,361.36Z" fill="#424854"/><path d="M275.91,343.93a1,1,0,0,0-1.33.62,1.58,1.58,0,0,0,.84,1.81,1.17,1.17,0,0,0,1.37-.8A1.26,1.26,0,0,0,275.91,343.93Z" fill="#424854"/><path d="M269.84,355.06c0,.21.31.53.48.53s.44-.27.59-.37c0-.52-.27-.64-.55-.64S269.77,354.73,269.84,355.06Z" fill="#424854"/><path d="M271.71,368c.45,0,1-.38,1-.73a1.21,1.21,0,0,0-1-1.1,1,1,0,0,0-.23.05c0-.14,0-.31,0-.35s-.43.08-.53.18,0,.34,0,.36a.66.66,0,0,0,.15,0,1.13,1.13,0,0,0-.37.76C270.71,367.7,271,368,271.71,368Z" fill="#424854"/><path d="M270.25,349.58a.4.4,0,1,0,.8,0,.43.43,0,0,0-.44-.31A.37.37,0,0,0,270.25,349.58Z" fill="#424854"/><path d="M279.48,348.08a.76.76,0,0,0,.42,1.41c.55-.07.8-.79.77-1A1,1,0,0,0,279.48,348.08Z" fill="#424854"/><path d="M273.05,369.5a.45.45,0,0,0-.14-.47c-.13-.07-.39-.21-.48-.06a.5.5,0,0,0,.05.48C272.57,369.53,273,369.65,273.05,369.5Z" fill="#424854"/><path d="M271.44,351.81a.47.47,0,0,0-.35.33c0,.13.14.51.31.48s.3-.29.28-.39S271.6,351.79,271.44,351.81Z" fill="#424854"/><path d="M271,340c-.19,0-.7-.05-.79.35s.36.53.53.56a.65.65,0,0,0,.55-.27A.43.43,0,0,0,271,340Z" fill="#424854"/><path d="M269.14,385c-.5-.35-.86-.35-1.11,0a.87.87,0,0,0,.09,1.29,1.48,1.48,0,0,0,1.33-.31C269.7,385.64,269.58,385.29,269.14,385Z" fill="#424854"/><path d="M269.06,383.78a.72.72,0,0,0,.49-.78.54.54,0,0,0-.48-.56c-.53-.08-.75.27-1,.71C268.39,383.52,268.56,384,269.06,383.78Z" fill="#424854"/><path d="M270.42,377.69a1.13,1.13,0,0,0-.21-1.66,1,1,0,0,0-.48-.21.63.63,0,0,0-.67,0,1.2,1.2,0,0,0-.73.44,1.49,1.49,0,0,0,.28,1.82A1.26,1.26,0,0,0,270.42,377.69Z" fill="#424854"/><path d="M269.39,390.87a.88.88,0,0,0,0-1.09c-.54-.45-1.18-.53-1.47-.17a1.15,1.15,0,0,0,.18,1.42A1,1,0,0,0,269.39,390.87Z" fill="#424854"/><path d="M280.22,382.94c.16.19.32.37.53.36a.65.65,0,0,0,.56-.24c.13-.13.33-.22.41-.51a1.44,1.44,0,0,0-.22-1.24,1.09,1.09,0,0,0-1.07-.37.94.94,0,0,0-.65.65A1.19,1.19,0,0,1,279,381a1.1,1.1,0,0,0-1.26-.1,1.42,1.42,0,0,0-.11,1.47c.19.26.41.64.79.48a1.62,1.62,0,0,1,1.38.07A.59.59,0,0,0,280.22,382.94Z" fill="#424854"/><path d="M266.52,375c0,.05,0,.34,0,.36a.51.51,0,0,0,.45,0,.39.39,0,0,0,0-.54C266.86,374.65,266.63,374.94,266.52,375Z" fill="#424854"/><path d="M265.64,380a1,1,0,0,0-1.15.2,1.61,1.61,0,0,0,.16,1.6,1.19,1.19,0,0,0,1.41-.52C266.37,380.8,266.21,380.34,265.64,380Z" fill="#424854"/><path d="M266.1,382.37c0,.22,0,.66.16.71a.7.7,0,0,0,.62-.19c.09-.13.1-.67-.06-.77A.82.82,0,0,0,266.1,382.37Z" fill="#424854"/><path d="M285.63,321.2a.61.61,0,0,0,.74-.51.71.71,0,0,0-.54-.83.55.55,0,0,0-.66.47A.68.68,0,0,0,285.63,321.2Z" fill="#424854"/><path d="M284.42,330a1.22,1.22,0,0,0,.72,1.41c.34.1.82-.29,1-.78a.9.9,0,0,0-.43-1.15A1.15,1.15,0,0,0,284.42,330Z" fill="#424854"/><path d="M284.33,395.33c0,.05,0,.1,0,.15a.27.27,0,0,0,.29.26,1.48,1.48,0,0,0,.78.32.67.67,0,0,0,.76-.5,1.12,1.12,0,0,0-.45-1.35,1.34,1.34,0,0,0-.24-.12l-.07,0c-.26.11-.53.21-.79.33a.46.46,0,0,0-.36.14.39.39,0,0,0-.05.3.65.65,0,0,0,0,.24A1,1,0,0,0,284.33,395.33Z" fill="#424854"/><path d="M285,340a.64.64,0,0,0,.2,0,1.27,1.27,0,0,0-.37.46,2.16,2.16,0,0,0-.1,1.5,1,1,0,0,1,0,.56.89.89,0,0,0,.6,1.37.49.49,0,0,0-.13.23.79.79,0,0,0,.66.77.8.8,0,0,0,1-.49.69.69,0,0,0-.55-.81h0a1.25,1.25,0,0,0,.21-.65,1.31,1.31,0,0,1,.31-.91,1.45,1.45,0,0,0,.19-1.38,1.23,1.23,0,0,0-1.09-.83h-.14a1.19,1.19,0,0,0,.56-.68c.1-.42-.23-.83-.83-1a1,1,0,0,0-1.16.45A1.29,1.29,0,0,0,285,340Z" fill="#424854"/><path d="M286.48,393.78a4.83,4.83,0,0,0,.56-.27,1,1,0,0,0,.58-1.13,1.45,1.45,0,0,0-.95-1.22,1,1,0,0,0-1.36.9,1.49,1.49,0,0,0,1.09,1.74Z" fill="#424854"/><path d="M287.54,373.3a.75.75,0,0,0-1,.18.73.73,0,0,0,.23,1,.69.69,0,0,0,.93-.29A.57.57,0,0,0,287.54,373.3Z" fill="#424854"/><path d="M286.83,356.82a1.24,1.24,0,0,0,.47-.74,1.86,1.86,0,0,0,.05-.27c.08-.62-.17-.92-.8-.92s-1,0-1.26.83a2.91,2.91,0,0,1-.35-.68.66.66,0,0,0-.67-.61,1,1,0,0,0-1,.45c-.66,1.27-.57,1.68.58,2.52l.07.08h0a1.57,1.57,0,0,0-.51-.21.42.42,0,0,0-.52.25h0a.34.34,0,0,0-.35.17c0,.13.14.31.26.39a.2.2,0,0,0,.14,0,.47.47,0,0,0,.41.25,1.35,1.35,0,0,0,.62-.3c.08.38.29.58.63.57a.66.66,0,0,0,.5-.25c.11.45.75.51,1.07.3s.26-.11.63.08,1,.22,1.13-.52A1.38,1.38,0,0,0,286.83,356.82Zm-1.63.86v0c-.15-.45.1-.67.32-1a2.37,2.37,0,0,0,.55.25A2,2,0,0,0,285.2,357.68Z" fill="#424854"/><path d="M277.2,334.59a1.08,1.08,0,0,0-.33-.73c-.21-.18-.7.12-.72.45a1.23,1.23,0,0,0,.19.55C276.83,335,277.21,334.88,277.2,334.59Z" fill="#424854"/><path d="M275.16,319.08a.84.84,0,0,0-1,.46c-.09.33.26.8.86,1,.11-.08.39-.17.48-.35A.84.84,0,0,0,275.16,319.08Z" fill="#424854"/><path d="M275.21,341.05c.1.5.53.35.74.47a1.24,1.24,0,0,0,1.25,0,1.63,1.63,0,0,0,1.3-.45c.11-.29-.44-.69-1-.62l0,0a1.26,1.26,0,0,0-.35-.46.78.78,0,0,0-1.09,0C275.78,340.24,275.11,340.55,275.21,341.05Z" fill="#424854"/><path d="M274.29,339.54c.36.22,1.13-.33,1.07-.63s-1-.6-1.21-.26A.7.7,0,0,0,274.29,339.54Z" fill="#424854"/><path d="M274.25,327.78c.1,0,.24,0,.28-.08s-.07-.14-.11-.23-.2.06-.24.12S274.23,327.78,274.25,327.78Z" fill="#424854"/><path d="M277.72,328.49a.85.85,0,0,0-.49-1.11,1.13,1.13,0,0,0-1.37.59,1.21,1.21,0,0,0,.7,1.34C276.93,329.43,277.55,329,277.72,328.49Z" fill="#424854"/><path d="M276.44,322c-.26-.15-.72.18-.7.49s.17.38.22.48c.47.1.83-.11.8-.41A.77.77,0,0,0,276.44,322Z" fill="#424854"/><path d="M277.24,320.42c-.33-.09-.69.11-.67.4s0,.74.39.77.62-.4.71-.62S277.52,320.49,277.24,320.42Z" fill="#424854"/><path d="M272.82,333.07c.14.06.55.13.68-.15s-.27-.51-.41-.55-.45,0-.53.2A.45.45,0,0,0,272.82,333.07Z" fill="#424854"/><path d="M270.52,321.56a.64.64,0,0,0-.82.5.6.6,0,0,0,.39.79c.43.11,1-.11,1.11-.41S270.86,321.67,270.52,321.56Z" fill="#424854"/><path d="M269.41,371.86a.39.39,0,0,0-.62.1.56.56,0,0,0,0,.81.74.74,0,0,0,.68.07.93.93,0,0,0,.59.88,5.36,5.36,0,0,0,.88.25c.05.13.1.28.16.41a1.39,1.39,0,0,0,1.32.8,1.6,1.6,0,0,0,1.19-1,.81.81,0,0,0,0-.61,1.27,1.27,0,0,0-1.67-.64l-.42.16a7.91,7.91,0,0,0-.29-.78.66.66,0,0,0-.95-.43,1.08,1.08,0,0,0-.56.38A1.05,1.05,0,0,0,269.41,371.86Z" fill="#424854"/><path d="M266.48,366.21a1.12,1.12,0,0,0,.82,1.08c.43,0,.82-.48.86-1.12a.81.81,0,0,0-.7-.72A1,1,0,0,0,266.48,366.21Z" fill="#424854"/><path d="M271.23,334.23c-.18.47-.14.84.5.92s.85-.84.64-1.06S271.36,333.9,271.23,334.23Z" fill="#424854"/><path d="M266.57,368.9a.7.7,0,0,0,.9-.08.67.67,0,0,0-.15-1,.54.54,0,0,0-.86.08A.68.68,0,0,0,266.57,368.9Z" fill="#424854"/><path d="M272.25,347.55a.58.58,0,0,0-.26.47c0,.11.31.41.51.37s.29-.51.24-.63A.53.53,0,0,0,272.25,347.55Z" fill="#424854"/><path d="M273,344a.73.73,0,0,0,.64.67.62.62,0,0,0,.66-.6.7.7,0,0,0-.64-.66C273.32,343.39,273,343.69,273,344Z" fill="#424854"/><path d="M270.25,381.14a1.28,1.28,0,0,0,2.52-.17c0-.5-.67-.9-1.38-1A1.24,1.24,0,0,0,270.25,381.14Z" fill="#424854"/><path d="M260.92,384c-.26-.24-1,.19-1.18.41a.77.77,0,0,0,0,.91c.25.24.76,0,1-.17S261.17,384.23,260.92,384Z" fill="#424854"/><path d="M261.78,382c.1-.23.23-.84,0-1s-.73.26-.9.44a.41.41,0,0,0,.18.67C261.35,382.26,261.66,382.31,261.78,382Z" fill="#424854"/><path d="M260.13,392.4a.81.81,0,0,0-.09-1.07.66.66,0,0,0-.9.07.69.69,0,0,0,0,1A.77.77,0,0,0,260.13,392.4Z" fill="#424854"/><path d="M261,385a.21.21,0,0,0,.29,0,.22.22,0,0,0-.07-.27c-.05,0-.21,0-.24.08A.21.21,0,0,0,261,385Z" fill="#424854"/><path d="M262.11,388.48a1.15,1.15,0,0,0-.09-1.43.79.79,0,0,0-1.07.09,1,1,0,0,0,.17,1.32A.68.68,0,0,0,262.11,388.48Z" fill="#424854"/><path d="M258.82,389.77a.86.86,0,0,0,.12-.43.38.38,0,0,0,.1.12c.25.19.53.33.81.06a.83.83,0,0,0-.14-1,.79.79,0,0,0-.67.25.7.7,0,0,0-.15.2,1.15,1.15,0,0,0-.46-.66,1.07,1.07,0,0,0-1.12,1.82A1.1,1.1,0,0,0,258.82,389.77Z" fill="#424854"/><path d="M257.77,381.74c.1-.13-.06-.47-.16-.54a.39.39,0,0,0-.47,0c-.11.13,0,.37.07.46S257.67,381.87,257.77,381.74Z" fill="#424854"/><path d="M259.62,376.17c.11-.2.23-.77.07-.88s-.67.1-.87.23-.17.52.12.77A.41.41,0,0,0,259.62,376.17Z" fill="#424854"/><path d="M257,394.25c-.21.18-.07.62.21.78s.57.16.7-.14.24-.86,0-1S257.21,394.09,257,394.25Z" fill="#424854"/><path d="M267.89,360.85a.81.81,0,0,0,.42.51c.52.16.78-.19,1-.71-.29-.33-.49-.72-1-.54A.61.61,0,0,0,267.89,360.85Z" fill="#424854"/><path d="M268.2,348.07a.53.53,0,0,0,.28.35.39.39,0,0,0,.45-.3c0-.28-.33-.28-.47-.3S268.18,348,268.2,348.07Z" fill="#424854"/><path d="M273.6,326.14c-.35-.15-.71.32-1,.45v.22a.65.65,0,0,0,.62.47.88.88,0,0,0,.59-.08C273.75,326.89,273.94,326.29,273.6,326.14Z" fill="#424854"/><path d="M263,384.06a.77.77,0,0,0,1-.15.81.81,0,0,0-.21-1.05.63.63,0,0,0-.88.16A.69.69,0,0,0,263,384.06Z" fill="#424854"/><path d="M268.37,331.43a.44.44,0,0,0-.35.25.49.49,0,0,0,.23.4c.11,0,.43,0,.49-.25S268.5,331.46,268.37,331.43Z" fill="#424854"/><path d="M262.54,368.57c-.12.1-.24.62-.1.73s.61,0,.67-.15.16-.51.05-.62S262.66,368.46,262.54,368.57Z" fill="#424854"/><path d="M262.09,394c-.11-.07-.45.07-.59.21a.35.35,0,0,0,.11.59c.21.07.76.23.91,0S262.27,394.1,262.09,394Z" fill="#424854"/><path d="M279.82,386.27a.25.25,0,0,0-.13-.12c-.6-.07-.61-.58-.78-1a.69.69,0,0,0-1.1-.36.57.57,0,0,0-.13.08.64.64,0,0,0-.19-.27,1.09,1.09,0,0,0-.34-.17.41.41,0,0,0-.29-.52c-.47-.11-.95-.38-1.48-.12l-.26.63-.17.07a1.15,1.15,0,0,0-.3-.72v0a1.32,1.32,0,0,0,1-.58,1.34,1.34,0,0,0-.43-1.69,1.13,1.13,0,0,0-1.48.24,1.76,1.76,0,0,0,.15,1.67.75.75,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.11-1.53.31-.77,1.18-.25,1.5a2.35,2.35,0,0,0,1.59.2c.44,0,.53-.6.9-.23a1.85,1.85,0,0,0,1.16.61.66.66,0,0,0,.52.4c.57.09.77-.05,1.05-.68l.49-.18,0,0a3.27,3.27,0,0,0,.42.51.72.72,0,0,0,.7.17,1,1,0,0,0,.38.61c.27.21.58.34.5.86-.12.06-.28.1-.4.16a.24.24,0,0,0,0-.17c0-.13-.1-.41-.34-.43s-.28.35-.25.41.13.32.34.31l.09,0,0,0a1.2,1.2,0,0,0-.18.83c.08.33.43.37.76.27l.76-.19A1.92,1.92,0,0,0,279.82,386.27Z" fill="#424854"/><path d="M263.84,390.37a1.26,1.26,0,0,0-1.79,1.72,1,1,0,0,0-.48,1.5,1.35,1.35,0,0,0,1.68-.14.72.72,0,0,0,0-.78.94.94,0,0,0,.7-.29A1.69,1.69,0,0,0,263.84,390.37Z" fill="#424854"/><path d="M274.33,392.83a.22.22,0,0,0,0-.28.26.26,0,0,0-.25.05.2.2,0,0,0,0,.24A.2.2,0,0,0,274.33,392.83Z" fill="#424854"/><path d="M272.69,393.5a.79.79,0,0,0,.28.6.65.65,0,0,0,.91-.14c.32-.39,0-.88-.2-1.07S272.77,393,272.69,393.5Z" fill="#424854"/><path d="M282.51,390.7a.61.61,0,0,0-.64.6.54.54,0,0,0,.6.53.49.49,0,0,0,.52-.51A.53.53,0,0,0,282.51,390.7Z" fill="#424854"/><path d="M311.13,396.91c-.19,0-.19.42-.14.52a.46.46,0,0,0,.41.23c.16,0,.21-.31.19-.44S311.32,396.86,311.13,396.91Z" fill="#424854"/><path d="M330,213.63H115.9a1.89,1.89,0,0,0-1,.3L71.72,242.47a1.81,1.81,0,0,0,1,3.33h41.74V375.71c0,7.37-.25,14.79,0,22.16v.31a1.84,1.84,0,0,0,1.81,1.82h172l-.7-3.63h-4a1.21,1.21,0,0,0,.15-1.18c-.23-.45-.94-.76-.94-1s.76-.66.66-1.33a1.15,1.15,0,0,0-1.28-.93c-.5,0-1.17.72-1.34,1.27a1,1,0,0,0-.59.33c-.06.29-.21.66,0,.92s.57,0,.63-.14A1.59,1.59,0,0,0,281,394c.19.18.43.28.45.37s-.69.68-.65,1.35a1.2,1.2,0,0,0,.32.66H279a.76.76,0,0,0-.25-.16,1.9,1.9,0,0,0-1,.09s-.06.05-.1.07h-3.15a.8.8,0,0,0-1.5-.53.62.62,0,0,0-.05.53h-.65a.73.73,0,0,0-.16-.14,6.64,6.64,0,0,0,.28-.86,1.39,1.39,0,0,0-.86-1.36.85.85,0,0,0-1,.29l-.06-.12c.89-1.1.84-1.58-.31-2.1a1,1,0,0,0-1.39.74,8.59,8.59,0,0,0,.16,1.72c-.49.39-1,.89-.87,1.63,0,.07.05.13.07.2h-3.34l0,0A1.5,1.5,0,0,0,265,396a1,1,0,0,0,.86-.41.74.74,0,0,0,.09-1.06,1.46,1.46,0,0,0-1.52-.07,1,1,0,0,0-.21.4,1.06,1.06,0,0,0-.9.31,1.28,1.28,0,0,0,0,1.19h-1.79a1.31,1.31,0,0,0-.3-1,1.19,1.19,0,0,0-1.34.14.93.93,0,0,0-.16.87h-3.82l-.08-.05,0,.05h-5.72a.63.63,0,0,0-.14-.46c-.17-.23-.92-.17-1,.1a.56.56,0,0,0,0,.36h-4.39a.34.34,0,0,0-.06-.21c-.18-.22-.43,0-.55.12s0,.05,0,.09h-6.82c.08-.23.14-.5,0-.58s-.68,0-.89.13a.36.36,0,0,0-.15.45h-12.6a.19.19,0,0,0-.16,0l0,0h-2.95c0-.07,0-.14,0-.2a.28.28,0,0,0-.23-.35.86.86,0,0,0-.78.55h-8.83a1.07,1.07,0,0,0-.59-.46,1,1,0,0,0-1.2.46h-3.64a.62.62,0,0,0-.67,0h-2.23a1.12,1.12,0,0,0,.33-.45c.1-.3-.12-.57-.47-.65a.43.43,0,0,0-.56.44,1.33,1.33,0,0,0,.09.66h-7.78a1.67,1.67,0,0,0-.28-.5.86.86,0,0,0-.38-.27.91.91,0,0,0,.33-.24c.17-.21-.13-.7-.46-.72a1.22,1.22,0,0,0-.54.2.86.86,0,0,0,0,.68,1.27,1.27,0,0,0-.62.23,1.06,1.06,0,0,0-.42.62h-.58a1.51,1.51,0,0,0,0-2,1.43,1.43,0,0,0-2-.25,1.21,1.21,0,0,0-.13,1.84,2.47,2.47,0,0,0,.4.44h-2.22a.72.72,0,0,0,0-.29c-.07-.53-.79-.52-1-.4s-.08.38,0,.69H118.09v-20.8a.29.29,0,0,0,0-.18V245.8h21a1.86,1.86,0,0,0,1-.28l42.8-27.2c0,9.28-.09,18.55-.07,27.83,0,13.3.76,26.53,1.35,39.81.12,2.85.28,6.31.28,8.89a.45.45,0,0,0,.89,0c0-7.74.67-16.36,1.07-24.35.69-13.77.69-27.59.58-41.38,0-4-.08-7.9-.09-11.86H328.21v62l3.63.14V215.45A1.81,1.81,0,0,0,330,213.63ZM138.61,242.17H78.76l37.69-24.91h61.36Z" fill="#424854"/><path d="M284.64,390.89a1.29,1.29,0,0,0,.33-.33.74.74,0,0,0,.36-.69,1.11,1.11,0,0,0-.07-.26,1.75,1.75,0,0,0-.33-1,2.57,2.57,0,0,0-1.08-.78c0-.05,0-.09,0-.14,0-.52-.39-.78-1-.73a.88.88,0,0,0-.61.28l-.24.08a.48.48,0,0,0-.18-.59.77.77,0,0,0-.65.15.41.41,0,0,0,.11.7l.08.05a.77.77,0,0,0-.31.94c.29.83.88.75,1.12.64s.77.09.55.3-.23.58.28,1.14A1.12,1.12,0,0,0,284.64,390.89Z" fill="#424854"/><path d="M279.63,391.14c-.2-.37-.53-.44-1-.42-1.08,0-1.43.39-1.36,1.36,0,.69.06,1.37.09,2a1.36,1.36,0,0,0-1.61.11c-.08-.18-.22-.37-.32-.57-.56.08-1,.17-1.06.76a.57.57,0,0,0,.47.67,1.2,1.2,0,0,0,.75-.14,1.14,1.14,0,0,0,.37.62,1.34,1.34,0,0,0,.23.13v0h0a.85.85,0,0,0,.83-.08,1.3,1.3,0,0,0,.18-.15l.07-.07s0,0,0,0a1.18,1.18,0,0,0,.2-.31s0,0,0,0,.06-.1.08-.16c1.86.07,2.4-.8,1.6-2.4a2,2,0,0,1,.23-.28A.74.74,0,0,0,279.63,391.14Z" fill="#424854"/><path d="M267,392.27c-.2.3-.46.62-.12,1a.82.82,0,0,0,.66.06.6.6,0,0,0,.29-.47C267.82,392.38,267.49,392.24,267,392.27Z" fill="#424854"/><path d="M267,394.35a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11c.13-.12.31-.58.16-.75S267.13,394.25,267,394.35Z" fill="#424854"/><path d="M275,389.45c.47.35.83.26,1.22-.29a.61.61,0,0,0,.07-.14c.34-.11.64-.41.58-.69s-.9-.59-1.31-.48a2.31,2.31,0,0,0-.37,0,.79.79,0,0,0-.57-.11.61.61,0,0,0-.13.85A1.35,1.35,0,0,0,275,389.45Z" fill="#424854"/><path d="M265.8,390.14c.1-.32.14-.67.22-1,.74-.41,1.1-1,.86-1.43a1.41,1.41,0,0,0-1.63-.43l-.07,0a.73.73,0,0,0-.16-.76.76.76,0,0,0-1,.08.81.81,0,0,0,.08,1,.62.62,0,0,0,.75.09,2.43,2.43,0,0,0,.35,1.22c-.39.24-.84.43-.58,1a.79.79,0,0,0,.49.46.61.61,0,0,0-.72.11.67.67,0,0,0,0,.9.69.69,0,0,0,1,0,.54.54,0,0,0,0-.86.94.94,0,0,0-.24-.18.7.7,0,0,0,.29,0C265.56,390.34,265.76,390.25,265.8,390.14Z" fill="#424854"/><path d="M275.43,390.63A2,2,0,0,0,275,392c.16.73.21.79,1,.77.2-.31.35-.56.52-.8a1.11,1.11,0,0,0-.18-1.39C276.16,390.36,275.56,390.36,275.43,390.63Z" fill="#424854"/><path d="M269.88,390a4.42,4.42,0,0,0,0,.63c0,.7.31,1.06.86,1.11a1.09,1.09,0,0,0,1.19-1,12,12,0,0,1,.44-2c.19-.52,0-1.26-.32-1.37a.8.8,0,0,0-.83.52.56.56,0,0,1-.24.44.69.69,0,0,0-1,.11.74.74,0,0,0,0,.88l0,0A1.58,1.58,0,0,0,269.88,390Z" fill="#424854"/><path d="M278.51,331.73a1.21,1.21,0,0,0,1.82,0c.72-.7-.13-1.31.48-1.57s.59.4,1.42,0,.95-1.41.38-1.74-1.05,0-1.16-.11-.44-.74-.9-.49c-1,.53-.28,1.29-.52,1.53s-.93.37-1.32.71A1.1,1.1,0,0,0,278.51,331.73Z" fill="#424854"/><path d="M285.75,375.94a1,1,0,0,0-.5-.17.86.86,0,0,0-.51-.29,1.3,1.3,0,0,0-1.53,1,4.43,4.43,0,0,0,.55.68,1.11,1.11,0,0,0,.48.22.7.7,0,0,0,.13.16,1.56,1.56,0,0,0,1.65-.24A1.08,1.08,0,0,0,285.75,375.94Z" fill="#424854"/><path d="M272.6,355.9a1.54,1.54,0,0,1-.17-.19.61.61,0,0,0-.81-.23.66.66,0,0,0-.45.62c-.12.73.09,1,.84,1.07.56.05,1.12.13,1.67.19,0,1,.05,1.12.93,1,.23-.49.05-.82-.42-1.07C274.51,356,273.93,355.54,272.6,355.9Z" fill="#424854"/><path d="M274.85,371.64a.87.87,0,0,0,.8-.92c0-.54-.45-1.23-.86-1.24a1.21,1.21,0,0,0-1.19,1A1.25,1.25,0,0,0,274.85,371.64Z" fill="#424854"/><path d="M282,336.42a.71.71,0,0,0,.91-.1.53.53,0,0,0,.2-.57.72.72,0,0,0,.76-.53,1.39,1.39,0,0,0-.85-1.46,1,1,0,0,0-1,.79,1.07,1.07,0,0,0,.06.7l-.2,0C281.75,335.72,281.52,336.13,282,336.42Z" fill="#424854"/><path d="M282.58,324.41c-.32-.24-1,.34-1.1,1a.68.68,0,0,0,.5.77c.46.17,1.09,0,1.23-.32C283.5,325.14,282.9,324.65,282.58,324.41Z" fill="#424854"/><path d="M273.36,379.56c.14,0,.48-.05.49-.25s-.3-.31-.38-.29-.36,0-.37.26A.25.25,0,0,0,273.36,379.56Z" fill="#424854"/><path d="M273.43,376.74c0-.21-.21-.32-.39-.45a.89.89,0,0,0-.53-.24c-.26,0-.31.35-.15.61a1.07,1.07,0,0,0,.71.44A.32.32,0,0,0,273.43,376.74Z" fill="#424854"/><path d="M287.29,348.87a1.19,1.19,0,0,0-1-1.09,1.26,1.26,0,0,0-1,1.11.85.85,0,0,0,.56.67c0,.29.12.55.4.54a2.27,2.27,0,0,0,.62-.19.78.78,0,0,0,0-.34A.69.69,0,0,0,287.29,348.87Z" fill="#424854"/><path d="M272.15,379.11c.46-.16.36-.55.28-.91-.38-.2-.74-.23-1,.16a.57.57,0,0,0,.07.55A.73.73,0,0,0,272.15,379.11Z" fill="#424854"/><path d="M282.22,369.39a.81.81,0,0,0-.22-1.05.64.64,0,0,0-.88.16.7.7,0,0,0,.12,1A.77.77,0,0,0,282.22,369.39Z" fill="#424854"/><path d="M280.76,367a1.26,1.26,0,0,0,1.29-1.16,2,2,0,0,0-1.47-1.47,1.27,1.27,0,0,0-1.13,1.32A1.51,1.51,0,0,0,280.76,367Z" fill="#424854"/><path d="M279.44,377.41a.78.78,0,0,0-.18-1c-.47-.28-.84,0-1.21.23a3.62,3.62,0,0,0,.05.4.46.46,0,0,0-.53.23c-.31.47,0,.73.11.81s.21.31.13.37a.65.65,0,0,0-.76.32c-.42.62-.41,1,0,1.36a1.17,1.17,0,0,0,1.09-.1,1.11,1.11,0,0,0,.91-.79c.16-.56-.14-.75,0-1.1a.53.53,0,0,0,0-.41A.72.72,0,0,0,279.44,377.41Z" fill="#424854"/><path d="M281,361.45h0a.79.79,0,0,0-.74.68c0,.32.46.85.73.84a.94.94,0,0,0,.7-.6,1.59,1.59,0,0,0,.43-.27c.15-.14.29-.94,0-1.15S281.15,361.2,281,361.45Z" fill="#424854"/><path d="M277.77,364.82a1.21,1.21,0,0,0,1.35-1.37,1.35,1.35,0,0,0-1.43-1.25,1.49,1.49,0,0,0-1.06,1,.27.27,0,0,0-.08-.1.32.32,0,0,0-.41.49.63.63,0,0,0,.4.12v0A1.1,1.1,0,0,0,277.77,364.82Z" fill="#424854"/><path d="M284,342.73c0-.25-.6-.46-.85-.51s-.53.31-.49.63h0l0,0a.74.74,0,0,0-.9.42.81.81,0,0,0,.45,1,.69.69,0,0,0,.84-.49,1,1,0,0,0,0-.41.33.33,0,0,0,.17,0C283.4,343.25,284,343,284,342.73Z" fill="#424854"/><path d="M276.7,358.54c.43,0,.5-.58.58-.83s-.21-.54-.57-.54-.62.19-.53.54S276.28,358.54,276.7,358.54Z" fill="#424854"/><path d="M280.52,360.1a1,1,0,0,0-.91-1,1.18,1.18,0,0,0-1.13,1c0,.37.86.93,1.33.88A1,1,0,0,0,280.52,360.1Z" fill="#424854"/><path d="M282.24,372c-.17-.47.05-.93-.29-1.29a2.09,2.09,0,0,0-2.47-.48,1.68,1.68,0,0,0-1,1.25c-.09.58.59.9.74,1.5.34,1.41,1.43,1.34,2.33.94a1.46,1.46,0,0,0,.69-.65h0a.69.69,0,0,0,.19.35,1.46,1.46,0,0,0,1.19.33,1.49,1.49,0,0,0,1,.8,1.24,1.24,0,0,0,1.35-.93,1.14,1.14,0,0,0-.88-1.54,1.69,1.69,0,0,0-1.19.25.91.91,0,0,0-.23-.28,1.19,1.19,0,0,0-1.29.28A2.59,2.59,0,0,0,282.24,372Z" fill="#424854"/><path d="M283.56,380.1a1.26,1.26,0,0,0,.32,1.63,1.27,1.27,0,0,0,1.5-2A1.23,1.23,0,0,0,283.56,380.1Z" fill="#424854"/><path d="M281.29,354c-.38,0-1.15.72-1.15,1a1,1,0,0,0,1.13.91c.49,0,.75-.4.73-1.07S281.69,354,281.29,354Z" fill="#424854"/><path d="M282.89,378.39c0-.19,0-.31-.25-.33s-.31.05-.33.25a.25.25,0,0,0,.26.33C282.76,378.65,282.86,378.59,282.89,378.39Z" fill="#424854"/><path d="M283.09,385.07a1.08,1.08,0,0,0,1,.2,1.33,1.33,0,0,0,.65.13c.55,0,.81-.44.75-1.12a.74.74,0,0,0-.19-.4,1.16,1.16,0,0,0-.44-1.27,1.47,1.47,0,0,0-2.09.43A1.43,1.43,0,0,0,283.09,385.07Z" fill="#424854"/><path d="M280.78,376c-.33.5-.31.94,0,1.16a.75.75,0,0,0,1.1-.2.64.64,0,0,0-.28-.91C281.3,375.88,281,375.71,280.78,376Z" fill="#424854"/><path d="M282.37,380.15c.22-.27,0-.95-.35-1.18a.59.59,0,0,0-.85.25c-.36.52-.41.93-.13,1.15A1.12,1.12,0,0,0,282.37,380.15Z" fill="#424854"/><path d="M282.35,374.72a2,2,0,0,0-.64-.35c-.32-.06-.5.19-.49.5s.07.55.43.58A.73.73,0,0,0,282.35,374.72Z" fill="#424854"/><path d="M286.69,360.41a.72.72,0,0,0-.68.8.87.87,0,0,0,.81.72c.29,0,.75-.64.72-1S287,360.39,286.69,360.41Z" fill="#424854"/><path d="M280.63,323.18a.87.87,0,0,0-.47-.91c-.65-.2-1.28,0-1.4.45a1.22,1.22,0,0,0,.76,1.22A1.14,1.14,0,0,0,280.63,323.18Z" fill="#424854"/><path d="M285.21,361.89a1,1,0,1,0,.14,1.95l.07,0a.75.75,0,0,0,.23.36.61.61,0,0,0,.88-.11.76.76,0,0,0-.1-1.06.65.65,0,0,0-.39-.09,2.11,2.11,0,0,0,0-.36A.9.9,0,0,0,285.21,361.89Z" fill="#424854"/><path d="M285.46,387.69a1.49,1.49,0,0,1,.86.42A.69.69,0,0,0,287,388a.82.82,0,0,0,.18-.65c0-.13-.29-.3-.46-.33a6.39,6.39,0,0,0-1.07,0c-.31,0-.42.2-.4.53C285.28,387.55,285.37,387.69,285.46,387.69Z" fill="#424854"/><path d="M283.14,367.83c-.45.21-.45,1-.16,1.68a1,1,0,0,0,.57.45.59.59,0,0,0,.23.45,1.34,1.34,0,0,0,1.65-.32.84.84,0,0,0-.33-1.1s-.09,0-.14-.07a1.08,1.08,0,0,0-.29-.76A1.27,1.27,0,0,0,283.14,367.83Z" fill="#424854"/><path d="M287.28,367.81a.53.53,0,0,0-.06-.86.66.66,0,0,0-1,0,.67.67,0,0,0,.05.9A.7.7,0,0,0,287.28,367.81Z" fill="#424854"/><path d="M287.44,382.32a.95.95,0,1,0-1.88.2.8.8,0,0,0,.76.64C287,383.1,287.47,382.77,287.44,382.32Z" fill="#424854"/><path d="M286.73,377.94c-.39,0-1.11.72-1.09,1.07a.89.89,0,0,0,1,.82c.6,0,.83-.25.82-.93S287.17,377.92,286.73,377.94Z" fill="#424854"/><path d="M274.73,373.64a.46.46,0,0,0-.15-.75c-.22-.07-.47-.16-.64,0s-.11.8.19,1S274.58,373.84,274.73,373.64Z" fill="#424854"/><path d="M190.68,330.55a.67.67,0,0,0-.82.52.69.69,0,0,0,.47.77.67.67,0,0,0,.8-.56A.53.53,0,0,0,190.68,330.55Z" fill="#424854"/><path d="M189.58,344a.66.66,0,0,0,.06.63,1,1,0,0,0,.79.25c.52-.14.35-.6.35-1C190.28,343.64,189.85,343.54,189.58,344Z" fill="#424854"/><path d="M189.59,339.44c-.2-.1-.76.26-.78.6s.2.41.44.45.65-.14.61-.46S189.79,339.53,189.59,339.44Z" fill="#424854"/><path d="M184.51,348.85l-.14-.81A1.08,1.08,0,0,0,184.51,348.85Z" fill="#424854"/><path d="M186.69,354.72c-.64.2-.61,1-.79,1.12s-1-.58-1.83-.3l.79,3.58a.62.62,0,0,0,.51.47.8.8,0,0,0,.82-.57.57.57,0,0,0-.24-.56c.26-.47.38-1,.56-1.1s1.05.68,1.81.33a1.44,1.44,0,0,0,.68-1.85A2.4,2.4,0,0,0,186.69,354.72Z" fill="#424854"/><path d="M195.18,335.54c-.07,0-.19,0-.21.13a.2.2,0,0,0,.17.24c.13,0,.2-.12.21-.18S195.23,335.55,195.18,335.54Z" fill="#424854"/><path d="M193.92,351.65a.69.69,0,0,0,.67.71.58.58,0,0,0,.68-.55.77.77,0,0,0-.6-.79A.72.72,0,0,0,193.92,351.65Z" fill="#424854"/><path d="M191.3,350.13a1.15,1.15,0,0,0-1.28.75,1.56,1.56,0,0,0,1,1.37,1.07,1.07,0,0,0,1.12-.87A1.15,1.15,0,0,0,191.3,350.13Z" fill="#424854"/><path d="M187.41,334.83a.74.74,0,0,0,.47.78c.25,0,.54-.29.59-.68a.38.38,0,0,0-.36-.5C187.79,334.4,187.49,334.46,187.41,334.83Z" fill="#424854"/><path d="M194.47,356a.91.91,0,0,0,.85,1.07,1.11,1.11,0,0,0,1.24-.69,1.34,1.34,0,0,0-.93-1.2A.91.91,0,0,0,194.47,356Z" fill="#424854"/><path d="M186.79,338.32a.55.55,0,0,0,.44.74.6.6,0,0,0,.7-.43c.1-.27-.36-.86-.63-.8A.78.78,0,0,0,186.79,338.32Z" fill="#424854"/><path d="M188.36,327.32c-.14-.06-.66.05-.7.24s.31.53.43.53.53-.09.58-.24S188.51,327.38,188.36,327.32Z" fill="#424854"/><path d="M185.74,353.57a1.48,1.48,0,0,0-1.32-1.68Z" fill="#424854"/><path d="M184.08,346.39l.29,1.65a1.35,1.35,0,0,1,.18-.47A1.1,1.1,0,0,0,184.08,346.39Z" fill="#424854"/><path d="M185.67,344.86c-.73-.1-1.11.1-1.19.63a1.13,1.13,0,0,0,.83,1c.36,0,.94-.52,1-.94A.64.64,0,0,0,185.67,344.86Z" fill="#424854"/><path d="M188,344.81c-.7.41-.89.67-.74,1.09a.69.69,0,0,0,.69.49.77.77,0,0,0,.79-.6C188.82,345.25,188.4,345,188,344.81Z" fill="#424854"/><path d="M188.56,352.73a1.24,1.24,0,0,0-1.15-1.46,1.26,1.26,0,0,0-1.32,1c-.15.7.23,1.18,1,1.33S188.43,353.46,188.56,352.73Z" fill="#424854"/><path d="M197.35,374.3c0,.27.21.35.44.39a.56.56,0,0,0,.29,0,.36.36,0,0,0,.28,0c.22-.16-.05-.77-.19-1a.41.41,0,0,0-.69,0C197.3,373.86,197.19,374.1,197.35,374.3Z" fill="#424854"/><path d="M198.71,364.16a.67.67,0,0,0-.64-.73.69.69,0,0,0-.84.6.84.84,0,0,0,.73.79A.75.75,0,0,0,198.71,364.16Z" fill="#424854"/><path d="M197,350.06c-.54-.1-.95.24-1.06.88-.08.48.25.84.88.94s.87-.13,1-.5A1.46,1.46,0,0,0,197,350.06Z" fill="#424854"/><path d="M194.24,370a.63.63,0,0,0-.5-.82.75.75,0,0,0-.9.56.7.7,0,0,0,.64.74A.65.65,0,0,0,194.24,370Z" fill="#424854"/><path d="M197.25,359.66a.65.65,0,0,0,.48-.67c-.08-.37-.95-.51-1.09-.25S196.88,359.73,197.25,359.66Z" fill="#424854"/><path d="M195.49,385.23c.48.17,1-.41,1.31-1.07a1.26,1.26,0,0,0-.8-1.4,1.29,1.29,0,0,0-1.35,1.16A1.28,1.28,0,0,0,195.49,385.23Z" fill="#424854"/><path d="M194.39,381.59a.54.54,0,0,0,.67-.32c.21-.49-.06-.79-.43-1.11-.43.17-.89.22-.86.75A.71.71,0,0,0,194.39,381.59Z" fill="#424854"/><path d="M201,366.19a.45.45,0,0,0-.28-.65c-.32-.1-.79.1-.77.39s.1.83.44.87S201,366.39,201,366.19Z" fill="#424854"/><path d="M199.78,365.24c.07,0,.24-.3.13-.46s-.43,0-.54.06a.36.36,0,0,0-.06.39C199.39,365.33,199.65,365.3,199.78,365.24Z" fill="#424854"/><path d="M197.81,352.53a.67.67,0,0,0,.43.45c.17,0,.65-.05.72-.26s-.33-.54-.5-.63A.5.5,0,0,0,197.81,352.53Z" fill="#424854"/><path d="M197.27,346.56c-.51-.07-1.05.22-1.1.59a1.36,1.36,0,0,0,1,1.34c.36.07.78-.32.84-.78A.92.92,0,0,0,197.27,346.56Z" fill="#424854"/><path d="M199.06,337.8c.2,0,.39-.24.41-.36a.44.44,0,0,0-.25-.37.42.42,0,0,0-.37.22C198.82,337.41,198.85,337.78,199.06,337.8Z" fill="#424854"/><path d="M196.7,343.93a.69.69,0,0,0-.88.56.77.77,0,0,0,.57.81.81.81,0,0,0,.85-.66A.63.63,0,0,0,196.7,343.93Z" fill="#424854"/><path d="M198.27,342.8c0,.31,0,.61.39.7s.82-.43.77-.66-.34-.35-.58-.42A.41.41,0,0,0,198.27,342.8Z" fill="#424854"/><path d="M200.69,362.22a.67.67,0,0,0-.81.52.81.81,0,0,0,.52.86.67.67,0,0,0,.79-.55A.65.65,0,0,0,200.69,362.22Z" fill="#424854"/><path d="M184.71,342.58a2.16,2.16,0,0,1-.62,0l1,1.23a.61.61,0,0,0,.38-.82A.65.65,0,0,0,184.71,342.58Z" fill="#424854"/><path d="M204.77,395.15a.85.85,0,0,0,.56-.33c.15-.26-.19-.72-.5-.7a1.09,1.09,0,0,0-.47.23C204.26,394.82,204.47,395.17,204.77,395.15Z" fill="#424854"/><path d="M205.67,388.89a.65.65,0,0,0-.51-.82.59.59,0,0,0-.78.41c-.12.42.11,1,.42,1.1S205.56,389.23,205.67,388.89Z" fill="#424854"/><path d="M207,363.34c.06-.26-.57-.57-.67-.53-.28.11-.68.19-.77.52s.32.47.46.46S206.9,363.59,207,363.34Z" fill="#424854"/><path d="M202.8,389.12c.13-.19.29-.41.2-.61s-.74-.32-1-.08-.12.44,0,.64A.45.45,0,0,0,202.8,389.12Z" fill="#424854"/><path d="M202.52,380.72a.54.54,0,0,0-.12.44.39.39,0,0,0,.51.18c.24-.14,0-.43,0-.56S202.55,380.67,202.52,380.72Z" fill="#424854"/><path d="M204.21,393.25a1.26,1.26,0,0,0,.24-1.43c-.23-.28-1-.2-1.43.14A.81.81,0,0,0,203,393,1,1,0,0,0,204.21,393.25Z" fill="#424854"/><path d="M206.48,388.54a.45.45,0,0,0,.49,0c.1-.1.31-.32.19-.44a.46.46,0,0,0-.48-.08C206.58,388.07,206.36,388.42,206.48,388.54Z" fill="#424854"/><path d="M285.88,352.16a.72.72,0,0,0-.54,0,.64.64,0,0,0-.41-.28c-.32-.06-.43.16-.5.39s.07.66.39.65h0a.91.91,0,0,0,.89.63.57.57,0,0,0,.58-.57A.73.73,0,0,0,285.88,352.16Z" fill="#424854"/><path d="M206.32,396c.3.12.48-.16.55-.44s-.12-.69-.41-.66-.74,0-.77.39S206.1,396,206.32,396Z" fill="#424854"/><path d="M210.43,388c.09-.07,0-.43,0-.55s-.32-.12-.36-.07a.58.58,0,0,0-.11.44C210,387.87,210.33,388,210.43,388Z" fill="#424854"/><path d="M203.19,375.66a.34.34,0,0,0,.21.33c.13,0,.3-.17.36-.3s0-.39-.22-.43S203.22,375.53,203.19,375.66Z" fill="#424854"/><path d="M210,379.26a.63.63,0,0,0,.13-.61c-.07-.13-.54-.39-.69-.28s-.12.6,0,.68S209.9,379.34,210,379.26Z" fill="#424854"/><path d="M207.09,393.88a.75.75,0,1,0,.63-1.34c-.33-.1-.8.26-1,.86C206.81,393.51,206.9,393.79,207.09,393.88Z" fill="#424854"/><path d="M207.51,355.88a.76.76,0,0,0,.64,0,.66.66,0,0,0,0-1,.62.62,0,0,0-.83.44A.6.6,0,0,0,207.51,355.88Z" fill="#424854"/><path d="M208.39,389.48c-.29-.35-.64-.45-.85-.23a1.11,1.11,0,0,0-.15,1.19.71.71,0,0,0,1,0A.65.65,0,0,0,208.39,389.48Z" fill="#424854"/><path d="M203.47,373.4a.43.43,0,0,0,.14.42c.16.16.68.43.82.3s.09-.67,0-.89a.33.33,0,0,0-.35-.23.82.82,0,0,0-.14-.72c-.27-.32-.14-.25,0-.65a.72.72,0,0,0-.65-1.06,1.41,1.41,0,0,0-1.3,1.34A1.67,1.67,0,0,0,203.47,373.4Z" fill="#424854"/><path d="M199.93,386.73c.15-.13.33-.23.37-.45s-.25-.39-.54-.3a1.12,1.12,0,0,0-.62.57.32.32,0,0,0,.26.44A.67.67,0,0,0,199.93,386.73Z" fill="#424854"/><path d="M201.19,382.19a1.44,1.44,0,0,0-1.31-.4,1.48,1.48,0,0,0-.7-.5,1.32,1.32,0,0,0-1.42,1.14,1.5,1.5,0,0,0,1.06,1.5,2,2,0,0,0,.54,0,1.12,1.12,0,0,0,1.58.16A1.42,1.42,0,0,0,201.19,382.19Z" fill="#424854"/><path d="M185.41,386.44a.69.69,0,0,0,.87-.23c.18-.38-.45-1.09-.75-1l-.05,0h0a2,2,0,0,0-1.21-.73l1,1.65A.37.37,0,0,0,185.41,386.44Z" fill="#424854"/><path d="M202.3,386.8c.25-.14.3-.89.06-1a.78.78,0,0,0-.7,0,.55.55,0,0,0-.17.85A.62.62,0,0,0,202.3,386.8Z" fill="#424854"/><path d="M193.63,376.39a.68.68,0,0,0-.5-.9,1.43,1.43,0,0,0-1.27.66,1,1,0,0,0,.82,1.11C193.1,377.36,193.5,377,193.63,376.39Z" fill="#424854"/><path d="M184.28,372.38l-.27,1.47A1.17,1.17,0,0,0,184.28,372.38Z" fill="#424854"/><path d="M184.57,384a.49.49,0,0,0,.07-.55c-.13-.14-.46,0-.52.11a.46.46,0,0,0,0,.48C184.19,384.15,184.47,384.08,184.57,384Z" fill="#424854"/><path d="M203.27,359.42c-.4-.09-.9.39-1,.92a.91.91,0,0,0,.85,1.08c.59.08,1.08-.21,1.12-.66A1.34,1.34,0,0,0,203.27,359.42Z" fill="#424854"/><path d="M205.45,367.32c0-.18-.27-.34-.4-.4s-.29.06-.31.2a.5.5,0,0,0,.21.4C205,367.56,205.41,367.49,205.45,367.32Z" fill="#424854"/><path d="M202.92,340.63a.78.78,0,0,0-.75.52c-.07.34.41.65.69.76s1-.16,1-.51S203.21,340.68,202.92,340.63Z" fill="#424854"/><path d="M203.94,357.29c0-.07-.12-.18-.18-.19s-.19,0-.21.13a.21.21,0,0,0,.17.24C203.85,357.48,203.92,357.35,203.94,357.29Z" fill="#424854"/><path d="M203.38,345.44a.81.81,0,0,0-.79.61.61.61,0,0,0,.49.74.69.69,0,1,0,.3-1.35Z" fill="#424854"/><path d="M204.44,383.62a.74.74,0,0,0-.16.9c.15.19.59.13.89-.12a.38.38,0,0,0,.06-.62A.55.55,0,0,0,204.44,383.62Z" fill="#424854"/><path d="M205,351.47a.72.72,0,0,0-.77.6.69.69,0,0,0,.57.87.74.74,0,0,0,.83-.64A.7.7,0,0,0,205,351.47Z" fill="#424854"/><path d="M185.5,339.72a1.06,1.06,0,0,0-.09.83.32.32,0,0,0,.49.16.69.69,0,0,0,.22-.55c0-.2.1-.39,0-.58S185.65,339.46,185.5,339.72Z" fill="#424854"/><path d="M186,349.14a1.16,1.16,0,0,0,.79,1.1c.34.07.86-.41.9-.85s-.18-.59-.6-.65C186.5,348.65,186.11,348.79,186,349.14Z" fill="#424854"/><path d="M194.34,392c.28.12.51-.28.54-.42s0-.44-.21-.52a.42.42,0,0,0-.49.26C194.12,391.44,194.05,391.85,194.34,392Z" fill="#424854"/><path d="M196.45,390.9a.65.65,0,0,0,0-1c-.48-.56-.9-.66-1.31-.32a1.14,1.14,0,0,0-.07,1.33A1.26,1.26,0,0,0,196.45,390.9Z" fill="#424854"/><path d="M191.91,392.33c.35.25.94.18,1-.2a1.18,1.18,0,0,1,.89-.93,1.07,1.07,0,0,0,.43-1.18,1.42,1.42,0,0,0-1.38-.5l-.33.13c-.23,0-.41.18-.45.58a.5.5,0,0,0,.1.38,2.18,2.18,0,0,1-.43.86A.54.54,0,0,0,191.91,392.33Z" fill="#424854"/><path d="M195,394.69a.6.6,0,0,0,0-.89c-.41-.49-.79-.64-1.07-.44a1.14,1.14,0,0,0-.15,1.35A1,1,0,0,0,195,394.69Z" fill="#424854"/><path d="M198.8,396.16a.86.86,0,0,0,1.11-.5,1.14,1.14,0,0,0-.6-1.37,1.26,1.26,0,0,0-1.09.34.31.31,0,0,0,0-.35c-.39-.45-.82-.54-1.11-.31a.74.74,0,0,0-.1,1.11.64.64,0,0,0,1,0L198,395s0,0,0,0C197.85,395.38,198.3,396,198.8,396.16Z" fill="#424854"/><path d="M209.74,382.61a.67.67,0,0,0-1-.16.7.7,0,0,0-.17.89.69.69,0,0,0,1,.12A.54.54,0,0,0,209.74,382.61Z" fill="#424854"/><path d="M209.52,389.29a.2.2,0,0,0,0,.29c.09.1.23,0,.29,0s0-.21,0-.25S209.59,389.23,209.52,389.29Z" fill="#424854"/><path d="M201.12,392c.14-.34-.33-.7-.46-1h-.22a.63.63,0,0,0-.46.62.7.7,0,0,0,0,.25h0c-.17.06-.4.36-.37.51a1.6,1.6,0,0,0,0,.21.34.34,0,0,0-.15.07c0,.1,0,.24.09.28s.13,0,.19-.09a.78.78,0,0,0,.24.24c.48.25.67-.21,1-.54a2.33,2.33,0,0,0-.22-.35C200.91,392.2,201.06,392.16,201.12,392Z" fill="#424854"/><path d="M197.56,388.45a.64.64,0,0,0-.3-.86,2.23,2.23,0,0,1-.48-.38,1,1,0,0,0-1-.39c0-.11-.15-.32-.25-.33a.47.47,0,0,0-.39.23.49.49,0,0,0,0,.13.77.77,0,0,0-.44,0,.94.94,0,0,0-.18-.82,1.74,1.74,0,0,0-1.65-.3.74.74,0,0,0,.05-.54c-.14-.38.8-.45.63-1s.38-.93.11-1.56-.93-1.05-1.37-.63a1.91,1.91,0,0,0-.55,1.08,1.22,1.22,0,0,0-1.26,1.05,1.1,1.1,0,0,0,.35,1,.78.78,0,0,0,.09.91,1.16,1.16,0,0,0,1.39.24h0a1.3,1.3,0,0,0,.28,1.15,1.34,1.34,0,0,0,1.75,0c0-.05.08-.12.13-.18v0a.57.57,0,0,0,.49.2.32.32,0,0,0,.14-.11,1.14,1.14,0,0,0,.31.7,10.77,10.77,0,0,0,1.31.69A.62.62,0,0,0,197.56,388.45Z" fill="#424854"/><path d="M211.34,393.08c-.11.07-.34.37-.19.51a.47.47,0,0,0,.54,0,.46.46,0,0,0,.07-.44A.43.43,0,0,0,211.34,393.08Z" fill="#424854"/><path d="M192.6,342.83a1,1,0,0,0,1.05-.66,1.22,1.22,0,0,0-.77-1.23c-.35-.06-.88.52-1,1.06A.8.8,0,0,0,192.6,342.83Z" fill="#424854"/><path d="M192.57,336.81c0-.15,0-.45-.16-.46a.45.45,0,0,0-.4.26c0,.12,0,.52.2.53S192.56,336.91,192.57,336.81Z" fill="#424854"/><path d="M184.75,334.16c.09-.27-.27-.34-.4-.4s-.32.14-.31.2a.51.51,0,0,0,.21.4A.38.38,0,0,0,184.75,334.16Z" fill="#424854"/><path d="M187.56,392.43a.73.73,0,0,0,0-.66.4.4,0,0,0-.7-.09l-.07.07a.77.77,0,0,0-.82-.55c-.89.06-1,.65-.92.91s-.29.72-.43.45l.28,2.38c.86-.33.81-.86,1.38-1s.67-.53.65-1.17c0-.09,0-.19,0-.29C187.16,392.58,187.44,392.6,187.56,392.43Z" fill="#424854"/><path d="M191.21,388.19l0,0-.62-.8a4.43,4.43,0,0,0-.61.27.74.74,0,0,0-.34.63,1,1,0,0,0-.69.2c-.27.21-.48.48-1,.26,0-.2,0-.48-.11-.61a1.34,1.34,0,0,0-.75-.39c-.35,0-.48.32-.47.66,0,.09,0,.19,0,.28a.68.68,0,0,0-.32.52.67.67,0,0,0,.27.55.43.43,0,0,0,.31,0c.4.5,1.16.94,1.59.8,0,0,.13-.05.15-.1.23-.55.72-.43,1.16-.48a.7.7,0,0,0,.64-1,.88.88,0,0,0-.05-.15.56.56,0,0,0,.32-.11A2.72,2.72,0,0,0,191.21,388.19Z" fill="#424854"/><path d="M187.72,392.83c-.21.36.34,1.12.64,1.06s.59-1,.25-1.21A.7.7,0,0,0,187.72,392.83Z" fill="#424854"/><path d="M185.1,337.51a1.42,1.42,0,0,0-1.07-1.57Z" fill="#424854"/><path d="M251.52,394.94a.81.81,0,0,0,.08,1c.26.19.45.05.62-.13a.46.46,0,0,0-.06-.76C252,394.94,251.7,394.83,251.52,394.94Z" fill="#424854"/><path d="M255.26,386.1a.47.47,0,0,0-.07-.54.45.45,0,0,0-.45,0,.4.4,0,0,0,0,.42C254.81,386.09,255.14,386.27,255.26,386.1Z" fill="#424854"/><path d="M252.6,389.33a.66.66,0,0,0-1,.14c-.26.3-.31.61-.15.8-.33.06-.51.33-.68.67-.13-.07-.28-.13-.35,0a.46.46,0,0,0,0,.48c.08.1.45.26.55.12a.28.28,0,0,0,0-.18c.17.22.36.39.69.27a.69.69,0,0,0,.49-.77.59.59,0,0,0-.1-.33.89.89,0,0,0,.62-.19A.71.71,0,0,0,252.6,389.33Z" fill="#424854"/><path d="M253.38,393.43a.58.58,0,0,0,0,.45c0,.05.33.07.37,0s.25-.35.09-.52S253.4,393.37,253.38,393.43Z" fill="#424854"/><path d="M213.08,392.43c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,213.08,392.43Z" fill="#424854"/><path d="M286.06,346.89c.27,0,.4-.63.38-.83s-.33-.32-.52-.34-.5.15-.4.45S285.8,346.91,286.06,346.89Z" fill="#424854"/><path d="M287.75,328.74c-.29-.1-.58.15-.77.33s0,.59.32.69.63,0,.67-.31S288,328.83,287.75,328.74Z" fill="#424854"/><path d="M254.93,394.39a.82.82,0,0,0,1.07-.13,1,1,0,0,0,0-1.25,1.25,1.25,0,0,0-1.45,0C254.33,393.26,254.53,394,254.93,394.39Z" fill="#424854"/><path d="M192.61,380.67c.47-.38.57-.73.29-1.07l0,0a1,1,0,0,0,.06-.14.65.65,0,0,0-.37-.83.86.86,0,0,0-.65.05c-.23.14-.29.34-.21.66,0,0,0,0-.07,0a1.51,1.51,0,0,0,0,1.36C191.8,381,192.18,381,192.61,380.67Z" fill="#424854"/><path d="M213.13,390.49c-.16-.05-.42.22-.45.34s0,.38.19.43.36-.11.41-.23S213.29,390.54,213.13,390.49Z" fill="#424854"/><path d="M244.63,389.22a.67.67,0,0,0,0,1,.7.7,0,0,0,.91,0,.69.69,0,0,0,0-1A.54.54,0,0,0,244.63,389.22Z" fill="#424854"/><path d="M249.27,387.81a.44.44,0,0,0,0,.37.52.52,0,0,0,.45,0c.09-.05.19-.45.11-.53S249.39,387.73,249.27,387.81Z" fill="#424854"/><path d="M252.47,382.59c.08-.11,0-.34-.11-.46s-.36-.15-.48,0,.1.41.2.51A.38.38,0,0,0,252.47,382.59Z" fill="#424854"/><path d="M246.5,393.48c-.19.25-.3.53,0,.81a.75.75,0,0,0,.92,0c.17-.19,0-.61-.26-.87A.38.38,0,0,0,246.5,393.48Z" fill="#424854"/><path d="M251.56,388.37a.22.22,0,0,0,0-.28c-.05,0-.22,0-.25.05a.2.2,0,0,0,0,.24A.19.19,0,0,0,251.56,388.37Z" fill="#424854"/><path d="M240.66,389.41c-.12.09-.31.59-.17.73s.61,0,.68-.08.21-.49.11-.62S240.8,389.32,240.66,389.41Z" fill="#424854"/><path d="M195.86,360.48c-.32-.29-.66-.38-1,0a.54.54,0,0,0-.06.53.91.91,0,0,0,.66.31C195.91,361.19,195.88,360.81,195.86,360.48Z" fill="#424854"/><path d="M195.43,373.18a2.08,2.08,0,0,0-.26-.6.69.69,0,0,0-.79.61c0,.33.2.4.45.45S195.47,373.49,195.43,373.18Z" fill="#424854"/><path d="M194,365.47a1.35,1.35,0,0,0-1.33.47,1,1,0,0,0-.52-.64,1.33,1.33,0,0,0-1.85.23,1.54,1.54,0,0,0,.06,1.38.62.62,0,0,0-.65.51.73.73,0,0,0,.59.78.89.89,0,0,0,.28,0,1.08,1.08,0,0,0,.14,1.17h0a.8.8,0,0,0-.93.75.87.87,0,0,0,.84,1.13c.56.09,1.11-.19,1.16-.6a.65.65,0,1,1,.48-1.19.94.94,0,0,0,0-1.45,1,1,0,0,0-1.14-.32v0a.68.68,0,0,0,0-.14,1.26,1.26,0,0,0,1.26-.48l.06-.07a1.16,1.16,0,0,0,1,.81,1.74,1.74,0,0,0,.6,0,.58.58,0,0,0,0,.5.9.9,0,0,0,1.26.27,1.15,1.15,0,0,0,.49-1.15.9.9,0,0,0-.91-.63A1.27,1.27,0,0,0,194,365.47Z" fill="#424854"/><path d="M195.18,378.39a.71.71,0,0,0,0,.65c.1.13.61.28.75.15s0-.71-.05-.76S195.28,378.24,195.18,378.39Z" fill="#424854"/><path d="M189.5,359.35a1,1,0,0,0,1.17.47c.18,0,.35-.08.54-.12.3.33.58.72,1,.82,0,.1,0,.21,0,.32a1.25,1.25,0,0,0,1.29,1,1.29,1.29,0,0,0,.78-1.6,1.38,1.38,0,0,0-.7-.77c0-.06,0-.12,0-.18.16-.71-.27-1.07-.84-1.34.13-.37.45-.74,0-1.07a.65.65,0,0,0-.84,0c-.43.37-.16.75.07,1.12l-.51.53-.71-.64a4.86,4.86,0,0,0-.71.25A1.45,1.45,0,0,0,189.5,359.35Z" fill="#424854"/><path d="M192.06,354.72a.61.61,0,0,0-.52-.73.94.94,0,0,0-1.1.59.77.77,0,0,0,.53.93A1.11,1.11,0,0,0,192.06,354.72Z" fill="#424854"/><path d="M193.33,348.78a1.29,1.29,0,0,0,1.18-.94,1.18,1.18,0,0,0-.84-1,.88.88,0,0,0-.93.56C192.6,348.08,192.86,348.7,193.33,348.78Z" fill="#424854"/><path d="M189.85,347c-.59-.07-1,.14-1,.51a.75.75,0,0,0,.66.9.65.65,0,0,0,.69-.67C190.18,347.37,190.19,347,189.85,347Z" fill="#424854"/><path d="M184.4,359.54v1.84a1,1,0,0,0,.68-1A.78.78,0,0,0,184.4,359.54Z" fill="#424854"/><path d="M191.36,372a.67.67,0,0,0-.28.94,1.15,1.15,0,0,0,1.4.3.79.79,0,0,0,.19-1.06A1,1,0,0,0,191.36,372Z" fill="#424854"/><path d="M184.77,367.71a1,1,0,0,0,.45,0,1.86,1.86,0,0,0,0,1.73,1.34,1.34,0,0,0,1.59.25c.39-.19.68-.42,1.16-.15s.61-.08.77-.43c-.18-.5-.52-.65-.92-.46a7,7,0,0,0-.75-1.06.53.53,0,0,0-.1-.06c.18-.18,0-.75-.1-1s-.55-.23-.78,0c.06-1-.18-1.29-1-1.44Zm1.14-.6a.48.48,0,0,0,.09.11l.14.09-.37,0A1,1,0,0,0,185.91,367.11Z" fill="#424854"/><path d="M184.93,371.71c.21.12.7-.09.84-.22s0-.45-.05-.62a.34.34,0,0,0-.59-.06,2.34,2.34,0,0,0-.15.25.73.73,0,0,0-.56-.48l-.23,1.47A.77.77,0,0,0,184.93,371.71Z" fill="#424854"/><path d="M192.11,362.5c.22-.49-.06-.79-.43-1.12-.43.18-.89.23-.86.75a.71.71,0,0,0,.62.68A.54.54,0,0,0,192.11,362.5Z" fill="#424854"/><path d="M186.4,363.25a.61.61,0,0,0-.67.1.53.53,0,0,0-.18.78,1.1,1.1,0,0,0,.7.45.55.55,0,0,0,.5-.34,2,2,0,0,0,1.49.43,1.41,1.41,0,0,0,.88-.34,1.51,1.51,0,0,0,.48-1.17c0-.5.4-.85.21-1.31a2.09,2.09,0,0,0-2.11-1.37,1.73,1.73,0,0,0-1.41.79c-.29.5.22,1.06.13,1.66C186.41,363.05,186.4,363.15,186.4,363.25Z" fill="#424854"/><path d="M193.87,364a.72.72,0,0,0-.53-.84.76.76,0,0,0-.82.56.6.6,0,0,0,.49.75A.66.66,0,0,0,193.87,364Z" fill="#424854"/><path d="M196.13,375.19a.69.69,0,0,0-1-.17.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07A.64.64,0,0,0,196.13,375.19Z" fill="#424854"/><path d="M198.46,377.46a.86.86,0,0,0-.26-.18.53.53,0,0,0,.15-.25c0-.13-.06-.38-.23-.41s-.34.15-.38.26a.54.54,0,0,0,0,.25,1.1,1.1,0,0,0-.87.06,1.18,1.18,0,0,0,.12,1.5c.36.41.84.39,1.35-.07A1,1,0,0,0,198.46,377.46Z" fill="#424854"/><path d="M198.36,384.67a.58.58,0,0,0-.55-.08.76.76,0,0,0-.36.54c0,.49.44.49.81.51C198.55,385.32,198.68,385,198.36,384.67Z" fill="#424854"/><path d="M198.72,370.57c.11.13.48.07.57,0a.5.5,0,0,0,.12-.23h.45a.57.57,0,0,0,.85-.37.75.75,0,0,0-.5-.93,1.85,1.85,0,0,1-.65-.39,1,1,0,0,0-1.11-.4c-.34.1-.67.95-.55,1.34s.22.77.76.74h.07A.29.29,0,0,0,198.72,370.57Z" fill="#424854"/><path d="M197,391.79a.69.69,0,0,0,.19.82.77.77,0,0,0,1,.08c.4-.37.23-.81.1-1.22C197.46,391.3,197.14,391.38,197,391.79Z" fill="#424854"/><path d="M200.81,348.69a.66.66,0,1,0-1.25-.4.69.69,0,0,0,.5.84A.54.54,0,0,0,200.81,348.69Z" fill="#424854"/><path d="M193.47,337a1.14,1.14,0,0,0,.68,1,.72.72,0,0,0,.75-.65.66.66,0,0,0-.64-.73C193.81,336.5,193.49,336.66,193.47,337Z" fill="#424854"/><path d="M198.24,356.21a.87.87,0,0,0,.88,1.32,5.39,5.39,0,0,0,1.42-.31,1.37,1.37,0,0,0,.68-1.46c-.07-.31-.47-.89-1.05-.6-.61.9-1.06.26-1.71.75A1.18,1.18,0,0,0,198.24,356.21Z" fill="#424854"/><path d="M194.76,334.08c0-.12-.26-.34-.39-.39s-.32.13-.31.19a.54.54,0,0,0,.2.4C194.36,334.32,194.74,334.2,194.76,334.08Z" fill="#424854"/><path d="M184.84,382a5.46,5.46,0,0,0,.15-1.45Z" fill="#424854"/><path d="M186.12,376.71c-.24-.27-.48-.6-.9-.36a.77.77,0,0,0-.23.61.59.59,0,0,0,.37.41C185.8,377.44,186,377.16,186.12,376.71Z" fill="#424854"/><path d="M187.9,379.61c.58-.4.83-1,.56-1.37a1,1,0,0,0-.83-.34.83.83,0,0,0-.73.11.66.66,0,0,0-.19.59,1.08,1.08,0,0,0,.14.75A.86.86,0,0,0,187.9,379.61Z" fill="#424854"/><path d="M191.44,376.32c-.12-.57-.43-.68-1.6-.48-.1-.37-.18-.74-.56-.8a1.31,1.31,0,0,0,.08-.21.62.62,0,0,0,.24.1c.31,0,.64-.33.7-.74a.82.82,0,0,0-.61-1,.64.64,0,0,0-.47.14,1.25,1.25,0,0,0-.2-1,1.29,1.29,0,0,0-1.7-.32,1.47,1.47,0,0,0-.63,1.24,3.24,3.24,0,0,0-.75.16,1.25,1.25,0,0,0-.7,1.18s0,.09,0,.13a1.2,1.2,0,0,0-.73-.47l-.33,2a1.27,1.27,0,0,0,1.3-.79.67.67,0,0,0,0-.2,1.22,1.22,0,0,0,.5.31,2.21,2.21,0,0,0,1.5-.07,1.11,1.11,0,0,1,.57,0,1.32,1.32,0,0,0,.32.05s0,0,0,0a.55.55,0,0,0,.12.41,8.24,8.24,0,0,0,.94.49,2.58,2.58,0,0,0,.23.61.56.56,0,0,0-.2-.08.7.7,0,0,0-.85.49.72.72,0,0,0,.51.84.8.8,0,0,0,.92-.55.65.65,0,0,0,0-.24.68.68,0,0,0,.56.14A1.42,1.42,0,0,0,191.44,376.32Z" fill="#424854"/><path d="M185.12,378.26l.35,1.53A.94.94,0,0,0,185.12,378.26Z" fill="#424854"/><path d="M186.74,385.1c-.46.36-.47.73,0,1.26a.85.85,0,0,0,1.2.16,1.66,1.66,0,0,0,.24-1.45C187.89,384.7,187.23,384.72,186.74,385.1Z" fill="#424854"/><path d="M189.49,382.84a.84.84,0,0,0-.28-.95c-.48-.17-.37-.52-.49-.84a2.27,2.27,0,0,0-.62-.74,1.7,1.7,0,0,0-.56-.26,6.29,6.29,0,0,0-.62-.17c-.68-.15-1.09,0-1.29.54a1.1,1.1,0,0,0,.63,1.41l.64.3a1,1,0,0,0-.11.76c.13.52.84.43,1.06.28s.07-.29,0-.54c.08.06.17.09.25.15C188.53,383.11,189.29,383.16,189.49,382.84Z" fill="#424854"/><path d="M101.28,396.5a1.15,1.15,0,0,0-.75,1.44l2.6-.78C102.94,396.5,102.15,396.23,101.28,396.5Z" fill="#424854"/><path d="M95.72,394.42a1.17,1.17,0,0,0-.25.46c.21.44.59.6.81.4a.8.8,0,0,0,.26-.59A.57.57,0,0,0,95.72,394.42Z" fill="#424854"/><path d="M97.52,394.12c-.16.15-.6.44-.39.77s.69.25.93.19.29-.41.18-.67S97.74,393.92,97.52,394.12Z" fill="#424854"/><path d="M101.36,394.88a1.41,1.41,0,0,0,.69-1.62,1,1,0,0,0-1.82,1C100.44,394.76,101,395.06,101.36,394.88Z" fill="#424854"/><path d="M101.72,388.34a.38.38,0,0,0-.36-.17c-.12.05-.16.3-.15.44s.22.33.4.27S101.75,388.48,101.72,388.34Z" fill="#424854"/><path d="M97.31,397a1.24,1.24,0,0,0-.52,1.34l1.72-.48C98.28,397.22,97.74,396.83,97.31,397Z" fill="#424854"/><path d="M100.51,387.36a.38.38,0,0,0,.19-.42c0-.12-.28-.41-.44-.36s-.21.43-.16.54S100.34,387.41,100.51,387.36Z" fill="#424854"/><path d="M97.11,391.44c-.32.12-.49.68-.28,1.28.12,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.85.85,0,0,0,97.11,391.44Z" fill="#424854"/><path d="M81.93,397.72l1-.08A.69.69,0,0,0,81.93,397.72Z" fill="#424854"/><path d="M83.7,393.78a.48.48,0,0,0-.18.42c0,.11.23.37.49.24s.15-.41.1-.53A.44.44,0,0,0,83.7,393.78Z" fill="#424854"/><path d="M76,395.85a.82.82,0,0,0,.08,1,.63.63,0,0,0,.9,0,.76.76,0,0,0,0-1.06A.75.75,0,0,0,76,395.85Z" fill="#424854"/><path d="M85.71,398a.43.43,0,0,0-.24.51l.72-.21C86.13,398.11,86,397.87,85.71,398Z" fill="#424854"/><path d="M90.52,394.39l-.18.13a.66.66,0,0,0,0,.78.88.88,0,0,0,.42.43c.21-.24.81-.44.72-.81S90.8,394.55,90.52,394.39Z" fill="#424854"/><path d="M92.41,389.35a.61.61,0,0,0-.4.79c.17.41.71.76,1,.64a1.06,1.06,0,0,0,.3-1.06A.65.65,0,0,0,92.41,389.35Z" fill="#424854"/><path d="M90.56,396.43c.06.07.13.19.23.17s.07-.14.11-.22-.16-.12-.23-.12S90.55,396.41,90.56,396.43Z" fill="#424854"/><path d="M86.51,397a.62.62,0,0,0-.08.93A.59.59,0,0,0,87,398c.18-.1.38-.36.36-.52C87.29,397.05,86.73,396.94,86.51,397Z" fill="#424854"/><path d="M94.12,397a.43.43,0,0,0-.19.68c.12.19.47.67.74.51s.3-.73.23-.94A.53.53,0,0,0,94.12,397Z" fill="#424854"/><path d="M113.36,385.66a.39.39,0,0,0,.41-.23c0-.11,0-.49-.15-.54s-.42.22-.45.34A.39.39,0,0,0,113.36,385.66Z" fill="#424854"/><path d="M112.84,392.92a.54.54,0,0,0,0-.25c-.08-.38-.14-.79-.68-.81l-.63-.06a1,1,0,0,0-.89-.2l0,0a.55.55,0,0,0-.52.37.76.76,0,0,0,.41,1,1.79,1.79,0,0,1,.6.45,1,1,0,0,0,1.07.52.41.41,0,0,0,.18-.1,1.09,1.09,0,0,0,.08.28c.19.49.61.62,1.19.37.41-.18.62-.51.51-.83A1.51,1.51,0,0,0,112.84,392.92Z" fill="#424854"/><path d="M112.84,388a2.38,2.38,0,0,0,.2.62.68.68,0,0,0,.85-.52c0-.32-.16-.42-.4-.49S112.83,387.68,112.84,388Z" fill="#424854"/><path d="M112.3,396.57a.76.76,0,0,0-.46.94.78.78,0,0,0-.36.47l.66.13a.93.93,0,0,0,.88.22c.41-.16.9-1.09.75-1.42A1.2,1.2,0,0,0,112.3,396.57Z" fill="#424854"/><path d="M113.43,378.32a1.32,1.32,0,0,0-1.64.78,1.93,1.93,0,0,0,1,1.8,1.32,1.32,0,0,0,1.53-1A1.47,1.47,0,0,0,113.43,378.32Z" fill="#424854"/><path d="M118.43,392.25a.24.24,0,0,0-.14.34c.08.12.23.36.47.3s.15-.42.1-.47S118.63,392.17,118.43,392.25Z" fill="#424854"/><path d="M110.9,394.63a1.49,1.49,0,0,1-1-.12c-.14-.05-.47.16-.56.34a.79.79,0,0,0,0,.67s0,0,0,0a1.46,1.46,0,0,0-.09.16.45.45,0,0,0,.21.68c.3.14.79,0,.8-.31a1.85,1.85,0,0,0,0-.5c.22-.06.44-.14.65-.22s.34-.32.2-.62C111.12,394.71,111,394.6,110.9,394.63Z" fill="#424854"/><path d="M112.39,389.75a.48.48,0,0,0-.32.64.53.53,0,0,0,.66.44.62.62,0,0,0,.41-.78A.55.55,0,0,0,112.39,389.75Z" fill="#424854"/><path d="M108.22,386.08a.34.34,0,0,0-.18-.34c-.12,0-.31.14-.38.26s0,.39.16.45S108.17,386.21,108.22,386.08Z" fill="#424854"/><path d="M105.79,394.42a.48.48,0,0,0-.16-.42c-.09-.05-.47,0-.52.15s.22.36.35.43A.28.28,0,0,0,105.79,394.42Z" fill="#424854"/><path d="M104.9,395.13a1.35,1.35,0,0,0-.57,1.73.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54A1.19,1.19,0,0,0,104.9,395.13Z" fill="#424854"/><path d="M109,389.93a1.65,1.65,0,0,0-1.47-1.65c-.58,0-.65.75-.42,1.09s.11.26-.08.64-.21,1,.54,1.12A1.41,1.41,0,0,0,109,389.93Z" fill="#424854"/><path d="M108.46,397.6a1.15,1.15,0,0,0-.7,1l1.34-.1C109,397.9,108.74,397.57,108.46,397.6Z" fill="#424854"/><path d="M109.79,387.73c.08-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,109.79,387.73Z" fill="#424854"/><path d="M108.36,394c.4-.14.56-.77.35-1.34a.53.53,0,0,0-.74-.32c-.48.15-.82.68-.69,1A1.09,1.09,0,0,0,108.36,394Z" fill="#424854"/><path d="M104.21,397.6c-.27,0-.94.1-1,.35s.51.62.61.59c.29-.07.7-.11.82-.44S104.35,397.6,104.21,397.6Z" fill="#424854"/><path d="M737.35,399.29l.86-.08A.54.54,0,0,0,737.35,399.29Z" fill="#424854"/><path d="M723.36,397.73a.94.94,0,0,0-.09,1.24,1.35,1.35,0,0,0,1.68-.14.85.85,0,0,0-.21-1.13A.93.93,0,0,0,723.36,397.73Z" fill="#424854"/><path d="M708.2,398.86l.62,0A.38.38,0,0,0,708.2,398.86Z" fill="#424854"/><path d="M736.28,393.15a.62.62,0,0,0-.08.94.55.55,0,0,0,.54.07c.17-.1.38-.35.36-.52C737.06,393.18,736.5,393.07,736.28,393.15Z" fill="#424854"/><path d="M721.55,394.9a.83.83,0,0,0-.14-1,.79.79,0,0,0-.67.25.41.41,0,0,0,0,.69C721,395,721.26,395.17,721.55,394.9Z" fill="#424854"/><path d="M716.26,398.37l1.45,0A1.25,1.25,0,0,0,716.26,398.37Z" fill="#424854"/><path d="M731.7,393.85a.74.74,0,0,0,.08,1,.72.72,0,0,0,1.05,0,.76.76,0,0,0-.09-1.05A.7.7,0,0,0,731.7,393.85Z" fill="#424854"/><path d="M720.84,396.78a.68.68,0,0,0,0,1,.77.77,0,0,0,1,0,.8.8,0,0,0-.1-1.07A.64.64,0,0,0,720.84,396.78Z" fill="#424854"/><path d="M726.7,393a.69.69,0,1,0-1-1,.81.81,0,0,0,.08,1A.61.61,0,0,0,726.7,393Z" fill="#424854"/><path d="M713.33,394.85c-.3.34-.34.7-.1.88a1.12,1.12,0,0,0,1.2-.05.69.69,0,0,0-.14-1A.65.65,0,0,0,713.33,394.85Z" fill="#424854"/><path d="M726.1,395.84a.68.68,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,726.1,395.84Z" fill="#424854"/><path d="M702.87,395.44c.11-.15.21-.49.11-.62a.65.65,0,0,0-.62,0c-.13.09-.31.59-.18.73S702.8,395.54,702.87,395.44Z" fill="#424854"/><path d="M721.44,389.77a.77.77,0,0,0,0,.91c.25.24.76,0,1-.17s.39-.9.13-1.15S721.63,389.55,721.44,389.77Z" fill="#424854"/><path d="M711,393.19a.4.4,0,0,0,0,.37.52.52,0,0,0,.45,0c.09-.05.19-.45.1-.53S711.08,393.11,711,393.19Z" fill="#424854"/><path d="M712.62,396.4c-.12-.09-.37-.25-.47-.12a.47.47,0,0,0-.06.21h0a.6.6,0,0,0-.05,1.05.64.64,0,0,0,.76-.3.6.6,0,0,0,0-.47A.54.54,0,0,0,712.62,396.4Z" fill="#424854"/><path d="M717,391.48a.51.51,0,0,0-.07-.54.45.45,0,0,0-.45,0,.42.42,0,0,0,0,.42C716.51,391.47,716.84,391.65,717,391.48Z" fill="#424854"/><path d="M713.26,393.75a.22.22,0,0,0,0-.28c-.05,0-.22,0-.25,0a.2.2,0,0,0,0,.24A.19.19,0,0,0,713.26,393.75Z" fill="#424854"/><path d="M735.74,398a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.22.22,0,0,0,0-.28A.25.25,0,0,0,735.74,398Z" fill="#424854"/><path d="M682.71,391a1,1,0,0,0,1.14.63,1.42,1.42,0,0,0,.68-1.62.75.75,0,0,0-.53-.4.23.23,0,0,0-.12-.06.24.24,0,0,0-.17,0,.85.85,0,0,0-.36.06A1,1,0,0,0,682.71,391Z" fill="#424854"/><path d="M695.3,389.7c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,695.3,389.7Z" fill="#424854"/><path d="M690.84,390.73c.4-.14.57-.77.35-1.35a.52.52,0,0,0-.73-.31c-.48.15-.83.67-.7,1A1.09,1.09,0,0,0,690.84,390.73Z" fill="#424854"/><path d="M683,384.12c.17-.05.22-.3.19-.42s-.28-.41-.43-.35-.21.43-.17.54S682.82,384.18,683,384.12Z" fill="#424854"/><path d="M700.91,389a.24.24,0,0,0-.13.35c.07.12.22.36.46.3s.15-.42.1-.47S701.12,388.93,700.91,389Z" fill="#424854"/><path d="M691.58,395.23c-.11-.56-.36-.89-.64-.86a1.17,1.17,0,0,0-.7,1c0,.28.58.61.93.57A.51.51,0,0,0,691.58,395.23Z" fill="#424854"/><path d="M707.46,395.19l-.05,0a.76.76,0,0,0-.21-.6.54.54,0,0,0-.87,0,.67.67,0,0,0,0,1,.7.7,0,0,0,.8.08.43.43,0,0,0,.4.09c.12-.08.33-.16.27-.38A.25.25,0,0,0,707.46,395.19Z" fill="#424854"/><path d="M688.77,392.66a1.17,1.17,0,0,0-1.38-.76c-.55.16-.83,1-.58,1.73a.91.91,0,0,0,1.25.57A1.11,1.11,0,0,0,688.77,392.66Z" fill="#424854"/><path d="M696.25,393.68a1.18,1.18,0,0,0-1.47-.34c-.5.21-.62.68-.34,1.3a1,1,0,0,0,1.07.46C695.91,394.94,696.4,394,696.25,393.68Z" fill="#424854"/><path d="M681,394.63l-.45.91A.84.84,0,0,0,681,394.63Z" fill="#424854"/><path d="M694,396c-.65.29-1,.75-.78,1.15a.94.94,0,1,0,1.71-.78A.81.81,0,0,0,694,396Z" fill="#424854"/><path d="M693.69,389.76c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.69.69,0,0,0-.32.92A.77.77,0,0,0,693.69,389.76Z" fill="#424854"/><path d="M693.68,391.51c-.08,0-.21-.14-.29-.12a1.45,1.45,0,0,1-1-.11c-.14,0-.46.16-.56.33a.85.85,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31C693.77,392,693.82,391.82,693.68,391.51Z" fill="#424854"/><path d="M691,398.46l.78.13A.53.53,0,0,0,691,398.46Z" fill="#424854"/><path d="M682.25,396.84a.74.74,0,0,0-.41.91.66.66,0,0,0,.85.32.59.59,0,0,0,.42-.78A.67.67,0,0,0,682.25,396.84Z" fill="#424854"/><path d="M688.15,398.61l1,.28C688.86,398.57,688.54,398.28,688.15,398.61Z" fill="#424854"/><path d="M702.86,387.92c.2-.35-.51-1-.94-.88s-.76.66-.58,1S702.66,388.27,702.86,387.92Z" fill="#424854"/><path d="M695.21,387.6a.61.61,0,0,0,.41-.78.55.55,0,0,0-.75-.31.5.5,0,0,0-.32.65A.53.53,0,0,0,695.21,387.6Z" fill="#424854"/><path d="M680.73,391.17l-.19.68C680.86,391.77,680.83,391.44,680.73,391.17Z" fill="#424854"/><path d="M692.27,384.5c.09-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,692.27,384.5Z" fill="#424854"/><path d="M685.55,397.48a.67.67,0,0,0-.42.88l0,0a.21.21,0,0,0-.19.12c-.06.19.19.38.27.39s.36.07.44-.14v-.05a.66.66,0,0,0,.31-.06.72.72,0,0,0,.34-.93A.53.53,0,0,0,685.55,397.48Z" fill="#424854"/><path d="M707,397.88a.62.62,0,0,0-.05,1.06.64.64,0,0,0,.76-.31C707.81,398.31,707.65,398.13,707,397.88Z" fill="#424854"/><path d="M684.09,385.64c.19-.06.14-.4.11-.53a.36.36,0,0,0-.35-.17c-.12.05-.17.3-.16.44S683.91,385.7,684.09,385.64Z" fill="#424854"/><path d="M699,399l.35.22C699.35,399.05,699.24,399,699,399Z" fill="#424854"/><path d="M700.23,394.4c-.35-.16-.66-.48-1-.37a.65.65,0,0,0-.44.41,1.11,1.11,0,0,0-.23.62,1.47,1.47,0,0,0,.61,1.1,1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84A1.12,1.12,0,0,0,700.23,394.4Z" fill="#424854"/><path d="M696.34,397.57a.35.35,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37,0-.49A.38.38,0,0,0,696.34,397.57Z" fill="#424854"/><path d="M703.84,398c-.17,0-.38-.32-.19-.35s.33-.23.25-.71a.72.72,0,0,0-.79-.72,1.07,1.07,0,0,0-1,1.14c0,.58.36.66.35,1s.2.51.59.62,1,.26,1.12-.28S704,398,703.84,398Z" fill="#424854"/><path d="M704.19,389.57c-.58.1-.72.3-.78,1a11.15,11.15,0,0,0-1,.87.45.45,0,0,0,.33.77c.48,0,1,.05,1.44-.37,0-.21,0-.45,0-.68.53-.35.85-.88.68-1.21A.63.63,0,0,0,704.19,389.57Z" fill="#424854"/><path d="M686.09,389.83c.37-.16.19-1.1-.23-1.26s-1,.08-1,.44S685.73,390,686.09,389.83Z" fill="#424854"/><path d="M680.49,384l.42.68A.53.53,0,0,0,680.49,384Z" fill="#424854"/><path d="M681.4,396.65l-.36,1.47c.16.06.37,0,.58-.43A.71.71,0,0,0,681.4,396.65Z" fill="#424854"/><path d="M680.94,398.51l.1-.39h0C680.82,398,680.82,398.39,680.94,398.51Z" fill="#424854"/><path d="M686.19,392c-.52-.27-.76-.19-1.21.33a9,9,0,0,0-1.32.1.45.45,0,0,0-.19.82l.18.12a1.13,1.13,0,0,0-.63,1.38,1.5,1.5,0,0,0,1.75,1,1.57,1.57,0,0,0,.84-1.75.94.94,0,0,0-.45-.53l.13-.15c.63,0,1.2-.21,1.26-.58A.62.62,0,0,0,686.19,392Z" fill="#424854"/><rect x="331.59" y="2.12" width="34.45" height="34.45" fill="#00bfb3"/><rect x="331.59" y="54.37" width="34.45" height="34.45" fill="#00bfb3"/><polygon points="352.85 24.63 341.81 12.98 346.2 8.82 352.97 15.96 369.12 -0.19 373.4 4.09 352.85 24.63" fill="#e6ebf2"/><rect x="239" y="6.81" width="15.13" height="15.13" fill="#424854"/><rect x="401.71" y="28.13" width="180.09" height="172.79" fill="#07c"/><rect x="466.48" y="94.19" width="20.62" height="73.45" fill="#005a9e"/><rect x="532.14" y="94.19" width="20.62" height="73.45" fill="#005a9e"/><rect x="499.31" y="58.25" width="20.62" height="109.39" fill="#1ba9f5"/><rect x="433.65" y="69.19" width="20.62" height="98.45" fill="#1ba9f5"/><rect x="256.95" y="139.77" width="216.16" height="119.98" fill="#00bfb3"/><g clip-path="url(#a)"><path d="M380.27,259.39c.26.29,0,.81-.45.94a.54.54,0,0,1-.78-.39,1.68,1.68,0,0,0-.79-1.14c-.37-.19-.2-.61-.11-.92a1.42,1.42,0,0,1,1.22-.81,1.1,1.1,0,0,1,.7,1.06A1.15,1.15,0,0,0,380.27,259.39Zm-8.35-11.29c.54,0,.81-.44.75-1.12a1,1,0,0,0-.86-.78c-.44,0-1.21.75-1.17,1.11S371.31,248.14,371.92,248.1Zm21.38,7.47c-.05-.63-.42-1-1-1s-1,.42-1,.8a1.38,1.38,0,0,0,1.28,1.11A.85.85,0,0,0,393.3,255.57Zm-12.68-.32c-.74.05-1.08.32-1.05.86a1.13,1.13,0,0,0,1,.85,1.28,1.28,0,0,0,.78-1.12A.63.63,0,0,0,380.62,255.25Zm2.3-.52c-.61.54-.74.84-.51,1.22a.67.67,0,0,0,.77.33.76.76,0,0,0,.66-.74C383.78,255,383.32,254.88,382.92,254.73Zm-11.24-3.85c-.12.45-.35.85.09,1.14a.72.72,0,0,0,.92-.09.55.55,0,0,0,.14-.73C372.57,250.74,372.16,250.78,371.68,250.88ZM355,243.17a.72.72,0,0,0,.92-.09.54.54,0,0,0,.14-.72c-.26-.47-.67-.43-1.15-.32C354.74,242.48,354.51,242.88,355,243.17Zm27.64-1.61a.67.67,0,0,0,.67-.71.53.53,0,0,0-.59-.62.66.66,0,0,0-.7.67A.69.69,0,0,0,382.59,241.56Zm-29.25,9.35a.87.87,0,0,0-.68-.75.68.68,0,0,0-.64.66.66.66,0,1,0,1.32.09Zm31.94,3.4c.48-.24.23-.66.13-1.09-.52-.09-1-.1-1.14.4a.64.64,0,0,0,.19.6A1,1,0,0,0,385.28,254.31Zm-4.34-8.57c.25,0,.46-.39.44-.78s-.17-.45-.46-.42-.59.15-.6.54A.72.72,0,0,0,380.94,245.74Zm23.67,14.91a.62.62,0,0,0-.72.6.58.58,0,0,0,.33.44.73.73,0,0,0,.62-.11A.64.64,0,0,0,404.61,260.65Zm-11.53-9.32c.3,0,.71-.59.61-.8s-.4-.28-.64-.31a.42.42,0,0,0-.5.49C392.59,251,392.69,251.31,393.08,251.33Zm1.51,8.45c-.28-.07-.65.3-.55.56a.68.68,0,0,0,.51.36c.18,0,.63-.18.65-.4S394.78,259.84,394.59,259.78Zm-40.21-13.61c.13,0,.43,0,.47-.25s-.27-.34-.34-.32a.62.62,0,0,0-.35.27C354.13,245.93,354.31,246.18,354.38,246.17Zm25,4.07a1.07,1.07,0,0,0,.08.83.33.33,0,0,0,.51.07.74.74,0,0,0,.11-.59c0-.2,0-.4-.14-.56S379.52,250,379.42,250.24Zm-4.7,2.87a1.26,1.26,0,0,0,1.55.11c.42-.28.29-1.09-.08-1.69a1.24,1.24,0,0,0-1.6-.19A1.28,1.28,0,0,0,374.72,253.11Zm-4,3.49a.8.8,0,0,0-.92-.33c-.43.27-.65,0-1-.11a2.09,2.09,0,0,0-1,0,1.71,1.71,0,0,0-.55.29,4.87,4.87,0,0,0-.5.4c-.53.45-.64.89-.34,1.35a1.08,1.08,0,0,0,1.5.34,12.55,12.55,0,0,1,1.85-.89C370.4,257.54,370.9,257,370.76,256.6Zm6.65-7.25a1.14,1.14,0,0,0,1.18-1.19,1.44,1.44,0,0,0-1.36-1.33,1.5,1.5,0,0,0-1.26,1.35C376,248.86,376.55,249.34,377.41,249.35Zm9.78,9.94c-.58,0-1.14.52-1.11,1a1.56,1.56,0,0,0,1.21,1.15,1.07,1.07,0,0,0,.93-1.07A1.16,1.16,0,0,0,387.19,259.29ZM365.7,252.9c.78.33,1.45.26,1.66-.21a1.4,1.4,0,0,0-.66-1.54c-.53-.25-.81-.06-1.34,1-.43-.16-.85-.39-1.13.15a.72.72,0,0,0,.12.92c.1.09.3.19.4.15A7.49,7.49,0,0,0,365.7,252.9Zm-4-6.47c0-.59-.49-.92-1.17-.85a.94.94,0,0,0-1,1.09,1.1,1.1,0,0,0,1.22,1A1.14,1.14,0,0,0,361.66,246.43Zm18.21,7.94a.61.61,0,0,0,.21-.88.64.64,0,0,0-.87-.28,2,2,0,0,1-.59.15,1,1,0,0,0-1,.85c-.11.51.16.83.93.8A10.19,10.19,0,0,0,379.87,254.37Zm-31.67-6.56c.1.5.54.34.75.46a1.11,1.11,0,0,0,1.56-.4,1,1,0,0,0-.39-1.14.79.79,0,0,0-1.08,0C348.77,247,348.1,247.31,348.2,247.81ZM371.74,259a.34.34,0,0,0-.16,0,.93.93,0,0,0-.33-.48,2,2,0,0,0-2,.31,1.32,1.32,0,0,0,.39,1.78,1.52,1.52,0,0,0,1.49,0,.91.91,0,0,0,.83.29.85.85,0,0,0,.84-.87A1.64,1.64,0,0,0,371.74,259Zm17.1-3.47a.87.87,0,0,0-.8.72c0,.75.39,1.31.86,1.29a1.32,1.32,0,0,0,1-1.16A1.2,1.2,0,0,0,388.84,255.55Zm-21.62.4c0-.7-.3-1.26-.76-1.27a1.17,1.17,0,0,0-1,1c0,.42.45.9.95.94A.86.86,0,0,0,367.22,256Zm25.53,2.14c-.55,0-.88.42-.86,1.06s.41.78,1.05.75.83-.29.83-.68S393.13,258.08,392.75,258.09ZM387,251.88c.51-.07.93-.47.9-.87s-.59-1.06-1-1-.76.69-.74,1.23A.81.81,0,0,0,387,251.88Zm-23.21-2.45a1.13,1.13,0,0,0,1.07-.94.79.79,0,0,0-.73-.79,1,1,0,0,0-.93.94C363.19,249.1,363.42,249.41,363.79,249.43Zm5.46,3.37c0,.31.7.85,1.06.86s.6-.3.57-.85-.24-.89-.68-.88C369.6,252,369.2,252.32,369.25,252.8Zm13.57,6c-.63,0-1,.25-1,.6a1.15,1.15,0,0,0,1,.93c.35,0,.76-.57.72-1S383.24,258.74,382.82,258.76Zm-29.93-2.52a1,1,0,0,0,.77-1,1,1,0,0,0-1.19-.39.76.76,0,0,0,.42,1.4Zm48,1.62a.73.73,0,0,0-.64.74.69.69,0,0,0,.73.74.74.74,0,0,0,.69-.79A.7.7,0,0,0,400.92,257.86Zm-15.79-1.4c-.6.05-.93.34-.92.71a.74.74,0,0,0,.83.74.63.63,0,0,0,.55-.78C385.53,256.81,385.47,256.45,385.13,256.46Zm-16.57-8.34a.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6.69.69,0,0,0-.75.73A.77.77,0,0,0,368.56,248.12Zm22.65,5.42a.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6.69.69,0,0,0-.75.73A.77.77,0,0,0,391.21,253.54Zm6.88-1.26a.82.82,0,0,0-.66.76.63.63,0,0,0,.63.63.7.7,0,1,0,0-1.39Zm-39.22,6.63a.82.82,0,0,0-1.05.54.87.87,0,0,0,.91.86.57.57,0,0,0,.58-.58A.73.73,0,0,0,358.87,258.91Zm28.5-13.5c-.45,0-.73.24-.69.55a1.12,1.12,0,0,0,.87.82.7.7,0,0,0,.6-.78A.66.66,0,0,0,387.37,245.41ZM354.7,257.82a2.06,2.06,0,0,0,.16-.34.6.6,0,0,0,.44.21.82.82,0,0,0,.74-.57h.14a2,2,0,0,0,.41-.69c.07-.38-.38-.7-.81-.65a.42.42,0,0,0-.19.06.69.69,0,0,0-.29-.13.94.94,0,0,0-1,.54,1.3,1.3,0,0,0-1.62.26,1.32,1.32,0,0,0-.16,1.4,1,1,0,0,0-.81.18,1.56,1.56,0,0,0-.76,1.21h-.12a1.4,1.4,0,0,0-1.08,1.29c0,.65.62,1.08,1.44,1.05a1,1,0,0,0,1.07-1.08.77.77,0,0,0,0-.15h.11a.65.65,0,0,0,.17.82.73.73,0,0,0,1-.19.69.69,0,0,0-.1-1l-.11-.07a1.27,1.27,0,0,0,.13-1.35.3.3,0,0,0,0-.08.9.9,0,0,0,.56-.06.75.75,0,0,0,.81.66.74.74,0,0,0,.62-.75A.79.79,0,0,0,354.7,257.82Zm11.65,3.05a.75.75,0,0,0-.31.58.67.67,0,0,0,.67.64c.51,0,.71-.54.73-.82S366.82,260.59,366.35,260.87Zm29.24-5.63a.67.67,0,0,0-.68.6.69.69,0,0,0,.66.72.53.53,0,0,0,.64-.57A.66.66,0,0,0,395.59,255.24ZM380.81,248a.74.74,0,0,0-.4.57.54.54,0,0,0,.57.64.59.59,0,0,0,.6-.56C381.63,248.41,381.06,247.92,380.81,248ZM363,256.15a.77.77,0,0,0,.35.55.57.57,0,0,0,.55-.06c.32-.3.22-.65-.07-1C363.47,255.68,363.06,255.68,363,256.15Zm-7.39-6.55c0,.31.22.56.54.47s.82-.33.8-.58-.61-.46-.86-.52S355.57,249.29,355.62,249.6ZM377.13,251a.76.76,0,0,0,.23.61c.4.26.65-.07.89-.35-.08-.42-.28-.72-.72-.66A.61.61,0,0,0,377.13,251Zm5.6-1.08c0,.32.28.36.52.35s.61-.27.5-.57-.16-.48-.37-.53S382.68,249.56,382.73,249.9Zm-14-4.7c.24-.07.8-.34.8-.61s-.66-.41-.9-.43-.48.2-.42.55S368.37,245.28,368.69,245.2Zm3.27-5.3c.22,0,.75-.3.73-.49s-.48-.47-.71-.54-.51.18-.53.56A.41.41,0,0,0,372,239.9Zm-.83,9.85c.16,0,.59-.33.57-.52s-.54-.46-.63-.41-.54.39-.47.56A.68.68,0,0,0,371.13,249.75Zm8.51-11.42c.19,0,.5-.19.53-.35s-.26-.43-.42-.46-.63.19-.64.38S379.52,238.35,379.64,238.33Zm18.14,9.89c0-.35-.81-.57-1.11-.56a.79.79,0,0,0-.63.66c0,.34.53.55.83.6S397.79,248.57,397.78,248.22Zm-10.85-5.05c.1,0,.45-.18.45-.3s-.33-.28-.47-.31-.28.19-.27.25S386.8,243.14,386.93,243.17Zm-1.41,2.4a.44.44,0,0,0-.34.33c0,.12.13.5.3.48s.3-.3.29-.39S385.69,245.54,385.52,245.57Zm6.8.09c.21,0,.34-.32.34-.44a.47.47,0,0,0-.32-.31c-.1,0-.31.18-.32.29S392.12,245.69,392.32,245.66Zm-25.89-3.79c.17,0,.34-.34.33-.46s-.13-.35-.31-.35-.3.21-.32.33S366.27,241.87,366.43,241.87Zm-3.92-3.66c.12,0,.25-.23.28-.37s-.1-.37-.29-.37-.26.33-.27.46A.35.35,0,0,0,362.51,238.21Zm25.6,6.38c.13,0,.17-.16.17-.22s-.15-.15-.21-.15-.18.08-.17.17A.2.2,0,0,0,388.11,244.59Zm-22,2c.13,0,.17-.15.17-.22s-.16-.15-.21-.15-.18.08-.18.17A.21.21,0,0,0,366.11,246.6Zm11-1.36a.38.38,0,0,0,.46-.29c0-.28-.33-.29-.47-.31s-.29.19-.27.25A.53.53,0,0,0,377.12,245.24Zm-32.69,13.33a.44.44,0,0,0-.34.33c0,.12.13.5.3.48s.3-.3.29-.39S344.6,258.54,344.43,258.57Zm-.82-2.58c-.14,0-.36.08-.36.35a.38.38,0,0,0,.44.42.39.39,0,0,0,.36-.47A.42.42,0,0,0,343.61,256Zm32.67-1.52a1.75,1.75,0,0,0-1.23,1.14.67.67,0,0,0-.4-.36c-.39-.12.12-.91-.41-1.1s-.52-.86-1.19-1-1.4.12-1.33.73a2.39,2.39,0,0,0,.82,1.38c.3.32.8,0,.74.57s-.06,1.59.91,1.59a1.18,1.18,0,0,0,1-1v0a1.33,1.33,0,0,0,1.1.45,1.32,1.32,0,0,0,1.06-1.38A1.11,1.11,0,0,0,376.28,254.47Zm14.38,5a.73.73,0,0,0-.61.76.68.68,0,0,0,.8.56.58.58,0,0,0,.56-.67A.76.76,0,0,0,390.66,259.49Zm-57-1.92a1.18,1.18,0,0,1-1.13-.61,1.1,1.1,0,0,0-1.26-.11,1.43,1.43,0,0,0-.11,1.47c.19.26.41.65.79.48a1.66,1.66,0,0,1,1.38.08.56.56,0,0,0,.8-.38C334.24,258.1,334,257.55,333.63,257.57Zm-15.45.15a1.18,1.18,0,0,0,1.41-.51c.31-.46.15-.91-.42-1.28a1,1,0,0,0-1.15.2s0,0,0,.05a.5.5,0,0,0-.29.16.75.75,0,0,0,0,1,.61.61,0,0,0,.27.17A.5.5,0,0,0,318.18,257.72ZM339,246.05a.85.85,0,0,0-.32-1.11,1,1,0,0,0-1.33,1.43A1.36,1.36,0,0,0,339,246.05Zm-7.45,8.45a.64.64,0,0,0-.93.24c-.42.62-.41,1,0,1.36a1.14,1.14,0,0,0,1.3-.29A1.28,1.28,0,0,0,331.51,254.5Zm19,2.51a.59.59,0,0,0,.88-.1.67.67,0,0,0,0-1,.72.72,0,0,0-1,.09A.75.75,0,0,0,350.5,257ZM321,244.78a.68.68,0,0,0-.14-1,.54.54,0,0,0-.86.08.67.67,0,0,0,.1,1A.71.71,0,0,0,321,244.78Zm10.54,6.08a.65.65,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.52-.38-.58-.77-.77C331.54,250.07,331.26,250.42,331.54,250.86Zm-8.26-2.21c.15-.21,0-.61-.34-.84a.39.39,0,0,0-.62.11.56.56,0,0,0,.05.81A.75.75,0,0,0,323.28,248.65Zm26.89-8.54c.16-.12.34-.4.3-.56-.09-.45-.66-.5-.87-.4a.62.62,0,0,0,0,.94A.57.57,0,0,0,350.17,240.11Zm-1.57,10.13c-.37-.08-.88.63-.71.88s1,.22,1.1-.15A.67.67,0,0,0,348.6,250.24Zm-14.26-7.69c.27.16.56.26.81,0s0-.92-.25-1-.46.14-.64.32A.42.42,0,0,0,334.34,242.55Zm10.12,9.28a.91.91,0,0,0,1.34-.29,1.28,1.28,0,0,0,.21-.75.7.7,0,0,0,.64.64.61.61,0,0,0,.66-.59.71.71,0,0,0-.64-.66.59.59,0,0,0-.66.55.8.8,0,0,0-.28-.6,1.34,1.34,0,0,0-1.49.29A.92.92,0,0,0,344.46,251.83Zm-.93-5.48c-.16-.15-.62.06-.78.18a.49.49,0,0,0,.1.77.68.68,0,0,0,.6-.18C343.56,247,343.69,246.51,343.53,246.35Zm12.3-2.06c0,.3-.13.69.13.92s.56-.08.61-.21.24-.91,0-1.08S355.84,244.19,355.83,244.29Zm-29.23,8.77a.33.33,0,0,0,.37-.36c0-.21-.22-.33-.4-.45s-.31-.26-.53-.24-.31.35-.15.6A1.12,1.12,0,0,0,326.6,253.06ZM324.92,256a1.25,1.25,0,0,0-1.14,1.14,1.29,1.29,0,0,0,1.48,1,1.26,1.26,0,0,0,1-1.15C326.34,256.42,325.63,256,324.92,256Zm23.23-2a1.38,1.38,0,0,0-1,.29.75.75,0,0,0-.14-.12c-.57-.47-1.07-.25-1.57.15-.28-.28-.46-.74-1-.46a.63.63,0,0,0-.35.76c.14.56.61.48,1,.44l.25.69-.88.35a4.31,4.31,0,0,0-.1.75,1.46,1.46,0,0,0,.83,1c.38.05.78-.31.95-.84.05-.18.08-.35.13-.53a2.3,2.3,0,0,0,1.17-.53,2.69,2.69,0,0,0,.29.16.7.7,0,0,0,.36,0,1,1,0,0,0,.65.2c.5,0,.77-.26.76-.69a1.34,1.34,0,0,0-.47-1A1.21,1.21,0,0,0,348.15,253.91Zm-2-5.69a1.26,1.26,0,0,0,.16.33.88.88,0,0,0,1.59-.19,5.79,5.79,0,0,0,.35-1.42,1.36,1.36,0,0,0-1-1.25c-.31-.08-1,0-1,.67C346.79,247.31,346,247.42,346.17,248.22Zm-24.31,4a1.18,1.18,0,0,0-.18.45.69.69,0,0,0-.2-.31.68.68,0,0,0-1,.14.69.69,0,0,0,.06,1,.84.84,0,0,0,1.05-.19.41.41,0,0,0,.07-.15,1.44,1.44,0,0,0,.45.85,1.26,1.26,0,0,0,1.81-.41,1.15,1.15,0,0,0,.15-1.21.47.47,0,0,0,.52-.08c.22-.26-.05-.66-.18-.84a.44.44,0,0,0-.69-.12.72.72,0,0,0-.24.48A1.41,1.41,0,0,0,321.86,252.24Zm16.55,6.33a1.47,1.47,0,0,0-2.09.43,1.43,1.43,0,0,0,.3,2,1.21,1.21,0,0,0,1.8-.36C339.06,259.86,339.06,259.05,338.41,258.57Zm-.6-6.52a1.15,1.15,0,0,0,.09,1.49,1.55,1.55,0,0,0,1.65-.25,1.06,1.06,0,0,0-.27-1.39A1.15,1.15,0,0,0,337.81,252.05Zm-.72,4a1.26,1.26,0,0,0,.33,1.64c.55.44,1.16.31,1.65-.34a1.07,1.07,0,0,0-.16-1.68A1.23,1.23,0,0,0,337.09,256.05Zm-9-1.45a2,2,0,0,1-.25.56,1,1,0,0,0,.05,1.32c.34.4.75.38,1.2-.24a12.48,12.48,0,0,0,.32-1.44.63.63,0,0,0-.57-.72A.65.65,0,0,0,328.11,254.6Zm23.74-7.86a1,1,0,0,0,1.26-1.58,1.34,1.34,0,0,0-1.66.32A1,1,0,0,0,351.85,246.74ZM336,249.52c.6.45,1.27.5,1.55.12a1.32,1.32,0,0,0-.31-1.48,1.2,1.2,0,0,0-1.32.29A.88.88,0,0,0,336,249.52Zm4.64-1.26c.4.29.87.15,1.24-.37a.76.76,0,0,0,0-1.07,1.47,1.47,0,0,0-1.52.11A.9.9,0,0,0,340.59,248.26Zm-9.79-.37a.81.81,0,0,0,1.05-.25,1,1,0,0,0-.13-1.24,1.25,1.25,0,0,0-1.44.14C330.07,246.84,330.36,247.57,330.8,247.89Zm10.56,5.68a1,1,0,0,0-.06,1.09c-.06.06-.12.13-.11.16s.16.33.28.35a.41.41,0,0,0,.41-.19.72.72,0,0,0,.59-.23,1.11,1.11,0,0,0-.22-1.33A.62.62,0,0,0,341.36,253.57Zm-6.66,1.6c-.36.52-.41.94-.13,1.15a1.14,1.14,0,0,0,1.33-.21,1,1,0,0,0-.35-1.19C335.26,254.73,334.94,254.83,334.7,255.17Zm19.22-2.53a.75.75,0,0,0-.25-1,.67.67,0,0,0-.94.24.68.68,0,0,0,.16,1A.84.84,0,0,0,353.92,252.64Zm-7.57-11.45a.75.75,0,0,0-.2-1,.69.69,0,0,0-1,.19.73.73,0,0,0,.19,1A.69.69,0,0,0,346.35,241.19Zm-11,11.71a.65.65,0,0,0-.28-.92c-.29-.15-.61-.32-.81,0-.33.49-.3.93,0,1.15A.75.75,0,0,0,335.4,252.9ZM316.45,259a.68.68,0,0,0,.11,1,.76.76,0,0,0,1-.15.8.8,0,0,0-.21-1.05A.64.64,0,0,0,316.45,259Zm18.21-14.52a.68.68,0,0,0,.11,1,.75.75,0,0,0,1-.15.81.81,0,0,0-.21-1.05A.64.64,0,0,0,334.66,244.46Zm5.4-4.44A.76.76,0,0,0,340,239a.75.75,0,0,0-1,.19.81.81,0,0,0,.19,1A.61.61,0,0,0,340.06,240ZM327,244.25a1.13,1.13,0,0,0,1.19-.18.71.71,0,0,0-.25-.95.66.66,0,0,0-.94.24C326.72,243.74,326.72,244.1,327,244.25ZM352.81,249a.68.68,0,0,0,.11,1,.81.81,0,0,0,1-.09.66.66,0,0,0-.15-.95A.65.65,0,0,0,352.81,249Zm-12-5.26a.55.55,0,0,0-.05-.87.67.67,0,0,0-1,0,.69.69,0,0,0,.05.91A.71.71,0,0,0,340.81,243.77ZM325,250.16a.78.78,0,0,0,.21.67.55.55,0,0,0,.86-.06A.61.61,0,0,0,326,250C325.81,249.74,325.07,249.89,325,250.16Zm24.09,2.43c-.4.15-.63.42-.46.83.06.15.34.33.45.29s.52-.26.57-.45C349.76,252.86,349.4,252.72,349.1,252.59Zm9.54,2.27a1.14,1.14,0,0,0-.41.78c0,.41.54.81,1.06.79s1-.29,1-.8a1.19,1.19,0,0,0-1-1.1,1.06,1.06,0,0,0-.19.06.5.5,0,0,0,.08-.12c.16-.37.37-.71.55-1.07a.58.58,0,0,0,.05-.93.76.76,0,0,0-1,0,.28.28,0,0,0-.18.14,1.27,1.27,0,0,1-.49.28,1,1,0,0,0-.85.82c-.06.35.55,1,1,1.09A2,2,0,0,0,358.64,254.86Zm-2.74,3.48a.73.73,0,0,0,.1,1.05.69.69,0,0,0,.95-.24.64.64,0,0,0-.1-.89A.62.62,0,0,0,355.9,258.34Zm4.37.29a2.38,2.38,0,0,0-.64,0,.67.67,0,0,0,.19,1c.28.17.45,0,.6-.2A.45.45,0,0,0,360.27,258.63Zm-32.48-9.87a.37.37,0,0,0,0-.34c-.13-.13-.43,0-.55.12a.3.3,0,0,0,0,.37.38.38,0,0,0,.17.06.84.84,0,0,0,.26.82c.28.17.45,0,.6-.2s.16-.64-.15-.74A1.17,1.17,0,0,0,327.79,248.76Zm34.75,7.69a1.83,1.83,0,0,0-.65,0,.68.68,0,0,0,.19,1c.29.17.46,0,.6-.2S362.84,256.55,362.54,256.45Zm-48.1,1c-.2.22-.14.5.17.66s.58.2.7-.1.23-.84,0-1S314.6,257.23,314.44,257.41Zm41.38-7c-.24.24-.27.74,0,.86s.78.28,1,0-.13-.65-.27-.81A.44.44,0,0,0,355.82,250.46Zm-39.18-5.35c.1-.17.16-.52.05-.63a.63.63,0,0,0-.62,0c-.12.1-.24.62-.1.74S316.59,245.21,316.64,245.11ZM335.59,238c.15-.13.29-.94,0-1.15s-1,.29-1.12.53a.76.76,0,0,0,.13.9C334.88,238.53,335.37,238.25,335.59,238Zm-10.66,4.3c.08-.06.14-.47.05-.54s-.43.09-.53.18a.43.43,0,0,0,0,.37A.54.54,0,0,0,324.93,242.34Zm34.52,5.25c.08-.07.18-.43.05-.54s-.43.08-.53.18-.09.29,0,.36A.45.45,0,0,0,359.45,247.59Zm-32.87-2.13a.47.47,0,0,0-.13-.47c-.13-.08-.4-.21-.49-.07a.5.5,0,0,0,.05.48C326.1,245.49,326.49,245.61,326.58,245.46Zm3.64-5.84a.49.49,0,0,0-.14-.53.47.47,0,0,0-.44,0,.44.44,0,0,0,0,.43C329.76,239.65,330.11,239.8,330.22,239.62Zm-19.54,17.56a.4.4,0,0,0,.06.46c.09.09.46.19.56.06s-.06-.48-.15-.55A.41.41,0,0,0,310.68,257.18Zm-4.79.91a1.29,1.29,0,0,0-.34-.55,1.47,1.47,0,0,0-2.12.21,1.42,1.42,0,0,0,.07,2,1.2,1.2,0,0,0,1.83-.16,2,2,0,0,0,.59-1,.16.16,0,0,0,.08-.06c.08-.1,0-.34-.11-.45Zm58.66-.33a.37.37,0,0,0,.07.45c.09.09.46.19.56.06s-.06-.48-.16-.54A.39.39,0,0,0,364.55,257.76Zm-37.76-15.47a.23.23,0,0,0-.07-.28c-.06,0-.22,0-.25.08a.2.2,0,0,0,0,.24A.21.21,0,0,0,326.79,242.29Zm-12.27,18.38c0,.06,0,.19,0,.24a.19.19,0,0,0,.28,0,.22.22,0,0,0-.07-.28C314.71,260.55,314.55,260.62,314.52,260.67ZM349.6,244a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.23.23,0,0,0-.07-.28S349.63,244,349.6,244Zm-29,6.8c-.19-.2-.42.08-.53.18s0,.34,0,.36a.54.54,0,0,0,.45,0A.37.37,0,0,0,320.58,250.81Zm20.49-1.56a.77.77,0,0,0-1,.18.72.72,0,0,0,.23,1,.68.68,0,0,0,.93-.29A.57.57,0,0,0,341.07,249.25Zm23.08,2.12c.18-.54-.48-.87-.88-.77s-.28,0-.57-.29a.71.71,0,0,0-1.24.1,1.08,1.08,0,0,0-.12.62,1.2,1.2,0,0,0-.51.89,1.31,1.31,0,0,0,1,1.39,1.75,1.75,0,0,0,1.47-1.18A1.41,1.41,0,0,0,364.15,251.37ZM301.27,257c.19-.38,0-.95-.36-1a1.18,1.18,0,0,1-1.05-.73,1.09,1.09,0,0,0-1.24-.25,1.44,1.44,0,0,0-.28,1.45c.16.28.34.69.74.56a1.52,1.52,0,0,1,1.19.15,1.12,1.12,0,0,0-.27.83c.38.21.7.52,1.11.19a.6.6,0,0,0,.14-.83l-.15-.16A.78.78,0,0,0,301.27,257Zm-14.55-4.2-.1-.05a1.88,1.88,0,0,0,.64-.45,1.68,1.68,0,0,0,.56-1.51c-.11-.58-.85-.66-1.18-1.18-.78-1.22-1.8-.81-2.51-.14a1.43,1.43,0,0,0-.45.84,1.5,1.5,0,0,0,.4,1.2c.31.39.25.9.7,1.13a2.4,2.4,0,0,0,.77.24,1.63,1.63,0,0,0,0,1.6,1.19,1.19,0,0,0,1.46-.36C287.35,253.7,287.25,253.23,286.72,252.8Zm20.76-7.64a.83.83,0,0,0-.2-1.13.93.93,0,0,0-1.38,0,.94.94,0,0,0-.1,1.24A1.35,1.35,0,0,0,307.48,245.16Zm-8.08,8.93a1.28,1.28,0,0,0-.25-1.34.64.64,0,0,0-1,.13c-.48.57-.52,1-.12,1.35A1.13,1.13,0,0,0,299.4,254.09Zm1.25-3.3c-.43-.34-.84-.1-1.22.08a3.66,3.66,0,0,0,0,.47,1.27,1.27,0,0,0-.15,1.11.79.79,0,0,0,.89.46,1,1,0,0,0,.68-1,1.51,1.51,0,0,0-.09-.18A.74.74,0,0,0,300.65,250.79ZM289.7,257a.71.71,0,0,0,.57-.72.52.52,0,0,0-.42-.6c-.51-.14-.77.18-1,.6C289.06,256.63,289.19,257.07,289.7,257Zm0-15a.44.44,0,0,0,.37.06c.12-.08.33-.16.27-.37a.25.25,0,0,0-.34-.18l-.08,0a.75.75,0,0,0-.22-.55.53.53,0,0,0-.86,0,.67.67,0,0,0,0,1A.72.72,0,0,0,289.73,242Zm9.85,7.18a.65.65,0,0,0,.56.29,1,1,0,0,0,.63-.53c.17-.51-.31-.62-.68-.86C299.66,248.35,299.34,248.66,299.58,249.13Zm-8-3.11c.17-.19,0-.61-.25-.87a.38.38,0,0,0-.62,0c-.2.25-.31.53,0,.81A.74.74,0,0,0,291.61,246Zm27.67-5.53a.74.74,0,0,0,.36-.52c0-.46-.6-.57-.83-.49a.63.63,0,0,0-.07.94A.55.55,0,0,0,319.28,240.49Zm-3.48,10.7c.14.26,1,.33,1.1,0a.64.64,0,0,0-.3-.76C316.24,250.27,315.66,250.92,315.8,251.19Zm-11.72-10a.82.82,0,0,0-.14-1c-.22-.07-.47.09-.67.25a.41.41,0,0,0,0,.69C303.53,241.36,303.8,241.5,304.08,241.23Zm8.23,10.29h0c-.19.19-.11.49.16.72a.41.41,0,0,0,.68-.12,1.43,1.43,0,0,0,.13-.45,1,1,0,0,0,.39-.29,1.1,1.1,0,0,0,.09-1.41,1.33,1.33,0,0,0-1.51.12A.92.92,0,0,0,312.31,251.52ZM312,246c-.15-.17-.63,0-.8.09a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11C312,246.6,312.13,246.14,312,246Zm13.11.09c.12-.24.33-.88.15-1.07s-.78.18-.81.29c-.06.29-.21.66,0,.92S325,246.19,325.1,246.06Zm-30.68,4.71a.32.32,0,0,0,.4-.32.72.72,0,0,0-.34-.49c-.15-.13-.28-.29-.5-.29s-.34.31-.21.58A1.08,1.08,0,0,0,294.42,250.77Zm22.25,4.74a1.3,1.3,0,0,0-.93-1.52,1.43,1.43,0,0,0-1,.17l-.13-.13c-.51-.53-1-.36-1.57,0-.25-.31-.38-.78-.91-.57a.66.66,0,0,0-.44.73c.08.56.55.53,1,.54l.17.71-.91.26a3.78,3.78,0,0,0-.18.74,1.39,1.39,0,0,0,.71,1.09c.37.1.81-.21,1-.73.07-.16.13-.33.19-.51a2.19,2.19,0,0,0,1.22-.39l.27.19A1.26,1.26,0,0,0,316.67,255.51Zm-2-9.24c.42,1-.36,1-.29,1.85a1.4,1.4,0,0,0,.12.35.88.88,0,0,0,1.6,0,5.41,5.41,0,0,0,.5-1.36,1.36,1.36,0,0,0-.86-1.36C315.47,245.61,314.77,245.63,314.7,246.27ZM307.15,251a1.15,1.15,0,0,0-1.48,0,1.13,1.13,0,0,0-.07,1.48,1.57,1.57,0,0,0,1.67-.06A1.08,1.08,0,0,0,307.15,251Zm-29.94,9.53a.94.94,0,0,0,.11,1.44,1.11,1.11,0,0,0,1.55-.19,1.15,1.15,0,0,0-.23-1.49A.94.94,0,0,0,277.21,260.54Zm27.31-5.64a1.25,1.25,0,0,0,.14,1.66,1.26,1.26,0,0,0,1.71-1.84A1.24,1.24,0,0,0,304.52,254.9Zm-9.17-.58c.29.43.7.46,1.22-.11a11.88,11.88,0,0,0,.47-1.4.61.61,0,0,0-.48-.77h-.19c-.21-.25-.55-.3-1-.15s-.82.69-.73,1a1.09,1.09,0,0,0,.59.61A.94.94,0,0,0,295.35,254.32Zm26.24-7.18a.9.9,0,0,0,.05-1.3A1.35,1.35,0,0,0,320,246a1,1,0,0,0,.26,1.3A.93.93,0,0,0,321.59,247.14Zm-17.45.07a.89.89,0,0,0,0,1.08c.54.51,1.2.63,1.52.28a1.29,1.29,0,0,0-.15-1.5A1.2,1.2,0,0,0,304.14,247.21Zm4.55-1a.91.91,0,0,0,.17,1.37c.36.33.84.24,1.27-.24a.75.75,0,0,0,.09-1.06A1.48,1.48,0,0,0,308.69,246.18Zm-8.46-.21a1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.45,0c-.24.27,0,1,.36,1.4A.82.82,0,0,0,300.23,246ZM309,252.9a.93.93,0,0,0-.09,1.24.77.77,0,0,0,1.06.06,1.1,1.1,0,0,0-.08-1.35A.62.62,0,0,0,309,252.9Zm-5.93.71a.59.59,0,0,0-.87.15c-.41.48-.51.89-.26,1.13a1.13,1.13,0,0,0,1.35-.06A1,1,0,0,0,303.11,253.61Zm12.25-12.46a.75.75,0,0,0-.09-1.05.69.69,0,0,0-1,.08.74.74,0,0,0,.08,1A.7.7,0,0,0,315.36,241.15Zm-12.17,10.43a.65.65,0,0,0-.18-.94c-.27-.18-.57-.39-.8-.13-.38.45-.41.89-.13,1.14A.75.75,0,0,0,303.19,251.58Zm-19.51,5a.76.76,0,0,0,1-.05.8.8,0,0,0,0-.95,1.55,1.55,0,0,0-.49-1.5,1.27,1.27,0,0,0-1.35-.11c.06-.22.08-.46,0-.56s-.76.18-.94.34-.19.49.11.68a.76.76,0,0,0,.45.15,1.29,1.29,0,0,0,.6,1.32,1.6,1.6,0,0,0,.44.14A.65.65,0,0,0,283.68,256.58ZM304.27,243a.64.64,0,0,0-.89.07.69.69,0,0,0,0,1,.78.78,0,0,0,1,0A.83.83,0,0,0,304.27,243Zm5-3.75a.7.7,0,1,0-1-1,.83.83,0,0,0,.09,1A.61.61,0,0,0,309.24,239.29Zm-13.38,1.89c-.3.34-.33.7-.09.88A1.13,1.13,0,0,0,297,242a.7.7,0,0,0-.14-1A.66.66,0,0,0,295.86,241.18Zm25.06,8.48a.67.67,0,0,0,0,1,.83.83,0,0,0,1,0,.66.66,0,0,0,0-1A.64.64,0,0,0,320.92,249.66Zm-12.28-7.49a.66.66,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,308.64,242.17Zm-14.49,6.27a.59.59,0,0,0,0-.82c-.17-.24-.92-.17-1,.1a.78.78,0,0,0,.13.68A.55.55,0,0,0,294.15,248.44Zm22.14,5.12c0,.15.3.36.42.33a1,1,0,0,0,.61-.38c.15-.39-.2-.57-.48-.73C316.42,252.89,316.16,253.13,316.29,253.56ZM292.7,252.4a.76.76,0,0,0,.59.26c.48-.1.41-.51.38-.87-.36-.24-.71-.31-1,.05A.59.59,0,0,0,292.7,252.4Zm33.93,3.36c.2-.35.44-.67.66-1a.57.57,0,0,0,.15-.92.75.75,0,0,0-1.05-.08,2.31,2.31,0,0,1-.63.31.56.56,0,0,0-.76.24.54.54,0,0,0,0,.15,1,1,0,0,0-.19.35c-.1.34.43,1.08.83,1.19S326.37,256.23,326.63,255.76Zm3.14,2.34a1.71,1.71,0,0,0-.57-.1,1.18,1.18,0,0,0-.43-.55,1.11,1.11,0,0,0-1.48.24,1.77,1.77,0,0,0,.15,1.67.7.7,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.12-1.53.31a1.07,1.07,0,0,0-.19.18.58.58,0,0,0-.16-.32.61.61,0,0,0-.85-.09.82.82,0,0,0,0-.22.56.56,0,0,0-.27-.49,1,1,0,0,0,.55-.85,1.18,1.18,0,0,0-.71-1,.91.91,0,0,0-1,.43,1.28,1.28,0,0,0-1.64.08,1.36,1.36,0,0,0-.35,1.22h0a.62.62,0,0,1,0,.13,1,1,0,0,0-.77.1,1.34,1.34,0,0,0-.81,1.69,1.6,1.6,0,0,0,1.19.69.65.65,0,0,0,.08.83.74.74,0,0,0,1-.08.7.7,0,0,0,0-1l-.11-.08a1.28,1.28,0,0,0,.28-1.33l0-.08a1.18,1.18,0,0,0,1.25-.44,1.67,1.67,0,0,0,.33-.5.58.58,0,0,0,.18.17,1.23,1.23,0,0,0-.56.67c.28.36.45.79.95.62a.56.56,0,0,0,.17-.09.71.71,0,0,0,.18.67.67.67,0,0,0,.79,0,.56.56,0,0,0,.28.58,2.35,2.35,0,0,0,1.59.21c.44,0,.53-.6.9-.23s1.23,1,1.82.26a1.18,1.18,0,0,0-.14-1.41h0a1.32,1.32,0,0,0,1-.58.58.58,0,0,0,.05-.14c.24.16.42,0,.58-.14A.46.46,0,0,0,329.77,258.1ZM285.4,241.77c.11-.15.21-.49.12-.62a.65.65,0,0,0-.62,0c-.13.09-.31.59-.18.73S285.33,241.87,285.4,241.77ZM305,236.84c.17-.12.39-.91.14-1.15s-1,.19-1.18.41a.8.8,0,0,0,0,.91C304.25,237.25,304.77,237,305,236.84ZM294,239.93c.08-.05.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.37A.52.52,0,0,0,294,239.93Zm5.55-2.12a.49.49,0,0,0-.08-.54.43.43,0,0,0-.44,0,.42.42,0,0,0,0,.42C299,237.8,299.38,238,299.5,237.81Zm32.13,21.81c-.13.12-.06.37,0,.46s.43.24.55.12,0-.48-.1-.56A.41.41,0,0,0,331.63,259.62Zm2.33-4.78c.09-.1,0-.34-.06-.46s-.34-.19-.48-.06.06.42.15.52A.35.35,0,0,0,334,254.84ZM295.8,240.08c.08-.1,0-.23-.05-.28s-.21,0-.25,0a.2.2,0,0,0,0,.24A.2.2,0,0,0,295.8,240.08ZM281.58,257a.21.21,0,0,0,0,.25.21.21,0,0,0,.29,0,.23.23,0,0,0,0-.28C281.78,256.91,281.61,257,281.58,257Zm37-12.46c.08-.1,0-.23,0-.28a.25.25,0,0,0-.25.05c0,.05-.08.18,0,.24A.21.21,0,0,0,318.57,244.54Zm-30,3.86a.39.39,0,0,0,.1-.53c-.17-.22-.43,0-.55.12s-.06.33,0,.36A.52.52,0,0,0,288.59,248.4ZM309.77,260c-.25-.46-.67-.88-.62-1.06s1.14-.51,1.26-1.34a1.43,1.43,0,0,0-1.19-1.57,2.4,2.4,0,0,0-2.19,1.32c-.18.65.53,1.09.51,1.27s-1.05.57-1.24,1.38a2,2,0,0,0,2.71,2,1.88,1.88,0,0,0,.73-.7.65.65,0,0,0,.67-.18.81.81,0,0,0,0-1A.61.61,0,0,0,309.77,260Zm-.45-10.56a.57.57,0,0,0-.1-.87.75.75,0,0,0-1,.08.72.72,0,0,0,.12,1A.69.69,0,0,0,309.32,249.45Zm20.46,4.35a1.68,1.68,0,0,0,2-.33.55.55,0,0,0,.47.29.68.68,0,0,0,.74-.4.75.75,0,0,0-.18-1,.92.92,0,0,0-1.08.15.8.8,0,0,0-.57-.17c-.41,0-.29,0-.54-.36a.71.71,0,0,0-1.24,0A1.41,1.41,0,0,0,329.78,253.8Zm-62.44-11.86a1.57,1.57,0,0,0,.84-1.74.85.85,0,0,0-.19-.32.51.51,0,0,0,.09-.78c-.12-.12-.11-.47.06-.39s.4,0,.62-.42a.72.72,0,0,0-.22-1,1,1,0,0,0-1.44.34c-.32.5-.1.76-.33,1s-.15.52.08.82a2.28,2.28,0,0,0-.51.09,1.15,1.15,0,0,0-.75,1.44A1.5,1.5,0,0,0,267.34,241.94Zm29.19,14.62a1.36,1.36,0,0,0-.44-1.19,1.11,1.11,0,0,0-1.49.08,1.76,1.76,0,0,0,0,1.67.76.76,0,0,0-.54,0c-.35.21-.57-.71-1.07-.47s-.95-.19-1.5.12a1.25,1.25,0,0,0-.83,0,1.17,1.17,0,0,0-.9,1.4l-.07-.08c-.46-.41-.81-.45-1.11-.13a.87.87,0,0,0,0,1.3,1.5,1.5,0,0,0,1.35-.16.63.63,0,0,0,.15-.24,1.36,1.36,0,0,0,1.53.36,1.1,1.1,0,0,0,.54-.64l.47,0c.44,0,.6-.54.92-.13s1.11,1.16,1.78.46a1,1,0,0,0,.21-.47A1.17,1.17,0,0,0,297,257,.87.87,0,0,0,296.53,256.56ZM280.58,249a1.32,1.32,0,0,0,1.11-1.49,4.6,4.6,0,0,0-.74-.46,1,1,0,0,0-1.22.33,1.11,1.11,0,0,0,.14,1.41A1,1,0,0,0,280.58,249Zm-14.16-11.08a1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.18-.39,1,1,0,0,0-.64,1.38A1,1,0,0,0,266.42,237.92Zm-10,3a1.21,1.21,0,0,0-.65,1.36c.12.37.85.61,1.35.44a.84.84,0,0,0,.6-1C257.51,241.07,256.85,240.68,256.42,240.87Zm21.48,6.44a1.54,1.54,0,0,0,.68-1.37.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14S277.49,247.47,277.9,247.31Zm0-11.34c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,277.87,236Zm-4.84-.63c-.48.15-.83.68-.7,1a1.09,1.09,0,0,0,1.08.64c.41-.14.57-.77.35-1.34A.52.52,0,0,0,273,235.34ZM255.17,257.7a.75.75,0,0,0,.55,1.39.84.84,0,0,0,.36-1A.73.73,0,0,0,255.17,257.7Zm10.39-27.3c.17-.06.22-.31.2-.43s-.28-.41-.44-.35-.21.43-.17.54S265.4,230.45,265.56,230.4Zm18.25,5.53c.23-.06.15-.42.1-.47s-.22-.26-.42-.18a.25.25,0,0,0-.14.35C283.42,235.75,283.57,236,283.81,235.93Zm-11,5.67c0,.28.58.61.93.57a.51.51,0,0,0,.41-.67c-.11-.56-.36-.89-.64-.86A1.19,1.19,0,0,0,272.81,241.6Zm5.33,15.71c.05-.7-.3-1-1.18-1.13a5,5,0,0,0-.63-1,.78.78,0,0,0-1.1,0c-.34.39-.62.82-.94,1.25-.69,0-.73,0-.81.78.14.26.76.19.53.71a5.75,5.75,0,0,0-.93,0,.88.88,0,0,0-.7.71c-.12.36.18.53.37.72a1.22,1.22,0,0,0,1.38.17q.11-.51.21-1.08l.33.27c.46.41.42.71-.19.88a1.15,1.15,0,0,0-.87,1.24,1.19,1.19,0,0,0,.83,1.19,1,1,0,0,0,1.32-.48,2.75,2.75,0,0,0,.28-1.16c0-.32,0-.58.32-.74s.4-.58.16-.95C277.56,258.66,278.07,258.19,278.14,257.31Zm4,.36a6,6,0,0,0-.84-.11c.14-.3.18-.57.33-.68a.88.88,0,0,0,.3-1.27,1.32,1.32,0,0,1-.08-.44c-.08-.5-.32-.77-.64-.72s-.62.45-.45,1c0,.05.09.09.1.15.07.29,0,.48-.35.45-.12,0-.24-.08-.36-.09a1.22,1.22,0,0,0-1.16.74,1,1,0,0,0,.3,1.3,1.76,1.76,0,0,0,1.68.39,4.49,4.49,0,0,0,.31.79.83.83,0,0,0,.11.15.64.64,0,0,0-.14.08,1,1,0,0,0,0,1.33.66.66,0,0,0,1,.13,1.12,1.12,0,0,0,.13-1.32,1.14,1.14,0,0,0,.37-.45A.93.93,0,0,0,282.16,257.67Zm-17-2.34c0-.54-.27-.72-.58-.77s-.56.18-.7.48-.33.63-.47,1-.35.72-.06,1.12a.59.59,0,0,1,0,.4,3.3,3.3,0,0,0-.12.64s-.05-.07-.1-.09c-.41-.12-.65.41-.8.62s0,.58.38.69.65,0,.67-.36c0-.09,0-.23,0-.36a1.55,1.55,0,0,0,.67.31c.38.1.72,0,.8-.38a1.81,1.81,0,0,1,.56-.89,1.35,1.35,0,0,0,0-2A2.69,2.69,0,0,1,265.15,255.33Zm26.57-8.1a1.26,1.26,0,0,0,1.79.06l.35-.29c.18.23.34.46.52.66a.67.67,0,0,0,1,.1,1.41,1.41,0,0,0,.29-.31.38.38,0,0,0,.13.19c.26.19.44.05.61-.13a.46.46,0,0,0-.06-.76,1.93,1.93,0,0,1-1.4-.81,4.76,4.76,0,0,0-.91.05,3.07,3.07,0,0,0-.29-.34,1.4,1.4,0,0,0-1.5-.34,1.58,1.58,0,0,0-.79,1.35A.82.82,0,0,0,291.72,247.23Zm-18.66,4.07a1,1,0,0,0,.69-1.16l.15,0a1.33,1.33,0,0,0,.56-1.59,1.4,1.4,0,0,0-1.59-.75,1.37,1.37,0,0,0-.9,1.16,1.36,1.36,0,0,0-.68,1.54A1.34,1.34,0,0,0,273.06,251.3Zm15,6.85a1.28,1.28,0,0,0,.65-1.62,1.53,1.53,0,0,0-1.05-.82c.07-.2.09-.55,0-.65s-.71.07-.74.17a1.25,1.25,0,0,0,0,.58,1.21,1.21,0,0,0-.66,1.42A2,2,0,0,0,288.09,258.15ZM271.8,255a1.28,1.28,0,0,1,.66-1.5l-.07-.11a.8.8,0,0,1,.33-1,.68.68,0,0,1,.89.38.72.72,0,0,1,0,.52c.24-.55.73-.89,1.11-.73a1.11,1.11,0,0,1,.46,1.27,1,1,0,0,1-1.07.45,1.77,1.77,0,0,1-.88,1.55A1.29,1.29,0,0,1,271.8,255Zm1.76-1.51h0a.28.28,0,0,1,0-.09A.41.41,0,0,0,273.56,253.48Zm1.81-2a1.45,1.45,0,0,0,1.83.49,1,1,0,0,0,.49-1.36c-.46-.9-.78-.9-1.71-.64A1.12,1.12,0,0,0,275.37,251.49Zm-6-11.59a.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54,1.18,1.18,0,0,0-1.38-.76C269.41,238.33,269.13,239.19,269.38,239.9Zm-1.13,8.82a.63.63,0,0,0,.36-.47,1.26,1.26,0,0,0,.95-.49.56.56,0,0,0,.69.25.71.71,0,0,0,.5-.85.66.66,0,0,0-.9-.36.52.52,0,0,0-.19.11,1.36,1.36,0,0,0-.81-.78.85.85,0,0,0-1,.63.36.36,0,0,0,0,.1,1.31,1.31,0,0,0-.58.11c-.51.21-.84.75-.68,1.12A1.49,1.49,0,0,0,268.25,248.72Zm9.83-7.35c.4-.16.89-1.09.74-1.42a1.19,1.19,0,0,0-1.46-.34c-.51.21-.63.68-.35,1.3A1,1,0,0,0,278.08,241.37Zm12.26,12.93a1.68,1.68,0,0,0,.84.19,1.3,1.3,0,0,0,1.36,1.13,1.28,1.28,0,0,0,1.16-1c.09-.49-.57-1-1.26-1.12a.87.87,0,0,0-.53.1s0,0,0-.05c-.24-.57-.77-.88-1.19-.69a1.14,1.14,0,0,0-.66.69.64.64,0,0,0-.7,0c-.41.26-.29.68-.19,1.11.43.1.87.29,1.14-.2A.54.54,0,0,0,290.34,254.3Zm-6.59,5.91c-.43.16-.53.76-.25,1.43a.9.9,0,0,0,1,.37,1.28,1.28,0,0,0,.59-1.14A1.25,1.25,0,0,0,283.75,260.21Zm-20.63-18.4a.81.81,0,0,0,.33-.33.55.55,0,0,0,.29-.35c.07-.26.1-.55-.24-.69a.71.71,0,0,0-.21,0,.84.84,0,0,0-.92-.37,1.23,1.23,0,0,0-.53,1.34A1.13,1.13,0,0,0,263.12,241.81Zm12.7,1.15a.69.69,0,0,0-.23-.17c-.55-.12-.81.54-.66.83a.65.65,0,0,0,.79.2.5.5,0,0,0,.21-.28,1.25,1.25,0,0,0,1.25.29,1.18,1.18,0,0,0,.35-1.23.81.81,0,0,0-.93-.37A1.31,1.31,0,0,0,275.82,243Zm-18.53,15.69a1.26,1.26,0,0,0,.58-1.22,1.3,1.3,0,0,0-1.36-.44.57.57,0,0,0-.39.78C256.38,258.46,256.84,258.81,257.29,258.65Zm30.94,1a.94.94,0,0,0-.46,1,.7.7,0,0,0,.94.45.78.78,0,0,0,.48-.88C289.07,259.87,288.48,259.52,288.23,259.61Zm-12-23.58c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.7.7,0,0,0-.32.93A.77.77,0,0,0,276.26,236Zm-13.67-1.52a.32.32,0,0,0-.31-.16.38.38,0,0,0-.24.22,1.15,1.15,0,0,0-.16,1.19c.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.8.8,0,0,0,262.59,234.51Zm11.86,3.37a.81.81,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31c.29-.1.34-.32.2-.63-.08,0-.21-.14-.29-.11a1.48,1.48,0,0,1-.95-.12C274.86,237.5,274.54,237.71,274.45,237.88Zm-6.59,14.72a.75.75,0,0,0,.83-.82,2.44,2.44,0,0,1,.36.7.78.78,0,0,0,.55.4,6.23,6.23,0,0,1,1,.28.83.83,0,0,0,1.05-.44c.18-.48.12-.8-.22-1a.41.41,0,0,0,.05-.09c.17-.48-.06-.84-.69-1.06a1.18,1.18,0,0,0-.74,0,.69.69,0,0,0-.47-.3,1,1,0,0,0-.94.52.67.67,0,0,0-.16.57,1,1,0,0,0-.91-.1.54.54,0,0,0-.3.76A1.07,1.07,0,0,0,267.86,252.6Zm11.23.13a.93.93,0,0,0-1.15.62,1.25,1.25,0,0,0,0,.71.71.71,0,0,0-.44.94.69.69,0,0,0,.83.36.84.84,0,0,0,.47-.68,1,1,0,0,0,.59-.26c.27-.29.18-.59.09-.91S279.45,252.91,279.09,252.73Zm9.23-3.17c0,.39-.05.81.38,1a.62.62,0,0,0,.84-.33,1.47,1.47,0,0,0,.34,1.05,1.13,1.13,0,0,0,1.48.05.75.75,0,0,0,.57.13,1.21,1.21,0,0,0,.78-1.38,1.11,1.11,0,0,0-1-.69h0a1.43,1.43,0,0,0-1.9.05,1.13,1.13,0,0,0-.21.39.51.51,0,0,0-.11-.32C289.13,249.14,288.72,249.27,288.32,249.56Zm-22.64-6a.7.7,0,0,0-.62-.49c-.16-1-1.07-1.19-1.92-1.09a1.45,1.45,0,0,0-.86.41,1.53,1.53,0,0,0-.39,1.2.78.78,0,0,1,0,.22.68.68,0,0,0-.31.86,1.22,1.22,0,0,0,.48.65,2,2,0,0,0,1.95.8,1.67,1.67,0,0,0,1.34-.9,1,1,0,0,0-.08-.87h0A.59.59,0,0,0,265.68,243.56Zm19.75-9.37c.2-.35-.51-1-.94-.88s-.76.66-.58,1S285.23,234.54,285.43,234.19Zm-7.65-.32a.61.61,0,0,0,.41-.78.55.55,0,0,0-.74-.31.5.5,0,0,0-.33.65A.53.53,0,0,0,277.78,233.87ZM283.51,248a.73.73,0,0,0-.42.92,2,2,0,0,0,.72.13c.31,0,.4-.35.29-.64S283.86,247.93,283.51,248Zm-8.67-17.25c.09-.18-.21-.56-.36-.83a.28.28,0,0,0-.4-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,274.84,230.77Zm-6.72,13a.67.67,0,0,0-.42.88.61.61,0,0,0,.85.29.71.71,0,0,0,.34-.93A.54.54,0,0,0,268.12,243.75Zm-6,16.14c-.27.27,0,.94.38.93s.64-.54.43-1C262.78,259.63,262.3,259.67,262.08,259.89Zm28.16-15c.14-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.63.63,0,0,0,290.24,244.9Zm4.36-1.09a.64.64,0,0,0,.76-.3.61.61,0,0,0-.09-.53.49.49,0,0,0-.11-.25c-.12-.09-.38-.25-.48-.12a.66.66,0,0,0,0,.15A.61.61,0,0,0,294.6,243.81Zm-28.18-12.6c-.12,0-.17.3-.16.44s.22.32.4.26.15-.4.11-.53A.36.36,0,0,0,266.42,231.21Zm15.19,14.1a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S281.81,245.26,281.61,245.31Zm-.65,4.38a1.24,1.24,0,0,0-1,1.31,1.16,1.16,0,0,0,1.34,1.18c.91-.2,1.34-.82,1.26-1.39A1.59,1.59,0,0,0,281,249.69Zm-21.25-2.42h.08c.5-.07.74-.85.66-1.55a1.2,1.2,0,0,0-.82-.83.41.41,0,0,0-.26-.37c-1-.47-1.19.54-1.53.5s-.85-.53-1.35-.63c-.7-.15-1.41.1-1.49.85a1.22,1.22,0,0,0,1.09,1.46c1,.16,1-.88,1.55-.56s0,.72.88,1.12A1.31,1.31,0,0,0,259.71,247.27Zm22.05-4.84a1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84,1.08,1.08,0,0,0-.49-.91c-.36-.17-.67-.49-1-.38a.67.67,0,0,0-.45.41,1.11,1.11,0,0,0-.23.62A1.47,1.47,0,0,0,281.76,242.43Zm-2.84,1.41a.34.34,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49S279,243.7,278.92,243.84Zm6.74,1.41c.39.12,1,.26,1.12-.28s-.2-.71-.37-.74-.38-.32-.19-.35.33-.23.25-.71-.3-.72-.79-.71a1,1,0,0,0-1,1.13c0,.58.37.66.35,1S285.27,245.14,285.66,245.25Zm-.35-6.79c.48,0,1,0,1.44-.37l0-.68c.53-.35.85-.88.68-1.21a.63.63,0,0,0-.71-.36c-.57.1-.72.3-.78,1a9.71,9.71,0,0,0-1,.86A.45.45,0,0,0,285.31,238.46Zm-27,16.65a1.44,1.44,0,0,0,.67-1.71,1.13,1.13,0,0,0-1.39-.72c-.73.28-1.24,1.07-1,1.62A1.55,1.55,0,0,0,258.32,255.11Zm4-16.16a4.22,4.22,0,0,0-.33-.8,1.05,1.05,0,0,0-.43-.38s0,0,0,0c0-.3-.57-.47-.82-.27a1.06,1.06,0,0,0-.23.41,1,1,0,0,0-.43,1,1,1,0,0,0,.45.59A1.32,1.32,0,0,0,262.34,239Zm-6.63-16.77a1.38,1.38,0,0,0,1.17-.4,1.74,1.74,0,0,0,.11.18.75.75,0,0,0,1,.25,1.46,1.46,0,0,0,.3-1.49.89.89,0,0,0-1.32-.09,1,1,0,0,0-.52-.36,1.13,1.13,0,0,0-.4,0,.71.71,0,0,0-.13-.35.72.72,0,0,0-1,0,.67.67,0,0,0,0,1,1.1,1.1,0,0,0,.18.14.05.05,0,0,1,0,0A1,1,0,0,0,255.71,222.18Zm2.3,37c-.47-.12-.83.16-1,.8s0,1,.42,1.05a1.86,1.86,0,0,0,1.4-.64A1,1,0,0,0,258,259.16Zm1-23.75c-.18.58,0,1,.4,1.14a1.56,1.56,0,0,0,1.36-.7.89.89,0,0,0-.71-1.08C259.48,234.58,259.19,234.76,259,235.41Zm6.81-6.28c.44.1.8,0,.91-.37a1.49,1.49,0,0,0-.63-1.37c-.5-.14-.87.12-1,.74S265.2,229,265.81,229.13Zm-4.42-4.7a1.1,1.1,0,0,0,.5,1.15c.41.13.91-.28,1.07-.87a.52.52,0,0,0-.4-.69C262.08,223.86,261.49,224.07,261.39,224.43Zm-1.92-8.82c.17.06.36-.11.41-.22s0-.5-.15-.55-.42.23-.45.34S259.3,215.56,259.47,215.61Zm11.43,15.26c.22.1.37-.24.36-.31s0-.34-.24-.4a.25.25,0,0,0-.32.2C270.69,230.5,270.68,230.78,270.9,230.87ZM259.09,230a.52.52,0,0,0,.73-.3c.24-.52.24-.93,0-1.07a1.15,1.15,0,0,0-1.13.36C258.54,229.18,258.78,229.77,259.09,230Zm13,9.16c-.07.19.18.38.27.39s.35.07.43-.14a.26.26,0,0,0-.17-.35C272.51,239,272.17,238.92,272.11,239.11Zm-1.52,5.55a1.42,1.42,0,0,0,.09.27c-.3.31-.17.66.08.95a.81.81,0,0,0,.69-.17,1.57,1.57,0,0,0,.54.06l.46,0c0,.29,0,.57,0,.84.07.51.27.69.78.69a1,1,0,0,0,1-.64.8.8,0,0,0,0-.77,1.06,1.06,0,0,0,.12-1,.53.53,0,0,0-.78-.13,2,2,0,0,0-.34.28,2.55,2.55,0,0,0,0-.39,1.4,1.4,0,0,0-1-1.16,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,270.59,244.66Zm-8.23,7.9a1.62,1.62,0,0,0-.5.11c-.77.31-1.09.9-.82,1.56a1.36,1.36,0,0,0,1.63.8,1.45,1.45,0,0,0,.77-.75,1.7,1.7,0,0,0,1.44-1.16,1.1,1.1,0,0,0-.86-1.37A1.2,1.2,0,0,0,262.36,252.56Zm-.54-3.8a1.37,1.37,0,0,0-1.25.26.83.83,0,0,0-.6-.11,1.23,1.23,0,0,0-.7,1.42c.13.33.73.48,1.21.32a.05.05,0,0,0,0,0,1.46,1.46,0,0,0,.68.69,1,1,0,0,0,.72-.06.41.41,0,0,0,.58.19c.2-.1.54-.31.44-.6a.57.57,0,0,0-.32-.31l.06-.14A1.49,1.49,0,0,0,261.82,248.76Zm-5.75-8.86a1,1,0,0,0,1.2-.81c.16-1-.09-1.18-1-1.53a.78.78,0,0,0-.45,0,1.45,1.45,0,0,1-.25-.09l-.17.13a.84.84,0,0,0-.1.22,1.21,1.21,0,0,0-.41.64C254.75,239,255.32,239.71,256.07,239.9Zm1.52-13.17a1.11,1.11,0,0,0,1.49-.82,1.19,1.19,0,0,0-.67-1.43c-.53-.19-1.27.34-1.49,1.06A.91.91,0,0,0,257.59,226.73Zm6.91,4.43c.09-.44-.39-1-1-1.14s-.91.18-1,.85a.91.91,0,0,0,.13.61,1,1,0,0,0-.16.06.56.56,0,0,0-.15.52c.07.19.29.43.46.44.4,0,.59-.37.6-.63C263.81,231.8,264.44,231.45,264.5,231.16Zm-3.59,23.68a.94.94,0,0,0-.85.45,1,1,0,0,0-.43.06c-.8.31-1.22,1-1,1.61a1,1,0,0,0,.33.42.67.67,0,0,0-.48.35.72.72,0,0,0,.08.93c.37.38.78.11,1.22-.05a1.65,1.65,0,0,0-.12-.89,1,1,0,0,0,.57,0,1.44,1.44,0,0,0,.77-1,1.06,1.06,0,0,0,.88-.62C262,255.73,261.37,254.94,260.91,254.84Zm5.55-6.27a1.12,1.12,0,0,0-.93.17.67.67,0,0,0-.56-.39.67.67,0,0,1,.15-.06c.38-.08.75-.58.54-1.36s-1.2-1.09-1.58-.64-.21.79-.42.82-.67-.15-.89.17.41,1.31.58,1.41.72.15.63.55-.47.73-.31,1.13.47,1.34,1.14,1.39.55-.54.82-.82a.9.9,0,0,0,.25-.72,1.2,1.2,0,0,0,.34.17.69.69,0,0,0,.8-.56A1,1,0,0,0,266.46,248.57Zm-9.27,3.17a1.27,1.27,0,0,0-.7-1.33c-.45-.12-.89.3-1.06,1a.88.88,0,0,0,.61.89A1.27,1.27,0,0,0,257.19,251.74Zm4.17-20.05c-.69-.16-1.22,0-1.31.46a.95.95,0,1,0,1.85.38A.81.81,0,0,0,261.36,231.69Zm-.91,20.89a.93.93,0,0,0-1,.52.69.69,0,0,0,.49.92.76.76,0,0,0,.9-.42A1.08,1.08,0,0,0,260.45,252.58Zm4.31-26.09a1,1,0,0,0,1-.46,1,1,0,0,0-.62-1,.7.7,0,0,0-.81.55A.79.79,0,0,0,264.76,226.49Zm-7.33,5.41a1.89,1.89,0,0,0-.62.07s0-.07-.05-.1a1,1,0,0,0-1.32,0,.91.91,0,0,0-.08,1.38.89.89,0,0,0,1.27.26,1.22,1.22,0,0,0,.28-.48,1.19,1.19,0,0,0,.15.09h0c.16.41.7.76,1,.64s.41-.73.29-1.07a.62.62,0,0,0-.38-.38A.53.53,0,0,0,257.43,231.9Zm9.63,13.89a.84.84,0,0,0,.38-.62c-.07-.5-.48-.63-1-.64-.27.3-.53.62-.28,1A.6.6,0,0,0,267.06,245.79Zm4.6,12a1.71,1.71,0,0,0-.09-1c-.31-.59-1.13-.42-1.24-.58s.38-1.13,0-1.85a2,2,0,0,0-2.26-.6,2.54,2.54,0,0,0-.89.67,1.12,1.12,0,0,0-.37.58,1.17,1.17,0,0,0,.25,1.09,1.1,1.1,0,0,0,.33.43c.51.37,1.46.33,1.58.55s-.49,1.15,0,1.84a1.27,1.27,0,0,0,1.17.56,1.43,1.43,0,0,0-.39.11.82.82,0,0,0-.47,1.19,1.15,1.15,0,0,0,1.42.67,1.13,1.13,0,0,0,.63-1.43,1,1,0,0,0-1.06-.55,1.85,1.85,0,0,0,.64-.21,1.12,1.12,0,0,0,.35-.34.51.51,0,0,0,.42.16.59.59,0,0,0,.6-.58.81.81,0,0,0-.24-.62A.76.76,0,0,0,271.66,257.76Zm1.58-27.33c.37-.16.18-1.11-.24-1.26s-1,.08-1,.43S272.87,230.59,273.24,230.43Zm-5.19-5.17a.55.55,0,0,0-.42-.69.5.5,0,0,0-.64.33.54.54,0,0,0,.27.75A.61.61,0,0,0,268.05,225.26Zm-2.18-4.41a.62.62,0,0,0,.86.56c.17-.1.16-.58.19-.89a.27.27,0,0,0-.23-.34A.83.83,0,0,0,265.87,220.85ZM270,241.71a.65.65,0,0,0,.8.21c.29-.19.27-.42-.13-1A.61.61,0,0,0,270,241.71Zm-10.3-24.93c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,259.68,216.78Zm4.05,20.74a.25.25,0,0,0-.15-.39c-.18-.07-.3,0-.38.14v0a.45.45,0,0,0-.63-.13c-.16.15-.59.44-.38.77s.69.25.92.19a.35.35,0,0,0,.25-.45A.25.25,0,0,0,263.73,237.52Zm-4.45,5a1.34,1.34,0,0,0,1.83-.38,1.59,1.59,0,0,0-.65-1.84,1.33,1.33,0,0,0-.59-.11.56.56,0,0,0-.69-.11.41.41,0,0,0-.22.62l-.07.08A1.15,1.15,0,0,0,259.28,242.5Zm8-8.39c-.19-.34-.25-.79-.57-.89a.69.69,0,0,0-.6.07c-.17.09-.38.11-.55.36a1.5,1.5,0,0,0-.16,1.25,1.09,1.09,0,0,0,.92.67.9.9,0,0,0,.82-.43A1.09,1.09,0,0,0,267.28,234.11Zm4.71.25.44-.52c.63,0,1.2-.21,1.26-.58a.63.63,0,0,0-.36-.71c-.52-.26-.76-.19-1.21.33a9,9,0,0,0-1.32.11.45.45,0,0,0-.19.82C271,234.05,271.4,234.45,272,234.36ZM259.66,218a1.35,1.35,0,0,0-.13,1.68.85.85,0,0,0,1.15,0,.93.93,0,0,0,.18-1.37C260.54,217.9,259.94,217.75,259.66,218Zm5.85-15.3a.68.68,0,0,0,1,.11.54.54,0,0,0,.15-.85.66.66,0,0,0-1-.15A.7.7,0,0,0,265.51,202.7Zm-9,9.06a1,1,0,0,0,.43.71c.48.25.66-.22,1-.54-.24-.48-.5-.84-1-.68A.67.67,0,0,0,256.47,211.76Zm4.87-8.79a.75.75,0,0,0-.17.9c.16.2.6.14.9-.11a.39.39,0,0,0,.06-.62C261.91,202.91,261.65,202.75,261.34,203Zm2.79,13.18c-.23.22-.4.47-.19.79a.83.83,0,0,0,1,0,.76.76,0,0,0-.14-.7A.41.41,0,0,0,264.13,216.15Zm-6.84,6.95a.68.68,0,0,0,0,.62c.09.15.52.4.71.28s.11-.61,0-.8A.49.49,0,0,0,257.29,223.1Zm-1.46,13.19c-.29.19-.07.56,0,.65s.82.47,1,.32,0-.81-.15-.85C256.47,236.31,256.12,236.1,255.83,236.29Zm.83-30.95a1.07,1.07,0,0,0-.62.56.42.42,0,0,0,0,.19.79.79,0,0,0-.57-.06.51.51,0,0,0-.15.5.55.55,0,0,0,.49.21.64.64,0,0,0,.31-.48.42.42,0,0,0,.18.09.77.77,0,0,0,.54-.26c.15-.13.33-.23.37-.45S257,205.25,256.66,205.34Zm-1.73,22.36a5.63,5.63,0,0,0,1.26.72,1.37,1.37,0,0,0,1.48-.64c.16-.28.25-1-.37-1.15-1.06.26-1-.51-1.78-.57a1,1,0,0,0-.36.06A.88.88,0,0,0,254.93,227.7Zm1.32-26.36a1.25,1.25,0,0,0-.08,1.85,1.15,1.15,0,0,0,1.67.24,1.42,1.42,0,0,0,.24-1.88A1.49,1.49,0,0,0,256.25,201.34ZM258,217.41a1.2,1.2,0,0,0,.07-1.35.88.88,0,0,0-1.06-.2c-.59.45-.82,1.08-.52,1.45A1.29,1.29,0,0,0,258,217.41Zm3.39-6.23c-.23-.28-1-.2-1.44.14a.82.82,0,0,0,0,1.08,1,1,0,0,0,1.23.2A1.23,1.23,0,0,0,261.35,211.18Zm1.43,15.75a.69.69,0,0,0-.58,0,.83.83,0,0,0-.38.56c0,.14.18.35.33.44a.52.52,0,0,0,.1.18.73.73,0,0,0,.87.18l.06,0c.29.08.46-.07.53-.39a1,1,0,0,0-.14-.24.79.79,0,0,0-.18-.53A.7.7,0,0,0,262.78,226.93Zm-1.61-11.15a.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07.63.63,0,0,0,.08-.89A.69.69,0,0,0,261.17,215.78Zm4,5.68a.61.61,0,0,0-.12.88.69.69,0,1,0,1.12-.81A.81.81,0,0,0,265.17,221.46Zm-.74-12.86a1.13,1.13,0,0,0-.14,1.19.7.7,0,0,0,1,0,.67.67,0,0,0,0-1C265,208.48,264.65,208.39,264.43,208.6Zm-3,12.5a.71.71,0,0,0-.19,1,.54.54,0,0,0,.85.17.66.66,0,1,0-.66-1.14Zm-3-15.1a.59.59,0,0,0,.8.15c.26-.13.31-.88.06-1a.78.78,0,0,0-.7,0A.54.54,0,0,0,258.39,206Zm1.31,2.48c.13-.19.28-.42.2-.62a.81.81,0,0,0-1-.07c-.23.23-.12.44,0,.63A.46.46,0,0,0,259.7,208.48Zm1.64-15.89c-.1-.3-.45-.31-.77-.1a.41.41,0,0,0-.07.69c.17.16.68.42.83.3S261.41,192.81,261.34,192.59Zm5,5.13c-.16.11-.12.6,0,.69s.46.28.6.21a.65.65,0,0,0,.12-.61C267,197.87,266.53,197.61,266.38,197.72Zm2.86,21.14c.28-.21,0-1-.21-1.22a.77.77,0,0,0-.9-.11c-.28.2-.13.75,0,1S269,219.08,269.24,218.86Zm-2.31-12.16a.51.51,0,0,0-.11.43c0,.1.41.26.5.19s0-.43,0-.56A.4.4,0,0,0,266.93,206.7Zm-3.35.67c-.11.06-.33.4-.2.52a.44.44,0,0,0,.48,0c.11-.1.31-.33.19-.45A.44.44,0,0,0,263.58,207.37Zm5,5.59a.46.46,0,0,0,.06-.44.43.43,0,0,0-.42-.09c-.1.07-.33.37-.19.52A.48.48,0,0,0,268.59,213Zm-13-23c.1.14.47.07.56,0a.39.39,0,0,0,.1-.46c-.1-.14-.35-.11-.46,0S255.52,189.79,255.62,189.92Zm.64-5.72a.36.36,0,0,0-.05.39c.08.1.33.06.46,0s.25-.3.13-.46S256.38,184.13,256.26,184.2Zm10.4,24.74s0-.21,0-.26a.21.21,0,0,0-.24,0,.2.2,0,0,0,0,.29A.22.22,0,0,0,266.66,208.94Zm-8.23,21.49a.22.22,0,0,0,0,.3.22.22,0,0,0,.28,0c.05,0,0-.21,0-.26A.22.22,0,0,0,258.43,230.43ZM257,166.36a1.36,1.36,0,0,0,1,1.34c.36.06.78-.33.84-.79a.92.92,0,0,0-.78-1.14C257.6,165.69,257.06,166,257,166.36Zm11.34,8.72a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-.95.62.62,0,0,0-.83.44A.57.57,0,0,0,268.35,175.08Zm-10.26,3.79a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S257.72,178.94,258.09,178.87Zm1.41-16.16c.3.08.82-.43.76-.66s-.33-.35-.57-.43a.42.42,0,0,0-.58.38C259.09,162.31,259.12,162.62,259.5,162.71Zm-4.2,12.49a.92.92,0,0,0,.86,1.07,1.12,1.12,0,0,0,1.24-.7,1.35,1.35,0,0,0-.93-1.2A.92.92,0,0,0,255.3,175.2Zm3.35-3.46a.69.69,0,0,0,.43.45c.17,0,.65-.05.71-.27s-.32-.53-.5-.62S258.6,171.46,258.65,171.74Zm7.71,10.8c-.09.33.32.47.46.45s.92-.19,1-.45-.58-.56-.67-.52C266.85,182.12,266.45,182.2,266.36,182.54ZM261,174.37c-.62.89-1.06.26-1.71.75a1.49,1.49,0,0,0-.23.29.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46C262,174.66,261.59,174.07,261,174.37Zm-1,26.13h-.11a1,1,0,0,0-.14-.35c0-.07-.32-.11-.36-.06a.51.51,0,0,0-.11.43.24.24,0,0,0,.06.09,1.4,1.4,0,0,0-.76,1,1.46,1.46,0,0,0,1,1.5,1.33,1.33,0,0,0,1.55-.95A1.94,1.94,0,0,0,260,200.5Zm3.13-21a.92.92,0,0,0,.86,1.09c.59.08,1.08-.21,1.12-.66a1.35,1.35,0,0,0-1-1.35C263.7,178.54,263.21,179,263.15,179.54Zm-5.32-10.27c-.53-.1-.94.24-1.05.87s.25.84.88.94.87-.12.95-.5A1.47,1.47,0,0,0,257.83,169.27Zm1.08,13.36a.7.7,0,0,0-.84.61.84.84,0,0,0,.73.79.75.75,0,0,0,.74-.66A.66.66,0,0,0,258.91,182.63Zm6.76-10.48a.76.76,0,0,0,.84-.64.7.7,0,0,0-.63-.83.72.72,0,0,0-.77.59A.7.7,0,0,0,265.67,172.15Zm-8.44-7.64a.82.82,0,0,0,.85-.66.64.64,0,0,0-.54-.72.7.7,0,0,0-.88.56A.77.77,0,0,0,257.23,164.51Zm7,.13a.83.83,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Zm-2.69,16.79a.67.67,0,0,0-.82.52.84.84,0,0,0,.53.86.67.67,0,0,0,.79-.56A.64.64,0,0,0,261.53,181.43Zm-.63-13.09a.55.55,0,0,0,.75-.44.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45A.71.71,0,0,0,260.9,168.34Zm-5.16,11.31a.56.56,0,0,0-.05.53.93.93,0,0,0,.66.3c.4-.08.36-.47.35-.79C256.38,179.39,256,179.31,255.74,179.65Zm3.55,7.8a1.39,1.39,0,0,0-.55,1.35c.11.37.21.77.76.73.4,0,.8,0,1.2,0a.58.58,0,0,0,.85-.37.75.75,0,0,0-.5-.93,2,2,0,0,1-.65-.39A1,1,0,0,0,259.29,187.45Zm-4.07,5c0,.32.2.4.45.45s.64-.15.6-.47a1.79,1.79,0,0,0-.27-.59A.68.68,0,0,0,255.22,192.4Zm3.75.44a.69.69,0,0,0-.79.61c0,.33.2.4.45.45s.64-.15.6-.46A2.21,2.21,0,0,0,259,192.84Zm1.86-7.7c0,.25.1.82.44.86s.52-.4.6-.6a.44.44,0,0,0-.27-.65C261.28,184.64,260.81,184.84,260.83,185.14Zm2.87-24c.19.08,1-.16,1-.5s-.68-.73-1-.77a.76.76,0,0,0-.75.52C262.94,160.69,263.41,161,263.7,161.11Zm-8.6-7.62c.1,0,.48-.09.5-.2s-.26-.35-.39-.4-.32.13-.31.19A.56.56,0,0,0,255.1,153.49Zm10.79,32.64a.29.29,0,0,0-.31.19.44.44,0,0,0,.21.4c.09.05.46,0,.5-.2S266,186.18,265.89,186.13Zm-6-29.13a.5.5,0,0,0,.42-.36.46.46,0,0,0-.25-.37.45.45,0,0,0-.37.22C259.66,156.61,259.69,157,259.89,157ZM259,195.82c-.17,0-.35.15-.38.27s0,.49.2.53.4-.27.41-.39S259.13,195.86,259,195.82Zm5.42-1.36c-.19,0-.32.28-.36.41a.35.35,0,0,0,.22.32c.13,0,.29-.17.36-.3S264.57,194.51,264.38,194.46ZM256,155.12a.22.22,0,0,0,.21-.19c0-.06-.12-.18-.18-.18s-.19,0-.2.13A.2.2,0,0,0,256,155.12Zm8.79,21.37c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,264.77,176.49Zm-9.34-4.93a.57.57,0,0,0,.68-.55.78.78,0,0,0-.6-.79.73.73,0,0,0-.75.63A.68.68,0,0,0,255.43,171.56Zm9.06,21.05c.57-.07.56-.81.3-1.13s-.14-.24,0-.64.1-1-.65-1.06a1.41,1.41,0,0,0-1.3,1.34A1.65,1.65,0,0,0,264.49,192.61Z" fill="#01ada1"/></g><path d="M260,200.5h-.11a1,1,0,0,0-.14-.35c0-.07-.32-.11-.36-.06a.51.51,0,0,0-.11.43.24.24,0,0,0,.06.09,1.4,1.4,0,0,0-.76,1,1.46,1.46,0,0,0,1,1.5,1.33,1.33,0,0,0,1.55-.95A1.94,1.94,0,0,0,260,200.5Z" fill="#01ada1"/><path d="M261.35,211.18c-.23-.28-1-.2-1.44.14a.82.82,0,0,0,0,1.08,1,1,0,0,0,1.23.2A1.23,1.23,0,0,0,261.35,211.18Z" fill="#01ada1"/><path d="M264.38,194.46c-.19,0-.32.28-.36.41a.35.35,0,0,0,.22.32c.13,0,.29-.17.36-.3S264.57,194.51,264.38,194.46Z" fill="#01ada1"/><path d="M261.34,192.59c-.1-.3-.45-.31-.77-.1a.41.41,0,0,0-.07.69c.17.16.68.42.83.3S261.41,192.81,261.34,192.59Z" fill="#01ada1"/><path d="M263.58,207.37c-.11.06-.33.4-.2.52a.44.44,0,0,0,.48,0c.11-.1.31-.33.19-.45A.44.44,0,0,0,263.58,207.37Z" fill="#01ada1"/><path d="M262.2,226.91a.83.83,0,0,0-.38.56c0,.14.18.35.33.44a.52.52,0,0,0,.1.18.73.73,0,0,0,.87.18l.06,0c.29.08.46-.07.53-.39a1,1,0,0,0-.14-.24.79.79,0,0,0-.18-.53,2.17,2.17,0,0,0-1.19-.22Z" fill="#01ada1"/><path d="M258.91,182.63a.7.7,0,0,0-.84.61.84.84,0,0,0,.73.79.75.75,0,0,0,.74-.66A.66.66,0,0,0,258.91,182.63Z" fill="#01ada1"/><path d="M261.36,231.69c-.69-.16-1.22,0-1.31.46a.95.95,0,1,0,1.85.38A.81.81,0,0,0,261.36,231.69Z" fill="#01ada1"/><path d="M264.43,208.6a1.13,1.13,0,0,0-.14,1.19.7.7,0,0,0,1,0,.67.67,0,0,0,0-1C265,208.48,264.65,208.39,264.43,208.6Z" fill="#01ada1"/><path d="M259.66,218a1.35,1.35,0,0,0-.13,1.68.85.85,0,0,0,1.15,0,.93.93,0,0,0,.18-1.37C260.54,217.9,259.94,217.75,259.66,218Z" fill="#01ada1"/><path d="M262.73,259.37c.36.12.65,0,.67-.36,0-.09,0-.23,0-.36a1.55,1.55,0,0,0,.67.31c.38.1.72,0,.8-.38a1.81,1.81,0,0,1,.56-.89,1.35,1.35,0,0,0,0-2,2.69,2.69,0,0,1-.28-.35c0-.54-.27-.72-.58-.77s-.56.18-.7.48-.33.63-.47,1-.35.72-.06,1.12a.59.59,0,0,1,0,.4,3.3,3.3,0,0,0-.12.64s-.05-.07-.1-.09c-.41-.12-.65.41-.8.62S262.39,259.26,262.73,259.37Z" fill="#01ada1"/><path d="M262.67,255a1.45,1.45,0,0,0,.77-.75,1.7,1.7,0,0,0,1.44-1.16,1.1,1.1,0,0,0-.86-1.37,1.2,1.2,0,0,0-1.66.81,1.62,1.62,0,0,0-.5.11c-.77.31-1.09.9-.82,1.56A1.36,1.36,0,0,0,262.67,255Z" fill="#01ada1"/><path d="M258.68,230.73c.05,0,0-.21,0-.26a.22.22,0,0,0-.24,0,.22.22,0,0,0,0,.3A.22.22,0,0,0,258.68,230.73Z" fill="#01ada1"/><path d="M267,249.83a1,1,0,0,0-.56-1.26,1.12,1.12,0,0,0-.93.17.67.67,0,0,0-.56-.39.67.67,0,0,1,.15-.06c.38-.08.75-.58.54-1.36s-1.2-1.09-1.58-.64-.21.79-.42.82-.67-.15-.89.17.41,1.31.58,1.41.72.15.63.55-.47.73-.31,1.13.47,1.34,1.14,1.39.55-.54.82-.82a.9.9,0,0,0,.25-.72,1.2,1.2,0,0,0,.34.17A.69.69,0,0,0,267,249.83Z" fill="#01ada1"/><path d="M257.83,169.27a.81.81,0,0,0-.88.41v1.07a1.16,1.16,0,0,0,.71.33c.49.08.87-.12.95-.5A1.47,1.47,0,0,0,257.83,169.27Z" fill="#01ada1"/><path d="M257.19,251.74a1.28,1.28,0,0,0-.24-1V252A.68.68,0,0,0,257.19,251.74Z" fill="#01ada1"/><path d="M258.09,178.87a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S257.72,178.94,258.09,178.87Z" fill="#01ada1"/><path d="M257,201.14v2.53a1.15,1.15,0,0,0,.89-.24,1.42,1.42,0,0,0,.24-1.88A1.36,1.36,0,0,0,257,201.14Z" fill="#01ada1"/><path d="M259.68,216.78c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,259.68,216.78Z" fill="#01ada1"/><path d="M257,220.63l-.06-.06v1.32l0,.07a.75.75,0,0,0,1,.25,1.46,1.46,0,0,0,.3-1.49A.89.89,0,0,0,257,220.63Z" fill="#01ada1"/><path d="M259.9,207.86a.81.81,0,0,0-1-.07c-.23.23-.12.44,0,.63a.46.46,0,0,0,.76.06C259.83,208.29,260,208.06,259.9,207.86Z" fill="#01ada1"/><path d="M257,211.24v1.25c.44.18.62-.25.9-.56C257.63,211.49,257.38,211.17,257,211.24Z" fill="#01ada1"/><path d="M257,215.86s0,0,0,0v1.68a1.32,1.32,0,0,0,1-.15,1.2,1.2,0,0,0,.07-1.35A.88.88,0,0,0,257,215.86Z" fill="#01ada1"/><path d="M265.51,202.7a.68.68,0,0,0,1,.11.54.54,0,0,0,.15-.85.66.66,0,0,0-1-.15A.7.7,0,0,0,265.51,202.7Z" fill="#01ada1"/><path d="M259.28,242.5a1.34,1.34,0,0,0,1.83-.38,1.59,1.59,0,0,0-.65-1.84,1.33,1.33,0,0,0-.59-.11.56.56,0,0,0-.69-.11.41.41,0,0,0-.22.62l-.07.08A1.15,1.15,0,0,0,259.28,242.5Z" fill="#01ada1"/><path d="M260.05,234.77c-.57-.19-.86,0-1.05.64s0,1,.4,1.14a1.56,1.56,0,0,0,1.36-.7A.89.89,0,0,0,260.05,234.77Z" fill="#01ada1"/><path d="M259.73,214.84c-.16,0-.42.23-.45.34s0,.38.19.43.36-.11.41-.22S259.89,214.89,259.73,214.84Z" fill="#01ada1"/><path d="M258.68,228.94c-.14.24.1.83.41,1a.52.52,0,0,0,.73-.3c.24-.52.24-.93,0-1.07A1.15,1.15,0,0,0,258.68,228.94Z" fill="#01ada1"/><path d="M268.25,248.72a.63.63,0,0,0,.36-.47,1.26,1.26,0,0,0,.95-.49.56.56,0,0,0,.69.25.71.71,0,0,0,.5-.85.66.66,0,0,0-.9-.36.52.52,0,0,0-.19.11,1.36,1.36,0,0,0-.81-.78.85.85,0,0,0-1,.63.36.36,0,0,0,0,.1,1.31,1.31,0,0,0-.58.11c-.51.21-.84.75-.68,1.12A1.49,1.49,0,0,0,268.25,248.72Z" fill="#01ada1"/><path d="M267.32,207.32c.1-.07,0-.43,0-.56a.4.4,0,0,0-.36-.06.51.51,0,0,0-.11.43C266.86,207.23,267.23,207.39,267.32,207.32Z" fill="#01ada1"/><path d="M266.66,208.94s0-.21,0-.26a.21.21,0,0,0-.24,0,.2.2,0,0,0,0,.29A.22.22,0,0,0,266.66,208.94Z" fill="#01ada1"/><path d="M266.38,197.72c-.16.11-.12.6,0,.69s.46.28.6.21a.65.65,0,0,0,.12-.61C267,197.87,266.53,197.61,266.38,197.72Z" fill="#01ada1"/><path d="M265.89,186.13a.29.29,0,0,0-.31.19.44.44,0,0,0,.21.4c.09.05.46,0,.5-.2S266,186.18,265.89,186.13Z" fill="#01ada1"/><path d="M257,205.33V206a.64.64,0,0,0,.25-.35C257.23,205.48,257.11,205.37,257,205.33Z" fill="#01ada1"/><path d="M257.67,227.78c.16-.28.25-1-.37-1.15a1.83,1.83,0,0,1-.35.06v1.68A1.47,1.47,0,0,0,257.67,227.78Z" fill="#01ada1"/><path d="M266.69,220.18a.83.83,0,0,0-.82.67.62.62,0,0,0,.86.56c.17-.1.16-.58.19-.89A.27.27,0,0,0,266.69,220.18Z" fill="#01ada1"/><path d="M257.64,246.14c.58.33,0,.72.88,1.12a1.31,1.31,0,0,0,1.19,0h.08c.5-.07.74-.85.66-1.55a1.2,1.2,0,0,0-.82-.83.41.41,0,0,0-.26-.37c-1-.47-1.19.54-1.53.5a4.11,4.11,0,0,1-.89-.45v1.86C257.18,246.21,257.32,246,257.64,246.14Z" fill="#01ada1"/><path d="M266.71,233.22a.69.69,0,0,0-.6.07c-.17.09-.38.11-.55.36a1.5,1.5,0,0,0-.16,1.25,1.09,1.09,0,0,0,.92.67.9.9,0,0,0,.82-.43,1.09,1.09,0,0,0,.14-1C267.09,233.77,267,233.32,266.71,233.22Z" fill="#01ada1"/><path d="M258.32,255.11a1.44,1.44,0,0,0,.67-1.71,1.13,1.13,0,0,0-1.39-.72,1.71,1.71,0,0,0-.65.44v1.68A1.51,1.51,0,0,0,258.32,255.11Z" fill="#01ada1"/><path d="M258.65,171.74a.69.69,0,0,0,.43.45c.17,0,.65-.05.71-.27s-.32-.53-.5-.62S258.6,171.46,258.65,171.74Z" fill="#01ada1"/><path d="M257.54,163.13a.82.82,0,0,0-.59.1v1.13a.64.64,0,0,0,.28.15.82.82,0,0,0,.85-.66A.64.64,0,0,0,257.54,163.13Z" fill="#01ada1"/><path d="M259.89,157a.5.5,0,0,0,.42-.36.46.46,0,0,0-.25-.37.45.45,0,0,0-.37.22C259.66,156.61,259.69,157,259.89,157Z" fill="#01ada1"/><path d="M258.1,165.77c-.5-.08-1,.21-1.09.59a1.36,1.36,0,0,0,1,1.34c.36.06.78-.33.84-.79A.92.92,0,0,0,258.1,165.77Z" fill="#01ada1"/><path d="M259.11,162c0,.31,0,.62.39.71s.82-.43.76-.66-.33-.35-.57-.43A.42.42,0,0,0,259.11,162Z" fill="#01ada1"/><path d="M261.39,224.43a1.1,1.1,0,0,0,.5,1.15c.41.13.91-.28,1.07-.87a.52.52,0,0,0-.4-.69C262.08,223.86,261.49,224.07,261.39,224.43Z" fill="#01ada1"/><path d="M261.42,221.1a.71.71,0,0,0-.19,1,.54.54,0,0,0,.85.17.66.66,0,1,0-.66-1.14Z" fill="#01ada1"/><path d="M261.34,203a.75.75,0,0,0-.17.9c.16.2.6.14.9-.11a.39.39,0,0,0,.06-.62C261.91,202.91,261.65,202.75,261.34,203Z" fill="#01ada1"/><path d="M261.17,215.78a.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07.63.63,0,0,0,.08-.89A.69.69,0,0,0,261.17,215.78Z" fill="#01ada1"/><path d="M274.48,259.6a1.19,1.19,0,0,0-.32.15h2.08a.58.58,0,0,1,.12-.1c.43-.24.4-.58.16-.95,1,0,1.55-.51,1.62-1.39.05-.7-.3-1-1.18-1.13a5,5,0,0,0-.63-1,.78.78,0,0,0-1.1,0c-.34.39-.62.82-.94,1.25-.69,0-.73,0-.81.78.14.26.76.19.53.71a5.75,5.75,0,0,0-.93,0,.88.88,0,0,0-.7.71c-.12.36.18.53.37.72a1.22,1.22,0,0,0,1.38.17q.11-.51.21-1.08l.33.27C275.13,259.13,275.09,259.43,274.48,259.6Z" fill="#01ada1"/><path d="M281.08,259.75h1.4a1.19,1.19,0,0,0-.08-.2,1.14,1.14,0,0,0,.37-.45.93.93,0,0,0-.61-1.43,6,6,0,0,0-.84-.11c.14-.3.18-.57.33-.68a.88.88,0,0,0,.3-1.27,1.32,1.32,0,0,1-.08-.44c-.08-.5-.32-.77-.64-.72s-.62.45-.45,1c0,.05.09.09.1.15.07.29,0,.48-.35.45-.12,0-.24-.08-.36-.09a1.22,1.22,0,0,0-1.16.74,1,1,0,0,0,.3,1.3,1.76,1.76,0,0,0,1.68.39,4.49,4.49,0,0,0,.31.79.83.83,0,0,0,.11.15.52.52,0,0,0-.33.42Z" fill="#01ada1"/><path d="M281.58,257a.21.21,0,0,0,0,.25.21.21,0,0,0,.29,0,.23.23,0,0,0,0-.28C281.78,256.91,281.61,257,281.58,257Z" fill="#01ada1"/><path d="M288.23,259.61a.52.52,0,0,0-.2.14h.74A.72.72,0,0,0,288.23,259.61Z" fill="#01ada1"/><path d="M299.16,246.1a.82.82,0,0,0,1.07-.13,1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.45,0C298.56,245,298.76,245.73,299.16,246.1Z" fill="#01ada1"/><path d="M257.29,258.65a1.26,1.26,0,0,0,.58-1.22c-.09-.25-.52-.44-.92-.48v1.72A.57.57,0,0,0,257.29,258.65Z" fill="#01ada1"/><path d="M269.46,259.75h1.62a1.15,1.15,0,0,0-.85-.27,1.85,1.85,0,0,0,.64-.21,1.12,1.12,0,0,0,.35-.34.51.51,0,0,0,.42.16.59.59,0,0,0,.6-.58.81.81,0,0,0-.24-.62.76.76,0,0,0-.34-.13,1.71,1.71,0,0,0-.09-1c-.31-.59-1.13-.42-1.24-.58s.38-1.13,0-1.85a2,2,0,0,0-2.26-.6,2.54,2.54,0,0,0-.89.67,1.12,1.12,0,0,0-.37.58,1.17,1.17,0,0,0,.25,1.09,1.1,1.1,0,0,0,.33.43c.51.37,1.46.33,1.58.55s-.49,1.15,0,1.84a1.27,1.27,0,0,0,1.17.56,1.43,1.43,0,0,0-.39.11A.87.87,0,0,0,269.46,259.75Z" fill="#01ada1"/><path d="M257.4,175.57a1.3,1.3,0,0,0-.45-.93v1.47A.8.8,0,0,0,257.4,175.57Z" fill="#01ada1"/><path d="M258,259.16c-.41-.11-.73.11-.93.59h1.68A1.13,1.13,0,0,0,258,259.16Z" fill="#01ada1"/><path d="M262.34,259.75h.43A.63.63,0,0,0,262.34,259.75Z" fill="#01ada1"/><path d="M263.76,159.84a.76.76,0,0,0-.75.52c-.07.33.4.64.69.75s1-.16,1-.5S264.05,159.88,263.76,159.84Z" fill="#01ada1"/><path d="M274.08,229.8a.85.85,0,0,0-.27,1,.62.62,0,0,0,1-.06c.09-.18-.21-.56-.36-.83A.28.28,0,0,0,274.08,229.8Z" fill="#01ada1"/><path d="M275.7,234.64a.7.7,0,0,0-.32.93.77.77,0,0,0,.88.46c.31-.12.64-.71.53-1A1,1,0,0,0,275.7,234.64Z" fill="#01ada1"/><path d="M272.64,239c-.13,0-.47-.09-.53.1s.18.38.27.39.35.07.43-.14A.26.26,0,0,0,272.64,239Z" fill="#01ada1"/><path d="M273.06,251.3a1,1,0,0,0,.69-1.16l.15,0a1.33,1.33,0,0,0,.56-1.59,1.4,1.4,0,0,0-1.59-.75,1.37,1.37,0,0,0-.9,1.16,1.36,1.36,0,0,0-.68,1.54A1.34,1.34,0,0,0,273.06,251.3Z" fill="#01ada1"/><path d="M273.25,255.81a1.77,1.77,0,0,0,.88-1.55,1,1,0,0,0,1.07-.45,1.11,1.11,0,0,0-.46-1.27c-.38-.16-.87.18-1.11.73a.72.72,0,0,0,0-.52.68.68,0,0,0-.89-.38.8.8,0,0,0-.33,1l.07.11a1.23,1.23,0,0,0,.79,2.32Zm.34-2.41a.28.28,0,0,0,0,.09h0A.41.41,0,0,1,273.59,253.4Z" fill="#01ada1"/><path d="M273.74,242.17a.51.51,0,0,0,.41-.67c-.11-.56-.36-.89-.64-.86a1.19,1.19,0,0,0-.7,1C272.85,241.88,273.39,242.21,273.74,242.17Z" fill="#01ada1"/><path d="M270.59,244.66a1.42,1.42,0,0,0,.09.27c-.3.31-.17.66.08.95a.81.81,0,0,0,.69-.17,1.57,1.57,0,0,0,.54.06l.46,0c0,.29,0,.57,0,.84.07.51.27.69.78.69a1,1,0,0,0,1-.64.8.8,0,0,0,0-.77,1.06,1.06,0,0,0,.12-1,.53.53,0,0,0-.78-.13,2,2,0,0,0-.34.28,2.55,2.55,0,0,0,0-.39,1.4,1.4,0,0,0-1-1.16,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,270.59,244.66Z" fill="#01ada1"/><path d="M267.86,252.6a.75.75,0,0,0,.83-.82,2.44,2.44,0,0,1,.36.7.78.78,0,0,0,.55.4,6.23,6.23,0,0,1,1,.28.83.83,0,0,0,1.05-.44c.18-.48.12-.8-.22-1a.41.41,0,0,0,.05-.09c.17-.48-.06-.84-.69-1.06a1.18,1.18,0,0,0-.74,0,.69.69,0,0,0-.47-.3,1,1,0,0,0-.94.52.67.67,0,0,0-.16.57,1,1,0,0,0-.91-.1.54.54,0,0,0-.3.76A1.07,1.07,0,0,0,267.86,252.6Z" fill="#01ada1"/><path d="M270,241.71a.65.65,0,0,0,.8.21c.29-.19.27-.42-.13-1A.61.61,0,0,0,270,241.71Z" fill="#01ada1"/><path d="M274.45,237.88a.81.81,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31c.29-.1.34-.32.2-.63-.08,0-.21-.14-.29-.11a1.48,1.48,0,0,1-.95-.12C274.86,237.5,274.54,237.71,274.45,237.88Z" fill="#01ada1"/><path d="M264.11,178.62c-.41-.08-.9.4-1,.92a.92.92,0,0,0,.86,1.09c.59.08,1.08-.21,1.12-.66A1.35,1.35,0,0,0,264.11,178.62Z" fill="#01ada1"/><path d="M265.88,170.68a.72.72,0,0,0-.77.59.7.7,0,0,0,.56.88.76.76,0,0,0,.84-.64A.7.7,0,0,0,265.88,170.68Z" fill="#01ada1"/><path d="M264.77,176.49c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,264.77,176.49Z" fill="#01ada1"/><path d="M264.22,164.64a.83.83,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Z" fill="#01ada1"/><path d="M267.13,182c-.28.1-.68.18-.77.52s.32.47.46.45.92-.19,1-.45S267.22,182,267.13,182Z" fill="#01ada1"/><path d="M270,238.17c-.55.16-.83,1-.58,1.73a.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54A1.18,1.18,0,0,0,270,238.17Z" fill="#01ada1"/><path d="M273,235.34c-.48.15-.83.68-.7,1a1.09,1.09,0,0,0,1.08.64c.41-.14.57-.77.35-1.34A.52.52,0,0,0,273,235.34Z" fill="#01ada1"/><path d="M267,224.9a.54.54,0,0,0,.27.75.61.61,0,0,0,.79-.39.55.55,0,0,0-.42-.69A.5.5,0,0,0,267,224.9Z" fill="#01ada1"/><path d="M264.49,192.61c.57-.07.56-.81.3-1.13s-.14-.24,0-.64.1-1-.65-1.06a1.41,1.41,0,0,0-1.3,1.34A1.65,1.65,0,0,0,264.49,192.61Z" fill="#01ada1"/><path d="M288.5,259.32a1.5,1.5,0,0,0,1.35-.16.63.63,0,0,0,.15-.24,1.36,1.36,0,0,0,1.53.36,1.1,1.1,0,0,0,.54-.64l.47,0c.44,0,.6-.54.92-.13s1.11,1.16,1.78.46a1,1,0,0,0,.21-.47A1.17,1.17,0,0,0,297,257a.87.87,0,0,0-.48-.46,1.36,1.36,0,0,0-.44-1.19,1.11,1.11,0,0,0-1.49.08,1.76,1.76,0,0,0,0,1.67.76.76,0,0,0-.54,0c-.35.21-.57-.71-1.07-.47s-.95-.19-1.5.12a1.25,1.25,0,0,0-.83,0,1.17,1.17,0,0,0-.9,1.4l-.07-.08c-.46-.41-.81-.45-1.11-.13A.87.87,0,0,0,288.5,259.32Z" fill="#01ada1"/><path d="M288.14,248c-.06,0-.06.33,0,.36a.52.52,0,0,0,.45.05.39.39,0,0,0,.1-.53C288.52,247.65,288.26,247.91,288.14,248Z" fill="#01ada1"/><path d="M290.24,244.9c.14-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.63.63,0,0,0,290.24,244.9Z" fill="#01ada1"/><path d="M287.66,255.06c-.16-.12-.71.07-.74.17a1.25,1.25,0,0,0,0,.58,1.21,1.21,0,0,0-.66,1.42,2,2,0,0,0,1.86.92,1.28,1.28,0,0,0,.65-1.62,1.53,1.53,0,0,0-1.05-.82C287.76,255.51,287.78,255.16,287.66,255.06Z" fill="#01ada1"/><path d="M286.64,249.61c-.78-1.22-1.8-.81-2.51-.14a1.43,1.43,0,0,0-.45.84,1.5,1.5,0,0,0,.4,1.2c.31.39.25.9.7,1.13a2.4,2.4,0,0,0,.77.24,1.63,1.63,0,0,0,0,1.6,1.19,1.19,0,0,0,1.46-.36c.35-.42.25-.89-.28-1.32l-.1-.05a1.88,1.88,0,0,0,.64-.45,1.68,1.68,0,0,0,.56-1.51C287.71,250.21,287,250.13,286.64,249.61Z" fill="#01ada1"/><path d="M289.59,249.82a.51.51,0,0,0-.11-.32c-.35-.36-.76-.23-1.16.06,0,.39-.05.81.38,1a.62.62,0,0,0,.84-.33,1.47,1.47,0,0,0,.34,1.05,1.13,1.13,0,0,0,1.48.05.75.75,0,0,0,.57.13,1.21,1.21,0,0,0,.78-1.38,1.11,1.11,0,0,0-1-.69h0a1.43,1.43,0,0,0-1.9.05A1.13,1.13,0,0,0,289.59,249.82Z" fill="#01ada1"/><path d="M295.5,239.85a.2.2,0,0,0,0,.24.2.2,0,0,0,.3,0c.08-.1,0-.23-.05-.28S295.54,239.81,295.5,239.85Z" fill="#01ada1"/><path d="M282.81,240.68c-.36-.17-.67-.49-1-.38a.67.67,0,0,0-.45.41,1.11,1.11,0,0,0-.23.62,1.47,1.47,0,0,0,.61,1.1,1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84A1.08,1.08,0,0,0,282.81,240.68Z" fill="#01ada1"/><path d="M290.74,245.19c-.2.25-.31.53,0,.81a.74.74,0,0,0,.91,0c.17-.19,0-.61-.25-.87A.38.38,0,0,0,290.74,245.19Z" fill="#01ada1"/><path d="M290,241.46l-.08,0a.75.75,0,0,0-.22-.55.53.53,0,0,0-.86,0,.67.67,0,0,0,0,1,.72.72,0,0,0,.87,0,.44.44,0,0,0,.37.06c.12-.08.33-.16.27-.37A.25.25,0,0,0,290,241.46Z" fill="#01ada1"/><path d="M284.49,233.31c-.43.12-.76.66-.58,1s1.32.27,1.52-.08S284.92,233.19,284.49,233.31Z" fill="#01ada1"/><path d="M283.49,235.28a.25.25,0,0,0-.14.35c.07.12.22.36.46.3s.15-.42.1-.47S283.69,235.2,283.49,235.28Z" fill="#01ada1"/><path d="M283.09,248.94a2,2,0,0,0,.72.13c.31,0,.4-.35.29-.64s-.24-.5-.59-.41A.73.73,0,0,0,283.09,248.94Z" fill="#01ada1"/><path d="M286.76,235.84c-.57.1-.72.3-.78,1a9.71,9.71,0,0,0-1,.86.45.45,0,0,0,.33.77c.48,0,1,0,1.44-.37l0-.68c.53-.35.85-.88.68-1.21A.63.63,0,0,0,286.76,235.84Z" fill="#01ada1"/><path d="M281.61,245.31a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S281.81,245.26,281.61,245.31Z" fill="#01ada1"/><path d="M281,249.69a1.24,1.24,0,0,0-1,1.31,1.16,1.16,0,0,0,1.34,1.18c.91-.2,1.34-.82,1.26-1.39A1.59,1.59,0,0,0,281,249.69Z" fill="#01ada1"/><path d="M283,255.9a1.6,1.6,0,0,0,.44.14.65.65,0,0,0,.23.54.76.76,0,0,0,1-.05.8.8,0,0,0,0-.95,1.55,1.55,0,0,0-.49-1.5,1.27,1.27,0,0,0-1.35-.11c.06-.22.08-.46,0-.56s-.76.18-.94.34-.19.49.11.68a.76.76,0,0,0,.45.15A1.29,1.29,0,0,0,283,255.9Z" fill="#01ada1"/><path d="M284.9,241.12c-.13.09-.31.59-.18.73s.61,0,.68-.08.21-.49.12-.62A.65.65,0,0,0,284.9,241.12Z" fill="#01ada1"/><path d="M286.47,243.17c-.07-.48-.3-.72-.79-.71a1,1,0,0,0-1,1.13c0,.58.37.66.35,1s.2.51.59.62,1,.26,1.12-.28-.2-.71-.37-.74-.38-.32-.19-.35S286.55,243.65,286.47,243.17Z" fill="#01ada1"/><path d="M296.83,241a.66.66,0,0,0-1,.14c-.3.34-.33.7-.09.88A1.13,1.13,0,0,0,297,242,.7.7,0,0,0,296.83,241Z" fill="#01ada1"/><path d="M268.14,218.55c.09.18.83.53,1.1.31s0-1-.21-1.22a.77.77,0,0,0-.9-.11C267.85,217.73,268,218.28,268.14,218.55Z" fill="#01ada1"/><path d="M271.26,230.56c0-.15,0-.34-.24-.4a.25.25,0,0,0-.32.2c0,.14,0,.42.2.51S271.27,230.63,271.26,230.56Z" fill="#01ada1"/><path d="M268,213a.48.48,0,0,0,.55,0,.46.46,0,0,0,.06-.44.43.43,0,0,0-.42-.09C268.13,212.5,267.9,212.8,268,213Z" fill="#01ada1"/><path d="M270.61,233.81c.41.24.79.64,1.38.55l.44-.52c.63,0,1.2-.21,1.26-.58a.63.63,0,0,0-.36-.71c-.52-.26-.76-.19-1.21.33a9,9,0,0,0-1.32.11A.45.45,0,0,0,270.61,233.81Z" fill="#01ada1"/><path d="M268.35,175.08a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-.95.62.62,0,0,0-.83.44A.57.57,0,0,0,268.35,175.08Z" fill="#01ada1"/><path d="M328.18,259.73h0a1.32,1.32,0,0,0,1-.58.58.58,0,0,0,.05-.14c.24.16.42,0,.58-.14a.46.46,0,0,0-.06-.76,1.71,1.71,0,0,0-.57-.1,1.18,1.18,0,0,0-.43-.55,1.11,1.11,0,0,0-1.48.24,1.77,1.77,0,0,0,.15,1.67.7.7,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.12-1.53.31a1.07,1.07,0,0,0-.19.18.58.58,0,0,0-.16-.32.61.61,0,0,0-.85-.09.82.82,0,0,0,0-.22.56.56,0,0,0-.27-.49,1,1,0,0,0,.55-.85,1.18,1.18,0,0,0-.71-1,.91.91,0,0,0-1,.43,1.28,1.28,0,0,0-1.64.08,1.36,1.36,0,0,0-.35,1.22h0a.62.62,0,0,1,0,.13,1,1,0,0,0-.77.1,1.54,1.54,0,0,0-.89,1.2h2.57a1.7,1.7,0,0,0-.06-.46l0-.08a1.18,1.18,0,0,0,1.25-.44,1.67,1.67,0,0,0,.33-.5.58.58,0,0,0,.18.17,1.23,1.23,0,0,0-.56.67c.2.26.35.56.62.64h.11a.58.58,0,0,0,.22,0,.56.56,0,0,0,.17-.09s0,.07,0,.11h5.43Z" fill="#01ada1"/><path d="M261.65,167.9a.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45.71.71,0,0,0,.51.84A.55.55,0,0,0,261.65,167.9Z" fill="#01ada1"/><path d="M353.43,258.66a.3.3,0,0,0,0-.08.9.9,0,0,0,.56-.06.75.75,0,0,0,.81.66.74.74,0,0,0,.62-.75.79.79,0,0,0-.68-.61,2.06,2.06,0,0,0,.16-.34.6.6,0,0,0,.44.21.82.82,0,0,0,.74-.57h.14a2,2,0,0,0,.41-.69c.07-.38-.38-.7-.81-.65a.42.42,0,0,0-.19.06.69.69,0,0,0-.29-.13.94.94,0,0,0-1,.54,1.3,1.3,0,0,0-1.62.26,1.32,1.32,0,0,0-.16,1.4,1,1,0,0,0-.81.18,1.56,1.56,0,0,0-.76,1.21h-.12a1.2,1.2,0,0,0-.74.45h3.33A1.37,1.37,0,0,0,353.43,258.66Z" fill="#01ada1"/><path d="M259.07,175.41a.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46c-.08-.31-.47-.9-1.05-.6-.62.89-1.06.26-1.71.75A1.49,1.49,0,0,0,259.07,175.41Z" fill="#01ada1"/><path d="M292.29,245.31a1.58,1.58,0,0,0-.79,1.35.82.82,0,0,0,.22.57,1.26,1.26,0,0,0,1.79.06l.35-.29c.18.23.34.46.52.66a.67.67,0,0,0,1,.1,1.41,1.41,0,0,0,.29-.31.38.38,0,0,0,.13.19c.26.19.44.05.61-.13a.46.46,0,0,0-.06-.76,1.93,1.93,0,0,1-1.4-.81,4.76,4.76,0,0,0-.91.05,3.07,3.07,0,0,0-.29-.34A1.4,1.4,0,0,0,292.29,245.31Z" fill="#01ada1"/><path d="M292.7,252.4a.76.76,0,0,0,.59.26c.48-.1.41-.51.38-.87-.36-.24-.71-.31-1,.05A.59.59,0,0,0,292.7,252.4Z" fill="#01ada1"/><path d="M294.48,250c-.15-.13-.28-.29-.5-.29s-.34.31-.21.58a1.08,1.08,0,0,0,.65.52.32.32,0,0,0,.4-.32A.72.72,0,0,0,294.48,250Z" fill="#01ada1"/><path d="M293.16,247.72a.78.78,0,0,0,.13.68.55.55,0,0,0,.86,0,.59.59,0,0,0,0-.82C294,247.38,293.25,247.45,293.16,247.72Z" fill="#01ada1"/><path d="M291.91,253.56s0,0,0-.05c-.24-.57-.77-.88-1.19-.69a1.14,1.14,0,0,0-.66.69.64.64,0,0,0-.7,0c-.41.26-.29.68-.19,1.11.43.1.87.29,1.14-.2a.54.54,0,0,0,0-.15,1.68,1.68,0,0,0,.84.19,1.3,1.3,0,0,0,1.36,1.13,1.28,1.28,0,0,0,1.16-1c.09-.49-.57-1-1.26-1.12A.87.87,0,0,0,291.91,253.56Z" fill="#01ada1"/><path d="M294,239.93c.08-.05.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.37A.52.52,0,0,0,294,239.93Z" fill="#01ada1"/><path d="M273.24,230.43c.37-.16.18-1.11-.24-1.26s-1,.08-1,.43S272.87,230.59,273.24,230.43Z" fill="#01ada1"/><path d="M288.82,256.24c.24.39.37.83.88.72a.71.71,0,0,0,.57-.72.52.52,0,0,0-.42-.6C289.34,255.5,289.08,255.82,288.82,256.24Z" fill="#01ada1"/><path d="M295.35,254.32c.29.43.7.46,1.22-.11a11.88,11.88,0,0,0,.47-1.4.61.61,0,0,0-.48-.77h-.19c-.21-.25-.55-.3-1-.15s-.82.69-.73,1a1.09,1.09,0,0,0,.59.61A.94.94,0,0,0,295.35,254.32Z" fill="#01ada1"/><path d="M295.36,243.51a.61.61,0,0,0-.09-.53.49.49,0,0,0-.11-.25c-.12-.09-.38-.25-.48-.12a.66.66,0,0,0,0,.15.61.61,0,0,0,0,1.05A.64.64,0,0,0,295.36,243.51Z" fill="#01ada1"/><path d="M277.87,236c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,277.87,236Z" fill="#01ada1"/><path d="M265.56,230.4c.17-.06.22-.31.2-.43s-.28-.41-.44-.35-.21.43-.17.54S265.4,230.45,265.56,230.4Z" fill="#01ada1"/><path d="M279.73,247.38a1.11,1.11,0,0,0,.14,1.41,1,1,0,0,0,.71.21,1.32,1.32,0,0,0,1.11-1.49,4.6,4.6,0,0,0-.74-.46A1,1,0,0,0,279.73,247.38Z" fill="#01ada1"/><path d="M266.42,231.21c-.12,0-.17.3-.16.44s.22.32.4.26.15-.4.11-.53A.36.36,0,0,0,266.42,231.21Z" fill="#01ada1"/><path d="M265.75,226a1,1,0,0,0-.62-1,.7.7,0,0,0-.81.55.79.79,0,0,0,.44.9A1,1,0,0,0,265.75,226Z" fill="#01ada1"/><path d="M260.77,237.46a1.06,1.06,0,0,0-.23.41,1,1,0,0,0-.43,1,1,1,0,0,0,.45.59,1.32,1.32,0,0,0,1.78-.55,4.22,4.22,0,0,0-.33-.8,1.05,1.05,0,0,0-.43-.38s0,0,0,0C261.55,237.43,261,237.26,260.77,237.46Z" fill="#01ada1"/><path d="M265.17,221.46a.61.61,0,0,0-.12.88.69.69,0,1,0,1.12-.81A.81.81,0,0,0,265.17,221.46Z" fill="#01ada1"/><path d="M258.39,206a.59.59,0,0,0,.8.15c.26-.13.31-.88.06-1a.78.78,0,0,0-.7,0A.54.54,0,0,0,258.39,206Z" fill="#01ada1"/><path d="M266.09,227.39c-.5-.14-.87.12-1,.74s.14.86.75,1c.44.1.8,0,.91-.37A1.49,1.49,0,0,0,266.09,227.39Z" fill="#01ada1"/><path d="M262.29,232.06c.07.19.29.43.46.44.4,0,.59-.37.6-.63.46-.07,1.09-.42,1.15-.71.09-.44-.39-1-1-1.14s-.91.18-1,.85a.91.91,0,0,0,.13.61,1,1,0,0,0-.16.06A.56.56,0,0,0,262.29,232.06Z" fill="#01ada1"/><path d="M264.13,216.15c-.23.22-.4.47-.19.79a.83.83,0,0,0,1,0,.76.76,0,0,0-.14-.7A.41.41,0,0,0,264.13,216.15Z" fill="#01ada1"/><path d="M257.72,241.62a1.32,1.32,0,0,0-.77-.73v1.8a.88.88,0,0,0,.17,0A.84.84,0,0,0,257.72,241.62Z" fill="#01ada1"/><path d="M258.06,233.82c.24-.1.41-.73.29-1.07a.62.62,0,0,0-.38-.38.53.53,0,0,0-.54-.47,1.76,1.76,0,0,0-.48,0v1.16l.11.07h0C257.23,233.59,257.77,233.94,258.06,233.82Z" fill="#01ada1"/><path d="M257.59,226.73a1.11,1.11,0,0,0,1.49-.82,1.19,1.19,0,0,0-.67-1.43c-.51-.19-1.22.31-1.46,1v.7A.93.93,0,0,0,257.59,226.73Z" fill="#01ada1"/><path d="M257,237.19a.54.54,0,0,0,0-.38Z" fill="#01ada1"/><path d="M257,237.88v1.78a1,1,0,0,0,.32-.57C257.38,238.42,257.29,238.12,257,237.88Z" fill="#01ada1"/><path d="M261.84,241.38a1.13,1.13,0,0,0,1.28.43.81.81,0,0,0,.33-.33.55.55,0,0,0,.29-.35c.07-.26.1-.55-.24-.69a.71.71,0,0,0-.21,0,.84.84,0,0,0-.92-.37A1.23,1.23,0,0,0,261.84,241.38Z" fill="#01ada1"/><path d="M263.73,237.52a.25.25,0,0,0-.15-.39c-.18-.07-.3,0-.38.14v0a.45.45,0,0,0-.63-.13c-.16.15-.59.44-.38.77s.69.25.92.19a.35.35,0,0,0,.25-.45A.25.25,0,0,0,263.73,237.52Z" fill="#01ada1"/><path d="M259,195.82c-.17,0-.35.15-.38.27s0,.49.2.53.4-.27.41-.39S259.13,195.86,259,195.82Z" fill="#01ada1"/><path d="M262,234.57a1.15,1.15,0,0,0-.16,1.19c.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94.8.8,0,0,0-.53-.48.32.32,0,0,0-.31-.16A.38.38,0,0,0,262,234.57Z" fill="#01ada1"/><path d="M266.42,237.92a1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.18-.39,1,1,0,0,0-.64,1.38A1,1,0,0,0,266.42,237.92Z" fill="#01ada1"/><path d="M277.45,232.78a.5.5,0,0,0-.33.65.53.53,0,0,0,.66.44.61.61,0,0,0,.41-.78A.55.55,0,0,0,277.45,232.78Z" fill="#01ada1"/><path d="M258,224c.19-.11.11-.61,0-.8a.49.49,0,0,0-.77-.1.68.68,0,0,0,0,.62C257.4,223.87,257.83,224.12,258,224Z" fill="#01ada1"/><path d="M277,240.91a1,1,0,0,0,1.07.46c.4-.16.89-1.09.74-1.42a1.19,1.19,0,0,0-1.46-.34C276.85,239.82,276.73,240.29,277,240.91Z" fill="#01ada1"/><path d="M276.6,242.23a1.31,1.31,0,0,0-.78.73.69.69,0,0,0-.23-.17c-.55-.12-.81.54-.66.83a.65.65,0,0,0,.79.2.5.5,0,0,0,.21-.28,1.25,1.25,0,0,0,1.25.29,1.18,1.18,0,0,0,.35-1.23A.81.81,0,0,0,276.6,242.23Z" fill="#01ada1"/><path d="M279.09,252.73a.93.93,0,0,0-1.15.62,1.25,1.25,0,0,0,0,.71.71.71,0,0,0-.44.94.69.69,0,0,0,.83.36.84.84,0,0,0,.47-.68,1,1,0,0,0,.59-.26c.27-.29.18-.59.09-.91S279.45,252.91,279.09,252.73Z" fill="#01ada1"/><path d="M260.26,257.69a1.44,1.44,0,0,0,.77-1,1.06,1.06,0,0,0,.88-.62c.1-.35-.54-1.14-1-1.24a.94.94,0,0,0-.85.45,1,1,0,0,0-.43.06c-.8.31-1.22,1-1,1.61a1,1,0,0,0,.33.42.67.67,0,0,0-.48.35.72.72,0,0,0,.08.93c.37.38.78.11,1.22-.05a1.65,1.65,0,0,0-.12-.89A1,1,0,0,0,260.26,257.69Z" fill="#01ada1"/><path d="M275.37,251.49a1.45,1.45,0,0,0,1.83.49,1,1,0,0,0,.49-1.36c-.46-.9-.78-.9-1.71-.64A1.12,1.12,0,0,0,275.37,251.49Z" fill="#01ada1"/><path d="M278.92,243.84a.34.34,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49S279,243.7,278.92,243.84Z" fill="#01ada1"/><path d="M277.9,247.31a1.54,1.54,0,0,0,.68-1.37.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14S277.49,247.47,277.9,247.31Z" fill="#01ada1"/><path d="M266.47,244.53c-.27.3-.53.62-.28,1a.6.6,0,0,0,.87.23.84.84,0,0,0,.38-.62C267.37,244.67,267,244.54,266.47,244.53Z" fill="#01ada1"/><path d="M265.68,243.56a.7.7,0,0,0-.62-.49c-.16-1-1.07-1.19-1.92-1.09a1.45,1.45,0,0,0-.86.41,1.53,1.53,0,0,0-.39,1.2.78.78,0,0,1,0,.22.68.68,0,0,0-.31.86,1.22,1.22,0,0,0,.48.65,2,2,0,0,0,1.95.8,1.67,1.67,0,0,0,1.34-.9,1,1,0,0,0-.08-.87h0A.59.59,0,0,0,265.68,243.56Z" fill="#01ada1"/><path d="M261.82,248.76a1.37,1.37,0,0,0-1.25.26.83.83,0,0,0-.6-.11,1.23,1.23,0,0,0-.7,1.42c.13.33.73.48,1.21.32a.05.05,0,0,0,0,0,1.46,1.46,0,0,0,.68.69,1,1,0,0,0,.72-.06.41.41,0,0,0,.58.19c.2-.1.54-.31.44-.6a.57.57,0,0,0-.32-.31l.06-.14A1.49,1.49,0,0,0,261.82,248.76Z" fill="#01ada1"/><path d="M260.45,252.58a.93.93,0,0,0-1,.52.69.69,0,0,0,.49.92.76.76,0,0,0,.9-.42A1.08,1.08,0,0,0,260.45,252.58Z" fill="#01ada1"/><path d="M259,192.84a.69.69,0,0,0-.79.61c0,.33.2.4.45.45s.64-.15.6-.46A2.21,2.21,0,0,0,259,192.84Z" fill="#01ada1"/><path d="M268.54,237.24a1,1,0,0,0-1.44.34c-.32.5-.1.76-.33,1s-.15.52.08.82a2.28,2.28,0,0,0-.51.09,1.15,1.15,0,0,0-.75,1.44,1.5,1.5,0,0,0,1.75,1,1.57,1.57,0,0,0,.84-1.74.85.85,0,0,0-.19-.32.51.51,0,0,0,.09-.78c-.12-.12-.11-.47.06-.39s.4,0,.62-.42A.72.72,0,0,0,268.54,237.24Z" fill="#01ada1"/><path d="M259.29,187.45a1.39,1.39,0,0,0-.55,1.35c.11.37.21.77.76.73.4,0,.8,0,1.2,0a.58.58,0,0,0,.85-.37.75.75,0,0,0-.5-.93,2,2,0,0,1-.65-.39A1,1,0,0,0,259.29,187.45Z" fill="#01ada1"/><path d="M260.83,185.14c0,.25.1.82.44.86s.52-.4.6-.6a.44.44,0,0,0-.27-.65C261.28,184.64,260.81,184.84,260.83,185.14Z" fill="#01ada1"/><path d="M268.12,243.75a.67.67,0,0,0-.42.88.61.61,0,0,0,.85.29.71.71,0,0,0,.34-.93A.54.54,0,0,0,268.12,243.75Z" fill="#01ada1"/><path d="M261.53,181.43a.67.67,0,0,0-.82.52.84.84,0,0,0,.53.86.67.67,0,0,0,.79-.56A.64.64,0,0,0,261.53,181.43Z" fill="#01ada1"/><path d="M310.68,257.18a.4.4,0,0,0,.06.46c.09.09.46.19.56.06s-.06-.48-.15-.55A.41.41,0,0,0,310.68,257.18Z" fill="#01ada1"/><path d="M379.75,237.52c-.15,0-.63.19-.64.38s.41.45.53.43.5-.19.53-.35S379.91,237.55,379.75,237.52Z" fill="#01ada1"/><path d="M379.42,250.24a1.07,1.07,0,0,0,.08.83.33.33,0,0,0,.51.07.74.74,0,0,0,.11-.59c0-.2,0-.4-.14-.56S379.52,250,379.42,250.24Z" fill="#01ada1"/><path d="M377.58,245c0-.28-.33-.29-.47-.31s-.29.19-.27.25a.53.53,0,0,0,.28.35A.38.38,0,0,0,377.58,245Z" fill="#01ada1"/><path d="M377.61,254.21c-.11.51.16.83.93.8a10.19,10.19,0,0,0,1.33-.64.61.61,0,0,0,.21-.88.64.64,0,0,0-.87-.28,2,2,0,0,1-.59.15A1,1,0,0,0,377.61,254.21Z" fill="#01ada1"/><path d="M366.43,241.87c.17,0,.34-.34.33-.46s-.13-.35-.31-.35-.3.21-.32.33S366.27,241.87,366.43,241.87Z" fill="#01ada1"/><path d="M380.92,244.54c-.31,0-.59.15-.6.54a.72.72,0,0,0,.62.66c.25,0,.46-.39.44-.78S381.21,244.51,380.92,244.54Z" fill="#01ada1"/><path d="M365.89,246.4a.21.21,0,0,0,.22.2c.13,0,.17-.15.17-.22s-.16-.15-.21-.15S365.89,246.31,365.89,246.4Z" fill="#01ada1"/><path d="M362.79,237.84c0-.07-.1-.37-.29-.37s-.26.33-.27.46a.35.35,0,0,0,.28.28C362.63,238.21,362.76,238,362.79,237.84Z" fill="#01ada1"/><path d="M365.36,252.14c-.43-.16-.85-.39-1.13.15a.72.72,0,0,0,.12.92c.1.09.3.19.4.15a7.49,7.49,0,0,0,.95-.46c.78.33,1.45.26,1.66-.21a1.4,1.4,0,0,0-.66-1.54C366.17,250.9,365.89,251.09,365.36,252.14Z" fill="#01ada1"/><path d="M376,248.18c0,.68.58,1.16,1.44,1.17a1.14,1.14,0,0,0,1.18-1.19,1.44,1.44,0,0,0-1.36-1.33A1.5,1.5,0,0,0,376,248.18Z" fill="#01ada1"/><path d="M372.69,239.41c0-.19-.48-.47-.71-.54s-.51.18-.53.56a.41.41,0,0,0,.51.47C372.18,239.86,372.71,239.6,372.69,239.41Z" fill="#01ada1"/><path d="M380.81,248a.74.74,0,0,0-.4.57.54.54,0,0,0,.57.64.59.59,0,0,0,.6-.56C381.63,248.41,381.06,247.92,380.81,248Z" fill="#01ada1"/><path d="M371.13,249.75c.16,0,.59-.33.57-.52s-.54-.46-.63-.41-.54.39-.47.56A.68.68,0,0,0,371.13,249.75Z" fill="#01ada1"/><path d="M371.68,250.88c-.12.45-.35.85.09,1.14a.72.72,0,0,0,.92-.09.55.55,0,0,0,.14-.73C372.57,250.74,372.16,250.78,371.68,250.88Z" fill="#01ada1"/><path d="M370.64,247.31c.05.44.67.83,1.28.79s.81-.44.75-1.12a1,1,0,0,0-.86-.78C371.37,246.23,370.6,247,370.64,247.31Z" fill="#01ada1"/><path d="M379.57,256.11a1.13,1.13,0,0,0,1,.85,1.28,1.28,0,0,0,.78-1.12.63.63,0,0,0-.76-.59C379.88,255.3,379.54,255.57,379.57,256.11Z" fill="#01ada1"/><path d="M378.25,251.24c-.08-.42-.28-.72-.72-.66a.61.61,0,0,0-.4.4.76.76,0,0,0,.23.61C377.76,251.85,378,251.52,378.25,251.24Z" fill="#01ada1"/><path d="M373.05,253.13c-.66-.15-1.4.12-1.33.73a2.39,2.39,0,0,0,.82,1.38c.3.32.8,0,.74.57s-.06,1.59.91,1.59a1.18,1.18,0,0,0,1-1v0a1.33,1.33,0,0,0,1.1.45,1.32,1.32,0,0,0,1.06-1.38,1.11,1.11,0,0,0-1.09-1,1.75,1.75,0,0,0-1.23,1.14.67.67,0,0,0-.4-.36c-.39-.12.12-.91-.41-1.1S373.72,253.29,373.05,253.13Z" fill="#01ada1"/><path d="M374.59,251.34a1.28,1.28,0,0,0,.13,1.77,1.26,1.26,0,0,0,1.55.11c.42-.28.29-1.09-.08-1.69A1.24,1.24,0,0,0,374.59,251.34Z" fill="#01ada1"/><path d="M355.83,244.29c0,.3-.13.69.13.92s.56-.08.61-.21.24-.91,0-1.08S355.84,244.19,355.83,244.29Z" fill="#01ada1"/><path d="M344.09,258.9c0,.12.13.5.3.48s.3-.3.29-.39-.08-.45-.25-.42A.44.44,0,0,0,344.09,258.9Z" fill="#01ada1"/><path d="M345.13,240.35a.73.73,0,0,0,.19,1,.69.69,0,0,0,1-.12.75.75,0,0,0-.2-1A.69.69,0,0,0,345.13,240.35Z" fill="#01ada1"/><path d="M361.46,250.41a1.08,1.08,0,0,0-.12.62,1.2,1.2,0,0,0-.51.89,1.31,1.31,0,0,0,1,1.39,1.75,1.75,0,0,0,1.47-1.18,1.41,1.41,0,0,0,.81-.76c.18-.54-.48-.87-.88-.77s-.28,0-.57-.29A.71.71,0,0,0,361.46,250.41Z" fill="#01ada1"/><path d="M347.26,245.69c-.31-.08-1,0-1,.67.53.95-.24,1.06-.09,1.86a1.26,1.26,0,0,0,.16.33.88.88,0,0,0,1.59-.19,5.79,5.79,0,0,0,.35-1.42A1.36,1.36,0,0,0,347.26,245.69Z" fill="#01ada1"/><path d="M349.66,253.26c.1-.4-.26-.54-.56-.67-.4.15-.63.42-.46.83.06.15.34.33.45.29S349.61,253.45,349.66,253.26Z" fill="#01ada1"/><path d="M353.77,249a.65.65,0,0,0-1,.07.68.68,0,0,0,.11,1,.81.81,0,0,0,1-.09A.66.66,0,0,0,353.77,249Z" fill="#01ada1"/><path d="M351.45,245.48a1,1,0,0,0,.4,1.26,1,1,0,0,0,1.26-1.58A1.34,1.34,0,0,0,351.45,245.48Z" fill="#01ada1"/><path d="M345.25,257.78c.38.05.78-.31.95-.84.05-.18.08-.35.13-.53a2.3,2.3,0,0,0,1.17-.53,2.69,2.69,0,0,0,.29.16.7.7,0,0,0,.36,0,1,1,0,0,0,.65.2c.5,0,.77-.26.76-.69a1.34,1.34,0,0,0-.47-1,1.21,1.21,0,0,0-.94-.69,1.38,1.38,0,0,0-1,.29.75.75,0,0,0-.14-.12c-.57-.47-1.07-.25-1.57.15-.28-.28-.46-.74-1-.46a.63.63,0,0,0-.35.76c.14.56.61.48,1,.44l.25.69-.88.35a4.31,4.31,0,0,0-.1.75A1.46,1.46,0,0,0,345.25,257.78Z" fill="#01ada1"/><path d="M350.36,256a.75.75,0,0,0,.14,1,.59.59,0,0,0,.88-.1.67.67,0,0,0,0-1A.72.72,0,0,0,350.36,256Z" fill="#01ada1"/><path d="M349,251a.67.67,0,0,0-.39-.73c-.37-.08-.88.63-.71.88S348.89,251.34,349,251Z" fill="#01ada1"/><path d="M369.25,252.8c0,.31.7.85,1.06.86s.6-.3.57-.85-.24-.89-.68-.88C369.6,252,369.2,252.32,369.25,252.8Z" fill="#01ada1"/><path d="M354.86,242c-.12.44-.35.84.09,1.13a.72.72,0,0,0,.92-.09.54.54,0,0,0,.14-.72C355.75,241.89,355.34,241.93,354.86,242Z" fill="#01ada1"/><path d="M356.1,249c-.26-.06-.53.32-.48.63s.22.56.54.47.82-.33.8-.58S356.35,249,356.1,249Z" fill="#01ada1"/><path d="M354.16,245.87c0,.06.15.31.22.3s.43,0,.47-.25-.27-.34-.34-.32A.62.62,0,0,0,354.16,245.87Z" fill="#01ada1"/><path d="M343.61,256c-.14,0-.36.08-.36.35a.38.38,0,0,0,.44.42.39.39,0,0,0,.36-.47A.42.42,0,0,0,343.61,256Z" fill="#01ada1"/><path d="M355.82,250.46c-.24.24-.27.74,0,.86s.78.28,1,0-.13-.65-.27-.81A.44.44,0,0,0,355.82,250.46Z" fill="#01ada1"/><path d="M344.24,250.42a1,1,0,1,0,1.56,1.12,1.28,1.28,0,0,0,.21-.75.7.7,0,0,0,.64.64.61.61,0,0,0,.66-.59.71.71,0,0,0-.64-.66.59.59,0,0,0-.66.55.8.8,0,0,0-.28-.6A1.34,1.34,0,0,0,344.24,250.42Z" fill="#01ada1"/><path d="M342.75,246.53a.49.49,0,0,0,.1.77.68.68,0,0,0,.6-.18c.11-.14.24-.61.08-.77S342.91,246.41,342.75,246.53Z" fill="#01ada1"/><path d="M355.9,258.34a.73.73,0,0,0,.1,1.05.69.69,0,0,0,.95-.24.64.64,0,0,0-.1-.89A.62.62,0,0,0,355.9,258.34Z" fill="#01ada1"/><path d="M391.24,252.13a.69.69,0,0,0-.75.73.77.77,0,0,0,.72.68.8.8,0,0,0,.7-.81A.65.65,0,0,0,391.24,252.13Z" fill="#01ada1"/><path d="M392.34,244.91c-.1,0-.31.18-.32.29s.1.49.3.46.34-.32.34-.44A.47.47,0,0,0,392.34,244.91Z" fill="#01ada1"/><path d="M386.16,251.2a.81.81,0,0,0,.84.68c.51-.07.93-.47.9-.87s-.59-1.06-1-1S386.14,250.66,386.16,251.2Z" fill="#01ada1"/><path d="M386.91,242.56c-.08,0-.28.19-.27.25s.16.33.29.36.45-.18.45-.3S387.05,242.59,386.91,242.56Z" fill="#01ada1"/><path d="M387.19,259.29a1.26,1.26,0,0,0-.89.46H388A1,1,0,0,0,387.19,259.29Z" fill="#01ada1"/><path d="M386.68,246a1.12,1.12,0,0,0,.87.82.7.7,0,0,0,.6-.78.66.66,0,0,0-.78-.59C386.92,245.43,386.64,245.65,386.68,246Z" fill="#01ada1"/><path d="M385,257.91a.63.63,0,0,0,.55-.78c-.06-.32-.12-.68-.46-.67-.6.05-.93.34-.92.71A.74.74,0,0,0,385,257.91Z" fill="#01ada1"/><path d="M368.59,244.16c-.3,0-.48.2-.42.55s.2.57.52.49.8-.34.8-.61S368.83,244.18,368.59,244.16Z" fill="#01ada1"/><path d="M388.9,257.56a1.32,1.32,0,0,0,1-1.16,1.2,1.2,0,0,0-1-.85.87.87,0,0,0-.8.72C388.05,257,388.43,257.58,388.9,257.56Z" fill="#01ada1"/><path d="M388.07,244.22c-.06,0-.18.08-.17.17a.2.2,0,0,0,.21.2c.13,0,.17-.16.17-.22S388.13,244.22,388.07,244.22Z" fill="#01ada1"/><path d="M385.77,246c0-.15-.08-.45-.25-.42a.44.44,0,0,0-.34.33c0,.12.13.5.3.48S385.78,246.08,385.77,246Z" fill="#01ada1"/><path d="M394.91,255.84a.69.69,0,0,0,.66.72.53.53,0,0,0,.64-.57.66.66,0,0,0-.62-.75A.67.67,0,0,0,394.91,255.84Z" fill="#01ada1"/><path d="M398.06,253.67a.7.7,0,1,0,0-1.39.82.82,0,0,0-.66.76A.63.63,0,0,0,398.06,253.67Z" fill="#01ada1"/><path d="M400.92,257.86a.73.73,0,0,0-.64.74.69.69,0,0,0,.73.74.74.74,0,0,0,.69-.79A.7.7,0,0,0,400.92,257.86Z" fill="#01ada1"/><path d="M396.67,247.66a.79.79,0,0,0-.63.66c0,.34.53.55.83.6s.92-.35.91-.7S397,247.65,396.67,247.66Z" fill="#01ada1"/><path d="M393.77,259.22c0-.42-.64-1.14-1-1.13-.55,0-.88.42-.86,1.06a.71.71,0,0,0,.35.6h1.2A.61.61,0,0,0,393.77,259.22Z" fill="#01ada1"/><path d="M393.08,251.33c.3,0,.71-.59.61-.8s-.4-.28-.64-.31a.42.42,0,0,0-.5.49C392.59,251,392.69,251.31,393.08,251.33Z" fill="#01ada1"/><path d="M353.92,252.64a.75.75,0,0,0-.25-1,.67.67,0,0,0-.94.24.68.68,0,0,0,.16,1A.84.84,0,0,0,353.92,252.64Z" fill="#01ada1"/><path d="M391.36,255.4a1.38,1.38,0,0,0,1.28,1.11.85.85,0,0,0,.66-.94c-.05-.63-.42-1-1-1S391.33,255,391.36,255.4Z" fill="#01ada1"/><path d="M390.21,259.75h1a.71.71,0,0,0-.55-.26A.61.61,0,0,0,390.21,259.75Z" fill="#01ada1"/><path d="M384.27,253.62a.64.64,0,0,0,.19.6,1,1,0,0,0,.82.09c.48-.24.23-.66.13-1.09C384.89,253.13,384.45,253.12,384.27,253.62Z" fill="#01ada1"/><path d="M359.63,258.6a.67.67,0,0,0,.19,1c.28.17.45,0,.6-.2a.45.45,0,0,0-.15-.74A2.38,2.38,0,0,0,359.63,258.6Z" fill="#01ada1"/><path d="M361.89,256.42a.68.68,0,0,0,.19,1c.29.17.46,0,.6-.2s.16-.64-.14-.74A1.83,1.83,0,0,0,361.89,256.42Z" fill="#01ada1"/><path d="M364.13,247.7a1,1,0,0,0-.93.94c0,.46.22.77.59.79a1.13,1.13,0,0,0,1.07-.94A.79.79,0,0,0,364.13,247.7Z" fill="#01ada1"/><path d="M360.49,245.58a.94.94,0,0,0-1,1.09,1.1,1.1,0,0,0,1.22,1,1.14,1.14,0,0,0,.91-1.2C361.62,245.84,361.17,245.51,360.49,245.58Z" fill="#01ada1"/><path d="M363,256.15a.77.77,0,0,0,.35.55.57.57,0,0,0,.55-.06c.32-.3.22-.65-.07-1C363.47,255.68,363.06,255.68,363,256.15Z" fill="#01ada1"/><path d="M367.84,247.44a.77.77,0,0,0,.72.68.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6A.69.69,0,0,0,367.84,247.44Z" fill="#01ada1"/><path d="M366.86,256.9c-.53.45-.64.89-.34,1.35a1.08,1.08,0,0,0,1.5.34,12.55,12.55,0,0,1,1.85-.89c.53-.16,1-.74.89-1.1a.8.8,0,0,0-.92-.33c-.43.27-.65,0-1-.11a2.09,2.09,0,0,0-1,0,1.71,1.71,0,0,0-.55.29A4.87,4.87,0,0,0,366.86,256.9Z" fill="#01ada1"/><path d="M382.67,240.23a.66.66,0,0,0-.7.67.69.69,0,0,0,.62.66.67.67,0,0,0,.67-.71A.53.53,0,0,0,382.67,240.23Z" fill="#01ada1"/><path d="M364.55,257.76a.37.37,0,0,0,.07.45c.09.09.46.19.56.06s-.06-.48-.16-.54A.39.39,0,0,0,364.55,257.76Z" fill="#01ada1"/><path d="M367.22,256c0-.7-.3-1.26-.76-1.27a1.17,1.17,0,0,0-1,1c0,.42.45.9.95.94A.86.86,0,0,0,367.22,256Z" fill="#01ada1"/><path d="M383.38,249.15c-.22-.05-.7.41-.65.75s.28.36.52.35.61-.27.5-.57S383.59,249.2,383.38,249.15Z" fill="#01ada1"/><path d="M299.5,237.81a.49.49,0,0,0-.08-.54.43.43,0,0,0-.44,0,.42.42,0,0,0,0,.42C299,237.8,299.38,238,299.5,237.81Z" fill="#01ada1"/><path d="M383.54,259.28c0-.35-.3-.54-.72-.52-.63,0-1,.25-1,.6a.71.71,0,0,0,.15.39h1.45A.92.92,0,0,0,383.54,259.28Z" fill="#01ada1"/><path d="M359,247.23c-.06.05-.09.29,0,.36a.45.45,0,0,0,.45,0c.08-.07.18-.43.05-.54S359.07,247.13,359,247.23Z" fill="#01ada1"/><path d="M382.92,254.73c-.61.54-.74.84-.51,1.22a.67.67,0,0,0,.77.33.76.76,0,0,0,.66-.74C383.78,255,383.32,254.88,382.92,254.73Z" fill="#01ada1"/><path d="M371.74,259a.34.34,0,0,0-.16,0,.93.93,0,0,0-.33-.48,2,2,0,0,0-2,.31,1.11,1.11,0,0,0-.17.86h3.59C372.41,259.41,372,259,371.74,259Z" fill="#01ada1"/><path d="M358.55,252.63a1.27,1.27,0,0,1-.49.28,1,1,0,0,0-.85.82c-.06.35.55,1,1,1.09a2,2,0,0,0,.48,0,1.14,1.14,0,0,0-.41.78c0,.41.54.81,1.06.79s1-.29,1-.8a1.19,1.19,0,0,0-1-1.1,1.06,1.06,0,0,0-.19.06.5.5,0,0,0,.08-.12c.16-.37.37-.71.55-1.07a.58.58,0,0,0,.05-.93.76.76,0,0,0-1,0A.28.28,0,0,0,358.55,252.63Z" fill="#01ada1"/><path d="M359.31,259.73a.73.73,0,0,0-.44-.82.82.82,0,0,0-1.05.54.48.48,0,0,0,.05.3h1.44Z" fill="#01ada1"/><path d="M380.27,259.39a1.15,1.15,0,0,1-.21-1.26,1.1,1.1,0,0,0-.7-1.06,1.42,1.42,0,0,0-1.22.81c-.09.31-.26.73.11.92a1.48,1.48,0,0,1,.72.95h1.37A.42.42,0,0,0,380.27,259.39Z" fill="#01ada1"/><path d="M313,254c-.25-.31-.38-.78-.91-.57a.66.66,0,0,0-.44.73c.08.56.55.53,1,.54l.17.71-.91.26a3.78,3.78,0,0,0-.18.74,1.39,1.39,0,0,0,.71,1.09c.37.1.81-.21,1-.73.07-.16.13-.33.19-.51a2.19,2.19,0,0,0,1.22-.39l.27.19a1.26,1.26,0,0,0,1.52-.56,1.3,1.3,0,0,0-.93-1.52,1.43,1.43,0,0,0-1,.17l-.13-.13C314.08,253.5,313.55,253.67,313,254Z" fill="#01ada1"/><path d="M324.93,242.34c.08-.06.14-.47.05-.54s-.43.09-.53.18a.43.43,0,0,0,0,.37A.54.54,0,0,0,324.93,242.34Z" fill="#01ada1"/><path d="M314.24,240.18a.74.74,0,0,0,.08,1,.7.7,0,0,0,1,0,.75.75,0,0,0-.09-1.05A.69.69,0,0,0,314.24,240.18Z" fill="#01ada1"/><path d="M312.25,250.09a.92.92,0,0,0,.06,1.43h0c-.19.19-.11.49.16.72a.41.41,0,0,0,.68-.12,1.43,1.43,0,0,0,.13-.45,1,1,0,0,0,.39-.29,1.1,1.1,0,0,0,.09-1.41A1.33,1.33,0,0,0,312.25,250.09Z" fill="#01ada1"/><path d="M316.6,250.4c-.36-.13-.94.52-.8.79s1,.33,1.1,0A.64.64,0,0,0,316.6,250.4Z" fill="#01ada1"/><path d="M316.64,245.11c.1-.17.16-.52.05-.63a.63.63,0,0,0-.62,0c-.12.1-.24.62-.1.74S316.59,245.21,316.64,245.11Z" fill="#01ada1"/><path d="M316.29,253.56c0,.15.3.36.42.33a1,1,0,0,0,.61-.38c.15-.39-.2-.57-.48-.73C316.42,252.89,316.16,253.13,316.29,253.56Z" fill="#01ada1"/><path d="M311.19,246.06a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11c.13-.12.31-.58.17-.75S311.36,246,311.19,246.06Z" fill="#01ada1"/><path d="M314.7,246.27c.42,1-.36,1-.29,1.85a1.4,1.4,0,0,0,.12.35.88.88,0,0,0,1.6,0,5.41,5.41,0,0,0,.5-1.36,1.36,1.36,0,0,0-.86-1.36C315.47,245.61,314.77,245.63,314.7,246.27Z" fill="#01ada1"/><path d="M321.68,252.69a.69.69,0,0,0-.2-.31.68.68,0,0,0-1,.14.69.69,0,0,0,.06,1,.84.84,0,0,0,1.05-.19.41.41,0,0,0,.07-.15,1.44,1.44,0,0,0,.45.85,1.26,1.26,0,0,0,1.81-.41,1.15,1.15,0,0,0,.15-1.21.47.47,0,0,0,.52-.08c.22-.26-.05-.66-.18-.84a.44.44,0,0,0-.69-.12.72.72,0,0,0-.24.48,1.41,1.41,0,0,0-1.65.36A1.18,1.18,0,0,0,321.68,252.69Z" fill="#01ada1"/><path d="M321,244.78a.68.68,0,0,0-.14-1,.54.54,0,0,0-.86.08.67.67,0,0,0,.1,1A.71.71,0,0,0,321,244.78Z" fill="#01ada1"/><path d="M317.33,258.81a.64.64,0,0,0-.88.17.72.72,0,0,0-.11.77h1.25A.82.82,0,0,0,317.33,258.81Z" fill="#01ada1"/><path d="M308.36,249.63a.69.69,0,0,0,1-.18.57.57,0,0,0-.1-.87.75.75,0,0,0-1,.08A.72.72,0,0,0,308.36,249.63Z" fill="#01ada1"/><path d="M324.47,246.2c.23.26.56,0,.63-.14s.33-.88.15-1.07-.78.18-.81.29C324.38,245.57,324.23,245.94,324.47,246.2Z" fill="#01ada1"/><path d="M323.28,248.65c.15-.21,0-.61-.34-.84a.39.39,0,0,0-.62.11.56.56,0,0,0,.05.81A.75.75,0,0,0,323.28,248.65Z" fill="#01ada1"/><path d="M319.28,240.49a.74.74,0,0,0,.36-.52c0-.46-.6-.57-.83-.49a.63.63,0,0,0-.07.94A.55.55,0,0,0,319.28,240.49Z" fill="#01ada1"/><path d="M320.21,247.28a.93.93,0,0,0,1.38-.14.9.9,0,0,0,.05-1.3A1.35,1.35,0,0,0,320,246,1,1,0,0,0,320.21,247.28Z" fill="#01ada1"/><path d="M318.28,244.31c0,.05-.08.18,0,.24a.21.21,0,0,0,.3,0c.08-.1,0-.23,0-.28A.25.25,0,0,0,318.28,244.31Z" fill="#01ada1"/><path d="M318,256.18a.5.5,0,0,0-.29.16.75.75,0,0,0,0,1,.61.61,0,0,0,.27.17.5.5,0,0,0,.17.22,1.18,1.18,0,0,0,1.41-.51c.31-.46.15-.91-.42-1.28a1,1,0,0,0-1.15.2S318,256.16,318,256.18Z" fill="#01ada1"/><path d="M314.44,257.41c-.2.22-.14.5.17.66s.58.2.7-.1.23-.84,0-1S314.6,257.23,314.44,257.41Z" fill="#01ada1"/><path d="M307.28,244a.93.93,0,0,0-1.38,0,.94.94,0,0,0-.1,1.24,1.35,1.35,0,0,0,1.68-.14A.83.83,0,0,0,307.28,244Z" fill="#01ada1"/><path d="M304.27,243a.64.64,0,0,0-.89.07.69.69,0,0,0,0,1,.78.78,0,0,0,1,0A.83.83,0,0,0,304.27,243Z" fill="#01ada1"/><path d="M308.26,238.31a.83.83,0,0,0,.09,1,.61.61,0,0,0,.89,0,.7.7,0,1,0-1-1Z" fill="#01ada1"/><path d="M307.15,251a1.15,1.15,0,0,0-1.48,0,1.13,1.13,0,0,0-.07,1.48,1.57,1.57,0,0,0,1.67-.06A1.08,1.08,0,0,0,307.15,251Z" fill="#01ada1"/><path d="M304.52,254.9a1.25,1.25,0,0,0,.14,1.66,1.26,1.26,0,0,0,1.71-1.84A1.24,1.24,0,0,0,304.52,254.9Z" fill="#01ada1"/><path d="M300.65,250.79c-.43-.34-.84-.1-1.22.08a3.66,3.66,0,0,0,0,.47,1.27,1.27,0,0,0-.15,1.11.79.79,0,0,0,.89.46,1,1,0,0,0,.68-1,1.51,1.51,0,0,0-.09-.18A.74.74,0,0,0,300.65,250.79Z" fill="#01ada1"/><path d="M298.19,252.88c-.48.57-.52,1-.12,1.35a1.13,1.13,0,0,0,1.33-.14,1.28,1.28,0,0,0-.25-1.34A.64.64,0,0,0,298.19,252.88Z" fill="#01ada1"/><path d="M353.34,250.91a.87.87,0,0,0-.68-.75.68.68,0,0,0-.64.66.66.66,0,1,0,1.32.09Z" fill="#01ada1"/><path d="M300.09,248c-.43.32-.75.63-.51,1.1a.65.65,0,0,0,.56.29,1,1,0,0,0,.63-.53C300.94,248.38,300.46,248.27,300.09,248Z" fill="#01ada1"/><path d="M304.14,247.21a.89.89,0,0,0,0,1.08c.54.51,1.2.63,1.52.28a1.29,1.29,0,0,0-.15-1.5A1.2,1.2,0,0,0,304.14,247.21Z" fill="#01ada1"/><path d="M309.15,259c.06-.24,1.14-.51,1.26-1.34a1.43,1.43,0,0,0-1.19-1.57,2.4,2.4,0,0,0-2.19,1.32c-.18.65.53,1.09.51,1.27s-.82.49-1.14,1.12h3.21C309.37,259.4,309.11,259.1,309.15,259Z" fill="#01ada1"/><path d="M304,236.1a.8.8,0,0,0,0,.91c.25.24.77,0,1-.17s.39-.91.14-1.15S304.17,235.88,304,236.1Z" fill="#01ada1"/><path d="M310.22,246.25a1.48,1.48,0,0,0-1.53-.07.91.91,0,0,0,.17,1.37c.36.33.84.24,1.27-.24A.75.75,0,0,0,310.22,246.25Z" fill="#01ada1"/><path d="M308.64,242.17a.66.66,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,308.64,242.17Z" fill="#01ada1"/><path d="M309,252.9a.93.93,0,0,0-.09,1.24.77.77,0,0,0,1.06.06,1.1,1.1,0,0,0-.08-1.35A.62.62,0,0,0,309,252.9Z" fill="#01ada1"/><path d="M303.27,240.48a.41.41,0,0,0,0,.69c.25.19.52.33.8.06a.82.82,0,0,0-.14-1C303.72,240.16,303.47,240.32,303.27,240.48Z" fill="#01ada1"/><path d="M305.33,259.63a2,2,0,0,0,.59-1,.16.16,0,0,0,.08-.06c.08-.1,0-.34-.11-.45h0a1.29,1.29,0,0,0-.34-.55,1.47,1.47,0,0,0-2.12.21,1.41,1.41,0,0,0,0,2h1.71Z" fill="#01ada1"/><path d="M302.21,250.51c-.38.45-.41.89-.13,1.14a.75.75,0,0,0,1.11-.07.65.65,0,0,0-.18-.94C302.74,250.46,302.44,250.25,302.21,250.51Z" fill="#01ada1"/><path d="M302,254.89a1.13,1.13,0,0,0,1.35-.06,1,1,0,0,0-.22-1.22.59.59,0,0,0-.87.15C301.83,254.24,301.73,254.65,302,254.89Z" fill="#01ada1"/><path d="M300.91,256a1.18,1.18,0,0,1-1.05-.73,1.09,1.09,0,0,0-1.24-.25,1.44,1.44,0,0,0-.28,1.45c.16.28.34.69.74.56a1.52,1.52,0,0,1,1.19.15,1.12,1.12,0,0,0-.27.83c.38.21.7.52,1.11.19a.6.6,0,0,0,.14-.83l-.15-.16a.78.78,0,0,0,.17-.24C301.46,256.62,301.3,256.05,300.91,256Z" fill="#01ada1"/><path d="M324.92,256a1.25,1.25,0,0,0-1.14,1.14,1.29,1.29,0,0,0,1.48,1,1.26,1.26,0,0,0,1-1.15C326.34,256.42,325.63,256,324.92,256Z" fill="#01ada1"/><path d="M326,244.92a.5.5,0,0,0,.05.48c.09.09.48.21.57.06a.47.47,0,0,0-.13-.47C326.32,244.91,326.05,244.78,326,244.92Z" fill="#01ada1"/><path d="M326.6,253.06a.33.33,0,0,0,.37-.36c0-.21-.22-.33-.4-.45s-.31-.26-.53-.24-.31.35-.15.6A1.12,1.12,0,0,0,326.6,253.06Z" fill="#01ada1"/><path d="M326.47,242.09a.2.2,0,0,0,0,.24.21.21,0,0,0,.29,0,.23.23,0,0,0-.07-.28C326.66,242,326.5,242,326.47,242.09Z" fill="#01ada1"/><path d="M327.92,243.12a.66.66,0,0,0-.94.24c-.26.38-.26.74,0,.89a1.13,1.13,0,0,0,1.19-.18A.71.71,0,0,0,327.92,243.12Z" fill="#01ada1"/><path d="M334.3,253.09a.75.75,0,0,0,1.1-.19.65.65,0,0,0-.28-.92c-.29-.15-.61-.32-.81,0C334,252.43,334,252.87,334.3,253.09Z" fill="#01ada1"/><path d="M326.63,255.76c.2-.35.44-.67.66-1a.57.57,0,0,0,.15-.92.75.75,0,0,0-1.05-.08,2.31,2.31,0,0,1-.63.31.56.56,0,0,0-.76.24.54.54,0,0,0,0,.15,1,1,0,0,0-.19.35c-.1.34.43,1.08.83,1.19S326.37,256.23,326.63,255.76Z" fill="#01ada1"/><path d="M331.51,254.5a.64.64,0,0,0-.93.24c-.42.62-.41,1,0,1.36a1.14,1.14,0,0,0,1.3-.29A1.28,1.28,0,0,0,331.51,254.5Z" fill="#01ada1"/><path d="M328.11,248.85a1.17,1.17,0,0,0-.32-.09.37.37,0,0,0,0-.34c-.13-.13-.43,0-.55.12a.3.3,0,0,0,0,.37.38.38,0,0,0,.17.06.84.84,0,0,0,.26.82c.28.17.45,0,.6-.2S328.42,249,328.11,248.85Z" fill="#01ada1"/><path d="M328.11,254.6a2,2,0,0,1-.25.56,1,1,0,0,0,.05,1.32c.34.4.75.38,1.2-.24a12.48,12.48,0,0,0,.32-1.44.63.63,0,0,0-.57-.72A.65.65,0,0,0,328.11,254.6Z" fill="#01ada1"/><path d="M348.2,247.81c.1.5.54.34.75.46a1.11,1.11,0,0,0,1.56-.4,1,1,0,0,0-.39-1.14.79.79,0,0,0-1.08,0C348.77,247,348.1,247.31,348.2,247.81Z" fill="#01ada1"/><path d="M350.47,239.55c-.09-.45-.66-.5-.87-.4a.62.62,0,0,0,0,.94.57.57,0,0,0,.54,0C350.33,240,350.51,239.71,350.47,239.55Z" fill="#01ada1"/><path d="M349.6,244a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.23.23,0,0,0-.07-.28S349.63,244,349.6,244Z" fill="#01ada1"/><path d="M325,250.16a.78.78,0,0,0,.21.67.55.55,0,0,0,.86-.06A.61.61,0,0,0,326,250C325.81,249.74,325.07,249.89,325,250.16Z" fill="#01ada1"/><path d="M352.89,256.24a1,1,0,0,0,.77-1,1,1,0,0,0-1.19-.39.76.76,0,0,0,.42,1.4Z" fill="#01ada1"/><path d="M320.92,249.66a.67.67,0,0,0,0,1,.83.83,0,0,0,1,0,.66.66,0,0,0,0-1A.64.64,0,0,0,320.92,249.66Z" fill="#01ada1"/><path d="M338.41,258.57a1.47,1.47,0,0,0-2.09.43,1.32,1.32,0,0,0-.29.75h2.84A1.12,1.12,0,0,0,338.41,258.57Z" fill="#01ada1"/><path d="M320.58,250.81c-.19-.2-.42.08-.53.18s0,.34,0,.36a.54.54,0,0,0,.45,0A.37.37,0,0,0,320.58,250.81Z" fill="#01ada1"/><path d="M332.1,259.64a.41.41,0,0,0-.47,0,.16.16,0,0,0-.06.13h.6A.72.72,0,0,0,332.1,259.64Z" fill="#01ada1"/><path d="M334.34,242.55c.27.16.56.26.81,0s0-.92-.25-1-.46.14-.64.32A.42.42,0,0,0,334.34,242.55Z" fill="#01ada1"/><path d="M339.78,242.94a.69.69,0,0,0,.05.91.71.71,0,0,0,1-.08.55.55,0,0,0-.05-.87A.67.67,0,0,0,339.78,242.94Z" fill="#01ada1"/><path d="M334,254.84c.09-.1,0-.34-.06-.46s-.34-.19-.48-.06.06.42.15.52A.35.35,0,0,0,334,254.84Z" fill="#01ada1"/><path d="M341.07,249.25a.77.77,0,0,0-1,.18.72.72,0,0,0,.23,1,.68.68,0,0,0,.93-.29A.57.57,0,0,0,341.07,249.25Z" fill="#01ada1"/><path d="M340.28,246.93a.9.9,0,0,0,.31,1.33c.4.29.87.15,1.24-.37a.76.76,0,0,0,0-1.07A1.47,1.47,0,0,0,340.28,246.93Z" fill="#01ada1"/><path d="M330.28,246.54c-.21.3.08,1,.52,1.35a.81.81,0,0,0,1.05-.25,1,1,0,0,0-.13-1.24A1.25,1.25,0,0,0,330.28,246.54Z" fill="#01ada1"/><path d="M331.54,250.86a.65.65,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.52-.38-.58-.77-.77C331.54,250.07,331.26,250.42,331.54,250.86Z" fill="#01ada1"/><path d="M329.64,239.14a.44.44,0,0,0,0,.43c.09.08.44.23.55.05a.49.49,0,0,0-.14-.53A.47.47,0,0,0,329.64,239.14Z" fill="#01ada1"/><path d="M329.36,252a1.41,1.41,0,0,0,.42,1.82,1.68,1.68,0,0,0,2-.33.55.55,0,0,0,.47.29.68.68,0,0,0,.74-.4.75.75,0,0,0-.18-1,.92.92,0,0,0-1.08.15.8.8,0,0,0-.57-.17c-.41,0-.29,0-.54-.36A.71.71,0,0,0,329.36,252Z" fill="#01ada1"/><path d="M332.5,257a1.1,1.1,0,0,0-1.26-.11,1.43,1.43,0,0,0-.11,1.47c.19.26.41.65.79.48a1.66,1.66,0,0,1,1.38.08.56.56,0,0,0,.8-.38c.14-.4-.09-.95-.47-.93A1.18,1.18,0,0,1,332.5,257Z" fill="#01ada1"/><path d="M341.47,255.17a.41.41,0,0,0,.41-.19.72.72,0,0,0,.59-.23,1.11,1.11,0,0,0-.22-1.33.62.62,0,0,0-.89.15,1,1,0,0,0-.06,1.09c-.06.06-.12.13-.11.16S341.35,255.15,341.47,255.17Z" fill="#01ada1"/><path d="M334.7,255.17c-.36.52-.41.94-.13,1.15a1.14,1.14,0,0,0,1.33-.21,1,1,0,0,0-.35-1.19C335.26,254.73,334.94,254.83,334.7,255.17Z" fill="#01ada1"/><path d="M334.66,244.46a.68.68,0,0,0,.11,1,.75.75,0,0,0,1-.15.81.81,0,0,0-.21-1.05A.64.64,0,0,0,334.66,244.46Z" fill="#01ada1"/><path d="M335.87,248.45a.88.88,0,0,0,.08,1.07c.6.45,1.27.5,1.55.12a1.32,1.32,0,0,0-.31-1.48A1.2,1.2,0,0,0,335.87,248.45Z" fill="#01ada1"/><path d="M334.48,237.42a.76.76,0,0,0,.13.9c.27.21.76-.07,1-.28s.29-.94,0-1.15S334.65,237.18,334.48,237.42Z" fill="#01ada1"/><path d="M339.28,251.9a1.07,1.07,0,0,0-1.38,1.64,1.55,1.55,0,0,0,1.65-.25A1.06,1.06,0,0,0,339.28,251.9Z" fill="#01ada1"/><path d="M338.64,244.94a1,1,0,0,0-1.33,1.43,1.36,1.36,0,0,0,1.65-.32A.85.85,0,0,0,338.64,244.94Z" fill="#01ada1"/><path d="M337.09,256.05a1.26,1.26,0,0,0,.33,1.64c.55.44,1.16.31,1.65-.34a1.07,1.07,0,0,0-.16-1.68A1.23,1.23,0,0,0,337.09,256.05Z" fill="#01ada1"/><path d="M339,239.15a.81.81,0,0,0,.19,1,.61.61,0,0,0,.88-.11A.76.76,0,0,0,340,239,.75.75,0,0,0,339,239.15Z" fill="#01ada1"/><rect x="286.63" y="168.66" width="60.75" height="61.22" fill="#7de2d1"/><rect x="359.65" y="192.72" width="29.97" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="397.34" y="192.72" width="48.43" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="359.94" y="216.25" width="76.7" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="359.94" y="169.46" width="72.67" height="12.65" rx="6.15" fill="#7de2d1"/><circle cx="712.34" cy="198.16" r="7.92" fill="#424854"/><path d="M503.63,279.44,520,262.2q10.13-10.65,20.16-21.38l6.54-7c.65-.7,1.39-1.39,2.07-2.11,12.17,6.78,24.28,13.68,36.39,20.57l5.43,3.09a2.39,2.39,0,0,0,2.82-.36q4.29-4.32,8.56-8.66l20.51-20.83q12.4-12.6,24.77-25.24l21.37-21.86c2.34-2.39,4.66-4.81,7-7.17.76-.75,1.65-1.49,2.44-2.29.77.71,1.54,1.42,2.3,2.14,2.84,2.64,5.51,5.38,8.25,8.12,4.26,4.24,8.67,8.33,13.1,12.39a12.63,12.63,0,0,1,3.42-3.64l-1.36-1.25c-3.53-3.22-7-6.41-10.72-9.48-3.11-2.61-6.27-5.12-9.3-7.84l-4.57-4.11a1.75,1.75,0,0,0-2.44,0c-2.84,2.9-5.69,5.78-8.58,8.64l-20.75,20.58Q634.9,207,622.38,219.48l-21.63,21.6-7.1,7.1c-.74.76-1.58,1.49-2.35,2.27-12.16-6.89-24.35-13.73-36.44-20.75l-5.4-3.14a2.48,2.48,0,0,0-2.94.38l-8.08,8.31q-9.74,10-19.41,20.07l-23.82,24.85Z" fill="#424854"/><path d="M764.16,167.7a1,1,0,0,1,0-.18C764.13,168,764.16,167.88,764.16,167.7Z" fill="#424854"/><path d="M766.73,136.4a1.55,1.55,0,0,0-1.92,0l-8.46.21c-5.25.14-10.58.11-15.81.59-1.22.11-2.43.23-3.65.41-.61.1-.37.92.14,1a87.07,87.07,0,0,0,9.83.44c5,.08,10.1.11,15.15.13l-.08.07c-.2.21-.38.44-.56.66l-2.13,2.46c-4.2,4.84-8.4,9.67-12.51,14.58C737.9,167.44,729,178,720.25,188.55a12.47,12.47,0,0,1,3.16,3.94q5.08-6.13,10.15-12.28C742.79,169,752,157.86,761,146.56l2.55-3.21,1.05-1.32.2-.25c-.25,7.33-.45,14.66-.67,22,0,.9-.05,1.8,0,2.7a9.63,9.63,0,0,0,.09,1.08s0,.11,0,.15a1.47,1.47,0,0,0,2.74.47s0,0,0,0a1.89,1.89,0,0,0,.12-.38s0,0,0,0a7.43,7.43,0,0,0,.13-.93c.06-.68.07-1.38.09-2.06.09-2.34.09-4.69.13-7q.15-8.11.29-16.23c0-1.25,0-2.5.05-3.75A1.41,1.41,0,0,0,766.73,136.4Z" fill="#424854"/><path d="M639.21,279.81l-45.48.88-43.52-.59C535,267.81,526.28,252,526.28,230.94a67,67,0,1,1,112.93,48.87" fill="#fa744e"/><g clip-path="url(#b)"><path d="M577.21,271.76a1.22,1.22,0,0,0-1.54-.39.86.86,0,0,0-.31.39,1.14,1.14,0,0,0-1.38.86c-.14.57.43,1.29,1.18,1.48a1,1,0,0,0,1.21-.8h0a1,1,0,0,0,.3-.13C577.13,272.88,577.43,272.1,577.21,271.76Z" fill="#e55940"/><path d="M537.78,211.17a1.13,1.13,0,0,0,1.43-.43,1.22,1.22,0,0,0-.55-1.41c-.35-.17-1,.2-1.24.68A.83.83,0,0,0,537.78,211.17Z" fill="#e55940"/><path d="M576.17,264.42a.81.81,0,0,0,.21-1,1,1,0,0,0-1.19-.38,1.13,1.13,0,0,0-.42,1.29C575,264.71,575.63,264.75,576.17,264.42Z" fill="#e55940"/><path d="M573.18,262.75a.55.55,0,0,0-.48-.66.67.67,0,0,0-.86.48.61.61,0,0,0,.51.73A.73.73,0,0,0,573.18,262.75Z" fill="#e55940"/><path d="M575.55,254.47a1,1,0,0,0-1.33.74,1,1,0,0,0,.55,1.18,1.42,1.42,0,0,0,1.51-.91A1,1,0,0,0,575.55,254.47Z" fill="#e55940"/><path d="M574.13,264.55c-.49,0-.59.42-.56.83a.76.76,0,0,0,1.2,0C574.72,264.94,574.64,264.51,574.13,264.55Z" fill="#e55940"/><path d="M577.88,268.8a1.23,1.23,0,0,0,.32-1.48,1.09,1.09,0,0,0-1.36-.23.9.9,0,0,0,.22-.42.52.52,0,0,0-.55-.57c-.57,0-1,.14-1,.42a1.14,1.14,0,0,0,.76.91.4.4,0,0,0,.26-.08.94.94,0,0,0,.15,1A1.09,1.09,0,0,0,577.88,268.8Z" fill="#e55940"/><path d="M577.48,258.68c-.53-.19-1.28.34-1.49,1.06a.91.91,0,0,0,.67,1.19,1.11,1.11,0,0,0,1.49-.82A1.19,1.19,0,0,0,577.48,258.68Z" fill="#e55940"/><path d="M557.32,278.16a.54.54,0,0,0-.42-.4.69.69,0,0,0-.68.35c-.17.34.27,1.08.62,1S557.35,278.36,557.32,278.16Z" fill="#e55940"/><path d="M550.92,274.25a.61.61,0,0,0,.67,0c.29-.18.45-.47.26-.76a1.49,1.49,0,0,0-.28-.34h0a1,1,0,0,1,.53-.2,1,1,0,0,0,.81-.31,1.38,1.38,0,0,0,1.06-1.12.57.57,0,0,0,0-.18,1.39,1.39,0,0,0,.78.78c.37.12.85-.22,1-.7a.94.94,0,0,0-.72-1.25c-.47-.15-1.06.07-1.15.43a.9.9,0,0,0,0,.16A1.42,1.42,0,0,0,553,270a1.39,1.39,0,0,0-.45,0,1.87,1.87,0,0,0,.19-1.72,1.34,1.34,0,0,0-1.56-.41c-.4.15-.72.35-1.16,0s-.63,0-.82.35c.14.51.45.7.87.55a7.31,7.31,0,0,0,.64,1.13,1.59,1.59,0,0,0,1.26.35,1.41,1.41,0,0,0-.39.8s0,.07,0,.11a1.07,1.07,0,0,1-.75,0,1.45,1.45,0,0,0-1.34.4,1.15,1.15,0,0,0-.35,1.09,1.34,1.34,0,0,0-.61.15h-.13c-.37.07-.57.42-.58.9a2.82,2.82,0,0,0-.07.31c-.07.5-.48.8-.34,1.29a2.1,2.1,0,0,0,2,1.57,1.72,1.72,0,0,0,1.48-.64c.35-.47-.11-1.08,0-1.67A1.88,1.88,0,0,0,550.92,274.25Z" fill="#e55940"/><path d="M575,275.65a1.14,1.14,0,0,0-.39.59.72.72,0,0,0-.92.5.7.7,0,0,0,.46.78.86.86,0,0,0,.79-.27.9.9,0,0,0,.62.14c.39-.07.5-.37.61-.68s.3-.53.11-.89A.91.91,0,0,0,575,275.65Z" fill="#e55940"/><path d="M534.81,213.59a.65.65,0,0,0-.75.19.88.88,0,0,0-.32.51,3,3,0,0,1,.43.35.76.76,0,0,0,.12,1.28c.62.27,1.28.14,1.44-.29a1.23,1.23,0,0,0-.61-1.3.57.57,0,0,0-.19,0,4.83,4.83,0,0,1,.05-.59Z" fill="#e55940"/><path d="M571.52,266a.59.59,0,0,0,.38.8.71.71,0,0,0,.9-.39.67.67,0,0,0-.5-.83A.62.62,0,0,0,571.52,266Z" fill="#e55940"/><path d="M529.5,210.44a.22.22,0,0,0,.13.12l-.17-.05q-.45,1.41-.84,2.85c.68.23,1.45-.23,1.39-.77s-.43-.69-.31-.86.58-.39.49-.77c0-.16-.26-.29-.51-.38a.69.69,0,0,0,.5-.11c.13-.09.32-.32.18-.54a.45.45,0,0,0-.55-.11.74.74,0,0,0-.16.12c0,.16-.11.31-.16.46S529.49,210.43,529.5,210.44Z" fill="#e55940"/><path d="M557.94,275.1a.65.65,0,0,0-.6-.68.82.82,0,0,0-.61.25.45.45,0,0,0-.12.36,1.25,1.25,0,0,0-.58,0,1.88,1.88,0,0,0-1-1.47,1.5,1.5,0,0,0-1.17.36.68.68,0,0,0-.55.69.55.55,0,0,0,.05.17,1,1,0,0,0,.76,1.05,2.73,2.73,0,0,0,1.24.13,1.27,1.27,0,0,0,1,1.18.91.91,0,0,0,1.09-.58,1.14,1.14,0,0,0,.06-.9A.57.57,0,0,0,557.94,275.1Z" fill="#e55940"/><path d="M573.37,251.1c-.33-.1-.8.26-1,.86.08.12.18.39.36.48a.85.85,0,0,0,1.1-.36A.83.83,0,0,0,573.37,251.1Z" fill="#e55940"/><path d="M572.12,253.5c-.22,0-.75,0-.77.4s.41.61.63.7.48-.16.55-.44S572.41,253.47,572.12,253.5Z" fill="#e55940"/><path d="M562.24,278.15a1.12,1.12,0,0,0-1.11.89,1.18,1.18,0,0,0,0,.27l0,.06a7.77,7.77,0,0,0,.8.82.67.67,0,0,0,.58-.05,1.38,1.38,0,0,0,.45-1.46A.66.66,0,0,0,562.24,278.15Z" fill="#e55940"/><path d="M563.36,274.3c-.18-1-1-1.2-1.39-1s-.64.65-.94.66.27-.31-.65-.58-2,.79-1.16,1.6c.12.13-.77.84-.1,1.53a1.13,1.13,0,0,0,1.9,0,2.06,2.06,0,0,1,.83-.5h0a.64.64,0,0,0,.68-.32A1.21,1.21,0,0,0,563.36,274.3Z" fill="#e55940"/><path d="M571.29,269.44a1,1,0,0,0-.23.86,4.41,4.41,0,0,0,.3.86,3,3,0,0,0-.25.37,1.36,1.36,0,0,0-.11.28.81.81,0,0,0-.54.58.66.66,0,0,0,0,.14,1.27,1.27,0,0,0-1.42.81,1.29,1.29,0,0,0,.68,1.52,1.7,1.7,0,0,0,1.76-1,.94.94,0,0,0-.12-.67,1.63,1.63,0,0,0,1.36.28.8.8,0,0,0,.48-.37,1.28,1.28,0,0,0-.42-1.74l-.34-.24a1,1,0,0,0,1-.54l.14.05a1.34,1.34,0,0,0,1.4-1,1.41,1.41,0,0,0-.84-1.54,1.39,1.39,0,0,0-1.42.41,1.34,1.34,0,0,0-1.45.84A.13.13,0,0,1,571.29,269.44Z" fill="#e55940"/><path d="M572.29,258.37a1.5,1.5,0,0,0,.85,1.81,1.59,1.59,0,0,0,1.71-.91c.23-.64-.24-1.33-1.1-1.62A1.15,1.15,0,0,0,572.29,258.37Z" fill="#e55940"/><path d="M600.32,261.83a.75.75,0,0,0,.9.17.87.87,0,0,0,.24-1,.68.68,0,0,0-.9-.15A.76.76,0,0,0,600.32,261.83Z" fill="#e55940"/><path d="M597.54,275.11c0,.4-.12.5-.35.7a.83.83,0,0,0,0,1.15c.32.3.58.19.84-.06a1.65,1.65,0,0,1,.62-.48,17.38,17.38,0,0,1,1.72-.37c.78,1.18,1.25,1.27,2.1.33a.94.94,0,0,0-.3-1.54,8.27,8.27,0,0,0-1.68-.37c-.22-.59-.54-1.26-1.3-1.32A1.73,1.73,0,0,0,597.54,275.11Z" fill="#e55940"/><path d="M600.05,270c.4.55.8.67,1.22.37a1.18,1.18,0,0,0,.32-1.46,1.27,1.27,0,0,0-1.5-.22A1,1,0,0,0,600.05,270Z" fill="#e55940"/><path d="M597.69,266.73a.83.83,0,0,0,0,1.13,2.17,2.17,0,0,0,.79-.05c.36-.16.37-.72.09-1A.63.63,0,0,0,597.69,266.73Z" fill="#e55940"/><path d="M596.58,264.65a1,1,0,0,0,1.26.06,1,1,0,0,0-.34-1.21.69.69,0,0,0-.9.23A.68.68,0,0,0,596.58,264.65Z" fill="#e55940"/><path d="M602.5,267.4c-.14.18-.46.66-.29.86s.74,0,.9-.16.07-.45,0-.63A.34.34,0,0,0,602.5,267.4Z" fill="#e55940"/><path d="M602.2,256.11c-.34-.09-1-.47-1.33-.11s0,.64,0,.89c.05.64.71,1.22,1.22,1.05a1,1,0,0,0,.72-1A.78.78,0,0,0,602.2,256.11Z" fill="#e55940"/><path d="M602.38,272.93a.74.74,0,0,0-.25.61.57.57,0,0,0,.35.42c.44.09.67-.19.78-.63C603,273.05,602.8,272.71,602.38,272.93Z" fill="#e55940"/><path d="M602.63,277a1.09,1.09,0,0,0,.58,1.43,12.45,12.45,0,0,1,1.78,1c.43.34,1.19.42,1.4.11a.81.81,0,0,0-.24-.95c-.47-.19-.35-.54-.46-.86a2.12,2.12,0,0,0-.58-.76,1.75,1.75,0,0,0-.56-.29,5.44,5.44,0,0,0-.61-.19C603.27,276.35,602.85,276.51,602.63,277Z" fill="#e55940"/><path d="M597.87,257a.7.7,0,0,0,.18-.9.59.59,0,0,0-.86-.21.71.71,0,0,0-.18.9A.6.6,0,0,0,597.87,257Z" fill="#e55940"/><path d="M577.21,275.11a.61.61,0,0,0-.55-.72.87.87,0,0,0-.68.25c-.26.44,0,.8.37,1.1C576.74,275.68,577.14,275.58,577.21,275.11Z" fill="#e55940"/><path d="M587.69,266.24c-.17.19-.63.55-.38.9s.75.08,1,0,.32-.48.12-.77S587.93,266,587.69,266.24Z" fill="#e55940"/><path d="M587.06,269.47c-.3.21-.28,1.23,0,1.59a1,1,0,0,0,1.09.11.94.94,0,0,0,.34-1.33A1.15,1.15,0,0,0,587.06,269.47Z" fill="#e55940"/><path d="M584.2,259.22a.72.72,0,0,0-.81.56.78.78,0,0,0,.44.9,1,1,0,0,0,1-.46A1,1,0,0,0,584.2,259.22Z" fill="#e55940"/><path d="M578.08,269.61c-.17.58,0,1,.41,1.14a1.59,1.59,0,0,0,1.36-.7.89.89,0,0,0-.71-1.08C578.57,268.78,578.28,269,578.08,269.61Z" fill="#e55940"/><path d="M596.53,271.76a.58.58,0,0,0,.81.16.74.74,0,0,0,.42-.83.83.83,0,0,0-1-.57A.88.88,0,0,0,596.53,271.76Z" fill="#e55940"/><path d="M589.69,278.84a1.62,1.62,0,0,0,.18.51.58.58,0,0,0,.1.62,2.06,2.06,0,0,0,.92.68h.47a.78.78,0,0,1,.22,0v0l2.15,0a2.69,2.69,0,0,0-.15-2.11c-.45-.14-1-.33-1.61-.5a1.08,1.08,0,0,0-.69-.44,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,589.69,278.84Z" fill="#e55940"/><path d="M595.3,266.8a.76.76,0,0,0-.09,1.05.75.75,0,0,0,1,.08.78.78,0,0,0,.08-1A.69.69,0,0,0,595.3,266.8Z" fill="#e55940"/><path d="M594.32,260a1,1,0,0,0-.1,1.3c.3.41.65.49,1,.24a1.19,1.19,0,0,0,.43-1.51A1,1,0,0,0,594.32,260Z" fill="#e55940"/><path d="M592.28,272.36a.65.65,0,0,1,0,.11h0a1.88,1.88,0,0,0-.12-.55.44.44,0,0,0-.68-.22.54.54,0,0,0-.24.78,1.46,1.46,0,0,0,.6.34.73.73,0,0,0-.2.33c-.16,0-.36,0-.41.12s.19.39.27.39a.93.93,0,0,0,.24,0,.71.71,0,0,0,1.14-.05c.3-.38.62-.3,1-.31.07,1.07.59,1.45,1.47,1.15a1.36,1.36,0,0,0,.25-.11c.56-.29.66-.66.31-1.18s-.61-.85-1.4-.57a2.9,2.9,0,0,1,.36-.67.65.65,0,0,0,.13-.9,1,1,0,0,0-1-.58C592.61,270.64,592.32,271,592.28,272.36Z" fill="#e55940"/><path d="M590.38,276.32a.87.87,0,0,0-.14,1.08,1.15,1.15,0,0,0,1.19.05,1,1,0,0,0,0-1A.72.72,0,0,0,590.38,276.32Z" fill="#e55940"/><path d="M544.43,196.51a.49.49,0,0,0-.06-.55c-.16-.11-.44.13-.48.23a.48.48,0,0,0,.08.47C544.1,196.76,544.35,196.62,544.43,196.51Z" fill="#e55940"/><path d="M535.94,227.73a.91.91,0,0,0-.25,1.35,1.11,1.11,0,0,0,1.67.31,1.17,1.17,0,0,0,.4-1.52.65.65,0,0,0-.15-.18c.18-.06.45-.24.46-.39s-.3-.4-.47-.42-.61.26-.59.45a.24.24,0,0,0,.09.15A1.63,1.63,0,0,0,535.94,227.73Z" fill="#e55940"/><path d="M555.94,262.46a1.3,1.3,0,0,0-1.32-1l-.07,0s-.06-.05-.1-.06a1.32,1.32,0,0,0-1.33.57.87.87,0,0,0-.31-.12,2,2,0,0,0-.42,0,2.33,2.33,0,0,0-1.31,0,1,1,0,0,1-.57,0,1.07,1.07,0,0,0-.77-.07,1.58,1.58,0,0,0,0-1.12,1.91,1.91,0,0,1,0-.47.6.6,0,0,0,.44-.39.72.72,0,0,0-.42-.89.76.76,0,0,0-.59.05,2,2,0,0,0-2-.27,1.73,1.73,0,0,0-1,1h0c-.41-.14-.85.18-1,.77a.68.68,0,0,0,.41.95,1.64,1.64,0,0,0,1.12-.29,1.31,1.31,0,0,1,.09.28,2.81,2.81,0,0,0,.08.31.62.62,0,0,0-.61.3.53.53,0,0,0,.07.8,1.06,1.06,0,0,0,.8.21.54.54,0,0,0,.37-.48,1.53,1.53,0,0,0,.93.11,1,1,0,0,0-.16.34.8.8,0,0,0,.5,1,.69.69,0,0,0,.81-.56h0a1.22,1.22,0,0,0,.65.2,1.33,1.33,0,0,1,.91.3.93.93,0,0,0,.31.19.59.59,0,0,0-.2.53.73.73,0,0,0,.8.56.68.68,0,0,0,.62-.75.28.28,0,0,0,0-.13,1.26,1.26,0,0,0,1.06-.85l0-.08a1.21,1.21,0,0,0,1.25.45,1.59,1.59,0,0,0,.57-.18.6.6,0,0,0,.16.47.9.9,0,0,0,1.29-.13,1.16,1.16,0,0,0,.11-1.24A.91.91,0,0,0,555.94,262.46Zm-6.79,0-.06,0,.11-.06A.47.47,0,0,1,549.15,262.43Z" fill="#e55940"/><path d="M537.45,203.87a.64.64,0,0,0-.82.37.49.49,0,0,0,.35.7.85.85,0,0,0,.67-.16C537.79,204.65,537.74,204,537.45,203.87Z" fill="#e55940"/><path d="M527.26,220.37c.62-.24.66-.82.82-.83s.85.12.95-.4c.2-1.09-.82-1-.86-1.36a.78.78,0,0,1,0-.21.69.69,0,0,0,.19.1c.36.11.58-.07.71-.4a.67.67,0,0,0-.36-.91.67.67,0,0,0-.28,0v0a1.5,1.5,0,0,0-.34-.94c-.39,1.66-.73,3.33-1,5Z" fill="#e55940"/><path d="M534.79,258.83a1.17,1.17,0,0,0-.23-1.57,1.92,1.92,0,0,0-2.06.08c-.38.38,0,1-.14,1.09h0c.32.66.67,1.3,1,1.95,0-.45-.13-1,0-1.1S534.38,259.37,534.79,258.83Z" fill="#e55940"/><path d="M540.29,267c.05.24.54.3.79.14s.23-.92-.17-1S540.17,266.51,540.29,267Z" fill="#e55940"/><path d="M547.31,267.72h0a1.16,1.16,0,0,0,.18.2,1.31,1.31,0,0,0,1.59-.25c.31-.3.52-.61,1-.49s.56-.27.61-.65c-.33-.42-.69-.46-1-.16a6.85,6.85,0,0,0-1-.77,1.57,1.57,0,0,0-1.29.19,1.4,1.4,0,0,0,0-.89c-.23-.95-.56-1.2-1.38-1.09a1.31,1.31,0,0,0-1,1.66,1.09,1.09,0,0,0,.05.17,1.42,1.42,0,0,0-1-.4,1,1,0,0,0-.28,1.71.6.6,0,0,0,.44.7.75.75,0,0,0,.95-.46.6.6,0,0,0,0-.3.68.68,0,0,0,.32-.61.42.42,0,0,0,0-.16,1.45,1.45,0,0,0,.93.33A1.48,1.48,0,0,0,547.31,267.72Z" fill="#e55940"/><path d="M554.52,266.55a.72.72,0,0,0-.51-.84.78.78,0,0,0-.91.54,1,1,0,0,0-.41,0,.79.79,0,0,0-.65,1,.86.86,0,0,0,1.14.82c.56-.09,1-.53.93-.92,0,0,0,0,0-.05A.8.8,0,0,0,554.52,266.55Z" fill="#e55940"/><path d="M543.15,264.07a.68.68,0,0,0,.84-.53.34.34,0,0,0,0-.1,1.67,1.67,0,0,0,.42-1,1,1,0,0,0-1.2-.94,2.58,2.58,0,0,0-1.18.39,1.28,1.28,0,0,0-1.41-.68.9.9,0,0,0-.76,1,1,1,0,0,0,.79,1.13,1.25,1.25,0,0,0,1.09-.29,2,2,0,0,0,1.33.91Z" fill="#e55940"/><path d="M542,264.34a.64.64,0,0,0-.59.68.85.85,0,0,0,.92.58.65.65,0,1,0-.33-1.26Z" fill="#e55940"/><path d="M538.93,256.89c.15-.91-.34-1.14-.19-1.71s-.13-.85-.69-1.16l-.26-.13c.23-.12.38-.35.29-.54a.71.71,0,0,0-.55-.36.41.41,0,0,0-.43.56.44.44,0,0,1,0,.1.76.76,0,0,0-.82.34,5.53,5.53,0,0,0-.26-.82,4.06,4.06,0,0,0,.26-.36,1.5,1.5,0,0,0,.18-.59,1.16,1.16,0,0,0,.54-.6.27.27,0,0,0,0-.18c-.36-.48,0-.84.17-1.25a.7.7,0,0,0-.52-1,.8.8,0,0,0-.15,0,.41.41,0,0,0,0-.08,1.81,1.81,0,0,0,.18-.73.53.53,0,0,0-.43-.21l0,0h0l-1,.14a4.1,4.1,0,0,0-.08.65.75.75,0,0,0,.38.62,1,1,0,0,0-.18.7,1.17,1.17,0,0,1,0,.67,1.77,1.77,0,0,0-.65,0,.64.64,0,0,0-.25.12,1.23,1.23,0,0,0-.65.42c-.15.26,0,.49.23.66a1.33,1.33,0,0,0,.55.91l.36.27c-.18.23-.36.44-.51.67a.67.67,0,0,0,.16,1,1,1,0,0,0,1.19.15.84.84,0,0,0,.27-.21.76.76,0,0,0,.45.49c.25.1.47.61.17.6s-.58.25-.63,1a1.12,1.12,0,0,0,1,1.36A1.66,1.66,0,0,0,538.93,256.89Z" fill="#e55940"/><path d="M555.14,258.4a.55.55,0,0,0,.69-.3,3.89,3.89,0,0,0,.3-2.28,1.57,1.57,0,0,0-.18-.33.88.88,0,0,0-1.57.27c0,.11-.07.23-.1.34a.51.51,0,0,0-.17.83h0c0,.09,0,.17,0,.25A1.39,1.39,0,0,0,555.14,258.4Z" fill="#e55940"/><path d="M550.36,248.34a.68.68,0,0,0,.85.47.59.59,0,0,0,.48-.74.77.77,0,0,0-.81-.56A.72.72,0,0,0,550.36,248.34Z" fill="#e55940"/><path d="M553.33,259.45a.77.77,0,0,0-.61.79.6.6,0,0,0,.7.56.66.66,0,0,0,.67-.71A.72.72,0,0,0,553.33,259.45Z" fill="#e55940"/><path d="M551.28,233.11a.46.46,0,0,0-.35-.28c-.1,0-.29.22-.28.32s.15.48.35.43A.48.48,0,0,0,551.28,233.11Z" fill="#e55940"/><path d="M551,258.41a.77.77,0,0,0-.21.7.81.81,0,0,0,1.17.4.71.71,0,0,0-.13-1.17A.94.94,0,0,0,551,258.41Z" fill="#e55940"/><path d="M545.44,199.37c.18.06.69.13.83-.26a.37.37,0,0,0-.12-.43.65.65,0,0,0,.46-.42c.09-.41-.69-.94-1-.79s-.23.71,0,1a.64.64,0,0,0-.38.2A.43.43,0,0,0,545.44,199.37Z" fill="#e55940"/><path d="M548.17,201.25c0,.19.19.67.6.63s.37-.53.34-.7a.64.64,0,0,0-.44-.42A.43.43,0,0,0,548.17,201.25Z" fill="#e55940"/><path d="M547.92,244.6c.09.74.52,1.26,1,1.19a1.3,1.3,0,0,0,.85-1.26,1.21,1.21,0,0,0-1.13-.74A.89.89,0,0,0,547.92,244.6Z" fill="#e55940"/><path d="M550,240.94a.77.77,0,0,0,.8.6.82.82,0,0,0,.6-.89.65.65,0,0,0-.73-.52A.7.7,0,0,0,550,240.94Z" fill="#e55940"/><path d="M549.26,255.27a4.26,4.26,0,0,0-.6.45,1.43,1.43,0,0,0-.15,1.3,1,1,0,0,0,1.26.09c.16-.08.31-.18.47-.28a2.25,2.25,0,0,0,1.2.48c0,.1,0,.21.08.31a1.25,1.25,0,0,0,1.53.53,1.28,1.28,0,0,0,.25-1.76,1.38,1.38,0,0,0-.9-.51c0-.06,0-.13,0-.19a1.68,1.68,0,0,0-.07-.24,1.06,1.06,0,0,0,.21-.78c-.07-.53-.79-.52-1-.39s-.09.23,0,.45l-.27,0c0-.4.2-.85-.35-1a.65.65,0,0,0-.79.29c-.3.48.09.76.41,1l-.32.66Z" fill="#e55940"/><path d="M536.71,259.59a1.5,1.5,0,0,0-.49,2l.07,0a4.63,4.63,0,0,0,.59.21,1,1,0,0,0,1.21-.37,1.44,1.44,0,0,0,.21-1.54A1,1,0,0,0,536.71,259.59Z" fill="#e55940"/><path d="M557.8,260.91a1.38,1.38,0,0,0,1.45-.86,1,1,0,0,0-.55-.86.72.72,0,0,0,0-.41.66.66,0,0,0-.83-.5.69.69,0,0,0-.61.83.58.58,0,0,0,.18.28,1.16,1.16,0,0,0-.19.42C557.17,260.37,557.38,260.83,557.8,260.91Z" fill="#e55940"/><path d="M549.11,180.67a.7.7,0,0,0,.8.57.66.66,0,0,0,.62-.65.63.63,0,0,0-.67-.68l-.73.63A.51.51,0,0,0,549.11,180.67Z" fill="#e55940"/><path d="M558.81,249.44c.22-.22.17-1-.16-1.13s-.84-.13-.91.5S558.58,249.66,558.81,249.44Z" fill="#e55940"/><path d="M558.08,253.42c-.15.49,0,.87.27.86a1.12,1.12,0,0,0,.74-.34c.17-.21-.14-.7-.46-.71S558.2,253.38,558.08,253.42Z" fill="#e55940"/><path d="M559.43,257.07a.82.82,0,0,0,.76.66.68.68,0,0,0,.59-.78.65.65,0,0,0-.73-.63A.68.68,0,0,0,559.43,257.07Z" fill="#e55940"/><path d="M558.27,240.09a.75.75,0,0,0-.81-.57.82.82,0,0,0-.57.83.62.62,0,0,0,.7.55A.75.75,0,0,0,558.27,240.09Z" fill="#e55940"/><path d="M539.46,201.07c.14-.07.13-.36.08-.48a.51.51,0,0,0-.53-.19c-.17.1-.08.46,0,.54A.48.48,0,0,0,539.46,201.07Z" fill="#e55940"/><path d="M603.59,263.14c-.22.2-.33.5-.08.7s.74.5.94.33,0-.75-.06-1S603.83,262.92,603.59,263.14Z" fill="#e55940"/><path d="M558,269a.55.55,0,0,0,.41-.25,1.49,1.49,0,0,0,1.34-.94,1.08,1.08,0,0,0-.73-1.35c-.82-.22-1.58.09-1.73.72a1.11,1.11,0,0,0,0,.54.64.64,0,0,0-.6,0,.72.72,0,0,0-.48.79c.07.53.56.55,1,.69.09-.12.18-.24.25-.35A.46.46,0,0,0,558,269Z" fill="#e55940"/><path d="M543.37,205.06c.19.25,1,.3,1.14,0s.23-.82-.39-1S543.18,204.81,543.37,205.06Z" fill="#e55940"/><path d="M538.62,204a1.12,1.12,0,0,0,.25.77c.19.19.71-.05.76-.37a1.37,1.37,0,0,0-.12-.57C539,203.63,538.64,203.73,538.62,204Z" fill="#e55940"/><path d="M561.11,268a.67.67,0,0,0-.56.82c.08.31.31.32.56.29s.57-.34.43-.63A2.05,2.05,0,0,0,561.11,268Z" fill="#e55940"/><path d="M557.67,272c0-.48-.36-.77-.75-.71s-1,.68-1,1a.83.83,0,0,0,.07.27.72.72,0,0,0-.25.36.68.68,0,0,0,.56.8.65.65,0,0,0,.82-.39.5.5,0,0,0,0-.27C557.5,273,557.73,272.55,557.67,272Z" fill="#e55940"/><path d="M563.6,262.71a1.12,1.12,0,0,0-.52-1.26,1.23,1.23,0,0,0-1.41.74c-.09.33.3.81.79,1A.89.89,0,0,0,563.6,262.71Z" fill="#e55940"/><path d="M560.53,250.14c0-.14,0-.44-.21-.52a.43.43,0,0,0-.49.27c-.06.13-.13.54.16.67S560.5,250.28,560.53,250.14Z" fill="#e55940"/><path d="M555.16,267.72a1.24,1.24,0,0,0,1.19-.63,1.05,1.05,0,0,0-.38-.84.64.64,0,0,0,.3-.59.62.62,0,0,0-.72-.63.75.75,0,0,0-.69.81.37.37,0,0,0,.08.18.6.6,0,0,0-.2.31C554.53,267,554.7,267.59,555.16,267.72Z" fill="#e55940"/><path d="M561.2,260.76c.34-.06.37-.54.39-.76a.46.46,0,0,0-.46-.54c-.34,0-.72.34-.61.61S560.86,260.83,561.2,260.76Z" fill="#e55940"/><path d="M558.36,255.46a.64.64,0,0,0,.47.77.49.49,0,0,0,.65-.44.82.82,0,0,0-.24-.64C559.09,255,558.44,255.16,558.36,255.46Z" fill="#e55940"/><path d="M558.08,265.48a1.45,1.45,0,0,0,1.55-1,1,1,0,0,0,0-.3c.23.32.45.66,1,.46s.76-.24,1.14-.35a.58.58,0,0,0,.7-.62.76.76,0,0,0-.76-.73,2,2,0,0,1-.74-.17,1,1,0,0,0-1.18,0,1.08,1.08,0,0,0-.26.81,1,1,0,0,0-.56-.47,1.5,1.5,0,0,0-1.8.7A1.55,1.55,0,0,0,558.08,265.48Z" fill="#e55940"/><path d="M563.31,267.09a1.15,1.15,0,0,0-.93-1.49,1.17,1.17,0,0,0-1.59.78,1.36,1.36,0,0,0,.85,1.61A1.39,1.39,0,0,0,563.31,267.09Z" fill="#e55940"/><path d="M581.36,268.54a.35.35,0,0,0-.27.37.5.5,0,0,0,.41.35c.17,0,.27-.27.25-.43S581.53,268.5,581.36,268.54Z" fill="#e55940"/><path d="M567.4,255.12c.31,0,.67-.41.74-.63s-.12-.57-.48-.65a.43.43,0,0,0-.56.44C567.09,254.5,567.09,255.09,567.4,255.12Z" fill="#e55940"/><path d="M578.73,251c-.12,0-.31.14-.38.26s0,.39.16.45.35-.24.4-.37A.34.34,0,0,0,578.73,251Z" fill="#e55940"/><path d="M578.78,249c-.16,0-.42.22-.45.34s0,.38.19.43.36-.11.41-.23S578.94,249.09,578.78,249Z" fill="#e55940"/><path d="M560.37,175.71c.1,0,.44-.13.44-.31s-.34-.27-.48-.29-.27.12-.25.26A.44.44,0,0,0,560.37,175.71Z" fill="#e55940"/><path d="M578.17,264.15a.52.52,0,0,0,.73-.3c.24-.52.23-.94,0-1.07a1.14,1.14,0,0,0-1.13.36C577.62,263.38,577.86,264,578.17,264.15Z" fill="#e55940"/><path d="M567.19,260.2c.69.27,1.17-.33,1.4-.65s-.35-1-1-1.09a.67.67,0,0,0-.76.51C566.69,259.42,566.85,260.06,567.19,260.2Z" fill="#e55940"/><path d="M582,258.9a.52.52,0,0,0-.4-.69.94.94,0,0,0-1.17.42,1.08,1.08,0,0,0,.5,1.14C581.37,259.9,581.87,259.49,582,258.9Z" fill="#e55940"/><path d="M565.14,251.26c0,.09,0,.23.08.27s.14-.07.22-.11-.06-.2-.12-.23S565.13,251.24,565.14,251.26Z" fill="#e55940"/><path d="M564.87,247.12c-.22-.08-.7.23-.65.67a.59.59,0,0,0,.37.41.73.73,0,0,0,.61-.18A.65.65,0,0,0,564.87,247.12Z" fill="#e55940"/><path d="M563.63,253.58c-.12.37.32,1,.83,1.15a.83.83,0,0,0,1.1-.5,1.12,1.12,0,0,0-.6-1.36A1.21,1.21,0,0,0,563.63,253.58Z" fill="#e55940"/><path d="M580.23,261.82c.16.51.6.53,1.13.4l0-.05a6.94,6.94,0,0,0,.87.31c.3.08.46-.07.54-.39,0-.08-.09-.24-.17-.27-.35-.12-.5-.39-.7-.66a.72.72,0,0,0-.65-.06h0a.59.59,0,0,0-.83.08A.79.79,0,0,0,580.23,261.82Z" fill="#e55940"/><path d="M604.88,272.1a.53.53,0,0,0-.08-.73c-.39-.37-.76-.21-1.19,0,0,.45-.08.91.43,1A.7.7,0,0,0,604.88,272.1Z" fill="#e55940"/><path d="M589.4,258.9c-.11.05-.34.39-.22.51a.46.46,0,0,0,.49,0c.11-.1.32-.32.2-.44A.44.44,0,0,0,589.4,258.9Z" fill="#e55940"/><path d="M590,265.05c.22.09.37-.24.36-.32s0-.33-.24-.39a.25.25,0,0,0-.32.2C589.77,264.68,589.76,265,590,265.05Z" fill="#e55940"/><path d="M606.19,260.42c.22-.1.13-.42.08-.47a.66.66,0,0,0-.43-.13c-.06,0-.17.29-.12.35S606,260.51,606.19,260.42Z" fill="#e55940"/><path d="M608.12,266.25a1.15,1.15,0,0,0,1.51.07.86.86,0,0,0,.26-1.08.88.88,0,0,0,0-.21c0-.08-.2-.32-.39-.28a.9.9,0,0,0-1.3-.05A1.1,1.1,0,0,0,608.12,266.25Z" fill="#e55940"/><path d="M579.13,266.35a1.21,1.21,0,0,0,.83,1.17,1.18,1.18,0,0,0,1-.77,2,2,0,0,0,.23.43.94.94,0,0,0,1.38.11,1.16,1.16,0,0,0,.4-1.4c.31-.15.57-.36.61-.54.09-.44-.39-1-1-1.14s-.91.18-1.05.85a.57.57,0,0,0,0,.13,1.09,1.09,0,0,0-.36.17,1,1,0,0,0-.35.83.7.7,0,0,0-.4-.31C579.75,265.73,579.22,265.92,579.13,266.35Z" fill="#e55940"/><path d="M585.79,255.59c.17-.09.16-.57.19-.88a.27.27,0,0,0-.23-.35.83.83,0,0,0-.82.67A.61.61,0,0,0,585.79,255.59Z" fill="#e55940"/><path d="M584.14,262.32c-.13.5.13.85.75,1a.71.71,0,0,0,.9-.37.92.92,0,0,0,0-.46h0c.28.5.53,1,.79,1.49-.87.56-.88.68-.26,1.3.54-.07.71-.41.64-.94,1.21-.45,1.27-1.19.22-2.08a2.27,2.27,0,0,1,.06-.25c.16-.35,0-.58-.27-.79a.64.64,0,0,0-.76,0c-.49.24-.67.47-.6.84a.86.86,0,0,0-.43-.45C584.66,261.44,584.29,261.7,584.14,262.32Z" fill="#e55940"/><path d="M586.7,258.76a.5.5,0,0,0-.65.33.56.56,0,0,0,.11.64.64.64,0,0,0,0,.48c.12.18.47.21.64.27.42-.3.37-.58.22-.8a.49.49,0,0,0,.14-.24A.53.53,0,0,0,586.7,258.76Z" fill="#e55940"/><path d="M588.1,275.79a1.27,1.27,0,0,0-.27,1.48c.28.37.88.31,1.46-.14a.88.88,0,0,0,.1-1,.61.61,0,0,0,.48,0c.3-.18.28-.42-.13-1-.53-.12-.79.48-.68.78A1.21,1.21,0,0,0,588.1,275.79Z" fill="#e55940"/><path d="M636.19,263.6c0-.06-.19-.1-.25-.08s-.14.13-.11.22a.2.2,0,0,0,.26.12A.22.22,0,0,0,636.19,263.6Z" fill="#e55940"/><path d="M633.92,265.57a.45.45,0,0,0-.23.42c0,.12.28.44.43.37a.45.45,0,0,0,.16-.46C634.21,265.76,634.07,265.5,633.92,265.57Z" fill="#e55940"/><path d="M640.22,262.9a.41.41,0,0,0-.21.37c0,.12.23.43.42.34a.48.48,0,0,0,.19-.51A.43.43,0,0,0,640.22,262.9Z" fill="#e55940"/><path d="M634.54,262.86c.1,0,.37-.31.34-.42s-.4-.17-.54-.15-.21.27-.18.32A.53.53,0,0,0,634.54,262.86Z" fill="#e55940"/><path d="M634.9,276.5a.77.77,0,0,0,.41-.91c-.23-.5-.69-.48-1.12-.5-.42.7-.46,1-.12,1.31A.68.68,0,0,0,634.9,276.5Z" fill="#e55940"/><path d="M635.14,265.59a1.12,1.12,0,0,0,1.08.53.71.71,0,0,0,.33-.93.66.66,0,0,0-.91-.33C635.21,265,635,265.32,635.14,265.59Z" fill="#e55940"/><path d="M640.07,274.09a.9.9,0,0,0-.54.94c.24.7.76,1.12,1.21,1a1.28,1.28,0,0,0,.58-1.39A1.19,1.19,0,0,0,640.07,274.09Z" fill="#e55940"/><path d="M559.5,179.07a1.41,1.41,0,0,0-1,1.61,1.65,1.65,0,0,0,1.94,1.06c.54-.2.36-.92,0-1.17s-.19-.2-.14-.62S560.23,178.91,559.5,179.07Z" fill="#e55940"/><path d="M645.18,264.22a.78.78,0,0,0-.4.82c.11.33.67.37,1,.33s.77-.61.66-.95S645.46,264.12,645.18,264.22Z" fill="#e55940"/><path d="M641.74,271.47a.81.81,0,0,0,.42-1,.64.64,0,0,0-.82-.36.69.69,0,0,0-.5.91A.77.77,0,0,0,641.74,271.47Z" fill="#e55940"/><path d="M643.2,267.85a.78.78,0,0,0-.71-.1.42.42,0,0,0-.32.62c.13.28.31.53.68.43S643.36,268,643.2,267.85Z" fill="#e55940"/><path d="M644,273.87a.84.84,0,0,0,.35-1.09.92.92,0,0,0-1.23-.63c-.48.18-.81.69-.67,1A1.37,1.37,0,0,0,644,273.87Z" fill="#e55940"/><path d="M547,277.36l.38.35A.77.77,0,0,0,547,277.36Z" fill="#e55940"/><path d="M532.55,209.56c.53.39,1,.11,1.14.24s.35.78.84.58c1-.41.42-1.24.69-1.45s1-.27,1.38-.56a1.1,1.1,0,0,0,.4-1.67,1.22,1.22,0,0,0-1.81-.2c-.8.62,0,1.31-.66,1.51s-.54-.47-1.41-.13S532,209.17,532.55,209.56Z" fill="#e55940"/><path d="M609.79,259.35c.23-.47,0-.79-.39-1.13-.43.16-.89.2-.88.72a.71.71,0,0,0,.59.71A.54.54,0,0,0,609.79,259.35Z" fill="#e55940"/><path d="M533.89,207.4a.44.44,0,0,0,0-.43.46.46,0,0,0-.45-.07.38.38,0,0,0-.11.54C533.53,207.66,533.78,207.48,533.89,207.4Z" fill="#e55940"/><path d="M632.15,276.27c-.7.28-.93.64-.74,1.14a1.11,1.11,0,0,0,1.23.5,1.25,1.25,0,0,0,.41-1.3A.64.64,0,0,0,632.15,276.27Z" fill="#e55940"/><path d="M635.5,274.15a1.07,1.07,0,0,0,.81-.17c.39-.37,0-.7-.2-1.08-.52.07-1,.2-1,.73A.68.68,0,0,0,635.5,274.15Z" fill="#e55940"/><path d="M637.17,277.49a.63.63,0,0,0,.28-.91c-.15-.29-.32-.61-.64-.5-.55.22-.78.6-.66.95A.75.75,0,0,0,637.17,277.49Z" fill="#e55940"/><path d="M636.55,269.35c-.33.13-.52.89-.33,1.41a.81.81,0,0,0,1,.39,1,1,0,0,0,.6-1.1A1.25,1.25,0,0,0,636.55,269.35Z" fill="#e55940"/><path d="M633.46,270c-.14-.18-.29-.4-.51-.39s-.54.6-.4.91.38.26.61.18A.46.46,0,0,0,633.46,270Z" fill="#e55940"/><path d="M604.63,268.75a1.32,1.32,0,0,0-.56,1.64,1.7,1.7,0,0,0,2,.47,1.33,1.33,0,0,0,.29-1.73A1.29,1.29,0,0,0,604.63,268.75Z" fill="#e55940"/><path d="M614.37,267c-.16.05-.22.3-.2.42s.27.42.43.36.22-.42.18-.53S614.54,266.94,614.37,267Z" fill="#e55940"/><path d="M617,262a.36.36,0,0,0-.07.38c.08.11.33.08.47,0s.25-.29.14-.45S617.07,261.91,617,262Z" fill="#e55940"/><path d="M615.56,272.05a.19.19,0,0,0-.12.21.22.22,0,0,0,.27.13c.12-.05.11-.21.09-.27S615.61,272,615.56,272.05Z" fill="#e55940"/><path d="M614.73,270.71c-.21.22-.35.49-.11.71s.73.47,1,.31,0-.77-.16-1S615,270.46,614.73,270.71Z" fill="#e55940"/><path d="M618.11,271.74a.7.7,0,0,0-.5.92.79.79,0,0,0,.9.44.82.82,0,0,0,.42-1A.64.64,0,0,0,618.11,271.74Z" fill="#e55940"/><path d="M617.34,269.31c-.29.07-.4.34-.23.65s.36.49.64.31.66-.56.58-.82S617.58,269.25,617.34,269.31Z" fill="#e55940"/><path d="M600.5,277.31a.78.78,0,0,0-1,.36c-.19.3-.74.79-.49,1.24a.45.45,0,0,0,.51.25.77.77,0,0,0,.08.19.82.82,0,0,0,1.09.13.53.53,0,0,0,.12-.54.85.85,0,0,0,.42-.66A1,1,0,0,0,600.5,277.31Z" fill="#e55940"/><path d="M587.14,280.6l1.3,0a1.21,1.21,0,0,0-.49-.31A.71.71,0,0,0,587.14,280.6Z" fill="#e55940"/><path d="M618.65,263.94a.41.41,0,0,0,.63.29c.2-.1.62-.5.55-.68s-.6-.3-.84-.3S618.56,263.57,618.65,263.94Z" fill="#e55940"/><path d="M619.49,278a.56.56,0,0,0-.13.43.38.38,0,0,0,.5.21c.25-.13,0-.43,0-.56S619.53,277.91,619.49,278Z" fill="#e55940"/><path d="M613,276.18a.82.82,0,0,0,0-.75c-.2-.11-.62-.22-.73-.07a.71.71,0,0,0,0,.65C612.35,276.14,612.86,276.31,613,276.18Z" fill="#e55940"/><path d="M610,273.1a.93.93,0,0,0-.58,1.32,1.1,1.1,0,0,0,1.45.56,1.15,1.15,0,0,0,.51-1.42A1,1,0,0,0,610,273.1Z" fill="#e55940"/><path d="M608.67,268.84a.67.67,0,0,0-.31.93,1.14,1.14,0,0,0,1.39.35.79.79,0,0,0,.23-1.05A1,1,0,0,0,608.67,268.84Z" fill="#e55940"/><path d="M613.55,275.21a.73.73,0,0,0,.59.58c.33.34.78.32,1.27-.09a.94.94,0,0,0,.15-1.15,1.39,1.39,0,0,0-.75-.37.79.79,0,0,0-.66-.16A1,1,0,0,0,613.55,275.21Z" fill="#e55940"/><path d="M607,272.6c-.1-.45-.15-.92-.76-.85a.73.73,0,0,0-.69.62c0,.14,0,.36.1.42a9,9,0,0,0,.93.52c.16.84.6,1.35,1.11,1.26a1.42,1.42,0,0,0,.89-1.42C608.5,272.56,608.19,272.45,607,272.6Z" fill="#e55940"/><path d="M610.75,277.82a.7.7,0,0,0,.59.7.54.54,0,0,0,.68-.29c.23-.48,0-.79-.39-1.13C611.2,277.26,610.74,277.29,610.75,277.82Z" fill="#e55940"/><path d="M604.93,276.29c.6-.37.86-1,.61-1.34a1.14,1.14,0,0,0-1.41-.26,1,1,0,0,0-.24,1.31A.86.86,0,0,0,604.93,276.29Z" fill="#e55940"/><path d="M612.28,279a1.57,1.57,0,0,0,.43.7,1.4,1.4,0,0,0-1,.6l1.82,0a1.43,1.43,0,0,0-.16-.24.69.69,0,0,0,.32,0,1.67,1.67,0,0,0,1-1.74,1.33,1.33,0,0,0-1.56-.78A1.29,1.29,0,0,0,612.28,279Z" fill="#e55940"/><path d="M609.59,277.53c.49-.36.6-.7.34-1a.87.87,0,0,0-1.26-.3,1.53,1.53,0,0,0-.11,1.36C608.77,277.87,609.15,277.86,609.59,277.53Z" fill="#e55940"/><path d="M612.3,272a.79.79,0,0,0-.16,1,.82.82,0,0,0,1.07.11.64.64,0,0,0,.11-.89A.7.7,0,0,0,612.3,272Z" fill="#e55940"/><path d="M612.05,269.79a.21.21,0,0,0,0,.29.23.23,0,0,0,.28,0c.06,0,0-.22,0-.26A.2.2,0,0,0,612.05,269.79Z" fill="#e55940"/><path d="M623.58,275.49a.53.53,0,0,0-.08-.73c-.39-.37-.76-.21-1.19,0,0,.45-.08.91.43,1.05A.7.7,0,0,0,623.58,275.49Z" fill="#e55940"/><path d="M615.62,278.38a.73.73,0,0,0,.39.84l.13,0a1.09,1.09,0,0,0-.27,1l3.27-.06a.69.69,0,0,0-.67-.21.54.54,0,0,0-.16.1,1.21,1.21,0,0,0-.2-.71,1.45,1.45,0,0,0-1.32-.45l.42-.42c.85.09,1.47-.18,1.53-.69a1.44,1.44,0,0,0-1.1-1.28c-.58-.08-.79.19-1,1.35C616.2,277.87,615.73,277.77,615.62,278.38Z" fill="#e55940"/><path d="M582.29,271.46a.26.26,0,0,0,.14.4c.19.08.31,0,.39-.15v0a1.19,1.19,0,0,0,1.81.23,1.36,1.36,0,0,0,.22-1.88,1.62,1.62,0,0,0-2-.07,1,1,0,0,0-.3,1.35A.24.24,0,0,0,582.29,271.46Z" fill="#e55940"/><path d="M587.85,272.47a.72.72,0,0,0-.22-1.05,1.06,1.06,0,0,0-1.44.35c-.32.49-.1.75-.33,1.05s-.15.53.1.85.64.79,1.08.43.25-.69.13-.81,0,0,0,0a.76.76,0,0,0,.26-.36C587.55,272.88,587.7,272.76,587.85,272.47Z" fill="#e55940"/><path d="M582.23,276.17a1.44,1.44,0,0,0-.85.42,1.51,1.51,0,0,0-.39,1.2c0,.5-.33.87-.1,1.32a2.08,2.08,0,0,0,2.2,1.2,1.73,1.73,0,0,0,1.35-.9c.25-.52-.3-1-.26-1.65C584.27,276.32,583.21,276.05,582.23,276.17Z" fill="#e55940"/><path d="M585.8,267.41a.68.68,0,0,0-.61.06c-.16.1-.38.11-.54.37a1.43,1.43,0,0,0-.16,1.25,1.08,1.08,0,0,0,.91.67.94.94,0,0,0,.83-.44,1.14,1.14,0,0,0,.14-1C586.18,268,586.11,267.5,585.8,267.41Z" fill="#e55940"/><path d="M581.71,275.13a2,2,0,0,0,.51.53.4.4,0,0,0,.56-.22,1.21,1.21,0,0,0,1.52.25,2,2,0,0,0,.38-2,1.28,1.28,0,0,0-1.73-.19,1.47,1.47,0,0,0-.51,1.15A.76.76,0,0,0,581.71,275.13Z" fill="#e55940"/><path d="M616.65,267.68c.1-.07.22-.31.12-.45a.38.38,0,0,0-.46-.07c-.1,0-.32.38-.22.51S616.56,267.76,616.65,267.68Z" fill="#e55940"/><path d="M621,270.29c-.41.16-.92,1.08-.78,1.41a1.2,1.2,0,0,0,1.46.37c.51-.2.65-.66.38-1.29A1,1,0,0,0,621,270.29Z" fill="#e55940"/><path d="M620.56,277.36a1.51,1.51,0,0,0,1.27.5c.38-.11.48-.47.3-1s-.5-.78-.91-.63A.87.87,0,0,0,620.56,277.36Z" fill="#e55940"/><path d="M621.45,273.88c.15-.05.46-.49.38-.67s-.65-.27-.73-.2-.39.54-.28.68A.7.7,0,0,0,621.45,273.88Z" fill="#e55940"/><path d="M547,253.84a2.41,2.41,0,0,0-2.54-.37c-.55.39-.27,1.18-.41,1.31s-1.17-.23-1.83.28a2,2,0,0,0,.83,3.25,1.86,1.86,0,0,0,1-.08.64.64,0,0,0,.63.29.81.81,0,0,0,.62-.79.63.63,0,0,0-.41-.47c.1-.52,0-1.11.19-1.21s1.21.32,1.83-.24A1.44,1.44,0,0,0,547,253.84Z" fill="#e55940"/><path d="M604.82,280.33a.85.85,0,0,0-.87-.51.65.65,0,0,0-.42.68l1.3,0A.71.71,0,0,0,604.82,280.33Z" fill="#e55940"/><path d="M598,279.14a.82.82,0,0,0,0-1.22.71.71,0,0,0-1,0c-.35.27-.48.86-.2,1.11A.86.86,0,0,0,598,279.14Z" fill="#e55940"/><path d="M611.21,280.31c-.05-.12-.41-.2-.6-.16h0a1,1,0,0,0,0-.65c-.24-.64-.89-1.09-1.35-.69a2.36,2.36,0,0,0-.67,1.45.62.62,0,0,0,0,.13l2.7,0A.06.06,0,0,1,611.21,280.31Z" fill="#e55940"/><path d="M607.26,278.68c.21-.13.69-.56.59-.8s-.72-.25-1-.23-.42.46-.28.75S607,278.86,607.26,278.68Z" fill="#e55940"/><path d="M599,279.7a.56.56,0,0,0-.78.24,1.38,1.38,0,0,0-.12.66l1.35,0A.73.73,0,0,0,599,279.7Z" fill="#e55940"/><path d="M580.15,271.29a.66.66,0,0,0-1-.05,1,1,0,0,0-.35,1.33,1.86,1.86,0,0,0,.35.29,1.07,1.07,0,0,0,0,.25.92.92,0,0,0,.46.58,1.43,1.43,0,0,0,.62.14.75.75,0,0,0,.21,0,1.2,1.2,0,0,0,.53-.24h0a2.31,2.31,0,0,0,.4-.42,4.31,4.31,0,0,0-.33-.81,1.07,1.07,0,0,0-.72-.48A1.09,1.09,0,0,0,580.15,271.29Z" fill="#e55940"/><path d="M586.83,280.43a4.84,4.84,0,0,0,.68-.52c.56-.61.34-1.23-.47-1.39a1,1,0,0,0-1,.28,1.5,1.5,0,0,0-.5-.08c-.27.29-.52.62-.28,1a.62.62,0,0,0,.61.32c0,.08,0,.16,0,.26-.33-.05-.6,0-.74-.13a.89.89,0,0,0-1.31.05,1.5,1.5,0,0,1-.4.2.69.69,0,0,0-.17.1l3.58.05A.87.87,0,0,0,586.83,280.43Z" fill="#e55940"/><path d="M594.69,277a.61.61,0,0,0-.66.83.65.65,0,0,0,.79.2A.59.59,0,0,0,594.69,277Z" fill="#e55940"/><path d="M594.52,279.6c.41.14.84.32,1.17-.07a.62.62,0,0,0-.07-.91.94.94,0,0,0-.72-.19C594.35,278.63,594.41,279.11,594.52,279.6Z" fill="#e55940"/><path d="M647.92,268.2a.82.82,0,0,0-.4.92.6.6,0,0,0,.6.43c.23-.32.45-.66.67-1A.73.73,0,0,0,647.92,268.2Z" fill="#e55940"/><path d="M563.53,276.7a1.12,1.12,0,0,0,.76,1.19,1.13,1.13,0,0,0,1.26-.6,1.16,1.16,0,0,0,.55-1.07,2.56,2.56,0,0,0,1.68-1.55c.09-.67-.67-1-.67-1.2s1-.69,1.07-1.52a1,1,0,0,0,0-.42.62.62,0,0,0,1-.28.52.52,0,0,0,0-.11.83.83,0,0,0,1.11.26c.51-.33.63-.68.34-1.16a4.46,4.46,0,0,0-.68-.71l.23-.48a.68.68,0,0,0-.13-.83,1,1,0,0,0-1.06-.15.71.71,0,0,0-.47.38.93.93,0,0,0-.67-.62.55.55,0,0,0-.7.44,1.11,1.11,0,0,0,.18.82.76.76,0,0,0,1.15-.17,2.29,2.29,0,0,1-.12.77.79.79,0,0,0,.21.65,4.15,4.15,0,0,1,.27.32.47.47,0,0,0-.15-.06.59.59,0,0,0-.6.62,2.17,2.17,0,0,0-1.3-1.08,2,2,0,0,0-1.46.17,1.63,1.63,0,0,0-.73,1.67c.19.59,1,1.12,1,1.37s-1.07.64-1.09,1.48c0,0,0,.08,0,.12a1.35,1.35,0,0,0-.95,1.51A2.25,2.25,0,0,0,563.53,276.7Z" fill="#e55940"/><path d="M567.09,268.2c0-.08-.14-.36-.33-.34s-.22.36-.22.49a.37.37,0,0,0,.31.25C567,268.58,567.07,268.34,567.09,268.2Z" fill="#e55940"/><path d="M563.47,269.69a.69.69,0,0,0,0-1c-.25-.26-.56-.17-.85,0l-.94.49c-.35.2-.71.37-.71.87a.55.55,0,0,1-.21.34c-.77.61-.82.88-.26,1.6.23.3.57.43.86.17a1.72,1.72,0,0,1,1-.39,1.35,1.35,0,0,0,1.16-1.64A2.38,2.38,0,0,1,563.47,269.69Z" fill="#e55940"/><path d="M570.8,246.64a.59.59,0,0,0-.78.4c-.11.43.12,1,.42,1.1s.77-.34.87-.68A.65.65,0,0,0,570.8,246.64Z" fill="#e55940"/><path d="M545.27,273.76a1.29,1.29,0,0,0-.38-.69.58.58,0,0,0-.43-.69.65.65,0,0,0-.82.24,1.35,1.35,0,0,0-.77.72c.51.53,1,1.07,1.56,1.6A1.33,1.33,0,0,0,545.27,273.76Z" fill="#e55940"/><path d="M570.43,253.71a.82.82,0,0,0,.56-.33c.14-.26-.19-.72-.51-.7s-.37.18-.47.23C569.92,253.38,570.13,253.74,570.43,253.71Z" fill="#e55940"/><path d="M547.32,271.59a1.27,1.27,0,0,0,.18-.91A.74.74,0,0,0,548,270a.51.51,0,0,0,.13-.24.72.72,0,0,0-.51-.83.69.69,0,0,0-.87.43l0,.14a1.07,1.07,0,0,0-.75,0,.59.59,0,0,0-.44-.13.7.7,0,0,0-.34.16,1.35,1.35,0,0,0-.8-.53,1,1,0,0,0-.23-.05.58.58,0,0,0-.31-.16.53.53,0,0,0,0-.35.91.91,0,0,0-1.23-.41,1.16,1.16,0,0,0-.6,1.1.83.83,0,0,0,.36.54,1.47,1.47,0,0,0-1.05,1.46,1.09,1.09,0,0,0,1.21.95,1.56,1.56,0,0,0,1.21-.8,1.3,1.3,0,0,0,1.29-.35,1,1,0,0,0,.45.7A1.34,1.34,0,0,0,547.32,271.59Z" fill="#e55940"/><path d="M552.36,276.6a.94.94,0,0,0,.72-.4.77.77,0,0,0-.08-.73.82.82,0,0,0-1.24.12A.7.7,0,0,0,552.36,276.6Z" fill="#e55940"/><path d="M559,272c0-.24-.37-.49-.68-.44a.6.6,0,0,0-.24,1C558.39,272.76,558.88,272.48,559,272Z" fill="#e55940"/><path d="M553.13,278.52a1.38,1.38,0,0,0,1.52-.86.9.9,0,0,0-.61-.9,1,1,0,0,0-1.32.59C552.58,277.85,552.77,278.41,553.13,278.52Z" fill="#e55940"/><path d="M572.48,280.21c.37-.09.44-.33.44-.74a2,2,0,0,0-.07-.64c.33-.48.22-.9-.36-1.48a5.52,5.52,0,0,0,.08-1.17.79.79,0,0,0-.78-.66.64.64,0,0,0-.44-.37c-.3,0-.43.13-.5.61l-.66.22c-.54-.44-.59-.44-1.12.14,0,.3.51.61,0,.89-.21-.15-.41-.32-.63-.45a.2.2,0,0,0,.11,0c.17-.11.09-.42,0-.47s-.24-.28-.43-.16a.24.24,0,0,0-.08.37l.14.16a.92.92,0,0,0-.89.19c-.3.22-.16.53-.12.8.08.54.46.78,1,.95l.8-.75c0,.15.07.28.1.42.13.6-.08.82-.67.6a1.13,1.13,0,0,0-1.43.49,1.16,1.16,0,0,0-.17,1.18l2.25,0c0-.05.1-.09.14-.15.2-.25.38-.44.7-.4a.6.6,0,0,0,.24,0,.92.92,0,0,0,0,.43.54.54,0,0,0,.1.16l1.86,0A.52.52,0,0,1,572.48,280.21Zm-1.78-1a.16.16,0,0,0-.08.05,1,1,0,0,0,0-.18l.16.09Z" fill="#e55940"/><path d="M561.23,255.56a1.21,1.21,0,0,0,0,1.82c.71.71,1.31-.14,1.58.46s-.4.6,0,1.42,1.42.94,1.74.36,0-1.05.1-1.16.73-.45.48-.91c-.54-1-1.29-.26-1.54-.5s-.38-.93-.71-1.31C562.46,255.21,561.74,255,561.23,255.56Z" fill="#e55940"/><path d="M565,255.9c0,.35.45.35.58.29s.82-.46.8-.73-.72-.36-.81-.29S565,255.55,565,255.9Z" fill="#e55940"/><path d="M561.64,252.86c-.41,0-.74.66-.63,1.17a.92.92,0,0,0,1.15.77c.58-.1,1-.53.87-1A1.37,1.37,0,0,0,561.64,252.86Z" fill="#e55940"/><path d="M561.62,250.63c0-.06-.17-.13-.23-.12s-.16.1-.15.19a.2.2,0,0,0,.23.17C561.6,250.85,561.63,250.7,561.62,250.63Z" fill="#e55940"/><path d="M566.08,249.59a.64.64,0,0,0-.45.62.9.9,0,0,0,.08.6c.31-.06.91.12,1.06-.23s-.33-.7-.46-1Z" fill="#e55940"/><path d="M570.41,259.63a.74.74,0,0,0-.86.49.66.66,0,0,0,.49.77.6.6,0,0,0,.8-.39A.66.66,0,0,0,570.41,259.63Z" fill="#e55940"/><path d="M569,256.48c-.11.36.35,1,.77,1.1a.88.88,0,0,0,.91-.47c.19-.66,0-1.29-.46-1.4A1.23,1.23,0,0,0,569,256.48Z" fill="#e55940"/><path d="M568.85,264.66a1.51,1.51,0,0,0,1,1.53c.41.09.86-.3,1-.86s-.1-1-.79-1.17A1,1,0,0,0,568.85,264.66Z" fill="#e55940"/><path d="M567.94,261.77c-.57.14-.64.5-.82.4s-.46-.52-.82-.38-.45,1.3-.37,1.48.49.55.19.82l-.08.05a.69.69,0,0,0-.94-.67,1.21,1.21,0,0,0-.81,1A1.4,1.4,0,0,0,564,264c-.21-.2-.59,0-.69.32s.05.63.32.68.49,0,.64-.13a1.1,1.1,0,0,0,.76,1.07.88.88,0,0,0,.29.67c.49.41.76-.11,1.14-.17a.9.9,0,0,0,.76-.91c0-.5-.3-1-.22-1.21s.27-.49.62-.33.95,0,1.23-.77S568.5,261.62,567.94,261.77Z" fill="#e55940"/><path d="M566.14,259.72c0-.18-.36-.25-.5-.26s-.27.14-.24.28a.47.47,0,0,0,.32.32C565.82,260.07,566.15,259.89,566.14,259.72Z" fill="#e55940"/><path d="M539.49,268a1.42,1.42,0,0,0,.63-1.25c-.07-.38-.13-.79-.68-.81l-.28,0a.91.91,0,0,0-.28-1.54c-.16-.06.37-1.07-.53-1.44s-1.5-.08-1.74.76a1.91,1.91,0,0,1-.48.7,1.74,1.74,0,0,0,.14-.38,1.68,1.68,0,0,0-1.11-1.58,1.21,1.21,0,0,0,.32-1,1.29,1.29,0,0,0-.08-.26l-.07,0a6.92,6.92,0,0,0-1.06-.43.65.65,0,0,0-.5.28.41.41,0,0,0,0,.08,57,57,0,0,0,3.55,5.57l0-.09a.9.9,0,0,0,.44.56,2,2,0,0,1,.58.43.58.58,0,0,0-.26.21c.39.52.79,1,1.2,1.52,0,0,0-.05,0-.08C539.61,268.6,539.68,268.29,539.49,268Z" fill="#e55940"/><path d="M542.15,201.94c-.14.28.17,1,.53,1s.84-.15.69-.78S542.29,201.66,542.15,201.94Z" fill="#e55940"/><path d="M544.85,190.83c-.2,0-.34.47-.31.6a.4.4,0,0,0,.77-.17C545.32,191.14,545.06,190.82,544.85,190.83Z" fill="#e55940"/><path d="M540.67,202.27a.41.41,0,0,0,.37-.41c0-.15-.06-.56-.37-.58s-.39.43-.38.57S540.4,202.28,540.67,202.27Z" fill="#e55940"/><path d="M541,197.23a1.06,1.06,0,0,0-.58.56c-.09.25.36.61.67.52a1.22,1.22,0,0,0,.45-.37C541.49,197.43,541.23,197.12,541,197.23Z" fill="#e55940"/><path d="M540.94,199.93c0,.3.9.7,1.17.39a.69.69,0,0,0,0-.9C541.75,199.17,540.92,199.62,540.94,199.93Z" fill="#e55940"/><path d="M560.89,244.76a.72.72,0,0,0-.55.8.69.69,0,0,0,.8.66.75.75,0,0,0,.6-.87A.69.69,0,0,0,560.89,244.76Z" fill="#e55940"/><path d="M550.75,186.24c-.42,0-1.07.6-1.07.94a.94.94,0,0,0,1.05.88c.44,0,.74-.45.73-1.07C551.44,186.52,551.15,186.2,550.75,186.24Z" fill="#e55940"/><path d="M546.33,194.92c.25.47.92.22,1.1,0s-.55-1.14-.85-1.15S546.08,194.44,546.33,194.92Z" fill="#e55940"/><path d="M552.05,182.93a.69.69,0,0,0-.62.78c.06.32.29.34.54.33s.59-.29.48-.59A2,2,0,0,0,552.05,182.93Z" fill="#e55940"/><path d="M546.86,189.34a.73.73,0,0,0,.7.7.8.8,0,0,0,.76-.75.7.7,0,0,0-.75-.63A.71.71,0,0,0,546.86,189.34Z" fill="#e55940"/><path d="M545.29,190.15a.71.71,0,0,0,.52,1.06.93.93,0,0,0,.75-.34.81.81,0,0,0,0-.74A.83.83,0,0,0,545.29,190.15Z" fill="#e55940"/><path d="M532.67,220.77a1.15,1.15,0,0,0-.11,1.35.87.87,0,0,0,1,.21c.57-.38.81-1,.54-1.37A1.25,1.25,0,0,0,532.67,220.77Z" fill="#e55940"/><path d="M539.46,214.15c-.36.26-.56.87-.38,1.11a1.07,1.07,0,0,0,1.11,0,.64.64,0,0,0,.13-.95A.59.59,0,0,0,539.46,214.15Z" fill="#e55940"/><path d="M532.84,217.33a1.51,1.51,0,0,0-1.9.62,1.58,1.58,0,0,0,.69,1.81c.61.31,1.35-.08,1.74-.9A1.14,1.14,0,0,0,532.84,217.33Z" fill="#e55940"/><path d="M532.92,211.87c-.43-.22-1.08-.15-1.26.17-.36.65.18,1.2.47,1.48s1.07-.22,1.2-.84A.68.68,0,0,0,532.92,211.87Z" fill="#e55940"/><path d="M530.62,214.78a.86.86,0,0,0-.07.25,1,1,0,0,0-.18.06c-.33.21-.38,1-.1,1.42a.85.85,0,0,0,1.17.32,1.13,1.13,0,0,0,.41-1.43s0,0-.06-.06l0,0a.75.75,0,0,0-.38-.92A.66.66,0,0,0,530.62,214.78Z" fill="#e55940"/><path d="M533,214.27c0,.07-.16.17-.11.26s.15,0,.25.06.07-.19.05-.26S533,214.25,533,214.27Z" fill="#e55940"/><path d="M536.67,212.88c-.07.3.32.72.53.81s.58-.05.71-.39a.44.44,0,0,0-.37-.61C537.32,212.65,536.74,212.58,536.67,212.88Z" fill="#e55940"/><path d="M535.71,218.66c-.38.3-.44.71-.2.88a.81.81,0,0,0,.64.1c.28-.1.32-.67.07-.86A1.24,1.24,0,0,0,535.71,218.66Z" fill="#e55940"/><path d="M537,218.09c.31.12.69,0,.7-.33s.09-.74-.3-.81-.65.33-.77.54S536.71,218,537,218.09Z" fill="#e55940"/><path d="M535.74,219.64a1,1,0,0,0-1.24.4,1.41,1.41,0,0,0,.71,1.61,1,1,0,0,0,1-.4c.17.23.45.14.67,0s.35-.61.11-.77-.4-.31-.63-.3A1,1,0,0,0,535.74,219.64Z" fill="#e55940"/><path d="M548.26,181.87a.79.79,0,0,0-.18-.4c-.44.4-.86.81-1.28,1.22a1.37,1.37,0,0,0,.47,0C547.84,182.68,548.31,182.28,548.26,181.87Z" fill="#e55940"/><path d="M629.59,261.33a.67.67,0,0,0-.46.86.65.65,0,1,0,1.22-.44A.55.55,0,0,0,629.59,261.33Z" fill="#e55940"/><path d="M628.8,266.67a.75.75,0,0,0,.8.44c.24-.08.32-.51.19-.88a.39.39,0,0,0-.57-.26C628.93,266.1,628.7,266.29,628.8,266.67Z" fill="#e55940"/><path d="M631.17,275.67a.62.62,0,0,0-.06-.91.65.65,0,0,0-.91,0,2,2,0,0,1-.53.33,1,1,0,0,0-.71,1.11c0,.52.41.74,1.13.49A12.81,12.81,0,0,0,631.17,275.67Z" fill="#e55940"/><path d="M546.07,257.47a.66.66,0,0,0,.28.87.82.82,0,0,0,.65,0c.38-.17.39-.49.14-1.21C546.74,257.11,546.29,256.94,546.07,257.47Z" fill="#e55940"/><path d="M592.14,268a1,1,0,0,0-.11,1.45c.29.39.75.39,1.29,0s.56-.77.31-1.09A1.82,1.82,0,0,0,592.14,268Z" fill="#e55940"/><path d="M626,259.63c-.15,0-.55.37-.5.55s.53.31.64.25.42-.33.39-.49S626.16,259.61,626,259.63Z" fill="#e55940"/><path d="M625.81,267.78c.1,0,.39-.14.34-.42s-.4-.17-.54-.15-.21.27-.18.32A.55.55,0,0,0,625.81,267.78Z" fill="#e55940"/><path d="M592.91,264.71a1.25,1.25,0,0,1-.83-1.37c-.42-.15-1,.09-1,.44,0,.18.23.44.52.62a1.11,1.11,0,0,0-.33.15,1.22,1.22,0,0,0-.05,1.78,1.29,1.29,0,0,0,.43.36,2.12,2.12,0,0,0-.41.37,10.89,10.89,0,0,0-1.32.1.46.46,0,0,0-.18.83c.41.24.79.64,1.37.55l.44-.53c.64,0,1.2-.21,1.27-.58a.63.63,0,0,0-.37-.7h0a1,1,0,0,0,.28-.14A1.37,1.37,0,0,0,592.91,264.71Z" fill="#e55940"/><path d="M627.54,273.25a.73.73,0,0,0,.4.51c.46.13.6-.25.74-.59-.2-.38-.48-.61-.88-.41A.57.57,0,0,0,627.54,273.25Z" fill="#e55940"/><path d="M625.22,274.36a1.28,1.28,0,0,0,.65,1.65,1.77,1.77,0,0,0,.57.09.78.78,0,0,0,0,.46c.13.14.45.3.59.23s.21-.45.15-.6A.75.75,0,0,0,627,276a1.24,1.24,0,0,0,.43-.32c.31-.39,0-1.13-.58-1.59A1.25,1.25,0,0,0,625.22,274.36Z" fill="#e55940"/><path d="M630.7,270.45a.61.61,0,0,0,.4-.72c0-.28-.74-.58-.94-.39a.79.79,0,0,0-.21.67A.55.55,0,0,0,630.7,270.45Z" fill="#e55940"/><path d="M631.5,278.39a1.43,1.43,0,0,0-.93,1.14,3.25,3.25,0,0,0,0,.44l2.06,0a1.3,1.3,0,0,1-.19-.74A1.09,1.09,0,0,0,631.5,278.39Z" fill="#e55940"/><path d="M590.94,257.35a.38.38,0,0,0,.59,0,.42.42,0,0,0,0-.53.36.36,0,0,0-.49-.1A.38.38,0,0,0,590.94,257.35Z" fill="#e55940"/><path d="M646.42,271.78a.66.66,0,0,0-.47.69c.18-.23.35-.47.52-.7Z" fill="#e55940"/><path d="M532.78,204.18a1,1,0,0,0,1.07-.68.88.88,0,0,0-.58-1.23,1.27,1.27,0,0,0-.53-.07c-.2.42-.38.85-.57,1.27A1.1,1.1,0,0,0,532.78,204.18Z" fill="#e55940"/><path d="M639.62,278.16a1.15,1.15,0,0,0-.76,1.28,1,1,0,0,0,.31.37h0c.48-.45.93-.92,1.39-1.38A1.06,1.06,0,0,0,639.62,278.16Z" fill="#e55940"/><path d="M636.14,279.24c-.13-.32-.45-.42-.84-.27-.59.22-.87.53-.76.87,0,0,0,0,0,.06l1.58,0A1,1,0,0,0,636.14,279.24Z" fill="#e55940"/><path d="M591.49,254.83c.25-.13,0-.43,0-.56a.4.4,0,0,0-.36-.07.55.55,0,0,0-.13.43A.39.39,0,0,0,591.49,254.83Z" fill="#e55940"/><path d="M536.16,197.37a1.11,1.11,0,0,0,1.68-.39,1.23,1.23,0,0,0-.63-1.72,1.09,1.09,0,0,0-.58-.1c-.35.57-.7,1.13-1,1.71A2.44,2.44,0,0,0,536.16,197.37Z" fill="#e55940"/><path d="M555.81,176.07c.34,0,.41-.51.45-.72a.74.74,0,0,0,0-.26c-.31.2-.6.4-.9.61C555.45,175.91,555.6,176.1,555.81,176.07Z" fill="#e55940"/><path d="M540.13,191.66a1,1,0,0,0-.53-.84c-.4.53-.77,1.08-1.15,1.62a1.15,1.15,0,0,0,.84.29A.88.88,0,0,0,540.13,191.66Z" fill="#e55940"/><path d="M537.65,199.88a5.62,5.62,0,0,0-1.38-.47h-.12a1.36,1.36,0,0,0-1.09-.57.84.84,0,0,0-.87.84,1.26,1.26,0,0,0,.71,1,.45.45,0,0,0,.24.32,3.91,3.91,0,0,0,2.23.58,1.2,1.2,0,0,0,.35-.14A.87.87,0,0,0,537.65,199.88Z" fill="#e55940"/><path d="M539.4,196.17a.89.89,0,0,0,.44.53c.19.06.75-.28.73-.59a.63.63,0,0,0-.7-.56A.48.48,0,0,0,539.4,196.17Z" fill="#e55940"/><path d="M541,194.88a1,1,0,0,0,1.33-.39,2.73,2.73,0,0,0,.27.54,1,1,0,0,0,.27.25.88.88,0,0,0,1.4-.77,5.82,5.82,0,0,0-.2-1.44,1.37,1.37,0,0,0-1.4-.8c-.32,0-.55.21-.55.51a.87.87,0,0,0-.36-.26,1.17,1.17,0,0,0-1.45.63A1.28,1.28,0,0,0,541,194.88Z" fill="#e55940"/><path d="M538.06,197.46c-.14.27.36.73.89.72s.62-.72.52-1S538.2,197.19,538.06,197.46Z" fill="#e55940"/><path d="M542.27,189.18a1.32,1.32,0,0,0,1.08-1.08,1.42,1.42,0,0,0,0-.2,1.12,1.12,0,0,0,.55.18,2.19,2.19,0,0,0,1.45-.41,1,1,0,0,1,.55-.16c.72.05,1.1-.3,1.07-1a.49.49,0,0,0,.26,0,.78.78,0,0,0,.5-.88.8.8,0,0,0-.81-.81.69.69,0,0,0-.58.8h0a1.32,1.32,0,0,0-.68,0,1.27,1.27,0,0,1-1,0,1,1,0,0,0-.8,0c-.34.37-.67.75-1,1.13a1.47,1.47,0,0,0,0,.47.61.61,0,0,0,.05.12,1.2,1.2,0,0,0-.41-.2c-.35.4-.7.79-1,1.2C541.6,188.82,542,189.2,542.27,189.18Z" fill="#e55940"/><path d="M535.58,202.33c0-.08-.07-.22-.17-.23s-.1.11-.17.18.12.17.19.18S535.59,202.35,535.58,202.33Z" fill="#e55940"/><path d="M626.39,269.27a1.48,1.48,0,0,0-.8,1.66c.18.65.9.94,1.72.68a1.13,1.13,0,0,0,.77-1.49A1.42,1.42,0,0,0,626.39,269.27Z" fill="#e55940"/><path d="M551.27,179a1.26,1.26,0,0,0,.24-.46c-.31.25-.63.49-.93.74A1,1,0,0,0,551.27,179Z" fill="#e55940"/><path d="M556.89,191.89a1.46,1.46,0,0,0,1.37,1.21c.74-.06,1.36-.69,1.28-1.28a1.93,1.93,0,0,0-1.54-1.36A1.31,1.31,0,0,0,556.89,191.89Z" fill="#e55940"/><path d="M556,251a1.75,1.75,0,0,0-.13.35.88.88,0,0,0,1.25,1,5.71,5.71,0,0,0,1.26-.74,1.38,1.38,0,0,0,.2-1.6c-.17-.27-.72-.7-1.18-.25C557.07,250.81,556.46,250.34,556,251Z" fill="#e55940"/><path d="M556.12,178.31a2,2,0,0,1-.72-.23,1,1,0,0,0-1.18-.13,1.39,1.39,0,0,0-.21,1.43c.19.34.39.7.91.54s.78-.18,1.17-.27a.58.58,0,0,0,.74-.56A.76.76,0,0,0,556.12,178.31Z" fill="#e55940"/><path d="M560.82,183.57c-.19,0-.25.34-.25.47s.16.28.29.27.24-.24.27-.38S561,183.56,560.82,183.57Z" fill="#e55940"/><path d="M563.71,280.17l-.09.11,1.16,0C564.37,280,563.94,280,563.71,280.17Z" fill="#e55940"/><path d="M560.52,278.58l0-.07a4.57,4.57,0,0,0-.45-.43,1,1,0,0,0-1.26-.15,1.73,1.73,0,0,0-.77.92,1.25,1.25,0,0,0-1,1.34l2.34,0s0,0,0-.06A1.47,1.47,0,0,0,560.52,278.58Z" fill="#e55940"/><path d="M579.55,279.91a.88.88,0,0,0-.28-.49.58.58,0,0,0,.1-.12c.3-.4.8-.48.91-1a2.3,2.3,0,0,0-.33-1.71.83.83,0,0,0,.26-.3,1.58,1.58,0,0,0-.66-1.84A1.23,1.23,0,0,0,578,275a1.41,1.41,0,0,0-.23.92l-.09,0c-.53.25-.41,1-.81,1.45a1.57,1.57,0,0,0-.48,1.13,1.1,1.1,0,0,0-.38.54c0,.05,0,.13,0,.18-.12.27-.3.37-.55.15-.09-.08-.15-.2-.24-.28a1.22,1.22,0,0,0-1.37-.09,1,1,0,0,0-.52,1.23,1.52,1.52,0,0,0,.06.2l3.76,0a.69.69,0,0,0,0-.24.37.37,0,0,0-.29-.23.75.75,0,0,0,.05-.16,1,1,0,0,1,.15-.31c.13.1.26.2.4.29l.1,0a1.18,1.18,0,0,0,0,.62l2,0A2.32,2.32,0,0,0,579.55,279.91Z" fill="#e55940"/><path d="M627.34,279v0a1.32,1.32,0,0,0,1.18.11,1.33,1.33,0,0,0,.6-1.64,1.1,1.1,0,0,0-1.35-.63,1.73,1.73,0,0,0-.82,1.45.69.69,0,0,0-.5-.22c-.4,0-.16-.9-.72-.92s-.76-.67-1.43-.62-1.31.54-1.06,1.09a2.38,2.38,0,0,0,1.2,1.07c.38.22.78-.19.87.32a2.41,2.41,0,0,0,.36.93.77.77,0,0,0-.12.13l1.44,0A1.22,1.22,0,0,0,627.34,279Z" fill="#e55940"/><path d="M553.32,279.12l-.06,0a1.27,1.27,0,0,0-.27-.3,1.9,1.9,0,0,0-1-.33.63.63,0,0,0-.46-.52.82.82,0,0,0-.88.48s0,0,0,0a1.41,1.41,0,0,0-1.43-.62c-.31.07-.53.24-.51.55,0,.15,0,.3,0,.45.47.4.93.81,1.42,1.2l4,0C554.32,279.88,553.6,279.1,553.32,279.12Zm-2.46,0a.14.14,0,0,0,0-.06s0,0,0,0Z" fill="#e55940"/><path d="M555.89,279.81c.16-.6,0-1.09-.49-1.19a1,1,0,0,0-1.22.64,1.38,1.38,0,0,0,.49.9h1A1.1,1.1,0,0,0,555.89,279.81Z" fill="#e55940"/><path d="M531.61,207c-.26,0-.61.58-.59.93a.64.64,0,0,0,.75.6.59.59,0,0,0,.61-.64C532.34,207.49,531.92,207,531.61,207Z" fill="#e55940"/><path d="M530.92,207.81a1.17,1.17,0,0,0-.12-1.08c-.19.49-.39,1-.57,1.49A.92.92,0,0,0,530.92,207.81Z" fill="#e55940"/><path d="M534.27,203.51c0,.37.54.56.76.79l.21-.08a.63.63,0,0,0,.22-.74.9.9,0,0,0-.27-.54C534.92,203.11,534.29,203.14,534.27,203.51Z" fill="#e55940"/><path d="M630,271.45c-.22-.13-.45.11-.46.41a1.07,1.07,0,0,0,.33.77.32.32,0,0,0,.5-.09.73.73,0,0,0-.07-.59C630.19,271.76,630.15,271.56,630,271.45Z" fill="#e55940"/><path d="M544.5,252.3c.81-.11,1.18-.55,1.09-1.29a1.23,1.23,0,0,0-1.55-1,1.25,1.25,0,0,0-.94,1.37C543.17,252.06,543.69,252.41,544.5,252.3Z" fill="#e55940"/><path d="M546.05,233.88c-.45.07-.7.32-.63.62a1.13,1.13,0,0,0,1,.72.71.71,0,0,0,.51-.84A.66.66,0,0,0,546.05,233.88Z" fill="#e55940"/><path d="M546.84,232.75c0-.07-.17-.14-.23-.12s-.17.09-.15.18a.2.2,0,0,0,.23.18A.22.22,0,0,0,546.84,232.75Z" fill="#e55940"/><path d="M544.87,249.22a.63.63,0,0,0-.37.51c0,.2.52.28.64.23a.5.5,0,0,0,.2-.49A.55.55,0,0,0,544.87,249.22Z" fill="#e55940"/><path d="M546.41,248.8a1.54,1.54,0,0,0,1.33,1,1.06,1.06,0,0,0,.8-1.17,1.15,1.15,0,0,0-1.14-.94C546.83,247.78,546.33,248.34,546.41,248.8Z" fill="#e55940"/><path d="M549,253.09a1.51,1.51,0,0,0,0-.3,1.13,1.13,0,0,0,.5-1,.61.61,0,0,0-.72-.53,1,1,0,0,0-.71.43c-.66,0-1.43.39-1.53.9a1.17,1.17,0,0,0,.81,1.36A1.28,1.28,0,0,0,549,253.09Z" fill="#e55940"/><path d="M543.17,249.17c.35,0,.7-.65.61-1.08s-.36-.5-.78-.43c-.62.1-1,.36-.91.7A1.15,1.15,0,0,0,543.17,249.17Z" fill="#e55940"/><path d="M543.88,242.38a.66.66,0,0,0,.25.59,1.06,1.06,0,0,0,.82,0c.46-.29.16-.69,0-1.1C544.44,241.83,544,241.87,543.88,242.38Z" fill="#e55940"/><path d="M544.8,233.82a.49.49,0,0,0-.7-.16.54.54,0,0,0-.27.75.63.63,0,0,0,.11.12.31.31,0,0,0,0,.08c0,.13.19.49.36.44a.44.44,0,0,0,.24-.36.51.51,0,0,0,.17-.07A.54.54,0,0,0,544.8,233.82Z" fill="#e55940"/><path d="M543.48,240.24c-.1.1-.29.3-.18.52s.44,0,.48,0,.19-.28.07-.45A.24.24,0,0,0,543.48,240.24Z" fill="#e55940"/><path d="M546.39,240.35a1,1,0,0,0,.81-1,1.27,1.27,0,0,0-1.11-.93c-.36.06-.69.78-.61,1.31A.82.82,0,0,0,546.39,240.35Z" fill="#e55940"/><path d="M544.36,216.48c-.41-.16-1,0-1.14.28s.24.81.57,1a.64.64,0,0,0,.87-.4A.59.59,0,0,0,544.36,216.48Z" fill="#e55940"/><path d="M542.8,206c-.12-.07-.53-.19-.69.08s.21.54.35.59.44.1.54-.14A.43.43,0,0,0,542.8,206Z" fill="#e55940"/><path d="M543,223.15c.1.17.42,0,.54,0a.36.36,0,0,0,.08-.38c-.08-.11-.33-.09-.47,0S542.92,223,543,223.15Z" fill="#e55940"/><path d="M541.28,206.12c-.29,0-.26.36-.25.48s.26.27.35.24a.46.46,0,0,0,.3-.35C541.67,206.38,541.57,206.08,541.28,206.12Z" fill="#e55940"/><path d="M541.15,211.74c0,.31-.23.89.1,1.08s.74-.24,1-.34l0-.22a.64.64,0,0,0-.56-.53A.89.89,0,0,0,541.15,211.74Z" fill="#e55940"/><path d="M545,231.38c.05.14.19.31.32.32s.43-.23.41-.34-.35-.25-.5-.26S545,231.32,545,231.38Z" fill="#e55940"/><path d="M544.36,221.26a.4.4,0,0,0-.13.45c.09.15.35.14.46.09s.33-.37.23-.51S544.45,221.19,544.36,221.26Z" fill="#e55940"/><path d="M545.82,229.82a.61.61,0,0,0,.3,1c.2,0,.49-.34.72-.55a.28.28,0,0,0,0-.42A.84.84,0,0,0,545.82,229.82Z" fill="#e55940"/><path d="M547.23,207.52a.37.37,0,0,0-.51.19c-.09.28.2.39.32.43a.42.42,0,0,0,.37-.2A.45.45,0,0,0,547.23,207.52Z" fill="#e55940"/><path d="M545.38,241.9c.39.12.85-.73.63-1.12s-.83-.57-1.08-.32S545,241.79,545.38,241.9Z" fill="#e55940"/><path d="M540.56,224.57c-.08.16.07.37.17.43s.49.08.56-.07-.17-.45-.28-.49A.39.39,0,0,0,540.56,224.57Z" fill="#e55940"/><path d="M535.12,231.47a1,1,0,0,0-.32,1,.52.52,0,0,0,.75.24c.51-.25.78-.57.68-.83A1.18,1.18,0,0,0,535.12,231.47Z" fill="#e55940"/><path d="M545.58,245.72c-.1-.31-.2-.65-.54-.61-.58.12-.88.44-.83.81a.76.76,0,0,0,.91.65A.65.65,0,0,0,545.58,245.72Z" fill="#e55940"/><path d="M534.58,230.28a.62.62,0,0,0-.66.79c.08.19.55.23.86.3a.27.27,0,0,0,.37-.19A.85.85,0,0,0,534.58,230.28Z" fill="#e55940"/><path d="M540.05,234.1c0-.24-.16-.36-.34-.38a.29.29,0,0,0,0-.16,1.42,1.42,0,0,1-.12-.95c0-.15-.27-.41-.46-.46a.79.79,0,0,0-.65.2c-.1.09-.09.4,0,.57a6.21,6.21,0,0,0,.55.92.38.38,0,0,0,.11.11.5.5,0,0,0-.12.38.74.74,0,0,0,.69.59C539.94,234.89,540.11,234.48,540.05,234.1Z" fill="#e55940"/><path d="M534,236.25a1.2,1.2,0,0,0,1.29,0,.81.81,0,0,0,.12-1c-.43-.56-.95-.75-1.3-.48A1.2,1.2,0,0,0,534,236.25Z" fill="#e55940"/><path d="M535.53,234.53a.53.53,0,0,0,.32.32c.1,0,.41-.06.41-.34s-.35-.25-.5-.26S535.5,234.47,535.53,234.53Z" fill="#e55940"/><path d="M542,260.06a.88.88,0,0,0,.92.58.94.94,0,0,0,1-1.07c-.06-.51-.47-.94-.84-.91A1.38,1.38,0,0,0,542,260.06Z" fill="#e55940"/><path d="M541.25,244.91a.65.65,0,0,0-.82-.51c-.74.14-1,.45-.95,1a1.14,1.14,0,0,0,1.11.73A1.27,1.27,0,0,0,541.25,244.91Z" fill="#e55940"/><path d="M540.5,257.7c-.4.06-.61.4-.53.9a1.06,1.06,0,0,0,.46.78c0,.13.05.33.19.37s.36-.11.41-.22a.28.28,0,0,0,0-.1.94.94,0,0,0,.71-1A1.55,1.55,0,0,0,540.5,257.7Z" fill="#e55940"/><path d="M539.38,246.35a1.47,1.47,0,0,0-1.13,1c0,.32-.17.75.21.9a1.62,1.62,0,0,1,.91,1,.55.55,0,0,0,.83.31c.39-.18.62-.73.34-1a1.15,1.15,0,0,1-.35-1.23A1.11,1.11,0,0,0,539.38,246.35Z" fill="#e55940"/><path d="M538.68,239.56a1.05,1.05,0,0,0,.17.82.33.33,0,0,0,.52,0,.75.75,0,0,0,0-.59c0-.2,0-.41-.2-.55S538.75,239.27,538.68,239.56Z" fill="#e55940"/><path d="M541.6,232.49a.79.79,0,0,0-.24,1c.19.27.85.45,1.06.28a1,1,0,0,0,.16-1.16A.7.7,0,0,0,541.6,232.49Z" fill="#e55940"/><path d="M540.56,234.92c-.43.31-.45.74-.07,1.25a.7.7,0,0,0,.93.29,1.45,1.45,0,0,0,.4-1.45C541.52,234.58,541.07,234.55,540.56,234.92Z" fill="#e55940"/><path d="M541.93,238.86c.08.31.32.32.56.29s.57-.34.43-.63-.21-.45-.43-.48S541.85,238.53,541.93,238.86Z" fill="#e55940"/><path d="M541.92,244.14l.4-.08c-.23.35-.23.58,0,.84a.67.67,0,0,0,.8.25.83.83,0,0,0,.57-.67.49.49,0,0,0,.27-.1.64.64,0,0,0,.17-.78c-.23-.53-.46-.63-1.14-.52a10.78,10.78,0,0,0-1.08-.76.45.45,0,0,0-.67.51C541.37,243.28,541.41,243.83,541.92,244.14Z" fill="#e55940"/><path d="M534.32,242.93a1.28,1.28,0,0,0,1.56-.06c.39-.32.17-1.11-.27-1.66a1.22,1.22,0,0,0-1.61,0A1.28,1.28,0,0,0,534.32,242.93Z" fill="#e55940"/><path d="M537.63,237.58a1.29,1.29,0,0,0-.34-.69.87.87,0,1,0,.87-1.5c-.33-.43-.81-.44-1.35,0a1,1,0,0,0-.21,1.09,1,1,0,0,0-.47,0A1.5,1.5,0,0,0,535,237.9c.05.67.71,1.09,1.56,1A1.15,1.15,0,0,0,537.63,237.58Z" fill="#e55940"/><path d="M534,238a.49.49,0,0,0,.09.53c.13.11.38,0,.46-.17a.38.38,0,0,0-.11-.47A.36.36,0,0,0,534,238Z" fill="#e55940"/><path d="M540.13,238.41a.6.6,0,0,0,.53-.63c0-.28-.61-.71-.84-.56a.79.79,0,0,0-.34.62A.56.56,0,0,0,540.13,238.41Z" fill="#e55940"/><path d="M537.69,241.64c.25-.08.69-.32.76-.7s.31-.77.13-1a.67.67,0,0,0-.51-.34,1,1,0,0,0-.65-.07,1.46,1.46,0,0,0-.92.86,1.07,1.07,0,0,0,.27,1.1A.91.91,0,0,0,537.69,241.64Z" fill="#e55940"/><path d="M527.66,238.66a.81.81,0,0,0,.6-.89.57.57,0,0,0-.14-.28,2,2,0,0,0-.35-.91,1.06,1.06,0,0,0-1.28-.38c.06.81.11,1.62.19,2.41a1,1,0,0,0,.58-.05A.66.66,0,0,0,527.66,238.66Z" fill="#e55940"/><path d="M535.09,260.55c.18.06.34-.24.39-.36a.35.35,0,0,0-.18-.35c-.12,0-.31.14-.38.26S534.9,260.49,535.09,260.55Z" fill="#e55940"/><path d="M540.05,255a1.3,1.3,0,0,0,1.47-.85h.15c1-.1,1.6-.67,1.5-1.47a1.48,1.48,0,0,0-1.78-1.19,1.38,1.38,0,0,0-1.14.88,1.43,1.43,0,0,0-1,.47.63.63,0,0,0-1,.3.64.64,0,0,0,.49.66.45.45,0,0,0,.31-.07A2,2,0,0,0,540.05,255Z" fill="#e55940"/><path d="M555.36,254.05a.34.34,0,0,0,0-.23c-.08-.14-.37-.09-.48,0s-.24.38-.12.54.26.08.39,0c.07.31.57.75.87.58a.66.66,0,0,0,.25-.79C556.1,253.93,555.65,253.93,555.36,254.05Z" fill="#e55940"/><path d="M539.87,260.88a.7.7,0,0,0,.48-.6c0-.37-.69-.88-1-.69s-.15.92,0,1.09A.55.55,0,0,0,539.87,260.88Z" fill="#e55940"/><path d="M531,220.83a.88.88,0,0,0-1.15.34.83.83,0,0,0-.46.13c-.42.24-.7.83-.53,1.16a1.17,1.17,0,0,0,1.42.41l.09.06a1.2,1.2,0,0,0,1.5-.49C532.14,221.94,531.71,221.13,531,220.83Z" fill="#e55940"/><path d="M531.24,232.64a1.16,1.16,0,0,0,0,1.19,1,1,0,0,0,1.08-.09.51.51,0,0,0-.06-.78C531.85,232.57,531.45,232.45,531.24,232.64Z" fill="#e55940"/><path d="M526.87,222.15c0,.38-.1.75-.14,1.13.42.23.77.26.92.05a1.16,1.16,0,0,0-.22-1.17A.71.71,0,0,0,526.87,222.15Z" fill="#e55940"/><path d="M531.31,236.62a.89.89,0,0,0-.64-.23c-.44.07-1.12.88-1,1.23a1.19,1.19,0,0,0,1.36.65.84.84,0,0,0,.37-.17,1.24,1.24,0,0,0,.95,0,.88.88,0,0,0,.15-1.28C532.15,236.35,531.83,236.3,531.31,236.62Z" fill="#e55940"/><path d="M555.43,244.06a.54.54,0,0,0,.58-.65.67.67,0,0,0-.71-.67.68.68,0,0,0-.61.67A.71.71,0,0,0,555.43,244.06Z" fill="#e55940"/><path d="M530.94,227.25a.61.61,0,0,0-.07.89.71.71,0,0,0,1,.11.53.53,0,0,0,0-.81A.67.67,0,0,0,530.94,227.25Z" fill="#e55940"/><path d="M552.22,238a.41.41,0,0,0-.43.54c.07.3.2.58.58.55s.65-.66.53-.86S552.47,238,552.22,238Z" fill="#e55940"/><path d="M552,242.47c-.5.08-.93.53-.86.9a1.38,1.38,0,0,0,1.39,1,.85.85,0,0,0,.56-1A.93.93,0,0,0,552,242.47Z" fill="#e55940"/><path d="M552.8,245.89c-.54.06-.83.51-.74,1.15a.67.67,0,0,0,.16.35.88.88,0,0,0-.23.45.7.7,0,0,0,.28.55.44.44,0,0,0,.64-.3,1.25,1.25,0,0,0,0-.42,1.5,1.5,0,0,0,.3,0c.49-.08.79-.39.75-.77S553.18,245.84,552.8,245.89Z" fill="#e55940"/><path d="M551.42,193.85a1.27,1.27,0,0,0-1.24,1.39,1,1,0,0,0,1,1c.72-.05,1.5-.82,1.42-1.41A1.18,1.18,0,0,0,551.42,193.85Z" fill="#e55940"/><path d="M553.58,251.26a.9.9,0,0,0-.51-.1,1,1,0,1,0,.28,1.9,1.14,1.14,0,0,0,.94-.88c.15-.31.2-.75,0-.9A.73.73,0,0,0,553.58,251.26Z" fill="#e55940"/><path d="M528.5,225.46c-.13,0-.39.14-.49.29a5.38,5.38,0,0,0-.48,1,.39.39,0,0,0,0,.18.39.39,0,0,0-.19.06,1.52,1.52,0,0,0-.31,1.61.92.92,0,0,0-.62.66,1,1,0,0,0,0,.22,1.7,1.7,0,0,0,0,.22.58.58,0,0,0,.31.5,1.49,1.49,0,0,0,1.44-.45A.69.69,0,0,0,528,229a1.21,1.21,0,0,0,.44-.22.87.87,0,0,0,.14-1.4,1.21,1.21,0,0,0-.33-.31,1.73,1.73,0,0,1,.66-.49c.13-.07.2-.45.14-.64A.82.82,0,0,0,528.5,225.46Z" fill="#e55940"/><path d="M555.18,183.26a.69.69,0,0,0-.62.78c.05.32.29.34.54.33s.59-.29.47-.59A2,2,0,0,0,555.18,183.26Z" fill="#e55940"/><path d="M555.87,186.16c-.17,0-.3.23-.31.35s.15.47.32.46.33-.35.31-.47S556,186.16,555.87,186.16Z" fill="#e55940"/><path d="M556.71,235.53c0-.35-.88-.48-1.17-.44a.79.79,0,0,0-.55.72c0,.35.58.5.89.51S556.75,235.87,556.71,235.53Z" fill="#e55940"/><path d="M554.33,248a.73.73,0,0,0,.55.31c.17,0,.6-.26.6-.48s-.47-.41-.67-.44S554.2,247.73,554.33,248Z" fill="#e55940"/><path d="M555.36,197.51a.59.59,0,0,0,.19-.6c-.1-.18-.58-.1-.69,0a.55.55,0,0,0,0,.53A.54.54,0,0,0,555.36,197.51Z" fill="#e55940"/><path d="M529.65,231.08a.62.62,0,0,0,.29.84.54.54,0,0,0,.73-.34.5.5,0,0,0-.25-.68A.53.53,0,0,0,529.65,231.08Z" fill="#e55940"/><path d="M531.49,225a.67.67,0,0,0,.22-.95.73.73,0,0,0-1-.17.65.65,0,0,0-.11.9A.6.6,0,0,0,531.49,225Z" fill="#e55940"/><path d="M531.53,243.53a.53.53,0,0,0,0-.12.74.74,0,0,0-1-.19,2.31,2.31,0,0,0,0,.73.43.43,0,0,0,.69.13.9.9,0,0,0,.18-.15s0,0,0,.08a2.37,2.37,0,0,0,1,1.28c.33.28.8,0,.79.48s.12,1.6,1.08,1.49a1.2,1.2,0,0,0,.92-1.09h0a1.22,1.22,0,0,0,2.05-1.16l0-.06a.65.65,0,0,0,.22-.78h0c.14.21.42.32.91.24a12.69,12.69,0,0,0,1.26-.78.62.62,0,0,0,.11-.9.64.64,0,0,0-.89-.18,2.39,2.39,0,0,1-.58.22,1,1,0,0,0-.91,1,.73.73,0,0,0,0,.3,1.08,1.08,0,0,0-1.26-.51c-.56.17-.55.52-.92.6s-.45.31-.47.72c0,.1,0,.22,0,.34a.62.62,0,0,0-.22-.1c-.39-.06,0-.91-.52-1s-.62-.8-1.3-.88A1.27,1.27,0,0,0,531.53,243.53Z" fill="#e55940"/><path d="M533.15,241.16c.09.19.21.24.39.14s.22-.22.13-.4a.25.25,0,0,0-.37-.13C533.12,240.86,533.05,241,533.15,241.16Z" fill="#e55940"/><path d="M533.4,254.89c.12-.41-.06-.69-.39-1-.79-.74-1.27-.75-1.92,0l-.51.54c.3.76.62,1.52,1,2.26a2.74,2.74,0,0,0,.62-1.1,2.1,2.1,0,0,1,.36,0C533.07,255.61,533.28,255.31,533.4,254.89Z" fill="#e55940"/><path d="M531.11,226.93a.52.52,0,0,0,.73-.32.93.93,0,0,0-.27-1.21,1.09,1.09,0,0,0-1.2.36C530.19,226.15,530.54,226.7,531.11,226.93Z" fill="#e55940"/><path d="M534,224.31a1.49,1.49,0,0,0-.5,1.93,1.57,1.57,0,0,0,1.89.4c.59-.35.67-1.18.19-1.95A1.14,1.14,0,0,0,534,224.31Z" fill="#e55940"/><path d="M540.22,229.69s-.1,0-.13,0a1.08,1.08,0,0,0-.35,1.2c.23.36.88.36,1.38,0a.49.49,0,0,0,.21-.62.85.85,0,0,0,.13-.51.55.55,0,0,0-.66-.56A.68.68,0,0,0,540.22,229.69Z" fill="#e55940"/><path d="M539.18,218.21c-.12.07-.4.13-.51.3a.84.84,0,0,0-.07.74,1.55,1.55,0,0,0-.47.19c0,.14-.11.41,0,.6a.82.82,0,0,0,1.07.42.85.85,0,0,0,.34-.82.69.69,0,0,0,.4-.34C540.05,219,539.76,218.48,539.18,218.21Z" fill="#e55940"/><path d="M528.5,229.69a.59.59,0,0,0-.21.86.7.7,0,0,0,.94.27.67.67,0,0,0,.14-1A.61.61,0,0,0,528.5,229.69Z" fill="#e55940"/><path d="M537.14,224.37a1.42,1.42,0,0,0,1.71.29l.16.12a.35.35,0,0,0,.37-.14c0-.12-.11-.33-.22-.42h0a1,1,0,0,0-.14-.81,1,1,0,0,0-1.49-.28A1,1,0,0,0,537.14,224.37Z" fill="#e55940"/><path d="M537.69,216.06a.79.79,0,0,0,.26.59c.24.18.73-.09.76-.41a1.17,1.17,0,0,0-.17-.49C538.08,215.6,537.7,215.76,537.69,216.06Z" fill="#e55940"/><path d="M529.18,233a7.91,7.91,0,0,0-2.87-.93c0,.81,0,1.62.06,2.41a1.06,1.06,0,0,0,.7,0l.08.13a1.26,1.26,0,0,0,.17.13h-.08c-.29,0-.45.25-.35.59s.26.55.57.43.76-.42.72-.69a.18.18,0,0,0,0-.1,1.3,1.3,0,0,0,.69-.21A1.4,1.4,0,0,0,529.18,233Z" fill="#e55940"/><path d="M530.24,244.36a1.41,1.41,0,0,0-2,.45,2.1,2.1,0,0,1-.49.41c.27,1.23.57,2.45.91,3.64.24-.17.48-.34.72-.49a1.47,1.47,0,0,0,.47-.11.78.78,0,0,0,.33-.32c.42-.27.74-.8.59-1.1l0,0C531.7,245.76,531.06,244.89,530.24,244.36Z" fill="#e55940"/><path d="M531.41,231.28c.23-.36.44-.74,0-1s-.72-.05-1,.28A.77.77,0,0,0,531.41,231.28Z" fill="#e55940"/><path d="M540.5,211.16c0,.09,0,.14.08.24s.21,0,.25-.09,0-.2-.05-.2S540.55,211.07,540.5,211.16Z" fill="#e55940"/><path d="M531.18,248.45c-.4.06-.8.14-.88.61a.61.61,0,0,0,.52.73.85.85,0,0,0,.64-.19,1.38,1.38,0,0,0-.11.76.75.75,0,0,0,.27.56,1,1,0,0,0-.83.1,1.41,1.41,0,0,0-.55.69,1.45,1.45,0,0,0-.55.37c.16.44.33.88.49,1.31l.52-.1a1,1,0,0,0,.57-.34,1.2,1.2,0,0,0,.47-.11,1.25,1.25,0,0,0,.25-1.65.58.58,0,0,0-.19-.19,1.31,1.31,0,0,0,.61,0,.85.85,0,0,0,.74-1,1.68,1.68,0,0,0-1.13-.94.67.67,0,0,0-.47.33C531.72,249.08,531.52,248.74,531.18,248.45Z" fill="#e55940"/><path d="M529.84,240.8a1.2,1.2,0,0,0,1.13.78.55.55,0,0,0,.31.6.7.7,0,0,0,.89-.2.52.52,0,0,0,.07-.73.73.73,0,0,0-.49-.31,1.82,1.82,0,0,0,.07-.25,1,1,0,0,0-.61-1.1,2.15,2.15,0,0,0-.34-.05.21.21,0,0,0,0-.13c0-.19-.59-.39-.68-.33s-.48.44-.4.61a.55.55,0,0,0,.19.18,1.39,1.39,0,0,0-.15.19A1,1,0,0,0,529.84,240.8Z" fill="#e55940"/><path d="M529.19,242.48a1.39,1.39,0,0,0,.07-1.14,1.23,1.23,0,0,0-1.51-.63,1.3,1.3,0,0,0-.71.49c.08.54.16,1.08.25,1.62a1.17,1.17,0,0,0,1.3.35,1.11,1.11,0,0,0,.27-.19.69.69,0,0,0,0,.25A1.51,1.51,0,0,0,530,244c.39,0,.56-.37.48-.91s-.34-.86-.77-.8A1.3,1.3,0,0,0,529.19,242.48Z" fill="#e55940"/><path d="M530.06,228.17a.78.78,0,0,0-.94.32,1,1,0,0,0,.33,1,.56.56,0,0,0,.13,0,1,1,0,0,0,0,.16.42.42,0,0,0,.57.41c.21-.06.7-.38.67-.56s-.21-.24-.41-.33a1,1,0,0,0,.13-.18A.71.71,0,0,0,530.06,228.17Z" fill="#e55940"/><path d="M551.49,190.13a.66.66,0,0,0-.55-.73.83.83,0,0,0-.62.21c-.3.28-.2.59.27,1.19C551,190.69,551.46,190.7,551.49,190.13Z" fill="#e55940"/></g><path d="M592.55,145.05l-.07,89.74,89.78.07A89.76,89.76,0,0,0,592.55,145.05Z" fill="#ff957d"/><path d="M647.92,62.55V63a9.33,9.33,0,0,1-9.14,9.32h0A15.75,15.75,0,0,0,623.05,88v.41a9.34,9.34,0,0,1-9.33,9.33v6.4a15.75,15.75,0,0,0,15.73-15.73V88a9.33,9.33,0,0,1,9.14-9.32h0A15.75,15.75,0,0,0,654.32,63v-.41a9.34,9.34,0,0,1,9.33-9.33v-6.4A15.75,15.75,0,0,0,647.92,62.55Z" fill="#f368ab"/><polygon points="370.25 349.17 364.3 350.8 358.57 349.17 352.7 351.16 347.11 349.17 340.93 351.09 336.09 349.17 336.09 396.49 370.25 396.49 370.25 349.17" fill="#424854"/><rect x="598.12" y="348.01" width="6.93" height="30.67" fill="#e6ebf2"/><rect x="608.6" y="348.01" width="5.49" height="30.67" fill="#e6ebf2"/><rect x="617.45" y="348.01" width="3.39" height="30.67" fill="#e6ebf2"/><rect x="623.52" y="348.01" width="4.05" height="30.67" fill="#e6ebf2"/><rect x="638.91" y="348.01" width="3.67" height="30.67" fill="#e6ebf2"/><rect x="645.28" y="348.01" width="3.61" height="30.67" fill="#e6ebf2"/><rect x="630.65" y="348.01" width="5.46" height="30.67" fill="#e6ebf2"/><rect x="651.27" y="348.01" width="4.62" height="30.67" fill="#e6ebf2"/><rect x="141.92" y="360.83" width="10.42" height="18.27" fill="#e6ebf2"/><polygon points="146.99 350.49 133.85 363.38 160.12 363.38 146.99 350.49" fill="#e6ebf2"/><path d="M507.69,386.3a.94.94,0,0,0-.1,1.24,1.37,1.37,0,0,0,1.68-.14.84.84,0,0,0-.2-1.13A.92.92,0,0,0,507.69,386.3Z" fill="#424854"/><path d="M501.21,393.11c0,.81.09,1.11.52,1.21a.67.67,0,0,0,.78-.31.78.78,0,0,0-.07-1C502,392.69,501.6,392.92,501.21,393.11Z" fill="#424854"/><path d="M491.56,384.16a.68.68,0,0,0,0-1,.53.53,0,0,0-.86,0,.68.68,0,0,0,0,1A.72.72,0,0,0,491.56,384.16Z" fill="#424854"/><path d="M501.37,391.37a.64.64,0,0,0,.56.29,1,1,0,0,0,.63-.53c.17-.51-.31-.63-.68-.86C501.45,390.58,501.13,390.89,501.37,391.37Z" fill="#424854"/><path d="M493.4,388.25c.17-.18,0-.6-.25-.86a.38.38,0,0,0-.62,0c-.2.24-.31.53,0,.8A.72.72,0,0,0,493.4,388.25Z" fill="#424854"/><path d="M520.6,381.72a.62.62,0,0,0-.07.93.58.58,0,0,0,.54.08.74.74,0,0,0,.36-.52C521.39,381.75,520.83,381.64,520.6,381.72Z" fill="#424854"/><path d="M518.69,393.4a.65.65,0,0,0-.31-.77c-.35-.12-.93.53-.79.79S518.55,393.75,518.69,393.4Z" fill="#424854"/><path d="M505.87,383.47c.23-.21.08-.93-.14-1s-.47.09-.67.25a.41.41,0,0,0,0,.69C505.32,383.6,505.59,383.73,505.87,383.47Z" fill="#424854"/><path d="M514,392.33a1,1,0,1,0,1.42,1.28,1.1,1.1,0,0,0,.09-1.41A1.33,1.33,0,0,0,514,392.33Z" fill="#424854"/><path d="M513.78,388.21c-.15-.17-.63,0-.8.08a.49.49,0,0,0,0,.78.7.7,0,0,0,.61-.11C513.74,388.84,513.92,388.38,513.78,388.21Z" fill="#424854"/><path d="M526.23,387.51c-.06.3-.21.67,0,.93s.56,0,.63-.14.33-.88.15-1.07S526.26,387.41,526.23,387.51Z" fill="#424854"/><path d="M517.91,390.68a5.08,5.08,0,0,0,.51-1.36,1.36,1.36,0,0,0-.86-1.36c-.3-.11-1-.1-1.07.55.42,1-.36,1-.29,1.85a1.18,1.18,0,0,0,.12.34A.87.87,0,0,0,517.91,390.68Z" fill="#424854"/><path d="M507.46,393.24a1.14,1.14,0,0,0-.07,1.49,1.55,1.55,0,0,0,1.67-.07,1.06,1.06,0,0,0-.12-1.41A1.16,1.16,0,0,0,507.46,393.24Z" fill="#424854"/><path d="M523.37,389.38a.89.89,0,0,0,.06-1.3,1.36,1.36,0,0,0-1.69.13,1,1,0,0,0,.26,1.3A.91.91,0,0,0,523.37,389.38Z" fill="#424854"/><path d="M507.27,389.3a1.18,1.18,0,0,0-1.34.15.87.87,0,0,0,0,1.07c.54.52,1.2.64,1.52.28A1.29,1.29,0,0,0,507.27,389.3Z" fill="#424854"/><path d="M510.48,388.42a.9.9,0,0,0,.17,1.36c.36.33.84.25,1.27-.23a.77.77,0,0,0,.09-1.07A1.46,1.46,0,0,0,510.48,388.42Z" fill="#424854"/><path d="M502,388.2a1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.44,0c-.24.26,0,1,.36,1.39A.82.82,0,0,0,502,388.2Z" fill="#424854"/><path d="M522.3,394.75a.7.7,0,0,0,.06,1,.84.84,0,0,0,1-.19.75.75,0,0,0-.15-1A.67.67,0,0,0,522.3,394.75Z" fill="#424854"/><path d="M517.15,383.39a.75.75,0,0,0-.09-1.05.68.68,0,0,0-1,.08.73.73,0,0,0,.08,1A.7.7,0,0,0,517.15,383.39Z" fill="#424854"/><path d="M504.8,392.87c-.28-.18-.57-.38-.8-.13-.38.46-.41.9-.14,1.15a.76.76,0,0,0,1.12-.07A.66.66,0,0,0,504.8,392.87Z" fill="#424854"/><path d="M506.06,385.28a.64.64,0,0,0-.89.06.7.7,0,0,0,0,1.05.77.77,0,0,0,1,0A.81.81,0,0,0,506.06,385.28Z" fill="#424854"/><path d="M511,381.53a.7.7,0,1,0-1-1,.83.83,0,0,0,.09,1A.62.62,0,0,0,511,381.53Z" fill="#424854"/><path d="M497.65,383.41c-.3.34-.33.7-.09.88a1.15,1.15,0,0,0,1.2,0,.72.72,0,0,0-.14-1A.67.67,0,0,0,497.65,383.41Z" fill="#424854"/><path d="M522.71,391.89a.69.69,0,0,0,0,1,.84.84,0,0,0,1,0,.68.68,0,0,0,0-1A.65.65,0,0,0,522.71,391.89Z" fill="#424854"/><path d="M510.43,384.4a.68.68,0,0,0-.05.91.7.7,0,0,0,1,0,.54.54,0,0,0,0-.87A.66.66,0,0,0,510.43,384.4Z" fill="#424854"/><path d="M495.94,390.67s0,0,0,0a.67.67,0,0,0,.7-.32.59.59,0,0,0-.71-.75.48.48,0,0,0-.22.17c-.29-.06-.72,0-.79.22a.77.77,0,0,0,.13.69A.55.55,0,0,0,495.94,390.67Z" fill="#424854"/><path d="M518.63,395c-.42.11-.68.35-.56.78,0,.14.31.35.43.33a.94.94,0,0,0,.61-.39C519.25,395.36,518.91,395.18,518.63,395Z" fill="#424854"/><path d="M498.18,389c-.21-.1-.45-.22-.64-.1s-.19.78.09,1,.44,0,.61-.14A.45.45,0,0,0,498.18,389Z" fill="#424854"/><path d="M525.54,393.64c-.26.21-.35.71-.09.86s.74.36,1,.1,0-.66-.18-.84A.44.44,0,0,0,525.54,393.64Z" fill="#424854"/><path d="M483,390.59c.12-.18.31-.73.16-.86s-.68,0-.88.13-.23.5,0,.78A.41.41,0,0,0,483,390.59Z" fill="#424854"/><path d="M506.8,379.07c.17-.12.39-.9.14-1.14s-1,.18-1.18.4a.8.8,0,0,0,0,.91C506,379.48,506.56,379.25,506.8,379.07Z" fill="#424854"/><path d="M495.74,382.17c.08-.06.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.36A.52.52,0,0,0,495.74,382.17Z" fill="#424854"/><path d="M529,390.78c-.06,0-.11.28,0,.36a.47.47,0,0,0,.44.05c.09-.06.23-.4.11-.53S529.14,390.69,529,390.78Z" fill="#424854"/><path d="M497,385.45A.46.46,0,0,0,497,385c-.12-.09-.38-.26-.48-.12a.46.46,0,0,0,0,.48C496.55,385.43,496.92,385.59,497,385.45Z" fill="#424854"/><path d="M501.29,380.05a.51.51,0,0,0-.08-.55.46.46,0,0,0-.44,0,.42.42,0,0,0,0,.43C500.83,380,501.16,380.21,501.29,380.05Z" fill="#424854"/><path d="M479.93,395.35c-.13.12-.06.37,0,.46s.43.24.55.12,0-.48-.1-.56A.41.41,0,0,0,479.93,395.35Z" fill="#424854"/><path d="M497.58,382.32a.22.22,0,0,0,0-.28c0-.05-.21,0-.25,0a.2.2,0,0,0,0,.24A.21.21,0,0,0,497.58,382.32Z" fill="#424854"/><path d="M520.06,386.55c0,.05-.07.18,0,.24a.19.19,0,1,0,.25-.29C520.27,386.45,520.1,386.5,520.06,386.55Z" fill="#424854"/><path d="M490.48,390.1c-.17-.22-.43,0-.55.12s-.06.34,0,.37a.52.52,0,0,0,.45,0A.39.39,0,0,0,490.48,390.1Z" fill="#424854"/><path d="M510,390.89a.73.73,0,0,0,.12,1,.69.69,0,0,0,1-.18.58.58,0,0,0-.1-.87A.75.75,0,0,0,510,390.89Z" fill="#424854"/><path d="M532.92,394.6c-.41.06-.28,0-.53-.35a.71.71,0,0,0-1.24,0,1.4,1.4,0,0,0,.42,1.82,1.65,1.65,0,0,0,2.14-.57C534,395,533.33,394.55,532.92,394.6Z" fill="#424854"/><path d="M481,394.18a1.1,1.1,0,0,0,.14,1.41,1,1,0,0,0,.71.21,1.32,1.32,0,0,0,1.11-1.49,5.09,5.09,0,0,0-.74-.46A1,1,0,0,0,481,394.18Z" fill="#424854"/><path d="M466.59,384.09a1,1,0,0,0,1.14.63,1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.82,1Z" fill="#424854"/><path d="M479.89,392.74a.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14s.59.84,1,.68A1.56,1.56,0,0,0,479.89,392.74Z" fill="#424854"/><path d="M479.18,382.77c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.5-.84A1.46,1.46,0,0,0,479.18,382.77Z" fill="#424854"/><path d="M474.72,383.8c.4-.14.57-.77.35-1.34a.52.52,0,0,0-.74-.32c-.47.15-.82.67-.69,1A1.09,1.09,0,0,0,474.72,383.8Z" fill="#424854"/><path d="M448.16,392.7l-.12,0h0a.71.71,0,0,0,.19-.54.6.6,0,0,0-.78-.27.73.73,0,0,0-.08-.73,4.9,4.9,0,0,0-.68-.7l.24-.48a.72.72,0,0,0-.13-.84,1,1,0,0,0-1.07-.14.66.66,0,0,0-.46.37.93.93,0,0,0-.68-.62.53.53,0,0,0-.69.44,1.07,1.07,0,0,0,.17.82.76.76,0,0,0,1.15-.17,2.39,2.39,0,0,1-.12.78.37.37,0,0,0,0,.11.56.56,0,0,0-.65-.26c-.38.17-.21.62-.13.77a.65.65,0,0,0,.54.28.41.41,0,0,0,.37-.38l.09.12a5.83,5.83,0,0,1,.61.8.83.83,0,0,0,1.11.26l.14-.11a.36.36,0,0,0,0,.25.45.45,0,0,1,.1.86.57.57,0,0,0,0,.13,1.23,1.23,0,0,0-.74,2.33,1.71,1.71,0,0,0,1.76-1,1,1,0,0,0-.13-.7.71.71,0,0,0,.3-.22.3.3,0,0,0,.23-.08C448.88,393.6,448.57,392.69,448.16,392.7Z" fill="#424854"/><path d="M450.74,388.54c.06-.31-.45-.92-.79-.82s-.76.39-.44.94S450.69,388.85,450.74,388.54Z" fill="#424854"/><path d="M466.87,377.19c.17-.05.22-.3.19-.42s-.28-.41-.43-.35-.21.43-.17.54S466.7,377.25,466.87,377.19Z" fill="#424854"/><path d="M450.52,394.12c-.15-.06-.35.15-.4.27s0,.45.22.51.39-.25.4-.36A.46.46,0,0,0,450.52,394.12Z" fill="#424854"/><path d="M484.79,382.08a.24.24,0,0,0-.13.35c.07.12.22.36.46.3s.15-.42.1-.47S485,382,484.79,382.08Z" fill="#424854"/><path d="M475.46,388.3c-.11-.56-.36-.89-.64-.86a1.17,1.17,0,0,0-.7,1c0,.28.58.61.93.57A.51.51,0,0,0,475.46,388.3Z" fill="#424854"/><path d="M491.34,388.26c-.13.05-.44.2-.38.39s.38.2.45.16.33-.16.27-.38A.25.25,0,0,0,491.34,388.26Z" fill="#424854"/><path d="M496.59,392.81a.19.19,0,0,0,0-.12c0-.22-.17-.35-.34-.49s-.28-.29-.5-.3-.34.31-.21.58a1,1,0,0,0,.21.27l-.38,0a2.37,2.37,0,0,0-.29-.34,1.42,1.42,0,0,0-1.32-.39,1.13,1.13,0,0,0-.29-.44,1.43,1.43,0,0,0-1.9.05,1.49,1.49,0,0,0,.08,1.84,1.06,1.06,0,0,0,1.18.21.79.79,0,0,0,.18.31,1.23,1.23,0,0,0,1.39.29.42.42,0,0,0,.07.31.73.73,0,0,0,.59.27c.41-.09.42-.4.39-.72.07.09.14.19.22.28a.67.67,0,0,0,1,.1,1,1,0,0,0,.44-1.12A.83.83,0,0,0,496.59,392.81Zm-1.49,1.05.07-.06.09.11Z" fill="#424854"/><path d="M471.94,387.27a1.11,1.11,0,0,0,.71-1.54,1.17,1.17,0,0,0-1.38-.76c-.55.16-.83,1-.58,1.73A.91.91,0,0,0,471.94,387.27Z" fill="#424854"/><path d="M468.52,393.77c-.51.21-.84.75-.68,1.12a1.49,1.49,0,0,0,1.72.63,1,1,0,0,0,.28-1.27C469.57,393.64,469.18,393.5,468.52,393.77Z" fill="#424854"/><path d="M479.38,388.17c.41-.16.9-1.1.75-1.42a1.18,1.18,0,0,0-1.47-.34c-.5.21-.62.68-.34,1.3A.94.94,0,0,0,479.38,388.17Z" fill="#424854"/><path d="M463.67,386.84a1.24,1.24,0,0,0-.52,1.34,1.11,1.11,0,0,0,1.27.43.84.84,0,0,0,.45-.91C464.64,387.05,464.1,386.67,463.67,386.84Z" fill="#424854"/><path d="M478.49,390.63a1.2,1.2,0,0,0,.35-1.23.81.81,0,0,0-.93-.37c-.65.29-1,.75-.78,1.15A1.2,1.2,0,0,0,478.49,390.63Z" fill="#424854"/><path d="M477.57,382.83c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.69.69,0,0,0-.32.92A.77.77,0,0,0,477.57,382.83Z" fill="#424854"/><path d="M463.47,381.28c-.32.11-.48.68-.28,1.28.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.83.83,0,0,0,463.47,381.28Z" fill="#424854"/><path d="M477.56,384.58c-.08,0-.21-.14-.29-.11a1.51,1.51,0,0,1-1-.12c-.14-.05-.46.16-.56.33a.85.85,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31C477.65,385.11,477.7,384.89,477.56,384.58Z" fill="#424854"/><path d="M474.87,391.53c-.48.32-.69.68-.56.92a1.16,1.16,0,0,0,1.16.28,1,1,0,0,0,.17-1.07A.51.51,0,0,0,474.87,391.53Z" fill="#424854"/><path d="M466.13,389.91a.74.74,0,0,0-.41.91.66.66,0,0,0,.85.32.59.59,0,0,0,.42-.78A.67.67,0,0,0,466.13,389.91Z" fill="#424854"/><path d="M472,391.68c-.37.32-.22.69,0,1a.76.76,0,0,0,1-.72C472.74,391.64,472.42,391.35,472,391.68Z" fill="#424854"/><path d="M486.74,381c.2-.35-.51-1-.94-.88s-.76.66-.58,1S486.53,381.34,486.74,381Z" fill="#424854"/><path d="M454.46,392.88c-.19,0-.63.49-.52.78a.63.63,0,0,0,.83.34.48.48,0,0,0,.27-.73A.91.91,0,0,0,454.46,392.88Z" fill="#424854"/><path d="M452.83,391.7c-.17.11-.25.37-.32.48.16.49.5.71.72.53a1.1,1.1,0,0,0,.4-.7C453.64,391.73,453.1,391.52,452.83,391.7Z" fill="#424854"/><path d="M479.09,380.67a.61.61,0,0,0,.41-.78.56.56,0,0,0-.75-.31.5.5,0,0,0-.32.65A.53.53,0,0,0,479.09,380.67Z" fill="#424854"/><path d="M457.12,385.57c.21-.24.81-.44.72-.81s-.68-.38-1-.53l-.18.13a.64.64,0,0,0,0,.77A1,1,0,0,0,457.12,385.57Z" fill="#424854"/><path d="M463.88,384c-.16.14-.59.44-.38.77s.69.25.92.19.29-.41.18-.68S464.1,383.76,463.88,384Z" fill="#424854"/><path d="M476.15,377.57c.08-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,476.15,377.57Z" fill="#424854"/><path d="M463.18,390.61a.67.67,0,0,0-.31.86c.13.47.63.89,1,.8.72-.18.75-1,.75-1.36S463.72,390.29,463.18,390.61Z" fill="#424854"/><path d="M469.42,390.55a.67.67,0,0,0-.41.88.61.61,0,0,0,.85.29.72.72,0,0,0,.34-.93A.55.55,0,0,0,469.42,390.55Z" fill="#424854"/><path d="M460.49,386.86a.43.43,0,0,0-.2.68c.12.19.47.66.74.51s.3-.73.23-.95A.53.53,0,0,0,460.49,386.86Z" fill="#424854"/><path d="M462.64,385.12a.8.8,0,0,0,.26-.59c0-.2-.26-.32-.49-.34a.55.55,0,0,0,.19-.26,1.46,1.46,0,0,0-.62-1.37c-.51-.14-.87.12-1,.74s.13.85.75,1a1.31,1.31,0,0,0,.33,0,2.42,2.42,0,0,0-.2.39C462,385.16,462.42,385.32,462.64,385.12Z" fill="#424854"/><path d="M491.55,391.7c.13-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.64.64,0,0,0,491.55,391.7Z" fill="#424854"/><path d="M451.83,388.3c0,.14.22.51.53.44s.24-.52.19-.65-.23-.39-.48-.3A.43.43,0,0,0,451.83,388.3Z" fill="#424854"/><path d="M468,378.71c.19-.06.14-.4.11-.53a.36.36,0,0,0-.35-.17c-.13.05-.17.3-.16.44S467.79,378.77,468,378.71Z" fill="#424854"/><path d="M456.92,386.27c.06.07.13.19.23.17s.07-.14.12-.22-.17-.12-.24-.12S456.91,386.25,456.92,386.27Z" fill="#424854"/><path d="M482.92,392.11a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S483.12,392.06,482.92,392.11Z" fill="#424854"/><path d="M460.83,392.33c0-.15.33-.8-.15-1-1-.46-1.19.55-1.53.51s-.86-.53-1.35-.63c-.7-.15-1.41.1-1.49.85a1.36,1.36,0,0,0,.21.94,1.09,1.09,0,0,0-.53,1.1,1,1,0,0,0,.46.58,1.31,1.31,0,0,0,1.77-.54,7.23,7.23,0,0,0-.26-.68c.46-.2.55-.75,1-.5s0,.72.87,1.12,1.7-.08,1.62-.74S460.81,392.49,460.83,392.33Z" fill="#424854"/><path d="M484.11,387.48c-.35-.17-.66-.49-1-.38a.67.67,0,0,0-.44.41c-.08.17-.25.31-.23.62a1.47,1.47,0,0,0,.61,1.1,1.09,1.09,0,0,0,1.13,0,.91.91,0,0,0,.41-.84A1.09,1.09,0,0,0,484.11,387.48Z" fill="#424854"/><path d="M480.22,390.64a.35.35,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49A.38.38,0,0,0,480.22,390.64Z" fill="#424854"/><path d="M487.72,391c-.17,0-.38-.32-.19-.35s.32-.23.25-.71a.72.72,0,0,0-.79-.72,1.07,1.07,0,0,0-1,1.14c0,.58.36.66.35,1s.2.51.59.62,1,.26,1.12-.28S487.89,391.06,487.72,391Z" fill="#424854"/><path d="M488.07,382.64c-.51.09-.68.27-.75.79a.06.06,0,0,1,0,0c-.1-.13-.49-.12-.63,0s-.3.59-.17.72a.23.23,0,0,0,.15.06,3.06,3.06,0,0,0-.37.35.45.45,0,0,0,.33.77c.48,0,1,.05,1.44-.37,0-.21,0-.45,0-.68.53-.35.85-.88.68-1.21A.63.63,0,0,0,488.07,382.64Z" fill="#424854"/><path d="M471.16,393.59a.62.62,0,0,0-.38.81.59.59,0,0,0,.78.41.71.71,0,0,0,.5-.85A.68.68,0,0,0,471.16,393.59Z" fill="#424854"/><path d="M450.57,378.61a1.15,1.15,0,0,0-1.46.72,1.51,1.51,0,0,0,.84,1.81,1.56,1.56,0,0,0,1.71-.91C451.9,379.59,451.43,378.9,450.57,378.61Z" fill="#424854"/><path d="M451.05,376.17a.94.94,0,0,0,.54,1.18,1.42,1.42,0,0,0,1.52-.9,1,1,0,0,0-2.06-.28Z" fill="#424854"/><path d="M440.46,374.53c-.12.37.32,1,.83,1.15a.84.84,0,0,0,1.1-.5,1.14,1.14,0,0,0-.6-1.37A1.21,1.21,0,0,0,440.46,374.53Z" fill="#424854"/><path d="M456.65,391a.89.89,0,0,0-.71-1.08c-.57-.19-.86,0-1.06.64s0,1,.41,1.14A1.59,1.59,0,0,0,456.65,391Z" fill="#424854"/><path d="M457.78,380.75a.82.82,0,0,0,.84-.42c.24.23.55.37.74.29s.42-.73.3-1.07a.65.65,0,0,0-.89-.36l-.14.08-.18-.09a.94.94,0,0,0-1.17.42A1.08,1.08,0,0,0,457.78,380.75Z" fill="#424854"/><path d="M431.32,387.48a.72.72,0,0,0-.5-.84.77.77,0,0,0-.91.54.76.76,0,0,0,.53.9A.82.82,0,0,0,431.32,387.48Z" fill="#424854"/><path d="M430.21,372.35c-.22.36.34,1.12.64,1.06s.58-1,.25-1.21A.7.7,0,0,0,430.21,372.35Z" fill="#424854"/><path d="M455.36,370.78c.16.06.35-.11.4-.22s0-.5-.14-.55-.43.22-.45.34S455.19,370.73,455.36,370.78Z" fill="#424854"/><path d="M466.59,385.53c0,.14,0,.42.2.51s.37-.24.36-.32,0-.33-.24-.39A.25.25,0,0,0,466.59,385.53Z" fill="#424854"/><path d="M443.79,385.27c.08-.24.27-.49.62-.33s.95,0,1.24-.77-.33-1.59-.9-1.45-.63.5-.82.4-.45-.52-.82-.38c-.18.06-.3.39-.35.72-.2-.11-.5-.11-.61.07a.71.71,0,0,0,0,.62c.1.14.52.39.71.28.13.19.26.42.05.6s-.81.31-.92.73a2.84,2.84,0,0,0-.16,1.35c-.74,0-.75-.57-1.47-.63a1,1,0,0,0-.36.07,1.36,1.36,0,0,0-.33.22,1.52,1.52,0,0,0-.5-.22c-.81-.21-1.41.08-1.59.76a2.7,2.7,0,0,0,0,.28c-.14-.16-.31-.26-.43-.22-.28.1-.47.9-.15,1.1a.67.67,0,0,0,.76-.14,1.14,1.14,0,0,0,.7.6,1.39,1.39,0,0,0,1.55-.67,5.85,5.85,0,0,0,1.07.58,1.36,1.36,0,0,0,1.48-.64,1.13,1.13,0,0,0,.11-.53c.2-.07.38-.25.6-.29a.88.88,0,0,0,.76-.9C444,386,443.71,385.51,443.79,385.27Z" fill="#424854"/><path d="M455,385.12a.52.52,0,0,0,.73-.3c.24-.52.24-.94,0-1.07a1.15,1.15,0,0,0-1.13.36C454.43,384.35,454.67,384.94,455,385.12Z" fill="#424854"/><path d="M439.41,389.64c-.32.17-.64.32-1,.49s-.71.37-.71.86a.54.54,0,0,1-.21.35c-.58.46-.76.72-.57,1.13l-.09,0a.83.83,0,0,0-.18,1,.67.67,0,0,0,1,.12.8.8,0,0,0,.28-.4.5.5,0,0,0,.2-.11,1.72,1.72,0,0,1,1-.39,1.35,1.35,0,0,0,1.16-1.64,2.38,2.38,0,0,1,0-.45.68.68,0,0,0,0-1A.65.65,0,0,0,439.41,389.64Z" fill="#424854"/><path d="M433,376.75a1.24,1.24,0,0,0-.17-.33,1.2,1.2,0,0,0-.26-.21,1.5,1.5,0,0,0,.08-2.09,1.43,1.43,0,0,0-2-.24,1.2,1.2,0,0,0-.13,1.83,2,2,0,0,0,.89.73,1.17,1.17,0,0,0-.13.25,5.18,5.18,0,0,0-.26,1.18c-.17-.33-.43-1-1-1.26a2,2,0,0,0-2.15.91,2,2,0,0,0-.23,1.45,1.6,1.6,0,0,0,.2.42.83.83,0,0,0-.17.64.72.72,0,0,0,.66.49.8.8,0,0,0,.95.1.61.61,0,0,0,.19-.59c.5-.17,1-.52,1.15-.44s.33,1.21,1.13,1.45a1.44,1.44,0,0,0,1.74-.92,2.36,2.36,0,0,0-.47-1.92A3.08,3.08,0,0,0,433,376.75Z" fill="#424854"/><path d="M450.41,391.59a1.33,1.33,0,0,0,1.4-.95,1.41,1.41,0,0,0-.84-1.55,1.4,1.4,0,0,0-1.42.41,1.35,1.35,0,0,0-1.45.84,1.33,1.33,0,0,0,.92,1.72,1,1,0,0,0,1.25-.52Z" fill="#424854"/><path d="M452.16,392.73a1.12,1.12,0,0,0-1.38.86c-.14.57.43,1.28,1.18,1.47a1,1,0,0,0,1.2-.8C453.32,393.27,453.06,393.08,452.16,392.73Z" fill="#424854"/><path d="M452.81,380.7a.9.9,0,0,0,.67,1.2,1.1,1.1,0,0,0,1.48-.82,1.18,1.18,0,0,0-.66-1.43C453.77,379.46,453,380,452.81,380.7Z" fill="#424854"/><path d="M446.68,387.14c.4.1.85-.3,1-.85s-.09-1-.78-1.18a1,1,0,0,0-1.21.51A1.49,1.49,0,0,0,446.68,387.14Z" fill="#424854"/><path d="M458.35,386a1,1,0,0,0,.59,1c.43.1,1.38-.36,1.45-.71s-.39-1-1-1.14S458.5,385.37,458.35,386Z" fill="#424854"/><path d="M456.77,388.49a.57.57,0,0,0,.34-.08,1,1,0,0,0,0,.62c.12.37.85.61,1.35.44a.84.84,0,0,0,.59-1.06,1.15,1.15,0,0,0-1.24-.75.82.82,0,0,0-.53-.81c-.7-.15-1.22,0-1.32.47A1.2,1.2,0,0,0,456.77,388.49Z" fill="#424854"/><path d="M460.64,381.66a1,1,0,0,0,1-.46,1,1,0,0,0-.63-1,.7.7,0,0,0-.8.56A.78.78,0,0,0,460.64,381.66Z" fill="#424854"/><path d="M450.67,373a.84.84,0,0,0-.47-1c-.32-.1-.79.26-1,.86.08.11.18.39.36.48A.85.85,0,0,0,450.67,373Z" fill="#424854"/><path d="M459.6,383.07c-.05-.08-.08-.25-.17-.28-.35-.11-.5-.38-.7-.66-.08-.12-.47-.14-.65-.05a.8.8,0,0,0-.37.56c0,.14.19.37.35.46a5.47,5.47,0,0,0,1,.35C459.36,383.54,459.53,383.39,459.6,383.07Z" fill="#424854"/><path d="M453.31,387.07c-.57,0-.95.13-1,.41a1.2,1.2,0,0,0,.77.92c.27,0,.73-.41.77-.77S453.67,387.09,453.31,387.07Z" fill="#424854"/><path d="M446.86,368c-.11.42.12,1,.42,1.1s.77-.35.87-.69a.63.63,0,0,0-.51-.81A.59.59,0,0,0,446.86,368Z" fill="#424854"/><path d="M447.66,381.46a.67.67,0,0,0-.43-.87.73.73,0,0,0-.86.49.56.56,0,0,0,.05.4.34.34,0,0,0-.14,0,.69.69,0,0,0-.18,1,.53.53,0,0,0,.84.18.67.67,0,0,0,.29-.81A.58.58,0,0,0,447.66,381.46Z" fill="#424854"/><path d="M451.58,386.33c-.05-.43-.13-.85-.64-.82s-.59.42-.57.83A.77.77,0,0,0,451.58,386.33Z" fill="#424854"/><path d="M467.85,384.77c0,.35.9,1,1.27.83s.19-1.11-.23-1.26S467.89,384.42,467.85,384.77Z" fill="#424854"/><path d="M435.18,375.21a1.06,1.06,0,0,0,.73-.33.23.23,0,0,0,0-.2,1.12,1.12,0,0,0,.78-.21.6.6,0,0,0,0-.89c-.41-.48-.79-.64-1.08-.43a1.1,1.1,0,0,0-.27,1,2.06,2.06,0,0,0-.46.19C434.76,374.85,434.9,375.23,435.18,375.21Z" fill="#424854"/><path d="M463.15,380.81a.61.61,0,0,0,.79-.38.55.55,0,0,0-.42-.69.5.5,0,0,0-.65.33A.53.53,0,0,0,463.15,380.81Z" fill="#424854"/><path d="M443.14,370.54h-.22a.63.63,0,0,0-.46.62.9.9,0,0,0,.08.6c.31-.07.91.12,1.06-.23S443.28,370.83,443.14,370.54Z" fill="#424854"/><path d="M448.81,375.56c.3.12.48-.16.55-.44s-.12-.69-.41-.66-.75,0-.77.4S448.58,375.47,448.81,375.56Z" fill="#424854"/><path d="M462.61,376.58c.18-.1.16-.58.2-.89a.27.27,0,0,0-.23-.34.83.83,0,0,0-.83.66A.62.62,0,0,0,462.61,376.58Z" fill="#424854"/><path d="M435.8,387.38a1.32,1.32,0,0,0-1.73.72,1.1,1.1,0,0,0,0,.54.68.68,0,0,0-.59,0,.73.73,0,0,0-.49.79c.08.53.57.55,1,.69a1.73,1.73,0,0,0,.43-.79,1.07,1.07,0,0,0,.47.31,1.46,1.46,0,0,0,1.6-.9A1.08,1.08,0,0,0,435.8,387.38Z" fill="#424854"/><path d="M440.42,383.65a1.14,1.14,0,0,0-.53-1.26,1.24,1.24,0,0,0-1.41.74c-.09.33.3.82.79,1A.89.89,0,0,0,440.42,383.65Z" fill="#424854"/><path d="M433.31,393.36a.65.65,0,1,0-.21,1.29.66.66,0,0,0,.82-.39A.88.88,0,0,0,433.31,393.36Z" fill="#424854"/><path d="M449.17,384.25a.72.72,0,0,0,.71-.28V384a.38.38,0,0,0,.5.24c.26-.13.14-.41.09-.53a.44.44,0,0,0-.41-.13l-.07.07c.05-.36-.15-.55-.48-.64a.68.68,0,0,0-.86.47A.61.61,0,0,0,449.17,384.25Z" fill="#424854"/><path d="M440.42,385.94c.22,0,.62.06.71-.23s-.15-.58-.34-.76-.59,0-.69.32S440.15,385.9,440.42,385.94Z" fill="#424854"/><path d="M435.24,392.5a.72.72,0,0,0-.16-.68.69.69,0,0,0-1-.11.84.84,0,0,0,0,1.07.71.71,0,0,0,.63.17.47.47,0,0,0,.15.52c.33.23.83-.06.91-.53C435.8,392.74,435.51,392.54,435.24,392.5Z" fill="#424854"/><path d="M443.93,375.23c0,.22,0,.81.29.84s.68-.41.75-.62-.12-.58-.48-.66A.43.43,0,0,0,443.93,375.23Z" fill="#424854"/><path d="M447.81,374.34c.15-.26-.18-.72-.5-.7a1.09,1.09,0,0,0-.47.23c-.09.47.12.82.42.8A.77.77,0,0,0,447.81,374.34Z" fill="#424854"/><path d="M428.75,376.57c.29.11.68-.44.61-1s-.79-.52-1-.4S428.46,376.47,428.75,376.57Z" fill="#424854"/><path d="M437.37,371.08a1.09,1.09,0,0,0,0-.19,1.31,1.31,0,0,0,.83-.21.64.64,0,0,0,0-1c-.48-.57-.9-.67-1.31-.33a1.13,1.13,0,0,0-.11,1.26.7.7,0,0,0-.14.17c-.06.14-.12.55.16.68S437.33,371.22,437.37,371.08Z" fill="#424854"/><path d="M455.75,372.29a.34.34,0,0,0-.19-.34c-.12,0-.31.14-.38.26s0,.39.17.45S455.7,372.42,455.75,372.29Z" fill="#424854"/><path d="M441.43,380.57c.32-.58,0-1.05.1-1.16s.73-.45.48-.91c-.54-1-1.28-.27-1.53-.51s-.38-.92-.72-1.3a1.1,1.1,0,0,0-1.71-.19,1.66,1.66,0,0,0-.31.47.59.59,0,0,0-.29.13,1.53,1.53,0,0,0-.2,1.66,1.06,1.06,0,0,0,1.41.1.74.74,0,0,0,.21-.25c.34,0,.62-.18.78.18.27.6-.4.59,0,1.41,0,.06.07.1.1.15a.68.68,0,0,0,.08.9.58.58,0,0,0,.87,0,.7.7,0,0,0,.2-.38A.69.69,0,0,0,441.43,380.57Z" fill="#424854"/><path d="M463,390.3a1.14,1.14,0,0,0,.14-1c-.19-.33-.25-.78-.57-.88a.66.66,0,0,0-.6.07c-.17.09-.38.1-.55.36a1.43,1.43,0,0,0-.16,1.25,1.08,1.08,0,0,0,.91.67A.94.94,0,0,0,463,390.3Z" fill="#424854"/><path d="M458.16,389.52a.36.36,0,0,0-.27.36.5.5,0,0,0,.41.35c.17,0,.27-.26.25-.42S458.34,389.47,458.16,389.52Z" fill="#424854"/><path d="M468.31,389c.64,0,1.21-.22,1.27-.58a.6.6,0,0,0-.16-.55,1.45,1.45,0,0,0,.07-.89c-.19-.65-1-.93-1.84-.65a1.14,1.14,0,0,0-.76,1.44,1.29,1.29,0,0,0,.17.33l-.37,0a.45.45,0,0,0-.19.82c.41.25.79.65,1.38.56Z" fill="#424854"/><path d="M448.71,387.75a.7.7,0,0,0,.9-.38.67.67,0,0,0-.5-.83.6.6,0,0,0-.78.42A.57.57,0,0,0,448.71,387.75Z" fill="#424854"/><path d="M433.67,372.12c.35.24.94.17,1-.21a1.18,1.18,0,0,1,.89-.93,1.07,1.07,0,0,0,.43-1.18.84.84,0,0,0-.3-.29.47.47,0,0,0-.22-.27.72.72,0,0,0-.69,0l-.17,0c-.3.11-.74.23-.67.64a1.64,1.64,0,0,1-.45,1.31A.56.56,0,0,0,433.67,372.12Z" fill="#424854"/><path d="M428.58,353.52a1.66,1.66,0,0,0,2,.39A1.27,1.27,0,0,0,431,353l.65,0a.59.59,0,0,0,.86-.37.76.76,0,0,0-.5-.93,2,2,0,0,1-.65-.39,1,1,0,0,0-1.12-.41c-.21.07-.42.44-.52.8a1.05,1.05,0,0,0-.63.17A1.31,1.31,0,0,0,428.58,353.52Z" fill="#424854"/><path d="M438.63,357a1.18,1.18,0,0,0,.13,1.5c.35.41.84.39,1.35-.07a1,1,0,0,0,.11-1.15A1.63,1.63,0,0,0,438.63,357Z" fill="#424854"/><path d="M445.73,378.71a1,1,0,0,0-1.21-.29,1.28,1.28,0,0,0-.34,1,.7.7,0,0,0-.5.5c-.17.45,0,1.09.33,1.23.68.27,1.17-.33,1.4-.65a.36.36,0,0,0,0-.35.47.47,0,0,0,.12-.07A.93.93,0,0,0,445.73,378.71Z" fill="#424854"/><path d="M440,371.25c-.79-.17-1.11-.09-1.28.32a.68.68,0,0,0,.19.82.78.78,0,0,0,1,.09C440.31,372.1,440.14,371.66,440,371.25Z" fill="#424854"/><path d="M435.53,360.69a.71.71,0,0,0,.62.68.53.53,0,0,0,.66-.32c.22-.48-.05-.79-.43-1.11C436,360.11,435.5,360.17,435.53,360.69Z" fill="#424854"/><path d="M432.58,341.92a.7.7,0,0,0,.62.67.54.54,0,0,0,.67-.31c.21-.49-.06-.79-.43-1.12C433,341.34,432.55,341.39,432.58,341.92Z" fill="#424854"/><path d="M451.35,363.24a.54.54,0,0,0,.14-.85.67.67,0,0,0-1-.16.7.7,0,0,0-.16.89A.68.68,0,0,0,451.35,363.24Z" fill="#424854"/><path d="M441.33,372.18a1.07,1.07,0,0,0,.43.71c.48.25.67-.21.95-.54-.24-.47-.49-.83-1-.67A.66.66,0,0,0,441.33,372.18Z" fill="#424854"/><path d="M446,364.3c.15.19.59.13.89-.12a.38.38,0,0,0,.06-.62.56.56,0,0,0-.79-.16A.74.74,0,0,0,446,364.3Z" fill="#424854"/><path d="M448.81,377.37c.17.25.9.22,1,0s0-.48-.14-.7a.41.41,0,0,0-.68-.1C448.76,376.8,448.59,377.05,448.81,377.37Z" fill="#424854"/><path d="M438.66,385.55a1.34,1.34,0,0,0,.11-1.51,1,1,0,1,0-1.49,1.2A1.11,1.11,0,0,0,438.66,385.55Z" fill="#424854"/><path d="M430.32,343.48c.21-.11.11-.42.05-.47a.59.59,0,0,0-.43-.11c-.06,0-.15.29-.11.35S430.1,343.58,430.32,343.48Z" fill="#424854"/><path d="M441.52,365.77a1,1,0,0,0-.62.56.34.34,0,0,0,.25.45.71.71,0,0,0,.54-.27c.15-.13.33-.23.37-.44S441.81,365.68,441.52,365.77Z" fill="#424854"/><path d="M437.76,362.54a1.28,1.28,0,0,0-.51,2.48c.48.17,1.05-.42,1.31-1.07A1.26,1.26,0,0,0,437.76,362.54Z" fill="#424854"/><path d="M431.25,362.62a.82.82,0,0,0-.28-.94c-.48-.18-.37-.53-.49-.85a2.14,2.14,0,0,0-.62-.73s-.06,0-.08-.06a.57.57,0,0,0,.36-.37c0-.12-.06-.37-.23-.41h-.12c.48-.39.67-.91.43-1.25a1.16,1.16,0,0,0-1.42-.2,1,1,0,0,0-.2,1.31.89.89,0,0,0,1,.28.25.25,0,0,0-.07.12.65.65,0,0,0,.07.41l-.3-.11a4.34,4.34,0,0,0-.62-.16c-.68-.16-1.1,0-1.29.53a1.1,1.1,0,0,0,.63,1.41,12.09,12.09,0,0,1,1.82.95C430.28,362.89,431.05,362.94,431.25,362.62Z" fill="#424854"/><path d="M430.28,370.41c.05,0,.13-.05.15-.1.23-.55.72-.43,1.16-.48a.7.7,0,0,0,.64-1c0-.05,0-.1-.05-.14a.66.66,0,0,0,.32-.12A3,3,0,0,0,433,368l0,0-.62-.8a4.43,4.43,0,0,0-.61.27.75.75,0,0,0-.34.64.93.93,0,0,0-.69.2c-.28.2-.49.47-1,.25,0-.2,0-.48-.12-.6a1.24,1.24,0,0,0-.75-.4c-.34,0-.47.32-.46.66s0,.53,0,.79C428.41,369.66,429.68,370.61,430.28,370.41Z" fill="#424854"/><path d="M441,363.62a1.15,1.15,0,0,0,1.66.24A1.44,1.44,0,0,0,443,362a1.52,1.52,0,0,0-1.84-.21A1.27,1.27,0,0,0,441,363.62Z" fill="#424854"/><path d="M431.2,356.35c.2.83.66,1.32,1.16,1.21a1.42,1.42,0,0,0,.84-1.46c-.12-.57-.43-.68-1.6-.48-.12-.44-.19-.92-.8-.82a.72.72,0,0,0-.66.65.51.51,0,0,0,.12.41A8.24,8.24,0,0,0,431.2,356.35Z" fill="#424854"/><path d="M432.51,347.68a1.06,1.06,0,0,0-.29.5c-.24.05-.46.2-.44.4s.1.82.44.87a.41.41,0,0,0,.33-.16,1.16,1.16,0,0,0,1.42,0,1.08,1.08,0,0,0-1.46-1.57Z" fill="#424854"/><path d="M435.12,377.51a1.12,1.12,0,0,0,.36-.43.53.53,0,0,0,.17.08.48.48,0,0,0,.65-.43.89.89,0,0,0-.23-.65.72.72,0,0,0-.56.05,1.94,1.94,0,0,0-.27-.48,1.25,1.25,0,0,0-1.66-.12,1.26,1.26,0,0,0,1.54,2Z" fill="#424854"/><path d="M438.54,367a1.41,1.41,0,0,0-.44-.33.58.58,0,0,0,.16-.31A.44.44,0,0,0,438,366a.48.48,0,0,0-.4.23.46.46,0,0,0,.05.33,1.8,1.8,0,0,0-.41.11c-.47.22-.56.63-.08,1.23a12.6,12.6,0,0,0,1.31.68.6.6,0,0,0,.83-.36.65.65,0,0,0-.29-.86A2,2,0,0,1,438.54,367Z" fill="#424854"/><path d="M429.66,366.3a.9.9,0,0,0,.17-.28,1.21,1.21,0,0,0,.77.55,1.33,1.33,0,0,0,1.55-.95,1.93,1.93,0,0,0-1.19-1.68,1.26,1.26,0,0,0-1.28.74,1.16,1.16,0,0,0-1.18.21c-.46.35-.47.72,0,1.25A.85.85,0,0,0,429.66,366.3Z" fill="#424854"/><path d="M441.83,376.28c-.59.46-.81,1.09-.51,1.46a1.29,1.29,0,0,0,1.5.09,1.18,1.18,0,0,0,.07-1.34A.89.89,0,0,0,441.83,376.28Z" fill="#424854"/><path d="M442.89,382.64a1.47,1.47,0,0,0,.3-1.5.9.9,0,0,0-1.37-.05c-.39.31-.37.79,0,1.29A.76.76,0,0,0,442.89,382.64Z" fill="#424854"/><path d="M444.77,371.74a.82.82,0,0,0,0,1.08A1,1,0,0,0,446,373a1.26,1.26,0,0,0,.24-1.43C446,371.33,445.2,371.4,444.77,371.74Z" fill="#424854"/><path d="M433.12,351.8a.69.69,0,0,0-.29.94,1.15,1.15,0,0,0,1.41.3.79.79,0,0,0,.19-1.06A1,1,0,0,0,433.12,351.8Z" fill="#424854"/><path d="M433.39,359.13a1.5,1.5,0,0,0-.05,1.37c.22.31.6.3,1-.05s.57-.73.3-1.07A.87.87,0,0,0,433.39,359.13Z" fill="#424854"/><path d="M436.5,380.43a.94.94,0,0,0-1.07-.34.9.9,0,0,0-1.32.65c-.13.56.08,1,.51,1.11a1.49,1.49,0,0,0,1.13-.37,1,1,0,0,0,.66-.16A.61.61,0,0,0,436.5,380.43Z" fill="#424854"/><path d="M448.16,388.6a.7.7,0,0,0,.09-1,.73.73,0,0,0-1-.07.71.71,0,0,0-.16,1A.75.75,0,0,0,448.16,388.6Z" fill="#424854"/><path d="M438.83,373.75a.74.74,0,0,0-.1,1.11.64.64,0,0,0,.95,0c.23-.24.47-.51.26-.77C439.55,373.61,439.12,373.52,438.83,373.75Z" fill="#424854"/><path d="M436.86,354.8a.77.77,0,0,0-.12,1,.81.81,0,0,0,1.07.07.64.64,0,0,0,.08-.89A.69.69,0,0,0,436.86,354.8Z" fill="#424854"/><path d="M446,376.21a.75.75,0,0,0-.11,1,.1.1,0,0,0,.05,0,1.06,1.06,0,0,0-.12.2,1.13,1.13,0,0,0,.78,1.1.85.85,0,0,0,.9-.47,1.13,1.13,0,0,0-.33-1.32.68.68,0,0,0-.14-.37A.69.69,0,0,0,446,376.21Z" fill="#424854"/><path d="M451,382.94a.76.76,0,0,0,.07-1,.83.83,0,0,0-1-.07.62.62,0,0,0-.12.88A.75.75,0,0,0,451,382.94Z" fill="#424854"/><path d="M450.14,370.23a.65.65,0,0,0,0-1c-.29-.35-.64-.45-.86-.23a1.13,1.13,0,0,0-.14,1.19A.7.7,0,0,0,450.14,370.23Z" fill="#424854"/><path d="M443.25,366.43a.61.61,0,0,0,.81.15c.25-.14.3-.89.06-1a.78.78,0,0,0-.7,0A.55.55,0,0,0,443.25,366.43Z" fill="#424854"/><path d="M428.71,347.3c.19-.18,0-.76-.09-1s-.58-.23-.8,0-.31.52-.06.71S428.53,347.47,428.71,347.3Z" fill="#424854"/><path d="M440.12,364.45a.58.58,0,0,0-.55-.08.73.73,0,0,0-.36.54c0,.49.44.49.81.51C440.31,365.1,440.44,364.77,440.12,364.45Z" fill="#424854"/><path d="M443.77,368.22c-.23.22-.12.43,0,.63s.58.32.76,0,.29-.41.2-.61S444,368,443.77,368.22Z" fill="#424854"/><path d="M440.12,354.42c.22-.16-.06-.77-.19-1a.41.41,0,0,0-.69,0c-.21.23-.34.5-.08.71S439.91,354.59,440.12,354.42Z" fill="#424854"/><path d="M434.84,395c-.15.19-.48.68-.25.93s.66.05.85,0a.45.45,0,0,0,.23-.67C435.5,394.9,435,394.73,434.84,395Z" fill="#424854"/><path d="M446.19,353.9c.15-.12.09-.67,0-.89s-.45-.3-.77-.09a.41.41,0,0,0-.06.69C445.53,353.76,446.05,354,446.19,353.9Z" fill="#424854"/><path d="M437.72,359c.15-.13,0-.71-.05-.75s-.63-.2-.73-.05a.71.71,0,0,0,0,.65C437.07,359,437.58,359.1,437.72,359Z" fill="#424854"/><path d="M426.89,350.6c-.13.18-.43.67-.26.87s.74-.06.9-.2.05-.45,0-.62A.33.33,0,0,0,426.89,350.6Z" fill="#424854"/><path d="M451.8,359c.14-.07.2-.46.12-.61s-.53-.39-.68-.28-.12.6,0,.68S451.66,359.12,451.8,359Z" fill="#424854"/><path d="M453,378c-.27.21-.13.75,0,1s.83.52,1.11.31,0-1-.22-1.23A.77.77,0,0,0,453,378Z" fill="#424854"/><path d="M451.79,367.12a.58.58,0,0,0-.11.44c0,.09.41.26.51.19s0-.44,0-.56A.4.4,0,0,0,451.79,367.12Z" fill="#424854"/><path d="M448.73,368.32c.1-.11.3-.33.19-.45a.48.48,0,0,0-.48-.08c-.1.06-.32.41-.2.53A.48.48,0,0,0,448.73,368.32Z" fill="#424854"/><path d="M453.45,373.39a.45.45,0,0,0,.06-.45.45.45,0,0,0-.42-.08c-.1.07-.33.37-.19.52A.52.52,0,0,0,453.45,373.39Z" fill="#424854"/><path d="M441.05,350.34c.09-.08.2-.32.1-.46a.41.41,0,0,0-.47-.06c-.1.07-.3.4-.2.53S441,350.42,441.05,350.34Z" fill="#424854"/><path d="M441.54,345c.07,0,.24-.31.12-.47s-.42,0-.53.06a.36.36,0,0,0-.06.39C441.15,345.11,441.41,345.08,441.54,345Z" fill="#424854"/><path d="M451.52,369.36c.06,0,0-.21,0-.25s-.17-.1-.24,0a.2.2,0,0,0,0,.29A.2.2,0,0,0,451.52,369.36Z" fill="#424854"/><path d="M436.49,352.91a.21.21,0,0,0,.28,0c.05,0,0-.22,0-.26a.18.18,0,1,0-.27.25Z" fill="#424854"/><path d="M444.67,361.12c.24-.13,0-.43,0-.55s-.32-.12-.35-.07a.55.55,0,0,0-.12.44A.39.39,0,0,0,444.67,361.12Z" fill="#424854"/><path d="M434.05,366.08h0a1.29,1.29,0,0,0,.28,1.15,1.34,1.34,0,0,0,1.75,0,1.1,1.1,0,0,0,.15-1.48,1.74,1.74,0,0,0-1.64-.3.74.74,0,0,0,.05-.54c-.14-.38.8-.45.63-1s.38-.94.11-1.56-.93-1.06-1.38-.64a2.35,2.35,0,0,0-.61,1.48c-.08.43.43.67,0,.93s-1.32.91-.73,1.68A1.16,1.16,0,0,0,434.05,366.08Z" fill="#424854"/><path d="M428,329.8a1.36,1.36,0,0,0,1,1.34c.36.07.78-.33.84-.79a.92.92,0,0,0-.78-1.14C428.55,329.13,428,329.42,428,329.8Z" fill="#424854"/><path d="M439.3,338.53a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-1,.62.62,0,0,0-.83.44A.6.6,0,0,0,439.3,338.53Z" fill="#424854"/><path d="M429,342.31a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S428.67,342.38,429,342.31Z" fill="#424854"/><path d="M430.45,326.15c.3.08.82-.43.76-.66s-.33-.35-.57-.43a.42.42,0,0,0-.58.38C430,325.75,430.07,326.06,430.45,326.15Z" fill="#424854"/><path d="M428.34,339a1.34,1.34,0,0,0-.92-1.2,1,1,0,1,0-.31,1.9C427.67,339.78,428.28,339.44,428.34,339Z" fill="#424854"/><path d="M429.6,335.18a.67.67,0,0,0,.43.45c.16,0,.65-.05.71-.27s-.32-.53-.5-.62S429.55,334.9,429.6,335.18Z" fill="#424854"/><path d="M437.31,346c-.09.33.32.47.46.45s.92-.19,1-.45-.58-.56-.68-.52C437.79,345.56,437.4,345.64,437.31,346Z" fill="#424854"/><path d="M432,337.81c-.62.89-1.06.26-1.71.75a1.18,1.18,0,0,0-.23.29.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46C432.93,338.1,432.54,337.51,432,337.81Z" fill="#424854"/><path d="M434.1,343a.92.92,0,0,0,.86,1.09c.58.08,1.08-.21,1.12-.66a1.35,1.35,0,0,0-1-1.35C434.65,342,434.15,342.46,434.1,343Z" fill="#424854"/><path d="M429.55,334a1.44,1.44,0,0,0-.77-1.31c-.53-.1-.94.24-1,.87s.25.84.88.94S429.47,334.4,429.55,334Z" fill="#424854"/><path d="M429.75,347.47a.75.75,0,0,0,.74-.66.67.67,0,0,0-.63-.74.7.7,0,0,0-.84.61A.84.84,0,0,0,429.75,347.47Z" fill="#424854"/><path d="M436.62,335.59a.75.75,0,0,0,.84-.64.7.7,0,0,0-.63-.83.72.72,0,0,0-.77.59A.7.7,0,0,0,436.62,335.59Z" fill="#424854"/><path d="M428.18,328a.82.82,0,0,0,.85-.66.65.65,0,0,0-.54-.72.7.7,0,0,0-.88.57A.77.77,0,0,0,428.18,328Z" fill="#424854"/><path d="M435.17,328.08a.82.82,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Z" fill="#424854"/><path d="M432.48,344.87a.67.67,0,0,0-.82.52.83.83,0,0,0,.52.86.67.67,0,0,0,.8-.56A.64.64,0,0,0,432.48,344.87Z" fill="#424854"/><path d="M431.85,331.78a.54.54,0,0,0,.75-.44.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45A.71.71,0,0,0,431.85,331.78Z" fill="#424854"/><path d="M427.29,343.92c.41-.08.37-.47.36-.79-.32-.29-.66-.38-1,0a.56.56,0,0,0-.05.53A.91.91,0,0,0,427.29,343.92Z" fill="#424854"/><path d="M429.58,357.34c.34.06.64-.14.6-.46a1.79,1.79,0,0,0-.27-.59.67.67,0,0,0-.78.6C429.11,357.22,429.33,357.3,429.58,357.34Z" fill="#424854"/><path d="M434.65,324.55c.19.08,1-.16,1-.5s-.68-.73-1-.77a.76.76,0,0,0-.74.52C433.89,324.13,434.36,324.44,434.65,324.55Z" fill="#424854"/><path d="M426.15,316.33c-.07,0-.31.13-.31.19s.1.36.21.41.48-.09.5-.2S426.29,316.38,426.15,316.33Z" fill="#424854"/><path d="M436.84,349.57c-.08,0-.3.05-.31.19a.45.45,0,0,0,.2.4c.1,0,.46,0,.51-.19S437,349.62,436.84,349.57Z" fill="#424854"/><path d="M430.84,320.44c.21,0,.4-.24.42-.35a.46.46,0,0,0-.25-.38.45.45,0,0,0-.37.22C430.61,320.05,430.64,320.43,430.84,320.44Z" fill="#424854"/><path d="M435.33,357.91c-.19-.05-.32.27-.36.4a.37.37,0,0,0,.22.33c.13,0,.29-.18.35-.31S435.52,358,435.33,357.91Z" fill="#424854"/><path d="M427.14,318.37c0-.06-.12-.18-.18-.18s-.19,0-.2.13a.2.2,0,0,0,.17.24A.22.22,0,0,0,427.14,318.37Z" fill="#424854"/><path d="M435.72,339.93c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,435.72,339.93Z" fill="#424854"/><path d="M435.1,353.22a1.41,1.41,0,0,0-1.3,1.34,1.65,1.65,0,0,0,1.64,1.49c.56-.07.56-.81.3-1.13s-.14-.24,0-.64S435.85,353.24,435.1,353.22Z" fill="#424854"/><path d="M482.62,302.3h0l-.09,0Z" fill="#424854"/><path d="M747.72,314.08l-26.08-13.21L682.34,281l-5.12-2.59a7.77,7.77,0,0,0-2.66-1.08c-1.08-.1-2.23,0-3.31,0H564.93q-24.37,0-48.75.07l-44.59.08c-11.33,0-185-.21-185-.21a1.75,1.75,0,0,0-.81.19L213,313.93A1.83,1.83,0,0,0,212,316a1.8,1.8,0,0,0,1.77,1.39H285.5v80.81a1.82,1.82,0,0,0,1.8,1.82H680.18a1.81,1.81,0,0,0,1.81-1.82V318.85h3.12c11.87-.05,23.75,0,35.62-.17l21.9-.24,1.23,0a2.7,2.7,0,0,0,1.48-.47l.09.05C748,319.31,750.32,315.4,747.72,314.08Zm-73.94-32.43a2.69,2.69,0,0,0,.29.16C673.56,281.71,673.17,281.3,673.78,281.65ZM221.44,313.74,287,280.87H416.07l-68.72,32.87Zm502.94-.65c-11.5,0-23,.12-34.51.21-12.94.09-25.91.24-38.85.8-10.84.47-21.69,1-32.53,1.41-5.18.19-10.37.21-15.54.45h-.22a.6.6,0,0,0,0,1.19h.88l2.52,0,9.31.17c10.34.18,20.68.61,31,.94q15.94.51,31.9.52v77.52h-149a.84.84,0,0,0-.15-.3.74.74,0,0,0-1.05-.07,2,2,0,0,1-.68.33l-.17,0h-15.5a1.1,1.1,0,0,0-.11-1.28.6.6,0,0,0-.89.05.94.94,0,0,0-.1,1.23H505.2a1,1,0,0,0-.3-.53c-.27-.22-.59-.16-.87.16a1.94,1.94,0,0,0-.26.37h-2.64l.06,0a1.28,1.28,0,0,0-.26-1.35.64.64,0,0,0-.95.14c-.44.52-.49.91-.2,1.25h-1.39a11.48,11.48,0,0,0,.44-1.33.62.62,0,0,0-.49-.77.66.66,0,0,0-.8.43,1.94,1.94,0,0,1-.31.54,1,1,0,0,0-.19,1.13h-1.67a1.91,1.91,0,0,0-1.14-.67,1.2,1.2,0,0,0-1.05.51,1.34,1.34,0,0,0-.69,0,.68.68,0,0,0-.23.14h-1.43s0-.05,0-.07c-.35-.36-.76-.23-1.16.06h-.84c.35-.42.25-.89-.28-1.32a.94.94,0,0,0-1.16.07,1.78,1.78,0,0,0-.19,1.26h-2.59a1.25,1.25,0,0,0,.07-.56,1.29,1.29,0,0,0,.48.06c.31-.05.4-.35.29-.64s-.24-.5-.59-.41a.71.71,0,0,0-.44.78,1.69,1.69,0,0,0-.74.39.36.36,0,0,0-.12.38h-7.84a1.26,1.26,0,0,0-1.51-1.82,16.91,16.91,0,0,1-1.49,1.82h-5.86l-.21-.18s0-.08-.08-.13h-.09c-.15-.12-.28-.22-.31-.33s-.08-.56.3-.63.75-.58.54-1.36-1.21-1.09-1.58-.64-.21.79-.42.82-.68-.15-.89.17a.42.42,0,0,0,0,.3l-.08-.11c-.12-.12-.12-.48,0-.39s.4,0,.63-.42a.72.72,0,0,0-.22-1,1,1,0,0,0-1.44.34c-.33.49-.1.75-.34,1.05s-.14.53.11.85.64.8,1.07.44a.62.62,0,0,0,.28-.49,2.38,2.38,0,0,0,.55.89c.17.09.72.15.63.55a1.13,1.13,0,0,1-.13.33h-2.74a.92.92,0,0,0-1.78,0h-1.05l0-.08c.07-.26.1-.54-.23-.68a.74.74,0,0,0-.89.49l.21.27H457a1.43,1.43,0,0,0-.67-.92,1.24,1.24,0,0,0-1.57.47,1.45,1.45,0,0,0-.2.45h-1.45a3.15,3.15,0,0,0-.79-1.1,1.07,1.07,0,0,0-.33-.16c-.8-.16-1.33.39-1.11,1.14,0,0,0,.08,0,.12h-2.31a.53.53,0,0,0-.46,0h-4a1.62,1.62,0,0,0,.43-.75c.09-.66-.66-1-.66-1.2s1-.69,1.07-1.51a2,2,0,0,0-1.42-1.81.26.26,0,0,0,0-.2c-.05,0-.17-.1-.24,0a.21.21,0,0,0-.06.19,1.78,1.78,0,0,0-1.18.2,1.86,1.86,0,0,0-.68.87,1.12,1.12,0,0,0-1.08.23.91.91,0,0,0-.08,1.37.9.9,0,0,0,1.27.27,1.07,1.07,0,0,0,.26-.4c.27.31.55.56.52.7s-1.07.65-1.09,1.48a1.29,1.29,0,0,0,.12.6h-1.57a1.08,1.08,0,0,0,.42-1.13,1.11,1.11,0,0,0-1.39-1c-.4.16-.64.65-.93.66s.26-.31-.66-.59-2,.8-1.16,1.61c.05.06-.1.24-.23.49h-1.66a1.09,1.09,0,0,0-.18-.19,1.21,1.21,0,0,0-1.12-.17,1.87,1.87,0,0,0-1-1.48,1.69,1.69,0,0,0-1.64.93,1,1,0,0,0,.13.91H427c0-.8,0-1.59,0-2.39a.64.64,0,0,0,.87.14.62.62,0,0,0,.18-.94.74.74,0,0,0-1-.18h0c0-.89,0-1.78,0-2.67l0,0,.1-.09,0,0a2.51,2.51,0,0,0,.33.53,1.29,1.29,0,0,0,.89.35,1.15,1.15,0,0,0,.09.44,1.7,1.7,0,0,0-.11.36c-.16.87,0,1.24.6,1.47a1,1,0,0,0,.63.41,1.17,1.17,0,0,0,1.13-.53.88.88,0,0,0,0-.71l.06-.19a.51.51,0,0,0,0-.17,1.45,1.45,0,0,0,.78.78c.37.12.85-.22,1-.7a1,1,0,0,0-.73-1.25,1,1,0,0,0-1,.25,1.09,1.09,0,0,0-.2-.72,1.12,1.12,0,0,1-1.12-1.43,1.08,1.08,0,0,0-.35-.32,1.22,1.22,0,0,0-1.34-.67,1.4,1.4,0,0,0-.74.74l-.12-.06v-2.63a1.39,1.39,0,0,0,.83.3,1.46,1.46,0,0,0,1.13-.55c.35-.36.87-.37,1-.84a2.4,2.4,0,0,0,.07-1.32,1.2,1.2,0,0,0,.68.54.79.79,0,0,0,.86-.52,1.68,1.68,0,0,0,.38.37l.48.26a2.28,2.28,0,0,0,.19,1.27,2.5,2.5,0,0,0-.22.24,1.08,1.08,0,0,0-.13.88.57.57,0,0,0-.75.41,1.41,1.41,0,0,0,0,1.07.74.74,0,0,0-.83,0,.61.61,0,0,0-.13.89.66.66,0,0,0,.95.22.71.71,0,0,0,.21-.88.75.75,0,0,0,.17.1,1.24,1.24,0,0,0,1.19-.63.6.6,0,0,0-.06-.38,1.28,1.28,0,0,0,1.28-.76,1.57,1.57,0,0,0,.08-.72,1,1,0,0,0,.44.25,1.44,1.44,0,0,0,1.55-1,1.15,1.15,0,0,0-.69-1.41,1.88,1.88,0,0,0-.53-.06.47.47,0,0,0,.26-.6.64.64,0,0,0-.64-.54c-.57,0-.62.46-.69.88l-.73.06c0-.34-.08-.64-.11-.95a4,4,0,0,0-.7-.29,1.51,1.51,0,0,0-.94.28.71.71,0,0,0-.41-.45,1.3,1.3,0,0,0-1.37.66.64.64,0,0,0,0,.2.93.93,0,0,0-.23-.21,1.77,1.77,0,0,0-.31-.3,1.71,1.71,0,0,0-1.58-.35.75.75,0,0,0-.41.37,1.33,1.33,0,0,0-.37-.09v-1.9l0-.06a.75.75,0,0,0,0-.47.9.9,0,0,0,.25-1.07,1.08,1.08,0,0,0-.28-.23c0-.42,0-.85,0-1.28a1.89,1.89,0,0,0,0-.75c0-.75,0-1.51,0-2.26.63-.33.65-.78,1.16-.92s.67-.54.65-1.18c0-.09,0-.19,0-.29.21.13.49.15.61,0a.76.76,0,0,0,0-.66.4.4,0,0,0-.7-.09l-.07.07a.78.78,0,0,0-.82-.55.91.91,0,0,0-.87.5c0-.47,0-.94,0-1.4.11-.12.23-.31.19-.45s-.1-.11-.19-.14c0-1.14,0-2.28,0-3.42L427,366c.27-.2.43-.78.21-1l-.4-.36c0-2.72-.08-5.53-.15-8.37h.17a.83.83,0,0,0-.11.45.59.59,0,0,0,.37.41c.44.07.66-.21.76-.65-.21-.23-.42-.49-.72-.42a.46.46,0,0,0,.06-.26,2,2,0,0,0-.27-.59.65.65,0,0,0-.28,0c-.11-4.65-.26-9.4-.42-14.15a1,1,0,0,0,.59-.94.78.78,0,0,0-.65-.84l-.15-4.44a.76.76,0,0,0,.34.11.58.58,0,0,0,.68-.55.78.78,0,0,0-.6-.79.62.62,0,0,0-.46.15c-.16-4.62-.31-9.16-.44-13.49a.71.71,0,0,0,.38.27.69.69,0,0,0,.74-.64.66.66,0,0,0-.64-.74,1,1,0,0,0-.52.05c-.3-8-1.4-7.26-2.15-6.35s-.9,10.95-.9,19.53c0,16.24-.24,32.47,0,47.29.07,4.32.31,11.87.39,16.64H289.13v-79h58.63a1.89,1.89,0,0,0,.78-.17l72.92-34.88,18.71,9.2,38.56,19q7.32,3.6,14.66,7.16l4.22,2.06a7.28,7.28,0,0,0,2.13.86,21,21,0,0,0,2.51,0h26.61c11.24,0,22.48.29,33.72.2.2,0,.41,0,.62,0a1.17,1.17,0,0,0,0-2.33c-9.6-.1-19.2-.16-28.8-.33l-33.93-.6-.37,0c.3.11.57.35,0,0l-.07,0c-.15,0-.3,0-.32,0s.15-.08.26,0c-.9-.53-1.88-1-2.82-1.43q-6.44-3.27-12.89-6.52l-38-19L430,282.31c-.52-.26-1-.54-1.55-.81h3.26l30.3.09,42.42.08c16.1,0,32.21.09,48.32.09H673.61l.48,0,1,.52L709,299.52l26.78,13.58Z" fill="#424854"/><path d="M91.61,144.62a20.08,20.08,0,0,1,20,20.06h-9.78A10.29,10.29,0,0,0,91.61,154.4Z" fill="#ff957d"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg b/x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg
new file mode 100644
index 0000000000000..0cddcb0af6909
--- /dev/null
+++ b/x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="400" viewBox="0 0 800 400"><defs><clipPath id="a"><rect x="256.95" y="139.77" width="216.16" height="119.98" fill="#00bfb3"/></clipPath><clipPath id="b"><path d="M639.21,279.81l-45.48.88-43.52-.59C535,267.81,526.28,252,526.28,230.94a67,67,0,1,1,112.93,48.87" fill="#fa744e"/></clipPath></defs><title>Kibana-integrations-lightmode</title><path d="M249.27,92.3c.4,0,.8,0,1.21,0a69.24,69.24,0,0,1,39,12,13.26,13.26,0,0,1,3.29-3.59,74,74,0,0,0-42.32-13.26c-.41,0-.81,0-1.21,0Z" fill="#dbe1e9"/><path d="M323.06,145.46a74.17,74.17,0,0,0-11.71-26.34,13.33,13.33,0,0,1-3.58,3.32A69.29,69.29,0,0,1,318.2,145.9" fill="#dbe1e9"/><circle cx="300.74" cy="111.25" r="10.12" fill="#dbe1e9"/><path d="M221.89,215.86A62.33,62.33,0,0,1,250.6,98.27V80.11a80.45,80.45,0,0,0-58.35,135.75Z" fill="#fec514"/><path d="M219.29,214.45a62.24,62.24,0,0,1-30.9-53.85H170.23a80.29,80.29,0,0,0,20.65,53.85Z" fill="#fa744e"/><path d="M278,374.91a.67.67,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.53-.38-.59-.77-.78C278,374.12,277.73,374.46,278,374.91Z" fill="#e6ebf2"/><path d="M275.58,380.29a12.72,12.72,0,0,0,.32-1.45.62.62,0,0,0-.57-.71.65.65,0,0,0-.75.51,2.06,2.06,0,0,1-.25.57,1,1,0,0,0,.05,1.32C274.71,380.93,275.13,380.91,275.58,380.29Z" fill="#e6ebf2"/><path d="M277.59,372.44a1.77,1.77,0,0,0,.15-.42.78.78,0,0,0,.58-.33,1,1,0,0,0-.13-1.24,1.25,1.25,0,0,0-1.44.14.81.81,0,0,0,.05.72.49.49,0,0,0-.14.11.81.81,0,0,0-.18.7C276.69,372.58,277.13,372.59,277.59,372.44Z" fill="#e6ebf2"/><path d="M277.23,368.14a.66.66,0,0,0,.68.21c.46-.12.49-.56.54-1-.38-.23-.74-.55-1.15-.17a.62.62,0,0,0-.09.12,1.63,1.63,0,0,0-1.14-.52.69.69,0,0,0-.59.77c0,.62.44,1.08.91,1A1.12,1.12,0,0,0,277.23,368.14Z" fill="#e6ebf2"/><path d="M274.27,376.23c-.23.27-.14.48.43.94a.61.61,0,0,0,.39-1A.64.64,0,0,0,274.27,376.23Z" fill="#e6ebf2"/><path d="M274.64,368.12a.72.72,0,0,0-.25-1,.66.66,0,0,0-.94.25c-.26.37-.26.73,0,.89A1.15,1.15,0,0,0,274.64,368.12Z" fill="#e6ebf2"/><path d="M273.26,366.33a.22.22,0,0,0-.08-.27c-.05,0-.21,0-.24.07s-.05.19,0,.24A.2.2,0,0,0,273.26,366.33Z" fill="#e6ebf2"/><path d="M278.38,334.6a.64.64,0,0,0,.77-.46.49.49,0,0,0-.42-.66.89.89,0,0,0-.65.23C278,333.87,278.09,334.52,278.38,334.6Z" fill="#e6ebf2"/><path d="M277.52,324.81c-.3-.1-.57.11-.66.47a.43.43,0,0,0,.43.56c.22,0,.81,0,.85-.28S277.74,324.88,277.52,324.81Z" fill="#e6ebf2"/><path d="M282.37,318.15c-.64-.23-1.34.23-1.63,1.09a1.14,1.14,0,0,0,.7,1.46,1.5,1.5,0,0,0,1.82-.83A1.58,1.58,0,0,0,282.37,318.15Z" fill="#e6ebf2"/><path d="M284.17,347.55a1.43,1.43,0,0,0-.52-1.33.94.94,0,0,0-1.19.68c-.15.42.17.85.75,1.05A.69.69,0,0,0,284.17,347.55Z" fill="#e6ebf2"/><path d="M277.22,338.22c.16-.11,0-.46-.05-.53a.47.47,0,0,0-.47-.08c-.13.08-.09.37,0,.48S277.06,338.33,277.22,338.22Z" fill="#e6ebf2"/><path d="M283.19,350.37a2.11,2.11,0,0,0,.4-.68c.07-.39-.38-.7-.81-.66a.62.62,0,0,0-.53.72A.82.82,0,0,0,283.19,350.37Z" fill="#e6ebf2"/><path d="M282.31,352a.58.58,0,0,0,.07-.34.78.78,0,0,0-.77-.62.69.69,0,0,0-.66.71.76.76,0,0,0,.81.67l.07,0a.45.45,0,0,0,.22.17.39.39,0,0,0,.43-.19A.36.36,0,0,0,282.31,352Z" fill="#e6ebf2"/><path d="M283.56,322.17a.66.66,0,0,0-.87.43.72.72,0,0,0,.48.86.66.66,0,0,0,.77-.48A.6.6,0,0,0,283.56,322.17Z" fill="#e6ebf2"/><path d="M281.17,339.12c0,.05.14.3.21.3s.43,0,.47-.25-.27-.35-.33-.33A.55.55,0,0,0,281.17,339.12Z" fill="#e6ebf2"/><path d="M276.57,348.84c0-.62-.52-1.24-1-1.21a1.05,1.05,0,0,0-.78,1.09,1,1,0,0,0,1,.82C276.31,349.52,276.57,349.28,276.57,348.84Z" fill="#e6ebf2"/><path d="M277.75,352.57a1.39,1.39,0,0,0-1-1.2,1.49,1.49,0,0,0-1.61.88,1.34,1.34,0,0,0,.77,1.65,1.6,1.6,0,0,0,.89-.16.31.31,0,0,0,0,.1c0,.64.61,1.08,1.44,1.05a1,1,0,0,0,1.07-1.09,1.38,1.38,0,0,0-1.43-1.25Z" fill="#e6ebf2"/><path d="M281,337.15a3.88,3.88,0,0,0-2.28-.31,1.15,1.15,0,0,0-.32.17.87.87,0,0,0,.24,1.57,5,5,0,0,0,1.43.31,1.35,1.35,0,0,0,1.22-1A.55.55,0,0,0,281,337.15Z" fill="#e6ebf2"/><path d="M282,342.25a.81.81,0,0,0,.41-1.17.7.7,0,0,0-1.17.12,1,1,0,0,0,.06.83A.79.79,0,0,0,282,342.25Z" fill="#e6ebf2"/><path d="M280.34,344.16a.85.85,0,0,0-.68-.75.67.67,0,0,0-.63.65.76.76,0,0,0,.66.75A.74.74,0,0,0,280.34,344.16Z" fill="#e6ebf2"/><path d="M281.13,346.64a.89.89,0,0,0,0-.66c-.17-.37-.49-.39-1.21-.14,0,.39-.21.84.32,1.07A.66.66,0,0,0,281.13,346.64Z" fill="#e6ebf2"/><path d="M272.79,361.36a1.23,1.23,0,0,0-1,1.22,1.33,1.33,0,0,0,1.5,1,.94.94,0,0,0,.88-1.07A1.2,1.2,0,0,0,272.79,361.36Z" fill="#e6ebf2"/><path d="M275.91,343.93a1,1,0,0,0-1.33.62,1.58,1.58,0,0,0,.84,1.81,1.17,1.17,0,0,0,1.37-.8A1.26,1.26,0,0,0,275.91,343.93Z" fill="#e6ebf2"/><path d="M269.84,355.06c0,.21.31.53.48.53s.44-.27.59-.37c0-.52-.27-.64-.55-.64S269.77,354.73,269.84,355.06Z" fill="#e6ebf2"/><path d="M271.71,368c.45,0,1-.38,1-.73a1.21,1.21,0,0,0-1-1.1,1,1,0,0,0-.23.05c0-.14,0-.31,0-.35s-.43.08-.53.18,0,.34,0,.36a.66.66,0,0,0,.15,0,1.13,1.13,0,0,0-.37.76C270.71,367.7,271,368,271.71,368Z" fill="#e6ebf2"/><path d="M270.25,349.58a.4.4,0,1,0,.8,0,.43.43,0,0,0-.44-.31A.37.37,0,0,0,270.25,349.58Z" fill="#e6ebf2"/><path d="M279.48,348.08a.76.76,0,0,0,.42,1.41c.55-.07.8-.79.77-1A1,1,0,0,0,279.48,348.08Z" fill="#e6ebf2"/><path d="M273.05,369.5a.45.45,0,0,0-.14-.47c-.13-.07-.39-.21-.48-.06a.5.5,0,0,0,.05.48C272.57,369.53,273,369.65,273.05,369.5Z" fill="#e6ebf2"/><path d="M271.44,351.81a.47.47,0,0,0-.35.33c0,.13.14.51.31.48s.3-.29.28-.39S271.6,351.79,271.44,351.81Z" fill="#e6ebf2"/><path d="M271,340c-.19,0-.7-.05-.79.35s.36.53.53.56a.65.65,0,0,0,.55-.27A.43.43,0,0,0,271,340Z" fill="#e6ebf2"/><path d="M269.14,385c-.5-.35-.86-.35-1.11,0a.87.87,0,0,0,.09,1.29,1.48,1.48,0,0,0,1.33-.31C269.7,385.64,269.58,385.29,269.14,385Z" fill="#e6ebf2"/><path d="M269.06,383.78a.72.72,0,0,0,.49-.78.54.54,0,0,0-.48-.56c-.53-.08-.75.27-1,.71C268.39,383.52,268.56,384,269.06,383.78Z" fill="#e6ebf2"/><path d="M270.42,377.69a1.13,1.13,0,0,0-.21-1.66,1,1,0,0,0-.48-.21.63.63,0,0,0-.67,0,1.2,1.2,0,0,0-.73.44,1.49,1.49,0,0,0,.28,1.82A1.26,1.26,0,0,0,270.42,377.69Z" fill="#e6ebf2"/><path d="M269.39,390.87a.88.88,0,0,0,0-1.09c-.54-.45-1.18-.53-1.47-.17a1.15,1.15,0,0,0,.18,1.42A1,1,0,0,0,269.39,390.87Z" fill="#e6ebf2"/><path d="M280.22,382.94c.16.19.32.37.53.36a.65.65,0,0,0,.56-.24c.13-.13.33-.22.41-.51a1.44,1.44,0,0,0-.22-1.24,1.09,1.09,0,0,0-1.07-.37.94.94,0,0,0-.65.65A1.19,1.19,0,0,1,279,381a1.1,1.1,0,0,0-1.26-.1,1.42,1.42,0,0,0-.11,1.47c.19.26.41.64.79.48a1.62,1.62,0,0,1,1.38.07A.59.59,0,0,0,280.22,382.94Z" fill="#e6ebf2"/><path d="M266.52,375c0,.05,0,.34,0,.36a.51.51,0,0,0,.45,0,.39.39,0,0,0,0-.54C266.86,374.65,266.63,374.94,266.52,375Z" fill="#e6ebf2"/><path d="M265.64,380a1,1,0,0,0-1.15.2,1.61,1.61,0,0,0,.16,1.6,1.19,1.19,0,0,0,1.41-.52C266.37,380.8,266.21,380.34,265.64,380Z" fill="#e6ebf2"/><path d="M266.1,382.37c0,.22,0,.66.16.71a.7.7,0,0,0,.62-.19c.09-.13.1-.67-.06-.77A.82.82,0,0,0,266.1,382.37Z" fill="#e6ebf2"/><path d="M285.63,321.2a.61.61,0,0,0,.74-.51.71.71,0,0,0-.54-.83.55.55,0,0,0-.66.47A.68.68,0,0,0,285.63,321.2Z" fill="#e6ebf2"/><path d="M284.42,330a1.22,1.22,0,0,0,.72,1.41c.34.1.82-.29,1-.78a.9.9,0,0,0-.43-1.15A1.15,1.15,0,0,0,284.42,330Z" fill="#e6ebf2"/><path d="M284.33,395.33c0,.05,0,.1,0,.15a.27.27,0,0,0,.29.26,1.48,1.48,0,0,0,.78.32.67.67,0,0,0,.76-.5,1.12,1.12,0,0,0-.45-1.35,1.34,1.34,0,0,0-.24-.12l-.07,0c-.26.11-.53.21-.79.33a.46.46,0,0,0-.36.14.39.39,0,0,0-.05.3.65.65,0,0,0,0,.24A1,1,0,0,0,284.33,395.33Z" fill="#e6ebf2"/><path d="M285,340a.64.64,0,0,0,.2,0,1.27,1.27,0,0,0-.37.46,2.16,2.16,0,0,0-.1,1.5,1,1,0,0,1,0,.56.89.89,0,0,0,.6,1.37.49.49,0,0,0-.13.23.79.79,0,0,0,.66.77.8.8,0,0,0,1-.49.69.69,0,0,0-.55-.81h0a1.25,1.25,0,0,0,.21-.65,1.31,1.31,0,0,1,.31-.91,1.45,1.45,0,0,0,.19-1.38,1.23,1.23,0,0,0-1.09-.83h-.14a1.19,1.19,0,0,0,.56-.68c.1-.42-.23-.83-.83-1a1,1,0,0,0-1.16.45A1.29,1.29,0,0,0,285,340Z" fill="#e6ebf2"/><path d="M286.48,393.78a4.83,4.83,0,0,0,.56-.27,1,1,0,0,0,.58-1.13,1.45,1.45,0,0,0-.95-1.22,1,1,0,0,0-1.36.9,1.49,1.49,0,0,0,1.09,1.74Z" fill="#e6ebf2"/><path d="M287.54,373.3a.75.75,0,0,0-1,.18.73.73,0,0,0,.23,1,.69.69,0,0,0,.93-.29A.57.57,0,0,0,287.54,373.3Z" fill="#e6ebf2"/><path d="M286.83,356.82a1.24,1.24,0,0,0,.47-.74,1.86,1.86,0,0,0,.05-.27c.08-.62-.17-.92-.8-.92s-1,0-1.26.83a2.91,2.91,0,0,1-.35-.68.66.66,0,0,0-.67-.61,1,1,0,0,0-1,.45c-.66,1.27-.57,1.68.58,2.52l.07.08h0a1.57,1.57,0,0,0-.51-.21.42.42,0,0,0-.52.25h0a.34.34,0,0,0-.35.17c0,.13.14.31.26.39a.2.2,0,0,0,.14,0,.47.47,0,0,0,.41.25,1.35,1.35,0,0,0,.62-.3c.08.38.29.58.63.57a.66.66,0,0,0,.5-.25c.11.45.75.51,1.07.3s.26-.11.63.08,1,.22,1.13-.52A1.38,1.38,0,0,0,286.83,356.82Zm-1.63.86v0c-.15-.45.1-.67.32-1a2.37,2.37,0,0,0,.55.25A2,2,0,0,0,285.2,357.68Z" fill="#e6ebf2"/><path d="M277.2,334.59a1.08,1.08,0,0,0-.33-.73c-.21-.18-.7.12-.72.45a1.23,1.23,0,0,0,.19.55C276.83,335,277.21,334.88,277.2,334.59Z" fill="#e6ebf2"/><path d="M275.16,319.08a.84.84,0,0,0-1,.46c-.09.33.26.8.86,1,.11-.08.39-.17.48-.35A.84.84,0,0,0,275.16,319.08Z" fill="#e6ebf2"/><path d="M275.21,341.05c.1.5.53.35.74.47a1.24,1.24,0,0,0,1.25,0,1.63,1.63,0,0,0,1.3-.45c.11-.29-.44-.69-1-.62l0,0a1.26,1.26,0,0,0-.35-.46.78.78,0,0,0-1.09,0C275.78,340.24,275.11,340.55,275.21,341.05Z" fill="#e6ebf2"/><path d="M274.29,339.54c.36.22,1.13-.33,1.07-.63s-1-.6-1.21-.26A.7.7,0,0,0,274.29,339.54Z" fill="#e6ebf2"/><path d="M274.25,327.78c.1,0,.24,0,.28-.08s-.07-.14-.11-.23-.2.06-.24.12S274.23,327.78,274.25,327.78Z" fill="#e6ebf2"/><path d="M277.72,328.49a.85.85,0,0,0-.49-1.11,1.13,1.13,0,0,0-1.37.59,1.21,1.21,0,0,0,.7,1.34C276.93,329.43,277.55,329,277.72,328.49Z" fill="#e6ebf2"/><path d="M276.44,322c-.26-.15-.72.18-.7.49s.17.38.22.48c.47.1.83-.11.8-.41A.77.77,0,0,0,276.44,322Z" fill="#e6ebf2"/><path d="M277.24,320.42c-.33-.09-.69.11-.67.4s0,.74.39.77.62-.4.71-.62S277.52,320.49,277.24,320.42Z" fill="#e6ebf2"/><path d="M272.82,333.07c.14.06.55.13.68-.15s-.27-.51-.41-.55-.45,0-.53.2A.45.45,0,0,0,272.82,333.07Z" fill="#e6ebf2"/><path d="M270.52,321.56a.64.64,0,0,0-.82.5.6.6,0,0,0,.39.79c.43.11,1-.11,1.11-.41S270.86,321.67,270.52,321.56Z" fill="#e6ebf2"/><path d="M269.41,371.86a.39.39,0,0,0-.62.1.56.56,0,0,0,0,.81.74.74,0,0,0,.68.07.93.93,0,0,0,.59.88,5.36,5.36,0,0,0,.88.25c.05.13.1.28.16.41a1.39,1.39,0,0,0,1.32.8,1.6,1.6,0,0,0,1.19-1,.81.81,0,0,0,0-.61,1.27,1.27,0,0,0-1.67-.64l-.42.16a7.91,7.91,0,0,0-.29-.78.66.66,0,0,0-.95-.43,1.08,1.08,0,0,0-.56.38A1.05,1.05,0,0,0,269.41,371.86Z" fill="#e6ebf2"/><path d="M266.48,366.21a1.12,1.12,0,0,0,.82,1.08c.43,0,.82-.48.86-1.12a.81.81,0,0,0-.7-.72A1,1,0,0,0,266.48,366.21Z" fill="#e6ebf2"/><path d="M271.23,334.23c-.18.47-.14.84.5.92s.85-.84.64-1.06S271.36,333.9,271.23,334.23Z" fill="#e6ebf2"/><path d="M266.57,368.9a.7.7,0,0,0,.9-.08.67.67,0,0,0-.15-1,.54.54,0,0,0-.86.08A.68.68,0,0,0,266.57,368.9Z" fill="#e6ebf2"/><path d="M272.25,347.55a.58.58,0,0,0-.26.47c0,.11.31.41.51.37s.29-.51.24-.63A.53.53,0,0,0,272.25,347.55Z" fill="#e6ebf2"/><path d="M273,344a.73.73,0,0,0,.64.67.62.62,0,0,0,.66-.6.7.7,0,0,0-.64-.66C273.32,343.39,273,343.69,273,344Z" fill="#e6ebf2"/><path d="M270.25,381.14a1.28,1.28,0,0,0,2.52-.17c0-.5-.67-.9-1.38-1A1.24,1.24,0,0,0,270.25,381.14Z" fill="#e6ebf2"/><path d="M260.92,384c-.26-.24-1,.19-1.18.41a.77.77,0,0,0,0,.91c.25.24.76,0,1-.17S261.17,384.23,260.92,384Z" fill="#e6ebf2"/><path d="M261.78,382c.1-.23.23-.84,0-1s-.73.26-.9.44a.41.41,0,0,0,.18.67C261.35,382.26,261.66,382.31,261.78,382Z" fill="#e6ebf2"/><path d="M260.13,392.4a.81.81,0,0,0-.09-1.07.66.66,0,0,0-.9.07.69.69,0,0,0,0,1A.77.77,0,0,0,260.13,392.4Z" fill="#e6ebf2"/><path d="M261,385a.21.21,0,0,0,.29,0,.22.22,0,0,0-.07-.27c-.05,0-.21,0-.24.08A.21.21,0,0,0,261,385Z" fill="#e6ebf2"/><path d="M262.11,388.48a1.15,1.15,0,0,0-.09-1.43.79.79,0,0,0-1.07.09,1,1,0,0,0,.17,1.32A.68.68,0,0,0,262.11,388.48Z" fill="#e6ebf2"/><path d="M258.82,389.77a.86.86,0,0,0,.12-.43.38.38,0,0,0,.1.12c.25.19.53.33.81.06a.83.83,0,0,0-.14-1,.79.79,0,0,0-.67.25.7.7,0,0,0-.15.2,1.15,1.15,0,0,0-.46-.66,1.07,1.07,0,0,0-1.12,1.82A1.1,1.1,0,0,0,258.82,389.77Z" fill="#e6ebf2"/><path d="M257.77,381.74c.1-.13-.06-.47-.16-.54a.39.39,0,0,0-.47,0c-.11.13,0,.37.07.46S257.67,381.87,257.77,381.74Z" fill="#e6ebf2"/><path d="M259.62,376.17c.11-.2.23-.77.07-.88s-.67.1-.87.23-.17.52.12.77A.41.41,0,0,0,259.62,376.17Z" fill="#e6ebf2"/><path d="M257,394.25c-.21.18-.07.62.21.78s.57.16.7-.14.24-.86,0-1S257.21,394.09,257,394.25Z" fill="#e6ebf2"/><path d="M267.89,360.85a.81.81,0,0,0,.42.51c.52.16.78-.19,1-.71-.29-.33-.49-.72-1-.54A.61.61,0,0,0,267.89,360.85Z" fill="#e6ebf2"/><path d="M268.2,348.07a.53.53,0,0,0,.28.35.39.39,0,0,0,.45-.3c0-.28-.33-.28-.47-.3S268.18,348,268.2,348.07Z" fill="#e6ebf2"/><path d="M273.6,326.14c-.35-.15-.71.32-1,.45v.22a.65.65,0,0,0,.62.47.88.88,0,0,0,.59-.08C273.75,326.89,273.94,326.29,273.6,326.14Z" fill="#e6ebf2"/><path d="M263,384.06a.77.77,0,0,0,1-.15.81.81,0,0,0-.21-1.05.63.63,0,0,0-.88.16A.69.69,0,0,0,263,384.06Z" fill="#e6ebf2"/><path d="M268.37,331.43a.44.44,0,0,0-.35.25.49.49,0,0,0,.23.4c.11,0,.43,0,.49-.25S268.5,331.46,268.37,331.43Z" fill="#e6ebf2"/><path d="M262.54,368.57c-.12.1-.24.62-.1.73s.61,0,.67-.15.16-.51.05-.62S262.66,368.46,262.54,368.57Z" fill="#e6ebf2"/><path d="M262.09,394c-.11-.07-.45.07-.59.21a.35.35,0,0,0,.11.59c.21.07.76.23.91,0S262.27,394.1,262.09,394Z" fill="#e6ebf2"/><path d="M279.82,386.27a.25.25,0,0,0-.13-.12c-.6-.07-.61-.58-.78-1a.69.69,0,0,0-1.1-.36.57.57,0,0,0-.13.08.64.64,0,0,0-.19-.27,1.09,1.09,0,0,0-.34-.17.41.41,0,0,0-.29-.52c-.47-.11-.95-.38-1.48-.12l-.26.63-.17.07a1.15,1.15,0,0,0-.3-.72v0a1.32,1.32,0,0,0,1-.58,1.34,1.34,0,0,0-.43-1.69,1.13,1.13,0,0,0-1.48.24,1.76,1.76,0,0,0,.15,1.67.75.75,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.11-1.53.31-.77,1.18-.25,1.5a2.35,2.35,0,0,0,1.59.2c.44,0,.53-.6.9-.23a1.85,1.85,0,0,0,1.16.61.66.66,0,0,0,.52.4c.57.09.77-.05,1.05-.68l.49-.18,0,0a3.27,3.27,0,0,0,.42.51.72.72,0,0,0,.7.17,1,1,0,0,0,.38.61c.27.21.58.34.5.86-.12.06-.28.1-.4.16a.24.24,0,0,0,0-.17c0-.13-.1-.41-.34-.43s-.28.35-.25.41.13.32.34.31l.09,0,0,0a1.2,1.2,0,0,0-.18.83c.08.33.43.37.76.27l.76-.19A1.92,1.92,0,0,0,279.82,386.27Z" fill="#e6ebf2"/><path d="M263.84,390.37a1.26,1.26,0,0,0-1.79,1.72,1,1,0,0,0-.48,1.5,1.35,1.35,0,0,0,1.68-.14.72.72,0,0,0,0-.78.94.94,0,0,0,.7-.29A1.69,1.69,0,0,0,263.84,390.37Z" fill="#e6ebf2"/><path d="M274.33,392.83a.22.22,0,0,0,0-.28.26.26,0,0,0-.25.05.2.2,0,0,0,0,.24A.2.2,0,0,0,274.33,392.83Z" fill="#e6ebf2"/><path d="M272.69,393.5a.79.79,0,0,0,.28.6.65.65,0,0,0,.91-.14c.32-.39,0-.88-.2-1.07S272.77,393,272.69,393.5Z" fill="#e6ebf2"/><path d="M282.51,390.7a.61.61,0,0,0-.64.6.54.54,0,0,0,.6.53.49.49,0,0,0,.52-.51A.53.53,0,0,0,282.51,390.7Z" fill="#e6ebf2"/><path d="M311.13,396.91c-.19,0-.19.42-.14.52a.46.46,0,0,0,.41.23c.16,0,.21-.31.19-.44S311.32,396.86,311.13,396.91Z" fill="#e6ebf2"/><path d="M330,213.63H115.9a1.89,1.89,0,0,0-1,.3L71.72,242.47a1.81,1.81,0,0,0,1,3.33h41.74V375.71c0,7.37-.25,14.79,0,22.16v.31a1.84,1.84,0,0,0,1.81,1.82h172l-.7-3.63h-4a1.21,1.21,0,0,0,.15-1.18c-.23-.45-.94-.76-.94-1s.76-.66.66-1.33a1.15,1.15,0,0,0-1.28-.93c-.5,0-1.17.72-1.34,1.27a1,1,0,0,0-.59.33c-.06.29-.21.66,0,.92s.57,0,.63-.14A1.59,1.59,0,0,0,281,394c.19.18.43.28.45.37s-.69.68-.65,1.35a1.2,1.2,0,0,0,.32.66H279a.76.76,0,0,0-.25-.16,1.9,1.9,0,0,0-1,.09s-.06.05-.1.07h-3.15a.8.8,0,0,0-1.5-.53.62.62,0,0,0-.05.53h-.65a.73.73,0,0,0-.16-.14,6.64,6.64,0,0,0,.28-.86,1.39,1.39,0,0,0-.86-1.36.85.85,0,0,0-1,.29l-.06-.12c.89-1.1.84-1.58-.31-2.1a1,1,0,0,0-1.39.74,8.59,8.59,0,0,0,.16,1.72c-.49.39-1,.89-.87,1.63,0,.07.05.13.07.2h-3.34l0,0A1.5,1.5,0,0,0,265,396a1,1,0,0,0,.86-.41.74.74,0,0,0,.09-1.06,1.46,1.46,0,0,0-1.52-.07,1,1,0,0,0-.21.4,1.06,1.06,0,0,0-.9.31,1.28,1.28,0,0,0,0,1.19h-1.79a1.31,1.31,0,0,0-.3-1,1.19,1.19,0,0,0-1.34.14.93.93,0,0,0-.16.87h-3.82l-.08-.05,0,.05h-5.72a.63.63,0,0,0-.14-.46c-.17-.23-.92-.17-1,.1a.56.56,0,0,0,0,.36h-4.39a.34.34,0,0,0-.06-.21c-.18-.22-.43,0-.55.12s0,.05,0,.09h-6.82c.08-.23.14-.5,0-.58s-.68,0-.89.13a.36.36,0,0,0-.15.45h-12.6a.19.19,0,0,0-.16,0l0,0h-2.95c0-.07,0-.14,0-.2a.28.28,0,0,0-.23-.35.86.86,0,0,0-.78.55h-8.83a1.07,1.07,0,0,0-.59-.46,1,1,0,0,0-1.2.46h-3.64a.62.62,0,0,0-.67,0h-2.23a1.12,1.12,0,0,0,.33-.45c.1-.3-.12-.57-.47-.65a.43.43,0,0,0-.56.44,1.33,1.33,0,0,0,.09.66h-7.78a1.67,1.67,0,0,0-.28-.5.86.86,0,0,0-.38-.27.91.91,0,0,0,.33-.24c.17-.21-.13-.7-.46-.72a1.22,1.22,0,0,0-.54.2.86.86,0,0,0,0,.68,1.27,1.27,0,0,0-.62.23,1.06,1.06,0,0,0-.42.62h-.58a1.51,1.51,0,0,0,0-2,1.43,1.43,0,0,0-2-.25,1.21,1.21,0,0,0-.13,1.84,2.47,2.47,0,0,0,.4.44h-2.22a.72.72,0,0,0,0-.29c-.07-.53-.79-.52-1-.4s-.08.38,0,.69H118.09v-20.8a.29.29,0,0,0,0-.18V245.8h21a1.86,1.86,0,0,0,1-.28l42.8-27.2c0,9.28-.09,18.55-.07,27.83,0,13.3.76,26.53,1.35,39.81.12,2.85.28,6.31.28,8.89a.45.45,0,0,0,.89,0c0-7.74.67-16.36,1.07-24.35.69-13.77.69-27.59.58-41.38,0-4-.08-7.9-.09-11.86H328.21v62l3.63.14V215.45A1.81,1.81,0,0,0,330,213.63ZM138.61,242.17H78.76l37.69-24.91h61.36Z" fill="#e6ebf2"/><path d="M284.64,390.89a1.29,1.29,0,0,0,.33-.33.74.74,0,0,0,.36-.69,1.11,1.11,0,0,0-.07-.26,1.75,1.75,0,0,0-.33-1,2.57,2.57,0,0,0-1.08-.78c0-.05,0-.09,0-.14,0-.52-.39-.78-1-.73a.88.88,0,0,0-.61.28l-.24.08a.48.48,0,0,0-.18-.59.77.77,0,0,0-.65.15.41.41,0,0,0,.11.7l.08.05a.77.77,0,0,0-.31.94c.29.83.88.75,1.12.64s.77.09.55.3-.23.58.28,1.14A1.12,1.12,0,0,0,284.64,390.89Z" fill="#e6ebf2"/><path d="M279.63,391.14c-.2-.37-.53-.44-1-.42-1.08,0-1.43.39-1.36,1.36,0,.69.06,1.37.09,2a1.36,1.36,0,0,0-1.61.11c-.08-.18-.22-.37-.32-.57-.56.08-1,.17-1.06.76a.57.57,0,0,0,.47.67,1.2,1.2,0,0,0,.75-.14,1.14,1.14,0,0,0,.37.62,1.34,1.34,0,0,0,.23.13v0h0a.85.85,0,0,0,.83-.08,1.3,1.3,0,0,0,.18-.15l.07-.07s0,0,0,0a1.18,1.18,0,0,0,.2-.31s0,0,0,0,.06-.1.08-.16c1.86.07,2.4-.8,1.6-2.4a2,2,0,0,1,.23-.28A.74.74,0,0,0,279.63,391.14Z" fill="#e6ebf2"/><path d="M267,392.27c-.2.3-.46.62-.12,1a.82.82,0,0,0,.66.06.6.6,0,0,0,.29-.47C267.82,392.38,267.49,392.24,267,392.27Z" fill="#e6ebf2"/><path d="M267,394.35a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11c.13-.12.31-.58.16-.75S267.13,394.25,267,394.35Z" fill="#e6ebf2"/><path d="M275,389.45c.47.35.83.26,1.22-.29a.61.61,0,0,0,.07-.14c.34-.11.64-.41.58-.69s-.9-.59-1.31-.48a2.31,2.31,0,0,0-.37,0,.79.79,0,0,0-.57-.11.61.61,0,0,0-.13.85A1.35,1.35,0,0,0,275,389.45Z" fill="#e6ebf2"/><path d="M265.8,390.14c.1-.32.14-.67.22-1,.74-.41,1.1-1,.86-1.43a1.41,1.41,0,0,0-1.63-.43l-.07,0a.73.73,0,0,0-.16-.76.76.76,0,0,0-1,.08.81.81,0,0,0,.08,1,.62.62,0,0,0,.75.09,2.43,2.43,0,0,0,.35,1.22c-.39.24-.84.43-.58,1a.79.79,0,0,0,.49.46.61.61,0,0,0-.72.11.67.67,0,0,0,0,.9.69.69,0,0,0,1,0,.54.54,0,0,0,0-.86.94.94,0,0,0-.24-.18.7.7,0,0,0,.29,0C265.56,390.34,265.76,390.25,265.8,390.14Z" fill="#e6ebf2"/><path d="M275.43,390.63A2,2,0,0,0,275,392c.16.73.21.79,1,.77.2-.31.35-.56.52-.8a1.11,1.11,0,0,0-.18-1.39C276.16,390.36,275.56,390.36,275.43,390.63Z" fill="#e6ebf2"/><path d="M269.88,390a4.42,4.42,0,0,0,0,.63c0,.7.31,1.06.86,1.11a1.09,1.09,0,0,0,1.19-1,12,12,0,0,1,.44-2c.19-.52,0-1.26-.32-1.37a.8.8,0,0,0-.83.52.56.56,0,0,1-.24.44.69.69,0,0,0-1,.11.74.74,0,0,0,0,.88l0,0A1.58,1.58,0,0,0,269.88,390Z" fill="#e6ebf2"/><path d="M278.51,331.73a1.21,1.21,0,0,0,1.82,0c.72-.7-.13-1.31.48-1.57s.59.4,1.42,0,.95-1.41.38-1.74-1.05,0-1.16-.11-.44-.74-.9-.49c-1,.53-.28,1.29-.52,1.53s-.93.37-1.32.71A1.1,1.1,0,0,0,278.51,331.73Z" fill="#e6ebf2"/><path d="M285.75,375.94a1,1,0,0,0-.5-.17.86.86,0,0,0-.51-.29,1.3,1.3,0,0,0-1.53,1,4.43,4.43,0,0,0,.55.68,1.11,1.11,0,0,0,.48.22.7.7,0,0,0,.13.16,1.56,1.56,0,0,0,1.65-.24A1.08,1.08,0,0,0,285.75,375.94Z" fill="#e6ebf2"/><path d="M272.6,355.9a1.54,1.54,0,0,1-.17-.19.61.61,0,0,0-.81-.23.66.66,0,0,0-.45.62c-.12.73.09,1,.84,1.07.56.05,1.12.13,1.67.19,0,1,.05,1.12.93,1,.23-.49.05-.82-.42-1.07C274.51,356,273.93,355.54,272.6,355.9Z" fill="#e6ebf2"/><path d="M274.85,371.64a.87.87,0,0,0,.8-.92c0-.54-.45-1.23-.86-1.24a1.21,1.21,0,0,0-1.19,1A1.25,1.25,0,0,0,274.85,371.64Z" fill="#e6ebf2"/><path d="M282,336.42a.71.71,0,0,0,.91-.1.53.53,0,0,0,.2-.57.72.72,0,0,0,.76-.53,1.39,1.39,0,0,0-.85-1.46,1,1,0,0,0-1,.79,1.07,1.07,0,0,0,.06.7l-.2,0C281.75,335.72,281.52,336.13,282,336.42Z" fill="#e6ebf2"/><path d="M282.58,324.41c-.32-.24-1,.34-1.1,1a.68.68,0,0,0,.5.77c.46.17,1.09,0,1.23-.32C283.5,325.14,282.9,324.65,282.58,324.41Z" fill="#e6ebf2"/><path d="M273.36,379.56c.14,0,.48-.05.49-.25s-.3-.31-.38-.29-.36,0-.37.26A.25.25,0,0,0,273.36,379.56Z" fill="#e6ebf2"/><path d="M273.43,376.74c0-.21-.21-.32-.39-.45a.89.89,0,0,0-.53-.24c-.26,0-.31.35-.15.61a1.07,1.07,0,0,0,.71.44A.32.32,0,0,0,273.43,376.74Z" fill="#e6ebf2"/><path d="M287.29,348.87a1.19,1.19,0,0,0-1-1.09,1.26,1.26,0,0,0-1,1.11.85.85,0,0,0,.56.67c0,.29.12.55.4.54a2.27,2.27,0,0,0,.62-.19.78.78,0,0,0,0-.34A.69.69,0,0,0,287.29,348.87Z" fill="#e6ebf2"/><path d="M272.15,379.11c.46-.16.36-.55.28-.91-.38-.2-.74-.23-1,.16a.57.57,0,0,0,.07.55A.73.73,0,0,0,272.15,379.11Z" fill="#e6ebf2"/><path d="M282.22,369.39a.81.81,0,0,0-.22-1.05.64.64,0,0,0-.88.16.7.7,0,0,0,.12,1A.77.77,0,0,0,282.22,369.39Z" fill="#e6ebf2"/><path d="M280.76,367a1.26,1.26,0,0,0,1.29-1.16,2,2,0,0,0-1.47-1.47,1.27,1.27,0,0,0-1.13,1.32A1.51,1.51,0,0,0,280.76,367Z" fill="#e6ebf2"/><path d="M279.44,377.41a.78.78,0,0,0-.18-1c-.47-.28-.84,0-1.21.23a3.62,3.62,0,0,0,.05.4.46.46,0,0,0-.53.23c-.31.47,0,.73.11.81s.21.31.13.37a.65.65,0,0,0-.76.32c-.42.62-.41,1,0,1.36a1.17,1.17,0,0,0,1.09-.1,1.11,1.11,0,0,0,.91-.79c.16-.56-.14-.75,0-1.1a.53.53,0,0,0,0-.41A.72.72,0,0,0,279.44,377.41Z" fill="#e6ebf2"/><path d="M281,361.45h0a.79.79,0,0,0-.74.68c0,.32.46.85.73.84a.94.94,0,0,0,.7-.6,1.59,1.59,0,0,0,.43-.27c.15-.14.29-.94,0-1.15S281.15,361.2,281,361.45Z" fill="#e6ebf2"/><path d="M277.77,364.82a1.21,1.21,0,0,0,1.35-1.37,1.35,1.35,0,0,0-1.43-1.25,1.49,1.49,0,0,0-1.06,1,.27.27,0,0,0-.08-.1.32.32,0,0,0-.41.49.63.63,0,0,0,.4.12v0A1.1,1.1,0,0,0,277.77,364.82Z" fill="#e6ebf2"/><path d="M284,342.73c0-.25-.6-.46-.85-.51s-.53.31-.49.63h0l0,0a.74.74,0,0,0-.9.42.81.81,0,0,0,.45,1,.69.69,0,0,0,.84-.49,1,1,0,0,0,0-.41.33.33,0,0,0,.17,0C283.4,343.25,284,343,284,342.73Z" fill="#e6ebf2"/><path d="M276.7,358.54c.43,0,.5-.58.58-.83s-.21-.54-.57-.54-.62.19-.53.54S276.28,358.54,276.7,358.54Z" fill="#e6ebf2"/><path d="M280.52,360.1a1,1,0,0,0-.91-1,1.18,1.18,0,0,0-1.13,1c0,.37.86.93,1.33.88A1,1,0,0,0,280.52,360.1Z" fill="#e6ebf2"/><path d="M282.24,372c-.17-.47.05-.93-.29-1.29a2.09,2.09,0,0,0-2.47-.48,1.68,1.68,0,0,0-1,1.25c-.09.58.59.9.74,1.5.34,1.41,1.43,1.34,2.33.94a1.46,1.46,0,0,0,.69-.65h0a.69.69,0,0,0,.19.35,1.46,1.46,0,0,0,1.19.33,1.49,1.49,0,0,0,1,.8,1.24,1.24,0,0,0,1.35-.93,1.14,1.14,0,0,0-.88-1.54,1.69,1.69,0,0,0-1.19.25.91.91,0,0,0-.23-.28,1.19,1.19,0,0,0-1.29.28A2.59,2.59,0,0,0,282.24,372Z" fill="#e6ebf2"/><path d="M283.56,380.1a1.26,1.26,0,0,0,.32,1.63,1.27,1.27,0,0,0,1.5-2A1.23,1.23,0,0,0,283.56,380.1Z" fill="#e6ebf2"/><path d="M281.29,354c-.38,0-1.15.72-1.15,1a1,1,0,0,0,1.13.91c.49,0,.75-.4.73-1.07S281.69,354,281.29,354Z" fill="#e6ebf2"/><path d="M282.89,378.39c0-.19,0-.31-.25-.33s-.31.05-.33.25a.25.25,0,0,0,.26.33C282.76,378.65,282.86,378.59,282.89,378.39Z" fill="#e6ebf2"/><path d="M283.09,385.07a1.08,1.08,0,0,0,1,.2,1.33,1.33,0,0,0,.65.13c.55,0,.81-.44.75-1.12a.74.74,0,0,0-.19-.4,1.16,1.16,0,0,0-.44-1.27,1.47,1.47,0,0,0-2.09.43A1.43,1.43,0,0,0,283.09,385.07Z" fill="#e6ebf2"/><path d="M280.78,376c-.33.5-.31.94,0,1.16a.75.75,0,0,0,1.1-.2.64.64,0,0,0-.28-.91C281.3,375.88,281,375.71,280.78,376Z" fill="#e6ebf2"/><path d="M282.37,380.15c.22-.27,0-.95-.35-1.18a.59.59,0,0,0-.85.25c-.36.52-.41.93-.13,1.15A1.12,1.12,0,0,0,282.37,380.15Z" fill="#e6ebf2"/><path d="M282.35,374.72a2,2,0,0,0-.64-.35c-.32-.06-.5.19-.49.5s.07.55.43.58A.73.73,0,0,0,282.35,374.72Z" fill="#e6ebf2"/><path d="M286.69,360.41a.72.72,0,0,0-.68.8.87.87,0,0,0,.81.72c.29,0,.75-.64.72-1S287,360.39,286.69,360.41Z" fill="#e6ebf2"/><path d="M280.63,323.18a.87.87,0,0,0-.47-.91c-.65-.2-1.28,0-1.4.45a1.22,1.22,0,0,0,.76,1.22A1.14,1.14,0,0,0,280.63,323.18Z" fill="#e6ebf2"/><path d="M285.21,361.89a1,1,0,1,0,.14,1.95l.07,0a.75.75,0,0,0,.23.36.61.61,0,0,0,.88-.11.76.76,0,0,0-.1-1.06.65.65,0,0,0-.39-.09,2.11,2.11,0,0,0,0-.36A.9.9,0,0,0,285.21,361.89Z" fill="#e6ebf2"/><path d="M285.46,387.69a1.49,1.49,0,0,1,.86.42A.69.69,0,0,0,287,388a.82.82,0,0,0,.18-.65c0-.13-.29-.3-.46-.33a6.39,6.39,0,0,0-1.07,0c-.31,0-.42.2-.4.53C285.28,387.55,285.37,387.69,285.46,387.69Z" fill="#e6ebf2"/><path d="M283.14,367.83c-.45.21-.45,1-.16,1.68a1,1,0,0,0,.57.45.59.59,0,0,0,.23.45,1.34,1.34,0,0,0,1.65-.32.84.84,0,0,0-.33-1.1s-.09,0-.14-.07a1.08,1.08,0,0,0-.29-.76A1.27,1.27,0,0,0,283.14,367.83Z" fill="#e6ebf2"/><path d="M287.28,367.81a.53.53,0,0,0-.06-.86.66.66,0,0,0-1,0,.67.67,0,0,0,.05.9A.7.7,0,0,0,287.28,367.81Z" fill="#e6ebf2"/><path d="M287.44,382.32a.95.95,0,1,0-1.88.2.8.8,0,0,0,.76.64C287,383.1,287.47,382.77,287.44,382.32Z" fill="#e6ebf2"/><path d="M286.73,377.94c-.39,0-1.11.72-1.09,1.07a.89.89,0,0,0,1,.82c.6,0,.83-.25.82-.93S287.17,377.92,286.73,377.94Z" fill="#e6ebf2"/><path d="M274.73,373.64a.46.46,0,0,0-.15-.75c-.22-.07-.47-.16-.64,0s-.11.8.19,1S274.58,373.84,274.73,373.64Z" fill="#e6ebf2"/><path d="M190.68,330.55a.67.67,0,0,0-.82.52.69.69,0,0,0,.47.77.67.67,0,0,0,.8-.56A.53.53,0,0,0,190.68,330.55Z" fill="#e6ebf2"/><path d="M189.58,344a.66.66,0,0,0,.06.63,1,1,0,0,0,.79.25c.52-.14.35-.6.35-1C190.28,343.64,189.85,343.54,189.58,344Z" fill="#e6ebf2"/><path d="M189.59,339.44c-.2-.1-.76.26-.78.6s.2.41.44.45.65-.14.61-.46S189.79,339.53,189.59,339.44Z" fill="#e6ebf2"/><path d="M184.51,348.85l-.14-.81A1.08,1.08,0,0,0,184.51,348.85Z" fill="#e6ebf2"/><path d="M186.69,354.72c-.64.2-.61,1-.79,1.12s-1-.58-1.83-.3l.79,3.58a.62.62,0,0,0,.51.47.8.8,0,0,0,.82-.57.57.57,0,0,0-.24-.56c.26-.47.38-1,.56-1.1s1.05.68,1.81.33a1.44,1.44,0,0,0,.68-1.85A2.4,2.4,0,0,0,186.69,354.72Z" fill="#e6ebf2"/><path d="M195.18,335.54c-.07,0-.19,0-.21.13a.2.2,0,0,0,.17.24c.13,0,.2-.12.21-.18S195.23,335.55,195.18,335.54Z" fill="#e6ebf2"/><path d="M193.92,351.65a.69.69,0,0,0,.67.71.58.58,0,0,0,.68-.55.77.77,0,0,0-.6-.79A.72.72,0,0,0,193.92,351.65Z" fill="#e6ebf2"/><path d="M191.3,350.13a1.15,1.15,0,0,0-1.28.75,1.56,1.56,0,0,0,1,1.37,1.07,1.07,0,0,0,1.12-.87A1.15,1.15,0,0,0,191.3,350.13Z" fill="#e6ebf2"/><path d="M187.41,334.83a.74.74,0,0,0,.47.78c.25,0,.54-.29.59-.68a.38.38,0,0,0-.36-.5C187.79,334.4,187.49,334.46,187.41,334.83Z" fill="#e6ebf2"/><path d="M194.47,356a.91.91,0,0,0,.85,1.07,1.11,1.11,0,0,0,1.24-.69,1.34,1.34,0,0,0-.93-1.2A.91.91,0,0,0,194.47,356Z" fill="#e6ebf2"/><path d="M186.79,338.32a.55.55,0,0,0,.44.74.6.6,0,0,0,.7-.43c.1-.27-.36-.86-.63-.8A.78.78,0,0,0,186.79,338.32Z" fill="#e6ebf2"/><path d="M188.36,327.32c-.14-.06-.66.05-.7.24s.31.53.43.53.53-.09.58-.24S188.51,327.38,188.36,327.32Z" fill="#e6ebf2"/><path d="M185.74,353.57a1.48,1.48,0,0,0-1.32-1.68Z" fill="#e6ebf2"/><path d="M184.08,346.39l.29,1.65a1.35,1.35,0,0,1,.18-.47A1.1,1.1,0,0,0,184.08,346.39Z" fill="#e6ebf2"/><path d="M185.67,344.86c-.73-.1-1.11.1-1.19.63a1.13,1.13,0,0,0,.83,1c.36,0,.94-.52,1-.94A.64.64,0,0,0,185.67,344.86Z" fill="#e6ebf2"/><path d="M188,344.81c-.7.41-.89.67-.74,1.09a.69.69,0,0,0,.69.49.77.77,0,0,0,.79-.6C188.82,345.25,188.4,345,188,344.81Z" fill="#e6ebf2"/><path d="M188.56,352.73a1.24,1.24,0,0,0-1.15-1.46,1.26,1.26,0,0,0-1.32,1c-.15.7.23,1.18,1,1.33S188.43,353.46,188.56,352.73Z" fill="#e6ebf2"/><path d="M197.35,374.3c0,.27.21.35.44.39a.56.56,0,0,0,.29,0,.36.36,0,0,0,.28,0c.22-.16-.05-.77-.19-1a.41.41,0,0,0-.69,0C197.3,373.86,197.19,374.1,197.35,374.3Z" fill="#e6ebf2"/><path d="M198.71,364.16a.67.67,0,0,0-.64-.73.69.69,0,0,0-.84.6.84.84,0,0,0,.73.79A.75.75,0,0,0,198.71,364.16Z" fill="#e6ebf2"/><path d="M197,350.06c-.54-.1-.95.24-1.06.88-.08.48.25.84.88.94s.87-.13,1-.5A1.46,1.46,0,0,0,197,350.06Z" fill="#e6ebf2"/><path d="M194.24,370a.63.63,0,0,0-.5-.82.75.75,0,0,0-.9.56.7.7,0,0,0,.64.74A.65.65,0,0,0,194.24,370Z" fill="#e6ebf2"/><path d="M197.25,359.66a.65.65,0,0,0,.48-.67c-.08-.37-.95-.51-1.09-.25S196.88,359.73,197.25,359.66Z" fill="#e6ebf2"/><path d="M195.49,385.23c.48.17,1-.41,1.31-1.07a1.26,1.26,0,0,0-.8-1.4,1.29,1.29,0,0,0-1.35,1.16A1.28,1.28,0,0,0,195.49,385.23Z" fill="#e6ebf2"/><path d="M194.39,381.59a.54.54,0,0,0,.67-.32c.21-.49-.06-.79-.43-1.11-.43.17-.89.22-.86.75A.71.71,0,0,0,194.39,381.59Z" fill="#e6ebf2"/><path d="M201,366.19a.45.45,0,0,0-.28-.65c-.32-.1-.79.1-.77.39s.1.83.44.87S201,366.39,201,366.19Z" fill="#e6ebf2"/><path d="M199.78,365.24c.07,0,.24-.3.13-.46s-.43,0-.54.06a.36.36,0,0,0-.06.39C199.39,365.33,199.65,365.3,199.78,365.24Z" fill="#e6ebf2"/><path d="M197.81,352.53a.67.67,0,0,0,.43.45c.17,0,.65-.05.72-.26s-.33-.54-.5-.63A.5.5,0,0,0,197.81,352.53Z" fill="#e6ebf2"/><path d="M197.27,346.56c-.51-.07-1.05.22-1.1.59a1.36,1.36,0,0,0,1,1.34c.36.07.78-.32.84-.78A.92.92,0,0,0,197.27,346.56Z" fill="#e6ebf2"/><path d="M199.06,337.8c.2,0,.39-.24.41-.36a.44.44,0,0,0-.25-.37.42.42,0,0,0-.37.22C198.82,337.41,198.85,337.78,199.06,337.8Z" fill="#e6ebf2"/><path d="M196.7,343.93a.69.69,0,0,0-.88.56.77.77,0,0,0,.57.81.81.81,0,0,0,.85-.66A.63.63,0,0,0,196.7,343.93Z" fill="#e6ebf2"/><path d="M198.27,342.8c0,.31,0,.61.39.7s.82-.43.77-.66-.34-.35-.58-.42A.41.41,0,0,0,198.27,342.8Z" fill="#e6ebf2"/><path d="M200.69,362.22a.67.67,0,0,0-.81.52.81.81,0,0,0,.52.86.67.67,0,0,0,.79-.55A.65.65,0,0,0,200.69,362.22Z" fill="#e6ebf2"/><path d="M184.71,342.58a2.16,2.16,0,0,1-.62,0l1,1.23a.61.61,0,0,0,.38-.82A.65.65,0,0,0,184.71,342.58Z" fill="#e6ebf2"/><path d="M204.77,395.15a.85.85,0,0,0,.56-.33c.15-.26-.19-.72-.5-.7a1.09,1.09,0,0,0-.47.23C204.26,394.82,204.47,395.17,204.77,395.15Z" fill="#e6ebf2"/><path d="M205.67,388.89a.65.65,0,0,0-.51-.82.59.59,0,0,0-.78.41c-.12.42.11,1,.42,1.1S205.56,389.23,205.67,388.89Z" fill="#e6ebf2"/><path d="M207,363.34c.06-.26-.57-.57-.67-.53-.28.11-.68.19-.77.52s.32.47.46.46S206.9,363.59,207,363.34Z" fill="#e6ebf2"/><path d="M202.8,389.12c.13-.19.29-.41.2-.61s-.74-.32-1-.08-.12.44,0,.64A.45.45,0,0,0,202.8,389.12Z" fill="#e6ebf2"/><path d="M202.52,380.72a.54.54,0,0,0-.12.44.39.39,0,0,0,.51.18c.24-.14,0-.43,0-.56S202.55,380.67,202.52,380.72Z" fill="#e6ebf2"/><path d="M204.21,393.25a1.26,1.26,0,0,0,.24-1.43c-.23-.28-1-.2-1.43.14A.81.81,0,0,0,203,393,1,1,0,0,0,204.21,393.25Z" fill="#e6ebf2"/><path d="M206.48,388.54a.45.45,0,0,0,.49,0c.1-.1.31-.32.19-.44a.46.46,0,0,0-.48-.08C206.58,388.07,206.36,388.42,206.48,388.54Z" fill="#e6ebf2"/><path d="M285.88,352.16a.72.72,0,0,0-.54,0,.64.64,0,0,0-.41-.28c-.32-.06-.43.16-.5.39s.07.66.39.65h0a.91.91,0,0,0,.89.63.57.57,0,0,0,.58-.57A.73.73,0,0,0,285.88,352.16Z" fill="#e6ebf2"/><path d="M206.32,396c.3.12.48-.16.55-.44s-.12-.69-.41-.66-.74,0-.77.39S206.1,396,206.32,396Z" fill="#e6ebf2"/><path d="M210.43,388c.09-.07,0-.43,0-.55s-.32-.12-.36-.07a.58.58,0,0,0-.11.44C210,387.87,210.33,388,210.43,388Z" fill="#e6ebf2"/><path d="M203.19,375.66a.34.34,0,0,0,.21.33c.13,0,.3-.17.36-.3s0-.39-.22-.43S203.22,375.53,203.19,375.66Z" fill="#e6ebf2"/><path d="M210,379.26a.63.63,0,0,0,.13-.61c-.07-.13-.54-.39-.69-.28s-.12.6,0,.68S209.9,379.34,210,379.26Z" fill="#e6ebf2"/><path d="M207.09,393.88a.75.75,0,1,0,.63-1.34c-.33-.1-.8.26-1,.86C206.81,393.51,206.9,393.79,207.09,393.88Z" fill="#e6ebf2"/><path d="M207.51,355.88a.76.76,0,0,0,.64,0,.66.66,0,0,0,0-1,.62.62,0,0,0-.83.44A.6.6,0,0,0,207.51,355.88Z" fill="#e6ebf2"/><path d="M208.39,389.48c-.29-.35-.64-.45-.85-.23a1.11,1.11,0,0,0-.15,1.19.71.71,0,0,0,1,0A.65.65,0,0,0,208.39,389.48Z" fill="#e6ebf2"/><path d="M203.47,373.4a.43.43,0,0,0,.14.42c.16.16.68.43.82.3s.09-.67,0-.89a.33.33,0,0,0-.35-.23.82.82,0,0,0-.14-.72c-.27-.32-.14-.25,0-.65a.72.72,0,0,0-.65-1.06,1.41,1.41,0,0,0-1.3,1.34A1.67,1.67,0,0,0,203.47,373.4Z" fill="#e6ebf2"/><path d="M199.93,386.73c.15-.13.33-.23.37-.45s-.25-.39-.54-.3a1.12,1.12,0,0,0-.62.57.32.32,0,0,0,.26.44A.67.67,0,0,0,199.93,386.73Z" fill="#e6ebf2"/><path d="M201.19,382.19a1.44,1.44,0,0,0-1.31-.4,1.48,1.48,0,0,0-.7-.5,1.32,1.32,0,0,0-1.42,1.14,1.5,1.5,0,0,0,1.06,1.5,2,2,0,0,0,.54,0,1.12,1.12,0,0,0,1.58.16A1.42,1.42,0,0,0,201.19,382.19Z" fill="#e6ebf2"/><path d="M185.41,386.44a.69.69,0,0,0,.87-.23c.18-.38-.45-1.09-.75-1l-.05,0h0a2,2,0,0,0-1.21-.73l1,1.65A.37.37,0,0,0,185.41,386.44Z" fill="#e6ebf2"/><path d="M202.3,386.8c.25-.14.3-.89.06-1a.78.78,0,0,0-.7,0,.55.55,0,0,0-.17.85A.62.62,0,0,0,202.3,386.8Z" fill="#e6ebf2"/><path d="M193.63,376.39a.68.68,0,0,0-.5-.9,1.43,1.43,0,0,0-1.27.66,1,1,0,0,0,.82,1.11C193.1,377.36,193.5,377,193.63,376.39Z" fill="#e6ebf2"/><path d="M184.28,372.38l-.27,1.47A1.17,1.17,0,0,0,184.28,372.38Z" fill="#e6ebf2"/><path d="M184.57,384a.49.49,0,0,0,.07-.55c-.13-.14-.46,0-.52.11a.46.46,0,0,0,0,.48C184.19,384.15,184.47,384.08,184.57,384Z" fill="#e6ebf2"/><path d="M203.27,359.42c-.4-.09-.9.39-1,.92a.91.91,0,0,0,.85,1.08c.59.08,1.08-.21,1.12-.66A1.34,1.34,0,0,0,203.27,359.42Z" fill="#e6ebf2"/><path d="M205.45,367.32c0-.18-.27-.34-.4-.4s-.29.06-.31.2a.5.5,0,0,0,.21.4C205,367.56,205.41,367.49,205.45,367.32Z" fill="#e6ebf2"/><path d="M202.92,340.63a.78.78,0,0,0-.75.52c-.07.34.41.65.69.76s1-.16,1-.51S203.21,340.68,202.92,340.63Z" fill="#e6ebf2"/><path d="M203.94,357.29c0-.07-.12-.18-.18-.19s-.19,0-.21.13a.21.21,0,0,0,.17.24C203.85,357.48,203.92,357.35,203.94,357.29Z" fill="#e6ebf2"/><path d="M203.38,345.44a.81.81,0,0,0-.79.61.61.61,0,0,0,.49.74.69.69,0,1,0,.3-1.35Z" fill="#e6ebf2"/><path d="M204.44,383.62a.74.74,0,0,0-.16.9c.15.19.59.13.89-.12a.38.38,0,0,0,.06-.62A.55.55,0,0,0,204.44,383.62Z" fill="#e6ebf2"/><path d="M205,351.47a.72.72,0,0,0-.77.6.69.69,0,0,0,.57.87.74.74,0,0,0,.83-.64A.7.7,0,0,0,205,351.47Z" fill="#e6ebf2"/><path d="M185.5,339.72a1.06,1.06,0,0,0-.09.83.32.32,0,0,0,.49.16.69.69,0,0,0,.22-.55c0-.2.1-.39,0-.58S185.65,339.46,185.5,339.72Z" fill="#e6ebf2"/><path d="M186,349.14a1.16,1.16,0,0,0,.79,1.1c.34.07.86-.41.9-.85s-.18-.59-.6-.65C186.5,348.65,186.11,348.79,186,349.14Z" fill="#e6ebf2"/><path d="M194.34,392c.28.12.51-.28.54-.42s0-.44-.21-.52a.42.42,0,0,0-.49.26C194.12,391.44,194.05,391.85,194.34,392Z" fill="#e6ebf2"/><path d="M196.45,390.9a.65.65,0,0,0,0-1c-.48-.56-.9-.66-1.31-.32a1.14,1.14,0,0,0-.07,1.33A1.26,1.26,0,0,0,196.45,390.9Z" fill="#e6ebf2"/><path d="M191.91,392.33c.35.25.94.18,1-.2a1.18,1.18,0,0,1,.89-.93,1.07,1.07,0,0,0,.43-1.18,1.42,1.42,0,0,0-1.38-.5l-.33.13c-.23,0-.41.18-.45.58a.5.5,0,0,0,.1.38,2.18,2.18,0,0,1-.43.86A.54.54,0,0,0,191.91,392.33Z" fill="#e6ebf2"/><path d="M195,394.69a.6.6,0,0,0,0-.89c-.41-.49-.79-.64-1.07-.44a1.14,1.14,0,0,0-.15,1.35A1,1,0,0,0,195,394.69Z" fill="#e6ebf2"/><path d="M198.8,396.16a.86.86,0,0,0,1.11-.5,1.14,1.14,0,0,0-.6-1.37,1.26,1.26,0,0,0-1.09.34.31.31,0,0,0,0-.35c-.39-.45-.82-.54-1.11-.31a.74.74,0,0,0-.1,1.11.64.64,0,0,0,1,0L198,395s0,0,0,0C197.85,395.38,198.3,396,198.8,396.16Z" fill="#e6ebf2"/><path d="M209.74,382.61a.67.67,0,0,0-1-.16.7.7,0,0,0-.17.89.69.69,0,0,0,1,.12A.54.54,0,0,0,209.74,382.61Z" fill="#e6ebf2"/><path d="M209.52,389.29a.2.2,0,0,0,0,.29c.09.1.23,0,.29,0s0-.21,0-.25S209.59,389.23,209.52,389.29Z" fill="#e6ebf2"/><path d="M201.12,392c.14-.34-.33-.7-.46-1h-.22a.63.63,0,0,0-.46.62.7.7,0,0,0,0,.25h0c-.17.06-.4.36-.37.51a1.6,1.6,0,0,0,0,.21.34.34,0,0,0-.15.07c0,.1,0,.24.09.28s.13,0,.19-.09a.78.78,0,0,0,.24.24c.48.25.67-.21,1-.54a2.33,2.33,0,0,0-.22-.35C200.91,392.2,201.06,392.16,201.12,392Z" fill="#e6ebf2"/><path d="M197.56,388.45a.64.64,0,0,0-.3-.86,2.23,2.23,0,0,1-.48-.38,1,1,0,0,0-1-.39c0-.11-.15-.32-.25-.33a.47.47,0,0,0-.39.23.49.49,0,0,0,0,.13.77.77,0,0,0-.44,0,.94.94,0,0,0-.18-.82,1.74,1.74,0,0,0-1.65-.3.74.74,0,0,0,.05-.54c-.14-.38.8-.45.63-1s.38-.93.11-1.56-.93-1.05-1.37-.63a1.91,1.91,0,0,0-.55,1.08,1.22,1.22,0,0,0-1.26,1.05,1.1,1.1,0,0,0,.35,1,.78.78,0,0,0,.09.91,1.16,1.16,0,0,0,1.39.24h0a1.3,1.3,0,0,0,.28,1.15,1.34,1.34,0,0,0,1.75,0c0-.05.08-.12.13-.18v0a.57.57,0,0,0,.49.2.32.32,0,0,0,.14-.11,1.14,1.14,0,0,0,.31.7,10.77,10.77,0,0,0,1.31.69A.62.62,0,0,0,197.56,388.45Z" fill="#e6ebf2"/><path d="M211.34,393.08c-.11.07-.34.37-.19.51a.47.47,0,0,0,.54,0,.46.46,0,0,0,.07-.44A.43.43,0,0,0,211.34,393.08Z" fill="#e6ebf2"/><path d="M192.6,342.83a1,1,0,0,0,1.05-.66,1.22,1.22,0,0,0-.77-1.23c-.35-.06-.88.52-1,1.06A.8.8,0,0,0,192.6,342.83Z" fill="#e6ebf2"/><path d="M192.57,336.81c0-.15,0-.45-.16-.46a.45.45,0,0,0-.4.26c0,.12,0,.52.2.53S192.56,336.91,192.57,336.81Z" fill="#e6ebf2"/><path d="M184.75,334.16c.09-.27-.27-.34-.4-.4s-.32.14-.31.2a.51.51,0,0,0,.21.4A.38.38,0,0,0,184.75,334.16Z" fill="#e6ebf2"/><path d="M187.56,392.43a.73.73,0,0,0,0-.66.4.4,0,0,0-.7-.09l-.07.07a.77.77,0,0,0-.82-.55c-.89.06-1,.65-.92.91s-.29.72-.43.45l.28,2.38c.86-.33.81-.86,1.38-1s.67-.53.65-1.17c0-.09,0-.19,0-.29C187.16,392.58,187.44,392.6,187.56,392.43Z" fill="#e6ebf2"/><path d="M191.21,388.19l0,0-.62-.8a4.43,4.43,0,0,0-.61.27.74.74,0,0,0-.34.63,1,1,0,0,0-.69.2c-.27.21-.48.48-1,.26,0-.2,0-.48-.11-.61a1.34,1.34,0,0,0-.75-.39c-.35,0-.48.32-.47.66,0,.09,0,.19,0,.28a.68.68,0,0,0-.32.52.67.67,0,0,0,.27.55.43.43,0,0,0,.31,0c.4.5,1.16.94,1.59.8,0,0,.13-.05.15-.1.23-.55.72-.43,1.16-.48a.7.7,0,0,0,.64-1,.88.88,0,0,0-.05-.15.56.56,0,0,0,.32-.11A2.72,2.72,0,0,0,191.21,388.19Z" fill="#e6ebf2"/><path d="M187.72,392.83c-.21.36.34,1.12.64,1.06s.59-1,.25-1.21A.7.7,0,0,0,187.72,392.83Z" fill="#e6ebf2"/><path d="M185.1,337.51a1.42,1.42,0,0,0-1.07-1.57Z" fill="#e6ebf2"/><path d="M251.52,394.94a.81.81,0,0,0,.08,1c.26.19.45.05.62-.13a.46.46,0,0,0-.06-.76C252,394.94,251.7,394.83,251.52,394.94Z" fill="#e6ebf2"/><path d="M255.26,386.1a.47.47,0,0,0-.07-.54.45.45,0,0,0-.45,0,.4.4,0,0,0,0,.42C254.81,386.09,255.14,386.27,255.26,386.1Z" fill="#e6ebf2"/><path d="M252.6,389.33a.66.66,0,0,0-1,.14c-.26.3-.31.61-.15.8-.33.06-.51.33-.68.67-.13-.07-.28-.13-.35,0a.46.46,0,0,0,0,.48c.08.1.45.26.55.12a.28.28,0,0,0,0-.18c.17.22.36.39.69.27a.69.69,0,0,0,.49-.77.59.59,0,0,0-.1-.33.89.89,0,0,0,.62-.19A.71.71,0,0,0,252.6,389.33Z" fill="#e6ebf2"/><path d="M253.38,393.43a.58.58,0,0,0,0,.45c0,.05.33.07.37,0s.25-.35.09-.52S253.4,393.37,253.38,393.43Z" fill="#e6ebf2"/><path d="M213.08,392.43c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,213.08,392.43Z" fill="#e6ebf2"/><path d="M286.06,346.89c.27,0,.4-.63.38-.83s-.33-.32-.52-.34-.5.15-.4.45S285.8,346.91,286.06,346.89Z" fill="#e6ebf2"/><path d="M287.75,328.74c-.29-.1-.58.15-.77.33s0,.59.32.69.63,0,.67-.31S288,328.83,287.75,328.74Z" fill="#e6ebf2"/><path d="M254.93,394.39a.82.82,0,0,0,1.07-.13,1,1,0,0,0,0-1.25,1.25,1.25,0,0,0-1.45,0C254.33,393.26,254.53,394,254.93,394.39Z" fill="#e6ebf2"/><path d="M192.61,380.67c.47-.38.57-.73.29-1.07l0,0a1,1,0,0,0,.06-.14.65.65,0,0,0-.37-.83.86.86,0,0,0-.65.05c-.23.14-.29.34-.21.66,0,0,0,0-.07,0a1.51,1.51,0,0,0,0,1.36C191.8,381,192.18,381,192.61,380.67Z" fill="#e6ebf2"/><path d="M213.13,390.49c-.16-.05-.42.22-.45.34s0,.38.19.43.36-.11.41-.23S213.29,390.54,213.13,390.49Z" fill="#e6ebf2"/><path d="M244.63,389.22a.67.67,0,0,0,0,1,.7.7,0,0,0,.91,0,.69.69,0,0,0,0-1A.54.54,0,0,0,244.63,389.22Z" fill="#e6ebf2"/><path d="M249.27,387.81a.44.44,0,0,0,0,.37.52.52,0,0,0,.45,0c.09-.05.19-.45.11-.53S249.39,387.73,249.27,387.81Z" fill="#e6ebf2"/><path d="M252.47,382.59c.08-.11,0-.34-.11-.46s-.36-.15-.48,0,.1.41.2.51A.38.38,0,0,0,252.47,382.59Z" fill="#e6ebf2"/><path d="M246.5,393.48c-.19.25-.3.53,0,.81a.75.75,0,0,0,.92,0c.17-.19,0-.61-.26-.87A.38.38,0,0,0,246.5,393.48Z" fill="#e6ebf2"/><path d="M251.56,388.37a.22.22,0,0,0,0-.28c-.05,0-.22,0-.25.05a.2.2,0,0,0,0,.24A.19.19,0,0,0,251.56,388.37Z" fill="#e6ebf2"/><path d="M240.66,389.41c-.12.09-.31.59-.17.73s.61,0,.68-.08.21-.49.11-.62S240.8,389.32,240.66,389.41Z" fill="#e6ebf2"/><path d="M195.86,360.48c-.32-.29-.66-.38-1,0a.54.54,0,0,0-.06.53.91.91,0,0,0,.66.31C195.91,361.19,195.88,360.81,195.86,360.48Z" fill="#e6ebf2"/><path d="M195.43,373.18a2.08,2.08,0,0,0-.26-.6.69.69,0,0,0-.79.61c0,.33.2.4.45.45S195.47,373.49,195.43,373.18Z" fill="#e6ebf2"/><path d="M194,365.47a1.35,1.35,0,0,0-1.33.47,1,1,0,0,0-.52-.64,1.33,1.33,0,0,0-1.85.23,1.54,1.54,0,0,0,.06,1.38.62.62,0,0,0-.65.51.73.73,0,0,0,.59.78.89.89,0,0,0,.28,0,1.08,1.08,0,0,0,.14,1.17h0a.8.8,0,0,0-.93.75.87.87,0,0,0,.84,1.13c.56.09,1.11-.19,1.16-.6a.65.65,0,1,1,.48-1.19.94.94,0,0,0,0-1.45,1,1,0,0,0-1.14-.32v0a.68.68,0,0,0,0-.14,1.26,1.26,0,0,0,1.26-.48l.06-.07a1.16,1.16,0,0,0,1,.81,1.74,1.74,0,0,0,.6,0,.58.58,0,0,0,0,.5.9.9,0,0,0,1.26.27,1.15,1.15,0,0,0,.49-1.15.9.9,0,0,0-.91-.63A1.27,1.27,0,0,0,194,365.47Z" fill="#e6ebf2"/><path d="M195.18,378.39a.71.71,0,0,0,0,.65c.1.13.61.28.75.15s0-.71-.05-.76S195.28,378.24,195.18,378.39Z" fill="#e6ebf2"/><path d="M189.5,359.35a1,1,0,0,0,1.17.47c.18,0,.35-.08.54-.12.3.33.58.72,1,.82,0,.1,0,.21,0,.32a1.25,1.25,0,0,0,1.29,1,1.29,1.29,0,0,0,.78-1.6,1.38,1.38,0,0,0-.7-.77c0-.06,0-.12,0-.18.16-.71-.27-1.07-.84-1.34.13-.37.45-.74,0-1.07a.65.65,0,0,0-.84,0c-.43.37-.16.75.07,1.12l-.51.53-.71-.64a4.86,4.86,0,0,0-.71.25A1.45,1.45,0,0,0,189.5,359.35Z" fill="#e6ebf2"/><path d="M192.06,354.72a.61.61,0,0,0-.52-.73.94.94,0,0,0-1.1.59.77.77,0,0,0,.53.93A1.11,1.11,0,0,0,192.06,354.72Z" fill="#e6ebf2"/><path d="M193.33,348.78a1.29,1.29,0,0,0,1.18-.94,1.18,1.18,0,0,0-.84-1,.88.88,0,0,0-.93.56C192.6,348.08,192.86,348.7,193.33,348.78Z" fill="#e6ebf2"/><path d="M189.85,347c-.59-.07-1,.14-1,.51a.75.75,0,0,0,.66.9.65.65,0,0,0,.69-.67C190.18,347.37,190.19,347,189.85,347Z" fill="#e6ebf2"/><path d="M184.4,359.54v1.84a1,1,0,0,0,.68-1A.78.78,0,0,0,184.4,359.54Z" fill="#e6ebf2"/><path d="M191.36,372a.67.67,0,0,0-.28.94,1.15,1.15,0,0,0,1.4.3.79.79,0,0,0,.19-1.06A1,1,0,0,0,191.36,372Z" fill="#e6ebf2"/><path d="M184.77,367.71a1,1,0,0,0,.45,0,1.86,1.86,0,0,0,0,1.73,1.34,1.34,0,0,0,1.59.25c.39-.19.68-.42,1.16-.15s.61-.08.77-.43c-.18-.5-.52-.65-.92-.46a7,7,0,0,0-.75-1.06.53.53,0,0,0-.1-.06c.18-.18,0-.75-.1-1s-.55-.23-.78,0c.06-1-.18-1.29-1-1.44Zm1.14-.6a.48.48,0,0,0,.09.11l.14.09-.37,0A1,1,0,0,0,185.91,367.11Z" fill="#e6ebf2"/><path d="M184.93,371.71c.21.12.7-.09.84-.22s0-.45-.05-.62a.34.34,0,0,0-.59-.06,2.34,2.34,0,0,0-.15.25.73.73,0,0,0-.56-.48l-.23,1.47A.77.77,0,0,0,184.93,371.71Z" fill="#e6ebf2"/><path d="M192.11,362.5c.22-.49-.06-.79-.43-1.12-.43.18-.89.23-.86.75a.71.71,0,0,0,.62.68A.54.54,0,0,0,192.11,362.5Z" fill="#e6ebf2"/><path d="M186.4,363.25a.61.61,0,0,0-.67.1.53.53,0,0,0-.18.78,1.1,1.1,0,0,0,.7.45.55.55,0,0,0,.5-.34,2,2,0,0,0,1.49.43,1.41,1.41,0,0,0,.88-.34,1.51,1.51,0,0,0,.48-1.17c0-.5.4-.85.21-1.31a2.09,2.09,0,0,0-2.11-1.37,1.73,1.73,0,0,0-1.41.79c-.29.5.22,1.06.13,1.66C186.41,363.05,186.4,363.15,186.4,363.25Z" fill="#e6ebf2"/><path d="M193.87,364a.72.72,0,0,0-.53-.84.76.76,0,0,0-.82.56.6.6,0,0,0,.49.75A.66.66,0,0,0,193.87,364Z" fill="#e6ebf2"/><path d="M196.13,375.19a.69.69,0,0,0-1-.17.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07A.64.64,0,0,0,196.13,375.19Z" fill="#e6ebf2"/><path d="M198.46,377.46a.86.86,0,0,0-.26-.18.53.53,0,0,0,.15-.25c0-.13-.06-.38-.23-.41s-.34.15-.38.26a.54.54,0,0,0,0,.25,1.1,1.1,0,0,0-.87.06,1.18,1.18,0,0,0,.12,1.5c.36.41.84.39,1.35-.07A1,1,0,0,0,198.46,377.46Z" fill="#e6ebf2"/><path d="M198.36,384.67a.58.58,0,0,0-.55-.08.76.76,0,0,0-.36.54c0,.49.44.49.81.51C198.55,385.32,198.68,385,198.36,384.67Z" fill="#e6ebf2"/><path d="M198.72,370.57c.11.13.48.07.57,0a.5.5,0,0,0,.12-.23h.45a.57.57,0,0,0,.85-.37.75.75,0,0,0-.5-.93,1.85,1.85,0,0,1-.65-.39,1,1,0,0,0-1.11-.4c-.34.1-.67.95-.55,1.34s.22.77.76.74h.07A.29.29,0,0,0,198.72,370.57Z" fill="#e6ebf2"/><path d="M197,391.79a.69.69,0,0,0,.19.82.77.77,0,0,0,1,.08c.4-.37.23-.81.1-1.22C197.46,391.3,197.14,391.38,197,391.79Z" fill="#e6ebf2"/><path d="M200.81,348.69a.66.66,0,1,0-1.25-.4.69.69,0,0,0,.5.84A.54.54,0,0,0,200.81,348.69Z" fill="#e6ebf2"/><path d="M193.47,337a1.14,1.14,0,0,0,.68,1,.72.72,0,0,0,.75-.65.66.66,0,0,0-.64-.73C193.81,336.5,193.49,336.66,193.47,337Z" fill="#e6ebf2"/><path d="M198.24,356.21a.87.87,0,0,0,.88,1.32,5.39,5.39,0,0,0,1.42-.31,1.37,1.37,0,0,0,.68-1.46c-.07-.31-.47-.89-1.05-.6-.61.9-1.06.26-1.71.75A1.18,1.18,0,0,0,198.24,356.21Z" fill="#e6ebf2"/><path d="M194.76,334.08c0-.12-.26-.34-.39-.39s-.32.13-.31.19a.54.54,0,0,0,.2.4C194.36,334.32,194.74,334.2,194.76,334.08Z" fill="#e6ebf2"/><path d="M184.84,382a5.46,5.46,0,0,0,.15-1.45Z" fill="#e6ebf2"/><path d="M186.12,376.71c-.24-.27-.48-.6-.9-.36a.77.77,0,0,0-.23.61.59.59,0,0,0,.37.41C185.8,377.44,186,377.16,186.12,376.71Z" fill="#e6ebf2"/><path d="M187.9,379.61c.58-.4.83-1,.56-1.37a1,1,0,0,0-.83-.34.83.83,0,0,0-.73.11.66.66,0,0,0-.19.59,1.08,1.08,0,0,0,.14.75A.86.86,0,0,0,187.9,379.61Z" fill="#e6ebf2"/><path d="M191.44,376.32c-.12-.57-.43-.68-1.6-.48-.1-.37-.18-.74-.56-.8a1.31,1.31,0,0,0,.08-.21.62.62,0,0,0,.24.1c.31,0,.64-.33.7-.74a.82.82,0,0,0-.61-1,.64.64,0,0,0-.47.14,1.25,1.25,0,0,0-.2-1,1.29,1.29,0,0,0-1.7-.32,1.47,1.47,0,0,0-.63,1.24,3.24,3.24,0,0,0-.75.16,1.25,1.25,0,0,0-.7,1.18s0,.09,0,.13a1.2,1.2,0,0,0-.73-.47l-.33,2a1.27,1.27,0,0,0,1.3-.79.67.67,0,0,0,0-.2,1.22,1.22,0,0,0,.5.31,2.21,2.21,0,0,0,1.5-.07,1.11,1.11,0,0,1,.57,0,1.32,1.32,0,0,0,.32.05s0,0,0,0a.55.55,0,0,0,.12.41,8.24,8.24,0,0,0,.94.49,2.58,2.58,0,0,0,.23.61.56.56,0,0,0-.2-.08.7.7,0,0,0-.85.49.72.72,0,0,0,.51.84.8.8,0,0,0,.92-.55.65.65,0,0,0,0-.24.68.68,0,0,0,.56.14A1.42,1.42,0,0,0,191.44,376.32Z" fill="#e6ebf2"/><path d="M185.12,378.26l.35,1.53A.94.94,0,0,0,185.12,378.26Z" fill="#e6ebf2"/><path d="M186.74,385.1c-.46.36-.47.73,0,1.26a.85.85,0,0,0,1.2.16,1.66,1.66,0,0,0,.24-1.45C187.89,384.7,187.23,384.72,186.74,385.1Z" fill="#e6ebf2"/><path d="M189.49,382.84a.84.84,0,0,0-.28-.95c-.48-.17-.37-.52-.49-.84a2.27,2.27,0,0,0-.62-.74,1.7,1.7,0,0,0-.56-.26,6.29,6.29,0,0,0-.62-.17c-.68-.15-1.09,0-1.29.54a1.1,1.1,0,0,0,.63,1.41l.64.3a1,1,0,0,0-.11.76c.13.52.84.43,1.06.28s.07-.29,0-.54c.08.06.17.09.25.15C188.53,383.11,189.29,383.16,189.49,382.84Z" fill="#e6ebf2"/><path d="M101.28,396.5a1.15,1.15,0,0,0-.75,1.44l2.6-.78C102.94,396.5,102.15,396.23,101.28,396.5Z" fill="#e6ebf2"/><path d="M95.72,394.42a1.17,1.17,0,0,0-.25.46c.21.44.59.6.81.4a.8.8,0,0,0,.26-.59A.57.57,0,0,0,95.72,394.42Z" fill="#e6ebf2"/><path d="M97.52,394.12c-.16.15-.6.44-.39.77s.69.25.93.19.29-.41.18-.67S97.74,393.92,97.52,394.12Z" fill="#e6ebf2"/><path d="M101.36,394.88a1.41,1.41,0,0,0,.69-1.62,1,1,0,0,0-1.82,1C100.44,394.76,101,395.06,101.36,394.88Z" fill="#e6ebf2"/><path d="M101.72,388.34a.38.38,0,0,0-.36-.17c-.12.05-.16.3-.15.44s.22.33.4.27S101.75,388.48,101.72,388.34Z" fill="#e6ebf2"/><path d="M97.31,397a1.24,1.24,0,0,0-.52,1.34l1.72-.48C98.28,397.22,97.74,396.83,97.31,397Z" fill="#e6ebf2"/><path d="M100.51,387.36a.38.38,0,0,0,.19-.42c0-.12-.28-.41-.44-.36s-.21.43-.16.54S100.34,387.41,100.51,387.36Z" fill="#e6ebf2"/><path d="M97.11,391.44c-.32.12-.49.68-.28,1.28.12,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.85.85,0,0,0,97.11,391.44Z" fill="#e6ebf2"/><path d="M81.93,397.72l1-.08A.69.69,0,0,0,81.93,397.72Z" fill="#e6ebf2"/><path d="M83.7,393.78a.48.48,0,0,0-.18.42c0,.11.23.37.49.24s.15-.41.1-.53A.44.44,0,0,0,83.7,393.78Z" fill="#e6ebf2"/><path d="M76,395.85a.82.82,0,0,0,.08,1,.63.63,0,0,0,.9,0,.76.76,0,0,0,0-1.06A.75.75,0,0,0,76,395.85Z" fill="#e6ebf2"/><path d="M85.71,398a.43.43,0,0,0-.24.51l.72-.21C86.13,398.11,86,397.87,85.71,398Z" fill="#e6ebf2"/><path d="M90.52,394.39l-.18.13a.66.66,0,0,0,0,.78.88.88,0,0,0,.42.43c.21-.24.81-.44.72-.81S90.8,394.55,90.52,394.39Z" fill="#e6ebf2"/><path d="M92.41,389.35a.61.61,0,0,0-.4.79c.17.41.71.76,1,.64a1.06,1.06,0,0,0,.3-1.06A.65.65,0,0,0,92.41,389.35Z" fill="#e6ebf2"/><path d="M90.56,396.43c.06.07.13.19.23.17s.07-.14.11-.22-.16-.12-.23-.12S90.55,396.41,90.56,396.43Z" fill="#e6ebf2"/><path d="M86.51,397a.62.62,0,0,0-.08.93A.59.59,0,0,0,87,398c.18-.1.38-.36.36-.52C87.29,397.05,86.73,396.94,86.51,397Z" fill="#e6ebf2"/><path d="M94.12,397a.43.43,0,0,0-.19.68c.12.19.47.67.74.51s.3-.73.23-.94A.53.53,0,0,0,94.12,397Z" fill="#e6ebf2"/><path d="M113.36,385.66a.39.39,0,0,0,.41-.23c0-.11,0-.49-.15-.54s-.42.22-.45.34A.39.39,0,0,0,113.36,385.66Z" fill="#e6ebf2"/><path d="M112.84,392.92a.54.54,0,0,0,0-.25c-.08-.38-.14-.79-.68-.81l-.63-.06a1,1,0,0,0-.89-.2l0,0a.55.55,0,0,0-.52.37.76.76,0,0,0,.41,1,1.79,1.79,0,0,1,.6.45,1,1,0,0,0,1.07.52.41.41,0,0,0,.18-.1,1.09,1.09,0,0,0,.08.28c.19.49.61.62,1.19.37.41-.18.62-.51.51-.83A1.51,1.51,0,0,0,112.84,392.92Z" fill="#e6ebf2"/><path d="M112.84,388a2.38,2.38,0,0,0,.2.62.68.68,0,0,0,.85-.52c0-.32-.16-.42-.4-.49S112.83,387.68,112.84,388Z" fill="#e6ebf2"/><path d="M112.3,396.57a.76.76,0,0,0-.46.94.78.78,0,0,0-.36.47l.66.13a.93.93,0,0,0,.88.22c.41-.16.9-1.09.75-1.42A1.2,1.2,0,0,0,112.3,396.57Z" fill="#e6ebf2"/><path d="M113.43,378.32a1.32,1.32,0,0,0-1.64.78,1.93,1.93,0,0,0,1,1.8,1.32,1.32,0,0,0,1.53-1A1.47,1.47,0,0,0,113.43,378.32Z" fill="#e6ebf2"/><path d="M118.43,392.25a.24.24,0,0,0-.14.34c.08.12.23.36.47.3s.15-.42.1-.47S118.63,392.17,118.43,392.25Z" fill="#e6ebf2"/><path d="M110.9,394.63a1.49,1.49,0,0,1-1-.12c-.14-.05-.47.16-.56.34a.79.79,0,0,0,0,.67s0,0,0,0a1.46,1.46,0,0,0-.09.16.45.45,0,0,0,.21.68c.3.14.79,0,.8-.31a1.85,1.85,0,0,0,0-.5c.22-.06.44-.14.65-.22s.34-.32.2-.62C111.12,394.71,111,394.6,110.9,394.63Z" fill="#e6ebf2"/><path d="M112.39,389.75a.48.48,0,0,0-.32.64.53.53,0,0,0,.66.44.62.62,0,0,0,.41-.78A.55.55,0,0,0,112.39,389.75Z" fill="#e6ebf2"/><path d="M108.22,386.08a.34.34,0,0,0-.18-.34c-.12,0-.31.14-.38.26s0,.39.16.45S108.17,386.21,108.22,386.08Z" fill="#e6ebf2"/><path d="M105.79,394.42a.48.48,0,0,0-.16-.42c-.09-.05-.47,0-.52.15s.22.36.35.43A.28.28,0,0,0,105.79,394.42Z" fill="#e6ebf2"/><path d="M104.9,395.13a1.35,1.35,0,0,0-.57,1.73.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54A1.19,1.19,0,0,0,104.9,395.13Z" fill="#e6ebf2"/><path d="M109,389.93a1.65,1.65,0,0,0-1.47-1.65c-.58,0-.65.75-.42,1.09s.11.26-.08.64-.21,1,.54,1.12A1.41,1.41,0,0,0,109,389.93Z" fill="#e6ebf2"/><path d="M108.46,397.6a1.15,1.15,0,0,0-.7,1l1.34-.1C109,397.9,108.74,397.57,108.46,397.6Z" fill="#e6ebf2"/><path d="M109.79,387.73c.08-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,109.79,387.73Z" fill="#e6ebf2"/><path d="M108.36,394c.4-.14.56-.77.35-1.34a.53.53,0,0,0-.74-.32c-.48.15-.82.68-.69,1A1.09,1.09,0,0,0,108.36,394Z" fill="#e6ebf2"/><path d="M104.21,397.6c-.27,0-.94.1-1,.35s.51.62.61.59c.29-.07.7-.11.82-.44S104.35,397.6,104.21,397.6Z" fill="#e6ebf2"/><path d="M737.35,399.29l.86-.08A.54.54,0,0,0,737.35,399.29Z" fill="#e6ebf2"/><path d="M723.36,397.73a.94.94,0,0,0-.09,1.24,1.35,1.35,0,0,0,1.68-.14.85.85,0,0,0-.21-1.13A.93.93,0,0,0,723.36,397.73Z" fill="#e6ebf2"/><path d="M708.2,398.86l.62,0A.38.38,0,0,0,708.2,398.86Z" fill="#e6ebf2"/><path d="M736.28,393.15a.62.62,0,0,0-.08.94.55.55,0,0,0,.54.07c.17-.1.38-.35.36-.52C737.06,393.18,736.5,393.07,736.28,393.15Z" fill="#e6ebf2"/><path d="M721.55,394.9a.83.83,0,0,0-.14-1,.79.79,0,0,0-.67.25.41.41,0,0,0,0,.69C721,395,721.26,395.17,721.55,394.9Z" fill="#e6ebf2"/><path d="M716.26,398.37l1.45,0A1.25,1.25,0,0,0,716.26,398.37Z" fill="#e6ebf2"/><path d="M731.7,393.85a.74.74,0,0,0,.08,1,.72.72,0,0,0,1.05,0,.76.76,0,0,0-.09-1.05A.7.7,0,0,0,731.7,393.85Z" fill="#e6ebf2"/><path d="M720.84,396.78a.68.68,0,0,0,0,1,.77.77,0,0,0,1,0,.8.8,0,0,0-.1-1.07A.64.64,0,0,0,720.84,396.78Z" fill="#e6ebf2"/><path d="M726.7,393a.69.69,0,1,0-1-1,.81.81,0,0,0,.08,1A.61.61,0,0,0,726.7,393Z" fill="#e6ebf2"/><path d="M713.33,394.85c-.3.34-.34.7-.1.88a1.12,1.12,0,0,0,1.2-.05.69.69,0,0,0-.14-1A.65.65,0,0,0,713.33,394.85Z" fill="#e6ebf2"/><path d="M726.1,395.84a.68.68,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,726.1,395.84Z" fill="#e6ebf2"/><path d="M702.87,395.44c.11-.15.21-.49.11-.62a.65.65,0,0,0-.62,0c-.13.09-.31.59-.18.73S702.8,395.54,702.87,395.44Z" fill="#e6ebf2"/><path d="M721.44,389.77a.77.77,0,0,0,0,.91c.25.24.76,0,1-.17s.39-.9.13-1.15S721.63,389.55,721.44,389.77Z" fill="#e6ebf2"/><path d="M711,393.19a.4.4,0,0,0,0,.37.52.52,0,0,0,.45,0c.09-.05.19-.45.1-.53S711.08,393.11,711,393.19Z" fill="#e6ebf2"/><path d="M712.62,396.4c-.12-.09-.37-.25-.47-.12a.47.47,0,0,0-.06.21h0a.6.6,0,0,0-.05,1.05.64.64,0,0,0,.76-.3.6.6,0,0,0,0-.47A.54.54,0,0,0,712.62,396.4Z" fill="#e6ebf2"/><path d="M717,391.48a.51.51,0,0,0-.07-.54.45.45,0,0,0-.45,0,.42.42,0,0,0,0,.42C716.51,391.47,716.84,391.65,717,391.48Z" fill="#e6ebf2"/><path d="M713.26,393.75a.22.22,0,0,0,0-.28c-.05,0-.22,0-.25,0a.2.2,0,0,0,0,.24A.19.19,0,0,0,713.26,393.75Z" fill="#e6ebf2"/><path d="M735.74,398a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.22.22,0,0,0,0-.28A.25.25,0,0,0,735.74,398Z" fill="#e6ebf2"/><path d="M682.71,391a1,1,0,0,0,1.14.63,1.42,1.42,0,0,0,.68-1.62.75.75,0,0,0-.53-.4.23.23,0,0,0-.12-.06.24.24,0,0,0-.17,0,.85.85,0,0,0-.36.06A1,1,0,0,0,682.71,391Z" fill="#e6ebf2"/><path d="M695.3,389.7c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,695.3,389.7Z" fill="#e6ebf2"/><path d="M690.84,390.73c.4-.14.57-.77.35-1.35a.52.52,0,0,0-.73-.31c-.48.15-.83.67-.7,1A1.09,1.09,0,0,0,690.84,390.73Z" fill="#e6ebf2"/><path d="M683,384.12c.17-.05.22-.3.19-.42s-.28-.41-.43-.35-.21.43-.17.54S682.82,384.18,683,384.12Z" fill="#e6ebf2"/><path d="M700.91,389a.24.24,0,0,0-.13.35c.07.12.22.36.46.3s.15-.42.1-.47S701.12,388.93,700.91,389Z" fill="#e6ebf2"/><path d="M691.58,395.23c-.11-.56-.36-.89-.64-.86a1.17,1.17,0,0,0-.7,1c0,.28.58.61.93.57A.51.51,0,0,0,691.58,395.23Z" fill="#e6ebf2"/><path d="M707.46,395.19l-.05,0a.76.76,0,0,0-.21-.6.54.54,0,0,0-.87,0,.67.67,0,0,0,0,1,.7.7,0,0,0,.8.08.43.43,0,0,0,.4.09c.12-.08.33-.16.27-.38A.25.25,0,0,0,707.46,395.19Z" fill="#e6ebf2"/><path d="M688.77,392.66a1.17,1.17,0,0,0-1.38-.76c-.55.16-.83,1-.58,1.73a.91.91,0,0,0,1.25.57A1.11,1.11,0,0,0,688.77,392.66Z" fill="#e6ebf2"/><path d="M696.25,393.68a1.18,1.18,0,0,0-1.47-.34c-.5.21-.62.68-.34,1.3a1,1,0,0,0,1.07.46C695.91,394.94,696.4,394,696.25,393.68Z" fill="#e6ebf2"/><path d="M681,394.63l-.45.91A.84.84,0,0,0,681,394.63Z" fill="#e6ebf2"/><path d="M694,396c-.65.29-1,.75-.78,1.15a.94.94,0,1,0,1.71-.78A.81.81,0,0,0,694,396Z" fill="#e6ebf2"/><path d="M693.69,389.76c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.69.69,0,0,0-.32.92A.77.77,0,0,0,693.69,389.76Z" fill="#e6ebf2"/><path d="M693.68,391.51c-.08,0-.21-.14-.29-.12a1.45,1.45,0,0,1-1-.11c-.14,0-.46.16-.56.33a.85.85,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31C693.77,392,693.82,391.82,693.68,391.51Z" fill="#e6ebf2"/><path d="M691,398.46l.78.13A.53.53,0,0,0,691,398.46Z" fill="#e6ebf2"/><path d="M682.25,396.84a.74.74,0,0,0-.41.91.66.66,0,0,0,.85.32.59.59,0,0,0,.42-.78A.67.67,0,0,0,682.25,396.84Z" fill="#e6ebf2"/><path d="M688.15,398.61l1,.28C688.86,398.57,688.54,398.28,688.15,398.61Z" fill="#e6ebf2"/><path d="M702.86,387.92c.2-.35-.51-1-.94-.88s-.76.66-.58,1S702.66,388.27,702.86,387.92Z" fill="#e6ebf2"/><path d="M695.21,387.6a.61.61,0,0,0,.41-.78.55.55,0,0,0-.75-.31.5.5,0,0,0-.32.65A.53.53,0,0,0,695.21,387.6Z" fill="#e6ebf2"/><path d="M680.73,391.17l-.19.68C680.86,391.77,680.83,391.44,680.73,391.17Z" fill="#e6ebf2"/><path d="M692.27,384.5c.09-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,692.27,384.5Z" fill="#e6ebf2"/><path d="M685.55,397.48a.67.67,0,0,0-.42.88l0,0a.21.21,0,0,0-.19.12c-.06.19.19.38.27.39s.36.07.44-.14v-.05a.66.66,0,0,0,.31-.06.72.72,0,0,0,.34-.93A.53.53,0,0,0,685.55,397.48Z" fill="#e6ebf2"/><path d="M707,397.88a.62.62,0,0,0-.05,1.06.64.64,0,0,0,.76-.31C707.81,398.31,707.65,398.13,707,397.88Z" fill="#e6ebf2"/><path d="M684.09,385.64c.19-.06.14-.4.11-.53a.36.36,0,0,0-.35-.17c-.12.05-.17.3-.16.44S683.91,385.7,684.09,385.64Z" fill="#e6ebf2"/><path d="M699,399l.35.22C699.35,399.05,699.24,399,699,399Z" fill="#e6ebf2"/><path d="M700.23,394.4c-.35-.16-.66-.48-1-.37a.65.65,0,0,0-.44.41,1.11,1.11,0,0,0-.23.62,1.47,1.47,0,0,0,.61,1.1,1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84A1.12,1.12,0,0,0,700.23,394.4Z" fill="#e6ebf2"/><path d="M696.34,397.57a.35.35,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37,0-.49A.38.38,0,0,0,696.34,397.57Z" fill="#e6ebf2"/><path d="M703.84,398c-.17,0-.38-.32-.19-.35s.33-.23.25-.71a.72.72,0,0,0-.79-.72,1.07,1.07,0,0,0-1,1.14c0,.58.36.66.35,1s.2.51.59.62,1,.26,1.12-.28S704,398,703.84,398Z" fill="#e6ebf2"/><path d="M704.19,389.57c-.58.1-.72.3-.78,1a11.15,11.15,0,0,0-1,.87.45.45,0,0,0,.33.77c.48,0,1,.05,1.44-.37,0-.21,0-.45,0-.68.53-.35.85-.88.68-1.21A.63.63,0,0,0,704.19,389.57Z" fill="#e6ebf2"/><path d="M686.09,389.83c.37-.16.19-1.1-.23-1.26s-1,.08-1,.44S685.73,390,686.09,389.83Z" fill="#e6ebf2"/><path d="M680.49,384l.42.68A.53.53,0,0,0,680.49,384Z" fill="#e6ebf2"/><path d="M681.4,396.65l-.36,1.47c.16.06.37,0,.58-.43A.71.71,0,0,0,681.4,396.65Z" fill="#e6ebf2"/><path d="M680.94,398.51l.1-.39h0C680.82,398,680.82,398.39,680.94,398.51Z" fill="#e6ebf2"/><path d="M686.19,392c-.52-.27-.76-.19-1.21.33a9,9,0,0,0-1.32.1.45.45,0,0,0-.19.82l.18.12a1.13,1.13,0,0,0-.63,1.38,1.5,1.5,0,0,0,1.75,1,1.57,1.57,0,0,0,.84-1.75.94.94,0,0,0-.45-.53l.13-.15c.63,0,1.2-.21,1.26-.58A.62.62,0,0,0,686.19,392Z" fill="#e6ebf2"/><rect x="331.59" y="2.12" width="34.45" height="34.45" fill="#00bfb3"/><rect x="331.59" y="54.37" width="34.45" height="34.45" fill="#00bfb3"/><polygon points="352.85 24.63 341.81 12.98 346.2 8.82 352.97 15.96 369.12 -0.19 373.4 4.09 352.85 24.63" fill="#353740"/><rect x="239" y="6.81" width="15.13" height="15.13" fill="#dbe1e9"/><rect x="401.71" y="28.13" width="180.09" height="172.79" fill="#07c"/><rect x="466.48" y="94.19" width="20.62" height="73.45" fill="#005a9e"/><rect x="532.14" y="94.19" width="20.62" height="73.45" fill="#005a9e"/><rect x="499.31" y="58.25" width="20.62" height="109.39" fill="#1ba9f5"/><rect x="433.65" y="69.19" width="20.62" height="98.45" fill="#1ba9f5"/><path d="M91.61,144.62a20.08,20.08,0,0,1,20,20.06h-9.78A10.29,10.29,0,0,0,91.61,154.4Z" fill="#ff957d"/><rect x="256.95" y="139.77" width="216.16" height="119.98" fill="#00bfb3"/><g clip-path="url(#a)"><path d="M380.27,259.39c.26.29,0,.81-.45.94a.54.54,0,0,1-.78-.39,1.68,1.68,0,0,0-.79-1.14c-.37-.19-.2-.61-.11-.92a1.42,1.42,0,0,1,1.22-.81,1.1,1.1,0,0,1,.7,1.06A1.15,1.15,0,0,0,380.27,259.39Zm-8.35-11.29c.54,0,.81-.44.75-1.12a1,1,0,0,0-.86-.78c-.44,0-1.21.75-1.17,1.11S371.31,248.14,371.92,248.1Zm21.38,7.47c-.05-.63-.42-1-1-1s-1,.42-1,.8a1.38,1.38,0,0,0,1.28,1.11A.85.85,0,0,0,393.3,255.57Zm-12.68-.32c-.74.05-1.08.32-1.05.86a1.13,1.13,0,0,0,1,.85,1.28,1.28,0,0,0,.78-1.12A.63.63,0,0,0,380.62,255.25Zm2.3-.52c-.61.54-.74.84-.51,1.22a.67.67,0,0,0,.77.33.76.76,0,0,0,.66-.74C383.78,255,383.32,254.88,382.92,254.73Zm-11.24-3.85c-.12.45-.35.85.09,1.14a.72.72,0,0,0,.92-.09.55.55,0,0,0,.14-.73C372.57,250.74,372.16,250.78,371.68,250.88ZM355,243.17a.72.72,0,0,0,.92-.09.54.54,0,0,0,.14-.72c-.26-.47-.67-.43-1.15-.32C354.74,242.48,354.51,242.88,355,243.17Zm27.64-1.61a.67.67,0,0,0,.67-.71.53.53,0,0,0-.59-.62.66.66,0,0,0-.7.67A.69.69,0,0,0,382.59,241.56Zm-29.25,9.35a.87.87,0,0,0-.68-.75.68.68,0,0,0-.64.66.66.66,0,1,0,1.32.09Zm31.94,3.4c.48-.24.23-.66.13-1.09-.52-.09-1-.1-1.14.4a.64.64,0,0,0,.19.6A1,1,0,0,0,385.28,254.31Zm-4.34-8.57c.25,0,.46-.39.44-.78s-.17-.45-.46-.42-.59.15-.6.54A.72.72,0,0,0,380.94,245.74Zm23.67,14.91a.62.62,0,0,0-.72.6.58.58,0,0,0,.33.44.73.73,0,0,0,.62-.11A.64.64,0,0,0,404.61,260.65Zm-11.53-9.32c.3,0,.71-.59.61-.8s-.4-.28-.64-.31a.42.42,0,0,0-.5.49C392.59,251,392.69,251.31,393.08,251.33Zm1.51,8.45c-.28-.07-.65.3-.55.56a.68.68,0,0,0,.51.36c.18,0,.63-.18.65-.4S394.78,259.84,394.59,259.78Zm-40.21-13.61c.13,0,.43,0,.47-.25s-.27-.34-.34-.32a.62.62,0,0,0-.35.27C354.13,245.93,354.31,246.18,354.38,246.17Zm25,4.07a1.07,1.07,0,0,0,.08.83.33.33,0,0,0,.51.07.74.74,0,0,0,.11-.59c0-.2,0-.4-.14-.56S379.52,250,379.42,250.24Zm-4.7,2.87a1.26,1.26,0,0,0,1.55.11c.42-.28.29-1.09-.08-1.69a1.24,1.24,0,0,0-1.6-.19A1.28,1.28,0,0,0,374.72,253.11Zm-4,3.49a.8.8,0,0,0-.92-.33c-.43.27-.65,0-1-.11a2.09,2.09,0,0,0-1,0,1.71,1.71,0,0,0-.55.29,4.87,4.87,0,0,0-.5.4c-.53.45-.64.89-.34,1.35a1.08,1.08,0,0,0,1.5.34,12.55,12.55,0,0,1,1.85-.89C370.4,257.54,370.9,257,370.76,256.6Zm6.65-7.25a1.14,1.14,0,0,0,1.18-1.19,1.44,1.44,0,0,0-1.36-1.33,1.5,1.5,0,0,0-1.26,1.35C376,248.86,376.55,249.34,377.41,249.35Zm9.78,9.94c-.58,0-1.14.52-1.11,1a1.56,1.56,0,0,0,1.21,1.15,1.07,1.07,0,0,0,.93-1.07A1.16,1.16,0,0,0,387.19,259.29ZM365.7,252.9c.78.33,1.45.26,1.66-.21a1.4,1.4,0,0,0-.66-1.54c-.53-.25-.81-.06-1.34,1-.43-.16-.85-.39-1.13.15a.72.72,0,0,0,.12.92c.1.09.3.19.4.15A7.49,7.49,0,0,0,365.7,252.9Zm-4-6.47c0-.59-.49-.92-1.17-.85a.94.94,0,0,0-1,1.09,1.1,1.1,0,0,0,1.22,1A1.14,1.14,0,0,0,361.66,246.43Zm18.21,7.94a.61.61,0,0,0,.21-.88.64.64,0,0,0-.87-.28,2,2,0,0,1-.59.15,1,1,0,0,0-1,.85c-.11.51.16.83.93.8A10.19,10.19,0,0,0,379.87,254.37Zm-31.67-6.56c.1.5.54.34.75.46a1.11,1.11,0,0,0,1.56-.4,1,1,0,0,0-.39-1.14.79.79,0,0,0-1.08,0C348.77,247,348.1,247.31,348.2,247.81ZM371.74,259a.34.34,0,0,0-.16,0,.93.93,0,0,0-.33-.48,2,2,0,0,0-2,.31,1.32,1.32,0,0,0,.39,1.78,1.52,1.52,0,0,0,1.49,0,.91.91,0,0,0,.83.29.85.85,0,0,0,.84-.87A1.64,1.64,0,0,0,371.74,259Zm17.1-3.47a.87.87,0,0,0-.8.72c0,.75.39,1.31.86,1.29a1.32,1.32,0,0,0,1-1.16A1.2,1.2,0,0,0,388.84,255.55Zm-21.62.4c0-.7-.3-1.26-.76-1.27a1.17,1.17,0,0,0-1,1c0,.42.45.9.95.94A.86.86,0,0,0,367.22,256Zm25.53,2.14c-.55,0-.88.42-.86,1.06s.41.78,1.05.75.83-.29.83-.68S393.13,258.08,392.75,258.09ZM387,251.88c.51-.07.93-.47.9-.87s-.59-1.06-1-1-.76.69-.74,1.23A.81.81,0,0,0,387,251.88Zm-23.21-2.45a1.13,1.13,0,0,0,1.07-.94.79.79,0,0,0-.73-.79,1,1,0,0,0-.93.94C363.19,249.1,363.42,249.41,363.79,249.43Zm5.46,3.37c0,.31.7.85,1.06.86s.6-.3.57-.85-.24-.89-.68-.88C369.6,252,369.2,252.32,369.25,252.8Zm13.57,6c-.63,0-1,.25-1,.6a1.15,1.15,0,0,0,1,.93c.35,0,.76-.57.72-1S383.24,258.74,382.82,258.76Zm-29.93-2.52a1,1,0,0,0,.77-1,1,1,0,0,0-1.19-.39.76.76,0,0,0,.42,1.4Zm48,1.62a.73.73,0,0,0-.64.74.69.69,0,0,0,.73.74.74.74,0,0,0,.69-.79A.7.7,0,0,0,400.92,257.86Zm-15.79-1.4c-.6.05-.93.34-.92.71a.74.74,0,0,0,.83.74.63.63,0,0,0,.55-.78C385.53,256.81,385.47,256.45,385.13,256.46Zm-16.57-8.34a.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6.69.69,0,0,0-.75.73A.77.77,0,0,0,368.56,248.12Zm22.65,5.42a.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6.69.69,0,0,0-.75.73A.77.77,0,0,0,391.21,253.54Zm6.88-1.26a.82.82,0,0,0-.66.76.63.63,0,0,0,.63.63.7.7,0,1,0,0-1.39Zm-39.22,6.63a.82.82,0,0,0-1.05.54.87.87,0,0,0,.91.86.57.57,0,0,0,.58-.58A.73.73,0,0,0,358.87,258.91Zm28.5-13.5c-.45,0-.73.24-.69.55a1.12,1.12,0,0,0,.87.82.7.7,0,0,0,.6-.78A.66.66,0,0,0,387.37,245.41ZM354.7,257.82a2.06,2.06,0,0,0,.16-.34.6.6,0,0,0,.44.21.82.82,0,0,0,.74-.57h.14a2,2,0,0,0,.41-.69c.07-.38-.38-.7-.81-.65a.42.42,0,0,0-.19.06.69.69,0,0,0-.29-.13.94.94,0,0,0-1,.54,1.3,1.3,0,0,0-1.62.26,1.32,1.32,0,0,0-.16,1.4,1,1,0,0,0-.81.18,1.56,1.56,0,0,0-.76,1.21h-.12a1.4,1.4,0,0,0-1.08,1.29c0,.65.62,1.08,1.44,1.05a1,1,0,0,0,1.07-1.08.77.77,0,0,0,0-.15h.11a.65.65,0,0,0,.17.82.73.73,0,0,0,1-.19.69.69,0,0,0-.1-1l-.11-.07a1.27,1.27,0,0,0,.13-1.35.3.3,0,0,0,0-.08.9.9,0,0,0,.56-.06.75.75,0,0,0,.81.66.74.74,0,0,0,.62-.75A.79.79,0,0,0,354.7,257.82Zm11.65,3.05a.75.75,0,0,0-.31.58.67.67,0,0,0,.67.64c.51,0,.71-.54.73-.82S366.82,260.59,366.35,260.87Zm29.24-5.63a.67.67,0,0,0-.68.6.69.69,0,0,0,.66.72.53.53,0,0,0,.64-.57A.66.66,0,0,0,395.59,255.24ZM380.81,248a.74.74,0,0,0-.4.57.54.54,0,0,0,.57.64.59.59,0,0,0,.6-.56C381.63,248.41,381.06,247.92,380.81,248ZM363,256.15a.77.77,0,0,0,.35.55.57.57,0,0,0,.55-.06c.32-.3.22-.65-.07-1C363.47,255.68,363.06,255.68,363,256.15Zm-7.39-6.55c0,.31.22.56.54.47s.82-.33.8-.58-.61-.46-.86-.52S355.57,249.29,355.62,249.6ZM377.13,251a.76.76,0,0,0,.23.61c.4.26.65-.07.89-.35-.08-.42-.28-.72-.72-.66A.61.61,0,0,0,377.13,251Zm5.6-1.08c0,.32.28.36.52.35s.61-.27.5-.57-.16-.48-.37-.53S382.68,249.56,382.73,249.9Zm-14-4.7c.24-.07.8-.34.8-.61s-.66-.41-.9-.43-.48.2-.42.55S368.37,245.28,368.69,245.2Zm3.27-5.3c.22,0,.75-.3.73-.49s-.48-.47-.71-.54-.51.18-.53.56A.41.41,0,0,0,372,239.9Zm-.83,9.85c.16,0,.59-.33.57-.52s-.54-.46-.63-.41-.54.39-.47.56A.68.68,0,0,0,371.13,249.75Zm8.51-11.42c.19,0,.5-.19.53-.35s-.26-.43-.42-.46-.63.19-.64.38S379.52,238.35,379.64,238.33Zm18.14,9.89c0-.35-.81-.57-1.11-.56a.79.79,0,0,0-.63.66c0,.34.53.55.83.6S397.79,248.57,397.78,248.22Zm-10.85-5.05c.1,0,.45-.18.45-.3s-.33-.28-.47-.31-.28.19-.27.25S386.8,243.14,386.93,243.17Zm-1.41,2.4a.44.44,0,0,0-.34.33c0,.12.13.5.3.48s.3-.3.29-.39S385.69,245.54,385.52,245.57Zm6.8.09c.21,0,.34-.32.34-.44a.47.47,0,0,0-.32-.31c-.1,0-.31.18-.32.29S392.12,245.69,392.32,245.66Zm-25.89-3.79c.17,0,.34-.34.33-.46s-.13-.35-.31-.35-.3.21-.32.33S366.27,241.87,366.43,241.87Zm-3.92-3.66c.12,0,.25-.23.28-.37s-.1-.37-.29-.37-.26.33-.27.46A.35.35,0,0,0,362.51,238.21Zm25.6,6.38c.13,0,.17-.16.17-.22s-.15-.15-.21-.15-.18.08-.17.17A.2.2,0,0,0,388.11,244.59Zm-22,2c.13,0,.17-.15.17-.22s-.16-.15-.21-.15-.18.08-.18.17A.21.21,0,0,0,366.11,246.6Zm11-1.36a.38.38,0,0,0,.46-.29c0-.28-.33-.29-.47-.31s-.29.19-.27.25A.53.53,0,0,0,377.12,245.24Zm-32.69,13.33a.44.44,0,0,0-.34.33c0,.12.13.5.3.48s.3-.3.29-.39S344.6,258.54,344.43,258.57Zm-.82-2.58c-.14,0-.36.08-.36.35a.38.38,0,0,0,.44.42.39.39,0,0,0,.36-.47A.42.42,0,0,0,343.61,256Zm32.67-1.52a1.75,1.75,0,0,0-1.23,1.14.67.67,0,0,0-.4-.36c-.39-.12.12-.91-.41-1.1s-.52-.86-1.19-1-1.4.12-1.33.73a2.39,2.39,0,0,0,.82,1.38c.3.32.8,0,.74.57s-.06,1.59.91,1.59a1.18,1.18,0,0,0,1-1v0a1.33,1.33,0,0,0,1.1.45,1.32,1.32,0,0,0,1.06-1.38A1.11,1.11,0,0,0,376.28,254.47Zm14.38,5a.73.73,0,0,0-.61.76.68.68,0,0,0,.8.56.58.58,0,0,0,.56-.67A.76.76,0,0,0,390.66,259.49Zm-57-1.92a1.18,1.18,0,0,1-1.13-.61,1.1,1.1,0,0,0-1.26-.11,1.43,1.43,0,0,0-.11,1.47c.19.26.41.65.79.48a1.66,1.66,0,0,1,1.38.08.56.56,0,0,0,.8-.38C334.24,258.1,334,257.55,333.63,257.57Zm-15.45.15a1.18,1.18,0,0,0,1.41-.51c.31-.46.15-.91-.42-1.28a1,1,0,0,0-1.15.2s0,0,0,.05a.5.5,0,0,0-.29.16.75.75,0,0,0,0,1,.61.61,0,0,0,.27.17A.5.5,0,0,0,318.18,257.72ZM339,246.05a.85.85,0,0,0-.32-1.11,1,1,0,0,0-1.33,1.43A1.36,1.36,0,0,0,339,246.05Zm-7.45,8.45a.64.64,0,0,0-.93.24c-.42.62-.41,1,0,1.36a1.14,1.14,0,0,0,1.3-.29A1.28,1.28,0,0,0,331.51,254.5Zm19,2.51a.59.59,0,0,0,.88-.1.67.67,0,0,0,0-1,.72.72,0,0,0-1,.09A.75.75,0,0,0,350.5,257ZM321,244.78a.68.68,0,0,0-.14-1,.54.54,0,0,0-.86.08.67.67,0,0,0,.1,1A.71.71,0,0,0,321,244.78Zm10.54,6.08a.65.65,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.52-.38-.58-.77-.77C331.54,250.07,331.26,250.42,331.54,250.86Zm-8.26-2.21c.15-.21,0-.61-.34-.84a.39.39,0,0,0-.62.11.56.56,0,0,0,.05.81A.75.75,0,0,0,323.28,248.65Zm26.89-8.54c.16-.12.34-.4.3-.56-.09-.45-.66-.5-.87-.4a.62.62,0,0,0,0,.94A.57.57,0,0,0,350.17,240.11Zm-1.57,10.13c-.37-.08-.88.63-.71.88s1,.22,1.1-.15A.67.67,0,0,0,348.6,250.24Zm-14.26-7.69c.27.16.56.26.81,0s0-.92-.25-1-.46.14-.64.32A.42.42,0,0,0,334.34,242.55Zm10.12,9.28a.91.91,0,0,0,1.34-.29,1.28,1.28,0,0,0,.21-.75.7.7,0,0,0,.64.64.61.61,0,0,0,.66-.59.71.71,0,0,0-.64-.66.59.59,0,0,0-.66.55.8.8,0,0,0-.28-.6,1.34,1.34,0,0,0-1.49.29A.92.92,0,0,0,344.46,251.83Zm-.93-5.48c-.16-.15-.62.06-.78.18a.49.49,0,0,0,.1.77.68.68,0,0,0,.6-.18C343.56,247,343.69,246.51,343.53,246.35Zm12.3-2.06c0,.3-.13.69.13.92s.56-.08.61-.21.24-.91,0-1.08S355.84,244.19,355.83,244.29Zm-29.23,8.77a.33.33,0,0,0,.37-.36c0-.21-.22-.33-.4-.45s-.31-.26-.53-.24-.31.35-.15.6A1.12,1.12,0,0,0,326.6,253.06ZM324.92,256a1.25,1.25,0,0,0-1.14,1.14,1.29,1.29,0,0,0,1.48,1,1.26,1.26,0,0,0,1-1.15C326.34,256.42,325.63,256,324.92,256Zm23.23-2a1.38,1.38,0,0,0-1,.29.75.75,0,0,0-.14-.12c-.57-.47-1.07-.25-1.57.15-.28-.28-.46-.74-1-.46a.63.63,0,0,0-.35.76c.14.56.61.48,1,.44l.25.69-.88.35a4.31,4.31,0,0,0-.1.75,1.46,1.46,0,0,0,.83,1c.38.05.78-.31.95-.84.05-.18.08-.35.13-.53a2.3,2.3,0,0,0,1.17-.53,2.69,2.69,0,0,0,.29.16.7.7,0,0,0,.36,0,1,1,0,0,0,.65.2c.5,0,.77-.26.76-.69a1.34,1.34,0,0,0-.47-1A1.21,1.21,0,0,0,348.15,253.91Zm-2-5.69a1.26,1.26,0,0,0,.16.33.88.88,0,0,0,1.59-.19,5.79,5.79,0,0,0,.35-1.42,1.36,1.36,0,0,0-1-1.25c-.31-.08-1,0-1,.67C346.79,247.31,346,247.42,346.17,248.22Zm-24.31,4a1.18,1.18,0,0,0-.18.45.69.69,0,0,0-.2-.31.68.68,0,0,0-1,.14.69.69,0,0,0,.06,1,.84.84,0,0,0,1.05-.19.41.41,0,0,0,.07-.15,1.44,1.44,0,0,0,.45.85,1.26,1.26,0,0,0,1.81-.41,1.15,1.15,0,0,0,.15-1.21.47.47,0,0,0,.52-.08c.22-.26-.05-.66-.18-.84a.44.44,0,0,0-.69-.12.72.72,0,0,0-.24.48A1.41,1.41,0,0,0,321.86,252.24Zm16.55,6.33a1.47,1.47,0,0,0-2.09.43,1.43,1.43,0,0,0,.3,2,1.21,1.21,0,0,0,1.8-.36C339.06,259.86,339.06,259.05,338.41,258.57Zm-.6-6.52a1.15,1.15,0,0,0,.09,1.49,1.55,1.55,0,0,0,1.65-.25,1.06,1.06,0,0,0-.27-1.39A1.15,1.15,0,0,0,337.81,252.05Zm-.72,4a1.26,1.26,0,0,0,.33,1.64c.55.44,1.16.31,1.65-.34a1.07,1.07,0,0,0-.16-1.68A1.23,1.23,0,0,0,337.09,256.05Zm-9-1.45a2,2,0,0,1-.25.56,1,1,0,0,0,.05,1.32c.34.4.75.38,1.2-.24a12.48,12.48,0,0,0,.32-1.44.63.63,0,0,0-.57-.72A.65.65,0,0,0,328.11,254.6Zm23.74-7.86a1,1,0,0,0,1.26-1.58,1.34,1.34,0,0,0-1.66.32A1,1,0,0,0,351.85,246.74ZM336,249.52c.6.45,1.27.5,1.55.12a1.32,1.32,0,0,0-.31-1.48,1.2,1.2,0,0,0-1.32.29A.88.88,0,0,0,336,249.52Zm4.64-1.26c.4.29.87.15,1.24-.37a.76.76,0,0,0,0-1.07,1.47,1.47,0,0,0-1.52.11A.9.9,0,0,0,340.59,248.26Zm-9.79-.37a.81.81,0,0,0,1.05-.25,1,1,0,0,0-.13-1.24,1.25,1.25,0,0,0-1.44.14C330.07,246.84,330.36,247.57,330.8,247.89Zm10.56,5.68a1,1,0,0,0-.06,1.09c-.06.06-.12.13-.11.16s.16.33.28.35a.41.41,0,0,0,.41-.19.72.72,0,0,0,.59-.23,1.11,1.11,0,0,0-.22-1.33A.62.62,0,0,0,341.36,253.57Zm-6.66,1.6c-.36.52-.41.94-.13,1.15a1.14,1.14,0,0,0,1.33-.21,1,1,0,0,0-.35-1.19C335.26,254.73,334.94,254.83,334.7,255.17Zm19.22-2.53a.75.75,0,0,0-.25-1,.67.67,0,0,0-.94.24.68.68,0,0,0,.16,1A.84.84,0,0,0,353.92,252.64Zm-7.57-11.45a.75.75,0,0,0-.2-1,.69.69,0,0,0-1,.19.73.73,0,0,0,.19,1A.69.69,0,0,0,346.35,241.19Zm-11,11.71a.65.65,0,0,0-.28-.92c-.29-.15-.61-.32-.81,0-.33.49-.3.93,0,1.15A.75.75,0,0,0,335.4,252.9ZM316.45,259a.68.68,0,0,0,.11,1,.76.76,0,0,0,1-.15.8.8,0,0,0-.21-1.05A.64.64,0,0,0,316.45,259Zm18.21-14.52a.68.68,0,0,0,.11,1,.75.75,0,0,0,1-.15.81.81,0,0,0-.21-1.05A.64.64,0,0,0,334.66,244.46Zm5.4-4.44A.76.76,0,0,0,340,239a.75.75,0,0,0-1,.19.81.81,0,0,0,.19,1A.61.61,0,0,0,340.06,240ZM327,244.25a1.13,1.13,0,0,0,1.19-.18.71.71,0,0,0-.25-.95.66.66,0,0,0-.94.24C326.72,243.74,326.72,244.1,327,244.25ZM352.81,249a.68.68,0,0,0,.11,1,.81.81,0,0,0,1-.09.66.66,0,0,0-.15-.95A.65.65,0,0,0,352.81,249Zm-12-5.26a.55.55,0,0,0-.05-.87.67.67,0,0,0-1,0,.69.69,0,0,0,.05.91A.71.71,0,0,0,340.81,243.77ZM325,250.16a.78.78,0,0,0,.21.67.55.55,0,0,0,.86-.06A.61.61,0,0,0,326,250C325.81,249.74,325.07,249.89,325,250.16Zm24.09,2.43c-.4.15-.63.42-.46.83.06.15.34.33.45.29s.52-.26.57-.45C349.76,252.86,349.4,252.72,349.1,252.59Zm9.54,2.27a1.14,1.14,0,0,0-.41.78c0,.41.54.81,1.06.79s1-.29,1-.8a1.19,1.19,0,0,0-1-1.1,1.06,1.06,0,0,0-.19.06.5.5,0,0,0,.08-.12c.16-.37.37-.71.55-1.07a.58.58,0,0,0,.05-.93.76.76,0,0,0-1,0,.28.28,0,0,0-.18.14,1.27,1.27,0,0,1-.49.28,1,1,0,0,0-.85.82c-.06.35.55,1,1,1.09A2,2,0,0,0,358.64,254.86Zm-2.74,3.48a.73.73,0,0,0,.1,1.05.69.69,0,0,0,.95-.24.64.64,0,0,0-.1-.89A.62.62,0,0,0,355.9,258.34Zm4.37.29a2.38,2.38,0,0,0-.64,0,.67.67,0,0,0,.19,1c.28.17.45,0,.6-.2A.45.45,0,0,0,360.27,258.63Zm-32.48-9.87a.37.37,0,0,0,0-.34c-.13-.13-.43,0-.55.12a.3.3,0,0,0,0,.37.38.38,0,0,0,.17.06.84.84,0,0,0,.26.82c.28.17.45,0,.6-.2s.16-.64-.15-.74A1.17,1.17,0,0,0,327.79,248.76Zm34.75,7.69a1.83,1.83,0,0,0-.65,0,.68.68,0,0,0,.19,1c.29.17.46,0,.6-.2S362.84,256.55,362.54,256.45Zm-48.1,1c-.2.22-.14.5.17.66s.58.2.7-.1.23-.84,0-1S314.6,257.23,314.44,257.41Zm41.38-7c-.24.24-.27.74,0,.86s.78.28,1,0-.13-.65-.27-.81A.44.44,0,0,0,355.82,250.46Zm-39.18-5.35c.1-.17.16-.52.05-.63a.63.63,0,0,0-.62,0c-.12.1-.24.62-.1.74S316.59,245.21,316.64,245.11ZM335.59,238c.15-.13.29-.94,0-1.15s-1,.29-1.12.53a.76.76,0,0,0,.13.9C334.88,238.53,335.37,238.25,335.59,238Zm-10.66,4.3c.08-.06.14-.47.05-.54s-.43.09-.53.18a.43.43,0,0,0,0,.37A.54.54,0,0,0,324.93,242.34Zm34.52,5.25c.08-.07.18-.43.05-.54s-.43.08-.53.18-.09.29,0,.36A.45.45,0,0,0,359.45,247.59Zm-32.87-2.13a.47.47,0,0,0-.13-.47c-.13-.08-.4-.21-.49-.07a.5.5,0,0,0,.05.48C326.1,245.49,326.49,245.61,326.58,245.46Zm3.64-5.84a.49.49,0,0,0-.14-.53.47.47,0,0,0-.44,0,.44.44,0,0,0,0,.43C329.76,239.65,330.11,239.8,330.22,239.62Zm-19.54,17.56a.4.4,0,0,0,.06.46c.09.09.46.19.56.06s-.06-.48-.15-.55A.41.41,0,0,0,310.68,257.18Zm-4.79.91a1.29,1.29,0,0,0-.34-.55,1.47,1.47,0,0,0-2.12.21,1.42,1.42,0,0,0,.07,2,1.2,1.2,0,0,0,1.83-.16,2,2,0,0,0,.59-1,.16.16,0,0,0,.08-.06c.08-.1,0-.34-.11-.45Zm58.66-.33a.37.37,0,0,0,.07.45c.09.09.46.19.56.06s-.06-.48-.16-.54A.39.39,0,0,0,364.55,257.76Zm-37.76-15.47a.23.23,0,0,0-.07-.28c-.06,0-.22,0-.25.08a.2.2,0,0,0,0,.24A.21.21,0,0,0,326.79,242.29Zm-12.27,18.38c0,.06,0,.19,0,.24a.19.19,0,0,0,.28,0,.22.22,0,0,0-.07-.28C314.71,260.55,314.55,260.62,314.52,260.67ZM349.6,244a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.23.23,0,0,0-.07-.28S349.63,244,349.6,244Zm-29,6.8c-.19-.2-.42.08-.53.18s0,.34,0,.36a.54.54,0,0,0,.45,0A.37.37,0,0,0,320.58,250.81Zm20.49-1.56a.77.77,0,0,0-1,.18.72.72,0,0,0,.23,1,.68.68,0,0,0,.93-.29A.57.57,0,0,0,341.07,249.25Zm23.08,2.12c.18-.54-.48-.87-.88-.77s-.28,0-.57-.29a.71.71,0,0,0-1.24.1,1.08,1.08,0,0,0-.12.62,1.2,1.2,0,0,0-.51.89,1.31,1.31,0,0,0,1,1.39,1.75,1.75,0,0,0,1.47-1.18A1.41,1.41,0,0,0,364.15,251.37ZM301.27,257c.19-.38,0-.95-.36-1a1.18,1.18,0,0,1-1.05-.73,1.09,1.09,0,0,0-1.24-.25,1.44,1.44,0,0,0-.28,1.45c.16.28.34.69.74.56a1.52,1.52,0,0,1,1.19.15,1.12,1.12,0,0,0-.27.83c.38.21.7.52,1.11.19a.6.6,0,0,0,.14-.83l-.15-.16A.78.78,0,0,0,301.27,257Zm-14.55-4.2-.1-.05a1.88,1.88,0,0,0,.64-.45,1.68,1.68,0,0,0,.56-1.51c-.11-.58-.85-.66-1.18-1.18-.78-1.22-1.8-.81-2.51-.14a1.43,1.43,0,0,0-.45.84,1.5,1.5,0,0,0,.4,1.2c.31.39.25.9.7,1.13a2.4,2.4,0,0,0,.77.24,1.63,1.63,0,0,0,0,1.6,1.19,1.19,0,0,0,1.46-.36C287.35,253.7,287.25,253.23,286.72,252.8Zm20.76-7.64a.83.83,0,0,0-.2-1.13.93.93,0,0,0-1.38,0,.94.94,0,0,0-.1,1.24A1.35,1.35,0,0,0,307.48,245.16Zm-8.08,8.93a1.28,1.28,0,0,0-.25-1.34.64.64,0,0,0-1,.13c-.48.57-.52,1-.12,1.35A1.13,1.13,0,0,0,299.4,254.09Zm1.25-3.3c-.43-.34-.84-.1-1.22.08a3.66,3.66,0,0,0,0,.47,1.27,1.27,0,0,0-.15,1.11.79.79,0,0,0,.89.46,1,1,0,0,0,.68-1,1.51,1.51,0,0,0-.09-.18A.74.74,0,0,0,300.65,250.79ZM289.7,257a.71.71,0,0,0,.57-.72.52.52,0,0,0-.42-.6c-.51-.14-.77.18-1,.6C289.06,256.63,289.19,257.07,289.7,257Zm0-15a.44.44,0,0,0,.37.06c.12-.08.33-.16.27-.37a.25.25,0,0,0-.34-.18l-.08,0a.75.75,0,0,0-.22-.55.53.53,0,0,0-.86,0,.67.67,0,0,0,0,1A.72.72,0,0,0,289.73,242Zm9.85,7.18a.65.65,0,0,0,.56.29,1,1,0,0,0,.63-.53c.17-.51-.31-.62-.68-.86C299.66,248.35,299.34,248.66,299.58,249.13Zm-8-3.11c.17-.19,0-.61-.25-.87a.38.38,0,0,0-.62,0c-.2.25-.31.53,0,.81A.74.74,0,0,0,291.61,246Zm27.67-5.53a.74.74,0,0,0,.36-.52c0-.46-.6-.57-.83-.49a.63.63,0,0,0-.07.94A.55.55,0,0,0,319.28,240.49Zm-3.48,10.7c.14.26,1,.33,1.1,0a.64.64,0,0,0-.3-.76C316.24,250.27,315.66,250.92,315.8,251.19Zm-11.72-10a.82.82,0,0,0-.14-1c-.22-.07-.47.09-.67.25a.41.41,0,0,0,0,.69C303.53,241.36,303.8,241.5,304.08,241.23Zm8.23,10.29h0c-.19.19-.11.49.16.72a.41.41,0,0,0,.68-.12,1.43,1.43,0,0,0,.13-.45,1,1,0,0,0,.39-.29,1.1,1.1,0,0,0,.09-1.41,1.33,1.33,0,0,0-1.51.12A.92.92,0,0,0,312.31,251.52ZM312,246c-.15-.17-.63,0-.8.09a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11C312,246.6,312.13,246.14,312,246Zm13.11.09c.12-.24.33-.88.15-1.07s-.78.18-.81.29c-.06.29-.21.66,0,.92S325,246.19,325.1,246.06Zm-30.68,4.71a.32.32,0,0,0,.4-.32.72.72,0,0,0-.34-.49c-.15-.13-.28-.29-.5-.29s-.34.31-.21.58A1.08,1.08,0,0,0,294.42,250.77Zm22.25,4.74a1.3,1.3,0,0,0-.93-1.52,1.43,1.43,0,0,0-1,.17l-.13-.13c-.51-.53-1-.36-1.57,0-.25-.31-.38-.78-.91-.57a.66.66,0,0,0-.44.73c.08.56.55.53,1,.54l.17.71-.91.26a3.78,3.78,0,0,0-.18.74,1.39,1.39,0,0,0,.71,1.09c.37.1.81-.21,1-.73.07-.16.13-.33.19-.51a2.19,2.19,0,0,0,1.22-.39l.27.19A1.26,1.26,0,0,0,316.67,255.51Zm-2-9.24c.42,1-.36,1-.29,1.85a1.4,1.4,0,0,0,.12.35.88.88,0,0,0,1.6,0,5.41,5.41,0,0,0,.5-1.36,1.36,1.36,0,0,0-.86-1.36C315.47,245.61,314.77,245.63,314.7,246.27ZM307.15,251a1.15,1.15,0,0,0-1.48,0,1.13,1.13,0,0,0-.07,1.48,1.57,1.57,0,0,0,1.67-.06A1.08,1.08,0,0,0,307.15,251Zm-29.94,9.53a.94.94,0,0,0,.11,1.44,1.11,1.11,0,0,0,1.55-.19,1.15,1.15,0,0,0-.23-1.49A.94.94,0,0,0,277.21,260.54Zm27.31-5.64a1.25,1.25,0,0,0,.14,1.66,1.26,1.26,0,0,0,1.71-1.84A1.24,1.24,0,0,0,304.52,254.9Zm-9.17-.58c.29.43.7.46,1.22-.11a11.88,11.88,0,0,0,.47-1.4.61.61,0,0,0-.48-.77h-.19c-.21-.25-.55-.3-1-.15s-.82.69-.73,1a1.09,1.09,0,0,0,.59.61A.94.94,0,0,0,295.35,254.32Zm26.24-7.18a.9.9,0,0,0,.05-1.3A1.35,1.35,0,0,0,320,246a1,1,0,0,0,.26,1.3A.93.93,0,0,0,321.59,247.14Zm-17.45.07a.89.89,0,0,0,0,1.08c.54.51,1.2.63,1.52.28a1.29,1.29,0,0,0-.15-1.5A1.2,1.2,0,0,0,304.14,247.21Zm4.55-1a.91.91,0,0,0,.17,1.37c.36.33.84.24,1.27-.24a.75.75,0,0,0,.09-1.06A1.48,1.48,0,0,0,308.69,246.18Zm-8.46-.21a1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.45,0c-.24.27,0,1,.36,1.4A.82.82,0,0,0,300.23,246ZM309,252.9a.93.93,0,0,0-.09,1.24.77.77,0,0,0,1.06.06,1.1,1.1,0,0,0-.08-1.35A.62.62,0,0,0,309,252.9Zm-5.93.71a.59.59,0,0,0-.87.15c-.41.48-.51.89-.26,1.13a1.13,1.13,0,0,0,1.35-.06A1,1,0,0,0,303.11,253.61Zm12.25-12.46a.75.75,0,0,0-.09-1.05.69.69,0,0,0-1,.08.74.74,0,0,0,.08,1A.7.7,0,0,0,315.36,241.15Zm-12.17,10.43a.65.65,0,0,0-.18-.94c-.27-.18-.57-.39-.8-.13-.38.45-.41.89-.13,1.14A.75.75,0,0,0,303.19,251.58Zm-19.51,5a.76.76,0,0,0,1-.05.8.8,0,0,0,0-.95,1.55,1.55,0,0,0-.49-1.5,1.27,1.27,0,0,0-1.35-.11c.06-.22.08-.46,0-.56s-.76.18-.94.34-.19.49.11.68a.76.76,0,0,0,.45.15,1.29,1.29,0,0,0,.6,1.32,1.6,1.6,0,0,0,.44.14A.65.65,0,0,0,283.68,256.58ZM304.27,243a.64.64,0,0,0-.89.07.69.69,0,0,0,0,1,.78.78,0,0,0,1,0A.83.83,0,0,0,304.27,243Zm5-3.75a.7.7,0,1,0-1-1,.83.83,0,0,0,.09,1A.61.61,0,0,0,309.24,239.29Zm-13.38,1.89c-.3.34-.33.7-.09.88A1.13,1.13,0,0,0,297,242a.7.7,0,0,0-.14-1A.66.66,0,0,0,295.86,241.18Zm25.06,8.48a.67.67,0,0,0,0,1,.83.83,0,0,0,1,0,.66.66,0,0,0,0-1A.64.64,0,0,0,320.92,249.66Zm-12.28-7.49a.66.66,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,308.64,242.17Zm-14.49,6.27a.59.59,0,0,0,0-.82c-.17-.24-.92-.17-1,.1a.78.78,0,0,0,.13.68A.55.55,0,0,0,294.15,248.44Zm22.14,5.12c0,.15.3.36.42.33a1,1,0,0,0,.61-.38c.15-.39-.2-.57-.48-.73C316.42,252.89,316.16,253.13,316.29,253.56ZM292.7,252.4a.76.76,0,0,0,.59.26c.48-.1.41-.51.38-.87-.36-.24-.71-.31-1,.05A.59.59,0,0,0,292.7,252.4Zm33.93,3.36c.2-.35.44-.67.66-1a.57.57,0,0,0,.15-.92.75.75,0,0,0-1.05-.08,2.31,2.31,0,0,1-.63.31.56.56,0,0,0-.76.24.54.54,0,0,0,0,.15,1,1,0,0,0-.19.35c-.1.34.43,1.08.83,1.19S326.37,256.23,326.63,255.76Zm3.14,2.34a1.71,1.71,0,0,0-.57-.1,1.18,1.18,0,0,0-.43-.55,1.11,1.11,0,0,0-1.48.24,1.77,1.77,0,0,0,.15,1.67.7.7,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.12-1.53.31a1.07,1.07,0,0,0-.19.18.58.58,0,0,0-.16-.32.61.61,0,0,0-.85-.09.82.82,0,0,0,0-.22.56.56,0,0,0-.27-.49,1,1,0,0,0,.55-.85,1.18,1.18,0,0,0-.71-1,.91.91,0,0,0-1,.43,1.28,1.28,0,0,0-1.64.08,1.36,1.36,0,0,0-.35,1.22h0a.62.62,0,0,1,0,.13,1,1,0,0,0-.77.1,1.34,1.34,0,0,0-.81,1.69,1.6,1.6,0,0,0,1.19.69.65.65,0,0,0,.08.83.74.74,0,0,0,1-.08.7.7,0,0,0,0-1l-.11-.08a1.28,1.28,0,0,0,.28-1.33l0-.08a1.18,1.18,0,0,0,1.25-.44,1.67,1.67,0,0,0,.33-.5.58.58,0,0,0,.18.17,1.23,1.23,0,0,0-.56.67c.28.36.45.79.95.62a.56.56,0,0,0,.17-.09.71.71,0,0,0,.18.67.67.67,0,0,0,.79,0,.56.56,0,0,0,.28.58,2.35,2.35,0,0,0,1.59.21c.44,0,.53-.6.9-.23s1.23,1,1.82.26a1.18,1.18,0,0,0-.14-1.41h0a1.32,1.32,0,0,0,1-.58.58.58,0,0,0,.05-.14c.24.16.42,0,.58-.14A.46.46,0,0,0,329.77,258.1ZM285.4,241.77c.11-.15.21-.49.12-.62a.65.65,0,0,0-.62,0c-.13.09-.31.59-.18.73S285.33,241.87,285.4,241.77ZM305,236.84c.17-.12.39-.91.14-1.15s-1,.19-1.18.41a.8.8,0,0,0,0,.91C304.25,237.25,304.77,237,305,236.84ZM294,239.93c.08-.05.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.37A.52.52,0,0,0,294,239.93Zm5.55-2.12a.49.49,0,0,0-.08-.54.43.43,0,0,0-.44,0,.42.42,0,0,0,0,.42C299,237.8,299.38,238,299.5,237.81Zm32.13,21.81c-.13.12-.06.37,0,.46s.43.24.55.12,0-.48-.1-.56A.41.41,0,0,0,331.63,259.62Zm2.33-4.78c.09-.1,0-.34-.06-.46s-.34-.19-.48-.06.06.42.15.52A.35.35,0,0,0,334,254.84ZM295.8,240.08c.08-.1,0-.23-.05-.28s-.21,0-.25,0a.2.2,0,0,0,0,.24A.2.2,0,0,0,295.8,240.08ZM281.58,257a.21.21,0,0,0,0,.25.21.21,0,0,0,.29,0,.23.23,0,0,0,0-.28C281.78,256.91,281.61,257,281.58,257Zm37-12.46c.08-.1,0-.23,0-.28a.25.25,0,0,0-.25.05c0,.05-.08.18,0,.24A.21.21,0,0,0,318.57,244.54Zm-30,3.86a.39.39,0,0,0,.1-.53c-.17-.22-.43,0-.55.12s-.06.33,0,.36A.52.52,0,0,0,288.59,248.4ZM309.77,260c-.25-.46-.67-.88-.62-1.06s1.14-.51,1.26-1.34a1.43,1.43,0,0,0-1.19-1.57,2.4,2.4,0,0,0-2.19,1.32c-.18.65.53,1.09.51,1.27s-1.05.57-1.24,1.38a2,2,0,0,0,2.71,2,1.88,1.88,0,0,0,.73-.7.65.65,0,0,0,.67-.18.81.81,0,0,0,0-1A.61.61,0,0,0,309.77,260Zm-.45-10.56a.57.57,0,0,0-.1-.87.75.75,0,0,0-1,.08.72.72,0,0,0,.12,1A.69.69,0,0,0,309.32,249.45Zm20.46,4.35a1.68,1.68,0,0,0,2-.33.55.55,0,0,0,.47.29.68.68,0,0,0,.74-.4.75.75,0,0,0-.18-1,.92.92,0,0,0-1.08.15.8.8,0,0,0-.57-.17c-.41,0-.29,0-.54-.36a.71.71,0,0,0-1.24,0A1.41,1.41,0,0,0,329.78,253.8Zm-62.44-11.86a1.57,1.57,0,0,0,.84-1.74.85.85,0,0,0-.19-.32.51.51,0,0,0,.09-.78c-.12-.12-.11-.47.06-.39s.4,0,.62-.42a.72.72,0,0,0-.22-1,1,1,0,0,0-1.44.34c-.32.5-.1.76-.33,1s-.15.52.08.82a2.28,2.28,0,0,0-.51.09,1.15,1.15,0,0,0-.75,1.44A1.5,1.5,0,0,0,267.34,241.94Zm29.19,14.62a1.36,1.36,0,0,0-.44-1.19,1.11,1.11,0,0,0-1.49.08,1.76,1.76,0,0,0,0,1.67.76.76,0,0,0-.54,0c-.35.21-.57-.71-1.07-.47s-.95-.19-1.5.12a1.25,1.25,0,0,0-.83,0,1.17,1.17,0,0,0-.9,1.4l-.07-.08c-.46-.41-.81-.45-1.11-.13a.87.87,0,0,0,0,1.3,1.5,1.5,0,0,0,1.35-.16.63.63,0,0,0,.15-.24,1.36,1.36,0,0,0,1.53.36,1.1,1.1,0,0,0,.54-.64l.47,0c.44,0,.6-.54.92-.13s1.11,1.16,1.78.46a1,1,0,0,0,.21-.47A1.17,1.17,0,0,0,297,257,.87.87,0,0,0,296.53,256.56ZM280.58,249a1.32,1.32,0,0,0,1.11-1.49,4.6,4.6,0,0,0-.74-.46,1,1,0,0,0-1.22.33,1.11,1.11,0,0,0,.14,1.41A1,1,0,0,0,280.58,249Zm-14.16-11.08a1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.18-.39,1,1,0,0,0-.64,1.38A1,1,0,0,0,266.42,237.92Zm-10,3a1.21,1.21,0,0,0-.65,1.36c.12.37.85.61,1.35.44a.84.84,0,0,0,.6-1C257.51,241.07,256.85,240.68,256.42,240.87Zm21.48,6.44a1.54,1.54,0,0,0,.68-1.37.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14S277.49,247.47,277.9,247.31Zm0-11.34c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,277.87,236Zm-4.84-.63c-.48.15-.83.68-.7,1a1.09,1.09,0,0,0,1.08.64c.41-.14.57-.77.35-1.34A.52.52,0,0,0,273,235.34ZM255.17,257.7a.75.75,0,0,0,.55,1.39.84.84,0,0,0,.36-1A.73.73,0,0,0,255.17,257.7Zm10.39-27.3c.17-.06.22-.31.2-.43s-.28-.41-.44-.35-.21.43-.17.54S265.4,230.45,265.56,230.4Zm18.25,5.53c.23-.06.15-.42.1-.47s-.22-.26-.42-.18a.25.25,0,0,0-.14.35C283.42,235.75,283.57,236,283.81,235.93Zm-11,5.67c0,.28.58.61.93.57a.51.51,0,0,0,.41-.67c-.11-.56-.36-.89-.64-.86A1.19,1.19,0,0,0,272.81,241.6Zm5.33,15.71c.05-.7-.3-1-1.18-1.13a5,5,0,0,0-.63-1,.78.78,0,0,0-1.1,0c-.34.39-.62.82-.94,1.25-.69,0-.73,0-.81.78.14.26.76.19.53.71a5.75,5.75,0,0,0-.93,0,.88.88,0,0,0-.7.71c-.12.36.18.53.37.72a1.22,1.22,0,0,0,1.38.17q.11-.51.21-1.08l.33.27c.46.41.42.71-.19.88a1.15,1.15,0,0,0-.87,1.24,1.19,1.19,0,0,0,.83,1.19,1,1,0,0,0,1.32-.48,2.75,2.75,0,0,0,.28-1.16c0-.32,0-.58.32-.74s.4-.58.16-.95C277.56,258.66,278.07,258.19,278.14,257.31Zm4,.36a6,6,0,0,0-.84-.11c.14-.3.18-.57.33-.68a.88.88,0,0,0,.3-1.27,1.32,1.32,0,0,1-.08-.44c-.08-.5-.32-.77-.64-.72s-.62.45-.45,1c0,.05.09.09.1.15.07.29,0,.48-.35.45-.12,0-.24-.08-.36-.09a1.22,1.22,0,0,0-1.16.74,1,1,0,0,0,.3,1.3,1.76,1.76,0,0,0,1.68.39,4.49,4.49,0,0,0,.31.79.83.83,0,0,0,.11.15.64.64,0,0,0-.14.08,1,1,0,0,0,0,1.33.66.66,0,0,0,1,.13,1.12,1.12,0,0,0,.13-1.32,1.14,1.14,0,0,0,.37-.45A.93.93,0,0,0,282.16,257.67Zm-17-2.34c0-.54-.27-.72-.58-.77s-.56.18-.7.48-.33.63-.47,1-.35.72-.06,1.12a.59.59,0,0,1,0,.4,3.3,3.3,0,0,0-.12.64s-.05-.07-.1-.09c-.41-.12-.65.41-.8.62s0,.58.38.69.65,0,.67-.36c0-.09,0-.23,0-.36a1.55,1.55,0,0,0,.67.31c.38.1.72,0,.8-.38a1.81,1.81,0,0,1,.56-.89,1.35,1.35,0,0,0,0-2A2.69,2.69,0,0,1,265.15,255.33Zm26.57-8.1a1.26,1.26,0,0,0,1.79.06l.35-.29c.18.23.34.46.52.66a.67.67,0,0,0,1,.1,1.41,1.41,0,0,0,.29-.31.38.38,0,0,0,.13.19c.26.19.44.05.61-.13a.46.46,0,0,0-.06-.76,1.93,1.93,0,0,1-1.4-.81,4.76,4.76,0,0,0-.91.05,3.07,3.07,0,0,0-.29-.34,1.4,1.4,0,0,0-1.5-.34,1.58,1.58,0,0,0-.79,1.35A.82.82,0,0,0,291.72,247.23Zm-18.66,4.07a1,1,0,0,0,.69-1.16l.15,0a1.33,1.33,0,0,0,.56-1.59,1.4,1.4,0,0,0-1.59-.75,1.37,1.37,0,0,0-.9,1.16,1.36,1.36,0,0,0-.68,1.54A1.34,1.34,0,0,0,273.06,251.3Zm15,6.85a1.28,1.28,0,0,0,.65-1.62,1.53,1.53,0,0,0-1.05-.82c.07-.2.09-.55,0-.65s-.71.07-.74.17a1.25,1.25,0,0,0,0,.58,1.21,1.21,0,0,0-.66,1.42A2,2,0,0,0,288.09,258.15ZM271.8,255a1.28,1.28,0,0,1,.66-1.5l-.07-.11a.8.8,0,0,1,.33-1,.68.68,0,0,1,.89.38.72.72,0,0,1,0,.52c.24-.55.73-.89,1.11-.73a1.11,1.11,0,0,1,.46,1.27,1,1,0,0,1-1.07.45,1.77,1.77,0,0,1-.88,1.55A1.29,1.29,0,0,1,271.8,255Zm1.76-1.51h0a.28.28,0,0,1,0-.09A.41.41,0,0,0,273.56,253.48Zm1.81-2a1.45,1.45,0,0,0,1.83.49,1,1,0,0,0,.49-1.36c-.46-.9-.78-.9-1.71-.64A1.12,1.12,0,0,0,275.37,251.49Zm-6-11.59a.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54,1.18,1.18,0,0,0-1.38-.76C269.41,238.33,269.13,239.19,269.38,239.9Zm-1.13,8.82a.63.63,0,0,0,.36-.47,1.26,1.26,0,0,0,.95-.49.56.56,0,0,0,.69.25.71.71,0,0,0,.5-.85.66.66,0,0,0-.9-.36.52.52,0,0,0-.19.11,1.36,1.36,0,0,0-.81-.78.85.85,0,0,0-1,.63.36.36,0,0,0,0,.1,1.31,1.31,0,0,0-.58.11c-.51.21-.84.75-.68,1.12A1.49,1.49,0,0,0,268.25,248.72Zm9.83-7.35c.4-.16.89-1.09.74-1.42a1.19,1.19,0,0,0-1.46-.34c-.51.21-.63.68-.35,1.3A1,1,0,0,0,278.08,241.37Zm12.26,12.93a1.68,1.68,0,0,0,.84.19,1.3,1.3,0,0,0,1.36,1.13,1.28,1.28,0,0,0,1.16-1c.09-.49-.57-1-1.26-1.12a.87.87,0,0,0-.53.1s0,0,0-.05c-.24-.57-.77-.88-1.19-.69a1.14,1.14,0,0,0-.66.69.64.64,0,0,0-.7,0c-.41.26-.29.68-.19,1.11.43.1.87.29,1.14-.2A.54.54,0,0,0,290.34,254.3Zm-6.59,5.91c-.43.16-.53.76-.25,1.43a.9.9,0,0,0,1,.37,1.28,1.28,0,0,0,.59-1.14A1.25,1.25,0,0,0,283.75,260.21Zm-20.63-18.4a.81.81,0,0,0,.33-.33.55.55,0,0,0,.29-.35c.07-.26.1-.55-.24-.69a.71.71,0,0,0-.21,0,.84.84,0,0,0-.92-.37,1.23,1.23,0,0,0-.53,1.34A1.13,1.13,0,0,0,263.12,241.81Zm12.7,1.15a.69.69,0,0,0-.23-.17c-.55-.12-.81.54-.66.83a.65.65,0,0,0,.79.2.5.5,0,0,0,.21-.28,1.25,1.25,0,0,0,1.25.29,1.18,1.18,0,0,0,.35-1.23.81.81,0,0,0-.93-.37A1.31,1.31,0,0,0,275.82,243Zm-18.53,15.69a1.26,1.26,0,0,0,.58-1.22,1.3,1.3,0,0,0-1.36-.44.57.57,0,0,0-.39.78C256.38,258.46,256.84,258.81,257.29,258.65Zm30.94,1a.94.94,0,0,0-.46,1,.7.7,0,0,0,.94.45.78.78,0,0,0,.48-.88C289.07,259.87,288.48,259.52,288.23,259.61Zm-12-23.58c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.7.7,0,0,0-.32.93A.77.77,0,0,0,276.26,236Zm-13.67-1.52a.32.32,0,0,0-.31-.16.38.38,0,0,0-.24.22,1.15,1.15,0,0,0-.16,1.19c.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.8.8,0,0,0,262.59,234.51Zm11.86,3.37a.81.81,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31c.29-.1.34-.32.2-.63-.08,0-.21-.14-.29-.11a1.48,1.48,0,0,1-.95-.12C274.86,237.5,274.54,237.71,274.45,237.88Zm-6.59,14.72a.75.75,0,0,0,.83-.82,2.44,2.44,0,0,1,.36.7.78.78,0,0,0,.55.4,6.23,6.23,0,0,1,1,.28.83.83,0,0,0,1.05-.44c.18-.48.12-.8-.22-1a.41.41,0,0,0,.05-.09c.17-.48-.06-.84-.69-1.06a1.18,1.18,0,0,0-.74,0,.69.69,0,0,0-.47-.3,1,1,0,0,0-.94.52.67.67,0,0,0-.16.57,1,1,0,0,0-.91-.1.54.54,0,0,0-.3.76A1.07,1.07,0,0,0,267.86,252.6Zm11.23.13a.93.93,0,0,0-1.15.62,1.25,1.25,0,0,0,0,.71.71.71,0,0,0-.44.94.69.69,0,0,0,.83.36.84.84,0,0,0,.47-.68,1,1,0,0,0,.59-.26c.27-.29.18-.59.09-.91S279.45,252.91,279.09,252.73Zm9.23-3.17c0,.39-.05.81.38,1a.62.62,0,0,0,.84-.33,1.47,1.47,0,0,0,.34,1.05,1.13,1.13,0,0,0,1.48.05.75.75,0,0,0,.57.13,1.21,1.21,0,0,0,.78-1.38,1.11,1.11,0,0,0-1-.69h0a1.43,1.43,0,0,0-1.9.05,1.13,1.13,0,0,0-.21.39.51.51,0,0,0-.11-.32C289.13,249.14,288.72,249.27,288.32,249.56Zm-22.64-6a.7.7,0,0,0-.62-.49c-.16-1-1.07-1.19-1.92-1.09a1.45,1.45,0,0,0-.86.41,1.53,1.53,0,0,0-.39,1.2.78.78,0,0,1,0,.22.68.68,0,0,0-.31.86,1.22,1.22,0,0,0,.48.65,2,2,0,0,0,1.95.8,1.67,1.67,0,0,0,1.34-.9,1,1,0,0,0-.08-.87h0A.59.59,0,0,0,265.68,243.56Zm19.75-9.37c.2-.35-.51-1-.94-.88s-.76.66-.58,1S285.23,234.54,285.43,234.19Zm-7.65-.32a.61.61,0,0,0,.41-.78.55.55,0,0,0-.74-.31.5.5,0,0,0-.33.65A.53.53,0,0,0,277.78,233.87ZM283.51,248a.73.73,0,0,0-.42.92,2,2,0,0,0,.72.13c.31,0,.4-.35.29-.64S283.86,247.93,283.51,248Zm-8.67-17.25c.09-.18-.21-.56-.36-.83a.28.28,0,0,0-.4-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,274.84,230.77Zm-6.72,13a.67.67,0,0,0-.42.88.61.61,0,0,0,.85.29.71.71,0,0,0,.34-.93A.54.54,0,0,0,268.12,243.75Zm-6,16.14c-.27.27,0,.94.38.93s.64-.54.43-1C262.78,259.63,262.3,259.67,262.08,259.89Zm28.16-15c.14-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.63.63,0,0,0,290.24,244.9Zm4.36-1.09a.64.64,0,0,0,.76-.3.61.61,0,0,0-.09-.53.49.49,0,0,0-.11-.25c-.12-.09-.38-.25-.48-.12a.66.66,0,0,0,0,.15A.61.61,0,0,0,294.6,243.81Zm-28.18-12.6c-.12,0-.17.3-.16.44s.22.32.4.26.15-.4.11-.53A.36.36,0,0,0,266.42,231.21Zm15.19,14.1a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S281.81,245.26,281.61,245.31Zm-.65,4.38a1.24,1.24,0,0,0-1,1.31,1.16,1.16,0,0,0,1.34,1.18c.91-.2,1.34-.82,1.26-1.39A1.59,1.59,0,0,0,281,249.69Zm-21.25-2.42h.08c.5-.07.74-.85.66-1.55a1.2,1.2,0,0,0-.82-.83.41.41,0,0,0-.26-.37c-1-.47-1.19.54-1.53.5s-.85-.53-1.35-.63c-.7-.15-1.41.1-1.49.85a1.22,1.22,0,0,0,1.09,1.46c1,.16,1-.88,1.55-.56s0,.72.88,1.12A1.31,1.31,0,0,0,259.71,247.27Zm22.05-4.84a1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84,1.08,1.08,0,0,0-.49-.91c-.36-.17-.67-.49-1-.38a.67.67,0,0,0-.45.41,1.11,1.11,0,0,0-.23.62A1.47,1.47,0,0,0,281.76,242.43Zm-2.84,1.41a.34.34,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49S279,243.7,278.92,243.84Zm6.74,1.41c.39.12,1,.26,1.12-.28s-.2-.71-.37-.74-.38-.32-.19-.35.33-.23.25-.71-.3-.72-.79-.71a1,1,0,0,0-1,1.13c0,.58.37.66.35,1S285.27,245.14,285.66,245.25Zm-.35-6.79c.48,0,1,0,1.44-.37l0-.68c.53-.35.85-.88.68-1.21a.63.63,0,0,0-.71-.36c-.57.1-.72.3-.78,1a9.71,9.71,0,0,0-1,.86A.45.45,0,0,0,285.31,238.46Zm-27,16.65a1.44,1.44,0,0,0,.67-1.71,1.13,1.13,0,0,0-1.39-.72c-.73.28-1.24,1.07-1,1.62A1.55,1.55,0,0,0,258.32,255.11Zm4-16.16a4.22,4.22,0,0,0-.33-.8,1.05,1.05,0,0,0-.43-.38s0,0,0,0c0-.3-.57-.47-.82-.27a1.06,1.06,0,0,0-.23.41,1,1,0,0,0-.43,1,1,1,0,0,0,.45.59A1.32,1.32,0,0,0,262.34,239Zm-6.63-16.77a1.38,1.38,0,0,0,1.17-.4,1.74,1.74,0,0,0,.11.18.75.75,0,0,0,1,.25,1.46,1.46,0,0,0,.3-1.49.89.89,0,0,0-1.32-.09,1,1,0,0,0-.52-.36,1.13,1.13,0,0,0-.4,0,.71.71,0,0,0-.13-.35.72.72,0,0,0-1,0,.67.67,0,0,0,0,1,1.1,1.1,0,0,0,.18.14.05.05,0,0,1,0,0A1,1,0,0,0,255.71,222.18Zm2.3,37c-.47-.12-.83.16-1,.8s0,1,.42,1.05a1.86,1.86,0,0,0,1.4-.64A1,1,0,0,0,258,259.16Zm1-23.75c-.18.58,0,1,.4,1.14a1.56,1.56,0,0,0,1.36-.7.89.89,0,0,0-.71-1.08C259.48,234.58,259.19,234.76,259,235.41Zm6.81-6.28c.44.1.8,0,.91-.37a1.49,1.49,0,0,0-.63-1.37c-.5-.14-.87.12-1,.74S265.2,229,265.81,229.13Zm-4.42-4.7a1.1,1.1,0,0,0,.5,1.15c.41.13.91-.28,1.07-.87a.52.52,0,0,0-.4-.69C262.08,223.86,261.49,224.07,261.39,224.43Zm-1.92-8.82c.17.06.36-.11.41-.22s0-.5-.15-.55-.42.23-.45.34S259.3,215.56,259.47,215.61Zm11.43,15.26c.22.1.37-.24.36-.31s0-.34-.24-.4a.25.25,0,0,0-.32.2C270.69,230.5,270.68,230.78,270.9,230.87ZM259.09,230a.52.52,0,0,0,.73-.3c.24-.52.24-.93,0-1.07a1.15,1.15,0,0,0-1.13.36C258.54,229.18,258.78,229.77,259.09,230Zm13,9.16c-.07.19.18.38.27.39s.35.07.43-.14a.26.26,0,0,0-.17-.35C272.51,239,272.17,238.92,272.11,239.11Zm-1.52,5.55a1.42,1.42,0,0,0,.09.27c-.3.31-.17.66.08.95a.81.81,0,0,0,.69-.17,1.57,1.57,0,0,0,.54.06l.46,0c0,.29,0,.57,0,.84.07.51.27.69.78.69a1,1,0,0,0,1-.64.8.8,0,0,0,0-.77,1.06,1.06,0,0,0,.12-1,.53.53,0,0,0-.78-.13,2,2,0,0,0-.34.28,2.55,2.55,0,0,0,0-.39,1.4,1.4,0,0,0-1-1.16,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,270.59,244.66Zm-8.23,7.9a1.62,1.62,0,0,0-.5.11c-.77.31-1.09.9-.82,1.56a1.36,1.36,0,0,0,1.63.8,1.45,1.45,0,0,0,.77-.75,1.7,1.7,0,0,0,1.44-1.16,1.1,1.1,0,0,0-.86-1.37A1.2,1.2,0,0,0,262.36,252.56Zm-.54-3.8a1.37,1.37,0,0,0-1.25.26.83.83,0,0,0-.6-.11,1.23,1.23,0,0,0-.7,1.42c.13.33.73.48,1.21.32a.05.05,0,0,0,0,0,1.46,1.46,0,0,0,.68.69,1,1,0,0,0,.72-.06.41.41,0,0,0,.58.19c.2-.1.54-.31.44-.6a.57.57,0,0,0-.32-.31l.06-.14A1.49,1.49,0,0,0,261.82,248.76Zm-5.75-8.86a1,1,0,0,0,1.2-.81c.16-1-.09-1.18-1-1.53a.78.78,0,0,0-.45,0,1.45,1.45,0,0,1-.25-.09l-.17.13a.84.84,0,0,0-.1.22,1.21,1.21,0,0,0-.41.64C254.75,239,255.32,239.71,256.07,239.9Zm1.52-13.17a1.11,1.11,0,0,0,1.49-.82,1.19,1.19,0,0,0-.67-1.43c-.53-.19-1.27.34-1.49,1.06A.91.91,0,0,0,257.59,226.73Zm6.91,4.43c.09-.44-.39-1-1-1.14s-.91.18-1,.85a.91.91,0,0,0,.13.61,1,1,0,0,0-.16.06.56.56,0,0,0-.15.52c.07.19.29.43.46.44.4,0,.59-.37.6-.63C263.81,231.8,264.44,231.45,264.5,231.16Zm-3.59,23.68a.94.94,0,0,0-.85.45,1,1,0,0,0-.43.06c-.8.31-1.22,1-1,1.61a1,1,0,0,0,.33.42.67.67,0,0,0-.48.35.72.72,0,0,0,.08.93c.37.38.78.11,1.22-.05a1.65,1.65,0,0,0-.12-.89,1,1,0,0,0,.57,0,1.44,1.44,0,0,0,.77-1,1.06,1.06,0,0,0,.88-.62C262,255.73,261.37,254.94,260.91,254.84Zm5.55-6.27a1.12,1.12,0,0,0-.93.17.67.67,0,0,0-.56-.39.67.67,0,0,1,.15-.06c.38-.08.75-.58.54-1.36s-1.2-1.09-1.58-.64-.21.79-.42.82-.67-.15-.89.17.41,1.31.58,1.41.72.15.63.55-.47.73-.31,1.13.47,1.34,1.14,1.39.55-.54.82-.82a.9.9,0,0,0,.25-.72,1.2,1.2,0,0,0,.34.17.69.69,0,0,0,.8-.56A1,1,0,0,0,266.46,248.57Zm-9.27,3.17a1.27,1.27,0,0,0-.7-1.33c-.45-.12-.89.3-1.06,1a.88.88,0,0,0,.61.89A1.27,1.27,0,0,0,257.19,251.74Zm4.17-20.05c-.69-.16-1.22,0-1.31.46a.95.95,0,1,0,1.85.38A.81.81,0,0,0,261.36,231.69Zm-.91,20.89a.93.93,0,0,0-1,.52.69.69,0,0,0,.49.92.76.76,0,0,0,.9-.42A1.08,1.08,0,0,0,260.45,252.58Zm4.31-26.09a1,1,0,0,0,1-.46,1,1,0,0,0-.62-1,.7.7,0,0,0-.81.55A.79.79,0,0,0,264.76,226.49Zm-7.33,5.41a1.89,1.89,0,0,0-.62.07s0-.07-.05-.1a1,1,0,0,0-1.32,0,.91.91,0,0,0-.08,1.38.89.89,0,0,0,1.27.26,1.22,1.22,0,0,0,.28-.48,1.19,1.19,0,0,0,.15.09h0c.16.41.7.76,1,.64s.41-.73.29-1.07a.62.62,0,0,0-.38-.38A.53.53,0,0,0,257.43,231.9Zm9.63,13.89a.84.84,0,0,0,.38-.62c-.07-.5-.48-.63-1-.64-.27.3-.53.62-.28,1A.6.6,0,0,0,267.06,245.79Zm4.6,12a1.71,1.71,0,0,0-.09-1c-.31-.59-1.13-.42-1.24-.58s.38-1.13,0-1.85a2,2,0,0,0-2.26-.6,2.54,2.54,0,0,0-.89.67,1.12,1.12,0,0,0-.37.58,1.17,1.17,0,0,0,.25,1.09,1.1,1.1,0,0,0,.33.43c.51.37,1.46.33,1.58.55s-.49,1.15,0,1.84a1.27,1.27,0,0,0,1.17.56,1.43,1.43,0,0,0-.39.11.82.82,0,0,0-.47,1.19,1.15,1.15,0,0,0,1.42.67,1.13,1.13,0,0,0,.63-1.43,1,1,0,0,0-1.06-.55,1.85,1.85,0,0,0,.64-.21,1.12,1.12,0,0,0,.35-.34.51.51,0,0,0,.42.16.59.59,0,0,0,.6-.58.81.81,0,0,0-.24-.62A.76.76,0,0,0,271.66,257.76Zm1.58-27.33c.37-.16.18-1.11-.24-1.26s-1,.08-1,.43S272.87,230.59,273.24,230.43Zm-5.19-5.17a.55.55,0,0,0-.42-.69.5.5,0,0,0-.64.33.54.54,0,0,0,.27.75A.61.61,0,0,0,268.05,225.26Zm-2.18-4.41a.62.62,0,0,0,.86.56c.17-.1.16-.58.19-.89a.27.27,0,0,0-.23-.34A.83.83,0,0,0,265.87,220.85ZM270,241.71a.65.65,0,0,0,.8.21c.29-.19.27-.42-.13-1A.61.61,0,0,0,270,241.71Zm-10.3-24.93c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,259.68,216.78Zm4.05,20.74a.25.25,0,0,0-.15-.39c-.18-.07-.3,0-.38.14v0a.45.45,0,0,0-.63-.13c-.16.15-.59.44-.38.77s.69.25.92.19a.35.35,0,0,0,.25-.45A.25.25,0,0,0,263.73,237.52Zm-4.45,5a1.34,1.34,0,0,0,1.83-.38,1.59,1.59,0,0,0-.65-1.84,1.33,1.33,0,0,0-.59-.11.56.56,0,0,0-.69-.11.41.41,0,0,0-.22.62l-.07.08A1.15,1.15,0,0,0,259.28,242.5Zm8-8.39c-.19-.34-.25-.79-.57-.89a.69.69,0,0,0-.6.07c-.17.09-.38.11-.55.36a1.5,1.5,0,0,0-.16,1.25,1.09,1.09,0,0,0,.92.67.9.9,0,0,0,.82-.43A1.09,1.09,0,0,0,267.28,234.11Zm4.71.25.44-.52c.63,0,1.2-.21,1.26-.58a.63.63,0,0,0-.36-.71c-.52-.26-.76-.19-1.21.33a9,9,0,0,0-1.32.11.45.45,0,0,0-.19.82C271,234.05,271.4,234.45,272,234.36ZM259.66,218a1.35,1.35,0,0,0-.13,1.68.85.85,0,0,0,1.15,0,.93.93,0,0,0,.18-1.37C260.54,217.9,259.94,217.75,259.66,218Zm5.85-15.3a.68.68,0,0,0,1,.11.54.54,0,0,0,.15-.85.66.66,0,0,0-1-.15A.7.7,0,0,0,265.51,202.7Zm-9,9.06a1,1,0,0,0,.43.71c.48.25.66-.22,1-.54-.24-.48-.5-.84-1-.68A.67.67,0,0,0,256.47,211.76Zm4.87-8.79a.75.75,0,0,0-.17.9c.16.2.6.14.9-.11a.39.39,0,0,0,.06-.62C261.91,202.91,261.65,202.75,261.34,203Zm2.79,13.18c-.23.22-.4.47-.19.79a.83.83,0,0,0,1,0,.76.76,0,0,0-.14-.7A.41.41,0,0,0,264.13,216.15Zm-6.84,6.95a.68.68,0,0,0,0,.62c.09.15.52.4.71.28s.11-.61,0-.8A.49.49,0,0,0,257.29,223.1Zm-1.46,13.19c-.29.19-.07.56,0,.65s.82.47,1,.32,0-.81-.15-.85C256.47,236.31,256.12,236.1,255.83,236.29Zm.83-30.95a1.07,1.07,0,0,0-.62.56.42.42,0,0,0,0,.19.79.79,0,0,0-.57-.06.51.51,0,0,0-.15.5.55.55,0,0,0,.49.21.64.64,0,0,0,.31-.48.42.42,0,0,0,.18.09.77.77,0,0,0,.54-.26c.15-.13.33-.23.37-.45S257,205.25,256.66,205.34Zm-1.73,22.36a5.63,5.63,0,0,0,1.26.72,1.37,1.37,0,0,0,1.48-.64c.16-.28.25-1-.37-1.15-1.06.26-1-.51-1.78-.57a1,1,0,0,0-.36.06A.88.88,0,0,0,254.93,227.7Zm1.32-26.36a1.25,1.25,0,0,0-.08,1.85,1.15,1.15,0,0,0,1.67.24,1.42,1.42,0,0,0,.24-1.88A1.49,1.49,0,0,0,256.25,201.34ZM258,217.41a1.2,1.2,0,0,0,.07-1.35.88.88,0,0,0-1.06-.2c-.59.45-.82,1.08-.52,1.45A1.29,1.29,0,0,0,258,217.41Zm3.39-6.23c-.23-.28-1-.2-1.44.14a.82.82,0,0,0,0,1.08,1,1,0,0,0,1.23.2A1.23,1.23,0,0,0,261.35,211.18Zm1.43,15.75a.69.69,0,0,0-.58,0,.83.83,0,0,0-.38.56c0,.14.18.35.33.44a.52.52,0,0,0,.1.18.73.73,0,0,0,.87.18l.06,0c.29.08.46-.07.53-.39a1,1,0,0,0-.14-.24.79.79,0,0,0-.18-.53A.7.7,0,0,0,262.78,226.93Zm-1.61-11.15a.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07.63.63,0,0,0,.08-.89A.69.69,0,0,0,261.17,215.78Zm4,5.68a.61.61,0,0,0-.12.88.69.69,0,1,0,1.12-.81A.81.81,0,0,0,265.17,221.46Zm-.74-12.86a1.13,1.13,0,0,0-.14,1.19.7.7,0,0,0,1,0,.67.67,0,0,0,0-1C265,208.48,264.65,208.39,264.43,208.6Zm-3,12.5a.71.71,0,0,0-.19,1,.54.54,0,0,0,.85.17.66.66,0,1,0-.66-1.14Zm-3-15.1a.59.59,0,0,0,.8.15c.26-.13.31-.88.06-1a.78.78,0,0,0-.7,0A.54.54,0,0,0,258.39,206Zm1.31,2.48c.13-.19.28-.42.2-.62a.81.81,0,0,0-1-.07c-.23.23-.12.44,0,.63A.46.46,0,0,0,259.7,208.48Zm1.64-15.89c-.1-.3-.45-.31-.77-.1a.41.41,0,0,0-.07.69c.17.16.68.42.83.3S261.41,192.81,261.34,192.59Zm5,5.13c-.16.11-.12.6,0,.69s.46.28.6.21a.65.65,0,0,0,.12-.61C267,197.87,266.53,197.61,266.38,197.72Zm2.86,21.14c.28-.21,0-1-.21-1.22a.77.77,0,0,0-.9-.11c-.28.2-.13.75,0,1S269,219.08,269.24,218.86Zm-2.31-12.16a.51.51,0,0,0-.11.43c0,.1.41.26.5.19s0-.43,0-.56A.4.4,0,0,0,266.93,206.7Zm-3.35.67c-.11.06-.33.4-.2.52a.44.44,0,0,0,.48,0c.11-.1.31-.33.19-.45A.44.44,0,0,0,263.58,207.37Zm5,5.59a.46.46,0,0,0,.06-.44.43.43,0,0,0-.42-.09c-.1.07-.33.37-.19.52A.48.48,0,0,0,268.59,213Zm-13-23c.1.14.47.07.56,0a.39.39,0,0,0,.1-.46c-.1-.14-.35-.11-.46,0S255.52,189.79,255.62,189.92Zm.64-5.72a.36.36,0,0,0-.05.39c.08.1.33.06.46,0s.25-.3.13-.46S256.38,184.13,256.26,184.2Zm10.4,24.74s0-.21,0-.26a.21.21,0,0,0-.24,0,.2.2,0,0,0,0,.29A.22.22,0,0,0,266.66,208.94Zm-8.23,21.49a.22.22,0,0,0,0,.3.22.22,0,0,0,.28,0c.05,0,0-.21,0-.26A.22.22,0,0,0,258.43,230.43ZM257,166.36a1.36,1.36,0,0,0,1,1.34c.36.06.78-.33.84-.79a.92.92,0,0,0-.78-1.14C257.6,165.69,257.06,166,257,166.36Zm11.34,8.72a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-.95.62.62,0,0,0-.83.44A.57.57,0,0,0,268.35,175.08Zm-10.26,3.79a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S257.72,178.94,258.09,178.87Zm1.41-16.16c.3.08.82-.43.76-.66s-.33-.35-.57-.43a.42.42,0,0,0-.58.38C259.09,162.31,259.12,162.62,259.5,162.71Zm-4.2,12.49a.92.92,0,0,0,.86,1.07,1.12,1.12,0,0,0,1.24-.7,1.35,1.35,0,0,0-.93-1.2A.92.92,0,0,0,255.3,175.2Zm3.35-3.46a.69.69,0,0,0,.43.45c.17,0,.65-.05.71-.27s-.32-.53-.5-.62S258.6,171.46,258.65,171.74Zm7.71,10.8c-.09.33.32.47.46.45s.92-.19,1-.45-.58-.56-.67-.52C266.85,182.12,266.45,182.2,266.36,182.54ZM261,174.37c-.62.89-1.06.26-1.71.75a1.49,1.49,0,0,0-.23.29.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46C262,174.66,261.59,174.07,261,174.37Zm-1,26.13h-.11a1,1,0,0,0-.14-.35c0-.07-.32-.11-.36-.06a.51.51,0,0,0-.11.43.24.24,0,0,0,.06.09,1.4,1.4,0,0,0-.76,1,1.46,1.46,0,0,0,1,1.5,1.33,1.33,0,0,0,1.55-.95A1.94,1.94,0,0,0,260,200.5Zm3.13-21a.92.92,0,0,0,.86,1.09c.59.08,1.08-.21,1.12-.66a1.35,1.35,0,0,0-1-1.35C263.7,178.54,263.21,179,263.15,179.54Zm-5.32-10.27c-.53-.1-.94.24-1.05.87s.25.84.88.94.87-.12.95-.5A1.47,1.47,0,0,0,257.83,169.27Zm1.08,13.36a.7.7,0,0,0-.84.61.84.84,0,0,0,.73.79.75.75,0,0,0,.74-.66A.66.66,0,0,0,258.91,182.63Zm6.76-10.48a.76.76,0,0,0,.84-.64.7.7,0,0,0-.63-.83.72.72,0,0,0-.77.59A.7.7,0,0,0,265.67,172.15Zm-8.44-7.64a.82.82,0,0,0,.85-.66.64.64,0,0,0-.54-.72.7.7,0,0,0-.88.56A.77.77,0,0,0,257.23,164.51Zm7,.13a.83.83,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Zm-2.69,16.79a.67.67,0,0,0-.82.52.84.84,0,0,0,.53.86.67.67,0,0,0,.79-.56A.64.64,0,0,0,261.53,181.43Zm-.63-13.09a.55.55,0,0,0,.75-.44.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45A.71.71,0,0,0,260.9,168.34Zm-5.16,11.31a.56.56,0,0,0-.05.53.93.93,0,0,0,.66.3c.4-.08.36-.47.35-.79C256.38,179.39,256,179.31,255.74,179.65Zm3.55,7.8a1.39,1.39,0,0,0-.55,1.35c.11.37.21.77.76.73.4,0,.8,0,1.2,0a.58.58,0,0,0,.85-.37.75.75,0,0,0-.5-.93,2,2,0,0,1-.65-.39A1,1,0,0,0,259.29,187.45Zm-4.07,5c0,.32.2.4.45.45s.64-.15.6-.47a1.79,1.79,0,0,0-.27-.59A.68.68,0,0,0,255.22,192.4Zm3.75.44a.69.69,0,0,0-.79.61c0,.33.2.4.45.45s.64-.15.6-.46A2.21,2.21,0,0,0,259,192.84Zm1.86-7.7c0,.25.1.82.44.86s.52-.4.6-.6a.44.44,0,0,0-.27-.65C261.28,184.64,260.81,184.84,260.83,185.14Zm2.87-24c.19.08,1-.16,1-.5s-.68-.73-1-.77a.76.76,0,0,0-.75.52C262.94,160.69,263.41,161,263.7,161.11Zm-8.6-7.62c.1,0,.48-.09.5-.2s-.26-.35-.39-.4-.32.13-.31.19A.56.56,0,0,0,255.1,153.49Zm10.79,32.64a.29.29,0,0,0-.31.19.44.44,0,0,0,.21.4c.09.05.46,0,.5-.2S266,186.18,265.89,186.13Zm-6-29.13a.5.5,0,0,0,.42-.36.46.46,0,0,0-.25-.37.45.45,0,0,0-.37.22C259.66,156.61,259.69,157,259.89,157ZM259,195.82c-.17,0-.35.15-.38.27s0,.49.2.53.4-.27.41-.39S259.13,195.86,259,195.82Zm5.42-1.36c-.19,0-.32.28-.36.41a.35.35,0,0,0,.22.32c.13,0,.29-.17.36-.3S264.57,194.51,264.38,194.46ZM256,155.12a.22.22,0,0,0,.21-.19c0-.06-.12-.18-.18-.18s-.19,0-.2.13A.2.2,0,0,0,256,155.12Zm8.79,21.37c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,264.77,176.49Zm-9.34-4.93a.57.57,0,0,0,.68-.55.78.78,0,0,0-.6-.79.73.73,0,0,0-.75.63A.68.68,0,0,0,255.43,171.56Zm9.06,21.05c.57-.07.56-.81.3-1.13s-.14-.24,0-.64.1-1-.65-1.06a1.41,1.41,0,0,0-1.3,1.34A1.65,1.65,0,0,0,264.49,192.61Z" fill="#01ada1"/></g><path d="M260,200.5h-.11a1,1,0,0,0-.14-.35c0-.07-.32-.11-.36-.06a.51.51,0,0,0-.11.43.24.24,0,0,0,.06.09,1.4,1.4,0,0,0-.76,1,1.46,1.46,0,0,0,1,1.5,1.33,1.33,0,0,0,1.55-.95A1.94,1.94,0,0,0,260,200.5Z" fill="#01ada1"/><path d="M261.35,211.18c-.23-.28-1-.2-1.44.14a.82.82,0,0,0,0,1.08,1,1,0,0,0,1.23.2A1.23,1.23,0,0,0,261.35,211.18Z" fill="#01ada1"/><path d="M264.38,194.46c-.19,0-.32.28-.36.41a.35.35,0,0,0,.22.32c.13,0,.29-.17.36-.3S264.57,194.51,264.38,194.46Z" fill="#01ada1"/><path d="M261.34,192.59c-.1-.3-.45-.31-.77-.1a.41.41,0,0,0-.07.69c.17.16.68.42.83.3S261.41,192.81,261.34,192.59Z" fill="#01ada1"/><path d="M263.58,207.37c-.11.06-.33.4-.2.52a.44.44,0,0,0,.48,0c.11-.1.31-.33.19-.45A.44.44,0,0,0,263.58,207.37Z" fill="#01ada1"/><path d="M262.2,226.91a.83.83,0,0,0-.38.56c0,.14.18.35.33.44a.52.52,0,0,0,.1.18.73.73,0,0,0,.87.18l.06,0c.29.08.46-.07.53-.39a1,1,0,0,0-.14-.24.79.79,0,0,0-.18-.53,2.17,2.17,0,0,0-1.19-.22Z" fill="#01ada1"/><path d="M258.91,182.63a.7.7,0,0,0-.84.61.84.84,0,0,0,.73.79.75.75,0,0,0,.74-.66A.66.66,0,0,0,258.91,182.63Z" fill="#01ada1"/><path d="M261.36,231.69c-.69-.16-1.22,0-1.31.46a.95.95,0,1,0,1.85.38A.81.81,0,0,0,261.36,231.69Z" fill="#01ada1"/><path d="M264.43,208.6a1.13,1.13,0,0,0-.14,1.19.7.7,0,0,0,1,0,.67.67,0,0,0,0-1C265,208.48,264.65,208.39,264.43,208.6Z" fill="#01ada1"/><path d="M259.66,218a1.35,1.35,0,0,0-.13,1.68.85.85,0,0,0,1.15,0,.93.93,0,0,0,.18-1.37C260.54,217.9,259.94,217.75,259.66,218Z" fill="#01ada1"/><path d="M262.73,259.37c.36.12.65,0,.67-.36,0-.09,0-.23,0-.36a1.55,1.55,0,0,0,.67.31c.38.1.72,0,.8-.38a1.81,1.81,0,0,1,.56-.89,1.35,1.35,0,0,0,0-2,2.69,2.69,0,0,1-.28-.35c0-.54-.27-.72-.58-.77s-.56.18-.7.48-.33.63-.47,1-.35.72-.06,1.12a.59.59,0,0,1,0,.4,3.3,3.3,0,0,0-.12.64s-.05-.07-.1-.09c-.41-.12-.65.41-.8.62S262.39,259.26,262.73,259.37Z" fill="#01ada1"/><path d="M262.67,255a1.45,1.45,0,0,0,.77-.75,1.7,1.7,0,0,0,1.44-1.16,1.1,1.1,0,0,0-.86-1.37,1.2,1.2,0,0,0-1.66.81,1.62,1.62,0,0,0-.5.11c-.77.31-1.09.9-.82,1.56A1.36,1.36,0,0,0,262.67,255Z" fill="#01ada1"/><path d="M258.68,230.73c.05,0,0-.21,0-.26a.22.22,0,0,0-.24,0,.22.22,0,0,0,0,.3A.22.22,0,0,0,258.68,230.73Z" fill="#01ada1"/><path d="M267,249.83a1,1,0,0,0-.56-1.26,1.12,1.12,0,0,0-.93.17.67.67,0,0,0-.56-.39.67.67,0,0,1,.15-.06c.38-.08.75-.58.54-1.36s-1.2-1.09-1.58-.64-.21.79-.42.82-.67-.15-.89.17.41,1.31.58,1.41.72.15.63.55-.47.73-.31,1.13.47,1.34,1.14,1.39.55-.54.82-.82a.9.9,0,0,0,.25-.72,1.2,1.2,0,0,0,.34.17A.69.69,0,0,0,267,249.83Z" fill="#01ada1"/><path d="M257.83,169.27a.81.81,0,0,0-.88.41v1.07a1.16,1.16,0,0,0,.71.33c.49.08.87-.12.95-.5A1.47,1.47,0,0,0,257.83,169.27Z" fill="#01ada1"/><path d="M257.19,251.74a1.28,1.28,0,0,0-.24-1V252A.68.68,0,0,0,257.19,251.74Z" fill="#01ada1"/><path d="M258.09,178.87a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S257.72,178.94,258.09,178.87Z" fill="#01ada1"/><path d="M257,201.14v2.53a1.15,1.15,0,0,0,.89-.24,1.42,1.42,0,0,0,.24-1.88A1.36,1.36,0,0,0,257,201.14Z" fill="#01ada1"/><path d="M259.68,216.78c-.13,0-.31.14-.39.26s0,.39.17.45.35-.24.4-.37A.34.34,0,0,0,259.68,216.78Z" fill="#01ada1"/><path d="M257,220.63l-.06-.06v1.32l0,.07a.75.75,0,0,0,1,.25,1.46,1.46,0,0,0,.3-1.49A.89.89,0,0,0,257,220.63Z" fill="#01ada1"/><path d="M259.9,207.86a.81.81,0,0,0-1-.07c-.23.23-.12.44,0,.63a.46.46,0,0,0,.76.06C259.83,208.29,260,208.06,259.9,207.86Z" fill="#01ada1"/><path d="M257,211.24v1.25c.44.18.62-.25.9-.56C257.63,211.49,257.38,211.17,257,211.24Z" fill="#01ada1"/><path d="M257,215.86s0,0,0,0v1.68a1.32,1.32,0,0,0,1-.15,1.2,1.2,0,0,0,.07-1.35A.88.88,0,0,0,257,215.86Z" fill="#01ada1"/><path d="M265.51,202.7a.68.68,0,0,0,1,.11.54.54,0,0,0,.15-.85.66.66,0,0,0-1-.15A.7.7,0,0,0,265.51,202.7Z" fill="#01ada1"/><path d="M259.28,242.5a1.34,1.34,0,0,0,1.83-.38,1.59,1.59,0,0,0-.65-1.84,1.33,1.33,0,0,0-.59-.11.56.56,0,0,0-.69-.11.41.41,0,0,0-.22.62l-.07.08A1.15,1.15,0,0,0,259.28,242.5Z" fill="#01ada1"/><path d="M260.05,234.77c-.57-.19-.86,0-1.05.64s0,1,.4,1.14a1.56,1.56,0,0,0,1.36-.7A.89.89,0,0,0,260.05,234.77Z" fill="#01ada1"/><path d="M259.73,214.84c-.16,0-.42.23-.45.34s0,.38.19.43.36-.11.41-.22S259.89,214.89,259.73,214.84Z" fill="#01ada1"/><path d="M258.68,228.94c-.14.24.1.83.41,1a.52.52,0,0,0,.73-.3c.24-.52.24-.93,0-1.07A1.15,1.15,0,0,0,258.68,228.94Z" fill="#01ada1"/><path d="M268.25,248.72a.63.63,0,0,0,.36-.47,1.26,1.26,0,0,0,.95-.49.56.56,0,0,0,.69.25.71.71,0,0,0,.5-.85.66.66,0,0,0-.9-.36.52.52,0,0,0-.19.11,1.36,1.36,0,0,0-.81-.78.85.85,0,0,0-1,.63.36.36,0,0,0,0,.1,1.31,1.31,0,0,0-.58.11c-.51.21-.84.75-.68,1.12A1.49,1.49,0,0,0,268.25,248.72Z" fill="#01ada1"/><path d="M267.32,207.32c.1-.07,0-.43,0-.56a.4.4,0,0,0-.36-.06.51.51,0,0,0-.11.43C266.86,207.23,267.23,207.39,267.32,207.32Z" fill="#01ada1"/><path d="M266.66,208.94s0-.21,0-.26a.21.21,0,0,0-.24,0,.2.2,0,0,0,0,.29A.22.22,0,0,0,266.66,208.94Z" fill="#01ada1"/><path d="M266.38,197.72c-.16.11-.12.6,0,.69s.46.28.6.21a.65.65,0,0,0,.12-.61C267,197.87,266.53,197.61,266.38,197.72Z" fill="#01ada1"/><path d="M265.89,186.13a.29.29,0,0,0-.31.19.44.44,0,0,0,.21.4c.09.05.46,0,.5-.2S266,186.18,265.89,186.13Z" fill="#01ada1"/><path d="M257,205.33V206a.64.64,0,0,0,.25-.35C257.23,205.48,257.11,205.37,257,205.33Z" fill="#01ada1"/><path d="M257.67,227.78c.16-.28.25-1-.37-1.15a1.83,1.83,0,0,1-.35.06v1.68A1.47,1.47,0,0,0,257.67,227.78Z" fill="#01ada1"/><path d="M266.69,220.18a.83.83,0,0,0-.82.67.62.62,0,0,0,.86.56c.17-.1.16-.58.19-.89A.27.27,0,0,0,266.69,220.18Z" fill="#01ada1"/><path d="M257.64,246.14c.58.33,0,.72.88,1.12a1.31,1.31,0,0,0,1.19,0h.08c.5-.07.74-.85.66-1.55a1.2,1.2,0,0,0-.82-.83.41.41,0,0,0-.26-.37c-1-.47-1.19.54-1.53.5a4.11,4.11,0,0,1-.89-.45v1.86C257.18,246.21,257.32,246,257.64,246.14Z" fill="#01ada1"/><path d="M266.71,233.22a.69.69,0,0,0-.6.07c-.17.09-.38.11-.55.36a1.5,1.5,0,0,0-.16,1.25,1.09,1.09,0,0,0,.92.67.9.9,0,0,0,.82-.43,1.09,1.09,0,0,0,.14-1C267.09,233.77,267,233.32,266.71,233.22Z" fill="#01ada1"/><path d="M258.32,255.11a1.44,1.44,0,0,0,.67-1.71,1.13,1.13,0,0,0-1.39-.72,1.71,1.71,0,0,0-.65.44v1.68A1.51,1.51,0,0,0,258.32,255.11Z" fill="#01ada1"/><path d="M258.65,171.74a.69.69,0,0,0,.43.45c.17,0,.65-.05.71-.27s-.32-.53-.5-.62S258.6,171.46,258.65,171.74Z" fill="#01ada1"/><path d="M257.54,163.13a.82.82,0,0,0-.59.1v1.13a.64.64,0,0,0,.28.15.82.82,0,0,0,.85-.66A.64.64,0,0,0,257.54,163.13Z" fill="#01ada1"/><path d="M259.89,157a.5.5,0,0,0,.42-.36.46.46,0,0,0-.25-.37.45.45,0,0,0-.37.22C259.66,156.61,259.69,157,259.89,157Z" fill="#01ada1"/><path d="M258.1,165.77c-.5-.08-1,.21-1.09.59a1.36,1.36,0,0,0,1,1.34c.36.06.78-.33.84-.79A.92.92,0,0,0,258.1,165.77Z" fill="#01ada1"/><path d="M259.11,162c0,.31,0,.62.39.71s.82-.43.76-.66-.33-.35-.57-.43A.42.42,0,0,0,259.11,162Z" fill="#01ada1"/><path d="M261.39,224.43a1.1,1.1,0,0,0,.5,1.15c.41.13.91-.28,1.07-.87a.52.52,0,0,0-.4-.69C262.08,223.86,261.49,224.07,261.39,224.43Z" fill="#01ada1"/><path d="M261.42,221.1a.71.71,0,0,0-.19,1,.54.54,0,0,0,.85.17.66.66,0,1,0-.66-1.14Z" fill="#01ada1"/><path d="M261.34,203a.75.75,0,0,0-.17.9c.16.2.6.14.9-.11a.39.39,0,0,0,.06-.62C261.91,202.91,261.65,202.75,261.34,203Z" fill="#01ada1"/><path d="M261.17,215.78a.78.78,0,0,0-.12,1,.81.81,0,0,0,1.07.07.63.63,0,0,0,.08-.89A.69.69,0,0,0,261.17,215.78Z" fill="#01ada1"/><path d="M274.48,259.6a1.19,1.19,0,0,0-.32.15h2.08a.58.58,0,0,1,.12-.1c.43-.24.4-.58.16-.95,1,0,1.55-.51,1.62-1.39.05-.7-.3-1-1.18-1.13a5,5,0,0,0-.63-1,.78.78,0,0,0-1.1,0c-.34.39-.62.82-.94,1.25-.69,0-.73,0-.81.78.14.26.76.19.53.71a5.75,5.75,0,0,0-.93,0,.88.88,0,0,0-.7.71c-.12.36.18.53.37.72a1.22,1.22,0,0,0,1.38.17q.11-.51.21-1.08l.33.27C275.13,259.13,275.09,259.43,274.48,259.6Z" fill="#01ada1"/><path d="M281.08,259.75h1.4a1.19,1.19,0,0,0-.08-.2,1.14,1.14,0,0,0,.37-.45.93.93,0,0,0-.61-1.43,6,6,0,0,0-.84-.11c.14-.3.18-.57.33-.68a.88.88,0,0,0,.3-1.27,1.32,1.32,0,0,1-.08-.44c-.08-.5-.32-.77-.64-.72s-.62.45-.45,1c0,.05.09.09.1.15.07.29,0,.48-.35.45-.12,0-.24-.08-.36-.09a1.22,1.22,0,0,0-1.16.74,1,1,0,0,0,.3,1.3,1.76,1.76,0,0,0,1.68.39,4.49,4.49,0,0,0,.31.79.83.83,0,0,0,.11.15.52.52,0,0,0-.33.42Z" fill="#01ada1"/><path d="M281.58,257a.21.21,0,0,0,0,.25.21.21,0,0,0,.29,0,.23.23,0,0,0,0-.28C281.78,256.91,281.61,257,281.58,257Z" fill="#01ada1"/><path d="M288.23,259.61a.52.52,0,0,0-.2.14h.74A.72.72,0,0,0,288.23,259.61Z" fill="#01ada1"/><path d="M299.16,246.1a.82.82,0,0,0,1.07-.13,1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.45,0C298.56,245,298.76,245.73,299.16,246.1Z" fill="#01ada1"/><path d="M257.29,258.65a1.26,1.26,0,0,0,.58-1.22c-.09-.25-.52-.44-.92-.48v1.72A.57.57,0,0,0,257.29,258.65Z" fill="#01ada1"/><path d="M269.46,259.75h1.62a1.15,1.15,0,0,0-.85-.27,1.85,1.85,0,0,0,.64-.21,1.12,1.12,0,0,0,.35-.34.51.51,0,0,0,.42.16.59.59,0,0,0,.6-.58.81.81,0,0,0-.24-.62.76.76,0,0,0-.34-.13,1.71,1.71,0,0,0-.09-1c-.31-.59-1.13-.42-1.24-.58s.38-1.13,0-1.85a2,2,0,0,0-2.26-.6,2.54,2.54,0,0,0-.89.67,1.12,1.12,0,0,0-.37.58,1.17,1.17,0,0,0,.25,1.09,1.1,1.1,0,0,0,.33.43c.51.37,1.46.33,1.58.55s-.49,1.15,0,1.84a1.27,1.27,0,0,0,1.17.56,1.43,1.43,0,0,0-.39.11A.87.87,0,0,0,269.46,259.75Z" fill="#01ada1"/><path d="M257.4,175.57a1.3,1.3,0,0,0-.45-.93v1.47A.8.8,0,0,0,257.4,175.57Z" fill="#01ada1"/><path d="M258,259.16c-.41-.11-.73.11-.93.59h1.68A1.13,1.13,0,0,0,258,259.16Z" fill="#01ada1"/><path d="M262.34,259.75h.43A.63.63,0,0,0,262.34,259.75Z" fill="#01ada1"/><path d="M263.76,159.84a.76.76,0,0,0-.75.52c-.07.33.4.64.69.75s1-.16,1-.5S264.05,159.88,263.76,159.84Z" fill="#01ada1"/><path d="M274.08,229.8a.85.85,0,0,0-.27,1,.62.62,0,0,0,1-.06c.09-.18-.21-.56-.36-.83A.28.28,0,0,0,274.08,229.8Z" fill="#01ada1"/><path d="M275.7,234.64a.7.7,0,0,0-.32.93.77.77,0,0,0,.88.46c.31-.12.64-.71.53-1A1,1,0,0,0,275.7,234.64Z" fill="#01ada1"/><path d="M272.64,239c-.13,0-.47-.09-.53.1s.18.38.27.39.35.07.43-.14A.26.26,0,0,0,272.64,239Z" fill="#01ada1"/><path d="M273.06,251.3a1,1,0,0,0,.69-1.16l.15,0a1.33,1.33,0,0,0,.56-1.59,1.4,1.4,0,0,0-1.59-.75,1.37,1.37,0,0,0-.9,1.16,1.36,1.36,0,0,0-.68,1.54A1.34,1.34,0,0,0,273.06,251.3Z" fill="#01ada1"/><path d="M273.25,255.81a1.77,1.77,0,0,0,.88-1.55,1,1,0,0,0,1.07-.45,1.11,1.11,0,0,0-.46-1.27c-.38-.16-.87.18-1.11.73a.72.72,0,0,0,0-.52.68.68,0,0,0-.89-.38.8.8,0,0,0-.33,1l.07.11a1.23,1.23,0,0,0,.79,2.32Zm.34-2.41a.28.28,0,0,0,0,.09h0A.41.41,0,0,1,273.59,253.4Z" fill="#01ada1"/><path d="M273.74,242.17a.51.51,0,0,0,.41-.67c-.11-.56-.36-.89-.64-.86a1.19,1.19,0,0,0-.7,1C272.85,241.88,273.39,242.21,273.74,242.17Z" fill="#01ada1"/><path d="M270.59,244.66a1.42,1.42,0,0,0,.09.27c-.3.31-.17.66.08.95a.81.81,0,0,0,.69-.17,1.57,1.57,0,0,0,.54.06l.46,0c0,.29,0,.57,0,.84.07.51.27.69.78.69a1,1,0,0,0,1-.64.8.8,0,0,0,0-.77,1.06,1.06,0,0,0,.12-1,.53.53,0,0,0-.78-.13,2,2,0,0,0-.34.28,2.55,2.55,0,0,0,0-.39,1.4,1.4,0,0,0-1-1.16,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,270.59,244.66Z" fill="#01ada1"/><path d="M267.86,252.6a.75.75,0,0,0,.83-.82,2.44,2.44,0,0,1,.36.7.78.78,0,0,0,.55.4,6.23,6.23,0,0,1,1,.28.83.83,0,0,0,1.05-.44c.18-.48.12-.8-.22-1a.41.41,0,0,0,.05-.09c.17-.48-.06-.84-.69-1.06a1.18,1.18,0,0,0-.74,0,.69.69,0,0,0-.47-.3,1,1,0,0,0-.94.52.67.67,0,0,0-.16.57,1,1,0,0,0-.91-.1.54.54,0,0,0-.3.76A1.07,1.07,0,0,0,267.86,252.6Z" fill="#01ada1"/><path d="M270,241.71a.65.65,0,0,0,.8.21c.29-.19.27-.42-.13-1A.61.61,0,0,0,270,241.71Z" fill="#01ada1"/><path d="M274.45,237.88a.81.81,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31c.29-.1.34-.32.2-.63-.08,0-.21-.14-.29-.11a1.48,1.48,0,0,1-.95-.12C274.86,237.5,274.54,237.71,274.45,237.88Z" fill="#01ada1"/><path d="M264.11,178.62c-.41-.08-.9.4-1,.92a.92.92,0,0,0,.86,1.09c.59.08,1.08-.21,1.12-.66A1.35,1.35,0,0,0,264.11,178.62Z" fill="#01ada1"/><path d="M265.88,170.68a.72.72,0,0,0-.77.59.7.7,0,0,0,.56.88.76.76,0,0,0,.84-.64A.7.7,0,0,0,265.88,170.68Z" fill="#01ada1"/><path d="M264.77,176.49c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,264.77,176.49Z" fill="#01ada1"/><path d="M264.22,164.64a.83.83,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Z" fill="#01ada1"/><path d="M267.13,182c-.28.1-.68.18-.77.52s.32.47.46.45.92-.19,1-.45S267.22,182,267.13,182Z" fill="#01ada1"/><path d="M270,238.17c-.55.16-.83,1-.58,1.73a.91.91,0,0,0,1.25.57,1.11,1.11,0,0,0,.71-1.54A1.18,1.18,0,0,0,270,238.17Z" fill="#01ada1"/><path d="M273,235.34c-.48.15-.83.68-.7,1a1.09,1.09,0,0,0,1.08.64c.41-.14.57-.77.35-1.34A.52.52,0,0,0,273,235.34Z" fill="#01ada1"/><path d="M267,224.9a.54.54,0,0,0,.27.75.61.61,0,0,0,.79-.39.55.55,0,0,0-.42-.69A.5.5,0,0,0,267,224.9Z" fill="#01ada1"/><path d="M264.49,192.61c.57-.07.56-.81.3-1.13s-.14-.24,0-.64.1-1-.65-1.06a1.41,1.41,0,0,0-1.3,1.34A1.65,1.65,0,0,0,264.49,192.61Z" fill="#01ada1"/><path d="M288.5,259.32a1.5,1.5,0,0,0,1.35-.16.63.63,0,0,0,.15-.24,1.36,1.36,0,0,0,1.53.36,1.1,1.1,0,0,0,.54-.64l.47,0c.44,0,.6-.54.92-.13s1.11,1.16,1.78.46a1,1,0,0,0,.21-.47A1.17,1.17,0,0,0,297,257a.87.87,0,0,0-.48-.46,1.36,1.36,0,0,0-.44-1.19,1.11,1.11,0,0,0-1.49.08,1.76,1.76,0,0,0,0,1.67.76.76,0,0,0-.54,0c-.35.21-.57-.71-1.07-.47s-.95-.19-1.5.12a1.25,1.25,0,0,0-.83,0,1.17,1.17,0,0,0-.9,1.4l-.07-.08c-.46-.41-.81-.45-1.11-.13A.87.87,0,0,0,288.5,259.32Z" fill="#01ada1"/><path d="M288.14,248c-.06,0-.06.33,0,.36a.52.52,0,0,0,.45.05.39.39,0,0,0,.1-.53C288.52,247.65,288.26,247.91,288.14,248Z" fill="#01ada1"/><path d="M290.24,244.9c.14-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.63.63,0,0,0,290.24,244.9Z" fill="#01ada1"/><path d="M287.66,255.06c-.16-.12-.71.07-.74.17a1.25,1.25,0,0,0,0,.58,1.21,1.21,0,0,0-.66,1.42,2,2,0,0,0,1.86.92,1.28,1.28,0,0,0,.65-1.62,1.53,1.53,0,0,0-1.05-.82C287.76,255.51,287.78,255.16,287.66,255.06Z" fill="#01ada1"/><path d="M286.64,249.61c-.78-1.22-1.8-.81-2.51-.14a1.43,1.43,0,0,0-.45.84,1.5,1.5,0,0,0,.4,1.2c.31.39.25.9.7,1.13a2.4,2.4,0,0,0,.77.24,1.63,1.63,0,0,0,0,1.6,1.19,1.19,0,0,0,1.46-.36c.35-.42.25-.89-.28-1.32l-.1-.05a1.88,1.88,0,0,0,.64-.45,1.68,1.68,0,0,0,.56-1.51C287.71,250.21,287,250.13,286.64,249.61Z" fill="#01ada1"/><path d="M289.59,249.82a.51.51,0,0,0-.11-.32c-.35-.36-.76-.23-1.16.06,0,.39-.05.81.38,1a.62.62,0,0,0,.84-.33,1.47,1.47,0,0,0,.34,1.05,1.13,1.13,0,0,0,1.48.05.75.75,0,0,0,.57.13,1.21,1.21,0,0,0,.78-1.38,1.11,1.11,0,0,0-1-.69h0a1.43,1.43,0,0,0-1.9.05A1.13,1.13,0,0,0,289.59,249.82Z" fill="#01ada1"/><path d="M295.5,239.85a.2.2,0,0,0,0,.24.2.2,0,0,0,.3,0c.08-.1,0-.23-.05-.28S295.54,239.81,295.5,239.85Z" fill="#01ada1"/><path d="M282.81,240.68c-.36-.17-.67-.49-1-.38a.67.67,0,0,0-.45.41,1.11,1.11,0,0,0-.23.62,1.47,1.47,0,0,0,.61,1.1,1.11,1.11,0,0,0,1.14,0,.9.9,0,0,0,.4-.84A1.08,1.08,0,0,0,282.81,240.68Z" fill="#01ada1"/><path d="M290.74,245.19c-.2.25-.31.53,0,.81a.74.74,0,0,0,.91,0c.17-.19,0-.61-.25-.87A.38.38,0,0,0,290.74,245.19Z" fill="#01ada1"/><path d="M290,241.46l-.08,0a.75.75,0,0,0-.22-.55.53.53,0,0,0-.86,0,.67.67,0,0,0,0,1,.72.72,0,0,0,.87,0,.44.44,0,0,0,.37.06c.12-.08.33-.16.27-.37A.25.25,0,0,0,290,241.46Z" fill="#01ada1"/><path d="M284.49,233.31c-.43.12-.76.66-.58,1s1.32.27,1.52-.08S284.92,233.19,284.49,233.31Z" fill="#01ada1"/><path d="M283.49,235.28a.25.25,0,0,0-.14.35c.07.12.22.36.46.3s.15-.42.1-.47S283.69,235.2,283.49,235.28Z" fill="#01ada1"/><path d="M283.09,248.94a2,2,0,0,0,.72.13c.31,0,.4-.35.29-.64s-.24-.5-.59-.41A.73.73,0,0,0,283.09,248.94Z" fill="#01ada1"/><path d="M286.76,235.84c-.57.1-.72.3-.78,1a9.71,9.71,0,0,0-1,.86.45.45,0,0,0,.33.77c.48,0,1,0,1.44-.37l0-.68c.53-.35.85-.88.68-1.21A.63.63,0,0,0,286.76,235.84Z" fill="#01ada1"/><path d="M281.61,245.31a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S281.81,245.26,281.61,245.31Z" fill="#01ada1"/><path d="M281,249.69a1.24,1.24,0,0,0-1,1.31,1.16,1.16,0,0,0,1.34,1.18c.91-.2,1.34-.82,1.26-1.39A1.59,1.59,0,0,0,281,249.69Z" fill="#01ada1"/><path d="M283,255.9a1.6,1.6,0,0,0,.44.14.65.65,0,0,0,.23.54.76.76,0,0,0,1-.05.8.8,0,0,0,0-.95,1.55,1.55,0,0,0-.49-1.5,1.27,1.27,0,0,0-1.35-.11c.06-.22.08-.46,0-.56s-.76.18-.94.34-.19.49.11.68a.76.76,0,0,0,.45.15A1.29,1.29,0,0,0,283,255.9Z" fill="#01ada1"/><path d="M284.9,241.12c-.13.09-.31.59-.18.73s.61,0,.68-.08.21-.49.12-.62A.65.65,0,0,0,284.9,241.12Z" fill="#01ada1"/><path d="M286.47,243.17c-.07-.48-.3-.72-.79-.71a1,1,0,0,0-1,1.13c0,.58.37.66.35,1s.2.51.59.62,1,.26,1.12-.28-.2-.71-.37-.74-.38-.32-.19-.35S286.55,243.65,286.47,243.17Z" fill="#01ada1"/><path d="M296.83,241a.66.66,0,0,0-1,.14c-.3.34-.33.7-.09.88A1.13,1.13,0,0,0,297,242,.7.7,0,0,0,296.83,241Z" fill="#01ada1"/><path d="M268.14,218.55c.09.18.83.53,1.1.31s0-1-.21-1.22a.77.77,0,0,0-.9-.11C267.85,217.73,268,218.28,268.14,218.55Z" fill="#01ada1"/><path d="M271.26,230.56c0-.15,0-.34-.24-.4a.25.25,0,0,0-.32.2c0,.14,0,.42.2.51S271.27,230.63,271.26,230.56Z" fill="#01ada1"/><path d="M268,213a.48.48,0,0,0,.55,0,.46.46,0,0,0,.06-.44.43.43,0,0,0-.42-.09C268.13,212.5,267.9,212.8,268,213Z" fill="#01ada1"/><path d="M270.61,233.81c.41.24.79.64,1.38.55l.44-.52c.63,0,1.2-.21,1.26-.58a.63.63,0,0,0-.36-.71c-.52-.26-.76-.19-1.21.33a9,9,0,0,0-1.32.11A.45.45,0,0,0,270.61,233.81Z" fill="#01ada1"/><path d="M268.35,175.08a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-.95.62.62,0,0,0-.83.44A.57.57,0,0,0,268.35,175.08Z" fill="#01ada1"/><path d="M328.18,259.73h0a1.32,1.32,0,0,0,1-.58.58.58,0,0,0,.05-.14c.24.16.42,0,.58-.14a.46.46,0,0,0-.06-.76,1.71,1.71,0,0,0-.57-.1,1.18,1.18,0,0,0-.43-.55,1.11,1.11,0,0,0-1.48.24,1.77,1.77,0,0,0,.15,1.67.7.7,0,0,0-.54.09c-.32.24-.64-.65-1.11-.35s-1-.12-1.53.31a1.07,1.07,0,0,0-.19.18.58.58,0,0,0-.16-.32.61.61,0,0,0-.85-.09.82.82,0,0,0,0-.22.56.56,0,0,0-.27-.49,1,1,0,0,0,.55-.85,1.18,1.18,0,0,0-.71-1,.91.91,0,0,0-1,.43,1.28,1.28,0,0,0-1.64.08,1.36,1.36,0,0,0-.35,1.22h0a.62.62,0,0,1,0,.13,1,1,0,0,0-.77.1,1.54,1.54,0,0,0-.89,1.2h2.57a1.7,1.7,0,0,0-.06-.46l0-.08a1.18,1.18,0,0,0,1.25-.44,1.67,1.67,0,0,0,.33-.5.58.58,0,0,0,.18.17,1.23,1.23,0,0,0-.56.67c.2.26.35.56.62.64h.11a.58.58,0,0,0,.22,0,.56.56,0,0,0,.17-.09s0,.07,0,.11h5.43Z" fill="#01ada1"/><path d="M261.65,167.9a.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45.71.71,0,0,0,.51.84A.55.55,0,0,0,261.65,167.9Z" fill="#01ada1"/><path d="M353.43,258.66a.3.3,0,0,0,0-.08.9.9,0,0,0,.56-.06.75.75,0,0,0,.81.66.74.74,0,0,0,.62-.75.79.79,0,0,0-.68-.61,2.06,2.06,0,0,0,.16-.34.6.6,0,0,0,.44.21.82.82,0,0,0,.74-.57h.14a2,2,0,0,0,.41-.69c.07-.38-.38-.7-.81-.65a.42.42,0,0,0-.19.06.69.69,0,0,0-.29-.13.94.94,0,0,0-1,.54,1.3,1.3,0,0,0-1.62.26,1.32,1.32,0,0,0-.16,1.4,1,1,0,0,0-.81.18,1.56,1.56,0,0,0-.76,1.21h-.12a1.2,1.2,0,0,0-.74.45h3.33A1.37,1.37,0,0,0,353.43,258.66Z" fill="#01ada1"/><path d="M259.07,175.41a.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46c-.08-.31-.47-.9-1.05-.6-.62.89-1.06.26-1.71.75A1.49,1.49,0,0,0,259.07,175.41Z" fill="#01ada1"/><path d="M292.29,245.31a1.58,1.58,0,0,0-.79,1.35.82.82,0,0,0,.22.57,1.26,1.26,0,0,0,1.79.06l.35-.29c.18.23.34.46.52.66a.67.67,0,0,0,1,.1,1.41,1.41,0,0,0,.29-.31.38.38,0,0,0,.13.19c.26.19.44.05.61-.13a.46.46,0,0,0-.06-.76,1.93,1.93,0,0,1-1.4-.81,4.76,4.76,0,0,0-.91.05,3.07,3.07,0,0,0-.29-.34A1.4,1.4,0,0,0,292.29,245.31Z" fill="#01ada1"/><path d="M292.7,252.4a.76.76,0,0,0,.59.26c.48-.1.41-.51.38-.87-.36-.24-.71-.31-1,.05A.59.59,0,0,0,292.7,252.4Z" fill="#01ada1"/><path d="M294.48,250c-.15-.13-.28-.29-.5-.29s-.34.31-.21.58a1.08,1.08,0,0,0,.65.52.32.32,0,0,0,.4-.32A.72.72,0,0,0,294.48,250Z" fill="#01ada1"/><path d="M293.16,247.72a.78.78,0,0,0,.13.68.55.55,0,0,0,.86,0,.59.59,0,0,0,0-.82C294,247.38,293.25,247.45,293.16,247.72Z" fill="#01ada1"/><path d="M291.91,253.56s0,0,0-.05c-.24-.57-.77-.88-1.19-.69a1.14,1.14,0,0,0-.66.69.64.64,0,0,0-.7,0c-.41.26-.29.68-.19,1.11.43.1.87.29,1.14-.2a.54.54,0,0,0,0-.15,1.68,1.68,0,0,0,.84.19,1.3,1.3,0,0,0,1.36,1.13,1.28,1.28,0,0,0,1.16-1c.09-.49-.57-1-1.26-1.12A.87.87,0,0,0,291.91,253.56Z" fill="#01ada1"/><path d="M294,239.93c.08-.05.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.37A.52.52,0,0,0,294,239.93Z" fill="#01ada1"/><path d="M273.24,230.43c.37-.16.18-1.11-.24-1.26s-1,.08-1,.43S272.87,230.59,273.24,230.43Z" fill="#01ada1"/><path d="M288.82,256.24c.24.39.37.83.88.72a.71.71,0,0,0,.57-.72.52.52,0,0,0-.42-.6C289.34,255.5,289.08,255.82,288.82,256.24Z" fill="#01ada1"/><path d="M295.35,254.32c.29.43.7.46,1.22-.11a11.88,11.88,0,0,0,.47-1.4.61.61,0,0,0-.48-.77h-.19c-.21-.25-.55-.3-1-.15s-.82.69-.73,1a1.09,1.09,0,0,0,.59.61A.94.94,0,0,0,295.35,254.32Z" fill="#01ada1"/><path d="M295.36,243.51a.61.61,0,0,0-.09-.53.49.49,0,0,0-.11-.25c-.12-.09-.38-.25-.48-.12a.66.66,0,0,0,0,.15.61.61,0,0,0,0,1.05A.64.64,0,0,0,295.36,243.51Z" fill="#01ada1"/><path d="M277.87,236c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.51-.84A1.49,1.49,0,0,0,277.87,236Z" fill="#01ada1"/><path d="M265.56,230.4c.17-.06.22-.31.2-.43s-.28-.41-.44-.35-.21.43-.17.54S265.4,230.45,265.56,230.4Z" fill="#01ada1"/><path d="M279.73,247.38a1.11,1.11,0,0,0,.14,1.41,1,1,0,0,0,.71.21,1.32,1.32,0,0,0,1.11-1.49,4.6,4.6,0,0,0-.74-.46A1,1,0,0,0,279.73,247.38Z" fill="#01ada1"/><path d="M266.42,231.21c-.12,0-.17.3-.16.44s.22.32.4.26.15-.4.11-.53A.36.36,0,0,0,266.42,231.21Z" fill="#01ada1"/><path d="M265.75,226a1,1,0,0,0-.62-1,.7.7,0,0,0-.81.55.79.79,0,0,0,.44.9A1,1,0,0,0,265.75,226Z" fill="#01ada1"/><path d="M260.77,237.46a1.06,1.06,0,0,0-.23.41,1,1,0,0,0-.43,1,1,1,0,0,0,.45.59,1.32,1.32,0,0,0,1.78-.55,4.22,4.22,0,0,0-.33-.8,1.05,1.05,0,0,0-.43-.38s0,0,0,0C261.55,237.43,261,237.26,260.77,237.46Z" fill="#01ada1"/><path d="M265.17,221.46a.61.61,0,0,0-.12.88.69.69,0,1,0,1.12-.81A.81.81,0,0,0,265.17,221.46Z" fill="#01ada1"/><path d="M258.39,206a.59.59,0,0,0,.8.15c.26-.13.31-.88.06-1a.78.78,0,0,0-.7,0A.54.54,0,0,0,258.39,206Z" fill="#01ada1"/><path d="M266.09,227.39c-.5-.14-.87.12-1,.74s.14.86.75,1c.44.1.8,0,.91-.37A1.49,1.49,0,0,0,266.09,227.39Z" fill="#01ada1"/><path d="M262.29,232.06c.07.19.29.43.46.44.4,0,.59-.37.6-.63.46-.07,1.09-.42,1.15-.71.09-.44-.39-1-1-1.14s-.91.18-1,.85a.91.91,0,0,0,.13.61,1,1,0,0,0-.16.06A.56.56,0,0,0,262.29,232.06Z" fill="#01ada1"/><path d="M264.13,216.15c-.23.22-.4.47-.19.79a.83.83,0,0,0,1,0,.76.76,0,0,0-.14-.7A.41.41,0,0,0,264.13,216.15Z" fill="#01ada1"/><path d="M257.72,241.62a1.32,1.32,0,0,0-.77-.73v1.8a.88.88,0,0,0,.17,0A.84.84,0,0,0,257.72,241.62Z" fill="#01ada1"/><path d="M258.06,233.82c.24-.1.41-.73.29-1.07a.62.62,0,0,0-.38-.38.53.53,0,0,0-.54-.47,1.76,1.76,0,0,0-.48,0v1.16l.11.07h0C257.23,233.59,257.77,233.94,258.06,233.82Z" fill="#01ada1"/><path d="M257.59,226.73a1.11,1.11,0,0,0,1.49-.82,1.19,1.19,0,0,0-.67-1.43c-.51-.19-1.22.31-1.46,1v.7A.93.93,0,0,0,257.59,226.73Z" fill="#01ada1"/><path d="M257,237.19a.54.54,0,0,0,0-.38Z" fill="#01ada1"/><path d="M257,237.88v1.78a1,1,0,0,0,.32-.57C257.38,238.42,257.29,238.12,257,237.88Z" fill="#01ada1"/><path d="M261.84,241.38a1.13,1.13,0,0,0,1.28.43.81.81,0,0,0,.33-.33.55.55,0,0,0,.29-.35c.07-.26.1-.55-.24-.69a.71.71,0,0,0-.21,0,.84.84,0,0,0-.92-.37A1.23,1.23,0,0,0,261.84,241.38Z" fill="#01ada1"/><path d="M263.73,237.52a.25.25,0,0,0-.15-.39c-.18-.07-.3,0-.38.14v0a.45.45,0,0,0-.63-.13c-.16.15-.59.44-.38.77s.69.25.92.19a.35.35,0,0,0,.25-.45A.25.25,0,0,0,263.73,237.52Z" fill="#01ada1"/><path d="M259,195.82c-.17,0-.35.15-.38.27s0,.49.2.53.4-.27.41-.39S259.13,195.86,259,195.82Z" fill="#01ada1"/><path d="M262,234.57a1.15,1.15,0,0,0-.16,1.19c.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94.8.8,0,0,0-.53-.48.32.32,0,0,0-.31-.16A.38.38,0,0,0,262,234.57Z" fill="#01ada1"/><path d="M266.42,237.92a1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.18-.39,1,1,0,0,0-.64,1.38A1,1,0,0,0,266.42,237.92Z" fill="#01ada1"/><path d="M277.45,232.78a.5.5,0,0,0-.33.65.53.53,0,0,0,.66.44.61.61,0,0,0,.41-.78A.55.55,0,0,0,277.45,232.78Z" fill="#01ada1"/><path d="M258,224c.19-.11.11-.61,0-.8a.49.49,0,0,0-.77-.1.68.68,0,0,0,0,.62C257.4,223.87,257.83,224.12,258,224Z" fill="#01ada1"/><path d="M277,240.91a1,1,0,0,0,1.07.46c.4-.16.89-1.09.74-1.42a1.19,1.19,0,0,0-1.46-.34C276.85,239.82,276.73,240.29,277,240.91Z" fill="#01ada1"/><path d="M276.6,242.23a1.31,1.31,0,0,0-.78.73.69.69,0,0,0-.23-.17c-.55-.12-.81.54-.66.83a.65.65,0,0,0,.79.2.5.5,0,0,0,.21-.28,1.25,1.25,0,0,0,1.25.29,1.18,1.18,0,0,0,.35-1.23A.81.81,0,0,0,276.6,242.23Z" fill="#01ada1"/><path d="M279.09,252.73a.93.93,0,0,0-1.15.62,1.25,1.25,0,0,0,0,.71.71.71,0,0,0-.44.94.69.69,0,0,0,.83.36.84.84,0,0,0,.47-.68,1,1,0,0,0,.59-.26c.27-.29.18-.59.09-.91S279.45,252.91,279.09,252.73Z" fill="#01ada1"/><path d="M260.26,257.69a1.44,1.44,0,0,0,.77-1,1.06,1.06,0,0,0,.88-.62c.1-.35-.54-1.14-1-1.24a.94.94,0,0,0-.85.45,1,1,0,0,0-.43.06c-.8.31-1.22,1-1,1.61a1,1,0,0,0,.33.42.67.67,0,0,0-.48.35.72.72,0,0,0,.08.93c.37.38.78.11,1.22-.05a1.65,1.65,0,0,0-.12-.89A1,1,0,0,0,260.26,257.69Z" fill="#01ada1"/><path d="M275.37,251.49a1.45,1.45,0,0,0,1.83.49,1,1,0,0,0,.49-1.36c-.46-.9-.78-.9-1.71-.64A1.12,1.12,0,0,0,275.37,251.49Z" fill="#01ada1"/><path d="M278.92,243.84a.34.34,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49S279,243.7,278.92,243.84Z" fill="#01ada1"/><path d="M277.9,247.31a1.54,1.54,0,0,0,.68-1.37.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14S277.49,247.47,277.9,247.31Z" fill="#01ada1"/><path d="M266.47,244.53c-.27.3-.53.62-.28,1a.6.6,0,0,0,.87.23.84.84,0,0,0,.38-.62C267.37,244.67,267,244.54,266.47,244.53Z" fill="#01ada1"/><path d="M265.68,243.56a.7.7,0,0,0-.62-.49c-.16-1-1.07-1.19-1.92-1.09a1.45,1.45,0,0,0-.86.41,1.53,1.53,0,0,0-.39,1.2.78.78,0,0,1,0,.22.68.68,0,0,0-.31.86,1.22,1.22,0,0,0,.48.65,2,2,0,0,0,1.95.8,1.67,1.67,0,0,0,1.34-.9,1,1,0,0,0-.08-.87h0A.59.59,0,0,0,265.68,243.56Z" fill="#01ada1"/><path d="M261.82,248.76a1.37,1.37,0,0,0-1.25.26.83.83,0,0,0-.6-.11,1.23,1.23,0,0,0-.7,1.42c.13.33.73.48,1.21.32a.05.05,0,0,0,0,0,1.46,1.46,0,0,0,.68.69,1,1,0,0,0,.72-.06.41.41,0,0,0,.58.19c.2-.1.54-.31.44-.6a.57.57,0,0,0-.32-.31l.06-.14A1.49,1.49,0,0,0,261.82,248.76Z" fill="#01ada1"/><path d="M260.45,252.58a.93.93,0,0,0-1,.52.69.69,0,0,0,.49.92.76.76,0,0,0,.9-.42A1.08,1.08,0,0,0,260.45,252.58Z" fill="#01ada1"/><path d="M259,192.84a.69.69,0,0,0-.79.61c0,.33.2.4.45.45s.64-.15.6-.46A2.21,2.21,0,0,0,259,192.84Z" fill="#01ada1"/><path d="M268.54,237.24a1,1,0,0,0-1.44.34c-.32.5-.1.76-.33,1s-.15.52.08.82a2.28,2.28,0,0,0-.51.09,1.15,1.15,0,0,0-.75,1.44,1.5,1.5,0,0,0,1.75,1,1.57,1.57,0,0,0,.84-1.74.85.85,0,0,0-.19-.32.51.51,0,0,0,.09-.78c-.12-.12-.11-.47.06-.39s.4,0,.62-.42A.72.72,0,0,0,268.54,237.24Z" fill="#01ada1"/><path d="M259.29,187.45a1.39,1.39,0,0,0-.55,1.35c.11.37.21.77.76.73.4,0,.8,0,1.2,0a.58.58,0,0,0,.85-.37.75.75,0,0,0-.5-.93,2,2,0,0,1-.65-.39A1,1,0,0,0,259.29,187.45Z" fill="#01ada1"/><path d="M260.83,185.14c0,.25.1.82.44.86s.52-.4.6-.6a.44.44,0,0,0-.27-.65C261.28,184.64,260.81,184.84,260.83,185.14Z" fill="#01ada1"/><path d="M268.12,243.75a.67.67,0,0,0-.42.88.61.61,0,0,0,.85.29.71.71,0,0,0,.34-.93A.54.54,0,0,0,268.12,243.75Z" fill="#01ada1"/><path d="M261.53,181.43a.67.67,0,0,0-.82.52.84.84,0,0,0,.53.86.67.67,0,0,0,.79-.56A.64.64,0,0,0,261.53,181.43Z" fill="#01ada1"/><path d="M310.68,257.18a.4.4,0,0,0,.06.46c.09.09.46.19.56.06s-.06-.48-.15-.55A.41.41,0,0,0,310.68,257.18Z" fill="#01ada1"/><path d="M379.75,237.52c-.15,0-.63.19-.64.38s.41.45.53.43.5-.19.53-.35S379.91,237.55,379.75,237.52Z" fill="#01ada1"/><path d="M379.42,250.24a1.07,1.07,0,0,0,.08.83.33.33,0,0,0,.51.07.74.74,0,0,0,.11-.59c0-.2,0-.4-.14-.56S379.52,250,379.42,250.24Z" fill="#01ada1"/><path d="M377.58,245c0-.28-.33-.29-.47-.31s-.29.19-.27.25a.53.53,0,0,0,.28.35A.38.38,0,0,0,377.58,245Z" fill="#01ada1"/><path d="M377.61,254.21c-.11.51.16.83.93.8a10.19,10.19,0,0,0,1.33-.64.61.61,0,0,0,.21-.88.64.64,0,0,0-.87-.28,2,2,0,0,1-.59.15A1,1,0,0,0,377.61,254.21Z" fill="#01ada1"/><path d="M366.43,241.87c.17,0,.34-.34.33-.46s-.13-.35-.31-.35-.3.21-.32.33S366.27,241.87,366.43,241.87Z" fill="#01ada1"/><path d="M380.92,244.54c-.31,0-.59.15-.6.54a.72.72,0,0,0,.62.66c.25,0,.46-.39.44-.78S381.21,244.51,380.92,244.54Z" fill="#01ada1"/><path d="M365.89,246.4a.21.21,0,0,0,.22.2c.13,0,.17-.15.17-.22s-.16-.15-.21-.15S365.89,246.31,365.89,246.4Z" fill="#01ada1"/><path d="M362.79,237.84c0-.07-.1-.37-.29-.37s-.26.33-.27.46a.35.35,0,0,0,.28.28C362.63,238.21,362.76,238,362.79,237.84Z" fill="#01ada1"/><path d="M365.36,252.14c-.43-.16-.85-.39-1.13.15a.72.72,0,0,0,.12.92c.1.09.3.19.4.15a7.49,7.49,0,0,0,.95-.46c.78.33,1.45.26,1.66-.21a1.4,1.4,0,0,0-.66-1.54C366.17,250.9,365.89,251.09,365.36,252.14Z" fill="#01ada1"/><path d="M376,248.18c0,.68.58,1.16,1.44,1.17a1.14,1.14,0,0,0,1.18-1.19,1.44,1.44,0,0,0-1.36-1.33A1.5,1.5,0,0,0,376,248.18Z" fill="#01ada1"/><path d="M372.69,239.41c0-.19-.48-.47-.71-.54s-.51.18-.53.56a.41.41,0,0,0,.51.47C372.18,239.86,372.71,239.6,372.69,239.41Z" fill="#01ada1"/><path d="M380.81,248a.74.74,0,0,0-.4.57.54.54,0,0,0,.57.64.59.59,0,0,0,.6-.56C381.63,248.41,381.06,247.92,380.81,248Z" fill="#01ada1"/><path d="M371.13,249.75c.16,0,.59-.33.57-.52s-.54-.46-.63-.41-.54.39-.47.56A.68.68,0,0,0,371.13,249.75Z" fill="#01ada1"/><path d="M371.68,250.88c-.12.45-.35.85.09,1.14a.72.72,0,0,0,.92-.09.55.55,0,0,0,.14-.73C372.57,250.74,372.16,250.78,371.68,250.88Z" fill="#01ada1"/><path d="M370.64,247.31c.05.44.67.83,1.28.79s.81-.44.75-1.12a1,1,0,0,0-.86-.78C371.37,246.23,370.6,247,370.64,247.31Z" fill="#01ada1"/><path d="M379.57,256.11a1.13,1.13,0,0,0,1,.85,1.28,1.28,0,0,0,.78-1.12.63.63,0,0,0-.76-.59C379.88,255.3,379.54,255.57,379.57,256.11Z" fill="#01ada1"/><path d="M378.25,251.24c-.08-.42-.28-.72-.72-.66a.61.61,0,0,0-.4.4.76.76,0,0,0,.23.61C377.76,251.85,378,251.52,378.25,251.24Z" fill="#01ada1"/><path d="M373.05,253.13c-.66-.15-1.4.12-1.33.73a2.39,2.39,0,0,0,.82,1.38c.3.32.8,0,.74.57s-.06,1.59.91,1.59a1.18,1.18,0,0,0,1-1v0a1.33,1.33,0,0,0,1.1.45,1.32,1.32,0,0,0,1.06-1.38,1.11,1.11,0,0,0-1.09-1,1.75,1.75,0,0,0-1.23,1.14.67.67,0,0,0-.4-.36c-.39-.12.12-.91-.41-1.1S373.72,253.29,373.05,253.13Z" fill="#01ada1"/><path d="M374.59,251.34a1.28,1.28,0,0,0,.13,1.77,1.26,1.26,0,0,0,1.55.11c.42-.28.29-1.09-.08-1.69A1.24,1.24,0,0,0,374.59,251.34Z" fill="#01ada1"/><path d="M355.83,244.29c0,.3-.13.69.13.92s.56-.08.61-.21.24-.91,0-1.08S355.84,244.19,355.83,244.29Z" fill="#01ada1"/><path d="M344.09,258.9c0,.12.13.5.3.48s.3-.3.29-.39-.08-.45-.25-.42A.44.44,0,0,0,344.09,258.9Z" fill="#01ada1"/><path d="M345.13,240.35a.73.73,0,0,0,.19,1,.69.69,0,0,0,1-.12.75.75,0,0,0-.2-1A.69.69,0,0,0,345.13,240.35Z" fill="#01ada1"/><path d="M361.46,250.41a1.08,1.08,0,0,0-.12.62,1.2,1.2,0,0,0-.51.89,1.31,1.31,0,0,0,1,1.39,1.75,1.75,0,0,0,1.47-1.18,1.41,1.41,0,0,0,.81-.76c.18-.54-.48-.87-.88-.77s-.28,0-.57-.29A.71.71,0,0,0,361.46,250.41Z" fill="#01ada1"/><path d="M347.26,245.69c-.31-.08-1,0-1,.67.53.95-.24,1.06-.09,1.86a1.26,1.26,0,0,0,.16.33.88.88,0,0,0,1.59-.19,5.79,5.79,0,0,0,.35-1.42A1.36,1.36,0,0,0,347.26,245.69Z" fill="#01ada1"/><path d="M349.66,253.26c.1-.4-.26-.54-.56-.67-.4.15-.63.42-.46.83.06.15.34.33.45.29S349.61,253.45,349.66,253.26Z" fill="#01ada1"/><path d="M353.77,249a.65.65,0,0,0-1,.07.68.68,0,0,0,.11,1,.81.81,0,0,0,1-.09A.66.66,0,0,0,353.77,249Z" fill="#01ada1"/><path d="M351.45,245.48a1,1,0,0,0,.4,1.26,1,1,0,0,0,1.26-1.58A1.34,1.34,0,0,0,351.45,245.48Z" fill="#01ada1"/><path d="M345.25,257.78c.38.05.78-.31.95-.84.05-.18.08-.35.13-.53a2.3,2.3,0,0,0,1.17-.53,2.69,2.69,0,0,0,.29.16.7.7,0,0,0,.36,0,1,1,0,0,0,.65.2c.5,0,.77-.26.76-.69a1.34,1.34,0,0,0-.47-1,1.21,1.21,0,0,0-.94-.69,1.38,1.38,0,0,0-1,.29.75.75,0,0,0-.14-.12c-.57-.47-1.07-.25-1.57.15-.28-.28-.46-.74-1-.46a.63.63,0,0,0-.35.76c.14.56.61.48,1,.44l.25.69-.88.35a4.31,4.31,0,0,0-.1.75A1.46,1.46,0,0,0,345.25,257.78Z" fill="#01ada1"/><path d="M350.36,256a.75.75,0,0,0,.14,1,.59.59,0,0,0,.88-.1.67.67,0,0,0,0-1A.72.72,0,0,0,350.36,256Z" fill="#01ada1"/><path d="M349,251a.67.67,0,0,0-.39-.73c-.37-.08-.88.63-.71.88S348.89,251.34,349,251Z" fill="#01ada1"/><path d="M369.25,252.8c0,.31.7.85,1.06.86s.6-.3.57-.85-.24-.89-.68-.88C369.6,252,369.2,252.32,369.25,252.8Z" fill="#01ada1"/><path d="M354.86,242c-.12.44-.35.84.09,1.13a.72.72,0,0,0,.92-.09.54.54,0,0,0,.14-.72C355.75,241.89,355.34,241.93,354.86,242Z" fill="#01ada1"/><path d="M356.1,249c-.26-.06-.53.32-.48.63s.22.56.54.47.82-.33.8-.58S356.35,249,356.1,249Z" fill="#01ada1"/><path d="M354.16,245.87c0,.06.15.31.22.3s.43,0,.47-.25-.27-.34-.34-.32A.62.62,0,0,0,354.16,245.87Z" fill="#01ada1"/><path d="M343.61,256c-.14,0-.36.08-.36.35a.38.38,0,0,0,.44.42.39.39,0,0,0,.36-.47A.42.42,0,0,0,343.61,256Z" fill="#01ada1"/><path d="M355.82,250.46c-.24.24-.27.74,0,.86s.78.28,1,0-.13-.65-.27-.81A.44.44,0,0,0,355.82,250.46Z" fill="#01ada1"/><path d="M344.24,250.42a1,1,0,1,0,1.56,1.12,1.28,1.28,0,0,0,.21-.75.7.7,0,0,0,.64.64.61.61,0,0,0,.66-.59.71.71,0,0,0-.64-.66.59.59,0,0,0-.66.55.8.8,0,0,0-.28-.6A1.34,1.34,0,0,0,344.24,250.42Z" fill="#01ada1"/><path d="M342.75,246.53a.49.49,0,0,0,.1.77.68.68,0,0,0,.6-.18c.11-.14.24-.61.08-.77S342.91,246.41,342.75,246.53Z" fill="#01ada1"/><path d="M355.9,258.34a.73.73,0,0,0,.1,1.05.69.69,0,0,0,.95-.24.64.64,0,0,0-.1-.89A.62.62,0,0,0,355.9,258.34Z" fill="#01ada1"/><path d="M391.24,252.13a.69.69,0,0,0-.75.73.77.77,0,0,0,.72.68.8.8,0,0,0,.7-.81A.65.65,0,0,0,391.24,252.13Z" fill="#01ada1"/><path d="M392.34,244.91c-.1,0-.31.18-.32.29s.1.49.3.46.34-.32.34-.44A.47.47,0,0,0,392.34,244.91Z" fill="#01ada1"/><path d="M386.16,251.2a.81.81,0,0,0,.84.68c.51-.07.93-.47.9-.87s-.59-1.06-1-1S386.14,250.66,386.16,251.2Z" fill="#01ada1"/><path d="M386.91,242.56c-.08,0-.28.19-.27.25s.16.33.29.36.45-.18.45-.3S387.05,242.59,386.91,242.56Z" fill="#01ada1"/><path d="M387.19,259.29a1.26,1.26,0,0,0-.89.46H388A1,1,0,0,0,387.19,259.29Z" fill="#01ada1"/><path d="M386.68,246a1.12,1.12,0,0,0,.87.82.7.7,0,0,0,.6-.78.66.66,0,0,0-.78-.59C386.92,245.43,386.64,245.65,386.68,246Z" fill="#01ada1"/><path d="M385,257.91a.63.63,0,0,0,.55-.78c-.06-.32-.12-.68-.46-.67-.6.05-.93.34-.92.71A.74.74,0,0,0,385,257.91Z" fill="#01ada1"/><path d="M368.59,244.16c-.3,0-.48.2-.42.55s.2.57.52.49.8-.34.8-.61S368.83,244.18,368.59,244.16Z" fill="#01ada1"/><path d="M388.9,257.56a1.32,1.32,0,0,0,1-1.16,1.2,1.2,0,0,0-1-.85.87.87,0,0,0-.8.72C388.05,257,388.43,257.58,388.9,257.56Z" fill="#01ada1"/><path d="M388.07,244.22c-.06,0-.18.08-.17.17a.2.2,0,0,0,.21.2c.13,0,.17-.16.17-.22S388.13,244.22,388.07,244.22Z" fill="#01ada1"/><path d="M385.77,246c0-.15-.08-.45-.25-.42a.44.44,0,0,0-.34.33c0,.12.13.5.3.48S385.78,246.08,385.77,246Z" fill="#01ada1"/><path d="M394.91,255.84a.69.69,0,0,0,.66.72.53.53,0,0,0,.64-.57.66.66,0,0,0-.62-.75A.67.67,0,0,0,394.91,255.84Z" fill="#01ada1"/><path d="M398.06,253.67a.7.7,0,1,0,0-1.39.82.82,0,0,0-.66.76A.63.63,0,0,0,398.06,253.67Z" fill="#01ada1"/><path d="M400.92,257.86a.73.73,0,0,0-.64.74.69.69,0,0,0,.73.74.74.74,0,0,0,.69-.79A.7.7,0,0,0,400.92,257.86Z" fill="#01ada1"/><path d="M396.67,247.66a.79.79,0,0,0-.63.66c0,.34.53.55.83.6s.92-.35.91-.7S397,247.65,396.67,247.66Z" fill="#01ada1"/><path d="M393.77,259.22c0-.42-.64-1.14-1-1.13-.55,0-.88.42-.86,1.06a.71.71,0,0,0,.35.6h1.2A.61.61,0,0,0,393.77,259.22Z" fill="#01ada1"/><path d="M393.08,251.33c.3,0,.71-.59.61-.8s-.4-.28-.64-.31a.42.42,0,0,0-.5.49C392.59,251,392.69,251.31,393.08,251.33Z" fill="#01ada1"/><path d="M353.92,252.64a.75.75,0,0,0-.25-1,.67.67,0,0,0-.94.24.68.68,0,0,0,.16,1A.84.84,0,0,0,353.92,252.64Z" fill="#01ada1"/><path d="M391.36,255.4a1.38,1.38,0,0,0,1.28,1.11.85.85,0,0,0,.66-.94c-.05-.63-.42-1-1-1S391.33,255,391.36,255.4Z" fill="#01ada1"/><path d="M390.21,259.75h1a.71.71,0,0,0-.55-.26A.61.61,0,0,0,390.21,259.75Z" fill="#01ada1"/><path d="M384.27,253.62a.64.64,0,0,0,.19.6,1,1,0,0,0,.82.09c.48-.24.23-.66.13-1.09C384.89,253.13,384.45,253.12,384.27,253.62Z" fill="#01ada1"/><path d="M359.63,258.6a.67.67,0,0,0,.19,1c.28.17.45,0,.6-.2a.45.45,0,0,0-.15-.74A2.38,2.38,0,0,0,359.63,258.6Z" fill="#01ada1"/><path d="M361.89,256.42a.68.68,0,0,0,.19,1c.29.17.46,0,.6-.2s.16-.64-.14-.74A1.83,1.83,0,0,0,361.89,256.42Z" fill="#01ada1"/><path d="M364.13,247.7a1,1,0,0,0-.93.94c0,.46.22.77.59.79a1.13,1.13,0,0,0,1.07-.94A.79.79,0,0,0,364.13,247.7Z" fill="#01ada1"/><path d="M360.49,245.58a.94.94,0,0,0-1,1.09,1.1,1.1,0,0,0,1.22,1,1.14,1.14,0,0,0,.91-1.2C361.62,245.84,361.17,245.51,360.49,245.58Z" fill="#01ada1"/><path d="M363,256.15a.77.77,0,0,0,.35.55.57.57,0,0,0,.55-.06c.32-.3.22-.65-.07-1C363.47,255.68,363.06,255.68,363,256.15Z" fill="#01ada1"/><path d="M367.84,247.44a.77.77,0,0,0,.72.68.8.8,0,0,0,.7-.81.65.65,0,0,0-.67-.6A.69.69,0,0,0,367.84,247.44Z" fill="#01ada1"/><path d="M366.86,256.9c-.53.45-.64.89-.34,1.35a1.08,1.08,0,0,0,1.5.34,12.55,12.55,0,0,1,1.85-.89c.53-.16,1-.74.89-1.1a.8.8,0,0,0-.92-.33c-.43.27-.65,0-1-.11a2.09,2.09,0,0,0-1,0,1.71,1.71,0,0,0-.55.29A4.87,4.87,0,0,0,366.86,256.9Z" fill="#01ada1"/><path d="M382.67,240.23a.66.66,0,0,0-.7.67.69.69,0,0,0,.62.66.67.67,0,0,0,.67-.71A.53.53,0,0,0,382.67,240.23Z" fill="#01ada1"/><path d="M364.55,257.76a.37.37,0,0,0,.07.45c.09.09.46.19.56.06s-.06-.48-.16-.54A.39.39,0,0,0,364.55,257.76Z" fill="#01ada1"/><path d="M367.22,256c0-.7-.3-1.26-.76-1.27a1.17,1.17,0,0,0-1,1c0,.42.45.9.95.94A.86.86,0,0,0,367.22,256Z" fill="#01ada1"/><path d="M383.38,249.15c-.22-.05-.7.41-.65.75s.28.36.52.35.61-.27.5-.57S383.59,249.2,383.38,249.15Z" fill="#01ada1"/><path d="M299.5,237.81a.49.49,0,0,0-.08-.54.43.43,0,0,0-.44,0,.42.42,0,0,0,0,.42C299,237.8,299.38,238,299.5,237.81Z" fill="#01ada1"/><path d="M383.54,259.28c0-.35-.3-.54-.72-.52-.63,0-1,.25-1,.6a.71.71,0,0,0,.15.39h1.45A.92.92,0,0,0,383.54,259.28Z" fill="#01ada1"/><path d="M359,247.23c-.06.05-.09.29,0,.36a.45.45,0,0,0,.45,0c.08-.07.18-.43.05-.54S359.07,247.13,359,247.23Z" fill="#01ada1"/><path d="M382.92,254.73c-.61.54-.74.84-.51,1.22a.67.67,0,0,0,.77.33.76.76,0,0,0,.66-.74C383.78,255,383.32,254.88,382.92,254.73Z" fill="#01ada1"/><path d="M371.74,259a.34.34,0,0,0-.16,0,.93.93,0,0,0-.33-.48,2,2,0,0,0-2,.31,1.11,1.11,0,0,0-.17.86h3.59C372.41,259.41,372,259,371.74,259Z" fill="#01ada1"/><path d="M358.55,252.63a1.27,1.27,0,0,1-.49.28,1,1,0,0,0-.85.82c-.06.35.55,1,1,1.09a2,2,0,0,0,.48,0,1.14,1.14,0,0,0-.41.78c0,.41.54.81,1.06.79s1-.29,1-.8a1.19,1.19,0,0,0-1-1.1,1.06,1.06,0,0,0-.19.06.5.5,0,0,0,.08-.12c.16-.37.37-.71.55-1.07a.58.58,0,0,0,.05-.93.76.76,0,0,0-1,0A.28.28,0,0,0,358.55,252.63Z" fill="#01ada1"/><path d="M359.31,259.73a.73.73,0,0,0-.44-.82.82.82,0,0,0-1.05.54.48.48,0,0,0,.05.3h1.44Z" fill="#01ada1"/><path d="M380.27,259.39a1.15,1.15,0,0,1-.21-1.26,1.1,1.1,0,0,0-.7-1.06,1.42,1.42,0,0,0-1.22.81c-.09.31-.26.73.11.92a1.48,1.48,0,0,1,.72.95h1.37A.42.42,0,0,0,380.27,259.39Z" fill="#01ada1"/><path d="M313,254c-.25-.31-.38-.78-.91-.57a.66.66,0,0,0-.44.73c.08.56.55.53,1,.54l.17.71-.91.26a3.78,3.78,0,0,0-.18.74,1.39,1.39,0,0,0,.71,1.09c.37.1.81-.21,1-.73.07-.16.13-.33.19-.51a2.19,2.19,0,0,0,1.22-.39l.27.19a1.26,1.26,0,0,0,1.52-.56,1.3,1.3,0,0,0-.93-1.52,1.43,1.43,0,0,0-1,.17l-.13-.13C314.08,253.5,313.55,253.67,313,254Z" fill="#01ada1"/><path d="M324.93,242.34c.08-.06.14-.47.05-.54s-.43.09-.53.18a.43.43,0,0,0,0,.37A.54.54,0,0,0,324.93,242.34Z" fill="#01ada1"/><path d="M314.24,240.18a.74.74,0,0,0,.08,1,.7.7,0,0,0,1,0,.75.75,0,0,0-.09-1.05A.69.69,0,0,0,314.24,240.18Z" fill="#01ada1"/><path d="M312.25,250.09a.92.92,0,0,0,.06,1.43h0c-.19.19-.11.49.16.72a.41.41,0,0,0,.68-.12,1.43,1.43,0,0,0,.13-.45,1,1,0,0,0,.39-.29,1.1,1.1,0,0,0,.09-1.41A1.33,1.33,0,0,0,312.25,250.09Z" fill="#01ada1"/><path d="M316.6,250.4c-.36-.13-.94.52-.8.79s1,.33,1.1,0A.64.64,0,0,0,316.6,250.4Z" fill="#01ada1"/><path d="M316.64,245.11c.1-.17.16-.52.05-.63a.63.63,0,0,0-.62,0c-.12.1-.24.62-.1.74S316.59,245.21,316.64,245.11Z" fill="#01ada1"/><path d="M316.29,253.56c0,.15.3.36.42.33a1,1,0,0,0,.61-.38c.15-.39-.2-.57-.48-.73C316.42,252.89,316.16,253.13,316.29,253.56Z" fill="#01ada1"/><path d="M311.19,246.06a.48.48,0,0,0,0,.77.67.67,0,0,0,.61-.11c.13-.12.31-.58.17-.75S311.36,246,311.19,246.06Z" fill="#01ada1"/><path d="M314.7,246.27c.42,1-.36,1-.29,1.85a1.4,1.4,0,0,0,.12.35.88.88,0,0,0,1.6,0,5.41,5.41,0,0,0,.5-1.36,1.36,1.36,0,0,0-.86-1.36C315.47,245.61,314.77,245.63,314.7,246.27Z" fill="#01ada1"/><path d="M321.68,252.69a.69.69,0,0,0-.2-.31.68.68,0,0,0-1,.14.69.69,0,0,0,.06,1,.84.84,0,0,0,1.05-.19.41.41,0,0,0,.07-.15,1.44,1.44,0,0,0,.45.85,1.26,1.26,0,0,0,1.81-.41,1.15,1.15,0,0,0,.15-1.21.47.47,0,0,0,.52-.08c.22-.26-.05-.66-.18-.84a.44.44,0,0,0-.69-.12.72.72,0,0,0-.24.48,1.41,1.41,0,0,0-1.65.36A1.18,1.18,0,0,0,321.68,252.69Z" fill="#01ada1"/><path d="M321,244.78a.68.68,0,0,0-.14-1,.54.54,0,0,0-.86.08.67.67,0,0,0,.1,1A.71.71,0,0,0,321,244.78Z" fill="#01ada1"/><path d="M317.33,258.81a.64.64,0,0,0-.88.17.72.72,0,0,0-.11.77h1.25A.82.82,0,0,0,317.33,258.81Z" fill="#01ada1"/><path d="M308.36,249.63a.69.69,0,0,0,1-.18.57.57,0,0,0-.1-.87.75.75,0,0,0-1,.08A.72.72,0,0,0,308.36,249.63Z" fill="#01ada1"/><path d="M324.47,246.2c.23.26.56,0,.63-.14s.33-.88.15-1.07-.78.18-.81.29C324.38,245.57,324.23,245.94,324.47,246.2Z" fill="#01ada1"/><path d="M323.28,248.65c.15-.21,0-.61-.34-.84a.39.39,0,0,0-.62.11.56.56,0,0,0,.05.81A.75.75,0,0,0,323.28,248.65Z" fill="#01ada1"/><path d="M319.28,240.49a.74.74,0,0,0,.36-.52c0-.46-.6-.57-.83-.49a.63.63,0,0,0-.07.94A.55.55,0,0,0,319.28,240.49Z" fill="#01ada1"/><path d="M320.21,247.28a.93.93,0,0,0,1.38-.14.9.9,0,0,0,.05-1.3A1.35,1.35,0,0,0,320,246,1,1,0,0,0,320.21,247.28Z" fill="#01ada1"/><path d="M318.28,244.31c0,.05-.08.18,0,.24a.21.21,0,0,0,.3,0c.08-.1,0-.23,0-.28A.25.25,0,0,0,318.28,244.31Z" fill="#01ada1"/><path d="M318,256.18a.5.5,0,0,0-.29.16.75.75,0,0,0,0,1,.61.61,0,0,0,.27.17.5.5,0,0,0,.17.22,1.18,1.18,0,0,0,1.41-.51c.31-.46.15-.91-.42-1.28a1,1,0,0,0-1.15.2S318,256.16,318,256.18Z" fill="#01ada1"/><path d="M314.44,257.41c-.2.22-.14.5.17.66s.58.2.7-.1.23-.84,0-1S314.6,257.23,314.44,257.41Z" fill="#01ada1"/><path d="M307.28,244a.93.93,0,0,0-1.38,0,.94.94,0,0,0-.1,1.24,1.35,1.35,0,0,0,1.68-.14A.83.83,0,0,0,307.28,244Z" fill="#01ada1"/><path d="M304.27,243a.64.64,0,0,0-.89.07.69.69,0,0,0,0,1,.78.78,0,0,0,1,0A.83.83,0,0,0,304.27,243Z" fill="#01ada1"/><path d="M308.26,238.31a.83.83,0,0,0,.09,1,.61.61,0,0,0,.89,0,.7.7,0,1,0-1-1Z" fill="#01ada1"/><path d="M307.15,251a1.15,1.15,0,0,0-1.48,0,1.13,1.13,0,0,0-.07,1.48,1.57,1.57,0,0,0,1.67-.06A1.08,1.08,0,0,0,307.15,251Z" fill="#01ada1"/><path d="M304.52,254.9a1.25,1.25,0,0,0,.14,1.66,1.26,1.26,0,0,0,1.71-1.84A1.24,1.24,0,0,0,304.52,254.9Z" fill="#01ada1"/><path d="M300.65,250.79c-.43-.34-.84-.1-1.22.08a3.66,3.66,0,0,0,0,.47,1.27,1.27,0,0,0-.15,1.11.79.79,0,0,0,.89.46,1,1,0,0,0,.68-1,1.51,1.51,0,0,0-.09-.18A.74.74,0,0,0,300.65,250.79Z" fill="#01ada1"/><path d="M298.19,252.88c-.48.57-.52,1-.12,1.35a1.13,1.13,0,0,0,1.33-.14,1.28,1.28,0,0,0-.25-1.34A.64.64,0,0,0,298.19,252.88Z" fill="#01ada1"/><path d="M353.34,250.91a.87.87,0,0,0-.68-.75.68.68,0,0,0-.64.66.66.66,0,1,0,1.32.09Z" fill="#01ada1"/><path d="M300.09,248c-.43.32-.75.63-.51,1.1a.65.65,0,0,0,.56.29,1,1,0,0,0,.63-.53C300.94,248.38,300.46,248.27,300.09,248Z" fill="#01ada1"/><path d="M304.14,247.21a.89.89,0,0,0,0,1.08c.54.51,1.2.63,1.52.28a1.29,1.29,0,0,0-.15-1.5A1.2,1.2,0,0,0,304.14,247.21Z" fill="#01ada1"/><path d="M309.15,259c.06-.24,1.14-.51,1.26-1.34a1.43,1.43,0,0,0-1.19-1.57,2.4,2.4,0,0,0-2.19,1.32c-.18.65.53,1.09.51,1.27s-.82.49-1.14,1.12h3.21C309.37,259.4,309.11,259.1,309.15,259Z" fill="#01ada1"/><path d="M304,236.1a.8.8,0,0,0,0,.91c.25.24.77,0,1-.17s.39-.91.14-1.15S304.17,235.88,304,236.1Z" fill="#01ada1"/><path d="M310.22,246.25a1.48,1.48,0,0,0-1.53-.07.91.91,0,0,0,.17,1.37c.36.33.84.24,1.27-.24A.75.75,0,0,0,310.22,246.25Z" fill="#01ada1"/><path d="M308.64,242.17a.66.66,0,0,0-.05.9.69.69,0,0,0,1,0,.53.53,0,0,0,0-.86A.65.65,0,0,0,308.64,242.17Z" fill="#01ada1"/><path d="M309,252.9a.93.93,0,0,0-.09,1.24.77.77,0,0,0,1.06.06,1.1,1.1,0,0,0-.08-1.35A.62.62,0,0,0,309,252.9Z" fill="#01ada1"/><path d="M303.27,240.48a.41.41,0,0,0,0,.69c.25.19.52.33.8.06a.82.82,0,0,0-.14-1C303.72,240.16,303.47,240.32,303.27,240.48Z" fill="#01ada1"/><path d="M305.33,259.63a2,2,0,0,0,.59-1,.16.16,0,0,0,.08-.06c.08-.1,0-.34-.11-.45h0a1.29,1.29,0,0,0-.34-.55,1.47,1.47,0,0,0-2.12.21,1.41,1.41,0,0,0,0,2h1.71Z" fill="#01ada1"/><path d="M302.21,250.51c-.38.45-.41.89-.13,1.14a.75.75,0,0,0,1.11-.07.65.65,0,0,0-.18-.94C302.74,250.46,302.44,250.25,302.21,250.51Z" fill="#01ada1"/><path d="M302,254.89a1.13,1.13,0,0,0,1.35-.06,1,1,0,0,0-.22-1.22.59.59,0,0,0-.87.15C301.83,254.24,301.73,254.65,302,254.89Z" fill="#01ada1"/><path d="M300.91,256a1.18,1.18,0,0,1-1.05-.73,1.09,1.09,0,0,0-1.24-.25,1.44,1.44,0,0,0-.28,1.45c.16.28.34.69.74.56a1.52,1.52,0,0,1,1.19.15,1.12,1.12,0,0,0-.27.83c.38.21.7.52,1.11.19a.6.6,0,0,0,.14-.83l-.15-.16a.78.78,0,0,0,.17-.24C301.46,256.62,301.3,256.05,300.91,256Z" fill="#01ada1"/><path d="M324.92,256a1.25,1.25,0,0,0-1.14,1.14,1.29,1.29,0,0,0,1.48,1,1.26,1.26,0,0,0,1-1.15C326.34,256.42,325.63,256,324.92,256Z" fill="#01ada1"/><path d="M326,244.92a.5.5,0,0,0,.05.48c.09.09.48.21.57.06a.47.47,0,0,0-.13-.47C326.32,244.91,326.05,244.78,326,244.92Z" fill="#01ada1"/><path d="M326.6,253.06a.33.33,0,0,0,.37-.36c0-.21-.22-.33-.4-.45s-.31-.26-.53-.24-.31.35-.15.6A1.12,1.12,0,0,0,326.6,253.06Z" fill="#01ada1"/><path d="M326.47,242.09a.2.2,0,0,0,0,.24.21.21,0,0,0,.29,0,.23.23,0,0,0-.07-.28C326.66,242,326.5,242,326.47,242.09Z" fill="#01ada1"/><path d="M327.92,243.12a.66.66,0,0,0-.94.24c-.26.38-.26.74,0,.89a1.13,1.13,0,0,0,1.19-.18A.71.71,0,0,0,327.92,243.12Z" fill="#01ada1"/><path d="M334.3,253.09a.75.75,0,0,0,1.1-.19.65.65,0,0,0-.28-.92c-.29-.15-.61-.32-.81,0C334,252.43,334,252.87,334.3,253.09Z" fill="#01ada1"/><path d="M326.63,255.76c.2-.35.44-.67.66-1a.57.57,0,0,0,.15-.92.75.75,0,0,0-1.05-.08,2.31,2.31,0,0,1-.63.31.56.56,0,0,0-.76.24.54.54,0,0,0,0,.15,1,1,0,0,0-.19.35c-.1.34.43,1.08.83,1.19S326.37,256.23,326.63,255.76Z" fill="#01ada1"/><path d="M331.51,254.5a.64.64,0,0,0-.93.24c-.42.62-.41,1,0,1.36a1.14,1.14,0,0,0,1.3-.29A1.28,1.28,0,0,0,331.51,254.5Z" fill="#01ada1"/><path d="M328.11,248.85a1.17,1.17,0,0,0-.32-.09.37.37,0,0,0,0-.34c-.13-.13-.43,0-.55.12a.3.3,0,0,0,0,.37.38.38,0,0,0,.17.06.84.84,0,0,0,.26.82c.28.17.45,0,.6-.2S328.42,249,328.11,248.85Z" fill="#01ada1"/><path d="M328.11,254.6a2,2,0,0,1-.25.56,1,1,0,0,0,.05,1.32c.34.4.75.38,1.2-.24a12.48,12.48,0,0,0,.32-1.44.63.63,0,0,0-.57-.72A.65.65,0,0,0,328.11,254.6Z" fill="#01ada1"/><path d="M348.2,247.81c.1.5.54.34.75.46a1.11,1.11,0,0,0,1.56-.4,1,1,0,0,0-.39-1.14.79.79,0,0,0-1.08,0C348.77,247,348.1,247.31,348.2,247.81Z" fill="#01ada1"/><path d="M350.47,239.55c-.09-.45-.66-.5-.87-.4a.62.62,0,0,0,0,.94.57.57,0,0,0,.54,0C350.33,240,350.51,239.71,350.47,239.55Z" fill="#01ada1"/><path d="M349.6,244a.2.2,0,0,0,0,.24.2.2,0,0,0,.29,0,.23.23,0,0,0-.07-.28S349.63,244,349.6,244Z" fill="#01ada1"/><path d="M325,250.16a.78.78,0,0,0,.21.67.55.55,0,0,0,.86-.06A.61.61,0,0,0,326,250C325.81,249.74,325.07,249.89,325,250.16Z" fill="#01ada1"/><path d="M352.89,256.24a1,1,0,0,0,.77-1,1,1,0,0,0-1.19-.39.76.76,0,0,0,.42,1.4Z" fill="#01ada1"/><path d="M320.92,249.66a.67.67,0,0,0,0,1,.83.83,0,0,0,1,0,.66.66,0,0,0,0-1A.64.64,0,0,0,320.92,249.66Z" fill="#01ada1"/><path d="M338.41,258.57a1.47,1.47,0,0,0-2.09.43,1.32,1.32,0,0,0-.29.75h2.84A1.12,1.12,0,0,0,338.41,258.57Z" fill="#01ada1"/><path d="M320.58,250.81c-.19-.2-.42.08-.53.18s0,.34,0,.36a.54.54,0,0,0,.45,0A.37.37,0,0,0,320.58,250.81Z" fill="#01ada1"/><path d="M332.1,259.64a.41.41,0,0,0-.47,0,.16.16,0,0,0-.06.13h.6A.72.72,0,0,0,332.1,259.64Z" fill="#01ada1"/><path d="M334.34,242.55c.27.16.56.26.81,0s0-.92-.25-1-.46.14-.64.32A.42.42,0,0,0,334.34,242.55Z" fill="#01ada1"/><path d="M339.78,242.94a.69.69,0,0,0,.05.91.71.71,0,0,0,1-.08.55.55,0,0,0-.05-.87A.67.67,0,0,0,339.78,242.94Z" fill="#01ada1"/><path d="M334,254.84c.09-.1,0-.34-.06-.46s-.34-.19-.48-.06.06.42.15.52A.35.35,0,0,0,334,254.84Z" fill="#01ada1"/><path d="M341.07,249.25a.77.77,0,0,0-1,.18.72.72,0,0,0,.23,1,.68.68,0,0,0,.93-.29A.57.57,0,0,0,341.07,249.25Z" fill="#01ada1"/><path d="M340.28,246.93a.9.9,0,0,0,.31,1.33c.4.29.87.15,1.24-.37a.76.76,0,0,0,0-1.07A1.47,1.47,0,0,0,340.28,246.93Z" fill="#01ada1"/><path d="M330.28,246.54c-.21.3.08,1,.52,1.35a.81.81,0,0,0,1.05-.25,1,1,0,0,0-.13-1.24A1.25,1.25,0,0,0,330.28,246.54Z" fill="#01ada1"/><path d="M331.54,250.86a.65.65,0,0,0,.59.23,1,1,0,0,0,.57-.6c.12-.52-.38-.58-.77-.77C331.54,250.07,331.26,250.42,331.54,250.86Z" fill="#01ada1"/><path d="M329.64,239.14a.44.44,0,0,0,0,.43c.09.08.44.23.55.05a.49.49,0,0,0-.14-.53A.47.47,0,0,0,329.64,239.14Z" fill="#01ada1"/><path d="M329.36,252a1.41,1.41,0,0,0,.42,1.82,1.68,1.68,0,0,0,2-.33.55.55,0,0,0,.47.29.68.68,0,0,0,.74-.4.75.75,0,0,0-.18-1,.92.92,0,0,0-1.08.15.8.8,0,0,0-.57-.17c-.41,0-.29,0-.54-.36A.71.71,0,0,0,329.36,252Z" fill="#01ada1"/><path d="M332.5,257a1.1,1.1,0,0,0-1.26-.11,1.43,1.43,0,0,0-.11,1.47c.19.26.41.65.79.48a1.66,1.66,0,0,1,1.38.08.56.56,0,0,0,.8-.38c.14-.4-.09-.95-.47-.93A1.18,1.18,0,0,1,332.5,257Z" fill="#01ada1"/><path d="M341.47,255.17a.41.41,0,0,0,.41-.19.72.72,0,0,0,.59-.23,1.11,1.11,0,0,0-.22-1.33.62.62,0,0,0-.89.15,1,1,0,0,0-.06,1.09c-.06.06-.12.13-.11.16S341.35,255.15,341.47,255.17Z" fill="#01ada1"/><path d="M334.7,255.17c-.36.52-.41.94-.13,1.15a1.14,1.14,0,0,0,1.33-.21,1,1,0,0,0-.35-1.19C335.26,254.73,334.94,254.83,334.7,255.17Z" fill="#01ada1"/><path d="M334.66,244.46a.68.68,0,0,0,.11,1,.75.75,0,0,0,1-.15.81.81,0,0,0-.21-1.05A.64.64,0,0,0,334.66,244.46Z" fill="#01ada1"/><path d="M335.87,248.45a.88.88,0,0,0,.08,1.07c.6.45,1.27.5,1.55.12a1.32,1.32,0,0,0-.31-1.48A1.2,1.2,0,0,0,335.87,248.45Z" fill="#01ada1"/><path d="M334.48,237.42a.76.76,0,0,0,.13.9c.27.21.76-.07,1-.28s.29-.94,0-1.15S334.65,237.18,334.48,237.42Z" fill="#01ada1"/><path d="M339.28,251.9a1.07,1.07,0,0,0-1.38,1.64,1.55,1.55,0,0,0,1.65-.25A1.06,1.06,0,0,0,339.28,251.9Z" fill="#01ada1"/><path d="M338.64,244.94a1,1,0,0,0-1.33,1.43,1.36,1.36,0,0,0,1.65-.32A.85.85,0,0,0,338.64,244.94Z" fill="#01ada1"/><path d="M337.09,256.05a1.26,1.26,0,0,0,.33,1.64c.55.44,1.16.31,1.65-.34a1.07,1.07,0,0,0-.16-1.68A1.23,1.23,0,0,0,337.09,256.05Z" fill="#01ada1"/><path d="M339,239.15a.81.81,0,0,0,.19,1,.61.61,0,0,0,.88-.11A.76.76,0,0,0,340,239,.75.75,0,0,0,339,239.15Z" fill="#01ada1"/><rect x="286.63" y="168.66" width="60.75" height="61.22" fill="#7de2d1"/><rect x="359.65" y="192.72" width="29.97" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="397.34" y="192.72" width="48.43" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="359.94" y="216.25" width="76.7" height="12.65" rx="6.15" fill="#7de2d1"/><rect x="359.94" y="169.46" width="72.67" height="12.65" rx="6.15" fill="#7de2d1"/><circle cx="712.34" cy="198.16" r="7.92" fill="#dbe1e9"/><path d="M503.63,279.44,520,262.2q10.13-10.65,20.16-21.38l6.54-7c.65-.7,1.39-1.39,2.07-2.11,12.17,6.78,24.28,13.68,36.39,20.57l5.43,3.09a2.39,2.39,0,0,0,2.82-.36q4.29-4.32,8.56-8.66l20.51-20.83q12.4-12.6,24.77-25.24l21.37-21.86c2.34-2.39,4.66-4.81,7-7.17.76-.75,1.65-1.49,2.44-2.29.77.71,1.54,1.42,2.3,2.14,2.84,2.64,5.51,5.38,8.25,8.12,4.26,4.24,8.67,8.33,13.1,12.39a12.63,12.63,0,0,1,3.42-3.64l-1.36-1.25c-3.53-3.22-7-6.41-10.72-9.48-3.11-2.61-6.27-5.12-9.3-7.84l-4.57-4.11a1.75,1.75,0,0,0-2.44,0c-2.84,2.9-5.69,5.78-8.58,8.64l-20.75,20.58Q634.9,207,622.38,219.48l-21.63,21.6-7.1,7.1c-.74.76-1.58,1.49-2.35,2.27-12.16-6.89-24.35-13.73-36.44-20.75l-5.4-3.14a2.48,2.48,0,0,0-2.94.38l-8.08,8.31q-9.74,10-19.41,20.07l-23.82,24.85Z" fill="#dbe1e9"/><path d="M764.16,167.7a1,1,0,0,1,0-.18C764.13,168,764.16,167.88,764.16,167.7Z" fill="#dbe1e9"/><path d="M766.73,136.4a1.55,1.55,0,0,0-1.92,0l-8.46.21c-5.25.14-10.58.11-15.81.59-1.22.11-2.43.23-3.65.41-.61.1-.37.92.14,1a87.07,87.07,0,0,0,9.83.44c5,.08,10.1.11,15.15.13l-.08.07c-.2.21-.38.44-.56.66l-2.13,2.46c-4.2,4.84-8.4,9.67-12.51,14.58C737.9,167.44,729,178,720.25,188.55a12.47,12.47,0,0,1,3.16,3.94q5.08-6.13,10.15-12.28C742.79,169,752,157.86,761,146.56l2.55-3.21,1.05-1.32.2-.25c-.25,7.33-.45,14.66-.67,22,0,.9-.05,1.8,0,2.7a9.63,9.63,0,0,0,.09,1.08s0,.11,0,.15a1.47,1.47,0,0,0,2.74.47s0,0,0,0a1.89,1.89,0,0,0,.12-.38s0,0,0,0a7.43,7.43,0,0,0,.13-.93c.06-.68.07-1.38.09-2.06.09-2.34.09-4.69.13-7q.15-8.11.29-16.23c0-1.25,0-2.5.05-3.75A1.41,1.41,0,0,0,766.73,136.4Z" fill="#dbe1e9"/><path d="M639.21,279.81l-45.48.88-43.52-.59C535,267.81,526.28,252,526.28,230.94a67,67,0,1,1,112.93,48.87" fill="#fa744e"/><g clip-path="url(#b)"><path d="M577.21,271.76a1.22,1.22,0,0,0-1.54-.39.86.86,0,0,0-.31.39,1.14,1.14,0,0,0-1.38.86c-.14.57.43,1.29,1.18,1.48a1,1,0,0,0,1.21-.8h0a1,1,0,0,0,.3-.13C577.13,272.88,577.43,272.1,577.21,271.76Z" fill="#e55940"/><path d="M537.78,211.17a1.13,1.13,0,0,0,1.43-.43,1.22,1.22,0,0,0-.55-1.41c-.35-.17-1,.2-1.24.68A.83.83,0,0,0,537.78,211.17Z" fill="#e55940"/><path d="M576.17,264.42a.81.81,0,0,0,.21-1,1,1,0,0,0-1.19-.38,1.13,1.13,0,0,0-.42,1.29C575,264.71,575.63,264.75,576.17,264.42Z" fill="#e55940"/><path d="M573.18,262.75a.55.55,0,0,0-.48-.66.67.67,0,0,0-.86.48.61.61,0,0,0,.51.73A.73.73,0,0,0,573.18,262.75Z" fill="#e55940"/><path d="M575.55,254.47a1,1,0,0,0-1.33.74,1,1,0,0,0,.55,1.18,1.42,1.42,0,0,0,1.51-.91A1,1,0,0,0,575.55,254.47Z" fill="#e55940"/><path d="M574.13,264.55c-.49,0-.59.42-.56.83a.76.76,0,0,0,1.2,0C574.72,264.94,574.64,264.51,574.13,264.55Z" fill="#e55940"/><path d="M577.88,268.8a1.23,1.23,0,0,0,.32-1.48,1.09,1.09,0,0,0-1.36-.23.9.9,0,0,0,.22-.42.52.52,0,0,0-.55-.57c-.57,0-1,.14-1,.42a1.14,1.14,0,0,0,.76.91.4.4,0,0,0,.26-.08.94.94,0,0,0,.15,1A1.09,1.09,0,0,0,577.88,268.8Z" fill="#e55940"/><path d="M577.48,258.68c-.53-.19-1.28.34-1.49,1.06a.91.91,0,0,0,.67,1.19,1.11,1.11,0,0,0,1.49-.82A1.19,1.19,0,0,0,577.48,258.68Z" fill="#e55940"/><path d="M557.32,278.16a.54.54,0,0,0-.42-.4.69.69,0,0,0-.68.35c-.17.34.27,1.08.62,1S557.35,278.36,557.32,278.16Z" fill="#e55940"/><path d="M550.92,274.25a.61.61,0,0,0,.67,0c.29-.18.45-.47.26-.76a1.49,1.49,0,0,0-.28-.34h0a1,1,0,0,1,.53-.2,1,1,0,0,0,.81-.31,1.38,1.38,0,0,0,1.06-1.12.57.57,0,0,0,0-.18,1.39,1.39,0,0,0,.78.78c.37.12.85-.22,1-.7a.94.94,0,0,0-.72-1.25c-.47-.15-1.06.07-1.15.43a.9.9,0,0,0,0,.16A1.42,1.42,0,0,0,553,270a1.39,1.39,0,0,0-.45,0,1.87,1.87,0,0,0,.19-1.72,1.34,1.34,0,0,0-1.56-.41c-.4.15-.72.35-1.16,0s-.63,0-.82.35c.14.51.45.7.87.55a7.31,7.31,0,0,0,.64,1.13,1.59,1.59,0,0,0,1.26.35,1.41,1.41,0,0,0-.39.8s0,.07,0,.11a1.07,1.07,0,0,1-.75,0,1.45,1.45,0,0,0-1.34.4,1.15,1.15,0,0,0-.35,1.09,1.34,1.34,0,0,0-.61.15h-.13c-.37.07-.57.42-.58.9a2.82,2.82,0,0,0-.07.31c-.07.5-.48.8-.34,1.29a2.1,2.1,0,0,0,2,1.57,1.72,1.72,0,0,0,1.48-.64c.35-.47-.11-1.08,0-1.67A1.88,1.88,0,0,0,550.92,274.25Z" fill="#e55940"/><path d="M575,275.65a1.14,1.14,0,0,0-.39.59.72.72,0,0,0-.92.5.7.7,0,0,0,.46.78.86.86,0,0,0,.79-.27.9.9,0,0,0,.62.14c.39-.07.5-.37.61-.68s.3-.53.11-.89A.91.91,0,0,0,575,275.65Z" fill="#e55940"/><path d="M534.81,213.59a.65.65,0,0,0-.75.19.88.88,0,0,0-.32.51,3,3,0,0,1,.43.35.76.76,0,0,0,.12,1.28c.62.27,1.28.14,1.44-.29a1.23,1.23,0,0,0-.61-1.3.57.57,0,0,0-.19,0,4.83,4.83,0,0,1,.05-.59Z" fill="#e55940"/><path d="M571.52,266a.59.59,0,0,0,.38.8.71.71,0,0,0,.9-.39.67.67,0,0,0-.5-.83A.62.62,0,0,0,571.52,266Z" fill="#e55940"/><path d="M529.5,210.44a.22.22,0,0,0,.13.12l-.17-.05q-.45,1.41-.84,2.85c.68.23,1.45-.23,1.39-.77s-.43-.69-.31-.86.58-.39.49-.77c0-.16-.26-.29-.51-.38a.69.69,0,0,0,.5-.11c.13-.09.32-.32.18-.54a.45.45,0,0,0-.55-.11.74.74,0,0,0-.16.12c0,.16-.11.31-.16.46S529.49,210.43,529.5,210.44Z" fill="#e55940"/><path d="M557.94,275.1a.65.65,0,0,0-.6-.68.82.82,0,0,0-.61.25.45.45,0,0,0-.12.36,1.25,1.25,0,0,0-.58,0,1.88,1.88,0,0,0-1-1.47,1.5,1.5,0,0,0-1.17.36.68.68,0,0,0-.55.69.55.55,0,0,0,.05.17,1,1,0,0,0,.76,1.05,2.73,2.73,0,0,0,1.24.13,1.27,1.27,0,0,0,1,1.18.91.91,0,0,0,1.09-.58,1.14,1.14,0,0,0,.06-.9A.57.57,0,0,0,557.94,275.1Z" fill="#e55940"/><path d="M573.37,251.1c-.33-.1-.8.26-1,.86.08.12.18.39.36.48a.85.85,0,0,0,1.1-.36A.83.83,0,0,0,573.37,251.1Z" fill="#e55940"/><path d="M572.12,253.5c-.22,0-.75,0-.77.4s.41.61.63.7.48-.16.55-.44S572.41,253.47,572.12,253.5Z" fill="#e55940"/><path d="M562.24,278.15a1.12,1.12,0,0,0-1.11.89,1.18,1.18,0,0,0,0,.27l0,.06a7.77,7.77,0,0,0,.8.82.67.67,0,0,0,.58-.05,1.38,1.38,0,0,0,.45-1.46A.66.66,0,0,0,562.24,278.15Z" fill="#e55940"/><path d="M563.36,274.3c-.18-1-1-1.2-1.39-1s-.64.65-.94.66.27-.31-.65-.58-2,.79-1.16,1.6c.12.13-.77.84-.1,1.53a1.13,1.13,0,0,0,1.9,0,2.06,2.06,0,0,1,.83-.5h0a.64.64,0,0,0,.68-.32A1.21,1.21,0,0,0,563.36,274.3Z" fill="#e55940"/><path d="M571.29,269.44a1,1,0,0,0-.23.86,4.41,4.41,0,0,0,.3.86,3,3,0,0,0-.25.37,1.36,1.36,0,0,0-.11.28.81.81,0,0,0-.54.58.66.66,0,0,0,0,.14,1.27,1.27,0,0,0-1.42.81,1.29,1.29,0,0,0,.68,1.52,1.7,1.7,0,0,0,1.76-1,.94.94,0,0,0-.12-.67,1.63,1.63,0,0,0,1.36.28.8.8,0,0,0,.48-.37,1.28,1.28,0,0,0-.42-1.74l-.34-.24a1,1,0,0,0,1-.54l.14.05a1.34,1.34,0,0,0,1.4-1,1.41,1.41,0,0,0-.84-1.54,1.39,1.39,0,0,0-1.42.41,1.34,1.34,0,0,0-1.45.84A.13.13,0,0,1,571.29,269.44Z" fill="#e55940"/><path d="M572.29,258.37a1.5,1.5,0,0,0,.85,1.81,1.59,1.59,0,0,0,1.71-.91c.23-.64-.24-1.33-1.1-1.62A1.15,1.15,0,0,0,572.29,258.37Z" fill="#e55940"/><path d="M600.32,261.83a.75.75,0,0,0,.9.17.87.87,0,0,0,.24-1,.68.68,0,0,0-.9-.15A.76.76,0,0,0,600.32,261.83Z" fill="#e55940"/><path d="M597.54,275.11c0,.4-.12.5-.35.7a.83.83,0,0,0,0,1.15c.32.3.58.19.84-.06a1.65,1.65,0,0,1,.62-.48,17.38,17.38,0,0,1,1.72-.37c.78,1.18,1.25,1.27,2.1.33a.94.94,0,0,0-.3-1.54,8.27,8.27,0,0,0-1.68-.37c-.22-.59-.54-1.26-1.3-1.32A1.73,1.73,0,0,0,597.54,275.11Z" fill="#e55940"/><path d="M600.05,270c.4.55.8.67,1.22.37a1.18,1.18,0,0,0,.32-1.46,1.27,1.27,0,0,0-1.5-.22A1,1,0,0,0,600.05,270Z" fill="#e55940"/><path d="M597.69,266.73a.83.83,0,0,0,0,1.13,2.17,2.17,0,0,0,.79-.05c.36-.16.37-.72.09-1A.63.63,0,0,0,597.69,266.73Z" fill="#e55940"/><path d="M596.58,264.65a1,1,0,0,0,1.26.06,1,1,0,0,0-.34-1.21.69.69,0,0,0-.9.23A.68.68,0,0,0,596.58,264.65Z" fill="#e55940"/><path d="M602.5,267.4c-.14.18-.46.66-.29.86s.74,0,.9-.16.07-.45,0-.63A.34.34,0,0,0,602.5,267.4Z" fill="#e55940"/><path d="M602.2,256.11c-.34-.09-1-.47-1.33-.11s0,.64,0,.89c.05.64.71,1.22,1.22,1.05a1,1,0,0,0,.72-1A.78.78,0,0,0,602.2,256.11Z" fill="#e55940"/><path d="M602.38,272.93a.74.74,0,0,0-.25.61.57.57,0,0,0,.35.42c.44.09.67-.19.78-.63C603,273.05,602.8,272.71,602.38,272.93Z" fill="#e55940"/><path d="M602.63,277a1.09,1.09,0,0,0,.58,1.43,12.45,12.45,0,0,1,1.78,1c.43.34,1.19.42,1.4.11a.81.81,0,0,0-.24-.95c-.47-.19-.35-.54-.46-.86a2.12,2.12,0,0,0-.58-.76,1.75,1.75,0,0,0-.56-.29,5.44,5.44,0,0,0-.61-.19C603.27,276.35,602.85,276.51,602.63,277Z" fill="#e55940"/><path d="M597.87,257a.7.7,0,0,0,.18-.9.59.59,0,0,0-.86-.21.71.71,0,0,0-.18.9A.6.6,0,0,0,597.87,257Z" fill="#e55940"/><path d="M577.21,275.11a.61.61,0,0,0-.55-.72.87.87,0,0,0-.68.25c-.26.44,0,.8.37,1.1C576.74,275.68,577.14,275.58,577.21,275.11Z" fill="#e55940"/><path d="M587.69,266.24c-.17.19-.63.55-.38.9s.75.08,1,0,.32-.48.12-.77S587.93,266,587.69,266.24Z" fill="#e55940"/><path d="M587.06,269.47c-.3.21-.28,1.23,0,1.59a1,1,0,0,0,1.09.11.94.94,0,0,0,.34-1.33A1.15,1.15,0,0,0,587.06,269.47Z" fill="#e55940"/><path d="M584.2,259.22a.72.72,0,0,0-.81.56.78.78,0,0,0,.44.9,1,1,0,0,0,1-.46A1,1,0,0,0,584.2,259.22Z" fill="#e55940"/><path d="M578.08,269.61c-.17.58,0,1,.41,1.14a1.59,1.59,0,0,0,1.36-.7.89.89,0,0,0-.71-1.08C578.57,268.78,578.28,269,578.08,269.61Z" fill="#e55940"/><path d="M596.53,271.76a.58.58,0,0,0,.81.16.74.74,0,0,0,.42-.83.83.83,0,0,0-1-.57A.88.88,0,0,0,596.53,271.76Z" fill="#e55940"/><path d="M589.69,278.84a1.62,1.62,0,0,0,.18.51.58.58,0,0,0,.1.62,2.06,2.06,0,0,0,.92.68h.47a.78.78,0,0,1,.22,0v0l2.15,0a2.69,2.69,0,0,0-.15-2.11c-.45-.14-1-.33-1.61-.5a1.08,1.08,0,0,0-.69-.44,1.59,1.59,0,0,0-1.44.62A.8.8,0,0,0,589.69,278.84Z" fill="#e55940"/><path d="M595.3,266.8a.76.76,0,0,0-.09,1.05.75.75,0,0,0,1,.08.78.78,0,0,0,.08-1A.69.69,0,0,0,595.3,266.8Z" fill="#e55940"/><path d="M594.32,260a1,1,0,0,0-.1,1.3c.3.41.65.49,1,.24a1.19,1.19,0,0,0,.43-1.51A1,1,0,0,0,594.32,260Z" fill="#e55940"/><path d="M592.28,272.36a.65.65,0,0,1,0,.11h0a1.88,1.88,0,0,0-.12-.55.44.44,0,0,0-.68-.22.54.54,0,0,0-.24.78,1.46,1.46,0,0,0,.6.34.73.73,0,0,0-.2.33c-.16,0-.36,0-.41.12s.19.39.27.39a.93.93,0,0,0,.24,0,.71.71,0,0,0,1.14-.05c.3-.38.62-.3,1-.31.07,1.07.59,1.45,1.47,1.15a1.36,1.36,0,0,0,.25-.11c.56-.29.66-.66.31-1.18s-.61-.85-1.4-.57a2.9,2.9,0,0,1,.36-.67.65.65,0,0,0,.13-.9,1,1,0,0,0-1-.58C592.61,270.64,592.32,271,592.28,272.36Z" fill="#e55940"/><path d="M590.38,276.32a.87.87,0,0,0-.14,1.08,1.15,1.15,0,0,0,1.19.05,1,1,0,0,0,0-1A.72.72,0,0,0,590.38,276.32Z" fill="#e55940"/><path d="M544.43,196.51a.49.49,0,0,0-.06-.55c-.16-.11-.44.13-.48.23a.48.48,0,0,0,.08.47C544.1,196.76,544.35,196.62,544.43,196.51Z" fill="#e55940"/><path d="M535.94,227.73a.91.91,0,0,0-.25,1.35,1.11,1.11,0,0,0,1.67.31,1.17,1.17,0,0,0,.4-1.52.65.65,0,0,0-.15-.18c.18-.06.45-.24.46-.39s-.3-.4-.47-.42-.61.26-.59.45a.24.24,0,0,0,.09.15A1.63,1.63,0,0,0,535.94,227.73Z" fill="#e55940"/><path d="M555.94,262.46a1.3,1.3,0,0,0-1.32-1l-.07,0s-.06-.05-.1-.06a1.32,1.32,0,0,0-1.33.57.87.87,0,0,0-.31-.12,2,2,0,0,0-.42,0,2.33,2.33,0,0,0-1.31,0,1,1,0,0,1-.57,0,1.07,1.07,0,0,0-.77-.07,1.58,1.58,0,0,0,0-1.12,1.91,1.91,0,0,1,0-.47.6.6,0,0,0,.44-.39.72.72,0,0,0-.42-.89.76.76,0,0,0-.59.05,2,2,0,0,0-2-.27,1.73,1.73,0,0,0-1,1h0c-.41-.14-.85.18-1,.77a.68.68,0,0,0,.41.95,1.64,1.64,0,0,0,1.12-.29,1.31,1.31,0,0,1,.09.28,2.81,2.81,0,0,0,.08.31.62.62,0,0,0-.61.3.53.53,0,0,0,.07.8,1.06,1.06,0,0,0,.8.21.54.54,0,0,0,.37-.48,1.53,1.53,0,0,0,.93.11,1,1,0,0,0-.16.34.8.8,0,0,0,.5,1,.69.69,0,0,0,.81-.56h0a1.22,1.22,0,0,0,.65.2,1.33,1.33,0,0,1,.91.3.93.93,0,0,0,.31.19.59.59,0,0,0-.2.53.73.73,0,0,0,.8.56.68.68,0,0,0,.62-.75.28.28,0,0,0,0-.13,1.26,1.26,0,0,0,1.06-.85l0-.08a1.21,1.21,0,0,0,1.25.45,1.59,1.59,0,0,0,.57-.18.6.6,0,0,0,.16.47.9.9,0,0,0,1.29-.13,1.16,1.16,0,0,0,.11-1.24A.91.91,0,0,0,555.94,262.46Zm-6.79,0-.06,0,.11-.06A.47.47,0,0,1,549.15,262.43Z" fill="#e55940"/><path d="M537.45,203.87a.64.64,0,0,0-.82.37.49.49,0,0,0,.35.7.85.85,0,0,0,.67-.16C537.79,204.65,537.74,204,537.45,203.87Z" fill="#e55940"/><path d="M527.26,220.37c.62-.24.66-.82.82-.83s.85.12.95-.4c.2-1.09-.82-1-.86-1.36a.78.78,0,0,1,0-.21.69.69,0,0,0,.19.1c.36.11.58-.07.71-.4a.67.67,0,0,0-.36-.91.67.67,0,0,0-.28,0v0a1.5,1.5,0,0,0-.34-.94c-.39,1.66-.73,3.33-1,5Z" fill="#e55940"/><path d="M534.79,258.83a1.17,1.17,0,0,0-.23-1.57,1.92,1.92,0,0,0-2.06.08c-.38.38,0,1-.14,1.09h0c.32.66.67,1.3,1,1.95,0-.45-.13-1,0-1.1S534.38,259.37,534.79,258.83Z" fill="#e55940"/><path d="M540.29,267c.05.24.54.3.79.14s.23-.92-.17-1S540.17,266.51,540.29,267Z" fill="#e55940"/><path d="M547.31,267.72h0a1.16,1.16,0,0,0,.18.2,1.31,1.31,0,0,0,1.59-.25c.31-.3.52-.61,1-.49s.56-.27.61-.65c-.33-.42-.69-.46-1-.16a6.85,6.85,0,0,0-1-.77,1.57,1.57,0,0,0-1.29.19,1.4,1.4,0,0,0,0-.89c-.23-.95-.56-1.2-1.38-1.09a1.31,1.31,0,0,0-1,1.66,1.09,1.09,0,0,0,.05.17,1.42,1.42,0,0,0-1-.4,1,1,0,0,0-.28,1.71.6.6,0,0,0,.44.7.75.75,0,0,0,.95-.46.6.6,0,0,0,0-.3.68.68,0,0,0,.32-.61.42.42,0,0,0,0-.16,1.45,1.45,0,0,0,.93.33A1.48,1.48,0,0,0,547.31,267.72Z" fill="#e55940"/><path d="M554.52,266.55a.72.72,0,0,0-.51-.84.78.78,0,0,0-.91.54,1,1,0,0,0-.41,0,.79.79,0,0,0-.65,1,.86.86,0,0,0,1.14.82c.56-.09,1-.53.93-.92,0,0,0,0,0-.05A.8.8,0,0,0,554.52,266.55Z" fill="#e55940"/><path d="M543.15,264.07a.68.68,0,0,0,.84-.53.34.34,0,0,0,0-.1,1.67,1.67,0,0,0,.42-1,1,1,0,0,0-1.2-.94,2.58,2.58,0,0,0-1.18.39,1.28,1.28,0,0,0-1.41-.68.9.9,0,0,0-.76,1,1,1,0,0,0,.79,1.13,1.25,1.25,0,0,0,1.09-.29,2,2,0,0,0,1.33.91Z" fill="#e55940"/><path d="M542,264.34a.64.64,0,0,0-.59.68.85.85,0,0,0,.92.58.65.65,0,1,0-.33-1.26Z" fill="#e55940"/><path d="M538.93,256.89c.15-.91-.34-1.14-.19-1.71s-.13-.85-.69-1.16l-.26-.13c.23-.12.38-.35.29-.54a.71.71,0,0,0-.55-.36.41.41,0,0,0-.43.56.44.44,0,0,1,0,.1.76.76,0,0,0-.82.34,5.53,5.53,0,0,0-.26-.82,4.06,4.06,0,0,0,.26-.36,1.5,1.5,0,0,0,.18-.59,1.16,1.16,0,0,0,.54-.6.27.27,0,0,0,0-.18c-.36-.48,0-.84.17-1.25a.7.7,0,0,0-.52-1,.8.8,0,0,0-.15,0,.41.41,0,0,0,0-.08,1.81,1.81,0,0,0,.18-.73.53.53,0,0,0-.43-.21l0,0h0l-1,.14a4.1,4.1,0,0,0-.08.65.75.75,0,0,0,.38.62,1,1,0,0,0-.18.7,1.17,1.17,0,0,1,0,.67,1.77,1.77,0,0,0-.65,0,.64.64,0,0,0-.25.12,1.23,1.23,0,0,0-.65.42c-.15.26,0,.49.23.66a1.33,1.33,0,0,0,.55.91l.36.27c-.18.23-.36.44-.51.67a.67.67,0,0,0,.16,1,1,1,0,0,0,1.19.15.84.84,0,0,0,.27-.21.76.76,0,0,0,.45.49c.25.1.47.61.17.6s-.58.25-.63,1a1.12,1.12,0,0,0,1,1.36A1.66,1.66,0,0,0,538.93,256.89Z" fill="#e55940"/><path d="M555.14,258.4a.55.55,0,0,0,.69-.3,3.89,3.89,0,0,0,.3-2.28,1.57,1.57,0,0,0-.18-.33.88.88,0,0,0-1.57.27c0,.11-.07.23-.1.34a.51.51,0,0,0-.17.83h0c0,.09,0,.17,0,.25A1.39,1.39,0,0,0,555.14,258.4Z" fill="#e55940"/><path d="M550.36,248.34a.68.68,0,0,0,.85.47.59.59,0,0,0,.48-.74.77.77,0,0,0-.81-.56A.72.72,0,0,0,550.36,248.34Z" fill="#e55940"/><path d="M553.33,259.45a.77.77,0,0,0-.61.79.6.6,0,0,0,.7.56.66.66,0,0,0,.67-.71A.72.72,0,0,0,553.33,259.45Z" fill="#e55940"/><path d="M551.28,233.11a.46.46,0,0,0-.35-.28c-.1,0-.29.22-.28.32s.15.48.35.43A.48.48,0,0,0,551.28,233.11Z" fill="#e55940"/><path d="M551,258.41a.77.77,0,0,0-.21.7.81.81,0,0,0,1.17.4.71.71,0,0,0-.13-1.17A.94.94,0,0,0,551,258.41Z" fill="#e55940"/><path d="M545.44,199.37c.18.06.69.13.83-.26a.37.37,0,0,0-.12-.43.65.65,0,0,0,.46-.42c.09-.41-.69-.94-1-.79s-.23.71,0,1a.64.64,0,0,0-.38.2A.43.43,0,0,0,545.44,199.37Z" fill="#e55940"/><path d="M548.17,201.25c0,.19.19.67.6.63s.37-.53.34-.7a.64.64,0,0,0-.44-.42A.43.43,0,0,0,548.17,201.25Z" fill="#e55940"/><path d="M547.92,244.6c.09.74.52,1.26,1,1.19a1.3,1.3,0,0,0,.85-1.26,1.21,1.21,0,0,0-1.13-.74A.89.89,0,0,0,547.92,244.6Z" fill="#e55940"/><path d="M550,240.94a.77.77,0,0,0,.8.6.82.82,0,0,0,.6-.89.65.65,0,0,0-.73-.52A.7.7,0,0,0,550,240.94Z" fill="#e55940"/><path d="M549.26,255.27a4.26,4.26,0,0,0-.6.45,1.43,1.43,0,0,0-.15,1.3,1,1,0,0,0,1.26.09c.16-.08.31-.18.47-.28a2.25,2.25,0,0,0,1.2.48c0,.1,0,.21.08.31a1.25,1.25,0,0,0,1.53.53,1.28,1.28,0,0,0,.25-1.76,1.38,1.38,0,0,0-.9-.51c0-.06,0-.13,0-.19a1.68,1.68,0,0,0-.07-.24,1.06,1.06,0,0,0,.21-.78c-.07-.53-.79-.52-1-.39s-.09.23,0,.45l-.27,0c0-.4.2-.85-.35-1a.65.65,0,0,0-.79.29c-.3.48.09.76.41,1l-.32.66Z" fill="#e55940"/><path d="M536.71,259.59a1.5,1.5,0,0,0-.49,2l.07,0a4.63,4.63,0,0,0,.59.21,1,1,0,0,0,1.21-.37,1.44,1.44,0,0,0,.21-1.54A1,1,0,0,0,536.71,259.59Z" fill="#e55940"/><path d="M557.8,260.91a1.38,1.38,0,0,0,1.45-.86,1,1,0,0,0-.55-.86.72.72,0,0,0,0-.41.66.66,0,0,0-.83-.5.69.69,0,0,0-.61.83.58.58,0,0,0,.18.28,1.16,1.16,0,0,0-.19.42C557.17,260.37,557.38,260.83,557.8,260.91Z" fill="#e55940"/><path d="M549.11,180.67a.7.7,0,0,0,.8.57.66.66,0,0,0,.62-.65.63.63,0,0,0-.67-.68l-.73.63A.51.51,0,0,0,549.11,180.67Z" fill="#e55940"/><path d="M558.81,249.44c.22-.22.17-1-.16-1.13s-.84-.13-.91.5S558.58,249.66,558.81,249.44Z" fill="#e55940"/><path d="M558.08,253.42c-.15.49,0,.87.27.86a1.12,1.12,0,0,0,.74-.34c.17-.21-.14-.7-.46-.71S558.2,253.38,558.08,253.42Z" fill="#e55940"/><path d="M559.43,257.07a.82.82,0,0,0,.76.66.68.68,0,0,0,.59-.78.65.65,0,0,0-.73-.63A.68.68,0,0,0,559.43,257.07Z" fill="#e55940"/><path d="M558.27,240.09a.75.75,0,0,0-.81-.57.82.82,0,0,0-.57.83.62.62,0,0,0,.7.55A.75.75,0,0,0,558.27,240.09Z" fill="#e55940"/><path d="M539.46,201.07c.14-.07.13-.36.08-.48a.51.51,0,0,0-.53-.19c-.17.1-.08.46,0,.54A.48.48,0,0,0,539.46,201.07Z" fill="#e55940"/><path d="M603.59,263.14c-.22.2-.33.5-.08.7s.74.5.94.33,0-.75-.06-1S603.83,262.92,603.59,263.14Z" fill="#e55940"/><path d="M558,269a.55.55,0,0,0,.41-.25,1.49,1.49,0,0,0,1.34-.94,1.08,1.08,0,0,0-.73-1.35c-.82-.22-1.58.09-1.73.72a1.11,1.11,0,0,0,0,.54.64.64,0,0,0-.6,0,.72.72,0,0,0-.48.79c.07.53.56.55,1,.69.09-.12.18-.24.25-.35A.46.46,0,0,0,558,269Z" fill="#e55940"/><path d="M543.37,205.06c.19.25,1,.3,1.14,0s.23-.82-.39-1S543.18,204.81,543.37,205.06Z" fill="#e55940"/><path d="M538.62,204a1.12,1.12,0,0,0,.25.77c.19.19.71-.05.76-.37a1.37,1.37,0,0,0-.12-.57C539,203.63,538.64,203.73,538.62,204Z" fill="#e55940"/><path d="M561.11,268a.67.67,0,0,0-.56.82c.08.31.31.32.56.29s.57-.34.43-.63A2.05,2.05,0,0,0,561.11,268Z" fill="#e55940"/><path d="M557.67,272c0-.48-.36-.77-.75-.71s-1,.68-1,1a.83.83,0,0,0,.07.27.72.72,0,0,0-.25.36.68.68,0,0,0,.56.8.65.65,0,0,0,.82-.39.5.5,0,0,0,0-.27C557.5,273,557.73,272.55,557.67,272Z" fill="#e55940"/><path d="M563.6,262.71a1.12,1.12,0,0,0-.52-1.26,1.23,1.23,0,0,0-1.41.74c-.09.33.3.81.79,1A.89.89,0,0,0,563.6,262.71Z" fill="#e55940"/><path d="M560.53,250.14c0-.14,0-.44-.21-.52a.43.43,0,0,0-.49.27c-.06.13-.13.54.16.67S560.5,250.28,560.53,250.14Z" fill="#e55940"/><path d="M555.16,267.72a1.24,1.24,0,0,0,1.19-.63,1.05,1.05,0,0,0-.38-.84.64.64,0,0,0,.3-.59.62.62,0,0,0-.72-.63.75.75,0,0,0-.69.81.37.37,0,0,0,.08.18.6.6,0,0,0-.2.31C554.53,267,554.7,267.59,555.16,267.72Z" fill="#e55940"/><path d="M561.2,260.76c.34-.06.37-.54.39-.76a.46.46,0,0,0-.46-.54c-.34,0-.72.34-.61.61S560.86,260.83,561.2,260.76Z" fill="#e55940"/><path d="M558.36,255.46a.64.64,0,0,0,.47.77.49.49,0,0,0,.65-.44.82.82,0,0,0-.24-.64C559.09,255,558.44,255.16,558.36,255.46Z" fill="#e55940"/><path d="M558.08,265.48a1.45,1.45,0,0,0,1.55-1,1,1,0,0,0,0-.3c.23.32.45.66,1,.46s.76-.24,1.14-.35a.58.58,0,0,0,.7-.62.76.76,0,0,0-.76-.73,2,2,0,0,1-.74-.17,1,1,0,0,0-1.18,0,1.08,1.08,0,0,0-.26.81,1,1,0,0,0-.56-.47,1.5,1.5,0,0,0-1.8.7A1.55,1.55,0,0,0,558.08,265.48Z" fill="#e55940"/><path d="M563.31,267.09a1.15,1.15,0,0,0-.93-1.49,1.17,1.17,0,0,0-1.59.78,1.36,1.36,0,0,0,.85,1.61A1.39,1.39,0,0,0,563.31,267.09Z" fill="#e55940"/><path d="M581.36,268.54a.35.35,0,0,0-.27.37.5.5,0,0,0,.41.35c.17,0,.27-.27.25-.43S581.53,268.5,581.36,268.54Z" fill="#e55940"/><path d="M567.4,255.12c.31,0,.67-.41.74-.63s-.12-.57-.48-.65a.43.43,0,0,0-.56.44C567.09,254.5,567.09,255.09,567.4,255.12Z" fill="#e55940"/><path d="M578.73,251c-.12,0-.31.14-.38.26s0,.39.16.45.35-.24.4-.37A.34.34,0,0,0,578.73,251Z" fill="#e55940"/><path d="M578.78,249c-.16,0-.42.22-.45.34s0,.38.19.43.36-.11.41-.23S578.94,249.09,578.78,249Z" fill="#e55940"/><path d="M560.37,175.71c.1,0,.44-.13.44-.31s-.34-.27-.48-.29-.27.12-.25.26A.44.44,0,0,0,560.37,175.71Z" fill="#e55940"/><path d="M578.17,264.15a.52.52,0,0,0,.73-.3c.24-.52.23-.94,0-1.07a1.14,1.14,0,0,0-1.13.36C577.62,263.38,577.86,264,578.17,264.15Z" fill="#e55940"/><path d="M567.19,260.2c.69.27,1.17-.33,1.4-.65s-.35-1-1-1.09a.67.67,0,0,0-.76.51C566.69,259.42,566.85,260.06,567.19,260.2Z" fill="#e55940"/><path d="M582,258.9a.52.52,0,0,0-.4-.69.94.94,0,0,0-1.17.42,1.08,1.08,0,0,0,.5,1.14C581.37,259.9,581.87,259.49,582,258.9Z" fill="#e55940"/><path d="M565.14,251.26c0,.09,0,.23.08.27s.14-.07.22-.11-.06-.2-.12-.23S565.13,251.24,565.14,251.26Z" fill="#e55940"/><path d="M564.87,247.12c-.22-.08-.7.23-.65.67a.59.59,0,0,0,.37.41.73.73,0,0,0,.61-.18A.65.65,0,0,0,564.87,247.12Z" fill="#e55940"/><path d="M563.63,253.58c-.12.37.32,1,.83,1.15a.83.83,0,0,0,1.1-.5,1.12,1.12,0,0,0-.6-1.36A1.21,1.21,0,0,0,563.63,253.58Z" fill="#e55940"/><path d="M580.23,261.82c.16.51.6.53,1.13.4l0-.05a6.94,6.94,0,0,0,.87.31c.3.08.46-.07.54-.39,0-.08-.09-.24-.17-.27-.35-.12-.5-.39-.7-.66a.72.72,0,0,0-.65-.06h0a.59.59,0,0,0-.83.08A.79.79,0,0,0,580.23,261.82Z" fill="#e55940"/><path d="M604.88,272.1a.53.53,0,0,0-.08-.73c-.39-.37-.76-.21-1.19,0,0,.45-.08.91.43,1A.7.7,0,0,0,604.88,272.1Z" fill="#e55940"/><path d="M589.4,258.9c-.11.05-.34.39-.22.51a.46.46,0,0,0,.49,0c.11-.1.32-.32.2-.44A.44.44,0,0,0,589.4,258.9Z" fill="#e55940"/><path d="M590,265.05c.22.09.37-.24.36-.32s0-.33-.24-.39a.25.25,0,0,0-.32.2C589.77,264.68,589.76,265,590,265.05Z" fill="#e55940"/><path d="M606.19,260.42c.22-.1.13-.42.08-.47a.66.66,0,0,0-.43-.13c-.06,0-.17.29-.12.35S606,260.51,606.19,260.42Z" fill="#e55940"/><path d="M608.12,266.25a1.15,1.15,0,0,0,1.51.07.86.86,0,0,0,.26-1.08.88.88,0,0,0,0-.21c0-.08-.2-.32-.39-.28a.9.9,0,0,0-1.3-.05A1.1,1.1,0,0,0,608.12,266.25Z" fill="#e55940"/><path d="M579.13,266.35a1.21,1.21,0,0,0,.83,1.17,1.18,1.18,0,0,0,1-.77,2,2,0,0,0,.23.43.94.94,0,0,0,1.38.11,1.16,1.16,0,0,0,.4-1.4c.31-.15.57-.36.61-.54.09-.44-.39-1-1-1.14s-.91.18-1.05.85a.57.57,0,0,0,0,.13,1.09,1.09,0,0,0-.36.17,1,1,0,0,0-.35.83.7.7,0,0,0-.4-.31C579.75,265.73,579.22,265.92,579.13,266.35Z" fill="#e55940"/><path d="M585.79,255.59c.17-.09.16-.57.19-.88a.27.27,0,0,0-.23-.35.83.83,0,0,0-.82.67A.61.61,0,0,0,585.79,255.59Z" fill="#e55940"/><path d="M584.14,262.32c-.13.5.13.85.75,1a.71.71,0,0,0,.9-.37.92.92,0,0,0,0-.46h0c.28.5.53,1,.79,1.49-.87.56-.88.68-.26,1.3.54-.07.71-.41.64-.94,1.21-.45,1.27-1.19.22-2.08a2.27,2.27,0,0,1,.06-.25c.16-.35,0-.58-.27-.79a.64.64,0,0,0-.76,0c-.49.24-.67.47-.6.84a.86.86,0,0,0-.43-.45C584.66,261.44,584.29,261.7,584.14,262.32Z" fill="#e55940"/><path d="M586.7,258.76a.5.5,0,0,0-.65.33.56.56,0,0,0,.11.64.64.64,0,0,0,0,.48c.12.18.47.21.64.27.42-.3.37-.58.22-.8a.49.49,0,0,0,.14-.24A.53.53,0,0,0,586.7,258.76Z" fill="#e55940"/><path d="M588.1,275.79a1.27,1.27,0,0,0-.27,1.48c.28.37.88.31,1.46-.14a.88.88,0,0,0,.1-1,.61.61,0,0,0,.48,0c.3-.18.28-.42-.13-1-.53-.12-.79.48-.68.78A1.21,1.21,0,0,0,588.1,275.79Z" fill="#e55940"/><path d="M636.19,263.6c0-.06-.19-.1-.25-.08s-.14.13-.11.22a.2.2,0,0,0,.26.12A.22.22,0,0,0,636.19,263.6Z" fill="#e55940"/><path d="M633.92,265.57a.45.45,0,0,0-.23.42c0,.12.28.44.43.37a.45.45,0,0,0,.16-.46C634.21,265.76,634.07,265.5,633.92,265.57Z" fill="#e55940"/><path d="M640.22,262.9a.41.41,0,0,0-.21.37c0,.12.23.43.42.34a.48.48,0,0,0,.19-.51A.43.43,0,0,0,640.22,262.9Z" fill="#e55940"/><path d="M634.54,262.86c.1,0,.37-.31.34-.42s-.4-.17-.54-.15-.21.27-.18.32A.53.53,0,0,0,634.54,262.86Z" fill="#e55940"/><path d="M634.9,276.5a.77.77,0,0,0,.41-.91c-.23-.5-.69-.48-1.12-.5-.42.7-.46,1-.12,1.31A.68.68,0,0,0,634.9,276.5Z" fill="#e55940"/><path d="M635.14,265.59a1.12,1.12,0,0,0,1.08.53.71.71,0,0,0,.33-.93.66.66,0,0,0-.91-.33C635.21,265,635,265.32,635.14,265.59Z" fill="#e55940"/><path d="M640.07,274.09a.9.9,0,0,0-.54.94c.24.7.76,1.12,1.21,1a1.28,1.28,0,0,0,.58-1.39A1.19,1.19,0,0,0,640.07,274.09Z" fill="#e55940"/><path d="M559.5,179.07a1.41,1.41,0,0,0-1,1.61,1.65,1.65,0,0,0,1.94,1.06c.54-.2.36-.92,0-1.17s-.19-.2-.14-.62S560.23,178.91,559.5,179.07Z" fill="#e55940"/><path d="M645.18,264.22a.78.78,0,0,0-.4.82c.11.33.67.37,1,.33s.77-.61.66-.95S645.46,264.12,645.18,264.22Z" fill="#e55940"/><path d="M641.74,271.47a.81.81,0,0,0,.42-1,.64.64,0,0,0-.82-.36.69.69,0,0,0-.5.91A.77.77,0,0,0,641.74,271.47Z" fill="#e55940"/><path d="M643.2,267.85a.78.78,0,0,0-.71-.1.42.42,0,0,0-.32.62c.13.28.31.53.68.43S643.36,268,643.2,267.85Z" fill="#e55940"/><path d="M644,273.87a.84.84,0,0,0,.35-1.09.92.92,0,0,0-1.23-.63c-.48.18-.81.69-.67,1A1.37,1.37,0,0,0,644,273.87Z" fill="#e55940"/><path d="M547,277.36l.38.35A.77.77,0,0,0,547,277.36Z" fill="#e55940"/><path d="M532.55,209.56c.53.39,1,.11,1.14.24s.35.78.84.58c1-.41.42-1.24.69-1.45s1-.27,1.38-.56a1.1,1.1,0,0,0,.4-1.67,1.22,1.22,0,0,0-1.81-.2c-.8.62,0,1.31-.66,1.51s-.54-.47-1.41-.13S532,209.17,532.55,209.56Z" fill="#e55940"/><path d="M609.79,259.35c.23-.47,0-.79-.39-1.13-.43.16-.89.2-.88.72a.71.71,0,0,0,.59.71A.54.54,0,0,0,609.79,259.35Z" fill="#e55940"/><path d="M533.89,207.4a.44.44,0,0,0,0-.43.46.46,0,0,0-.45-.07.38.38,0,0,0-.11.54C533.53,207.66,533.78,207.48,533.89,207.4Z" fill="#e55940"/><path d="M632.15,276.27c-.7.28-.93.64-.74,1.14a1.11,1.11,0,0,0,1.23.5,1.25,1.25,0,0,0,.41-1.3A.64.64,0,0,0,632.15,276.27Z" fill="#e55940"/><path d="M635.5,274.15a1.07,1.07,0,0,0,.81-.17c.39-.37,0-.7-.2-1.08-.52.07-1,.2-1,.73A.68.68,0,0,0,635.5,274.15Z" fill="#e55940"/><path d="M637.17,277.49a.63.63,0,0,0,.28-.91c-.15-.29-.32-.61-.64-.5-.55.22-.78.6-.66.95A.75.75,0,0,0,637.17,277.49Z" fill="#e55940"/><path d="M636.55,269.35c-.33.13-.52.89-.33,1.41a.81.81,0,0,0,1,.39,1,1,0,0,0,.6-1.1A1.25,1.25,0,0,0,636.55,269.35Z" fill="#e55940"/><path d="M633.46,270c-.14-.18-.29-.4-.51-.39s-.54.6-.4.91.38.26.61.18A.46.46,0,0,0,633.46,270Z" fill="#e55940"/><path d="M604.63,268.75a1.32,1.32,0,0,0-.56,1.64,1.7,1.7,0,0,0,2,.47,1.33,1.33,0,0,0,.29-1.73A1.29,1.29,0,0,0,604.63,268.75Z" fill="#e55940"/><path d="M614.37,267c-.16.05-.22.3-.2.42s.27.42.43.36.22-.42.18-.53S614.54,266.94,614.37,267Z" fill="#e55940"/><path d="M617,262a.36.36,0,0,0-.07.38c.08.11.33.08.47,0s.25-.29.14-.45S617.07,261.91,617,262Z" fill="#e55940"/><path d="M615.56,272.05a.19.19,0,0,0-.12.21.22.22,0,0,0,.27.13c.12-.05.11-.21.09-.27S615.61,272,615.56,272.05Z" fill="#e55940"/><path d="M614.73,270.71c-.21.22-.35.49-.11.71s.73.47,1,.31,0-.77-.16-1S615,270.46,614.73,270.71Z" fill="#e55940"/><path d="M618.11,271.74a.7.7,0,0,0-.5.92.79.79,0,0,0,.9.44.82.82,0,0,0,.42-1A.64.64,0,0,0,618.11,271.74Z" fill="#e55940"/><path d="M617.34,269.31c-.29.07-.4.34-.23.65s.36.49.64.31.66-.56.58-.82S617.58,269.25,617.34,269.31Z" fill="#e55940"/><path d="M600.5,277.31a.78.78,0,0,0-1,.36c-.19.3-.74.79-.49,1.24a.45.45,0,0,0,.51.25.77.77,0,0,0,.08.19.82.82,0,0,0,1.09.13.53.53,0,0,0,.12-.54.85.85,0,0,0,.42-.66A1,1,0,0,0,600.5,277.31Z" fill="#e55940"/><path d="M587.14,280.6l1.3,0a1.21,1.21,0,0,0-.49-.31A.71.71,0,0,0,587.14,280.6Z" fill="#e55940"/><path d="M618.65,263.94a.41.41,0,0,0,.63.29c.2-.1.62-.5.55-.68s-.6-.3-.84-.3S618.56,263.57,618.65,263.94Z" fill="#e55940"/><path d="M619.49,278a.56.56,0,0,0-.13.43.38.38,0,0,0,.5.21c.25-.13,0-.43,0-.56S619.53,277.91,619.49,278Z" fill="#e55940"/><path d="M613,276.18a.82.82,0,0,0,0-.75c-.2-.11-.62-.22-.73-.07a.71.71,0,0,0,0,.65C612.35,276.14,612.86,276.31,613,276.18Z" fill="#e55940"/><path d="M610,273.1a.93.93,0,0,0-.58,1.32,1.1,1.1,0,0,0,1.45.56,1.15,1.15,0,0,0,.51-1.42A1,1,0,0,0,610,273.1Z" fill="#e55940"/><path d="M608.67,268.84a.67.67,0,0,0-.31.93,1.14,1.14,0,0,0,1.39.35.79.79,0,0,0,.23-1.05A1,1,0,0,0,608.67,268.84Z" fill="#e55940"/><path d="M613.55,275.21a.73.73,0,0,0,.59.58c.33.34.78.32,1.27-.09a.94.94,0,0,0,.15-1.15,1.39,1.39,0,0,0-.75-.37.79.79,0,0,0-.66-.16A1,1,0,0,0,613.55,275.21Z" fill="#e55940"/><path d="M607,272.6c-.1-.45-.15-.92-.76-.85a.73.73,0,0,0-.69.62c0,.14,0,.36.1.42a9,9,0,0,0,.93.52c.16.84.6,1.35,1.11,1.26a1.42,1.42,0,0,0,.89-1.42C608.5,272.56,608.19,272.45,607,272.6Z" fill="#e55940"/><path d="M610.75,277.82a.7.7,0,0,0,.59.7.54.54,0,0,0,.68-.29c.23-.48,0-.79-.39-1.13C611.2,277.26,610.74,277.29,610.75,277.82Z" fill="#e55940"/><path d="M604.93,276.29c.6-.37.86-1,.61-1.34a1.14,1.14,0,0,0-1.41-.26,1,1,0,0,0-.24,1.31A.86.86,0,0,0,604.93,276.29Z" fill="#e55940"/><path d="M612.28,279a1.57,1.57,0,0,0,.43.7,1.4,1.4,0,0,0-1,.6l1.82,0a1.43,1.43,0,0,0-.16-.24.69.69,0,0,0,.32,0,1.67,1.67,0,0,0,1-1.74,1.33,1.33,0,0,0-1.56-.78A1.29,1.29,0,0,0,612.28,279Z" fill="#e55940"/><path d="M609.59,277.53c.49-.36.6-.7.34-1a.87.87,0,0,0-1.26-.3,1.53,1.53,0,0,0-.11,1.36C608.77,277.87,609.15,277.86,609.59,277.53Z" fill="#e55940"/><path d="M612.3,272a.79.79,0,0,0-.16,1,.82.82,0,0,0,1.07.11.64.64,0,0,0,.11-.89A.7.7,0,0,0,612.3,272Z" fill="#e55940"/><path d="M612.05,269.79a.21.21,0,0,0,0,.29.23.23,0,0,0,.28,0c.06,0,0-.22,0-.26A.2.2,0,0,0,612.05,269.79Z" fill="#e55940"/><path d="M623.58,275.49a.53.53,0,0,0-.08-.73c-.39-.37-.76-.21-1.19,0,0,.45-.08.91.43,1.05A.7.7,0,0,0,623.58,275.49Z" fill="#e55940"/><path d="M615.62,278.38a.73.73,0,0,0,.39.84l.13,0a1.09,1.09,0,0,0-.27,1l3.27-.06a.69.69,0,0,0-.67-.21.54.54,0,0,0-.16.1,1.21,1.21,0,0,0-.2-.71,1.45,1.45,0,0,0-1.32-.45l.42-.42c.85.09,1.47-.18,1.53-.69a1.44,1.44,0,0,0-1.1-1.28c-.58-.08-.79.19-1,1.35C616.2,277.87,615.73,277.77,615.62,278.38Z" fill="#e55940"/><path d="M582.29,271.46a.26.26,0,0,0,.14.4c.19.08.31,0,.39-.15v0a1.19,1.19,0,0,0,1.81.23,1.36,1.36,0,0,0,.22-1.88,1.62,1.62,0,0,0-2-.07,1,1,0,0,0-.3,1.35A.24.24,0,0,0,582.29,271.46Z" fill="#e55940"/><path d="M587.85,272.47a.72.72,0,0,0-.22-1.05,1.06,1.06,0,0,0-1.44.35c-.32.49-.1.75-.33,1.05s-.15.53.1.85.64.79,1.08.43.25-.69.13-.81,0,0,0,0a.76.76,0,0,0,.26-.36C587.55,272.88,587.7,272.76,587.85,272.47Z" fill="#e55940"/><path d="M582.23,276.17a1.44,1.44,0,0,0-.85.42,1.51,1.51,0,0,0-.39,1.2c0,.5-.33.87-.1,1.32a2.08,2.08,0,0,0,2.2,1.2,1.73,1.73,0,0,0,1.35-.9c.25-.52-.3-1-.26-1.65C584.27,276.32,583.21,276.05,582.23,276.17Z" fill="#e55940"/><path d="M585.8,267.41a.68.68,0,0,0-.61.06c-.16.1-.38.11-.54.37a1.43,1.43,0,0,0-.16,1.25,1.08,1.08,0,0,0,.91.67.94.94,0,0,0,.83-.44,1.14,1.14,0,0,0,.14-1C586.18,268,586.11,267.5,585.8,267.41Z" fill="#e55940"/><path d="M581.71,275.13a2,2,0,0,0,.51.53.4.4,0,0,0,.56-.22,1.21,1.21,0,0,0,1.52.25,2,2,0,0,0,.38-2,1.28,1.28,0,0,0-1.73-.19,1.47,1.47,0,0,0-.51,1.15A.76.76,0,0,0,581.71,275.13Z" fill="#e55940"/><path d="M616.65,267.68c.1-.07.22-.31.12-.45a.38.38,0,0,0-.46-.07c-.1,0-.32.38-.22.51S616.56,267.76,616.65,267.68Z" fill="#e55940"/><path d="M621,270.29c-.41.16-.92,1.08-.78,1.41a1.2,1.2,0,0,0,1.46.37c.51-.2.65-.66.38-1.29A1,1,0,0,0,621,270.29Z" fill="#e55940"/><path d="M620.56,277.36a1.51,1.51,0,0,0,1.27.5c.38-.11.48-.47.3-1s-.5-.78-.91-.63A.87.87,0,0,0,620.56,277.36Z" fill="#e55940"/><path d="M621.45,273.88c.15-.05.46-.49.38-.67s-.65-.27-.73-.2-.39.54-.28.68A.7.7,0,0,0,621.45,273.88Z" fill="#e55940"/><path d="M547,253.84a2.41,2.41,0,0,0-2.54-.37c-.55.39-.27,1.18-.41,1.31s-1.17-.23-1.83.28a2,2,0,0,0,.83,3.25,1.86,1.86,0,0,0,1-.08.64.64,0,0,0,.63.29.81.81,0,0,0,.62-.79.63.63,0,0,0-.41-.47c.1-.52,0-1.11.19-1.21s1.21.32,1.83-.24A1.44,1.44,0,0,0,547,253.84Z" fill="#e55940"/><path d="M604.82,280.33a.85.85,0,0,0-.87-.51.65.65,0,0,0-.42.68l1.3,0A.71.71,0,0,0,604.82,280.33Z" fill="#e55940"/><path d="M598,279.14a.82.82,0,0,0,0-1.22.71.71,0,0,0-1,0c-.35.27-.48.86-.2,1.11A.86.86,0,0,0,598,279.14Z" fill="#e55940"/><path d="M611.21,280.31c-.05-.12-.41-.2-.6-.16h0a1,1,0,0,0,0-.65c-.24-.64-.89-1.09-1.35-.69a2.36,2.36,0,0,0-.67,1.45.62.62,0,0,0,0,.13l2.7,0A.06.06,0,0,1,611.21,280.31Z" fill="#e55940"/><path d="M607.26,278.68c.21-.13.69-.56.59-.8s-.72-.25-1-.23-.42.46-.28.75S607,278.86,607.26,278.68Z" fill="#e55940"/><path d="M599,279.7a.56.56,0,0,0-.78.24,1.38,1.38,0,0,0-.12.66l1.35,0A.73.73,0,0,0,599,279.7Z" fill="#e55940"/><path d="M580.15,271.29a.66.66,0,0,0-1-.05,1,1,0,0,0-.35,1.33,1.86,1.86,0,0,0,.35.29,1.07,1.07,0,0,0,0,.25.92.92,0,0,0,.46.58,1.43,1.43,0,0,0,.62.14.75.75,0,0,0,.21,0,1.2,1.2,0,0,0,.53-.24h0a2.31,2.31,0,0,0,.4-.42,4.31,4.31,0,0,0-.33-.81,1.07,1.07,0,0,0-.72-.48A1.09,1.09,0,0,0,580.15,271.29Z" fill="#e55940"/><path d="M586.83,280.43a4.84,4.84,0,0,0,.68-.52c.56-.61.34-1.23-.47-1.39a1,1,0,0,0-1,.28,1.5,1.5,0,0,0-.5-.08c-.27.29-.52.62-.28,1a.62.62,0,0,0,.61.32c0,.08,0,.16,0,.26-.33-.05-.6,0-.74-.13a.89.89,0,0,0-1.31.05,1.5,1.5,0,0,1-.4.2.69.69,0,0,0-.17.1l3.58.05A.87.87,0,0,0,586.83,280.43Z" fill="#e55940"/><path d="M594.69,277a.61.61,0,0,0-.66.83.65.65,0,0,0,.79.2A.59.59,0,0,0,594.69,277Z" fill="#e55940"/><path d="M594.52,279.6c.41.14.84.32,1.17-.07a.62.62,0,0,0-.07-.91.94.94,0,0,0-.72-.19C594.35,278.63,594.41,279.11,594.52,279.6Z" fill="#e55940"/><path d="M647.92,268.2a.82.82,0,0,0-.4.92.6.6,0,0,0,.6.43c.23-.32.45-.66.67-1A.73.73,0,0,0,647.92,268.2Z" fill="#e55940"/><path d="M563.53,276.7a1.12,1.12,0,0,0,.76,1.19,1.13,1.13,0,0,0,1.26-.6,1.16,1.16,0,0,0,.55-1.07,2.56,2.56,0,0,0,1.68-1.55c.09-.67-.67-1-.67-1.2s1-.69,1.07-1.52a1,1,0,0,0,0-.42.62.62,0,0,0,1-.28.52.52,0,0,0,0-.11.83.83,0,0,0,1.11.26c.51-.33.63-.68.34-1.16a4.46,4.46,0,0,0-.68-.71l.23-.48a.68.68,0,0,0-.13-.83,1,1,0,0,0-1.06-.15.71.71,0,0,0-.47.38.93.93,0,0,0-.67-.62.55.55,0,0,0-.7.44,1.11,1.11,0,0,0,.18.82.76.76,0,0,0,1.15-.17,2.29,2.29,0,0,1-.12.77.79.79,0,0,0,.21.65,4.15,4.15,0,0,1,.27.32.47.47,0,0,0-.15-.06.59.59,0,0,0-.6.62,2.17,2.17,0,0,0-1.3-1.08,2,2,0,0,0-1.46.17,1.63,1.63,0,0,0-.73,1.67c.19.59,1,1.12,1,1.37s-1.07.64-1.09,1.48c0,0,0,.08,0,.12a1.35,1.35,0,0,0-.95,1.51A2.25,2.25,0,0,0,563.53,276.7Z" fill="#e55940"/><path d="M567.09,268.2c0-.08-.14-.36-.33-.34s-.22.36-.22.49a.37.37,0,0,0,.31.25C567,268.58,567.07,268.34,567.09,268.2Z" fill="#e55940"/><path d="M563.47,269.69a.69.69,0,0,0,0-1c-.25-.26-.56-.17-.85,0l-.94.49c-.35.2-.71.37-.71.87a.55.55,0,0,1-.21.34c-.77.61-.82.88-.26,1.6.23.3.57.43.86.17a1.72,1.72,0,0,1,1-.39,1.35,1.35,0,0,0,1.16-1.64A2.38,2.38,0,0,1,563.47,269.69Z" fill="#e55940"/><path d="M570.8,246.64a.59.59,0,0,0-.78.4c-.11.43.12,1,.42,1.1s.77-.34.87-.68A.65.65,0,0,0,570.8,246.64Z" fill="#e55940"/><path d="M545.27,273.76a1.29,1.29,0,0,0-.38-.69.58.58,0,0,0-.43-.69.65.65,0,0,0-.82.24,1.35,1.35,0,0,0-.77.72c.51.53,1,1.07,1.56,1.6A1.33,1.33,0,0,0,545.27,273.76Z" fill="#e55940"/><path d="M570.43,253.71a.82.82,0,0,0,.56-.33c.14-.26-.19-.72-.51-.7s-.37.18-.47.23C569.92,253.38,570.13,253.74,570.43,253.71Z" fill="#e55940"/><path d="M547.32,271.59a1.27,1.27,0,0,0,.18-.91A.74.74,0,0,0,548,270a.51.51,0,0,0,.13-.24.72.72,0,0,0-.51-.83.69.69,0,0,0-.87.43l0,.14a1.07,1.07,0,0,0-.75,0,.59.59,0,0,0-.44-.13.7.7,0,0,0-.34.16,1.35,1.35,0,0,0-.8-.53,1,1,0,0,0-.23-.05.58.58,0,0,0-.31-.16.53.53,0,0,0,0-.35.91.91,0,0,0-1.23-.41,1.16,1.16,0,0,0-.6,1.1.83.83,0,0,0,.36.54,1.47,1.47,0,0,0-1.05,1.46,1.09,1.09,0,0,0,1.21.95,1.56,1.56,0,0,0,1.21-.8,1.3,1.3,0,0,0,1.29-.35,1,1,0,0,0,.45.7A1.34,1.34,0,0,0,547.32,271.59Z" fill="#e55940"/><path d="M552.36,276.6a.94.94,0,0,0,.72-.4.77.77,0,0,0-.08-.73.82.82,0,0,0-1.24.12A.7.7,0,0,0,552.36,276.6Z" fill="#e55940"/><path d="M559,272c0-.24-.37-.49-.68-.44a.6.6,0,0,0-.24,1C558.39,272.76,558.88,272.48,559,272Z" fill="#e55940"/><path d="M553.13,278.52a1.38,1.38,0,0,0,1.52-.86.9.9,0,0,0-.61-.9,1,1,0,0,0-1.32.59C552.58,277.85,552.77,278.41,553.13,278.52Z" fill="#e55940"/><path d="M572.48,280.21c.37-.09.44-.33.44-.74a2,2,0,0,0-.07-.64c.33-.48.22-.9-.36-1.48a5.52,5.52,0,0,0,.08-1.17.79.79,0,0,0-.78-.66.64.64,0,0,0-.44-.37c-.3,0-.43.13-.5.61l-.66.22c-.54-.44-.59-.44-1.12.14,0,.3.51.61,0,.89-.21-.15-.41-.32-.63-.45a.2.2,0,0,0,.11,0c.17-.11.09-.42,0-.47s-.24-.28-.43-.16a.24.24,0,0,0-.08.37l.14.16a.92.92,0,0,0-.89.19c-.3.22-.16.53-.12.8.08.54.46.78,1,.95l.8-.75c0,.15.07.28.1.42.13.6-.08.82-.67.6a1.13,1.13,0,0,0-1.43.49,1.16,1.16,0,0,0-.17,1.18l2.25,0c0-.05.1-.09.14-.15.2-.25.38-.44.7-.4a.6.6,0,0,0,.24,0,.92.92,0,0,0,0,.43.54.54,0,0,0,.1.16l1.86,0A.52.52,0,0,1,572.48,280.21Zm-1.78-1a.16.16,0,0,0-.08.05,1,1,0,0,0,0-.18l.16.09Z" fill="#e55940"/><path d="M561.23,255.56a1.21,1.21,0,0,0,0,1.82c.71.71,1.31-.14,1.58.46s-.4.6,0,1.42,1.42.94,1.74.36,0-1.05.1-1.16.73-.45.48-.91c-.54-1-1.29-.26-1.54-.5s-.38-.93-.71-1.31C562.46,255.21,561.74,255,561.23,255.56Z" fill="#e55940"/><path d="M565,255.9c0,.35.45.35.58.29s.82-.46.8-.73-.72-.36-.81-.29S565,255.55,565,255.9Z" fill="#e55940"/><path d="M561.64,252.86c-.41,0-.74.66-.63,1.17a.92.92,0,0,0,1.15.77c.58-.1,1-.53.87-1A1.37,1.37,0,0,0,561.64,252.86Z" fill="#e55940"/><path d="M561.62,250.63c0-.06-.17-.13-.23-.12s-.16.1-.15.19a.2.2,0,0,0,.23.17C561.6,250.85,561.63,250.7,561.62,250.63Z" fill="#e55940"/><path d="M566.08,249.59a.64.64,0,0,0-.45.62.9.9,0,0,0,.08.6c.31-.06.91.12,1.06-.23s-.33-.7-.46-1Z" fill="#e55940"/><path d="M570.41,259.63a.74.74,0,0,0-.86.49.66.66,0,0,0,.49.77.6.6,0,0,0,.8-.39A.66.66,0,0,0,570.41,259.63Z" fill="#e55940"/><path d="M569,256.48c-.11.36.35,1,.77,1.1a.88.88,0,0,0,.91-.47c.19-.66,0-1.29-.46-1.4A1.23,1.23,0,0,0,569,256.48Z" fill="#e55940"/><path d="M568.85,264.66a1.51,1.51,0,0,0,1,1.53c.41.09.86-.3,1-.86s-.1-1-.79-1.17A1,1,0,0,0,568.85,264.66Z" fill="#e55940"/><path d="M567.94,261.77c-.57.14-.64.5-.82.4s-.46-.52-.82-.38-.45,1.3-.37,1.48.49.55.19.82l-.08.05a.69.69,0,0,0-.94-.67,1.21,1.21,0,0,0-.81,1A1.4,1.4,0,0,0,564,264c-.21-.2-.59,0-.69.32s.05.63.32.68.49,0,.64-.13a1.1,1.1,0,0,0,.76,1.07.88.88,0,0,0,.29.67c.49.41.76-.11,1.14-.17a.9.9,0,0,0,.76-.91c0-.5-.3-1-.22-1.21s.27-.49.62-.33.95,0,1.23-.77S568.5,261.62,567.94,261.77Z" fill="#e55940"/><path d="M566.14,259.72c0-.18-.36-.25-.5-.26s-.27.14-.24.28a.47.47,0,0,0,.32.32C565.82,260.07,566.15,259.89,566.14,259.72Z" fill="#e55940"/><path d="M539.49,268a1.42,1.42,0,0,0,.63-1.25c-.07-.38-.13-.79-.68-.81l-.28,0a.91.91,0,0,0-.28-1.54c-.16-.06.37-1.07-.53-1.44s-1.5-.08-1.74.76a1.91,1.91,0,0,1-.48.7,1.74,1.74,0,0,0,.14-.38,1.68,1.68,0,0,0-1.11-1.58,1.21,1.21,0,0,0,.32-1,1.29,1.29,0,0,0-.08-.26l-.07,0a6.92,6.92,0,0,0-1.06-.43.65.65,0,0,0-.5.28.41.41,0,0,0,0,.08,57,57,0,0,0,3.55,5.57l0-.09a.9.9,0,0,0,.44.56,2,2,0,0,1,.58.43.58.58,0,0,0-.26.21c.39.52.79,1,1.2,1.52,0,0,0-.05,0-.08C539.61,268.6,539.68,268.29,539.49,268Z" fill="#e55940"/><path d="M542.15,201.94c-.14.28.17,1,.53,1s.84-.15.69-.78S542.29,201.66,542.15,201.94Z" fill="#e55940"/><path d="M544.85,190.83c-.2,0-.34.47-.31.6a.4.4,0,0,0,.77-.17C545.32,191.14,545.06,190.82,544.85,190.83Z" fill="#e55940"/><path d="M540.67,202.27a.41.41,0,0,0,.37-.41c0-.15-.06-.56-.37-.58s-.39.43-.38.57S540.4,202.28,540.67,202.27Z" fill="#e55940"/><path d="M541,197.23a1.06,1.06,0,0,0-.58.56c-.09.25.36.61.67.52a1.22,1.22,0,0,0,.45-.37C541.49,197.43,541.23,197.12,541,197.23Z" fill="#e55940"/><path d="M540.94,199.93c0,.3.9.7,1.17.39a.69.69,0,0,0,0-.9C541.75,199.17,540.92,199.62,540.94,199.93Z" fill="#e55940"/><path d="M560.89,244.76a.72.72,0,0,0-.55.8.69.69,0,0,0,.8.66.75.75,0,0,0,.6-.87A.69.69,0,0,0,560.89,244.76Z" fill="#e55940"/><path d="M550.75,186.24c-.42,0-1.07.6-1.07.94a.94.94,0,0,0,1.05.88c.44,0,.74-.45.73-1.07C551.44,186.52,551.15,186.2,550.75,186.24Z" fill="#e55940"/><path d="M546.33,194.92c.25.47.92.22,1.1,0s-.55-1.14-.85-1.15S546.08,194.44,546.33,194.92Z" fill="#e55940"/><path d="M552.05,182.93a.69.69,0,0,0-.62.78c.06.32.29.34.54.33s.59-.29.48-.59A2,2,0,0,0,552.05,182.93Z" fill="#e55940"/><path d="M546.86,189.34a.73.73,0,0,0,.7.7.8.8,0,0,0,.76-.75.7.7,0,0,0-.75-.63A.71.71,0,0,0,546.86,189.34Z" fill="#e55940"/><path d="M545.29,190.15a.71.71,0,0,0,.52,1.06.93.93,0,0,0,.75-.34.81.81,0,0,0,0-.74A.83.83,0,0,0,545.29,190.15Z" fill="#e55940"/><path d="M532.67,220.77a1.15,1.15,0,0,0-.11,1.35.87.87,0,0,0,1,.21c.57-.38.81-1,.54-1.37A1.25,1.25,0,0,0,532.67,220.77Z" fill="#e55940"/><path d="M539.46,214.15c-.36.26-.56.87-.38,1.11a1.07,1.07,0,0,0,1.11,0,.64.64,0,0,0,.13-.95A.59.59,0,0,0,539.46,214.15Z" fill="#e55940"/><path d="M532.84,217.33a1.51,1.51,0,0,0-1.9.62,1.58,1.58,0,0,0,.69,1.81c.61.31,1.35-.08,1.74-.9A1.14,1.14,0,0,0,532.84,217.33Z" fill="#e55940"/><path d="M532.92,211.87c-.43-.22-1.08-.15-1.26.17-.36.65.18,1.2.47,1.48s1.07-.22,1.2-.84A.68.68,0,0,0,532.92,211.87Z" fill="#e55940"/><path d="M530.62,214.78a.86.86,0,0,0-.07.25,1,1,0,0,0-.18.06c-.33.21-.38,1-.1,1.42a.85.85,0,0,0,1.17.32,1.13,1.13,0,0,0,.41-1.43s0,0-.06-.06l0,0a.75.75,0,0,0-.38-.92A.66.66,0,0,0,530.62,214.78Z" fill="#e55940"/><path d="M533,214.27c0,.07-.16.17-.11.26s.15,0,.25.06.07-.19.05-.26S533,214.25,533,214.27Z" fill="#e55940"/><path d="M536.67,212.88c-.07.3.32.72.53.81s.58-.05.71-.39a.44.44,0,0,0-.37-.61C537.32,212.65,536.74,212.58,536.67,212.88Z" fill="#e55940"/><path d="M535.71,218.66c-.38.3-.44.71-.2.88a.81.81,0,0,0,.64.1c.28-.1.32-.67.07-.86A1.24,1.24,0,0,0,535.71,218.66Z" fill="#e55940"/><path d="M537,218.09c.31.12.69,0,.7-.33s.09-.74-.3-.81-.65.33-.77.54S536.71,218,537,218.09Z" fill="#e55940"/><path d="M535.74,219.64a1,1,0,0,0-1.24.4,1.41,1.41,0,0,0,.71,1.61,1,1,0,0,0,1-.4c.17.23.45.14.67,0s.35-.61.11-.77-.4-.31-.63-.3A1,1,0,0,0,535.74,219.64Z" fill="#e55940"/><path d="M548.26,181.87a.79.79,0,0,0-.18-.4c-.44.4-.86.81-1.28,1.22a1.37,1.37,0,0,0,.47,0C547.84,182.68,548.31,182.28,548.26,181.87Z" fill="#e55940"/><path d="M629.59,261.33a.67.67,0,0,0-.46.86.65.65,0,1,0,1.22-.44A.55.55,0,0,0,629.59,261.33Z" fill="#e55940"/><path d="M628.8,266.67a.75.75,0,0,0,.8.44c.24-.08.32-.51.19-.88a.39.39,0,0,0-.57-.26C628.93,266.1,628.7,266.29,628.8,266.67Z" fill="#e55940"/><path d="M631.17,275.67a.62.62,0,0,0-.06-.91.65.65,0,0,0-.91,0,2,2,0,0,1-.53.33,1,1,0,0,0-.71,1.11c0,.52.41.74,1.13.49A12.81,12.81,0,0,0,631.17,275.67Z" fill="#e55940"/><path d="M546.07,257.47a.66.66,0,0,0,.28.87.82.82,0,0,0,.65,0c.38-.17.39-.49.14-1.21C546.74,257.11,546.29,256.94,546.07,257.47Z" fill="#e55940"/><path d="M592.14,268a1,1,0,0,0-.11,1.45c.29.39.75.39,1.29,0s.56-.77.31-1.09A1.82,1.82,0,0,0,592.14,268Z" fill="#e55940"/><path d="M626,259.63c-.15,0-.55.37-.5.55s.53.31.64.25.42-.33.39-.49S626.16,259.61,626,259.63Z" fill="#e55940"/><path d="M625.81,267.78c.1,0,.39-.14.34-.42s-.4-.17-.54-.15-.21.27-.18.32A.55.55,0,0,0,625.81,267.78Z" fill="#e55940"/><path d="M592.91,264.71a1.25,1.25,0,0,1-.83-1.37c-.42-.15-1,.09-1,.44,0,.18.23.44.52.62a1.11,1.11,0,0,0-.33.15,1.22,1.22,0,0,0-.05,1.78,1.29,1.29,0,0,0,.43.36,2.12,2.12,0,0,0-.41.37,10.89,10.89,0,0,0-1.32.1.46.46,0,0,0-.18.83c.41.24.79.64,1.37.55l.44-.53c.64,0,1.2-.21,1.27-.58a.63.63,0,0,0-.37-.7h0a1,1,0,0,0,.28-.14A1.37,1.37,0,0,0,592.91,264.71Z" fill="#e55940"/><path d="M627.54,273.25a.73.73,0,0,0,.4.51c.46.13.6-.25.74-.59-.2-.38-.48-.61-.88-.41A.57.57,0,0,0,627.54,273.25Z" fill="#e55940"/><path d="M625.22,274.36a1.28,1.28,0,0,0,.65,1.65,1.77,1.77,0,0,0,.57.09.78.78,0,0,0,0,.46c.13.14.45.3.59.23s.21-.45.15-.6A.75.75,0,0,0,627,276a1.24,1.24,0,0,0,.43-.32c.31-.39,0-1.13-.58-1.59A1.25,1.25,0,0,0,625.22,274.36Z" fill="#e55940"/><path d="M630.7,270.45a.61.61,0,0,0,.4-.72c0-.28-.74-.58-.94-.39a.79.79,0,0,0-.21.67A.55.55,0,0,0,630.7,270.45Z" fill="#e55940"/><path d="M631.5,278.39a1.43,1.43,0,0,0-.93,1.14,3.25,3.25,0,0,0,0,.44l2.06,0a1.3,1.3,0,0,1-.19-.74A1.09,1.09,0,0,0,631.5,278.39Z" fill="#e55940"/><path d="M590.94,257.35a.38.38,0,0,0,.59,0,.42.42,0,0,0,0-.53.36.36,0,0,0-.49-.1A.38.38,0,0,0,590.94,257.35Z" fill="#e55940"/><path d="M646.42,271.78a.66.66,0,0,0-.47.69c.18-.23.35-.47.52-.7Z" fill="#e55940"/><path d="M532.78,204.18a1,1,0,0,0,1.07-.68.88.88,0,0,0-.58-1.23,1.27,1.27,0,0,0-.53-.07c-.2.42-.38.85-.57,1.27A1.1,1.1,0,0,0,532.78,204.18Z" fill="#e55940"/><path d="M639.62,278.16a1.15,1.15,0,0,0-.76,1.28,1,1,0,0,0,.31.37h0c.48-.45.93-.92,1.39-1.38A1.06,1.06,0,0,0,639.62,278.16Z" fill="#e55940"/><path d="M636.14,279.24c-.13-.32-.45-.42-.84-.27-.59.22-.87.53-.76.87,0,0,0,0,0,.06l1.58,0A1,1,0,0,0,636.14,279.24Z" fill="#e55940"/><path d="M591.49,254.83c.25-.13,0-.43,0-.56a.4.4,0,0,0-.36-.07.55.55,0,0,0-.13.43A.39.39,0,0,0,591.49,254.83Z" fill="#e55940"/><path d="M536.16,197.37a1.11,1.11,0,0,0,1.68-.39,1.23,1.23,0,0,0-.63-1.72,1.09,1.09,0,0,0-.58-.1c-.35.57-.7,1.13-1,1.71A2.44,2.44,0,0,0,536.16,197.37Z" fill="#e55940"/><path d="M555.81,176.07c.34,0,.41-.51.45-.72a.74.74,0,0,0,0-.26c-.31.2-.6.4-.9.61C555.45,175.91,555.6,176.1,555.81,176.07Z" fill="#e55940"/><path d="M540.13,191.66a1,1,0,0,0-.53-.84c-.4.53-.77,1.08-1.15,1.62a1.15,1.15,0,0,0,.84.29A.88.88,0,0,0,540.13,191.66Z" fill="#e55940"/><path d="M537.65,199.88a5.62,5.62,0,0,0-1.38-.47h-.12a1.36,1.36,0,0,0-1.09-.57.84.84,0,0,0-.87.84,1.26,1.26,0,0,0,.71,1,.45.45,0,0,0,.24.32,3.91,3.91,0,0,0,2.23.58,1.2,1.2,0,0,0,.35-.14A.87.87,0,0,0,537.65,199.88Z" fill="#e55940"/><path d="M539.4,196.17a.89.89,0,0,0,.44.53c.19.06.75-.28.73-.59a.63.63,0,0,0-.7-.56A.48.48,0,0,0,539.4,196.17Z" fill="#e55940"/><path d="M541,194.88a1,1,0,0,0,1.33-.39,2.73,2.73,0,0,0,.27.54,1,1,0,0,0,.27.25.88.88,0,0,0,1.4-.77,5.82,5.82,0,0,0-.2-1.44,1.37,1.37,0,0,0-1.4-.8c-.32,0-.55.21-.55.51a.87.87,0,0,0-.36-.26,1.17,1.17,0,0,0-1.45.63A1.28,1.28,0,0,0,541,194.88Z" fill="#e55940"/><path d="M538.06,197.46c-.14.27.36.73.89.72s.62-.72.52-1S538.2,197.19,538.06,197.46Z" fill="#e55940"/><path d="M542.27,189.18a1.32,1.32,0,0,0,1.08-1.08,1.42,1.42,0,0,0,0-.2,1.12,1.12,0,0,0,.55.18,2.19,2.19,0,0,0,1.45-.41,1,1,0,0,1,.55-.16c.72.05,1.1-.3,1.07-1a.49.49,0,0,0,.26,0,.78.78,0,0,0,.5-.88.8.8,0,0,0-.81-.81.69.69,0,0,0-.58.8h0a1.32,1.32,0,0,0-.68,0,1.27,1.27,0,0,1-1,0,1,1,0,0,0-.8,0c-.34.37-.67.75-1,1.13a1.47,1.47,0,0,0,0,.47.61.61,0,0,0,.05.12,1.2,1.2,0,0,0-.41-.2c-.35.4-.7.79-1,1.2C541.6,188.82,542,189.2,542.27,189.18Z" fill="#e55940"/><path d="M535.58,202.33c0-.08-.07-.22-.17-.23s-.1.11-.17.18.12.17.19.18S535.59,202.35,535.58,202.33Z" fill="#e55940"/><path d="M626.39,269.27a1.48,1.48,0,0,0-.8,1.66c.18.65.9.94,1.72.68a1.13,1.13,0,0,0,.77-1.49A1.42,1.42,0,0,0,626.39,269.27Z" fill="#e55940"/><path d="M551.27,179a1.26,1.26,0,0,0,.24-.46c-.31.25-.63.49-.93.74A1,1,0,0,0,551.27,179Z" fill="#e55940"/><path d="M556.89,191.89a1.46,1.46,0,0,0,1.37,1.21c.74-.06,1.36-.69,1.28-1.28a1.93,1.93,0,0,0-1.54-1.36A1.31,1.31,0,0,0,556.89,191.89Z" fill="#e55940"/><path d="M556,251a1.75,1.75,0,0,0-.13.35.88.88,0,0,0,1.25,1,5.71,5.71,0,0,0,1.26-.74,1.38,1.38,0,0,0,.2-1.6c-.17-.27-.72-.7-1.18-.25C557.07,250.81,556.46,250.34,556,251Z" fill="#e55940"/><path d="M556.12,178.31a2,2,0,0,1-.72-.23,1,1,0,0,0-1.18-.13,1.39,1.39,0,0,0-.21,1.43c.19.34.39.7.91.54s.78-.18,1.17-.27a.58.58,0,0,0,.74-.56A.76.76,0,0,0,556.12,178.31Z" fill="#e55940"/><path d="M560.82,183.57c-.19,0-.25.34-.25.47s.16.28.29.27.24-.24.27-.38S561,183.56,560.82,183.57Z" fill="#e55940"/><path d="M563.71,280.17l-.09.11,1.16,0C564.37,280,563.94,280,563.71,280.17Z" fill="#e55940"/><path d="M560.52,278.58l0-.07a4.57,4.57,0,0,0-.45-.43,1,1,0,0,0-1.26-.15,1.73,1.73,0,0,0-.77.92,1.25,1.25,0,0,0-1,1.34l2.34,0s0,0,0-.06A1.47,1.47,0,0,0,560.52,278.58Z" fill="#e55940"/><path d="M579.55,279.91a.88.88,0,0,0-.28-.49.58.58,0,0,0,.1-.12c.3-.4.8-.48.91-1a2.3,2.3,0,0,0-.33-1.71.83.83,0,0,0,.26-.3,1.58,1.58,0,0,0-.66-1.84A1.23,1.23,0,0,0,578,275a1.41,1.41,0,0,0-.23.92l-.09,0c-.53.25-.41,1-.81,1.45a1.57,1.57,0,0,0-.48,1.13,1.1,1.1,0,0,0-.38.54c0,.05,0,.13,0,.18-.12.27-.3.37-.55.15-.09-.08-.15-.2-.24-.28a1.22,1.22,0,0,0-1.37-.09,1,1,0,0,0-.52,1.23,1.52,1.52,0,0,0,.06.2l3.76,0a.69.69,0,0,0,0-.24.37.37,0,0,0-.29-.23.75.75,0,0,0,.05-.16,1,1,0,0,1,.15-.31c.13.1.26.2.4.29l.1,0a1.18,1.18,0,0,0,0,.62l2,0A2.32,2.32,0,0,0,579.55,279.91Z" fill="#e55940"/><path d="M627.34,279v0a1.32,1.32,0,0,0,1.18.11,1.33,1.33,0,0,0,.6-1.64,1.1,1.1,0,0,0-1.35-.63,1.73,1.73,0,0,0-.82,1.45.69.69,0,0,0-.5-.22c-.4,0-.16-.9-.72-.92s-.76-.67-1.43-.62-1.31.54-1.06,1.09a2.38,2.38,0,0,0,1.2,1.07c.38.22.78-.19.87.32a2.41,2.41,0,0,0,.36.93.77.77,0,0,0-.12.13l1.44,0A1.22,1.22,0,0,0,627.34,279Z" fill="#e55940"/><path d="M553.32,279.12l-.06,0a1.27,1.27,0,0,0-.27-.3,1.9,1.9,0,0,0-1-.33.63.63,0,0,0-.46-.52.82.82,0,0,0-.88.48s0,0,0,0a1.41,1.41,0,0,0-1.43-.62c-.31.07-.53.24-.51.55,0,.15,0,.3,0,.45.47.4.93.81,1.42,1.2l4,0C554.32,279.88,553.6,279.1,553.32,279.12Zm-2.46,0a.14.14,0,0,0,0-.06s0,0,0,0Z" fill="#e55940"/><path d="M555.89,279.81c.16-.6,0-1.09-.49-1.19a1,1,0,0,0-1.22.64,1.38,1.38,0,0,0,.49.9h1A1.1,1.1,0,0,0,555.89,279.81Z" fill="#e55940"/><path d="M531.61,207c-.26,0-.61.58-.59.93a.64.64,0,0,0,.75.6.59.59,0,0,0,.61-.64C532.34,207.49,531.92,207,531.61,207Z" fill="#e55940"/><path d="M530.92,207.81a1.17,1.17,0,0,0-.12-1.08c-.19.49-.39,1-.57,1.49A.92.92,0,0,0,530.92,207.81Z" fill="#e55940"/><path d="M534.27,203.51c0,.37.54.56.76.79l.21-.08a.63.63,0,0,0,.22-.74.9.9,0,0,0-.27-.54C534.92,203.11,534.29,203.14,534.27,203.51Z" fill="#e55940"/><path d="M630,271.45c-.22-.13-.45.11-.46.41a1.07,1.07,0,0,0,.33.77.32.32,0,0,0,.5-.09.73.73,0,0,0-.07-.59C630.19,271.76,630.15,271.56,630,271.45Z" fill="#e55940"/><path d="M544.5,252.3c.81-.11,1.18-.55,1.09-1.29a1.23,1.23,0,0,0-1.55-1,1.25,1.25,0,0,0-.94,1.37C543.17,252.06,543.69,252.41,544.5,252.3Z" fill="#e55940"/><path d="M546.05,233.88c-.45.07-.7.32-.63.62a1.13,1.13,0,0,0,1,.72.71.71,0,0,0,.51-.84A.66.66,0,0,0,546.05,233.88Z" fill="#e55940"/><path d="M546.84,232.75c0-.07-.17-.14-.23-.12s-.17.09-.15.18a.2.2,0,0,0,.23.18A.22.22,0,0,0,546.84,232.75Z" fill="#e55940"/><path d="M544.87,249.22a.63.63,0,0,0-.37.51c0,.2.52.28.64.23a.5.5,0,0,0,.2-.49A.55.55,0,0,0,544.87,249.22Z" fill="#e55940"/><path d="M546.41,248.8a1.54,1.54,0,0,0,1.33,1,1.06,1.06,0,0,0,.8-1.17,1.15,1.15,0,0,0-1.14-.94C546.83,247.78,546.33,248.34,546.41,248.8Z" fill="#e55940"/><path d="M549,253.09a1.51,1.51,0,0,0,0-.3,1.13,1.13,0,0,0,.5-1,.61.61,0,0,0-.72-.53,1,1,0,0,0-.71.43c-.66,0-1.43.39-1.53.9a1.17,1.17,0,0,0,.81,1.36A1.28,1.28,0,0,0,549,253.09Z" fill="#e55940"/><path d="M543.17,249.17c.35,0,.7-.65.61-1.08s-.36-.5-.78-.43c-.62.1-1,.36-.91.7A1.15,1.15,0,0,0,543.17,249.17Z" fill="#e55940"/><path d="M543.88,242.38a.66.66,0,0,0,.25.59,1.06,1.06,0,0,0,.82,0c.46-.29.16-.69,0-1.1C544.44,241.83,544,241.87,543.88,242.38Z" fill="#e55940"/><path d="M544.8,233.82a.49.49,0,0,0-.7-.16.54.54,0,0,0-.27.75.63.63,0,0,0,.11.12.31.31,0,0,0,0,.08c0,.13.19.49.36.44a.44.44,0,0,0,.24-.36.51.51,0,0,0,.17-.07A.54.54,0,0,0,544.8,233.82Z" fill="#e55940"/><path d="M543.48,240.24c-.1.1-.29.3-.18.52s.44,0,.48,0,.19-.28.07-.45A.24.24,0,0,0,543.48,240.24Z" fill="#e55940"/><path d="M546.39,240.35a1,1,0,0,0,.81-1,1.27,1.27,0,0,0-1.11-.93c-.36.06-.69.78-.61,1.31A.82.82,0,0,0,546.39,240.35Z" fill="#e55940"/><path d="M544.36,216.48c-.41-.16-1,0-1.14.28s.24.81.57,1a.64.64,0,0,0,.87-.4A.59.59,0,0,0,544.36,216.48Z" fill="#e55940"/><path d="M542.8,206c-.12-.07-.53-.19-.69.08s.21.54.35.59.44.1.54-.14A.43.43,0,0,0,542.8,206Z" fill="#e55940"/><path d="M543,223.15c.1.17.42,0,.54,0a.36.36,0,0,0,.08-.38c-.08-.11-.33-.09-.47,0S542.92,223,543,223.15Z" fill="#e55940"/><path d="M541.28,206.12c-.29,0-.26.36-.25.48s.26.27.35.24a.46.46,0,0,0,.3-.35C541.67,206.38,541.57,206.08,541.28,206.12Z" fill="#e55940"/><path d="M541.15,211.74c0,.31-.23.89.1,1.08s.74-.24,1-.34l0-.22a.64.64,0,0,0-.56-.53A.89.89,0,0,0,541.15,211.74Z" fill="#e55940"/><path d="M545,231.38c.05.14.19.31.32.32s.43-.23.41-.34-.35-.25-.5-.26S545,231.32,545,231.38Z" fill="#e55940"/><path d="M544.36,221.26a.4.4,0,0,0-.13.45c.09.15.35.14.46.09s.33-.37.23-.51S544.45,221.19,544.36,221.26Z" fill="#e55940"/><path d="M545.82,229.82a.61.61,0,0,0,.3,1c.2,0,.49-.34.72-.55a.28.28,0,0,0,0-.42A.84.84,0,0,0,545.82,229.82Z" fill="#e55940"/><path d="M547.23,207.52a.37.37,0,0,0-.51.19c-.09.28.2.39.32.43a.42.42,0,0,0,.37-.2A.45.45,0,0,0,547.23,207.52Z" fill="#e55940"/><path d="M545.38,241.9c.39.12.85-.73.63-1.12s-.83-.57-1.08-.32S545,241.79,545.38,241.9Z" fill="#e55940"/><path d="M540.56,224.57c-.08.16.07.37.17.43s.49.08.56-.07-.17-.45-.28-.49A.39.39,0,0,0,540.56,224.57Z" fill="#e55940"/><path d="M535.12,231.47a1,1,0,0,0-.32,1,.52.52,0,0,0,.75.24c.51-.25.78-.57.68-.83A1.18,1.18,0,0,0,535.12,231.47Z" fill="#e55940"/><path d="M545.58,245.72c-.1-.31-.2-.65-.54-.61-.58.12-.88.44-.83.81a.76.76,0,0,0,.91.65A.65.65,0,0,0,545.58,245.72Z" fill="#e55940"/><path d="M534.58,230.28a.62.62,0,0,0-.66.79c.08.19.55.23.86.3a.27.27,0,0,0,.37-.19A.85.85,0,0,0,534.58,230.28Z" fill="#e55940"/><path d="M540.05,234.1c0-.24-.16-.36-.34-.38a.29.29,0,0,0,0-.16,1.42,1.42,0,0,1-.12-.95c0-.15-.27-.41-.46-.46a.79.79,0,0,0-.65.2c-.1.09-.09.4,0,.57a6.21,6.21,0,0,0,.55.92.38.38,0,0,0,.11.11.5.5,0,0,0-.12.38.74.74,0,0,0,.69.59C539.94,234.89,540.11,234.48,540.05,234.1Z" fill="#e55940"/><path d="M534,236.25a1.2,1.2,0,0,0,1.29,0,.81.81,0,0,0,.12-1c-.43-.56-.95-.75-1.3-.48A1.2,1.2,0,0,0,534,236.25Z" fill="#e55940"/><path d="M535.53,234.53a.53.53,0,0,0,.32.32c.1,0,.41-.06.41-.34s-.35-.25-.5-.26S535.5,234.47,535.53,234.53Z" fill="#e55940"/><path d="M542,260.06a.88.88,0,0,0,.92.58.94.94,0,0,0,1-1.07c-.06-.51-.47-.94-.84-.91A1.38,1.38,0,0,0,542,260.06Z" fill="#e55940"/><path d="M541.25,244.91a.65.65,0,0,0-.82-.51c-.74.14-1,.45-.95,1a1.14,1.14,0,0,0,1.11.73A1.27,1.27,0,0,0,541.25,244.91Z" fill="#e55940"/><path d="M540.5,257.7c-.4.06-.61.4-.53.9a1.06,1.06,0,0,0,.46.78c0,.13.05.33.19.37s.36-.11.41-.22a.28.28,0,0,0,0-.1.94.94,0,0,0,.71-1A1.55,1.55,0,0,0,540.5,257.7Z" fill="#e55940"/><path d="M539.38,246.35a1.47,1.47,0,0,0-1.13,1c0,.32-.17.75.21.9a1.62,1.62,0,0,1,.91,1,.55.55,0,0,0,.83.31c.39-.18.62-.73.34-1a1.15,1.15,0,0,1-.35-1.23A1.11,1.11,0,0,0,539.38,246.35Z" fill="#e55940"/><path d="M538.68,239.56a1.05,1.05,0,0,0,.17.82.33.33,0,0,0,.52,0,.75.75,0,0,0,0-.59c0-.2,0-.41-.2-.55S538.75,239.27,538.68,239.56Z" fill="#e55940"/><path d="M541.6,232.49a.79.79,0,0,0-.24,1c.19.27.85.45,1.06.28a1,1,0,0,0,.16-1.16A.7.7,0,0,0,541.6,232.49Z" fill="#e55940"/><path d="M540.56,234.92c-.43.31-.45.74-.07,1.25a.7.7,0,0,0,.93.29,1.45,1.45,0,0,0,.4-1.45C541.52,234.58,541.07,234.55,540.56,234.92Z" fill="#e55940"/><path d="M541.93,238.86c.08.31.32.32.56.29s.57-.34.43-.63-.21-.45-.43-.48S541.85,238.53,541.93,238.86Z" fill="#e55940"/><path d="M541.92,244.14l.4-.08c-.23.35-.23.58,0,.84a.67.67,0,0,0,.8.25.83.83,0,0,0,.57-.67.49.49,0,0,0,.27-.1.64.64,0,0,0,.17-.78c-.23-.53-.46-.63-1.14-.52a10.78,10.78,0,0,0-1.08-.76.45.45,0,0,0-.67.51C541.37,243.28,541.41,243.83,541.92,244.14Z" fill="#e55940"/><path d="M534.32,242.93a1.28,1.28,0,0,0,1.56-.06c.39-.32.17-1.11-.27-1.66a1.22,1.22,0,0,0-1.61,0A1.28,1.28,0,0,0,534.32,242.93Z" fill="#e55940"/><path d="M537.63,237.58a1.29,1.29,0,0,0-.34-.69.87.87,0,1,0,.87-1.5c-.33-.43-.81-.44-1.35,0a1,1,0,0,0-.21,1.09,1,1,0,0,0-.47,0A1.5,1.5,0,0,0,535,237.9c.05.67.71,1.09,1.56,1A1.15,1.15,0,0,0,537.63,237.58Z" fill="#e55940"/><path d="M534,238a.49.49,0,0,0,.09.53c.13.11.38,0,.46-.17a.38.38,0,0,0-.11-.47A.36.36,0,0,0,534,238Z" fill="#e55940"/><path d="M540.13,238.41a.6.6,0,0,0,.53-.63c0-.28-.61-.71-.84-.56a.79.79,0,0,0-.34.62A.56.56,0,0,0,540.13,238.41Z" fill="#e55940"/><path d="M537.69,241.64c.25-.08.69-.32.76-.7s.31-.77.13-1a.67.67,0,0,0-.51-.34,1,1,0,0,0-.65-.07,1.46,1.46,0,0,0-.92.86,1.07,1.07,0,0,0,.27,1.1A.91.91,0,0,0,537.69,241.64Z" fill="#e55940"/><path d="M527.66,238.66a.81.81,0,0,0,.6-.89.57.57,0,0,0-.14-.28,2,2,0,0,0-.35-.91,1.06,1.06,0,0,0-1.28-.38c.06.81.11,1.62.19,2.41a1,1,0,0,0,.58-.05A.66.66,0,0,0,527.66,238.66Z" fill="#e55940"/><path d="M535.09,260.55c.18.06.34-.24.39-.36a.35.35,0,0,0-.18-.35c-.12,0-.31.14-.38.26S534.9,260.49,535.09,260.55Z" fill="#e55940"/><path d="M540.05,255a1.3,1.3,0,0,0,1.47-.85h.15c1-.1,1.6-.67,1.5-1.47a1.48,1.48,0,0,0-1.78-1.19,1.38,1.38,0,0,0-1.14.88,1.43,1.43,0,0,0-1,.47.63.63,0,0,0-1,.3.64.64,0,0,0,.49.66.45.45,0,0,0,.31-.07A2,2,0,0,0,540.05,255Z" fill="#e55940"/><path d="M555.36,254.05a.34.34,0,0,0,0-.23c-.08-.14-.37-.09-.48,0s-.24.38-.12.54.26.08.39,0c.07.31.57.75.87.58a.66.66,0,0,0,.25-.79C556.1,253.93,555.65,253.93,555.36,254.05Z" fill="#e55940"/><path d="M539.87,260.88a.7.7,0,0,0,.48-.6c0-.37-.69-.88-1-.69s-.15.92,0,1.09A.55.55,0,0,0,539.87,260.88Z" fill="#e55940"/><path d="M531,220.83a.88.88,0,0,0-1.15.34.83.83,0,0,0-.46.13c-.42.24-.7.83-.53,1.16a1.17,1.17,0,0,0,1.42.41l.09.06a1.2,1.2,0,0,0,1.5-.49C532.14,221.94,531.71,221.13,531,220.83Z" fill="#e55940"/><path d="M531.24,232.64a1.16,1.16,0,0,0,0,1.19,1,1,0,0,0,1.08-.09.51.51,0,0,0-.06-.78C531.85,232.57,531.45,232.45,531.24,232.64Z" fill="#e55940"/><path d="M526.87,222.15c0,.38-.1.75-.14,1.13.42.23.77.26.92.05a1.16,1.16,0,0,0-.22-1.17A.71.71,0,0,0,526.87,222.15Z" fill="#e55940"/><path d="M531.31,236.62a.89.89,0,0,0-.64-.23c-.44.07-1.12.88-1,1.23a1.19,1.19,0,0,0,1.36.65.84.84,0,0,0,.37-.17,1.24,1.24,0,0,0,.95,0,.88.88,0,0,0,.15-1.28C532.15,236.35,531.83,236.3,531.31,236.62Z" fill="#e55940"/><path d="M555.43,244.06a.54.54,0,0,0,.58-.65.67.67,0,0,0-.71-.67.68.68,0,0,0-.61.67A.71.71,0,0,0,555.43,244.06Z" fill="#e55940"/><path d="M530.94,227.25a.61.61,0,0,0-.07.89.71.71,0,0,0,1,.11.53.53,0,0,0,0-.81A.67.67,0,0,0,530.94,227.25Z" fill="#e55940"/><path d="M552.22,238a.41.41,0,0,0-.43.54c.07.3.2.58.58.55s.65-.66.53-.86S552.47,238,552.22,238Z" fill="#e55940"/><path d="M552,242.47c-.5.08-.93.53-.86.9a1.38,1.38,0,0,0,1.39,1,.85.85,0,0,0,.56-1A.93.93,0,0,0,552,242.47Z" fill="#e55940"/><path d="M552.8,245.89c-.54.06-.83.51-.74,1.15a.67.67,0,0,0,.16.35.88.88,0,0,0-.23.45.7.7,0,0,0,.28.55.44.44,0,0,0,.64-.3,1.25,1.25,0,0,0,0-.42,1.5,1.5,0,0,0,.3,0c.49-.08.79-.39.75-.77S553.18,245.84,552.8,245.89Z" fill="#e55940"/><path d="M551.42,193.85a1.27,1.27,0,0,0-1.24,1.39,1,1,0,0,0,1,1c.72-.05,1.5-.82,1.42-1.41A1.18,1.18,0,0,0,551.42,193.85Z" fill="#e55940"/><path d="M553.58,251.26a.9.9,0,0,0-.51-.1,1,1,0,1,0,.28,1.9,1.14,1.14,0,0,0,.94-.88c.15-.31.2-.75,0-.9A.73.73,0,0,0,553.58,251.26Z" fill="#e55940"/><path d="M528.5,225.46c-.13,0-.39.14-.49.29a5.38,5.38,0,0,0-.48,1,.39.39,0,0,0,0,.18.39.39,0,0,0-.19.06,1.52,1.52,0,0,0-.31,1.61.92.92,0,0,0-.62.66,1,1,0,0,0,0,.22,1.7,1.7,0,0,0,0,.22.58.58,0,0,0,.31.5,1.49,1.49,0,0,0,1.44-.45A.69.69,0,0,0,528,229a1.21,1.21,0,0,0,.44-.22.87.87,0,0,0,.14-1.4,1.21,1.21,0,0,0-.33-.31,1.73,1.73,0,0,1,.66-.49c.13-.07.2-.45.14-.64A.82.82,0,0,0,528.5,225.46Z" fill="#e55940"/><path d="M555.18,183.26a.69.69,0,0,0-.62.78c.05.32.29.34.54.33s.59-.29.47-.59A2,2,0,0,0,555.18,183.26Z" fill="#e55940"/><path d="M555.87,186.16c-.17,0-.3.23-.31.35s.15.47.32.46.33-.35.31-.47S556,186.16,555.87,186.16Z" fill="#e55940"/><path d="M556.71,235.53c0-.35-.88-.48-1.17-.44a.79.79,0,0,0-.55.72c0,.35.58.5.89.51S556.75,235.87,556.71,235.53Z" fill="#e55940"/><path d="M554.33,248a.73.73,0,0,0,.55.31c.17,0,.6-.26.6-.48s-.47-.41-.67-.44S554.2,247.73,554.33,248Z" fill="#e55940"/><path d="M555.36,197.51a.59.59,0,0,0,.19-.6c-.1-.18-.58-.1-.69,0a.55.55,0,0,0,0,.53A.54.54,0,0,0,555.36,197.51Z" fill="#e55940"/><path d="M529.65,231.08a.62.62,0,0,0,.29.84.54.54,0,0,0,.73-.34.5.5,0,0,0-.25-.68A.53.53,0,0,0,529.65,231.08Z" fill="#e55940"/><path d="M531.49,225a.67.67,0,0,0,.22-.95.73.73,0,0,0-1-.17.65.65,0,0,0-.11.9A.6.6,0,0,0,531.49,225Z" fill="#e55940"/><path d="M531.53,243.53a.53.53,0,0,0,0-.12.74.74,0,0,0-1-.19,2.31,2.31,0,0,0,0,.73.43.43,0,0,0,.69.13.9.9,0,0,0,.18-.15s0,0,0,.08a2.37,2.37,0,0,0,1,1.28c.33.28.8,0,.79.48s.12,1.6,1.08,1.49a1.2,1.2,0,0,0,.92-1.09h0a1.22,1.22,0,0,0,2.05-1.16l0-.06a.65.65,0,0,0,.22-.78h0c.14.21.42.32.91.24a12.69,12.69,0,0,0,1.26-.78.62.62,0,0,0,.11-.9.64.64,0,0,0-.89-.18,2.39,2.39,0,0,1-.58.22,1,1,0,0,0-.91,1,.73.73,0,0,0,0,.3,1.08,1.08,0,0,0-1.26-.51c-.56.17-.55.52-.92.6s-.45.31-.47.72c0,.1,0,.22,0,.34a.62.62,0,0,0-.22-.1c-.39-.06,0-.91-.52-1s-.62-.8-1.3-.88A1.27,1.27,0,0,0,531.53,243.53Z" fill="#e55940"/><path d="M533.15,241.16c.09.19.21.24.39.14s.22-.22.13-.4a.25.25,0,0,0-.37-.13C533.12,240.86,533.05,241,533.15,241.16Z" fill="#e55940"/><path d="M533.4,254.89c.12-.41-.06-.69-.39-1-.79-.74-1.27-.75-1.92,0l-.51.54c.3.76.62,1.52,1,2.26a2.74,2.74,0,0,0,.62-1.1,2.1,2.1,0,0,1,.36,0C533.07,255.61,533.28,255.31,533.4,254.89Z" fill="#e55940"/><path d="M531.11,226.93a.52.52,0,0,0,.73-.32.93.93,0,0,0-.27-1.21,1.09,1.09,0,0,0-1.2.36C530.19,226.15,530.54,226.7,531.11,226.93Z" fill="#e55940"/><path d="M534,224.31a1.49,1.49,0,0,0-.5,1.93,1.57,1.57,0,0,0,1.89.4c.59-.35.67-1.18.19-1.95A1.14,1.14,0,0,0,534,224.31Z" fill="#e55940"/><path d="M540.22,229.69s-.1,0-.13,0a1.08,1.08,0,0,0-.35,1.2c.23.36.88.36,1.38,0a.49.49,0,0,0,.21-.62.85.85,0,0,0,.13-.51.55.55,0,0,0-.66-.56A.68.68,0,0,0,540.22,229.69Z" fill="#e55940"/><path d="M539.18,218.21c-.12.07-.4.13-.51.3a.84.84,0,0,0-.07.74,1.55,1.55,0,0,0-.47.19c0,.14-.11.41,0,.6a.82.82,0,0,0,1.07.42.85.85,0,0,0,.34-.82.69.69,0,0,0,.4-.34C540.05,219,539.76,218.48,539.18,218.21Z" fill="#e55940"/><path d="M528.5,229.69a.59.59,0,0,0-.21.86.7.7,0,0,0,.94.27.67.67,0,0,0,.14-1A.61.61,0,0,0,528.5,229.69Z" fill="#e55940"/><path d="M537.14,224.37a1.42,1.42,0,0,0,1.71.29l.16.12a.35.35,0,0,0,.37-.14c0-.12-.11-.33-.22-.42h0a1,1,0,0,0-.14-.81,1,1,0,0,0-1.49-.28A1,1,0,0,0,537.14,224.37Z" fill="#e55940"/><path d="M537.69,216.06a.79.79,0,0,0,.26.59c.24.18.73-.09.76-.41a1.17,1.17,0,0,0-.17-.49C538.08,215.6,537.7,215.76,537.69,216.06Z" fill="#e55940"/><path d="M529.18,233a7.91,7.91,0,0,0-2.87-.93c0,.81,0,1.62.06,2.41a1.06,1.06,0,0,0,.7,0l.08.13a1.26,1.26,0,0,0,.17.13h-.08c-.29,0-.45.25-.35.59s.26.55.57.43.76-.42.72-.69a.18.18,0,0,0,0-.1,1.3,1.3,0,0,0,.69-.21A1.4,1.4,0,0,0,529.18,233Z" fill="#e55940"/><path d="M530.24,244.36a1.41,1.41,0,0,0-2,.45,2.1,2.1,0,0,1-.49.41c.27,1.23.57,2.45.91,3.64.24-.17.48-.34.72-.49a1.47,1.47,0,0,0,.47-.11.78.78,0,0,0,.33-.32c.42-.27.74-.8.59-1.1l0,0C531.7,245.76,531.06,244.89,530.24,244.36Z" fill="#e55940"/><path d="M531.41,231.28c.23-.36.44-.74,0-1s-.72-.05-1,.28A.77.77,0,0,0,531.41,231.28Z" fill="#e55940"/><path d="M540.5,211.16c0,.09,0,.14.08.24s.21,0,.25-.09,0-.2-.05-.2S540.55,211.07,540.5,211.16Z" fill="#e55940"/><path d="M531.18,248.45c-.4.06-.8.14-.88.61a.61.61,0,0,0,.52.73.85.85,0,0,0,.64-.19,1.38,1.38,0,0,0-.11.76.75.75,0,0,0,.27.56,1,1,0,0,0-.83.1,1.41,1.41,0,0,0-.55.69,1.45,1.45,0,0,0-.55.37c.16.44.33.88.49,1.31l.52-.1a1,1,0,0,0,.57-.34,1.2,1.2,0,0,0,.47-.11,1.25,1.25,0,0,0,.25-1.65.58.58,0,0,0-.19-.19,1.31,1.31,0,0,0,.61,0,.85.85,0,0,0,.74-1,1.68,1.68,0,0,0-1.13-.94.67.67,0,0,0-.47.33C531.72,249.08,531.52,248.74,531.18,248.45Z" fill="#e55940"/><path d="M529.84,240.8a1.2,1.2,0,0,0,1.13.78.55.55,0,0,0,.31.6.7.7,0,0,0,.89-.2.52.52,0,0,0,.07-.73.73.73,0,0,0-.49-.31,1.82,1.82,0,0,0,.07-.25,1,1,0,0,0-.61-1.1,2.15,2.15,0,0,0-.34-.05.21.21,0,0,0,0-.13c0-.19-.59-.39-.68-.33s-.48.44-.4.61a.55.55,0,0,0,.19.18,1.39,1.39,0,0,0-.15.19A1,1,0,0,0,529.84,240.8Z" fill="#e55940"/><path d="M529.19,242.48a1.39,1.39,0,0,0,.07-1.14,1.23,1.23,0,0,0-1.51-.63,1.3,1.3,0,0,0-.71.49c.08.54.16,1.08.25,1.62a1.17,1.17,0,0,0,1.3.35,1.11,1.11,0,0,0,.27-.19.69.69,0,0,0,0,.25A1.51,1.51,0,0,0,530,244c.39,0,.56-.37.48-.91s-.34-.86-.77-.8A1.3,1.3,0,0,0,529.19,242.48Z" fill="#e55940"/><path d="M530.06,228.17a.78.78,0,0,0-.94.32,1,1,0,0,0,.33,1,.56.56,0,0,0,.13,0,1,1,0,0,0,0,.16.42.42,0,0,0,.57.41c.21-.06.7-.38.67-.56s-.21-.24-.41-.33a1,1,0,0,0,.13-.18A.71.71,0,0,0,530.06,228.17Z" fill="#e55940"/><path d="M551.49,190.13a.66.66,0,0,0-.55-.73.83.83,0,0,0-.62.21c-.3.28-.2.59.27,1.19C551,190.69,551.46,190.7,551.49,190.13Z" fill="#e55940"/></g><path d="M592.55,145.05l-.07,89.74,89.78.07A89.76,89.76,0,0,0,592.55,145.05Z" fill="#ff957d"/><path d="M647.92,62.55V63a9.33,9.33,0,0,1-9.14,9.32h0A15.75,15.75,0,0,0,623.05,88v.41a9.34,9.34,0,0,1-9.33,9.33v6.4a15.75,15.75,0,0,0,15.73-15.73V88a9.33,9.33,0,0,1,9.14-9.32h0A15.75,15.75,0,0,0,654.32,63v-.41a9.34,9.34,0,0,1,9.33-9.33v-6.4A15.75,15.75,0,0,0,647.92,62.55Z" fill="#f368ab"/><polygon points="370.25 349.17 364.3 350.8 358.57 349.17 352.7 351.16 347.11 349.17 340.93 351.09 336.09 349.17 336.09 396.49 370.25 396.49 370.25 349.17" fill="#dbe1e9"/><rect x="598.12" y="348.01" width="6.93" height="30.67" fill="#343741"/><rect x="608.6" y="348.01" width="5.49" height="30.67" fill="#343741"/><rect x="617.45" y="348.01" width="3.39" height="30.67" fill="#343741"/><rect x="623.52" y="348.01" width="4.05" height="30.67" fill="#343741"/><rect x="638.91" y="348.01" width="3.67" height="30.67" fill="#343741"/><rect x="645.28" y="348.01" width="3.61" height="30.67" fill="#343741"/><rect x="630.65" y="348.01" width="5.46" height="30.67" fill="#343741"/><rect x="651.27" y="348.01" width="4.62" height="30.67" fill="#343741"/><rect x="141.92" y="360.83" width="10.42" height="18.27" fill="#343741"/><polygon points="146.99 350.49 133.85 363.38 160.12 363.38 146.99 350.49" fill="#343741"/><path d="M507.69,386.3a.94.94,0,0,0-.1,1.24,1.37,1.37,0,0,0,1.68-.14.84.84,0,0,0-.2-1.13A.92.92,0,0,0,507.69,386.3Z" fill="#dbe1e9"/><path d="M501.21,393.11c0,.81.09,1.11.52,1.21a.67.67,0,0,0,.78-.31.78.78,0,0,0-.07-1C502,392.69,501.6,392.92,501.21,393.11Z" fill="#dbe1e9"/><path d="M491.56,384.16a.68.68,0,0,0,0-1,.53.53,0,0,0-.86,0,.68.68,0,0,0,0,1A.72.72,0,0,0,491.56,384.16Z" fill="#dbe1e9"/><path d="M501.37,391.37a.64.64,0,0,0,.56.29,1,1,0,0,0,.63-.53c.17-.51-.31-.63-.68-.86C501.45,390.58,501.13,390.89,501.37,391.37Z" fill="#dbe1e9"/><path d="M493.4,388.25c.17-.18,0-.6-.25-.86a.38.38,0,0,0-.62,0c-.2.24-.31.53,0,.8A.72.72,0,0,0,493.4,388.25Z" fill="#dbe1e9"/><path d="M520.6,381.72a.62.62,0,0,0-.07.93.58.58,0,0,0,.54.08.74.74,0,0,0,.36-.52C521.39,381.75,520.83,381.64,520.6,381.72Z" fill="#dbe1e9"/><path d="M518.69,393.4a.65.65,0,0,0-.31-.77c-.35-.12-.93.53-.79.79S518.55,393.75,518.69,393.4Z" fill="#dbe1e9"/><path d="M505.87,383.47c.23-.21.08-.93-.14-1s-.47.09-.67.25a.41.41,0,0,0,0,.69C505.32,383.6,505.59,383.73,505.87,383.47Z" fill="#dbe1e9"/><path d="M514,392.33a1,1,0,1,0,1.42,1.28,1.1,1.1,0,0,0,.09-1.41A1.33,1.33,0,0,0,514,392.33Z" fill="#dbe1e9"/><path d="M513.78,388.21c-.15-.17-.63,0-.8.08a.49.49,0,0,0,0,.78.7.7,0,0,0,.61-.11C513.74,388.84,513.92,388.38,513.78,388.21Z" fill="#dbe1e9"/><path d="M526.23,387.51c-.06.3-.21.67,0,.93s.56,0,.63-.14.33-.88.15-1.07S526.26,387.41,526.23,387.51Z" fill="#dbe1e9"/><path d="M517.91,390.68a5.08,5.08,0,0,0,.51-1.36,1.36,1.36,0,0,0-.86-1.36c-.3-.11-1-.1-1.07.55.42,1-.36,1-.29,1.85a1.18,1.18,0,0,0,.12.34A.87.87,0,0,0,517.91,390.68Z" fill="#dbe1e9"/><path d="M507.46,393.24a1.14,1.14,0,0,0-.07,1.49,1.55,1.55,0,0,0,1.67-.07,1.06,1.06,0,0,0-.12-1.41A1.16,1.16,0,0,0,507.46,393.24Z" fill="#dbe1e9"/><path d="M523.37,389.38a.89.89,0,0,0,.06-1.3,1.36,1.36,0,0,0-1.69.13,1,1,0,0,0,.26,1.3A.91.91,0,0,0,523.37,389.38Z" fill="#dbe1e9"/><path d="M507.27,389.3a1.18,1.18,0,0,0-1.34.15.87.87,0,0,0,0,1.07c.54.52,1.2.64,1.52.28A1.29,1.29,0,0,0,507.27,389.3Z" fill="#dbe1e9"/><path d="M510.48,388.42a.9.9,0,0,0,.17,1.36c.36.33.84.25,1.27-.23a.77.77,0,0,0,.09-1.07A1.46,1.46,0,0,0,510.48,388.42Z" fill="#dbe1e9"/><path d="M502,388.2a1,1,0,0,0,0-1.25,1.23,1.23,0,0,0-1.44,0c-.24.26,0,1,.36,1.39A.82.82,0,0,0,502,388.2Z" fill="#dbe1e9"/><path d="M522.3,394.75a.7.7,0,0,0,.06,1,.84.84,0,0,0,1-.19.75.75,0,0,0-.15-1A.67.67,0,0,0,522.3,394.75Z" fill="#dbe1e9"/><path d="M517.15,383.39a.75.75,0,0,0-.09-1.05.68.68,0,0,0-1,.08.73.73,0,0,0,.08,1A.7.7,0,0,0,517.15,383.39Z" fill="#dbe1e9"/><path d="M504.8,392.87c-.28-.18-.57-.38-.8-.13-.38.46-.41.9-.14,1.15a.76.76,0,0,0,1.12-.07A.66.66,0,0,0,504.8,392.87Z" fill="#dbe1e9"/><path d="M506.06,385.28a.64.64,0,0,0-.89.06.7.7,0,0,0,0,1.05.77.77,0,0,0,1,0A.81.81,0,0,0,506.06,385.28Z" fill="#dbe1e9"/><path d="M511,381.53a.7.7,0,1,0-1-1,.83.83,0,0,0,.09,1A.62.62,0,0,0,511,381.53Z" fill="#dbe1e9"/><path d="M497.65,383.41c-.3.34-.33.7-.09.88a1.15,1.15,0,0,0,1.2,0,.72.72,0,0,0-.14-1A.67.67,0,0,0,497.65,383.41Z" fill="#dbe1e9"/><path d="M522.71,391.89a.69.69,0,0,0,0,1,.84.84,0,0,0,1,0,.68.68,0,0,0,0-1A.65.65,0,0,0,522.71,391.89Z" fill="#dbe1e9"/><path d="M510.43,384.4a.68.68,0,0,0-.05.91.7.7,0,0,0,1,0,.54.54,0,0,0,0-.87A.66.66,0,0,0,510.43,384.4Z" fill="#dbe1e9"/><path d="M495.94,390.67s0,0,0,0a.67.67,0,0,0,.7-.32.59.59,0,0,0-.71-.75.48.48,0,0,0-.22.17c-.29-.06-.72,0-.79.22a.77.77,0,0,0,.13.69A.55.55,0,0,0,495.94,390.67Z" fill="#dbe1e9"/><path d="M518.63,395c-.42.11-.68.35-.56.78,0,.14.31.35.43.33a.94.94,0,0,0,.61-.39C519.25,395.36,518.91,395.18,518.63,395Z" fill="#dbe1e9"/><path d="M498.18,389c-.21-.1-.45-.22-.64-.1s-.19.78.09,1,.44,0,.61-.14A.45.45,0,0,0,498.18,389Z" fill="#dbe1e9"/><path d="M525.54,393.64c-.26.21-.35.71-.09.86s.74.36,1,.1,0-.66-.18-.84A.44.44,0,0,0,525.54,393.64Z" fill="#dbe1e9"/><path d="M483,390.59c.12-.18.31-.73.16-.86s-.68,0-.88.13-.23.5,0,.78A.41.41,0,0,0,483,390.59Z" fill="#dbe1e9"/><path d="M506.8,379.07c.17-.12.39-.9.14-1.14s-1,.18-1.18.4a.8.8,0,0,0,0,.91C506,379.48,506.56,379.25,506.8,379.07Z" fill="#dbe1e9"/><path d="M495.74,382.17c.08-.06.19-.45.1-.53s-.43,0-.55.12-.06.34,0,.36A.52.52,0,0,0,495.74,382.17Z" fill="#dbe1e9"/><path d="M529,390.78c-.06,0-.11.28,0,.36a.47.47,0,0,0,.44.05c.09-.06.23-.4.11-.53S529.14,390.69,529,390.78Z" fill="#dbe1e9"/><path d="M497,385.45A.46.46,0,0,0,497,385c-.12-.09-.38-.26-.48-.12a.46.46,0,0,0,0,.48C496.55,385.43,496.92,385.59,497,385.45Z" fill="#dbe1e9"/><path d="M501.29,380.05a.51.51,0,0,0-.08-.55.46.46,0,0,0-.44,0,.42.42,0,0,0,0,.43C500.83,380,501.16,380.21,501.29,380.05Z" fill="#dbe1e9"/><path d="M479.93,395.35c-.13.12-.06.37,0,.46s.43.24.55.12,0-.48-.1-.56A.41.41,0,0,0,479.93,395.35Z" fill="#dbe1e9"/><path d="M497.58,382.32a.22.22,0,0,0,0-.28c0-.05-.21,0-.25,0a.2.2,0,0,0,0,.24A.21.21,0,0,0,497.58,382.32Z" fill="#dbe1e9"/><path d="M520.06,386.55c0,.05-.07.18,0,.24a.19.19,0,1,0,.25-.29C520.27,386.45,520.1,386.5,520.06,386.55Z" fill="#dbe1e9"/><path d="M490.48,390.1c-.17-.22-.43,0-.55.12s-.06.34,0,.37a.52.52,0,0,0,.45,0A.39.39,0,0,0,490.48,390.1Z" fill="#dbe1e9"/><path d="M510,390.89a.73.73,0,0,0,.12,1,.69.69,0,0,0,1-.18.58.58,0,0,0-.1-.87A.75.75,0,0,0,510,390.89Z" fill="#dbe1e9"/><path d="M532.92,394.6c-.41.06-.28,0-.53-.35a.71.71,0,0,0-1.24,0,1.4,1.4,0,0,0,.42,1.82,1.65,1.65,0,0,0,2.14-.57C534,395,533.33,394.55,532.92,394.6Z" fill="#dbe1e9"/><path d="M481,394.18a1.1,1.1,0,0,0,.14,1.41,1,1,0,0,0,.71.21,1.32,1.32,0,0,0,1.11-1.49,5.09,5.09,0,0,0-.74-.46A1,1,0,0,0,481,394.18Z" fill="#dbe1e9"/><path d="M466.59,384.09a1,1,0,0,0,1.14.63,1.42,1.42,0,0,0,.68-1.62,1,1,0,0,0-1.82,1Z" fill="#dbe1e9"/><path d="M479.89,392.74a.89.89,0,0,0-1.21-.45c-.57.19-.7.5-.47,1.14s.59.84,1,.68A1.56,1.56,0,0,0,479.89,392.74Z" fill="#dbe1e9"/><path d="M479.18,382.77c-.49.18-.63.61-.39,1.2s.61.61,1.2.37c.41-.18.61-.51.5-.84A1.46,1.46,0,0,0,479.18,382.77Z" fill="#dbe1e9"/><path d="M474.72,383.8c.4-.14.57-.77.35-1.34a.52.52,0,0,0-.74-.32c-.47.15-.82.67-.69,1A1.09,1.09,0,0,0,474.72,383.8Z" fill="#dbe1e9"/><path d="M448.16,392.7l-.12,0h0a.71.71,0,0,0,.19-.54.6.6,0,0,0-.78-.27.73.73,0,0,0-.08-.73,4.9,4.9,0,0,0-.68-.7l.24-.48a.72.72,0,0,0-.13-.84,1,1,0,0,0-1.07-.14.66.66,0,0,0-.46.37.93.93,0,0,0-.68-.62.53.53,0,0,0-.69.44,1.07,1.07,0,0,0,.17.82.76.76,0,0,0,1.15-.17,2.39,2.39,0,0,1-.12.78.37.37,0,0,0,0,.11.56.56,0,0,0-.65-.26c-.38.17-.21.62-.13.77a.65.65,0,0,0,.54.28.41.41,0,0,0,.37-.38l.09.12a5.83,5.83,0,0,1,.61.8.83.83,0,0,0,1.11.26l.14-.11a.36.36,0,0,0,0,.25.45.45,0,0,1,.1.86.57.57,0,0,0,0,.13,1.23,1.23,0,0,0-.74,2.33,1.71,1.71,0,0,0,1.76-1,1,1,0,0,0-.13-.7.71.71,0,0,0,.3-.22.3.3,0,0,0,.23-.08C448.88,393.6,448.57,392.69,448.16,392.7Z" fill="#dbe1e9"/><path d="M450.74,388.54c.06-.31-.45-.92-.79-.82s-.76.39-.44.94S450.69,388.85,450.74,388.54Z" fill="#dbe1e9"/><path d="M466.87,377.19c.17-.05.22-.3.19-.42s-.28-.41-.43-.35-.21.43-.17.54S466.7,377.25,466.87,377.19Z" fill="#dbe1e9"/><path d="M450.52,394.12c-.15-.06-.35.15-.4.27s0,.45.22.51.39-.25.4-.36A.46.46,0,0,0,450.52,394.12Z" fill="#dbe1e9"/><path d="M484.79,382.08a.24.24,0,0,0-.13.35c.07.12.22.36.46.3s.15-.42.1-.47S485,382,484.79,382.08Z" fill="#dbe1e9"/><path d="M475.46,388.3c-.11-.56-.36-.89-.64-.86a1.17,1.17,0,0,0-.7,1c0,.28.58.61.93.57A.51.51,0,0,0,475.46,388.3Z" fill="#dbe1e9"/><path d="M491.34,388.26c-.13.05-.44.2-.38.39s.38.2.45.16.33-.16.27-.38A.25.25,0,0,0,491.34,388.26Z" fill="#dbe1e9"/><path d="M496.59,392.81a.19.19,0,0,0,0-.12c0-.22-.17-.35-.34-.49s-.28-.29-.5-.3-.34.31-.21.58a1,1,0,0,0,.21.27l-.38,0a2.37,2.37,0,0,0-.29-.34,1.42,1.42,0,0,0-1.32-.39,1.13,1.13,0,0,0-.29-.44,1.43,1.43,0,0,0-1.9.05,1.49,1.49,0,0,0,.08,1.84,1.06,1.06,0,0,0,1.18.21.79.79,0,0,0,.18.31,1.23,1.23,0,0,0,1.39.29.42.42,0,0,0,.07.31.73.73,0,0,0,.59.27c.41-.09.42-.4.39-.72.07.09.14.19.22.28a.67.67,0,0,0,1,.1,1,1,0,0,0,.44-1.12A.83.83,0,0,0,496.59,392.81Zm-1.49,1.05.07-.06.09.11Z" fill="#dbe1e9"/><path d="M471.94,387.27a1.11,1.11,0,0,0,.71-1.54,1.17,1.17,0,0,0-1.38-.76c-.55.16-.83,1-.58,1.73A.91.91,0,0,0,471.94,387.27Z" fill="#dbe1e9"/><path d="M468.52,393.77c-.51.21-.84.75-.68,1.12a1.49,1.49,0,0,0,1.72.63,1,1,0,0,0,.28-1.27C469.57,393.64,469.18,393.5,468.52,393.77Z" fill="#dbe1e9"/><path d="M479.38,388.17c.41-.16.9-1.1.75-1.42a1.18,1.18,0,0,0-1.47-.34c-.5.21-.62.68-.34,1.3A.94.94,0,0,0,479.38,388.17Z" fill="#dbe1e9"/><path d="M463.67,386.84a1.24,1.24,0,0,0-.52,1.34,1.11,1.11,0,0,0,1.27.43.84.84,0,0,0,.45-.91C464.64,387.05,464.1,386.67,463.67,386.84Z" fill="#dbe1e9"/><path d="M478.49,390.63a1.2,1.2,0,0,0,.35-1.23.81.81,0,0,0-.93-.37c-.65.29-1,.75-.78,1.15A1.2,1.2,0,0,0,478.49,390.63Z" fill="#dbe1e9"/><path d="M477.57,382.83c.31-.12.64-.71.53-1a1,1,0,0,0-1.09-.43.69.69,0,0,0-.32.92A.77.77,0,0,0,477.57,382.83Z" fill="#dbe1e9"/><path d="M463.47,381.28c-.32.11-.48.68-.28,1.28.13,0,.37.21.57.17a.84.84,0,0,0,.67-.94A.83.83,0,0,0,463.47,381.28Z" fill="#dbe1e9"/><path d="M477.56,384.58c-.08,0-.21-.14-.29-.11a1.51,1.51,0,0,1-1-.12c-.14-.05-.46.16-.56.33a.85.85,0,0,0,0,.68.65.65,0,0,0,.55.16,6,6,0,0,0,1-.31C477.65,385.11,477.7,384.89,477.56,384.58Z" fill="#dbe1e9"/><path d="M474.87,391.53c-.48.32-.69.68-.56.92a1.16,1.16,0,0,0,1.16.28,1,1,0,0,0,.17-1.07A.51.51,0,0,0,474.87,391.53Z" fill="#dbe1e9"/><path d="M466.13,389.91a.74.74,0,0,0-.41.91.66.66,0,0,0,.85.32.59.59,0,0,0,.42-.78A.67.67,0,0,0,466.13,389.91Z" fill="#dbe1e9"/><path d="M472,391.68c-.37.32-.22.69,0,1a.76.76,0,0,0,1-.72C472.74,391.64,472.42,391.35,472,391.68Z" fill="#dbe1e9"/><path d="M486.74,381c.2-.35-.51-1-.94-.88s-.76.66-.58,1S486.53,381.34,486.74,381Z" fill="#dbe1e9"/><path d="M454.46,392.88c-.19,0-.63.49-.52.78a.63.63,0,0,0,.83.34.48.48,0,0,0,.27-.73A.91.91,0,0,0,454.46,392.88Z" fill="#dbe1e9"/><path d="M452.83,391.7c-.17.11-.25.37-.32.48.16.49.5.71.72.53a1.1,1.1,0,0,0,.4-.7C453.64,391.73,453.1,391.52,452.83,391.7Z" fill="#dbe1e9"/><path d="M479.09,380.67a.61.61,0,0,0,.41-.78.56.56,0,0,0-.75-.31.5.5,0,0,0-.32.65A.53.53,0,0,0,479.09,380.67Z" fill="#dbe1e9"/><path d="M457.12,385.57c.21-.24.81-.44.72-.81s-.68-.38-1-.53l-.18.13a.64.64,0,0,0,0,.77A1,1,0,0,0,457.12,385.57Z" fill="#dbe1e9"/><path d="M463.88,384c-.16.14-.59.44-.38.77s.69.25.92.19.29-.41.18-.68S464.1,383.76,463.88,384Z" fill="#dbe1e9"/><path d="M476.15,377.57c.08-.18-.21-.56-.37-.83a.27.27,0,0,0-.39-.14.85.85,0,0,0-.27,1A.62.62,0,0,0,476.15,377.57Z" fill="#dbe1e9"/><path d="M463.18,390.61a.67.67,0,0,0-.31.86c.13.47.63.89,1,.8.72-.18.75-1,.75-1.36S463.72,390.29,463.18,390.61Z" fill="#dbe1e9"/><path d="M469.42,390.55a.67.67,0,0,0-.41.88.61.61,0,0,0,.85.29.72.72,0,0,0,.34-.93A.55.55,0,0,0,469.42,390.55Z" fill="#dbe1e9"/><path d="M460.49,386.86a.43.43,0,0,0-.2.68c.12.19.47.66.74.51s.3-.73.23-.95A.53.53,0,0,0,460.49,386.86Z" fill="#dbe1e9"/><path d="M462.64,385.12a.8.8,0,0,0,.26-.59c0-.2-.26-.32-.49-.34a.55.55,0,0,0,.19-.26,1.46,1.46,0,0,0-.62-1.37c-.51-.14-.87.12-1,.74s.13.85.75,1a1.31,1.31,0,0,0,.33,0,2.42,2.42,0,0,0-.2.39C462,385.16,462.42,385.32,462.64,385.12Z" fill="#dbe1e9"/><path d="M491.55,391.7c.13-.32,0-.5-.71-.75a.62.62,0,0,0,0,1.06A.64.64,0,0,0,491.55,391.7Z" fill="#dbe1e9"/><path d="M451.83,388.3c0,.14.22.51.53.44s.24-.52.19-.65-.23-.39-.48-.3A.43.43,0,0,0,451.83,388.3Z" fill="#dbe1e9"/><path d="M468,378.71c.19-.06.14-.4.11-.53a.36.36,0,0,0-.35-.17c-.13.05-.17.3-.16.44S467.79,378.77,468,378.71Z" fill="#dbe1e9"/><path d="M456.92,386.27c.06.07.13.19.23.17s.07-.14.12-.22-.17-.12-.24-.12S456.91,386.25,456.92,386.27Z" fill="#dbe1e9"/><path d="M482.92,392.11a.25.25,0,0,0-.22.33c0,.19.14.28.34.24s.28-.15.23-.35S483.12,392.06,482.92,392.11Z" fill="#dbe1e9"/><path d="M460.83,392.33c0-.15.33-.8-.15-1-1-.46-1.19.55-1.53.51s-.86-.53-1.35-.63c-.7-.15-1.41.1-1.49.85a1.36,1.36,0,0,0,.21.94,1.09,1.09,0,0,0-.53,1.1,1,1,0,0,0,.46.58,1.31,1.31,0,0,0,1.77-.54,7.23,7.23,0,0,0-.26-.68c.46-.2.55-.75,1-.5s0,.72.87,1.12,1.7-.08,1.62-.74S460.81,392.49,460.83,392.33Z" fill="#dbe1e9"/><path d="M484.11,387.48c-.35-.17-.66-.49-1-.38a.67.67,0,0,0-.44.41c-.08.17-.25.31-.23.62a1.47,1.47,0,0,0,.61,1.1,1.09,1.09,0,0,0,1.13,0,.91.91,0,0,0,.41-.84A1.09,1.09,0,0,0,484.11,387.48Z" fill="#dbe1e9"/><path d="M480.22,390.64a.35.35,0,0,0,0,.45.52.52,0,0,0,.54,0c.13-.1.06-.37-.05-.49A.38.38,0,0,0,480.22,390.64Z" fill="#dbe1e9"/><path d="M487.72,391c-.17,0-.38-.32-.19-.35s.32-.23.25-.71a.72.72,0,0,0-.79-.72,1.07,1.07,0,0,0-1,1.14c0,.58.36.66.35,1s.2.51.59.62,1,.26,1.12-.28S487.89,391.06,487.72,391Z" fill="#dbe1e9"/><path d="M488.07,382.64c-.51.09-.68.27-.75.79a.06.06,0,0,1,0,0c-.1-.13-.49-.12-.63,0s-.3.59-.17.72a.23.23,0,0,0,.15.06,3.06,3.06,0,0,0-.37.35.45.45,0,0,0,.33.77c.48,0,1,.05,1.44-.37,0-.21,0-.45,0-.68.53-.35.85-.88.68-1.21A.63.63,0,0,0,488.07,382.64Z" fill="#dbe1e9"/><path d="M471.16,393.59a.62.62,0,0,0-.38.81.59.59,0,0,0,.78.41.71.71,0,0,0,.5-.85A.68.68,0,0,0,471.16,393.59Z" fill="#dbe1e9"/><path d="M450.57,378.61a1.15,1.15,0,0,0-1.46.72,1.51,1.51,0,0,0,.84,1.81,1.56,1.56,0,0,0,1.71-.91C451.9,379.59,451.43,378.9,450.57,378.61Z" fill="#dbe1e9"/><path d="M451.05,376.17a.94.94,0,0,0,.54,1.18,1.42,1.42,0,0,0,1.52-.9,1,1,0,0,0-2.06-.28Z" fill="#dbe1e9"/><path d="M440.46,374.53c-.12.37.32,1,.83,1.15a.84.84,0,0,0,1.1-.5,1.14,1.14,0,0,0-.6-1.37A1.21,1.21,0,0,0,440.46,374.53Z" fill="#dbe1e9"/><path d="M456.65,391a.89.89,0,0,0-.71-1.08c-.57-.19-.86,0-1.06.64s0,1,.41,1.14A1.59,1.59,0,0,0,456.65,391Z" fill="#dbe1e9"/><path d="M457.78,380.75a.82.82,0,0,0,.84-.42c.24.23.55.37.74.29s.42-.73.3-1.07a.65.65,0,0,0-.89-.36l-.14.08-.18-.09a.94.94,0,0,0-1.17.42A1.08,1.08,0,0,0,457.78,380.75Z" fill="#dbe1e9"/><path d="M431.32,387.48a.72.72,0,0,0-.5-.84.77.77,0,0,0-.91.54.76.76,0,0,0,.53.9A.82.82,0,0,0,431.32,387.48Z" fill="#dbe1e9"/><path d="M430.21,372.35c-.22.36.34,1.12.64,1.06s.58-1,.25-1.21A.7.7,0,0,0,430.21,372.35Z" fill="#dbe1e9"/><path d="M455.36,370.78c.16.06.35-.11.4-.22s0-.5-.14-.55-.43.22-.45.34S455.19,370.73,455.36,370.78Z" fill="#dbe1e9"/><path d="M466.59,385.53c0,.14,0,.42.2.51s.37-.24.36-.32,0-.33-.24-.39A.25.25,0,0,0,466.59,385.53Z" fill="#dbe1e9"/><path d="M443.79,385.27c.08-.24.27-.49.62-.33s.95,0,1.24-.77-.33-1.59-.9-1.45-.63.5-.82.4-.45-.52-.82-.38c-.18.06-.3.39-.35.72-.2-.11-.5-.11-.61.07a.71.71,0,0,0,0,.62c.1.14.52.39.71.28.13.19.26.42.05.6s-.81.31-.92.73a2.84,2.84,0,0,0-.16,1.35c-.74,0-.75-.57-1.47-.63a1,1,0,0,0-.36.07,1.36,1.36,0,0,0-.33.22,1.52,1.52,0,0,0-.5-.22c-.81-.21-1.41.08-1.59.76a2.7,2.7,0,0,0,0,.28c-.14-.16-.31-.26-.43-.22-.28.1-.47.9-.15,1.1a.67.67,0,0,0,.76-.14,1.14,1.14,0,0,0,.7.6,1.39,1.39,0,0,0,1.55-.67,5.85,5.85,0,0,0,1.07.58,1.36,1.36,0,0,0,1.48-.64,1.13,1.13,0,0,0,.11-.53c.2-.07.38-.25.6-.29a.88.88,0,0,0,.76-.9C444,386,443.71,385.51,443.79,385.27Z" fill="#dbe1e9"/><path d="M455,385.12a.52.52,0,0,0,.73-.3c.24-.52.24-.94,0-1.07a1.15,1.15,0,0,0-1.13.36C454.43,384.35,454.67,384.94,455,385.12Z" fill="#dbe1e9"/><path d="M439.41,389.64c-.32.17-.64.32-1,.49s-.71.37-.71.86a.54.54,0,0,1-.21.35c-.58.46-.76.72-.57,1.13l-.09,0a.83.83,0,0,0-.18,1,.67.67,0,0,0,1,.12.8.8,0,0,0,.28-.4.5.5,0,0,0,.2-.11,1.72,1.72,0,0,1,1-.39,1.35,1.35,0,0,0,1.16-1.64,2.38,2.38,0,0,1,0-.45.68.68,0,0,0,0-1A.65.65,0,0,0,439.41,389.64Z" fill="#dbe1e9"/><path d="M433,376.75a1.24,1.24,0,0,0-.17-.33,1.2,1.2,0,0,0-.26-.21,1.5,1.5,0,0,0,.08-2.09,1.43,1.43,0,0,0-2-.24,1.2,1.2,0,0,0-.13,1.83,2,2,0,0,0,.89.73,1.17,1.17,0,0,0-.13.25,5.18,5.18,0,0,0-.26,1.18c-.17-.33-.43-1-1-1.26a2,2,0,0,0-2.15.91,2,2,0,0,0-.23,1.45,1.6,1.6,0,0,0,.2.42.83.83,0,0,0-.17.64.72.72,0,0,0,.66.49.8.8,0,0,0,.95.1.61.61,0,0,0,.19-.59c.5-.17,1-.52,1.15-.44s.33,1.21,1.13,1.45a1.44,1.44,0,0,0,1.74-.92,2.36,2.36,0,0,0-.47-1.92A3.08,3.08,0,0,0,433,376.75Z" fill="#dbe1e9"/><path d="M450.41,391.59a1.33,1.33,0,0,0,1.4-.95,1.41,1.41,0,0,0-.84-1.55,1.4,1.4,0,0,0-1.42.41,1.35,1.35,0,0,0-1.45.84,1.33,1.33,0,0,0,.92,1.72,1,1,0,0,0,1.25-.52Z" fill="#dbe1e9"/><path d="M452.16,392.73a1.12,1.12,0,0,0-1.38.86c-.14.57.43,1.28,1.18,1.47a1,1,0,0,0,1.2-.8C453.32,393.27,453.06,393.08,452.16,392.73Z" fill="#dbe1e9"/><path d="M452.81,380.7a.9.9,0,0,0,.67,1.2,1.1,1.1,0,0,0,1.48-.82,1.18,1.18,0,0,0-.66-1.43C453.77,379.46,453,380,452.81,380.7Z" fill="#dbe1e9"/><path d="M446.68,387.14c.4.1.85-.3,1-.85s-.09-1-.78-1.18a1,1,0,0,0-1.21.51A1.49,1.49,0,0,0,446.68,387.14Z" fill="#dbe1e9"/><path d="M458.35,386a1,1,0,0,0,.59,1c.43.1,1.38-.36,1.45-.71s-.39-1-1-1.14S458.5,385.37,458.35,386Z" fill="#dbe1e9"/><path d="M456.77,388.49a.57.57,0,0,0,.34-.08,1,1,0,0,0,0,.62c.12.37.85.61,1.35.44a.84.84,0,0,0,.59-1.06,1.15,1.15,0,0,0-1.24-.75.82.82,0,0,0-.53-.81c-.7-.15-1.22,0-1.32.47A1.2,1.2,0,0,0,456.77,388.49Z" fill="#dbe1e9"/><path d="M460.64,381.66a1,1,0,0,0,1-.46,1,1,0,0,0-.63-1,.7.7,0,0,0-.8.56A.78.78,0,0,0,460.64,381.66Z" fill="#dbe1e9"/><path d="M450.67,373a.84.84,0,0,0-.47-1c-.32-.1-.79.26-1,.86.08.11.18.39.36.48A.85.85,0,0,0,450.67,373Z" fill="#dbe1e9"/><path d="M459.6,383.07c-.05-.08-.08-.25-.17-.28-.35-.11-.5-.38-.7-.66-.08-.12-.47-.14-.65-.05a.8.8,0,0,0-.37.56c0,.14.19.37.35.46a5.47,5.47,0,0,0,1,.35C459.36,383.54,459.53,383.39,459.6,383.07Z" fill="#dbe1e9"/><path d="M453.31,387.07c-.57,0-.95.13-1,.41a1.2,1.2,0,0,0,.77.92c.27,0,.73-.41.77-.77S453.67,387.09,453.31,387.07Z" fill="#dbe1e9"/><path d="M446.86,368c-.11.42.12,1,.42,1.1s.77-.35.87-.69a.63.63,0,0,0-.51-.81A.59.59,0,0,0,446.86,368Z" fill="#dbe1e9"/><path d="M447.66,381.46a.67.67,0,0,0-.43-.87.73.73,0,0,0-.86.49.56.56,0,0,0,.05.4.34.34,0,0,0-.14,0,.69.69,0,0,0-.18,1,.53.53,0,0,0,.84.18.67.67,0,0,0,.29-.81A.58.58,0,0,0,447.66,381.46Z" fill="#dbe1e9"/><path d="M451.58,386.33c-.05-.43-.13-.85-.64-.82s-.59.42-.57.83A.77.77,0,0,0,451.58,386.33Z" fill="#dbe1e9"/><path d="M467.85,384.77c0,.35.9,1,1.27.83s.19-1.11-.23-1.26S467.89,384.42,467.85,384.77Z" fill="#dbe1e9"/><path d="M435.18,375.21a1.06,1.06,0,0,0,.73-.33.23.23,0,0,0,0-.2,1.12,1.12,0,0,0,.78-.21.6.6,0,0,0,0-.89c-.41-.48-.79-.64-1.08-.43a1.1,1.1,0,0,0-.27,1,2.06,2.06,0,0,0-.46.19C434.76,374.85,434.9,375.23,435.18,375.21Z" fill="#dbe1e9"/><path d="M463.15,380.81a.61.61,0,0,0,.79-.38.55.55,0,0,0-.42-.69.5.5,0,0,0-.65.33A.53.53,0,0,0,463.15,380.81Z" fill="#dbe1e9"/><path d="M443.14,370.54h-.22a.63.63,0,0,0-.46.62.9.9,0,0,0,.08.6c.31-.07.91.12,1.06-.23S443.28,370.83,443.14,370.54Z" fill="#dbe1e9"/><path d="M448.81,375.56c.3.12.48-.16.55-.44s-.12-.69-.41-.66-.75,0-.77.4S448.58,375.47,448.81,375.56Z" fill="#dbe1e9"/><path d="M462.61,376.58c.18-.1.16-.58.2-.89a.27.27,0,0,0-.23-.34.83.83,0,0,0-.83.66A.62.62,0,0,0,462.61,376.58Z" fill="#dbe1e9"/><path d="M435.8,387.38a1.32,1.32,0,0,0-1.73.72,1.1,1.1,0,0,0,0,.54.68.68,0,0,0-.59,0,.73.73,0,0,0-.49.79c.08.53.57.55,1,.69a1.73,1.73,0,0,0,.43-.79,1.07,1.07,0,0,0,.47.31,1.46,1.46,0,0,0,1.6-.9A1.08,1.08,0,0,0,435.8,387.38Z" fill="#dbe1e9"/><path d="M440.42,383.65a1.14,1.14,0,0,0-.53-1.26,1.24,1.24,0,0,0-1.41.74c-.09.33.3.82.79,1A.89.89,0,0,0,440.42,383.65Z" fill="#dbe1e9"/><path d="M433.31,393.36a.65.65,0,1,0-.21,1.29.66.66,0,0,0,.82-.39A.88.88,0,0,0,433.31,393.36Z" fill="#dbe1e9"/><path d="M449.17,384.25a.72.72,0,0,0,.71-.28V384a.38.38,0,0,0,.5.24c.26-.13.14-.41.09-.53a.44.44,0,0,0-.41-.13l-.07.07c.05-.36-.15-.55-.48-.64a.68.68,0,0,0-.86.47A.61.61,0,0,0,449.17,384.25Z" fill="#dbe1e9"/><path d="M440.42,385.94c.22,0,.62.06.71-.23s-.15-.58-.34-.76-.59,0-.69.32S440.15,385.9,440.42,385.94Z" fill="#dbe1e9"/><path d="M435.24,392.5a.72.72,0,0,0-.16-.68.69.69,0,0,0-1-.11.84.84,0,0,0,0,1.07.71.71,0,0,0,.63.17.47.47,0,0,0,.15.52c.33.23.83-.06.91-.53C435.8,392.74,435.51,392.54,435.24,392.5Z" fill="#dbe1e9"/><path d="M443.93,375.23c0,.22,0,.81.29.84s.68-.41.75-.62-.12-.58-.48-.66A.43.43,0,0,0,443.93,375.23Z" fill="#dbe1e9"/><path d="M447.81,374.34c.15-.26-.18-.72-.5-.7a1.09,1.09,0,0,0-.47.23c-.09.47.12.82.42.8A.77.77,0,0,0,447.81,374.34Z" fill="#dbe1e9"/><path d="M428.75,376.57c.29.11.68-.44.61-1s-.79-.52-1-.4S428.46,376.47,428.75,376.57Z" fill="#dbe1e9"/><path d="M437.37,371.08a1.09,1.09,0,0,0,0-.19,1.31,1.31,0,0,0,.83-.21.64.64,0,0,0,0-1c-.48-.57-.9-.67-1.31-.33a1.13,1.13,0,0,0-.11,1.26.7.7,0,0,0-.14.17c-.06.14-.12.55.16.68S437.33,371.22,437.37,371.08Z" fill="#dbe1e9"/><path d="M455.75,372.29a.34.34,0,0,0-.19-.34c-.12,0-.31.14-.38.26s0,.39.17.45S455.7,372.42,455.75,372.29Z" fill="#dbe1e9"/><path d="M441.43,380.57c.32-.58,0-1.05.1-1.16s.73-.45.48-.91c-.54-1-1.28-.27-1.53-.51s-.38-.92-.72-1.3a1.1,1.1,0,0,0-1.71-.19,1.66,1.66,0,0,0-.31.47.59.59,0,0,0-.29.13,1.53,1.53,0,0,0-.2,1.66,1.06,1.06,0,0,0,1.41.1.74.74,0,0,0,.21-.25c.34,0,.62-.18.78.18.27.6-.4.59,0,1.41,0,.06.07.1.1.15a.68.68,0,0,0,.08.9.58.58,0,0,0,.87,0,.7.7,0,0,0,.2-.38A.69.69,0,0,0,441.43,380.57Z" fill="#dbe1e9"/><path d="M463,390.3a1.14,1.14,0,0,0,.14-1c-.19-.33-.25-.78-.57-.88a.66.66,0,0,0-.6.07c-.17.09-.38.1-.55.36a1.43,1.43,0,0,0-.16,1.25,1.08,1.08,0,0,0,.91.67A.94.94,0,0,0,463,390.3Z" fill="#dbe1e9"/><path d="M458.16,389.52a.36.36,0,0,0-.27.36.5.5,0,0,0,.41.35c.17,0,.27-.26.25-.42S458.34,389.47,458.16,389.52Z" fill="#dbe1e9"/><path d="M468.31,389c.64,0,1.21-.22,1.27-.58a.6.6,0,0,0-.16-.55,1.45,1.45,0,0,0,.07-.89c-.19-.65-1-.93-1.84-.65a1.14,1.14,0,0,0-.76,1.44,1.29,1.29,0,0,0,.17.33l-.37,0a.45.45,0,0,0-.19.82c.41.25.79.65,1.38.56Z" fill="#dbe1e9"/><path d="M448.71,387.75a.7.7,0,0,0,.9-.38.67.67,0,0,0-.5-.83.6.6,0,0,0-.78.42A.57.57,0,0,0,448.71,387.75Z" fill="#dbe1e9"/><path d="M433.67,372.12c.35.24.94.17,1-.21a1.18,1.18,0,0,1,.89-.93,1.07,1.07,0,0,0,.43-1.18.84.84,0,0,0-.3-.29.47.47,0,0,0-.22-.27.72.72,0,0,0-.69,0l-.17,0c-.3.11-.74.23-.67.64a1.64,1.64,0,0,1-.45,1.31A.56.56,0,0,0,433.67,372.12Z" fill="#dbe1e9"/><path d="M428.58,353.52a1.66,1.66,0,0,0,2,.39A1.27,1.27,0,0,0,431,353l.65,0a.59.59,0,0,0,.86-.37.76.76,0,0,0-.5-.93,2,2,0,0,1-.65-.39,1,1,0,0,0-1.12-.41c-.21.07-.42.44-.52.8a1.05,1.05,0,0,0-.63.17A1.31,1.31,0,0,0,428.58,353.52Z" fill="#dbe1e9"/><path d="M438.63,357a1.18,1.18,0,0,0,.13,1.5c.35.41.84.39,1.35-.07a1,1,0,0,0,.11-1.15A1.63,1.63,0,0,0,438.63,357Z" fill="#dbe1e9"/><path d="M445.73,378.71a1,1,0,0,0-1.21-.29,1.28,1.28,0,0,0-.34,1,.7.7,0,0,0-.5.5c-.17.45,0,1.09.33,1.23.68.27,1.17-.33,1.4-.65a.36.36,0,0,0,0-.35.47.47,0,0,0,.12-.07A.93.93,0,0,0,445.73,378.71Z" fill="#dbe1e9"/><path d="M440,371.25c-.79-.17-1.11-.09-1.28.32a.68.68,0,0,0,.19.82.78.78,0,0,0,1,.09C440.31,372.1,440.14,371.66,440,371.25Z" fill="#dbe1e9"/><path d="M435.53,360.69a.71.71,0,0,0,.62.68.53.53,0,0,0,.66-.32c.22-.48-.05-.79-.43-1.11C436,360.11,435.5,360.17,435.53,360.69Z" fill="#dbe1e9"/><path d="M432.58,341.92a.7.7,0,0,0,.62.67.54.54,0,0,0,.67-.31c.21-.49-.06-.79-.43-1.12C433,341.34,432.55,341.39,432.58,341.92Z" fill="#dbe1e9"/><path d="M451.35,363.24a.54.54,0,0,0,.14-.85.67.67,0,0,0-1-.16.7.7,0,0,0-.16.89A.68.68,0,0,0,451.35,363.24Z" fill="#dbe1e9"/><path d="M441.33,372.18a1.07,1.07,0,0,0,.43.71c.48.25.67-.21.95-.54-.24-.47-.49-.83-1-.67A.66.66,0,0,0,441.33,372.18Z" fill="#dbe1e9"/><path d="M446,364.3c.15.19.59.13.89-.12a.38.38,0,0,0,.06-.62.56.56,0,0,0-.79-.16A.74.74,0,0,0,446,364.3Z" fill="#dbe1e9"/><path d="M448.81,377.37c.17.25.9.22,1,0s0-.48-.14-.7a.41.41,0,0,0-.68-.1C448.76,376.8,448.59,377.05,448.81,377.37Z" fill="#dbe1e9"/><path d="M438.66,385.55a1.34,1.34,0,0,0,.11-1.51,1,1,0,1,0-1.49,1.2A1.11,1.11,0,0,0,438.66,385.55Z" fill="#dbe1e9"/><path d="M430.32,343.48c.21-.11.11-.42.05-.47a.59.59,0,0,0-.43-.11c-.06,0-.15.29-.11.35S430.1,343.58,430.32,343.48Z" fill="#dbe1e9"/><path d="M441.52,365.77a1,1,0,0,0-.62.56.34.34,0,0,0,.25.45.71.71,0,0,0,.54-.27c.15-.13.33-.23.37-.44S441.81,365.68,441.52,365.77Z" fill="#dbe1e9"/><path d="M437.76,362.54a1.28,1.28,0,0,0-.51,2.48c.48.17,1.05-.42,1.31-1.07A1.26,1.26,0,0,0,437.76,362.54Z" fill="#dbe1e9"/><path d="M431.25,362.62a.82.82,0,0,0-.28-.94c-.48-.18-.37-.53-.49-.85a2.14,2.14,0,0,0-.62-.73s-.06,0-.08-.06a.57.57,0,0,0,.36-.37c0-.12-.06-.37-.23-.41h-.12c.48-.39.67-.91.43-1.25a1.16,1.16,0,0,0-1.42-.2,1,1,0,0,0-.2,1.31.89.89,0,0,0,1,.28.25.25,0,0,0-.07.12.65.65,0,0,0,.07.41l-.3-.11a4.34,4.34,0,0,0-.62-.16c-.68-.16-1.1,0-1.29.53a1.1,1.1,0,0,0,.63,1.41,12.09,12.09,0,0,1,1.82.95C430.28,362.89,431.05,362.94,431.25,362.62Z" fill="#dbe1e9"/><path d="M430.28,370.41c.05,0,.13-.05.15-.1.23-.55.72-.43,1.16-.48a.7.7,0,0,0,.64-1c0-.05,0-.1-.05-.14a.66.66,0,0,0,.32-.12A3,3,0,0,0,433,368l0,0-.62-.8a4.43,4.43,0,0,0-.61.27.75.75,0,0,0-.34.64.93.93,0,0,0-.69.2c-.28.2-.49.47-1,.25,0-.2,0-.48-.12-.6a1.24,1.24,0,0,0-.75-.4c-.34,0-.47.32-.46.66s0,.53,0,.79C428.41,369.66,429.68,370.61,430.28,370.41Z" fill="#dbe1e9"/><path d="M441,363.62a1.15,1.15,0,0,0,1.66.24A1.44,1.44,0,0,0,443,362a1.52,1.52,0,0,0-1.84-.21A1.27,1.27,0,0,0,441,363.62Z" fill="#dbe1e9"/><path d="M431.2,356.35c.2.83.66,1.32,1.16,1.21a1.42,1.42,0,0,0,.84-1.46c-.12-.57-.43-.68-1.6-.48-.12-.44-.19-.92-.8-.82a.72.72,0,0,0-.66.65.51.51,0,0,0,.12.41A8.24,8.24,0,0,0,431.2,356.35Z" fill="#dbe1e9"/><path d="M432.51,347.68a1.06,1.06,0,0,0-.29.5c-.24.05-.46.2-.44.4s.1.82.44.87a.41.41,0,0,0,.33-.16,1.16,1.16,0,0,0,1.42,0,1.08,1.08,0,0,0-1.46-1.57Z" fill="#dbe1e9"/><path d="M435.12,377.51a1.12,1.12,0,0,0,.36-.43.53.53,0,0,0,.17.08.48.48,0,0,0,.65-.43.89.89,0,0,0-.23-.65.72.72,0,0,0-.56.05,1.94,1.94,0,0,0-.27-.48,1.25,1.25,0,0,0-1.66-.12,1.26,1.26,0,0,0,1.54,2Z" fill="#dbe1e9"/><path d="M438.54,367a1.41,1.41,0,0,0-.44-.33.58.58,0,0,0,.16-.31A.44.44,0,0,0,438,366a.48.48,0,0,0-.4.23.46.46,0,0,0,.05.33,1.8,1.8,0,0,0-.41.11c-.47.22-.56.63-.08,1.23a12.6,12.6,0,0,0,1.31.68.6.6,0,0,0,.83-.36.65.65,0,0,0-.29-.86A2,2,0,0,1,438.54,367Z" fill="#dbe1e9"/><path d="M429.66,366.3a.9.9,0,0,0,.17-.28,1.21,1.21,0,0,0,.77.55,1.33,1.33,0,0,0,1.55-.95,1.93,1.93,0,0,0-1.19-1.68,1.26,1.26,0,0,0-1.28.74,1.16,1.16,0,0,0-1.18.21c-.46.35-.47.72,0,1.25A.85.85,0,0,0,429.66,366.3Z" fill="#dbe1e9"/><path d="M441.83,376.28c-.59.46-.81,1.09-.51,1.46a1.29,1.29,0,0,0,1.5.09,1.18,1.18,0,0,0,.07-1.34A.89.89,0,0,0,441.83,376.28Z" fill="#dbe1e9"/><path d="M442.89,382.64a1.47,1.47,0,0,0,.3-1.5.9.9,0,0,0-1.37-.05c-.39.31-.37.79,0,1.29A.76.76,0,0,0,442.89,382.64Z" fill="#dbe1e9"/><path d="M444.77,371.74a.82.82,0,0,0,0,1.08A1,1,0,0,0,446,373a1.26,1.26,0,0,0,.24-1.43C446,371.33,445.2,371.4,444.77,371.74Z" fill="#dbe1e9"/><path d="M433.12,351.8a.69.69,0,0,0-.29.94,1.15,1.15,0,0,0,1.41.3.79.79,0,0,0,.19-1.06A1,1,0,0,0,433.12,351.8Z" fill="#dbe1e9"/><path d="M433.39,359.13a1.5,1.5,0,0,0-.05,1.37c.22.31.6.3,1-.05s.57-.73.3-1.07A.87.87,0,0,0,433.39,359.13Z" fill="#dbe1e9"/><path d="M436.5,380.43a.94.94,0,0,0-1.07-.34.9.9,0,0,0-1.32.65c-.13.56.08,1,.51,1.11a1.49,1.49,0,0,0,1.13-.37,1,1,0,0,0,.66-.16A.61.61,0,0,0,436.5,380.43Z" fill="#dbe1e9"/><path d="M448.16,388.6a.7.7,0,0,0,.09-1,.73.73,0,0,0-1-.07.71.71,0,0,0-.16,1A.75.75,0,0,0,448.16,388.6Z" fill="#dbe1e9"/><path d="M438.83,373.75a.74.74,0,0,0-.1,1.11.64.64,0,0,0,.95,0c.23-.24.47-.51.26-.77C439.55,373.61,439.12,373.52,438.83,373.75Z" fill="#dbe1e9"/><path d="M436.86,354.8a.77.77,0,0,0-.12,1,.81.81,0,0,0,1.07.07.64.64,0,0,0,.08-.89A.69.69,0,0,0,436.86,354.8Z" fill="#dbe1e9"/><path d="M446,376.21a.75.75,0,0,0-.11,1,.1.1,0,0,0,.05,0,1.06,1.06,0,0,0-.12.2,1.13,1.13,0,0,0,.78,1.1.85.85,0,0,0,.9-.47,1.13,1.13,0,0,0-.33-1.32.68.68,0,0,0-.14-.37A.69.69,0,0,0,446,376.21Z" fill="#dbe1e9"/><path d="M451,382.94a.76.76,0,0,0,.07-1,.83.83,0,0,0-1-.07.62.62,0,0,0-.12.88A.75.75,0,0,0,451,382.94Z" fill="#dbe1e9"/><path d="M450.14,370.23a.65.65,0,0,0,0-1c-.29-.35-.64-.45-.86-.23a1.13,1.13,0,0,0-.14,1.19A.7.7,0,0,0,450.14,370.23Z" fill="#dbe1e9"/><path d="M443.25,366.43a.61.61,0,0,0,.81.15c.25-.14.3-.89.06-1a.78.78,0,0,0-.7,0A.55.55,0,0,0,443.25,366.43Z" fill="#dbe1e9"/><path d="M428.71,347.3c.19-.18,0-.76-.09-1s-.58-.23-.8,0-.31.52-.06.71S428.53,347.47,428.71,347.3Z" fill="#dbe1e9"/><path d="M440.12,364.45a.58.58,0,0,0-.55-.08.73.73,0,0,0-.36.54c0,.49.44.49.81.51C440.31,365.1,440.44,364.77,440.12,364.45Z" fill="#dbe1e9"/><path d="M443.77,368.22c-.23.22-.12.43,0,.63s.58.32.76,0,.29-.41.2-.61S444,368,443.77,368.22Z" fill="#dbe1e9"/><path d="M440.12,354.42c.22-.16-.06-.77-.19-1a.41.41,0,0,0-.69,0c-.21.23-.34.5-.08.71S439.91,354.59,440.12,354.42Z" fill="#dbe1e9"/><path d="M434.84,395c-.15.19-.48.68-.25.93s.66.05.85,0a.45.45,0,0,0,.23-.67C435.5,394.9,435,394.73,434.84,395Z" fill="#dbe1e9"/><path d="M446.19,353.9c.15-.12.09-.67,0-.89s-.45-.3-.77-.09a.41.41,0,0,0-.06.69C445.53,353.76,446.05,354,446.19,353.9Z" fill="#dbe1e9"/><path d="M437.72,359c.15-.13,0-.71-.05-.75s-.63-.2-.73-.05a.71.71,0,0,0,0,.65C437.07,359,437.58,359.1,437.72,359Z" fill="#dbe1e9"/><path d="M426.89,350.6c-.13.18-.43.67-.26.87s.74-.06.9-.2.05-.45,0-.62A.33.33,0,0,0,426.89,350.6Z" fill="#dbe1e9"/><path d="M451.8,359c.14-.07.2-.46.12-.61s-.53-.39-.68-.28-.12.6,0,.68S451.66,359.12,451.8,359Z" fill="#dbe1e9"/><path d="M453,378c-.27.21-.13.75,0,1s.83.52,1.11.31,0-1-.22-1.23A.77.77,0,0,0,453,378Z" fill="#dbe1e9"/><path d="M451.79,367.12a.58.58,0,0,0-.11.44c0,.09.41.26.51.19s0-.44,0-.56A.4.4,0,0,0,451.79,367.12Z" fill="#dbe1e9"/><path d="M448.73,368.32c.1-.11.3-.33.19-.45a.48.48,0,0,0-.48-.08c-.1.06-.32.41-.2.53A.48.48,0,0,0,448.73,368.32Z" fill="#dbe1e9"/><path d="M453.45,373.39a.45.45,0,0,0,.06-.45.45.45,0,0,0-.42-.08c-.1.07-.33.37-.19.52A.52.52,0,0,0,453.45,373.39Z" fill="#dbe1e9"/><path d="M441.05,350.34c.09-.08.2-.32.1-.46a.41.41,0,0,0-.47-.06c-.1.07-.3.4-.2.53S441,350.42,441.05,350.34Z" fill="#dbe1e9"/><path d="M441.54,345c.07,0,.24-.31.12-.47s-.42,0-.53.06a.36.36,0,0,0-.06.39C441.15,345.11,441.41,345.08,441.54,345Z" fill="#dbe1e9"/><path d="M451.52,369.36c.06,0,0-.21,0-.25s-.17-.1-.24,0a.2.2,0,0,0,0,.29A.2.2,0,0,0,451.52,369.36Z" fill="#dbe1e9"/><path d="M436.49,352.91a.21.21,0,0,0,.28,0c.05,0,0-.22,0-.26a.18.18,0,1,0-.27.25Z" fill="#dbe1e9"/><path d="M444.67,361.12c.24-.13,0-.43,0-.55s-.32-.12-.35-.07a.55.55,0,0,0-.12.44A.39.39,0,0,0,444.67,361.12Z" fill="#dbe1e9"/><path d="M434.05,366.08h0a1.29,1.29,0,0,0,.28,1.15,1.34,1.34,0,0,0,1.75,0,1.1,1.1,0,0,0,.15-1.48,1.74,1.74,0,0,0-1.64-.3.74.74,0,0,0,.05-.54c-.14-.38.8-.45.63-1s.38-.94.11-1.56-.93-1.06-1.38-.64a2.35,2.35,0,0,0-.61,1.48c-.08.43.43.67,0,.93s-1.32.91-.73,1.68A1.16,1.16,0,0,0,434.05,366.08Z" fill="#dbe1e9"/><path d="M428,329.8a1.36,1.36,0,0,0,1,1.34c.36.07.78-.33.84-.79a.92.92,0,0,0-.78-1.14C428.55,329.13,428,329.42,428,329.8Z" fill="#dbe1e9"/><path d="M439.3,338.53a.7.7,0,0,0,.63,0,.64.64,0,0,0,0-1,.62.62,0,0,0-.83.44A.6.6,0,0,0,439.3,338.53Z" fill="#dbe1e9"/><path d="M429,342.31a.66.66,0,0,0,.48-.68c-.09-.36-.95-.5-1.1-.24S428.67,342.38,429,342.31Z" fill="#dbe1e9"/><path d="M430.45,326.15c.3.08.82-.43.76-.66s-.33-.35-.57-.43a.42.42,0,0,0-.58.38C430,325.75,430.07,326.06,430.45,326.15Z" fill="#dbe1e9"/><path d="M428.34,339a1.34,1.34,0,0,0-.92-1.2,1,1,0,1,0-.31,1.9C427.67,339.78,428.28,339.44,428.34,339Z" fill="#dbe1e9"/><path d="M429.6,335.18a.67.67,0,0,0,.43.45c.16,0,.65-.05.71-.27s-.32-.53-.5-.62S429.55,334.9,429.6,335.18Z" fill="#dbe1e9"/><path d="M437.31,346c-.09.33.32.47.46.45s.92-.19,1-.45-.58-.56-.68-.52C437.79,345.56,437.4,345.64,437.31,346Z" fill="#dbe1e9"/><path d="M432,337.81c-.62.89-1.06.26-1.71.75a1.18,1.18,0,0,0-.23.29.88.88,0,0,0,.89,1.33,5.39,5.39,0,0,0,1.42-.31,1.39,1.39,0,0,0,.68-1.46C432.93,338.1,432.54,337.51,432,337.81Z" fill="#dbe1e9"/><path d="M434.1,343a.92.92,0,0,0,.86,1.09c.58.08,1.08-.21,1.12-.66a1.35,1.35,0,0,0-1-1.35C434.65,342,434.15,342.46,434.1,343Z" fill="#dbe1e9"/><path d="M429.55,334a1.44,1.44,0,0,0-.77-1.31c-.53-.1-.94.24-1,.87s.25.84.88.94S429.47,334.4,429.55,334Z" fill="#dbe1e9"/><path d="M429.75,347.47a.75.75,0,0,0,.74-.66.67.67,0,0,0-.63-.74.7.7,0,0,0-.84.61A.84.84,0,0,0,429.75,347.47Z" fill="#dbe1e9"/><path d="M436.62,335.59a.75.75,0,0,0,.84-.64.7.7,0,0,0-.63-.83.72.72,0,0,0-.77.59A.7.7,0,0,0,436.62,335.59Z" fill="#dbe1e9"/><path d="M428.18,328a.82.82,0,0,0,.85-.66.65.65,0,0,0-.54-.72.7.7,0,0,0-.88.57A.77.77,0,0,0,428.18,328Z" fill="#dbe1e9"/><path d="M435.17,328.08a.82.82,0,0,0-.8.62.63.63,0,0,0,.5.74.7.7,0,1,0,.3-1.36Z" fill="#dbe1e9"/><path d="M432.48,344.87a.67.67,0,0,0-.82.52.83.83,0,0,0,.52.86.67.67,0,0,0,.8-.56A.64.64,0,0,0,432.48,344.87Z" fill="#dbe1e9"/><path d="M431.85,331.78a.54.54,0,0,0,.75-.44.66.66,0,0,0-.47-.85.68.68,0,0,0-.79.45A.71.71,0,0,0,431.85,331.78Z" fill="#dbe1e9"/><path d="M427.29,343.92c.41-.08.37-.47.36-.79-.32-.29-.66-.38-1,0a.56.56,0,0,0-.05.53A.91.91,0,0,0,427.29,343.92Z" fill="#dbe1e9"/><path d="M429.58,357.34c.34.06.64-.14.6-.46a1.79,1.79,0,0,0-.27-.59.67.67,0,0,0-.78.6C429.11,357.22,429.33,357.3,429.58,357.34Z" fill="#dbe1e9"/><path d="M434.65,324.55c.19.08,1-.16,1-.5s-.68-.73-1-.77a.76.76,0,0,0-.74.52C433.89,324.13,434.36,324.44,434.65,324.55Z" fill="#dbe1e9"/><path d="M426.15,316.33c-.07,0-.31.13-.31.19s.1.36.21.41.48-.09.5-.2S426.29,316.38,426.15,316.33Z" fill="#dbe1e9"/><path d="M436.84,349.57c-.08,0-.3.05-.31.19a.45.45,0,0,0,.2.4c.1,0,.46,0,.51-.19S437,349.62,436.84,349.57Z" fill="#dbe1e9"/><path d="M430.84,320.44c.21,0,.4-.24.42-.35a.46.46,0,0,0-.25-.38.45.45,0,0,0-.37.22C430.61,320.05,430.64,320.43,430.84,320.44Z" fill="#dbe1e9"/><path d="M435.33,357.91c-.19-.05-.32.27-.36.4a.37.37,0,0,0,.22.33c.13,0,.29-.18.35-.31S435.52,358,435.33,357.91Z" fill="#dbe1e9"/><path d="M427.14,318.37c0-.06-.12-.18-.18-.18s-.19,0-.2.13a.2.2,0,0,0,.17.24A.22.22,0,0,0,427.14,318.37Z" fill="#dbe1e9"/><path d="M435.72,339.93c0-.06-.12-.18-.17-.18a.2.2,0,0,0-.21.13.21.21,0,0,0,.17.24A.22.22,0,0,0,435.72,339.93Z" fill="#dbe1e9"/><path d="M435.1,353.22a1.41,1.41,0,0,0-1.3,1.34,1.65,1.65,0,0,0,1.64,1.49c.56-.07.56-.81.3-1.13s-.14-.24,0-.64S435.85,353.24,435.1,353.22Z" fill="#dbe1e9"/><path d="M482.62,302.3h0l-.09,0Z" fill="#dbe1e9"/><path d="M747.72,314.08l-26.08-13.21L682.34,281l-5.12-2.59a7.77,7.77,0,0,0-2.66-1.08c-1.08-.1-2.23,0-3.31,0H564.93q-24.37,0-48.75.07l-44.59.08c-11.33,0-185-.21-185-.21a1.75,1.75,0,0,0-.81.19L213,313.93A1.83,1.83,0,0,0,212,316a1.8,1.8,0,0,0,1.77,1.39H285.5v80.81a1.82,1.82,0,0,0,1.8,1.82H680.18a1.81,1.81,0,0,0,1.81-1.82V318.85h3.12c11.87-.05,23.75,0,35.62-.17l21.9-.24,1.23,0a2.7,2.7,0,0,0,1.48-.47l.09.05C748,319.31,750.32,315.4,747.72,314.08Zm-73.94-32.43a2.69,2.69,0,0,0,.29.16C673.56,281.71,673.17,281.3,673.78,281.65ZM221.44,313.74,287,280.87H416.07l-68.72,32.87Zm502.94-.65c-11.5,0-23,.12-34.51.21-12.94.09-25.91.24-38.85.8-10.84.47-21.69,1-32.53,1.41-5.18.19-10.37.21-15.54.45h-.22a.6.6,0,0,0,0,1.19h.88l2.52,0,9.31.17c10.34.18,20.68.61,31,.94q15.94.51,31.9.52v77.52h-149a.84.84,0,0,0-.15-.3.74.74,0,0,0-1.05-.07,2,2,0,0,1-.68.33l-.17,0h-15.5a1.1,1.1,0,0,0-.11-1.28.6.6,0,0,0-.89.05.94.94,0,0,0-.1,1.23H505.2a1,1,0,0,0-.3-.53c-.27-.22-.59-.16-.87.16a1.94,1.94,0,0,0-.26.37h-2.64l.06,0a1.28,1.28,0,0,0-.26-1.35.64.64,0,0,0-.95.14c-.44.52-.49.91-.2,1.25h-1.39a11.48,11.48,0,0,0,.44-1.33.62.62,0,0,0-.49-.77.66.66,0,0,0-.8.43,1.94,1.94,0,0,1-.31.54,1,1,0,0,0-.19,1.13h-1.67a1.91,1.91,0,0,0-1.14-.67,1.2,1.2,0,0,0-1.05.51,1.34,1.34,0,0,0-.69,0,.68.68,0,0,0-.23.14h-1.43s0-.05,0-.07c-.35-.36-.76-.23-1.16.06h-.84c.35-.42.25-.89-.28-1.32a.94.94,0,0,0-1.16.07,1.78,1.78,0,0,0-.19,1.26h-2.59a1.25,1.25,0,0,0,.07-.56,1.29,1.29,0,0,0,.48.06c.31-.05.4-.35.29-.64s-.24-.5-.59-.41a.71.71,0,0,0-.44.78,1.69,1.69,0,0,0-.74.39.36.36,0,0,0-.12.38h-7.84a1.26,1.26,0,0,0-1.51-1.82,16.91,16.91,0,0,1-1.49,1.82h-5.86l-.21-.18s0-.08-.08-.13h-.09c-.15-.12-.28-.22-.31-.33s-.08-.56.3-.63.75-.58.54-1.36-1.21-1.09-1.58-.64-.21.79-.42.82-.68-.15-.89.17a.42.42,0,0,0,0,.3l-.08-.11c-.12-.12-.12-.48,0-.39s.4,0,.63-.42a.72.72,0,0,0-.22-1,1,1,0,0,0-1.44.34c-.33.49-.1.75-.34,1.05s-.14.53.11.85.64.8,1.07.44a.62.62,0,0,0,.28-.49,2.38,2.38,0,0,0,.55.89c.17.09.72.15.63.55a1.13,1.13,0,0,1-.13.33h-2.74a.92.92,0,0,0-1.78,0h-1.05l0-.08c.07-.26.1-.54-.23-.68a.74.74,0,0,0-.89.49l.21.27H457a1.43,1.43,0,0,0-.67-.92,1.24,1.24,0,0,0-1.57.47,1.45,1.45,0,0,0-.2.45h-1.45a3.15,3.15,0,0,0-.79-1.1,1.07,1.07,0,0,0-.33-.16c-.8-.16-1.33.39-1.11,1.14,0,0,0,.08,0,.12h-2.31a.53.53,0,0,0-.46,0h-4a1.62,1.62,0,0,0,.43-.75c.09-.66-.66-1-.66-1.2s1-.69,1.07-1.51a2,2,0,0,0-1.42-1.81.26.26,0,0,0,0-.2c-.05,0-.17-.1-.24,0a.21.21,0,0,0-.06.19,1.78,1.78,0,0,0-1.18.2,1.86,1.86,0,0,0-.68.87,1.12,1.12,0,0,0-1.08.23.91.91,0,0,0-.08,1.37.9.9,0,0,0,1.27.27,1.07,1.07,0,0,0,.26-.4c.27.31.55.56.52.7s-1.07.65-1.09,1.48a1.29,1.29,0,0,0,.12.6h-1.57a1.08,1.08,0,0,0,.42-1.13,1.11,1.11,0,0,0-1.39-1c-.4.16-.64.65-.93.66s.26-.31-.66-.59-2,.8-1.16,1.61c.05.06-.1.24-.23.49h-1.66a1.09,1.09,0,0,0-.18-.19,1.21,1.21,0,0,0-1.12-.17,1.87,1.87,0,0,0-1-1.48,1.69,1.69,0,0,0-1.64.93,1,1,0,0,0,.13.91H427c0-.8,0-1.59,0-2.39a.64.64,0,0,0,.87.14.62.62,0,0,0,.18-.94.74.74,0,0,0-1-.18h0c0-.89,0-1.78,0-2.67l0,0,.1-.09,0,0a2.51,2.51,0,0,0,.33.53,1.29,1.29,0,0,0,.89.35,1.15,1.15,0,0,0,.09.44,1.7,1.7,0,0,0-.11.36c-.16.87,0,1.24.6,1.47a1,1,0,0,0,.63.41,1.17,1.17,0,0,0,1.13-.53.88.88,0,0,0,0-.71l.06-.19a.51.51,0,0,0,0-.17,1.45,1.45,0,0,0,.78.78c.37.12.85-.22,1-.7a1,1,0,0,0-.73-1.25,1,1,0,0,0-1,.25,1.09,1.09,0,0,0-.2-.72,1.12,1.12,0,0,1-1.12-1.43,1.08,1.08,0,0,0-.35-.32,1.22,1.22,0,0,0-1.34-.67,1.4,1.4,0,0,0-.74.74l-.12-.06v-2.63a1.39,1.39,0,0,0,.83.3,1.46,1.46,0,0,0,1.13-.55c.35-.36.87-.37,1-.84a2.4,2.4,0,0,0,.07-1.32,1.2,1.2,0,0,0,.68.54.79.79,0,0,0,.86-.52,1.68,1.68,0,0,0,.38.37l.48.26a2.28,2.28,0,0,0,.19,1.27,2.5,2.5,0,0,0-.22.24,1.08,1.08,0,0,0-.13.88.57.57,0,0,0-.75.41,1.41,1.41,0,0,0,0,1.07.74.74,0,0,0-.83,0,.61.61,0,0,0-.13.89.66.66,0,0,0,.95.22.71.71,0,0,0,.21-.88.75.75,0,0,0,.17.1,1.24,1.24,0,0,0,1.19-.63.6.6,0,0,0-.06-.38,1.28,1.28,0,0,0,1.28-.76,1.57,1.57,0,0,0,.08-.72,1,1,0,0,0,.44.25,1.44,1.44,0,0,0,1.55-1,1.15,1.15,0,0,0-.69-1.41,1.88,1.88,0,0,0-.53-.06.47.47,0,0,0,.26-.6.64.64,0,0,0-.64-.54c-.57,0-.62.46-.69.88l-.73.06c0-.34-.08-.64-.11-.95a4,4,0,0,0-.7-.29,1.51,1.51,0,0,0-.94.28.71.71,0,0,0-.41-.45,1.3,1.3,0,0,0-1.37.66.64.64,0,0,0,0,.2.93.93,0,0,0-.23-.21,1.77,1.77,0,0,0-.31-.3,1.71,1.71,0,0,0-1.58-.35.75.75,0,0,0-.41.37,1.33,1.33,0,0,0-.37-.09v-1.9l0-.06a.75.75,0,0,0,0-.47.9.9,0,0,0,.25-1.07,1.08,1.08,0,0,0-.28-.23c0-.42,0-.85,0-1.28a1.89,1.89,0,0,0,0-.75c0-.75,0-1.51,0-2.26.63-.33.65-.78,1.16-.92s.67-.54.65-1.18c0-.09,0-.19,0-.29.21.13.49.15.61,0a.76.76,0,0,0,0-.66.4.4,0,0,0-.7-.09l-.07.07a.78.78,0,0,0-.82-.55.91.91,0,0,0-.87.5c0-.47,0-.94,0-1.4.11-.12.23-.31.19-.45s-.1-.11-.19-.14c0-1.14,0-2.28,0-3.42L427,366c.27-.2.43-.78.21-1l-.4-.36c0-2.72-.08-5.53-.15-8.37h.17a.83.83,0,0,0-.11.45.59.59,0,0,0,.37.41c.44.07.66-.21.76-.65-.21-.23-.42-.49-.72-.42a.46.46,0,0,0,.06-.26,2,2,0,0,0-.27-.59.65.65,0,0,0-.28,0c-.11-4.65-.26-9.4-.42-14.15a1,1,0,0,0,.59-.94.78.78,0,0,0-.65-.84l-.15-4.44a.76.76,0,0,0,.34.11.58.58,0,0,0,.68-.55.78.78,0,0,0-.6-.79.62.62,0,0,0-.46.15c-.16-4.62-.31-9.16-.44-13.49a.71.71,0,0,0,.38.27.69.69,0,0,0,.74-.64.66.66,0,0,0-.64-.74,1,1,0,0,0-.52.05c-.3-8-1.4-7.26-2.15-6.35s-.9,10.95-.9,19.53c0,16.24-.24,32.47,0,47.29.07,4.32.31,11.87.39,16.64H289.13v-79h58.63a1.89,1.89,0,0,0,.78-.17l72.92-34.88,18.71,9.2,38.56,19q7.32,3.6,14.66,7.16l4.22,2.06a7.28,7.28,0,0,0,2.13.86,21,21,0,0,0,2.51,0h26.61c11.24,0,22.48.29,33.72.2.2,0,.41,0,.62,0a1.17,1.17,0,0,0,0-2.33c-9.6-.1-19.2-.16-28.8-.33l-33.93-.6-.37,0c.3.11.57.35,0,0l-.07,0c-.15,0-.3,0-.32,0s.15-.08.26,0c-.9-.53-1.88-1-2.82-1.43q-6.44-3.27-12.89-6.52l-38-19L430,282.31c-.52-.26-1-.54-1.55-.81h3.26l30.3.09,42.42.08c16.1,0,32.21.09,48.32.09H673.61l.48,0,1,.52L709,299.52l26.78,13.58Z" fill="#dbe1e9"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 77e7f2834b080..012856ca9213c 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 import { i18n } from '@kbn/i18n';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -140,16 +139,42 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     );
 
     const getApmDataHelper = async () => {
-      const {
-        fetchObservabilityOverviewPageData,
-        getHasData,
-        createCallApmApi,
-      } = await import('./services/rest/apm_observability_overview_fetchers');
+      const { fetchObservabilityOverviewPageData, getHasData } = await import(
+        './services/rest/apm_observability_overview_fetchers'
+      );
+      const { hasFleetApmIntegrations } = await import(
+        './tutorial/tutorial_apm_fleet_check'
+      );
+
+      const { createCallApmApi } = await import(
+        './services/rest/createCallApmApi'
+      );
+
       // have to do this here as well in case app isn't mounted yet
       createCallApmApi(core);
 
-      return { fetchObservabilityOverviewPageData, getHasData };
+      return {
+        fetchObservabilityOverviewPageData,
+        getHasData,
+        hasFleetApmIntegrations,
+      };
     };
+
+    // Registers a status check callback for the tutorial to call and verify if the APM integration is installed on fleet.
+    pluginSetupDeps.home?.tutorials.registerCustomStatusCheck(
+      'apm_fleet_server_status_check',
+      async () => {
+        const { hasFleetApmIntegrations } = await getApmDataHelper();
+        return hasFleetApmIntegrations();
+      }
+    );
+
+    // Registers custom component that is going to be render on fleet section
+    pluginSetupDeps.home?.tutorials.registerCustomComponent(
+      'TutorialFleetInstructions',
+      () => import('./tutorial/tutorial_fleet_instructions')
+    );
+
     plugins.observability.dashboard.register({
       appName: 'apm',
       hasData: async () => {
@@ -163,11 +188,12 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     });
 
     const getUxDataHelper = async () => {
-      const {
-        fetchUxOverviewDate,
-        hasRumData,
-        createCallApmApi,
-      } = await import('./components/app/RumDashboard/ux_overview_fetchers');
+      const { fetchUxOverviewDate, hasRumData } = await import(
+        './components/app/RumDashboard/ux_overview_fetchers'
+      );
+      const { createCallApmApi } = await import(
+        './services/rest/createCallApmApi'
+      );
       // have to do this here as well in case app isn't mounted yet
       createCallApmApi(core);
 
diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
index ef61e25af4fc2..1b95c88a5fdc5 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
@@ -11,8 +11,6 @@ import {
 } from '../../../../observability/public';
 import { callApmApi } from './createCallApmApi';
 
-export { createCallApmApi } from './createCallApmApi';
-
 export const fetchObservabilityOverviewPageData = async ({
   absoluteTime,
   relativeTime,
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts b/x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts
new file mode 100644
index 0000000000000..8db8614d606a9
--- /dev/null
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { callApmApi } from '../services/rest/createCallApmApi';
+
+export async function hasFleetApmIntegrations() {
+  try {
+    const { hasData = false } = await callApmApi({
+      endpoint: 'GET /api/apm/fleet/has_data',
+      signal: null,
+    });
+    return hasData;
+  } catch (e) {
+    console.error('Something went wrong while fetching apm fleet data', e);
+    return false;
+  }
+}
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
new file mode 100644
index 0000000000000..8a81b7a994e76
--- /dev/null
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
@@ -0,0 +1,122 @@
+/*
+ * 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 { EuiButton } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup } from '@elastic/eui';
+import { EuiPanel } from '@elastic/eui';
+import { EuiCard } from '@elastic/eui';
+import { EuiImage } from '@elastic/eui';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { HttpStart } from 'kibana/public';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { APIReturnType } from '../../services/rest/createCallApmApi';
+
+interface Props {
+  http: HttpStart;
+  basePath: string;
+  isDarkTheme: boolean;
+}
+
+const CentralizedContainer = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
+
+type APIResponseType = APIReturnType<'GET /api/apm/fleet/has_data'>;
+
+function TutorialFleetInstructions({ http, basePath, isDarkTheme }: Props) {
+  const [data, setData] = useState<APIResponseType | undefined>();
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    async function fetchData() {
+      setIsLoading(true);
+      try {
+        const response = await http.get('/api/apm/fleet/has_data');
+        setData(response as APIResponseType);
+      } catch (e) {
+        console.error('Error while fetching fleet details.', e);
+      }
+      setIsLoading(false);
+    }
+    fetchData();
+  }, [http]);
+
+  if (isLoading) {
+    return (
+      <CentralizedContainer>
+        <EuiLoadingSpinner />
+      </CentralizedContainer>
+    );
+  }
+
+  // When APM integration is enable in Fleet
+  if (data?.hasData) {
+    return (
+      <EuiButton iconType="gear" fill href={`${basePath}/app/fleet#/policies`}>
+        {i18n.translate(
+          'xpack.apm.tutorial.apmServer.fleet.manageApmIntegration.button',
+          {
+            defaultMessage: 'Manage APM integration in Fleet',
+          }
+        )}
+      </EuiButton>
+    );
+  }
+  // When APM integration is not installed in Fleet or for some reason the API didn't work out
+  return (
+    <EuiPanel>
+      <EuiFlexGroup>
+        <EuiFlexItem grow={7}>
+          <EuiCard
+            display="plain"
+            textAlign="left"
+            title={i18n.translate('xpack.apm.tutorial.apmServer.fleet.title', {
+              defaultMessage: 'Elastic APM (beta) now available in Fleet!',
+            })}
+            description={i18n.translate(
+              'xpack.apm.tutorial.apmServer.fleet.message',
+              {
+                defaultMessage:
+                  'The APM integration installs Elasticsearch templates and Ingest Node pipelines for APM data.',
+              }
+            )}
+            footer={
+              <EuiButton
+                iconType="analyzeEvent"
+                color="secondary"
+                href={`${basePath}/app/integrations#/detail/apm-0.3.0/overview`}
+              >
+                {i18n.translate(
+                  'xpack.apm.tutorial.apmServer.fleet.apmIntegration.button',
+                  {
+                    defaultMessage: 'APM integration',
+                  }
+                )}
+              </EuiButton>
+            }
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={3}>
+          <EuiImage
+            src={`${basePath}/plugins/apm/assets/${
+              isDarkTheme
+                ? 'illustration_integrations_darkmode.svg'
+                : 'illustration_integrations_lightmode.svg'
+            }`}
+            alt="Illustration"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+}
+// eslint-disable-next-line import/no-default-export
+export default TutorialFleetInstructions;
diff --git a/x-pack/plugins/apm/server/routes/fleet.ts b/x-pack/plugins/apm/server/routes/fleet.ts
new file mode 100644
index 0000000000000..74ca8dc368dad
--- /dev/null
+++ b/x-pack/plugins/apm/server/routes/fleet.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 Boom from '@hapi/boom';
+import { i18n } from '@kbn/i18n';
+import { getApmPackgePolicies } from '../lib/fleet/get_apm_package_policies';
+import { createApmServerRoute } from './create_apm_server_route';
+import { createApmServerRouteRepository } from './create_apm_server_route_repository';
+
+const hasFleetDataRoute = createApmServerRoute({
+  endpoint: 'GET /api/apm/fleet/has_data',
+  options: { tags: [] },
+  handler: async ({ core, plugins }) => {
+    const fleetPluginStart = await plugins.fleet?.start();
+    if (!fleetPluginStart) {
+      throw Boom.internal(
+        i18n.translate('xpack.apm.fleet_has_data.fleetRequired', {
+          defaultMessage: `Fleet plugin is required`,
+        })
+      );
+    }
+    const packagePolicies = await getApmPackgePolicies({
+      core,
+      fleetPluginStart,
+    });
+    return { hasData: packagePolicies.total > 0 };
+  },
+});
+
+export const ApmFleetRouteRepository = createApmServerRouteRepository().add(
+  hasFleetDataRoute
+);
diff --git a/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts b/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts
index f1c08444d2e1e..fa2f80f073958 100644
--- a/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts
+++ b/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts
@@ -30,6 +30,7 @@ import { sourceMapsRouteRepository } from './source_maps';
 import { traceRouteRepository } from './traces';
 import { transactionRouteRepository } from './transactions';
 import { APMRouteHandlerResources } from './typings';
+import { ApmFleetRouteRepository } from './fleet';
 
 const getTypedGlobalApmServerRouteRepository = () => {
   const repository = createApmServerRouteRepository()
@@ -50,7 +51,8 @@ const getTypedGlobalApmServerRouteRepository = () => {
     .merge(anomalyDetectionRouteRepository)
     .merge(apmIndicesRouteRepository)
     .merge(customLinkRouteRepository)
-    .merge(sourceMapsRouteRepository);
+    .merge(sourceMapsRouteRepository)
+    .merge(ApmFleetRouteRepository);
 
   return repository;
 };
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 c6afd6a592fff..55adc756f31af 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -6,7 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from '../../../../../../src/plugins/home/server';
+import {
+  INSTRUCTION_VARIANT,
+  TutorialSchema,
+  InstructionSetSchema,
+} from '../../../../../../src/plugins/home/server';
 
 import {
   createNodeAgentInstructions,
@@ -22,7 +26,9 @@ import {
 } from '../instructions/apm_agent_instructions';
 import { CloudSetup } from '../../../../cloud/server';
 
-export function createElasticCloudInstructions(cloudSetup?: CloudSetup) {
+export function createElasticCloudInstructions(
+  cloudSetup?: CloudSetup
+): TutorialSchema['elasticCloud'] {
   const apmServerUrl = cloudSetup?.apm.url;
   const instructionSets = [];
 
@@ -37,7 +43,9 @@ export function createElasticCloudInstructions(cloudSetup?: CloudSetup) {
   };
 }
 
-function getApmServerInstructionSet(cloudSetup?: CloudSetup) {
+function getApmServerInstructionSet(
+  cloudSetup?: CloudSetup
+): InstructionSetSchema {
   const cloudId = cloudSetup?.cloudId;
   return {
     title: i18n.translate('xpack.apm.tutorial.apmServer.title', {
@@ -61,7 +69,9 @@ function getApmServerInstructionSet(cloudSetup?: CloudSetup) {
   };
 }
 
-function getApmAgentInstructionSet(cloudSetup?: CloudSetup) {
+function getApmAgentInstructionSet(
+  cloudSetup?: CloudSetup
+): InstructionSetSchema {
   const apmServerUrl = cloudSetup?.apm.url;
   const secretToken = cloudSetup?.apm.secretToken;
 
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 a0e96f563381c..882d45c4c21db 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -6,28 +6,31 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from '../../../../../../src/plugins/home/server';
 import {
-  createWindowsServerInstructions,
-  createEditConfig,
-  createStartServerUnixSysv,
-  createStartServerUnix,
-  createDownloadServerRpm,
-  createDownloadServerDeb,
-  createDownloadServerOsx,
-} from '../instructions/apm_server_instructions';
+  INSTRUCTION_VARIANT,
+  InstructionsSchema,
+} from '../../../../../../src/plugins/home/server';
 import {
-  createNodeAgentInstructions,
   createDjangoAgentInstructions,
+  createDotNetAgentInstructions,
   createFlaskAgentInstructions,
-  createRailsAgentInstructions,
-  createRackAgentInstructions,
-  createJsAgentInstructions,
   createGoAgentInstructions,
   createJavaAgentInstructions,
-  createDotNetAgentInstructions,
+  createJsAgentInstructions,
+  createNodeAgentInstructions,
   createPhpAgentInstructions,
+  createRackAgentInstructions,
+  createRailsAgentInstructions,
 } from '../instructions/apm_agent_instructions';
+import {
+  createDownloadServerDeb,
+  createDownloadServerOsx,
+  createDownloadServerRpm,
+  createEditConfig,
+  createStartServerUnix,
+  createStartServerUnixSysv,
+  createWindowsServerInstructions,
+} from '../instructions/apm_server_instructions';
 
 export function onPremInstructions({
   errorIndices,
@@ -41,7 +44,7 @@ export function onPremInstructions({
   metricsIndices: string;
   sourcemapIndices: string;
   onboardingIndices: string;
-}) {
+}): InstructionsSchema {
   const EDIT_CONFIG = createEditConfig();
   const START_SERVER_UNIX = createStartServerUnix();
   const START_SERVER_UNIX_SYSV = createStartServerUnixSysv();
@@ -66,6 +69,12 @@ export function onPremInstructions({
           iconType: 'alert',
         },
         instructionVariants: [
+          {
+            id: INSTRUCTION_VARIANT.FLEET,
+            instructions: [
+              { customComponentName: 'TutorialFleetInstructions' },
+            ],
+          },
           {
             id: INSTRUCTION_VARIANT.OSX,
             instructions: [
diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts
index d678677a4b751..9118c30b845d0 100644
--- a/x-pack/plugins/apm/server/tutorial/index.ts
+++ b/x-pack/plugins/apm/server/tutorial/index.ts
@@ -6,15 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { onPremInstructions } from './envs/on_prem';
-import { createElasticCloudInstructions } from './envs/elastic_cloud';
-import apmIndexPattern from './index_pattern.json';
-import { CloudSetup } from '../../../cloud/server';
 import {
   ArtifactsSchema,
   TutorialsCategory,
+  TutorialSchema,
 } from '../../../../../src/plugins/home/server';
+import { CloudSetup } from '../../../cloud/server';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../common/index_pattern_constants';
+import { createElasticCloudInstructions } from './envs/elastic_cloud';
+import { onPremInstructions } from './envs/on_prem';
+import apmIndexPattern from './index_pattern.json';
 
 const apmIntro = i18n.translate('xpack.apm.tutorial.introduction', {
   defaultMessage:
@@ -102,6 +103,7 @@ It allows you to monitor the performance of thousands of applications in real ti
     ),
     euiIconType: 'apmApp',
     artifacts,
+    customStatusCheckName: 'apm_fleet_server_status_check',
     onPrem: onPremInstructions(indices),
     elasticCloud: createElasticCloudInstructions(cloud),
     previewImagePath: '/plugins/apm/assets/apm.png',
@@ -113,5 +115,5 @@ It allows you to monitor the performance of thousands of applications in real ti
           'An APM index pattern is required for some features in the APM UI.',
       }
     ),
-  };
+  } as TutorialSchema;
 };
diff --git a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts b/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
index a25021fac5d00..ba11a996f00df 100644
--- a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
+++ b/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
@@ -913,7 +913,10 @@ export const createPhpAgentInstructions = (
           'APM is automatically started when your app boots. Configure the agent either via `php.ini` file:',
       }
     ),
-    commands: `elastic_apm.server_url=http://localhost:8200
+    commands: `elastic_apm.server_url="${
+      apmServerUrl || 'http://localhost:8200'
+    }"
+elastic.apm.secret_token="${secretToken}"
 elastic_apm.service_name="My service"
 `.split('\n'),
     textPost: i18n.translate(

From 8a422fdbc203b0cc50e36a16547abe6cc3623834 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 24 Jun 2021 17:01:09 +0200
Subject: [PATCH 49/95] [Fleet] Use "Integrations" breadcrumb in "Add
 integrations" (#103227)

* update the UI breadcrumbs in create policy package to always look like it came from integrations

* added comment about the removal of a path from fleet

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../create_package_policy_page/index.tsx      | 26 +++++--------------
 .../fleet/public/constants/page_paths.ts      |  1 +
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
index b3b0d6ed51cb4..3fbaea67d8973 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
@@ -495,17 +495,13 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
           onCancel={() => setFormState('VALID')}
         />
       )}
-      {from === 'package'
-        ? packageInfo && (
-            <IntegrationBreadcrumb
-              pkgTitle={integrationInfo?.title || packageInfo.title}
-              pkgkey={pkgKeyFromPackageInfo(packageInfo)}
-              integration={integrationInfo?.name}
-            />
-          )
-        : agentPolicy && (
-            <PolicyBreadcrumb policyName={agentPolicy.name} policyId={agentPolicy.id} />
-          )}
+      {packageInfo && (
+        <IntegrationBreadcrumb
+          pkgTitle={integrationInfo?.title || packageInfo.title}
+          pkgkey={pkgKeyFromPackageInfo(packageInfo)}
+          integration={integrationInfo?.name}
+        />
+      )}
       <StepsWithLessPadding steps={steps} />
       <EuiSpacer size="xl" />
       <EuiSpacer size="xl" />
@@ -559,14 +555,6 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   );
 };
 
-const PolicyBreadcrumb: React.FunctionComponent<{
-  policyName: string;
-  policyId: string;
-}> = ({ policyName, policyId }) => {
-  useBreadcrumbs('add_integration_from_policy', { policyName, policyId });
-  return null;
-};
-
 const IntegrationBreadcrumb: React.FunctionComponent<{
   pkgTitle: string;
   pkgkey: string;
diff --git a/x-pack/plugins/fleet/public/constants/page_paths.ts b/x-pack/plugins/fleet/public/constants/page_paths.ts
index 1688a396cd5a1..317241358a381 100644
--- a/x-pack/plugins/fleet/public/constants/page_paths.ts
+++ b/x-pack/plugins/fleet/public/constants/page_paths.ts
@@ -54,6 +54,7 @@ export const FLEET_ROUTING_PATHS = {
   policy_details: '/policies/:policyId/:tabId?',
   policy_details_settings: '/policies/:policyId/settings',
   edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
+  // TODO: Review uses and remove if it is no longer used or linked to in any UX flows
   add_integration_from_policy: '/policies/:policyId/add-integration',
   enrollment_tokens: '/enrollment-tokens',
   data_streams: '/data-streams',

From 5a76c84dc9385ca00b6af4362401846f5f3e1de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:04:48 -0400
Subject: [PATCH 50/95] [APM] refactoring sourcemap api to receive form-data 
 (#103152)

---
 .../apm/server/lib/fleet/source_maps.test.ts  | 45 +++++++++++++++++--
 .../apm/server/lib/fleet/source_maps.ts       |  3 --
 .../plugins/apm/server/routes/source_maps.ts  | 30 ++++++++-----
 x-pack/plugins/apm/server/routes/typings.ts   |  1 +
 4 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts b/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts
index 61a4fa4436e69..d6a1770a91591 100644
--- a/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts
+++ b/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts
@@ -103,12 +103,51 @@ const artifacts = [
 
 describe('Source maps', () => {
   describe('getPackagePolicyWithSourceMap', () => {
-    it('returns unchanged package policy when artifacts is empty', () => {
+    it('removes source map from package policy', () => {
+      const packagePolicyWithSourceMaps = {
+        ...packagePolicy,
+        inputs: [
+          {
+            ...packagePolicy.inputs[0],
+            compiled_input: {
+              'apm-server': {
+                ...packagePolicy.inputs[0].compiled_input['apm-server'],
+                value: {
+                  rum: {
+                    source_mapping: {
+                      metadata: [
+                        {
+                          'service.name': 'service_name',
+                          'service.version': '1.0.0',
+                          'bundle.filepath':
+                            'http://localhost:3000/static/js/main.chunk.js',
+                          'sourcemap.url':
+                            '/api/fleet/artifacts/service_name-1.0.0/my-id-1',
+                        },
+                        {
+                          'service.name': 'service_name',
+                          'service.version': '2.0.0',
+                          'bundle.filepath':
+                            'http://localhost:3000/static/js/main.chunk.js',
+                          'sourcemap.url':
+                            '/api/fleet/artifacts/service_name-2.0.0/my-id-2',
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      };
       const updatedPackagePolicy = getPackagePolicyWithSourceMap({
-        packagePolicy,
+        packagePolicy: packagePolicyWithSourceMaps,
         artifacts: [],
       });
-      expect(updatedPackagePolicy).toEqual(packagePolicy);
+      expect(updatedPackagePolicy.inputs[0].config).toEqual({
+        'apm-server': { value: { rum: { source_mapping: { metadata: [] } } } },
+      });
     });
     it('adds source maps into the package policy', () => {
       const updatedPackagePolicy = getPackagePolicyWithSourceMap({
diff --git a/x-pack/plugins/apm/server/lib/fleet/source_maps.ts b/x-pack/plugins/apm/server/lib/fleet/source_maps.ts
index b313fbad2806f..6d608f7751f3b 100644
--- a/x-pack/plugins/apm/server/lib/fleet/source_maps.ts
+++ b/x-pack/plugins/apm/server/lib/fleet/source_maps.ts
@@ -97,9 +97,6 @@ export function getPackagePolicyWithSourceMap({
   packagePolicy: PackagePolicy;
   artifacts: ArtifactSourceMap[];
 }) {
-  if (!artifacts.length) {
-    return packagePolicy;
-  }
   const [firstInput, ...restInputs] = packagePolicy.inputs;
   return {
     ...packagePolicy,
diff --git a/x-pack/plugins/apm/server/routes/source_maps.ts b/x-pack/plugins/apm/server/routes/source_maps.ts
index 24ea825774b0a..f6d160e68a76a 100644
--- a/x-pack/plugins/apm/server/routes/source_maps.ts
+++ b/x-pack/plugins/apm/server/routes/source_maps.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import Boom from '@hapi/boom';
+import { jsonRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { SavedObjectsClientContract } from 'kibana/server';
 import {
@@ -34,7 +35,7 @@ export const sourceMapRt = t.intersection([
 const listSourceMapRoute = createApmServerRoute({
   endpoint: 'GET /api/apm/sourcemaps',
   options: { tags: ['access:apm'] },
-  handler: async ({ plugins, logger }) => {
+  handler: async ({ plugins }) => {
     try {
       const fleetPluginStart = await plugins.fleet?.start();
       if (fleetPluginStart) {
@@ -51,21 +52,26 @@ const listSourceMapRoute = createApmServerRoute({
 });
 
 const uploadSourceMapRoute = createApmServerRoute({
-  endpoint: 'POST /api/apm/sourcemaps/{serviceName}/{serviceVersion}',
-  options: { tags: ['access:apm', 'access:apm_write'] },
+  endpoint: 'POST /api/apm/sourcemaps',
+  options: {
+    tags: ['access:apm', 'access:apm_write'],
+    body: { accepts: ['multipart/form-data'] },
+  },
   params: t.type({
-    path: t.type({
-      serviceName: t.string,
-      serviceVersion: t.string,
-    }),
     body: t.type({
-      bundleFilepath: t.string,
-      sourceMap: sourceMapRt,
+      service_name: t.string,
+      service_version: t.string,
+      bundle_filepath: t.string,
+      sourcemap: jsonRt.pipe(sourceMapRt),
     }),
   }),
   handler: async ({ params, plugins, core }) => {
-    const { serviceName, serviceVersion } = params.path;
-    const { bundleFilepath, sourceMap } = params.body;
+    const {
+      service_name: serviceName,
+      service_version: serviceVersion,
+      bundle_filepath: bundleFilepath,
+      sourcemap: sourceMap,
+    } = params.body;
     const fleetPluginStart = await plugins.fleet?.start();
     const coreStart = await core.start();
     const esClient = coreStart.elasticsearch.client.asInternalUser;
@@ -107,7 +113,7 @@ const deleteSourceMapRoute = createApmServerRoute({
       id: t.string,
     }),
   }),
-  handler: async ({ context, params, plugins, core }) => {
+  handler: async ({ params, plugins, core }) => {
     const fleetPluginStart = await plugins.fleet?.start();
     const { id } = params.path;
     const coreStart = await core.start();
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index 13bd631085aac..474464dec1f99 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -39,6 +39,7 @@ export interface APMRouteCreateOptions {
       | 'access:ml:canGetJobs'
       | 'access:ml:canCreateJob'
     >;
+    body?: { accepts: Array<'application/json' | 'multipart/form-data'> };
   };
 }
 

From dd072c392786b8f7c49c16ee48fc95a0aba2be6e Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Thu, 24 Jun 2021 11:09:47 -0400
Subject: [PATCH 51/95] [Task Manager] Add config switch around logging at
 different levels based on the state (#102804)

* Gate behind a config with warning message that helps users enable

* Update more files

* Fix docs formatting

* Preserve existing functionality

* Add in task type to the message

* Show multiple alert types that are over the threshold

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/settings/task-manager-settings.asciidoc  |   8 +-
 .../resources/base/bin/kibana-docker          |   3 +-
 .../task_manager/server/config.test.ts        |  15 +-
 x-pack/plugins/task_manager/server/config.ts  |   9 +-
 .../managed_configuration.test.ts             |   5 +-
 .../server/lib/log_health_metrics.test.ts     | 191 +++++++++++++++++-
 .../server/lib/log_health_metrics.ts          |  73 +++++--
 .../configuration_statistics.test.ts          |   5 +-
 .../monitoring_stats_stream.test.ts           |   5 +-
 .../server/monitoring/task_run_statistics.ts  |   3 +
 .../task_manager/server/plugin.test.ts        |  10 +-
 .../server/polling_lifecycle.test.ts          |   5 +-
 .../task_manager/server/routes/health.test.ts |  15 +-
 13 files changed, 305 insertions(+), 42 deletions(-)

diff --git a/docs/settings/task-manager-settings.asciidoc b/docs/settings/task-manager-settings.asciidoc
index 87f5b700870eb..7f4dbb3a96e6b 100644
--- a/docs/settings/task-manager-settings.asciidoc
+++ b/docs/settings/task-manager-settings.asciidoc
@@ -29,7 +29,13 @@ Task Manager runs background tasks by polling for work on an interval.  You can
   | The maximum number of tasks that this Kibana instance will run simultaneously.  Defaults to 10.
     Starting in 8.0, it will not be possible to set the value greater than 100.
 
-  | `xpack.task_manager.monitored_stats_warn_delayed_task_start_in_seconds`
+  | `xpack.task_manager.`
+  `monitored_stats_health_verbose_log.enabled`
+  | This flag will enable automatic warn and error logging if task manager self detects a performance issue, such as the time between when a task is scheduled to execute and when it actually executes. Defaults to false.
+
+  | `xpack.task_manager.`
+  `monitored_stats_health_verbose_log.`
+  `warn_delayed_task_start_in_seconds`
   | The amount of seconds we allow a task to delay before printing a warning server log.  Defaults to 60.
 |===
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index d109a824ca81d..b520ab3070b15 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -379,7 +379,8 @@ kibana_vars=(
     xpack.task_manager.monitored_aggregated_stats_refresh_rate
     xpack.task_manager.monitored_stats_required_freshness
     xpack.task_manager.monitored_stats_running_average_window
-    xpack.task_manager.monitored_stats_warn_delayed_task_start_in_seconds
+    xpack.task_manager.monitored_stats_health_verbose_log.enabled
+    xpack.task_manager.monitored_stats_health_verbose_log.warn_delayed_task_start_in_seconds
     xpack.task_manager.monitored_task_execution_thresholds
     xpack.task_manager.poll_interval
     xpack.task_manager.request_capacity
diff --git a/x-pack/plugins/task_manager/server/config.test.ts b/x-pack/plugins/task_manager/server/config.test.ts
index 947b1fd84467e..5e44181f35b20 100644
--- a/x-pack/plugins/task_manager/server/config.test.ts
+++ b/x-pack/plugins/task_manager/server/config.test.ts
@@ -18,9 +18,12 @@ describe('config validation', () => {
         "max_poll_inactivity_cycles": 10,
         "max_workers": 10,
         "monitored_aggregated_stats_refresh_rate": 60000,
+        "monitored_stats_health_verbose_log": Object {
+          "enabled": false,
+          "warn_delayed_task_start_in_seconds": 60,
+        },
         "monitored_stats_required_freshness": 4000,
         "monitored_stats_running_average_window": 50,
-        "monitored_stats_warn_delayed_task_start_in_seconds": 60,
         "monitored_task_execution_thresholds": Object {
           "custom": Object {},
           "default": Object {
@@ -67,9 +70,12 @@ describe('config validation', () => {
         "max_poll_inactivity_cycles": 10,
         "max_workers": 10,
         "monitored_aggregated_stats_refresh_rate": 60000,
+        "monitored_stats_health_verbose_log": Object {
+          "enabled": false,
+          "warn_delayed_task_start_in_seconds": 60,
+        },
         "monitored_stats_required_freshness": 4000,
         "monitored_stats_running_average_window": 50,
-        "monitored_stats_warn_delayed_task_start_in_seconds": 60,
         "monitored_task_execution_thresholds": Object {
           "custom": Object {},
           "default": Object {
@@ -103,9 +109,12 @@ describe('config validation', () => {
         "max_poll_inactivity_cycles": 10,
         "max_workers": 10,
         "monitored_aggregated_stats_refresh_rate": 60000,
+        "monitored_stats_health_verbose_log": Object {
+          "enabled": false,
+          "warn_delayed_task_start_in_seconds": 60,
+        },
         "monitored_stats_required_freshness": 4000,
         "monitored_stats_running_average_window": 50,
-        "monitored_stats_warn_delayed_task_start_in_seconds": 60,
         "monitored_task_execution_thresholds": Object {
           "custom": Object {
             "alerting:always-fires": Object {
diff --git a/x-pack/plugins/task_manager/server/config.ts b/x-pack/plugins/task_manager/server/config.ts
index 5dee66cf113b2..03bb98170a34a 100644
--- a/x-pack/plugins/task_manager/server/config.ts
+++ b/x-pack/plugins/task_manager/server/config.ts
@@ -110,9 +110,12 @@ export const configSchema = schema.object(
         defaultValue: {},
       }),
     }),
-    /* The amount of seconds we allow a task to delay before printing a warning server log */
-    monitored_stats_warn_delayed_task_start_in_seconds: schema.number({
-      defaultValue: DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS,
+    monitored_stats_health_verbose_log: schema.object({
+      enabled: schema.boolean({ defaultValue: false }),
+      /* The amount of seconds we allow a task to delay before printing a warning server log */
+      warn_delayed_task_start_in_seconds: schema.number({
+        defaultValue: DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS,
+      }),
     }),
   },
   {
diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
index f6ee8d8a78ddc..f925c4d978ad7 100644
--- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
@@ -37,7 +37,10 @@ describe('managed configuration', () => {
       version_conflict_threshold: 80,
       max_poll_inactivity_cycles: 10,
       monitored_aggregated_stats_refresh_rate: 60000,
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
       monitored_stats_required_freshness: 4000,
       monitored_stats_running_average_window: 50,
       request_capacity: 1000,
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index ccbbf81ebfa31..f5163f4ca5ed8 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -10,7 +10,7 @@ import { configSchema, TaskManagerConfig } from '../config';
 import { HealthStatus } from '../monitoring';
 import { TaskPersistence } from '../monitoring/task_run_statistics';
 import { MonitoredHealth } from '../routes/health';
-import { logHealthMetrics } from './log_health_metrics';
+import { logHealthMetrics, resetLastLogLevel } from './log_health_metrics';
 import { Logger } from '../../../../../src/core/server';
 
 jest.mock('./calculate_health_status', () => ({
@@ -20,12 +20,110 @@ jest.mock('./calculate_health_status', () => ({
 describe('logHealthMetrics', () => {
   afterEach(() => {
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
+    // Reset the last state by running through this as OK
+    // (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    resetLastLogLevel();
     (calculateHealthStatus as jest.Mock<HealthStatus>).mockReset();
   });
+
+  it('should log a warning message to enable verbose logging when the status goes from OK to Warning/Error', () => {
+    const logger = loggingSystemMock.create().get();
+    const config = getTaskManagerConfig({
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
+    });
+    const health = getMockMonitoredHealth();
+    const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
+
+    // We must change from OK to Warning
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    logHealthMetrics(health, logger, config);
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(
+      () => HealthStatus.Warning
+    );
+    logHealthMetrics(health, logger, config);
+    // We must change from OK to Error
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    logHealthMetrics(health, logger, config);
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.Error);
+    logHealthMetrics(health, logger, config);
+
+    expect((logger as jest.Mocked<Logger>).warn.mock.calls[0][0] as string).toBe(
+      `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
+    );
+    expect((logger as jest.Mocked<Logger>).warn.mock.calls[1][0] as string).toBe(
+      `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
+    );
+  });
+
+  it('should not log a warning message to enable verbose logging when the status goes from Warning to OK', () => {
+    const logger = loggingSystemMock.create().get();
+    const config = getTaskManagerConfig({
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
+    });
+    const health = getMockMonitoredHealth();
+    const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
+
+    // We must change from Warning to OK
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(
+      () => HealthStatus.Warning
+    );
+    logHealthMetrics(health, logger, config);
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    logHealthMetrics(health, logger, config);
+    expect((logger as jest.Mocked<Logger>).warn).not.toHaveBeenCalled();
+  });
+
+  it('should not log a warning message to enable verbose logging when the status goes from Error to OK', () => {
+    // console.log('start', getLastLogLevel());
+    const logger = loggingSystemMock.create().get();
+    const config = getTaskManagerConfig({
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
+    });
+    const health = getMockMonitoredHealth();
+    const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
+
+    // We must change from Error to OK
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.Error);
+    logHealthMetrics(health, logger, config);
+    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    logHealthMetrics(health, logger, config);
+    expect((logger as jest.Mocked<Logger>).warn).not.toHaveBeenCalled();
+  });
+
   it('should log as debug if status is OK', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
+    });
+    const health = getMockMonitoredHealth();
+
+    logHealthMetrics(health, logger, config);
+
+    const firstDebug = JSON.parse(
+      (logger as jest.Mocked<Logger>).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+    );
+    expect(firstDebug).toMatchObject(health);
+  });
+
+  it('should log as debug if status is OK even if not enabled', () => {
+    const logger = loggingSystemMock.create().get();
+    const config = getTaskManagerConfig({
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = getMockMonitoredHealth();
 
@@ -40,7 +138,10 @@ describe('logHealthMetrics', () => {
   it('should log as warn if status is Warn', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = getMockMonitoredHealth();
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
@@ -62,7 +163,10 @@ describe('logHealthMetrics', () => {
   it('should log as error if status is Error', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = getMockMonitoredHealth();
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
@@ -79,15 +183,26 @@ describe('logHealthMetrics', () => {
     expect(logMessage).toMatchObject(health);
   });
 
-  it('should log as warn if drift exceeds the threshold', () => {
+  it('should log as warn if drift exceeds the threshold for a single alert type', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = getMockMonitoredHealth({
       stats: {
         runtime: {
           value: {
+            drift_by_type: {
+              'taskType:test': {
+                p99: 60000,
+              },
+              'taskType:test2': {
+                p99: 60000 - 1,
+              },
+            },
             drift: {
               p99: 60000,
             },
@@ -99,7 +214,50 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config);
 
     expect((logger as jest.Mocked<Logger>).warn.mock.calls[0][0] as string).toBe(
-      `Detected delay task start of 60s (which exceeds configured value of 60s)`
+      `Detected delay task start of 60s for task(s) \"taskType:test\" (which exceeds configured value of 60s)`
+    );
+
+    const secondMessage = JSON.parse(
+      ((logger as jest.Mocked<Logger>).warn.mock.calls[1][0] as string).replace(
+        `Latest Monitored Stats: `,
+        ''
+      )
+    );
+    expect(secondMessage).toMatchObject(health);
+  });
+
+  it('should log as warn if drift exceeds the threshold for multiple alert types', () => {
+    const logger = loggingSystemMock.create().get();
+    const config = getTaskManagerConfig({
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
+    });
+    const health = getMockMonitoredHealth({
+      stats: {
+        runtime: {
+          value: {
+            drift_by_type: {
+              'taskType:test': {
+                p99: 60000,
+              },
+              'taskType:test2': {
+                p99: 60000,
+              },
+            },
+            drift: {
+              p99: 60000,
+            },
+          },
+        },
+      },
+    });
+
+    logHealthMetrics(health, logger, config);
+
+    expect((logger as jest.Mocked<Logger>).warn.mock.calls[0][0] as string).toBe(
+      `Detected delay task start of 60s for task(s) \"taskType:test, taskType:test2\" (which exceeds configured value of 60s)`
     );
 
     const secondMessage = JSON.parse(
@@ -114,7 +272,10 @@ describe('logHealthMetrics', () => {
   it('should log as debug if there are no stats', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = {
       id: '1',
@@ -135,7 +296,10 @@ describe('logHealthMetrics', () => {
   it('should ignore capacity estimation status', () => {
     const logger = loggingSystemMock.create().get();
     const config = getTaskManagerConfig({
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: true,
+        warn_delayed_task_start_in_seconds: 60,
+      },
     });
     const health = getMockMonitoredHealth({
       stats: {
@@ -213,7 +377,14 @@ function getMockMonitoredHealth(overrides = {}): MonitoredHealth {
             p95: 2500,
             p99: 3000,
           },
-          drift_by_type: {},
+          drift_by_type: {
+            'taskType:test': {
+              p50: 1000,
+              p90: 2000,
+              p95: 2500,
+              p99: 3000,
+            },
+          },
           load: {
             p50: 1000,
             p90: 2000,
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index 1c98b3272a82d..e8511b1e8c71d 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -12,11 +12,23 @@ import { TaskManagerConfig } from '../config';
 import { MonitoredHealth } from '../routes/health';
 import { calculateHealthStatus } from './calculate_health_status';
 
+enum LogLevel {
+  Warn = 'warn',
+  Error = 'error',
+  Debug = 'debug',
+}
+
+let lastLogLevel: LogLevel | null = null;
+export function resetLastLogLevel() {
+  lastLogLevel = null;
+}
 export function logHealthMetrics(
   monitoredHealth: MonitoredHealth,
   logger: Logger,
   config: TaskManagerConfig
 ) {
+  let logLevel: LogLevel = LogLevel.Debug;
+  const enabled = config.monitored_stats_health_verbose_log.enabled;
   const healthWithoutCapacity: MonitoredHealth = {
     ...monitoredHealth,
     stats: {
@@ -25,23 +37,54 @@ export function logHealthMetrics(
     },
   };
   const statusWithoutCapacity = calculateHealthStatus(healthWithoutCapacity, config);
-  let logAsWarn = statusWithoutCapacity === HealthStatus.Warning;
-  const logAsError =
-    statusWithoutCapacity === HealthStatus.Error && !isEmpty(monitoredHealth.stats);
-  const driftInSeconds = (monitoredHealth.stats.runtime?.value.drift.p99 ?? 0) / 1000;
-
-  if (driftInSeconds >= config.monitored_stats_warn_delayed_task_start_in_seconds) {
-    logger.warn(
-      `Detected delay task start of ${driftInSeconds}s (which exceeds configured value of ${config.monitored_stats_warn_delayed_task_start_in_seconds}s)`
-    );
-    logAsWarn = true;
+  if (statusWithoutCapacity === HealthStatus.Warning) {
+    logLevel = LogLevel.Warn;
+  } else if (statusWithoutCapacity === HealthStatus.Error && !isEmpty(monitoredHealth.stats)) {
+    logLevel = LogLevel.Error;
   }
 
-  if (logAsError) {
-    logger.error(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`);
-  } else if (logAsWarn) {
-    logger.warn(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`);
+  const message = `Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`;
+  if (enabled) {
+    const driftInSeconds = (monitoredHealth.stats.runtime?.value.drift.p99 ?? 0) / 1000;
+    if (
+      driftInSeconds >= config.monitored_stats_health_verbose_log.warn_delayed_task_start_in_seconds
+    ) {
+      const taskTypes = Object.keys(monitoredHealth.stats.runtime?.value.drift_by_type ?? {})
+        .reduce((accum: string[], typeName) => {
+          if (
+            monitoredHealth.stats.runtime?.value.drift_by_type[typeName].p99 ===
+            monitoredHealth.stats.runtime?.value.drift.p99
+          ) {
+            accum.push(typeName);
+          }
+          return accum;
+        }, [])
+        .join(', ');
+
+      logger.warn(
+        `Detected delay task start of ${driftInSeconds}s for task(s) "${taskTypes}" (which exceeds configured value of ${config.monitored_stats_health_verbose_log.warn_delayed_task_start_in_seconds}s)`
+      );
+      logLevel = LogLevel.Warn;
+    }
+    switch (logLevel) {
+      case LogLevel.Warn:
+        logger.warn(message);
+        break;
+      case LogLevel.Error:
+        logger.error(message);
+        break;
+      default:
+        logger.debug(message);
+    }
   } else {
-    logger.debug(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`);
+    // This is legacy support - we used to always show this
+    logger.debug(message);
+    if (logLevel !== LogLevel.Debug && lastLogLevel === LogLevel.Debug) {
+      logger.warn(
+        `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
+      );
+    }
   }
+
+  lastLogLevel = logLevel;
 }
diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
index 39a7658fb09e4..6aa8bad5717ec 100644
--- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
@@ -23,7 +23,10 @@ describe('Configuration Statistics Aggregator', () => {
       max_poll_inactivity_cycles: 10,
       request_capacity: 1000,
       monitored_aggregated_stats_refresh_rate: 5000,
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
       monitored_stats_running_average_window: 50,
       monitored_task_execution_thresholds: {
         default: {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
index 01bd86ec96db6..2e53850814e83 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
@@ -27,7 +27,10 @@ describe('createMonitoringStatsStream', () => {
     max_poll_inactivity_cycles: 10,
     request_capacity: 1000,
     monitored_aggregated_stats_refresh_rate: 5000,
-    monitored_stats_warn_delayed_task_start_in_seconds: 60,
+    monitored_stats_health_verbose_log: {
+      enabled: false,
+      warn_delayed_task_start_in_seconds: 60,
+    },
     monitored_stats_running_average_window: 50,
     monitored_task_execution_thresholds: {
       default: {
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
index b792f4ca475f9..da86cfad2a911 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
@@ -103,6 +103,9 @@ type ResultFrequencySummary = ResultFrequency & {
 
 export interface SummarizedTaskRunStat extends JsonObject {
   drift: AveragedStat;
+  drift_by_type: {
+    [alertType: string]: AveragedStat;
+  };
   load: AveragedStat;
   execution: {
     duration: Record<string, AveragedStat>;
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index 6c7f722d4c525..0d9f285164f10 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -25,7 +25,10 @@ describe('TaskManagerPlugin', () => {
         max_poll_inactivity_cycles: 10,
         request_capacity: 1000,
         monitored_aggregated_stats_refresh_rate: 5000,
-        monitored_stats_warn_delayed_task_start_in_seconds: 60,
+        monitored_stats_health_verbose_log: {
+          enabled: false,
+          warn_delayed_task_start_in_seconds: 60,
+        },
         monitored_stats_required_freshness: 5000,
         monitored_stats_running_average_window: 50,
         monitored_task_execution_thresholds: {
@@ -56,7 +59,10 @@ describe('TaskManagerPlugin', () => {
         max_poll_inactivity_cycles: 10,
         request_capacity: 1000,
         monitored_aggregated_stats_refresh_rate: 5000,
-        monitored_stats_warn_delayed_task_start_in_seconds: 60,
+        monitored_stats_health_verbose_log: {
+          enabled: false,
+          warn_delayed_task_start_in_seconds: 60,
+        },
         monitored_stats_required_freshness: 5000,
         monitored_stats_running_average_window: 50,
         monitored_task_execution_thresholds: {
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 66c6805e9160e..73b892c9f59e0 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -45,7 +45,10 @@ describe('TaskPollingLifecycle', () => {
       max_poll_inactivity_cycles: 10,
       request_capacity: 1000,
       monitored_aggregated_stats_refresh_rate: 5000,
-      monitored_stats_warn_delayed_task_start_in_seconds: 60,
+      monitored_stats_health_verbose_log: {
+        enabled: false,
+        warn_delayed_task_start_in_seconds: 60,
+      },
       monitored_stats_required_freshness: 5000,
       monitored_stats_running_average_window: 50,
       monitored_task_execution_thresholds: {
diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts
index c14eb7e10b726..735029e90c2d3 100644
--- a/x-pack/plugins/task_manager/server/routes/health.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.test.ts
@@ -67,7 +67,10 @@ describe('healthRoute', () => {
       id,
       getTaskManagerConfig({
         monitored_stats_required_freshness: 1000,
-        monitored_stats_warn_delayed_task_start_in_seconds: 100,
+        monitored_stats_health_verbose_log: {
+          enabled: true,
+          warn_delayed_task_start_in_seconds: 100,
+        },
         monitored_aggregated_stats_refresh_rate: 60000,
       })
     );
@@ -114,7 +117,10 @@ describe('healthRoute', () => {
       id,
       getTaskManagerConfig({
         monitored_stats_required_freshness: 1000,
-        monitored_stats_warn_delayed_task_start_in_seconds: 120,
+        monitored_stats_health_verbose_log: {
+          enabled: true,
+          warn_delayed_task_start_in_seconds: 120,
+        },
         monitored_aggregated_stats_refresh_rate: 60000,
       })
     );
@@ -173,7 +179,10 @@ describe('healthRoute', () => {
       id,
       getTaskManagerConfig({
         monitored_stats_required_freshness: 1000,
-        monitored_stats_warn_delayed_task_start_in_seconds: 120,
+        monitored_stats_health_verbose_log: {
+          enabled: true,
+          warn_delayed_task_start_in_seconds: 120,
+        },
         monitored_aggregated_stats_refresh_rate: 60000,
       })
     );

From 686ac904d913f485e656e5b1f3604bfeb518240d Mon Sep 17 00:00:00 2001
From: Dmitry Tomashevich <39378793+Dmitriynj@users.noreply.github.com>
Date: Thu, 24 Jun 2021 18:27:29 +0300
Subject: [PATCH 52/95] [Discover] Move focus on chart toggle in Discover
 (#103119)

* [Discover] move focus on show chart

* [Discover] set actual moveFocus flag
---
 .../main/components/chart/discover_chart.tsx  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
index 210313aac5366..f1967d5b10b3e 100644
--- a/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 import moment from 'moment';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
 import { IUiSettingsClient } from 'kibana/public';
@@ -47,8 +47,21 @@ export function DiscoverChart({
   stateContainer: GetStateReturn;
   timefield?: string;
 }) {
+  const chartRef = useRef<{ element: HTMLElement | null; moveFocus: boolean }>({
+    element: null,
+    moveFocus: false,
+  });
+
+  useEffect(() => {
+    if (chartRef.current.moveFocus && chartRef.current.element) {
+      chartRef.current.element.focus();
+    }
+  }, [state.hideChart]);
+
   const toggleHideChart = useCallback(() => {
-    stateContainer.setAppState({ hideChart: !state.hideChart });
+    const newHideChart = !state.hideChart;
+    stateContainer.setAppState({ hideChart: newHideChart });
+    chartRef.current.moveFocus = !newHideChart;
   }, [state, stateContainer]);
 
   const onChangeInterval = useCallback(
@@ -102,9 +115,7 @@ export function DiscoverChart({
               <EuiButtonEmpty
                 size="xs"
                 iconType={!state.hideChart ? 'eyeClosed' : 'eye'}
-                onClick={() => {
-                  toggleHideChart();
-                }}
+                onClick={toggleHideChart}
                 data-test-subj="discoverChartToggle"
               >
                 {!state.hideChart
@@ -122,6 +133,8 @@ export function DiscoverChart({
       {!state.hideChart && chartData && (
         <EuiFlexItem grow={false}>
           <section
+            ref={(element) => (chartRef.current.element = element)}
+            tabIndex={-1}
             aria-label={i18n.translate('discover.histogramOfFoundDocumentsAriaLabel', {
               defaultMessage: 'Histogram of found documents',
             })}

From f2ebcadc7f526c75e87c32dce365acc6539745ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Thu, 24 Jun 2021 17:51:05 +0200
Subject: [PATCH 53/95] Refactored helpers file into separate domain files
 (#102383)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../edit_policy/edit_policy.helpers.tsx       | 96 -------------------
 .../edit_policy/features/cold_phase.test.ts   | 42 --------
 .../features/delete_phase.helpers.ts          | 36 +++++++
 .../edit_policy/features/delete_phase.test.ts | 59 +++++-------
 .../edit_policy/features/frozen_phase.test.ts | 18 +---
 .../general_behavior.helpers.ts               |  8 +-
 .../features/request_flyout.test.ts           |  7 +-
 .../edit_policy/features/rollover.helpers.ts  | 51 ++++++++++
 .../edit_policy/features/rollover.test.ts     | 17 ++--
 .../features/searchable_snapshots.helpers.ts  | 59 ++++++++++++
 .../features/searchable_snapshots.test.ts     | 25 +++--
 .../edit_policy/features/timeline.helpers.ts  | 29 ++++++
 .../edit_policy/features/timeline.test.ts     |  6 +-
 .../edit_policy/features/timing.helpers.ts    | 36 +++++++
 .../edit_policy/features/timing.test.ts       | 41 ++++++++
 .../edit_policy/features/warm_phase.test.ts   | 42 --------
 .../cold_phase_validation.test.ts             |  6 +-
 .../form_validation/error_indicators.test.ts  |  6 +-
 .../hot_phase_validation.test.ts              | 10 +-
 .../policy_name_validation.test.ts            | 10 +-
 .../form_validation/timing.test.ts            |  8 +-
 .../form_validation/validation.helpers.ts     | 47 +++++++++
 .../warm_phase_validation.test.ts             |  8 +-
 .../policy_serialization.helpers.ts           | 45 +++++++++
 .../policy_serialization.test.ts              | 25 +++--
 .../helpers/actions/errors_actions.ts         | 10 +-
 .../helpers/actions/forcemerge_actions.ts     |  2 +-
 ...ts => form_toggle_and_set_value_action.ts} | 15 +--
 .../helpers/actions/index.ts                  | 12 ++-
 .../helpers/actions/index_priority_actions.ts |  8 +-
 .../helpers/actions/phases.ts                 | 76 +++++++++++++++
 .../helpers/actions/replicas_action.ts        | 20 ++++
 .../helpers/actions/rollover_actions.ts       | 16 ++--
 .../actions/set_wait_for_snapshot_action.ts   | 19 ----
 .../helpers/actions/shrink_actions.ts         | 10 +-
 .../actions/snapshot_policy_actions.ts        | 27 ++++++
 36 files changed, 611 insertions(+), 341 deletions(-)
 delete mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
 delete mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
 rename x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/{set_replicas_action.ts => form_toggle_and_set_value_action.ts} (57%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
deleted file mode 100644
index 6f1c58b2e9b18..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ /dev/null
@@ -1,96 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { TestBedConfig } from '@kbn/test/jest';
-import { AppServicesContext } from '../../../public/types';
-
-import { Phase } from '../../../common/types';
-
-import {
-  createNodeAllocationActions,
-  createFormToggleAction,
-  createFormSetValueAction,
-  setReplicas,
-  createSearchableSnapshotActions,
-  createTogglePhaseAction,
-  createSavePolicyAction,
-  createErrorsActions,
-  createRolloverActions,
-  createSetWaitForSnapshotAction,
-  createMinAgeActions,
-  createShrinkActions,
-  createFreezeActions,
-  createForceMergeActions,
-  createReadonlyActions,
-  createIndexPriorityActions,
-} from '../helpers';
-import { initTestBed } from './init_test_bed';
-
-type SetupReturn = ReturnType<typeof setup>;
-export type EditPolicyTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
-
-export const setup = async (arg?: {
-  appServicesContext?: Partial<AppServicesContext>;
-  testBedConfig?: Partial<TestBedConfig>;
-}) => {
-  const testBed = await initTestBed(arg);
-
-  const { exists } = testBed;
-
-  return {
-    ...testBed,
-    actions: {
-      togglePhase: createTogglePhaseAction(testBed),
-      savePolicy: createSavePolicyAction(testBed),
-      toggleSaveAsNewPolicy: createFormToggleAction(testBed, 'saveAsNewSwitch'),
-      setPolicyName: createFormSetValueAction(testBed, 'policyNameField'),
-      errors: {
-        ...createErrorsActions(testBed),
-      },
-      timeline: {
-        hasPhase: (phase: Phase) => exists(`ilmTimelinePhase-${phase}`),
-      },
-      rollover: {
-        ...createRolloverActions(testBed),
-      },
-      hot: {
-        ...createForceMergeActions(testBed, 'hot'),
-        ...createIndexPriorityActions(testBed, 'hot'),
-        ...createShrinkActions(testBed, 'hot'),
-        ...createReadonlyActions(testBed, 'hot'),
-        ...createSearchableSnapshotActions(testBed, 'hot'),
-      },
-      warm: {
-        ...createMinAgeActions(testBed, 'warm'),
-        setReplicas: (value: string) => setReplicas(testBed, 'warm', value),
-        ...createShrinkActions(testBed, 'warm'),
-        ...createForceMergeActions(testBed, 'warm'),
-        ...createReadonlyActions(testBed, 'warm'),
-        ...createIndexPriorityActions(testBed, 'warm'),
-        ...createNodeAllocationActions(testBed, 'warm'),
-      },
-      cold: {
-        ...createMinAgeActions(testBed, 'cold'),
-        setReplicas: (value: string) => setReplicas(testBed, 'cold', value),
-        ...createFreezeActions(testBed, 'cold'),
-        ...createReadonlyActions(testBed, 'cold'),
-        ...createIndexPriorityActions(testBed, 'cold'),
-        ...createSearchableSnapshotActions(testBed, 'cold'),
-        ...createNodeAllocationActions(testBed, 'cold'),
-      },
-      frozen: {
-        ...createMinAgeActions(testBed, 'frozen'),
-        ...createSearchableSnapshotActions(testBed, 'frozen'),
-      },
-      delete: {
-        isShown: () => exists('delete-phase'),
-        ...createMinAgeActions(testBed, 'delete'),
-        setWaitForSnapshotPolicy: createSetWaitForSnapshotAction(testBed),
-      },
-    },
-  };
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
deleted file mode 100644
index e5e4267b6270c..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
+++ /dev/null
@@ -1,42 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers/setup_environment';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-
-describe('<EditPolicy /> cold phase', () => {
-  let testBed: EditPolicyTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  beforeAll(() => {
-    jest.useFakeTimers();
-  });
-
-  afterAll(() => {
-    jest.useRealTimers();
-    server.restore();
-  });
-
-  beforeEach(async () => {
-    httpRequestsMockHelpers.setDefaultResponses();
-
-    await act(async () => {
-      testBed = await setup();
-    });
-
-    const { component } = testBed;
-    component.update();
-  });
-
-  test('shows timing only when enabled', async () => {
-    const { actions } = testBed;
-    expect(actions.cold.hasMinAgeInput()).toBeFalsy();
-    await actions.togglePhase('cold');
-    expect(actions.cold.hasMinAgeInput()).toBeTruthy();
-  });
-});
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
new file mode 100644
index 0000000000000..1914a056528e1
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 {
+  createMinAgeActions,
+  createSavePolicyAction,
+  createSnapshotPolicyActions,
+  createTogglePhaseAction,
+} from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+
+type SetupReturn = ReturnType<typeof setupDeleteTestBed>;
+
+export type DeleteTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupDeleteTestBed = async () => {
+  const testBed = await initTestBed();
+  const { exists } = testBed;
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      savePolicy: createSavePolicyAction(testBed),
+      delete: {
+        isShown: () => exists('delete-phase'),
+        ...createMinAgeActions(testBed, 'delete'),
+        ...createSnapshotPolicyActions(testBed),
+      },
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
index 0c24101461f24..6ba41860eb855 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
@@ -8,16 +8,16 @@
 import { act } from 'react-dom/test-utils';
 import { API_BASE_PATH } from '../../../../common/constants';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 import {
   DELETE_PHASE_POLICY,
   getDefaultHotPhasePolicy,
   NEW_SNAPSHOT_POLICY_NAME,
   SNAPSHOT_POLICY_NAME,
 } from '../constants';
+import { DeleteTestBed, setupDeleteTestBed } from './delete_phase.helpers';
 
 describe('<EditPolicy /> delete phase', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: DeleteTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   afterAll(() => {
@@ -32,7 +32,7 @@ describe('<EditPolicy /> delete phase', () => {
     ]);
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupDeleteTestBed();
     });
 
     const { component } = testBed;
@@ -43,7 +43,7 @@ describe('<EditPolicy /> delete phase', () => {
     httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupDeleteTestBed();
     });
 
     const { component, actions } = testBed;
@@ -56,21 +56,6 @@ describe('<EditPolicy /> delete phase', () => {
     expect(actions.delete.isShown()).toBeFalsy();
   });
 
-  test('shows timing after it was enabled', async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-
-    await act(async () => {
-      testBed = await setup();
-    });
-
-    const { component, actions } = testBed;
-    component.update();
-
-    expect(actions.delete.hasMinAgeInput()).toBeFalsy();
-    await actions.togglePhase('delete');
-    expect(actions.delete.hasMinAgeInput()).toBeTruthy();
-  });
-
   describe('wait for snapshot', () => {
     test('shows snapshot policy name', () => {
       expect(testBed.find('snapshotPolicyCombobox').prop('data-currentvalue')).toEqual([
@@ -83,7 +68,7 @@ describe('<EditPolicy /> delete phase', () => {
     test('updates snapshot policy name', async () => {
       const { actions } = testBed;
 
-      await actions.delete.setWaitForSnapshotPolicy(NEW_SNAPSHOT_POLICY_NAME);
+      await actions.delete.setSnapshotPolicy(NEW_SNAPSHOT_POLICY_NAME);
       await actions.savePolicy();
 
       const expected = {
@@ -111,16 +96,16 @@ describe('<EditPolicy /> delete phase', () => {
     test('shows a callout when the input is not an existing policy', async () => {
       const { actions } = testBed;
 
-      await actions.delete.setWaitForSnapshotPolicy('my_custom_policy');
-      expect(testBed.find('noPoliciesCallout').exists()).toBeFalsy();
-      expect(testBed.find('policiesErrorCallout').exists()).toBeFalsy();
-      expect(testBed.find('customPolicyCallout').exists()).toBeTruthy();
+      await actions.delete.setSnapshotPolicy('my_custom_policy');
+      expect(actions.delete.hasNoPoliciesCallout()).toBeFalsy();
+      expect(actions.delete.hasPolicyErrorCallout()).toBeFalsy();
+      expect(actions.delete.hasCustomPolicyCallout()).toBeTruthy();
     });
 
     test('removes the action if field is empty', async () => {
       const { actions } = testBed;
 
-      await actions.delete.setWaitForSnapshotPolicy('');
+      await actions.delete.setSnapshotPolicy('');
       await actions.savePolicy();
 
       const expected = {
@@ -146,26 +131,30 @@ describe('<EditPolicy /> delete phase', () => {
       // need to call setup on testBed again for it to use a newly defined snapshot policies response
       httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupDeleteTestBed();
       });
 
-      testBed.component.update();
-      expect(testBed.find('customPolicyCallout').exists()).toBeFalsy();
-      expect(testBed.find('policiesErrorCallout').exists()).toBeFalsy();
-      expect(testBed.find('noPoliciesCallout').exists()).toBeTruthy();
+      const { component, actions } = testBed;
+      component.update();
+
+      expect(actions.delete.hasCustomPolicyCallout()).toBeFalsy();
+      expect(actions.delete.hasPolicyErrorCallout()).toBeFalsy();
+      expect(actions.delete.hasNoPoliciesCallout()).toBeTruthy();
     });
 
     test('shows a callout when there is an error loading snapshot policies', async () => {
       // need to call setup on testBed again for it to use a newly defined snapshot policies response
       httpRequestsMockHelpers.setLoadSnapshotPolicies([], { status: 500, body: 'error' });
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupDeleteTestBed();
       });
 
-      testBed.component.update();
-      expect(testBed.find('customPolicyCallout').exists()).toBeFalsy();
-      expect(testBed.find('noPoliciesCallout').exists()).toBeFalsy();
-      expect(testBed.find('policiesErrorCallout').exists()).toBeTruthy();
+      const { component, actions } = testBed;
+      component.update();
+
+      expect(actions.delete.hasCustomPolicyCallout()).toBeFalsy();
+      expect(actions.delete.hasNoPoliciesCallout()).toBeFalsy();
+      expect(actions.delete.hasPolicyErrorCallout()).toBeTruthy();
     });
   });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
index 982377e2a0365..aaa2b3dafddde 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
 
 import { licensingMock } from '../../../../../licensing/public/mocks';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { initTestBed } from '../init_test_bed';
 
 describe('<EditPolicy /> frozen phase', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: TestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -28,28 +29,19 @@ describe('<EditPolicy /> frozen phase', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await initTestBed();
     });
 
     const { component } = testBed;
     component.update();
   });
 
-  test('shows timing only when enabled', async () => {
-    const { actions, exists } = testBed;
-
-    expect(exists('frozen-phase')).toBe(true);
-    expect(actions.frozen.hasMinAgeInput()).toBeFalsy();
-    await actions.togglePhase('frozen');
-    expect(actions.frozen.hasMinAgeInput()).toBeTruthy();
-  });
-
   describe('on non-enterprise license', () => {
     beforeEach(async () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await setup({
+        testBed = await initTestBed({
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
index 6b6db2da5946d..384478bcf4c66 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { createNodeAllocationActions, createSavePolicyAction, setReplicas } from '../../../helpers';
+import {
+  createNodeAllocationActions,
+  createReplicasAction,
+  createSavePolicyAction,
+} from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
 type SetupReturn = ReturnType<typeof setupGeneralNodeAllocation>;
@@ -20,7 +24,7 @@ export const setupGeneralNodeAllocation = async () => {
     actions: {
       ...createNodeAllocationActions(testBed, 'warm'),
       savePolicy: createSavePolicyAction(testBed),
-      setReplicas: (value: string) => setReplicas(testBed, 'warm', value),
+      ...createReplicasAction(testBed, 'warm'),
     },
   };
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
index 1cb895e9ac86a..02a700519cb05 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
@@ -6,11 +6,12 @@
  */
 
 import { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { initTestBed } from '../init_test_bed';
 
 describe('<EditPolicy /> request flyout', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: TestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -26,7 +27,7 @@ describe('<EditPolicy /> request flyout', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await initTestBed();
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
new file mode 100644
index 0000000000000..b15e956c84b4c
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
@@ -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 {
+  createForceMergeActions,
+  createMinAgeActions,
+  createReadonlyActions,
+  createRolloverActions,
+  createSearchableSnapshotActions,
+  createShrinkActions,
+  createTogglePhaseAction,
+} from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+
+type SetupReturn = ReturnType<typeof setupRolloverTestBed>;
+
+export type RolloverTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupRolloverTestBed = async () => {
+  const testBed = await initTestBed();
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      ...createRolloverActions(testBed),
+      hot: {
+        ...createForceMergeActions(testBed, 'hot'),
+        ...createShrinkActions(testBed, 'hot'),
+        ...createReadonlyActions(testBed, 'hot'),
+        ...createSearchableSnapshotActions(testBed, 'hot'),
+      },
+      warm: {
+        ...createMinAgeActions(testBed, 'warm'),
+      },
+      cold: {
+        ...createMinAgeActions(testBed, 'cold'),
+      },
+      frozen: {
+        ...createMinAgeActions(testBed, 'frozen'),
+      },
+      delete: {
+        ...createMinAgeActions(testBed, 'delete'),
+      },
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
index 8e9586e52577b..432b07efca038 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
@@ -6,12 +6,11 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { licensingMock } from '../../../../../licensing/public/mocks';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { RolloverTestBed, setupRolloverTestBed } from './rollover.helpers';
 
 describe('<EditPolicy /> rollover', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: RolloverTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   afterAll(() => {
@@ -22,11 +21,7 @@ describe('<EditPolicy /> rollover', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup({
-        appServicesContext: {
-          license: licensingMock.createLicense({ license: { type: 'enterprise' } }),
-        },
-      });
+      testBed = await setupRolloverTestBed();
     });
 
     const { component } = testBed;
@@ -35,14 +30,14 @@ describe('<EditPolicy /> rollover', () => {
 
   test('shows forcemerge when rollover enabled', async () => {
     const { actions } = testBed;
-    expect(actions.hot.forceMergeFieldExists()).toBeTruthy();
+    expect(actions.hot.forceMergeExists()).toBeTruthy();
   });
 
   test('hides forcemerge when rollover is disabled', async () => {
     const { actions } = testBed;
     await actions.rollover.toggleDefault();
     await actions.rollover.toggle();
-    expect(actions.hot.forceMergeFieldExists()).toBeFalsy();
+    expect(actions.hot.forceMergeExists()).toBeFalsy();
   });
 
   test('shows shrink input when rollover enabled', async () => {
@@ -71,6 +66,8 @@ describe('<EditPolicy /> rollover', () => {
 
   test('hides and disables searchable snapshot field', async () => {
     const { actions } = testBed;
+
+    expect(actions.hot.searchableSnapshotsExists()).toBeTruthy();
     await actions.rollover.toggleDefault();
     await actions.rollover.toggle();
     await actions.togglePhase('cold');
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
new file mode 100644
index 0000000000000..cdb5dc16d1964
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 {
+  createForceMergeActions,
+  createFreezeActions,
+  createMinAgeActions,
+  createReadonlyActions,
+  createRolloverActions,
+  createSavePolicyAction,
+  createSearchableSnapshotActions,
+  createShrinkActions,
+  createTogglePhaseAction,
+} from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+import { AppServicesContext } from '../../../../public/types';
+
+type SetupReturn = ReturnType<typeof setupSearchableSnapshotsTestBed>;
+
+export type SearchableSnapshotsTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupSearchableSnapshotsTestBed = async (args?: {
+  appServicesContext?: Partial<AppServicesContext>;
+}) => {
+  const testBed = await initTestBed(args);
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      savePolicy: createSavePolicyAction(testBed),
+      ...createRolloverActions(testBed),
+      hot: {
+        ...createSearchableSnapshotActions(testBed, 'hot'),
+        ...createForceMergeActions(testBed, 'hot'),
+        ...createShrinkActions(testBed, 'hot'),
+      },
+      warm: {
+        ...createForceMergeActions(testBed, 'warm'),
+        ...createShrinkActions(testBed, 'warm'),
+        ...createReadonlyActions(testBed, 'warm'),
+      },
+      cold: {
+        ...createMinAgeActions(testBed, 'cold'),
+        ...createSearchableSnapshotActions(testBed, 'cold'),
+        ...createFreezeActions(testBed, 'cold'),
+        ...createReadonlyActions(testBed, 'cold'),
+      },
+      frozen: {
+        ...createMinAgeActions(testBed, 'frozen'),
+        ...createSearchableSnapshotActions(testBed, 'frozen'),
+      },
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
index d400966cdae38..66f42d5482fdb 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
@@ -9,10 +9,13 @@ import { act } from 'react-dom/test-utils';
 import { licensingMock } from '../../../../../licensing/public/mocks';
 import { setupEnvironment } from '../../helpers';
 import { getDefaultHotPhasePolicy } from '../constants';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import {
+  SearchableSnapshotsTestBed,
+  setupSearchableSnapshotsTestBed,
+} from './searchable_snapshots.helpers';
 
 describe('<EditPolicy /> searchable snapshots', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: SearchableSnapshotsTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   afterAll(() => {
@@ -23,7 +26,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupSearchableSnapshotsTestBed();
     });
 
     const { component } = testBed;
@@ -36,7 +39,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
     await actions.togglePhase('warm');
     await actions.togglePhase('cold');
 
-    expect(actions.warm.forceMergeFieldExists()).toBeTruthy();
+    expect(actions.warm.forceMergeExists()).toBeTruthy();
     expect(actions.warm.shrinkExists()).toBeTruthy();
     expect(actions.warm.readonlyExists()).toBeTruthy();
     expect(actions.cold.searchableSnapshotsExists()).toBeTruthy();
@@ -45,7 +48,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
 
     await actions.hot.setSearchableSnapshot('my-repo');
 
-    expect(actions.warm.forceMergeFieldExists()).toBeFalsy();
+    expect(actions.warm.forceMergeExists()).toBeFalsy();
     expect(actions.warm.shrinkExists()).toBeFalsy();
     expect(actions.warm.readonlyExists()).toBeFalsy();
     // searchable snapshot in cold is still visible
@@ -60,7 +63,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
     await actions.rollover.toggle();
     await actions.rollover.toggleDefault();
 
-    expect(actions.hot.forceMergeFieldExists()).toBeTruthy();
+    expect(actions.hot.forceMergeExists()).toBeTruthy();
     expect(actions.hot.shrinkExists()).toBeTruthy();
     expect(actions.hot.searchableSnapshotsExists()).toBeTruthy();
   });
@@ -122,7 +125,9 @@ describe('<EditPolicy /> searchable snapshots', () => {
         httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['found-snapshots'] });
 
         await act(async () => {
-          testBed = await setup({ appServicesContext: { cloud: { isCloudEnabled: true } } });
+          testBed = await setupSearchableSnapshotsTestBed({
+            appServicesContext: { cloud: { isCloudEnabled: true } },
+          });
         });
 
         const { component } = testBed;
@@ -149,7 +154,9 @@ describe('<EditPolicy /> searchable snapshots', () => {
         httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['found-snapshots'] });
 
         await act(async () => {
-          testBed = await setup({ appServicesContext: { cloud: { isCloudEnabled: true } } });
+          testBed = await setupSearchableSnapshotsTestBed({
+            appServicesContext: { cloud: { isCloudEnabled: true } },
+          });
         });
 
         const { component } = testBed;
@@ -184,7 +191,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
       httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['my-repo'] });
 
       await act(async () => {
-        testBed = await setup({
+        testBed = await setupSearchableSnapshotsTestBed({
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
new file mode 100644
index 0000000000000..8303fdbac4837
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { createTogglePhaseAction } from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+import { Phase } from '../../../../common/types';
+
+type SetupReturn = ReturnType<typeof setupTimelineTestBed>;
+
+export type TimelineTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupTimelineTestBed = async () => {
+  const testBed = await initTestBed();
+  const { exists } = testBed;
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      timeline: {
+        hasPhase: (phase: Phase) => exists(`ilmTimelinePhase-${phase}`),
+      },
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
index a4f2a24bcee8b..33aeb80b38cae 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
@@ -7,10 +7,10 @@
 
 import { act } from 'react-dom/test-utils';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupTimelineTestBed, TimelineTestBed } from './timeline.helpers';
 
 describe('<EditPolicy /> timeline', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: TimelineTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   afterAll(() => {
@@ -21,7 +21,7 @@ describe('<EditPolicy /> timeline', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupTimelineTestBed();
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
new file mode 100644
index 0000000000000..57d6f53a21c78
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { createMinAgeActions, createTogglePhaseAction } from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+
+type SetupReturn = ReturnType<typeof setupTimingTestBed>;
+
+export type TimingTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupTimingTestBed = async () => {
+  const testBed = await initTestBed();
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      warm: {
+        ...createMinAgeActions(testBed, 'warm'),
+      },
+      cold: {
+        ...createMinAgeActions(testBed, 'cold'),
+      },
+      frozen: {
+        ...createMinAgeActions(testBed, 'frozen'),
+      },
+      delete: {
+        ...createMinAgeActions(testBed, 'delete'),
+      },
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
new file mode 100644
index 0000000000000..985ee807ed827
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { act } from 'react-dom/test-utils';
+import { setupEnvironment } from '../../helpers';
+import { setupTimingTestBed, TimingTestBed } from './timing.helpers';
+import { PhaseWithTiming } from '../../../../common/types';
+
+describe('<EditPolicy /> timing', () => {
+  let testBed: TimingTestBed;
+  const { server, httpRequestsMockHelpers } = setupEnvironment();
+
+  afterAll(() => {
+    server.restore();
+  });
+
+  beforeEach(async () => {
+    httpRequestsMockHelpers.setDefaultResponses();
+
+    await act(async () => {
+      testBed = await setupTimingTestBed();
+    });
+
+    const { component } = testBed;
+    component.update();
+  });
+
+  ['warm', 'cold', 'frozen', 'delete'].forEach((phase: string) => {
+    test(`timing is only shown when ${phase} phase is enabled`, async () => {
+      const { actions } = testBed;
+      const phaseWithTiming = phase as PhaseWithTiming;
+      expect(actions[phaseWithTiming].hasMinAgeInput()).toBeFalsy();
+      await actions.togglePhase(phaseWithTiming);
+      expect(actions[phaseWithTiming].hasMinAgeInput()).toBeTruthy();
+    });
+  });
+});
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
deleted file mode 100644
index ae9f306483820..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
+++ /dev/null
@@ -1,42 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-
-describe('<EditPolicy /> warm phase', () => {
-  let testBed: EditPolicyTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  beforeAll(() => {
-    jest.useFakeTimers();
-  });
-
-  afterAll(() => {
-    jest.useRealTimers();
-    server.restore();
-  });
-
-  beforeEach(async () => {
-    httpRequestsMockHelpers.setDefaultResponses();
-
-    await act(async () => {
-      testBed = await setup();
-    });
-
-    const { component } = testBed;
-    component.update();
-  });
-
-  test('shows timing only when enabled', async () => {
-    const { actions } = testBed;
-    expect(actions.warm.hasMinAgeInput()).toBeFalsy();
-    await actions.togglePhase('warm');
-    expect(actions.warm.hasMinAgeInput()).toBeTruthy();
-  });
-});
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
index 9a14571c6ec3b..4725631e6f894 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
@@ -8,10 +8,10 @@
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> cold phase validation', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: ValidationTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -35,7 +35,7 @@ describe('<EditPolicy /> cold phase validation', () => {
     ]);
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component, actions } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
index 0a047714bd345..1464f683ef766 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
@@ -7,10 +7,10 @@
 
 import { act } from 'react-dom/test-utils';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> error indicators', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: ValidationTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -26,7 +26,7 @@ describe('<EditPolicy /> error indicators', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
index 296b128eb8f52..6cbc28ec161f2 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
@@ -8,11 +8,11 @@
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> hot phase validation', () => {
-  let testBed: EditPolicyTestBed;
-  let actions: EditPolicyTestBed['actions'];
+  let testBed: ValidationTestBed;
+  let actions: ValidationTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -27,7 +27,7 @@ describe('<EditPolicy /> hot phase validation', () => {
   beforeEach(async () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component } = testBed;
@@ -159,13 +159,11 @@ describe('<EditPolicy /> hot phase validation', () => {
 
   describe('shrink', () => {
     test(`doesn't allow 0 for shrink`, async () => {
-      await actions.hot.toggleShrink();
       await actions.hot.setShrink('0');
       actions.errors.waitForValidation();
       actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
     test(`doesn't allow -1 for shrink`, async () => {
-      await actions.hot.toggleShrink();
       await actions.hot.setShrink('-1');
       actions.errors.waitForValidation();
       actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
index 08b794466da49..799fbf89d47df 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
@@ -8,12 +8,12 @@
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 import { getGeneratedPolicies } from '../constants';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> policy name validation', () => {
-  let testBed: EditPolicyTestBed;
-  let actions: EditPolicyTestBed['actions'];
+  let testBed: ValidationTestBed;
+  let actions: ValidationTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -29,7 +29,7 @@ describe('<EditPolicy /> policy name validation', () => {
     httpRequestsMockHelpers.setLoadPolicies(getGeneratedPolicies());
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component } = testBed;
@@ -56,7 +56,7 @@ describe('<EditPolicy /> policy name validation', () => {
 
   test(`doesn't allow to save as new policy but using the same name`, async () => {
     await act(async () => {
-      testBed = await setup({
+      testBed = await setupValidationTestBed({
         testBedConfig: {
           memoryRouter: {
             initialEntries: [`/policies/edit/testy0`],
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
index ac11e8a162e02..be4f99103b319 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
@@ -10,11 +10,11 @@ import { i18nTexts } from '../../../../public/application/sections/edit_policy/i
 
 import { PhaseWithTiming } from '../../../../common/types';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> timing validation', () => {
-  let testBed: EditPolicyTestBed;
-  let actions: EditPolicyTestBed['actions'];
+  let testBed: ValidationTestBed;
+  let actions: ValidationTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -31,7 +31,7 @@ describe('<EditPolicy /> timing validation', () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
new file mode 100644
index 0000000000000..84ee96cd46987
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
@@ -0,0 +1,47 @@
+/*
+ * 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 { TestBedConfig } from '@kbn/test/jest';
+import {
+  createColdPhaseActions,
+  createDeletePhaseActions,
+  createErrorsActions,
+  createFormSetValueAction,
+  createFormToggleAction,
+  createFrozenPhaseActions,
+  createHotPhaseActions,
+  createRolloverActions,
+  createSavePolicyAction,
+  createTogglePhaseAction,
+  createWarmPhaseActions,
+} from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+
+type SetupReturn = ReturnType<typeof setupValidationTestBed>;
+
+export type ValidationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupValidationTestBed = async (arg?: { testBedConfig?: Partial<TestBedConfig> }) => {
+  const testBed = await initTestBed(arg);
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      setPolicyName: createFormSetValueAction(testBed, 'policyNameField'),
+      savePolicy: createSavePolicyAction(testBed),
+      toggleSaveAsNewPolicy: createFormToggleAction(testBed, 'saveAsNewSwitch'),
+      ...createRolloverActions(testBed),
+      ...createErrorsActions(testBed),
+      ...createHotPhaseActions(testBed),
+      ...createWarmPhaseActions(testBed),
+      ...createColdPhaseActions(testBed),
+      ...createFrozenPhaseActions(testBed),
+      ...createDeletePhaseActions(testBed),
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
index bef99ea8cb891..0b8bfceebfaf4 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
@@ -8,10 +8,10 @@
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
 import { setupEnvironment } from '../../helpers';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { setupValidationTestBed, ValidationTestBed } from './validation.helpers';
 
 describe('<EditPolicy /> warm phase validation', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: ValidationTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -28,7 +28,7 @@ describe('<EditPolicy /> warm phase validation', () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupValidationTestBed();
     });
 
     const { component, actions } = testBed;
@@ -60,7 +60,6 @@ describe('<EditPolicy /> warm phase validation', () => {
   describe('shrink', () => {
     test(`doesn't allow 0 for shrink`, async () => {
       const { actions } = testBed;
-      await actions.warm.toggleShrink();
       await actions.warm.setShrink('0');
 
       actions.errors.waitForValidation();
@@ -69,7 +68,6 @@ describe('<EditPolicy /> warm phase validation', () => {
     });
     test(`doesn't allow -1 for shrink`, async () => {
       const { actions } = testBed;
-      await actions.warm.toggleShrink();
       await actions.warm.setShrink('-1');
 
       actions.errors.waitForValidation();
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
new file mode 100644
index 0000000000000..52d4debca9315
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
@@ -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 { AppServicesContext } from '../../../../public/types';
+import {
+  createColdPhaseActions,
+  createDeletePhaseActions,
+  createFormSetValueAction,
+  createFrozenPhaseActions,
+  createHotPhaseActions,
+  createRolloverActions,
+  createSavePolicyAction,
+  createTogglePhaseAction,
+  createWarmPhaseActions,
+} from '../../helpers';
+import { initTestBed } from '../init_test_bed';
+
+type SetupReturn = ReturnType<typeof setupSerializationTestBed>;
+
+export type SerializationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+
+export const setupSerializationTestBed = async (arg?: {
+  appServicesContext?: Partial<AppServicesContext>;
+}) => {
+  const testBed = await initTestBed(arg);
+
+  return {
+    ...testBed,
+    actions: {
+      togglePhase: createTogglePhaseAction(testBed),
+      savePolicy: createSavePolicyAction(testBed),
+      setPolicyName: createFormSetValueAction(testBed, 'policyNameField'),
+      ...createRolloverActions(testBed),
+      ...createHotPhaseActions(testBed),
+      ...createWarmPhaseActions(testBed),
+      ...createColdPhaseActions(testBed),
+      ...createFrozenPhaseActions(testBed),
+      ...createDeletePhaseActions(testBed),
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
index 8c345cf784f9f..6e164cc06681c 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
@@ -13,10 +13,10 @@ import {
   POLICY_WITH_INCLUDE_EXCLUDE,
   POLICY_WITH_KNOWN_AND_UNKNOWN_FIELDS,
 } from '../constants';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
+import { SerializationTestBed, setupSerializationTestBed } from './policy_serialization.helpers';
 
 describe('<EditPolicy /> serialization', () => {
-  let testBed: EditPolicyTestBed;
+  let testBed: SerializationTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   afterAll(() => {
@@ -27,7 +27,7 @@ describe('<EditPolicy /> serialization', () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setup();
+      testBed = await setupSerializationTestBed();
     });
 
     const { component } = testBed;
@@ -44,7 +44,7 @@ describe('<EditPolicy /> serialization', () => {
     it('preserves policy settings it did not configure', async () => {
       httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_KNOWN_AND_UNKNOWN_FIELDS]);
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupSerializationTestBed();
       });
 
       const { component, actions } = testBed;
@@ -91,7 +91,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setLoadPolicies([]);
 
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupSerializationTestBed();
       });
 
       const { component, actions } = testBed;
@@ -125,7 +125,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setLoadPolicies([]);
 
       await act(async () => {
-        testBed = await setup({
+        testBed = await setupSerializationTestBed({
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
@@ -171,10 +171,8 @@ describe('<EditPolicy /> serialization', () => {
       await actions.hot.toggleForceMerge();
       await actions.hot.setForcemergeSegmentsCount('123');
       await actions.hot.setBestCompression(true);
-      await actions.hot.toggleShrink();
       await actions.hot.setShrink('2');
       await actions.hot.toggleReadonly();
-      await actions.hot.toggleIndexPriority();
       await actions.hot.setIndexPriority('123');
 
       await actions.savePolicy();
@@ -243,7 +241,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupSerializationTestBed();
       });
 
       const { component } = testBed;
@@ -276,7 +274,6 @@ describe('<EditPolicy /> serialization', () => {
       await actions.warm.setDataAllocation('node_attrs');
       await actions.warm.setSelectedNodeAttribute('test:123');
       await actions.warm.setReplicas('123');
-      await actions.warm.toggleShrink();
       await actions.warm.setShrink('123');
       await actions.warm.toggleForceMerge();
       await actions.warm.setForcemergeSegmentsCount('123');
@@ -338,7 +335,7 @@ describe('<EditPolicy /> serialization', () => {
         httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
 
         await act(async () => {
-          testBed = await setup();
+          testBed = await setupSerializationTestBed();
         });
 
         const { component } = testBed;
@@ -375,7 +372,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await setup();
+        testBed = await setupSerializationTestBed();
       });
 
       const { component } = testBed;
@@ -504,7 +501,7 @@ describe('<EditPolicy /> serialization', () => {
         });
 
         await act(async () => {
-          testBed = await setup();
+          testBed = await setupSerializationTestBed();
         });
 
         const { component } = testBed;
@@ -534,7 +531,7 @@ describe('<EditPolicy /> serialization', () => {
     test('default value', async () => {
       const { actions } = testBed;
       await actions.togglePhase('delete');
-      await actions.delete.setWaitForSnapshotPolicy('test');
+      await actions.delete.setSnapshotPolicy('test');
       await actions.savePolicy();
       const latestRequest = server.requests[server.requests.length - 1];
       const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts
index a92747a95a2ca..7acc6a3e2f26b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts
@@ -32,9 +32,11 @@ const createExpectMessagesAction = (testBed: TestBed) => (
 export const createErrorsActions = (testBed: TestBed) => {
   const { exists } = testBed;
   return {
-    waitForValidation: createWaitForValidationAction(testBed),
-    haveGlobalCallout: () => exists('policyFormErrorsCallout'),
-    havePhaseCallout: (phase: Phase) => exists(`phaseErrorIndicator-${phase}`),
-    expectMessages: createExpectMessagesAction(testBed),
+    errors: {
+      waitForValidation: createWaitForValidationAction(testBed),
+      haveGlobalCallout: () => exists('policyFormErrorsCallout'),
+      havePhaseCallout: (phase: Phase) => exists(`phaseErrorIndicator-${phase}`),
+      expectMessages: createExpectMessagesAction(testBed),
+    },
   };
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts
index a7e4983165bac..400f3d2070e6a 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts
@@ -25,7 +25,7 @@ export const createForceMergeActions = (testBed: TestBed, phase: Phase) => {
   const { exists } = testBed;
   const toggleSelector = `${phase}-forceMergeSwitch`;
   return {
-    forceMergeFieldExists: () => exists(toggleSelector),
+    forceMergeExists: () => exists(toggleSelector),
     toggleForceMerge: createFormToggleAction(testBed, toggleSelector),
     setForcemergeSegmentsCount: createFormSetValueAction(
       testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_and_set_value_action.ts
similarity index 57%
rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts
rename to x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_and_set_value_action.ts
index b07d7783379fb..643e0f23a9dea 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_and_set_value_action.ts
@@ -6,16 +6,17 @@
  */
 
 import { TestBed } from '@kbn/test/jest';
-
-import { Phase } from '../../../../common/types';
 import { createFormToggleAction } from './form_toggle_action';
 import { createFormSetValueAction } from './form_set_value_action';
 
-export const setReplicas = async (testBed: TestBed, phase: Phase, value: string) => {
+export const createFormToggleAndSetValueAction = (
+  testBed: TestBed,
+  toggleSelector: string,
+  inputSelector: string
+) => async (value: string) => {
   const { exists } = testBed;
-
-  if (!exists(`${phase}-selectedReplicaCount`)) {
-    await createFormToggleAction(testBed, `${phase}-setReplicasSwitch`)();
+  if (!exists(inputSelector)) {
+    await createFormToggleAction(testBed, toggleSelector)();
   }
-  await createFormSetValueAction(testBed, `${phase}-selectedReplicaCount`)(value);
+  await createFormSetValueAction(testBed, inputSelector)(value);
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts
index 7366bf2f35c70..acfaee3c236e9 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts
@@ -7,17 +7,25 @@
 
 export { createNodeAllocationActions } from './node_allocation_actions';
 export { createTogglePhaseAction } from './toggle_phase_action';
-export { setReplicas } from './set_replicas_action';
+export { createReplicasAction } from './replicas_action';
 export { createSavePolicyAction } from './save_policy_action';
 export { createFormToggleAction } from './form_toggle_action';
 export { createFormSetValueAction } from './form_set_value_action';
+export { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action';
 export { createSearchableSnapshotActions } from './searchable_snapshot_actions';
 export { createErrorsActions } from './errors_actions';
 export { createRolloverActions } from './rollover_actions';
-export { createSetWaitForSnapshotAction } from './set_wait_for_snapshot_action';
+export { createSnapshotPolicyActions } from './snapshot_policy_actions';
 export { createMinAgeActions } from './min_age_actions';
 export { createForceMergeActions } from './forcemerge_actions';
 export { createReadonlyActions } from './readonly_actions';
 export { createIndexPriorityActions } from './index_priority_actions';
 export { createShrinkActions } from './shrink_actions';
 export { createFreezeActions } from './freeze_actions';
+export {
+  createHotPhaseActions,
+  createWarmPhaseActions,
+  createColdPhaseActions,
+  createFrozenPhaseActions,
+  createDeletePhaseActions,
+} from './phases';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts
index 3b48da2a0c69f..eeab42c408244 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts
@@ -8,7 +8,7 @@
 import { TestBed } from '@kbn/test/jest';
 import { Phase } from '../../../../common/types';
 import { createFormToggleAction } from './form_toggle_action';
-import { createFormSetValueAction } from './form_set_value_action';
+import { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action';
 
 export const createIndexPriorityActions = (testBed: TestBed, phase: Phase) => {
   const { exists } = testBed;
@@ -16,6 +16,10 @@ export const createIndexPriorityActions = (testBed: TestBed, phase: Phase) => {
   return {
     indexPriorityExists: () => exists(toggleSelector),
     toggleIndexPriority: createFormToggleAction(testBed, toggleSelector),
-    setIndexPriority: createFormSetValueAction(testBed, `${phase}-indexPriority`),
+    setIndexPriority: createFormToggleAndSetValueAction(
+      testBed,
+      toggleSelector,
+      `${phase}-indexPriority`
+    ),
   };
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
new file mode 100644
index 0000000000000..18cc0f01ca06c
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
@@ -0,0 +1,76 @@
+/*
+ * 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 { TestBed } from '@kbn/test/jest';
+import {
+  createForceMergeActions,
+  createShrinkActions,
+  createReadonlyActions,
+  createIndexPriorityActions,
+  createSearchableSnapshotActions,
+  createMinAgeActions,
+  createNodeAllocationActions,
+  createReplicasAction,
+  createFreezeActions,
+  createSnapshotPolicyActions,
+} from './';
+
+export const createHotPhaseActions = (testBed: TestBed) => {
+  return {
+    hot: {
+      ...createForceMergeActions(testBed, 'hot'),
+      ...createShrinkActions(testBed, 'hot'),
+      ...createReadonlyActions(testBed, 'hot'),
+      ...createIndexPriorityActions(testBed, 'hot'),
+      ...createSearchableSnapshotActions(testBed, 'hot'),
+    },
+  };
+};
+export const createWarmPhaseActions = (testBed: TestBed) => {
+  return {
+    warm: {
+      ...createMinAgeActions(testBed, 'warm'),
+      ...createForceMergeActions(testBed, 'warm'),
+      ...createShrinkActions(testBed, 'warm'),
+      ...createReadonlyActions(testBed, 'warm'),
+      ...createIndexPriorityActions(testBed, 'warm'),
+      ...createNodeAllocationActions(testBed, 'warm'),
+      ...createReplicasAction(testBed, 'warm'),
+    },
+  };
+};
+export const createColdPhaseActions = (testBed: TestBed) => {
+  return {
+    cold: {
+      ...createMinAgeActions(testBed, 'cold'),
+      ...createReplicasAction(testBed, 'cold'),
+      ...createReadonlyActions(testBed, 'cold'),
+      ...createFreezeActions(testBed, 'cold'),
+      ...createIndexPriorityActions(testBed, 'cold'),
+      ...createNodeAllocationActions(testBed, 'cold'),
+      ...createSearchableSnapshotActions(testBed, 'cold'),
+    },
+  };
+};
+
+export const createFrozenPhaseActions = (testBed: TestBed) => {
+  return {
+    frozen: {
+      ...createMinAgeActions(testBed, 'frozen'),
+      ...createSearchableSnapshotActions(testBed, 'frozen'),
+    },
+  };
+};
+
+export const createDeletePhaseActions = (testBed: TestBed) => {
+  return {
+    delete: {
+      ...createMinAgeActions(testBed, 'delete'),
+      ...createSnapshotPolicyActions(testBed),
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts
new file mode 100644
index 0000000000000..f987ce6d0ca2f
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action';
+
+export const createReplicasAction = (testBed: TestBed, phase: Phase) => {
+  return {
+    setReplicas: createFormToggleAndSetValueAction(
+      testBed,
+      `${phase}-setReplicasSwitch`,
+      `${phase}-selectedReplicaCount`
+    ),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts
index daf4db7fab278..6d05f3d63f577 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts
@@ -53,12 +53,14 @@ const createSetMaxSizeAction = (testBed: TestBed) => async (value: string, units
 export const createRolloverActions = (testBed: TestBed) => {
   const { exists } = testBed;
   return {
-    toggle: createFormToggleAction(testBed, 'rolloverSwitch'),
-    toggleDefault: createFormToggleAction(testBed, 'useDefaultRolloverSwitch'),
-    setMaxPrimaryShardSize: createSetPrimaryShardSizeAction(testBed),
-    setMaxDocs: createFormSetValueAction(testBed, 'hot-selectedMaxDocuments'),
-    setMaxAge: createSetMaxAgeAction(testBed),
-    setMaxSize: createSetMaxSizeAction(testBed),
-    hasSettingRequiredCallout: (): boolean => exists('rolloverSettingsRequired'),
+    rollover: {
+      toggle: createFormToggleAction(testBed, 'rolloverSwitch'),
+      toggleDefault: createFormToggleAction(testBed, 'useDefaultRolloverSwitch'),
+      setMaxPrimaryShardSize: createSetPrimaryShardSizeAction(testBed),
+      setMaxDocs: createFormSetValueAction(testBed, 'hot-selectedMaxDocuments'),
+      setMaxAge: createSetMaxAgeAction(testBed),
+      setMaxSize: createSetMaxSizeAction(testBed),
+      hasSettingRequiredCallout: (): boolean => exists('rolloverSettingsRequired'),
+    },
   };
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts
deleted file mode 100644
index a0bc9da8d3063..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts
+++ /dev/null
@@ -1,19 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { act } from 'react-dom/test-utils';
-import { TestBed } from '@kbn/test/jest';
-
-export const createSetWaitForSnapshotAction = (testBed: TestBed) => async (
-  snapshotPolicyName: string
-) => {
-  const { find, component } = testBed;
-  act(() => {
-    find('snapshotPolicyCombobox').simulate('change', [{ label: snapshotPolicyName }]);
-  });
-  component.update();
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts
index 0531850384124..29c3e4a04a9a1 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts
@@ -7,15 +7,17 @@
 
 import { TestBed } from '@kbn/test/jest';
 import { Phase } from '../../../../common/types';
-import { createFormToggleAction } from './form_toggle_action';
-import { createFormSetValueAction } from './form_set_value_action';
+import { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action';
 
 export const createShrinkActions = (testBed: TestBed, phase: Phase) => {
   const { exists } = testBed;
   const toggleSelector = `${phase}-shrinkSwitch`;
   return {
     shrinkExists: () => exists(toggleSelector),
-    toggleShrink: createFormToggleAction(testBed, toggleSelector),
-    setShrink: createFormSetValueAction(testBed, `${phase}-primaryShardCount`),
+    setShrink: createFormToggleAndSetValueAction(
+      testBed,
+      toggleSelector,
+      `${phase}-primaryShardCount`
+    ),
   };
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts
new file mode 100644
index 0000000000000..0a49c3cf295bd
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 { TestBed } from '@kbn/test/target/types/jest';
+import { act } from 'react-dom/test-utils';
+
+const createSetWaitForSnapshotAction = (testBed: TestBed) => async (snapshotPolicyName: string) => {
+  const { find, component } = testBed;
+  act(() => {
+    find('snapshotPolicyCombobox').simulate('change', [{ label: snapshotPolicyName }]);
+  });
+  component.update();
+};
+
+export const createSnapshotPolicyActions = (testBed: TestBed) => {
+  const { exists } = testBed;
+  return {
+    setSnapshotPolicy: createSetWaitForSnapshotAction(testBed),
+    hasCustomPolicyCallout: () => exists('customPolicyCallout'),
+    hasPolicyErrorCallout: () => exists('policiesErrorCallout'),
+    hasNoPoliciesCallout: () => exists('noPoliciesCallout'),
+  };
+};

From aefdb9c2b086878f4daa88ec7cc914fdb4f516ae Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Thu, 24 Jun 2021 09:54:38 -0600
Subject: [PATCH 54/95] [Maps] timeslider play button (#103147)

* [Maps] timeslider play button

* cancel subscription on unmount

* change playback speed to 1750

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../map_container/map_container.tsx           |  4 +-
 .../timeslider/timeslider.tsx                 | 60 +++++++++++++++++++
 .../maps/public/embeddable/map_embeddable.tsx |  2 +
 .../routes/map_page/map_app/map_app.tsx       |  1 +
 .../map_app/wait_until_time_layers_load.ts    |  7 ++-
 5 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index 788094ee1ab5c..0bdf462cca4b3 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -13,6 +13,7 @@ import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from 'src/plugins/data/public';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { Observable } from 'rxjs';
 import { MBMap } from '../mb_map';
 import { RightSideControls } from '../right_side_controls';
 import { Timeslider } from '../timeslider';
@@ -47,6 +48,7 @@ export interface Props {
   description?: string;
   settings: MapSettings;
   layerList: ILayer[];
+  waitUntilTimeLayersLoad$: Observable<void>;
 }
 
 interface State {
@@ -223,7 +225,7 @@ export class MapContainer extends Component<Props, State> {
           <RightSideControls />
         </EuiFlexItem>
 
-        <Timeslider />
+        <Timeslider waitForTimesliceToLoad$={this.props.waitUntilTimeLayersLoad$} />
 
         <EuiFlexItem
           className={classNames('mapMapLayerPanel', {
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
index 0b7bcb115eb95..fb3d87b3aa432 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
@@ -10,6 +10,8 @@ import React, { Component } from 'react';
 import { EuiButtonIcon, EuiDualRange, EuiText } from '@elastic/eui';
 import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks';
 import { i18n } from '@kbn/i18n';
+import { Observable, Subscription } from 'rxjs';
+import { first } from 'rxjs/operators';
 import { epochToKbnDateFormat, getInterval, getTicks } from './time_utils';
 import { TimeRange } from '../../../../../../src/plugins/data/common';
 import { getTimeFilter } from '../../kibana_services';
@@ -20,9 +22,11 @@ export interface Props {
   setTimeslice: (timeslice: Timeslice) => void;
   isTimesliderOpen: boolean;
   timeRange: TimeRange;
+  waitForTimesliceToLoad$: Observable<void>;
 }
 
 interface State {
+  isPaused: boolean;
   max: number;
   min: number;
   range: number;
@@ -44,6 +48,8 @@ export function Timeslider(props: Props) {
 
 class KeyedTimeslider extends Component<Props, State> {
   private _isMounted: boolean = false;
+  private _timeoutId: number | undefined;
+  private _subscription: Subscription | undefined;
 
   constructor(props: Props) {
     super(props);
@@ -59,6 +65,7 @@ class KeyedTimeslider extends Component<Props, State> {
     const timeslice: [number, number] = [min, max];
 
     this.state = {
+      isPaused: true,
       max,
       min,
       range: interval,
@@ -68,6 +75,7 @@ class KeyedTimeslider extends Component<Props, State> {
   }
 
   componentWillUnmount() {
+    this._onPause();
     this._isMounted = false;
   }
 
@@ -118,6 +126,44 @@ class KeyedTimeslider extends Component<Props, State> {
     }
   }, 300);
 
+  _onPlay = () => {
+    this.setState({ isPaused: false });
+    this._playNextFrame();
+  };
+
+  _onPause = () => {
+    this.setState({ isPaused: true });
+    if (this._subscription) {
+      this._subscription.unsubscribe();
+      this._subscription = undefined;
+    }
+    if (this._timeoutId) {
+      clearTimeout(this._timeoutId);
+      this._timeoutId = undefined;
+    }
+  };
+
+  _playNextFrame() {
+    // advance to next frame
+    this._onNext();
+
+    // use waitForTimesliceToLoad$ observable to wait until next frame loaded
+    // .pipe(first()) waits until the first value is emitted from an observable and then automatically unsubscribes
+    this._subscription = this.props.waitForTimesliceToLoad$.pipe(first()).subscribe(() => {
+      if (this.state.isPaused) {
+        return;
+      }
+
+      // use timeout to display frame for small time period before moving to next frame
+      this._timeoutId = window.setTimeout(() => {
+        if (this.state.isPaused) {
+          return;
+        }
+        this._playNextFrame();
+      }, 1750);
+    });
+  }
+
   render() {
     return (
       <div className="mapTimeslider">
@@ -154,6 +200,20 @@ class KeyedTimeslider extends Component<Props, State> {
                   defaultMessage: 'Next time window',
                 })}
               />
+              <EuiButtonIcon
+                onClick={this.state.isPaused ? this._onPlay : this._onPause}
+                iconType={this.state.isPaused ? 'play' : 'pause'}
+                color="text"
+                aria-label={
+                  this.state.isPaused
+                    ? i18n.translate('xpack.maps.timeslider.playLabel', {
+                        defaultMessage: 'Play',
+                      })
+                    : i18n.translate('xpack.maps.timeslider.pauseLabel', {
+                        defaultMessage: 'Pause',
+                      })
+                }
+              />
             </div>
           </div>
         </div>
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index 509cece671dd6..4670285aa9eff 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -73,6 +73,7 @@ import { SavedMap } from '../routes/map_page';
 import { getIndexPatternsFromIds } from '../index_pattern_util';
 import { getMapAttributeService } from '../map_attribute_service';
 import { isUrlDrilldown, toValueClickDataFormat } from '../trigger_actions/trigger_utils';
+import { waitUntilTimeLayersLoad$ } from '../routes/map_page/map_app/wait_until_time_layers_load';
 
 import {
   MapByValueInput,
@@ -345,6 +346,7 @@ export class MapEmbeddable
             renderTooltipContent={this._renderTooltipContent}
             title={this.getTitle()}
             description={this.getDescription()}
+            waitUntilTimeLayersLoad$={waitUntilTimeLayersLoad$(this._savedMap.getStore())}
           />
         </I18nContext>
       </Provider>,
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
index 92459ed28ab91..5231aab5d1194 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
@@ -455,6 +455,7 @@ export class MapApp extends React.Component<Props, State> {
             addFilters={this._addFilter}
             title={this.props.savedMap.getAttributes().title}
             description={this.props.savedMap.getAttributes().description}
+            waitUntilTimeLayersLoad$={waitUntilTimeLayersLoad$(this.props.savedMap.getStore())}
           />
         </div>
       </div>
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
index 7e08e49863fdf..1258539456c63 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { debounceTime, first, switchMap } from 'rxjs/operators';
+import { debounceTime, first, map, switchMap } from 'rxjs/operators';
 import { getLayerList } from '../../../selectors/map_selectors';
 import { MapStore } from '../../../reducers/store';
 
@@ -31,6 +31,11 @@ export function waitUntilTimeLayersLoad$(store: MapStore) {
         .filter(({ isFilteredByGlobalTime }) => isFilteredByGlobalTime)
         .some(({ layer }) => layer.isLayerLoading());
       return !areTimeLayersStillLoading;
+    }),
+    map(() => {
+      // Observable notifies subscriber when loading is finished
+      // Return void to not expose internal implemenation details of observabale
+      return;
     })
   );
 }

From 7e32f934aa3170a0a1197812bd5f2bce65060b2a Mon Sep 17 00:00:00 2001
From: ymao1 <ying.mao@elastic.co>
Date: Thu, 24 Jun 2021 12:20:16 -0400
Subject: [PATCH 55/95] [Alerting] Using new es client in alerting functional
 tests (#102349)

* Switching to new es client in alerting tests

* Fixing types

* Updating functional test

* Updating functional test

* Updating functional test

* Fixing error handling

* Fixing types

* Fixing error handling

* Fixing functional tests

* Fixing functional tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../common/lib/es_test_index_tool.ts          |  11 +-
 .../common/lib/index.ts                       |   2 +-
 .../common/lib/task_manager_utils.ts          |  20 ++-
 .../actions/builtin_action_types/es_index.ts  |   4 +-
 .../es_index_preconfigured.ts                 |   4 +-
 .../tests/actions/execute.ts                  |  18 +--
 .../tests/alerting/alerts.ts                  | 126 ++++++++++--------
 .../tests/alerting/create.ts                  |  13 +-
 .../tests/alerting/delete.ts                  |  12 +-
 .../tests/alerting/disable.ts                 |  12 +-
 .../tests/alerting/enable.ts                  |  21 ++-
 .../tests/alerting/health.ts                  |   2 +-
 .../tests/alerting/rbac_legacy.ts             |  12 +-
 .../actions/builtin_action_types/es_index.ts  |   4 +-
 .../preconfigured_alert_history_connector.ts  |  12 +-
 .../spaces_only/tests/actions/enqueue.ts      |   7 +-
 .../spaces_only/tests/actions/execute.ts      |  10 +-
 .../spaces_only/tests/alerting/alerts_base.ts |  26 ++--
 .../builtin_alert_types/es_query/alert.ts     |   2 +-
 .../es_query/create_test_data.ts              |   2 +-
 .../index_threshold/alert.ts                  |   2 +-
 .../index_threshold/create_test_data.ts       |   2 +-
 .../index_threshold/fields_endpoint.ts        |   2 +-
 .../index_threshold/indices_endpoint.ts       |   2 +-
 .../time_series_query_endpoint.ts             |   2 +-
 .../spaces_only/tests/alerting/create.ts      |  13 +-
 .../spaces_only/tests/alerting/delete.ts      |   6 +-
 .../spaces_only/tests/alerting/disable.ts     |   6 +-
 .../spaces_only/tests/alerting/enable.ts      |  13 +-
 .../event_log/service_api_integration.ts      |   4 +-
 30 files changed, 206 insertions(+), 166 deletions(-)

diff --git a/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts b/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
index 18655f2d72fda..1d5eb43ebe970 100644
--- a/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
@@ -59,7 +59,10 @@ export class ESTestIndexTool {
   }
 
   async destroy() {
-    return await this.es.indices.delete({ index: this.index, ignore: [404] });
+    const indexExists = (await this.es.indices.exists({ index: this.index })).body;
+    if (indexExists) {
+      return await this.es.indices.delete({ index: this.index });
+    }
   }
 
   async search(source: string, reference: string) {
@@ -90,10 +93,10 @@ export class ESTestIndexTool {
   async waitForDocs(source: string, reference: string, numDocs: number = 1) {
     return await this.retry.try(async () => {
       const searchResult = await this.search(source, reference);
-      if (searchResult.hits.total.value < numDocs) {
-        throw new Error(`Expected ${numDocs} but received ${searchResult.hits.total.value}.`);
+      if (searchResult.body.hits.total.value < numDocs) {
+        throw new Error(`Expected ${numDocs} but received ${searchResult.body.hits.total.value}.`);
       }
-      return searchResult.hits.hits;
+      return searchResult.body.hits.hits;
     });
   }
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/index.ts b/x-pack/test/alerting_api_integration/common/lib/index.ts
index 242ce7ed8d884..eeb9c88269667 100644
--- a/x-pack/test/alerting_api_integration/common/lib/index.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/index.ts
@@ -14,7 +14,7 @@ export {
   getConsumerUnauthorizedErrorMessage,
   getProducerUnauthorizedErrorMessage,
 } from './alert_utils';
-export { TaskManagerUtils } from './task_manager_utils';
+export { TaskManagerUtils, TaskManagerDoc } from './task_manager_utils';
 export * from './test_assertions';
 export { checkAAD } from './check_aad';
 export { getEventLog } from './get_event_log';
diff --git a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
index 73a9d93f7f329..57af1b1bcb035 100644
--- a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
@@ -5,6 +5,12 @@
  * 2.0.
  */
 
+import { SerializedConcreteTaskInstance } from '../../../../plugins/task_manager/server/task';
+
+export interface TaskManagerDoc {
+  type: string;
+  task: SerializedConcreteTaskInstance;
+}
 export class TaskManagerUtils {
   private readonly es: any;
   private readonly retry: any;
@@ -39,8 +45,8 @@ export class TaskManagerUtils {
           },
         },
       });
-      if (searchResult.hits.total.value) {
-        throw new Error(`Expected 0 tasks but received ${searchResult.hits.total.value}`);
+      if (searchResult.body.hits.total.value) {
+        throw new Error(`Expected 0 tasks but received ${searchResult.body.hits.total.value}`);
       }
     });
   }
@@ -77,8 +83,10 @@ export class TaskManagerUtils {
           },
         },
       });
-      if (searchResult.hits.total.value) {
-        throw new Error(`Expected 0 non-idle tasks but received ${searchResult.hits.total.value}`);
+      if (searchResult.body.hits.total.value) {
+        throw new Error(
+          `Expected 0 non-idle tasks but received ${searchResult.body.hits.total.value}`
+        );
       }
     });
   }
@@ -108,9 +116,9 @@ export class TaskManagerUtils {
           },
         },
       });
-      if (searchResult.hits.total.value) {
+      if (searchResult.body.hits.total.value) {
         throw new Error(
-          `Expected 0 action_task_params objects but received ${searchResult.hits.total.value}`
+          `Expected 0 action_task_params objects but received ${searchResult.body.hits.total.value}`
         );
       }
     });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
index cd60f0cef1710..3db58cb2adc3d 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts
@@ -13,7 +13,7 @@ const ES_TEST_INDEX_NAME = 'functional-test-actions-index';
 
 // eslint-disable-next-line import/no-default-export
 export default function indexTest({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertest = getService('supertest');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
 
@@ -273,5 +273,5 @@ async function getTestIndexItems(es: any) {
     index: ES_TEST_INDEX_NAME,
   });
 
-  return result.hits.hits;
+  return result.body.hits.hits;
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index_preconfigured.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index_preconfigured.ts
index 48f042473c14e..92a5d7d840276 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index_preconfigured.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index_preconfigured.ts
@@ -15,7 +15,7 @@ const ES_TEST_INDEX_NAME = 'functional-test-actions-index-preconfigured';
 
 // eslint-disable-next-line import/no-default-export
 export default function indexTest({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   const supertest = getService('supertest');
 
@@ -57,5 +57,5 @@ async function getTestIndexItems(es: any) {
     index: ES_TEST_INDEX_NAME,
   });
 
-  return result.hits.hits;
+  return result.body.hits.hits;
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
index 5c578d2d08dae..9091b96ff335a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
@@ -23,7 +23,7 @@ const NANOS_IN_MILLIS = 1000 * 1000;
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
@@ -97,8 +97,8 @@ export default function ({ getService }: FtrProviderContext) {
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(1);
-              const indexedRecord = searchResult.hits.hits[0];
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              const indexedRecord = searchResult.body.hits.hits[0];
               expect(indexedRecord._source).to.eql({
                 params: {
                   reference,
@@ -250,8 +250,8 @@ export default function ({ getService }: FtrProviderContext) {
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(1);
-              const indexedRecord = searchResult.hits.hits[0];
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              const indexedRecord = searchResult.body.hits.hits[0];
               expect(indexedRecord._source).to.eql({
                 params: {
                   reference,
@@ -453,8 +453,8 @@ export default function ({ getService }: FtrProviderContext) {
             case 'space_1_all_with_restricted_fixture at space1':
               expect(response.statusCode).to.eql(200);
               searchResult = await esTestIndexTool.search('action:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              indexedRecord = searchResult.hits.hits[0];
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              indexedRecord = searchResult.body.hits.hits[0];
               expect(indexedRecord._source.state).to.eql({
                 callClusterSuccess: false,
                 callScopedClusterSuccess: false,
@@ -477,8 +477,8 @@ export default function ({ getService }: FtrProviderContext) {
             case 'superuser at space1':
               expect(response.statusCode).to.eql(200);
               searchResult = await esTestIndexTool.search('action:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              indexedRecord = searchResult.hits.hits[0];
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              indexedRecord = searchResult.body.hits.hits[0];
               expect(indexedRecord._source.state).to.eql({
                 callClusterSuccess: true,
                 callScopedClusterSuccess: true,
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
index b3d83ae22f330..3131649e7c742 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -21,13 +22,18 @@ import {
   getEventLog,
 } from '../../../common/lib';
 import { IValidatedEvent } from '../../../../../plugins/event_log/server';
+import {
+  TaskRunning,
+  TaskRunningStage,
+} from '../../../../../plugins/task_manager/server/task_running';
+import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
@@ -128,11 +134,11 @@ export default function alertTests({ getService }: FtrProviderContext) {
                 'alert:test.always-firing',
                 reference
               );
-              expect(alertSearchResult.hits.total.value).to.eql(1);
-              const alertSearchResultWithoutDates = omit(alertSearchResult.hits.hits[0]._source, [
-                'alertInfo.createdAt',
-                'alertInfo.updatedAt',
-              ]);
+              expect(alertSearchResult.body.hits.total.value).to.eql(1);
+              const alertSearchResultWithoutDates = omit(
+                alertSearchResult.body.hits.hits[0]._source,
+                ['alertInfo.createdAt', 'alertInfo.updatedAt']
+              );
               expect(alertSearchResultWithoutDates).to.eql({
                 source: 'alert:test.always-firing',
                 reference,
@@ -171,10 +177,10 @@ export default function alertTests({ getService }: FtrProviderContext) {
                   ruleTypeName: 'Test: Always Firing',
                 },
               });
-              expect(alertSearchResult.hits.hits[0]._source.alertInfo.createdAt).to.match(
+              expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.createdAt).to.match(
                 /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
               );
-              expect(alertSearchResult.hits.hits[0]._source.alertInfo.updatedAt).to.match(
+              expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.updatedAt).to.match(
                 /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
               );
 
@@ -183,8 +189,8 @@ export default function alertTests({ getService }: FtrProviderContext) {
                 'action:test.index-record',
                 reference
               );
-              expect(actionSearchResult.hits.total.value).to.eql(1);
-              expect(actionSearchResult.hits.hits[0]._source).to.eql({
+              expect(actionSearchResult.body.hits.total.value).to.eql(1);
+              expect(actionSearchResult.body.hits.hits[0]._source).to.eql({
                 config: {
                   unencrypted: `This value shouldn't get encrypted`,
                 },
@@ -275,11 +281,11 @@ instanceStateValue: true
                 'alert:test.always-firing',
                 reference
               );
-              expect(alertSearchResult.hits.total.value).to.eql(1);
-              const alertSearchResultWithoutDates = omit(alertSearchResult.hits.hits[0]._source, [
-                'alertInfo.createdAt',
-                'alertInfo.updatedAt',
-              ]);
+              expect(alertSearchResult.body.hits.total.value).to.eql(1);
+              const alertSearchResultWithoutDates = omit(
+                alertSearchResult.body.hits.hits[0]._source,
+                ['alertInfo.createdAt', 'alertInfo.updatedAt']
+              );
               expect(alertSearchResultWithoutDates).to.eql({
                 source: 'alert:test.always-firing',
                 reference,
@@ -319,10 +325,10 @@ instanceStateValue: true
                 },
               });
 
-              expect(alertSearchResult.hits.hits[0]._source.alertInfo.createdAt).to.match(
+              expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.createdAt).to.match(
                 /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
               );
-              expect(alertSearchResult.hits.hits[0]._source.alertInfo.updatedAt).to.match(
+              expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.updatedAt).to.match(
                 /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
               );
               // Ensure only 1 action executed with proper params
@@ -330,8 +336,8 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(actionSearchResult.hits.total.value).to.eql(1);
-              expect(actionSearchResult.hits.hits[0]._source).to.eql({
+              expect(actionSearchResult.body.hits.total.value).to.eql(1);
+              expect(actionSearchResult.body.hits.hits[0]._source).to.eql({
                 config: {
                   unencrypted: 'ignored-but-required',
                 },
@@ -410,9 +416,9 @@ instanceStateValue: true
             reference2
           );
 
-          expect(alertSearchResult.hits.total.value).to.be.greaterThan(0);
+          expect(alertSearchResult.body.hits.total.value).to.be.greaterThan(0);
           const alertSearchResultInfoWithoutDates = omit(
-            alertSearchResult.hits.hits[0]._source.alertInfo,
+            alertSearchResult.body.hits.hits[0]._source.alertInfo,
             ['createdAt', 'updatedAt']
           );
           expect(alertSearchResultInfoWithoutDates).to.eql({
@@ -445,16 +451,16 @@ instanceStateValue: true
             ruleTypeName: 'Test: Always Firing',
           });
 
-          expect(alertSearchResult.hits.hits[0]._source.alertInfo.createdAt).to.match(
+          expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.createdAt).to.match(
             /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
           );
-          expect(alertSearchResult.hits.hits[0]._source.alertInfo.updatedAt).to.match(
+          expect(alertSearchResult.body.hits.hits[0]._source.alertInfo.updatedAt).to.match(
             /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
           );
         });
 
         it('should handle custom retry logic when appropriate', async () => {
-          const testStart = new Date();
+          const testStart = new Date().toISOString();
           // We have to provide the test.rate-limit the next runAt, for testing purposes
           const retryDate = new Date(Date.now() + 60000);
 
@@ -525,8 +531,12 @@ instanceStateValue: true
               objectRemover.add(space.id, response.body.id, 'rule', 'alerting');
 
               // Wait for the task to be attempted once and idle
-              const scheduledActionTask = await retry.try(async () => {
-                const searchResult = await es.search({
+              const scheduledActionTask: estypes.SearchHit<
+                TaskRunning<TaskRunningStage.RAN, ConcreteTaskInstance>
+              > = await retry.try(async () => {
+                const searchResult: ApiResponse<
+                  estypes.SearchResponse<TaskRunning<TaskRunningStage.RAN, ConcreteTaskInstance>>
+                > = await es.search({
                   index: '.kibana_task_manager',
                   body: {
                     query: {
@@ -559,12 +569,12 @@ instanceStateValue: true
                     },
                   },
                 });
-                expect(searchResult.hits.total.value).to.eql(1);
-                return searchResult.hits.hits[0];
+                expect((searchResult.body.hits.total as estypes.SearchTotalHits).value).to.eql(1);
+                return searchResult.body.hits.hits[0];
               });
 
               // Ensure the next runAt is set to the retryDate by custom logic
-              expect(scheduledActionTask._source.task.runAt).to.eql(retryDate.toISOString());
+              expect(scheduledActionTask._source!.task.runAt).to.eql(retryDate.toISOString());
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -620,21 +630,21 @@ instanceStateValue: true
 
               // Ensure only 1 document exists with proper params
               searchResult = await esTestIndexTool.search('alert:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              expect(searchResult.hits.hits[0]._source.state).to.eql({
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.hits[0]._source.state).to.eql({
                 callClusterSuccess: false,
                 callScopedClusterSuccess: false,
                 savedObjectsClientSuccess: false,
                 callClusterError: {
-                  ...searchResult.hits.hits[0]._source.state.callClusterError,
+                  ...searchResult.body.hits.hits[0]._source.state.callClusterError,
                 },
                 callScopedClusterError: {
-                  ...searchResult.hits.hits[0]._source.state.callScopedClusterError,
+                  ...searchResult.body.hits.hits[0]._source.state.callScopedClusterError,
                 },
                 savedObjectsClientError: {
-                  ...searchResult.hits.hits[0]._source.state.savedObjectsClientError,
+                  ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError,
                   output: {
-                    ...searchResult.hits.hits[0]._source.state.savedObjectsClientError.output,
+                    ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError.output,
                     statusCode: 403,
                   },
                 },
@@ -651,15 +661,15 @@ instanceStateValue: true
 
               // Ensure only 1 document exists with proper params
               searchResult = await esTestIndexTool.search('alert:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              expect(searchResult.hits.hits[0]._source.state).to.eql({
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.hits[0]._source.state).to.eql({
                 callClusterSuccess: true,
                 callScopedClusterSuccess: true,
                 savedObjectsClientSuccess: false,
                 savedObjectsClientError: {
-                  ...searchResult.hits.hits[0]._source.state.savedObjectsClientError,
+                  ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError,
                   output: {
-                    ...searchResult.hits.hits[0]._source.state.savedObjectsClientError.output,
+                    ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError.output,
                     statusCode: 404,
                   },
                 },
@@ -737,21 +747,21 @@ instanceStateValue: true
 
               // Ensure only 1 document with proper params exists
               searchResult = await esTestIndexTool.search('action:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              expect(searchResult.hits.hits[0]._source.state).to.eql({
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.hits[0]._source.state).to.eql({
                 callClusterSuccess: false,
                 callScopedClusterSuccess: false,
                 savedObjectsClientSuccess: false,
                 callClusterError: {
-                  ...searchResult.hits.hits[0]._source.state.callClusterError,
+                  ...searchResult.body.hits.hits[0]._source.state.callClusterError,
                 },
                 callScopedClusterError: {
-                  ...searchResult.hits.hits[0]._source.state.callScopedClusterError,
+                  ...searchResult.body.hits.hits[0]._source.state.callScopedClusterError,
                 },
                 savedObjectsClientError: {
-                  ...searchResult.hits.hits[0]._source.state.savedObjectsClientError,
+                  ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError,
                   output: {
-                    ...searchResult.hits.hits[0]._source.state.savedObjectsClientError.output,
+                    ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError.output,
                     statusCode: 403,
                   },
                 },
@@ -776,15 +786,15 @@ instanceStateValue: true
 
               // Ensure only 1 document with proper params exists
               searchResult = await esTestIndexTool.search('action:test.authorization', reference);
-              expect(searchResult.hits.total.value).to.eql(1);
-              expect(searchResult.hits.hits[0]._source.state).to.eql({
+              expect(searchResult.body.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.hits[0]._source.state).to.eql({
                 callClusterSuccess: true,
                 callScopedClusterSuccess: true,
                 savedObjectsClientSuccess: false,
                 savedObjectsClientError: {
-                  ...searchResult.hits.hits[0]._source.state.savedObjectsClientError,
+                  ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError,
                   output: {
-                    ...searchResult.hits.hits[0]._source.state.savedObjectsClientError.output,
+                    ...searchResult.body.hits.hits[0]._source.state.savedObjectsClientError.output,
                     statusCode: 404,
                   },
                 },
@@ -842,7 +852,7 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.total.value).to.eql(1);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -921,8 +931,8 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(2);
-              const messages: string[] = searchResult.hits.hits.map(
+              expect(searchResult.body.hits.total.value).to.eql(2);
+              const messages: string[] = searchResult.body.hits.hits.map(
                 (hit: { _source: { params: { message: string } } }) => hit._source.params.message
               );
               expect(messages.sort()).to.eql(['from:default', 'from:other']);
@@ -995,8 +1005,8 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(2);
-              const messages: string[] = searchResult.hits.hits.map(
+              expect(searchResult.body.hits.total.value).to.eql(2);
+              const messages: string[] = searchResult.body.hits.hits.map(
                 (hit: { _source: { params: { message: string } } }) => hit._source.params.message
               );
               expect(messages.sort()).to.eql(['from:default:next', 'from:default:prev']);
@@ -1058,7 +1068,7 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(2);
+              expect(searchResult.body.hits.total.value).to.eql(2);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -1116,7 +1126,7 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(executedActionsResult.hits.total.value).to.eql(0);
+              expect(executedActionsResult.body.hits.total.value).to.eql(0);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -1174,7 +1184,7 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(executedActionsResult.hits.total.value).to.eql(0);
+              expect(executedActionsResult.body.hits.total.value).to.eql(0);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -1233,7 +1243,7 @@ instanceStateValue: true
                 'action:test.index-record',
                 reference
               );
-              expect(searchResult.hits.total.value).to.eql(1);
+              expect(searchResult.body.hits.total.value).to.eql(1);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
index 70cafe407de29..f481eaded4eb2 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { UserAtSpaceScenarios } from '../../scenarios';
 import {
   checkAAD,
@@ -14,13 +15,14 @@ import {
   getUrlPrefix,
   ObjectRemover,
   getProducerUnauthorizedErrorMessage,
+  TaskManagerDoc,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('create', () => {
@@ -28,11 +30,12 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
 
     after(() => objectRemover.removeAll());
 
-    async function getScheduledTask(id: string) {
-      return await es.get({
+    async function getScheduledTask(id: string): Promise<TaskManagerDoc> {
+      const scheduledTask: ApiResponse<estypes.GetResponse<TaskManagerDoc>> = await es.get({
         id: `task:${id}`,
         index: '.kibana_task_manager',
       });
+      return scheduledTask.body._source!;
     }
 
     for (const scenario of UserAtSpaceScenarios) {
@@ -127,9 +130,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
               expect(Date.parse(response.body.created_at)).to.be.greaterThan(0);
               expect(Date.parse(response.body.updated_at)).to.be.greaterThan(0);
 
-              const { _source: taskRecord } = await getScheduledTask(
-                response.body.scheduled_task_id
-              );
+              const taskRecord = await getScheduledTask(response.body.scheduled_task_id);
               expect(taskRecord.type).to.eql('task');
               expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
               expect(JSON.parse(taskRecord.task.params)).to.eql({
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts
index 2cbb16ababd10..d43fb2e7d835f 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts
@@ -19,7 +19,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createDeleteTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
@@ -78,7 +78,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -131,7 +131,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -198,7 +198,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -258,7 +258,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -353,7 +353,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
index b265451bbd632..66f01000ede5e 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
@@ -20,7 +20,7 @@ import {
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
@@ -101,7 +101,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               // Ensure AAD isn't broken
               await checkAAD({
@@ -157,7 +157,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -217,7 +217,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -273,7 +273,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -332,7 +332,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               // Ensure AAD isn't broken
               await checkAAD({
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
index 70e286b795720..d836f615e5349 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { UserAtSpaceScenarios } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -16,11 +17,12 @@ import {
   ObjectRemover,
   getConsumerUnauthorizedErrorMessage,
   getProducerUnauthorizedErrorMessage,
+  TaskManagerDoc,
 } from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
@@ -30,11 +32,12 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
 
     after(() => objectRemover.removeAll());
 
-    async function getScheduledTask(id: string) {
-      return await es.get({
+    async function getScheduledTask(id: string): Promise<TaskManagerDoc> {
+      const scheduledTask: ApiResponse<estypes.GetResponse<TaskManagerDoc>> = await es.get({
         id: `task:${id}`,
         index: '.kibana_task_manager',
       });
+      return scheduledTask.body._source!;
     }
 
     for (const scenario of UserAtSpaceScenarios) {
@@ -119,9 +122,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
                 .auth(user.username, user.password)
                 .expect(200);
               expect(typeof updatedAlert.scheduled_task_id).to.eql('string');
-              const { _source: taskRecord } = await getScheduledTask(
-                updatedAlert.scheduled_task_id
-              );
+              const taskRecord = await getScheduledTask(updatedAlert.scheduled_task_id);
               expect(taskRecord.type).to.eql('task');
               expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
               expect(JSON.parse(taskRecord.task.params)).to.eql({
@@ -182,7 +183,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -292,7 +293,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
                 await getScheduledTask(createdAlert.scheduled_task_id);
                 throw new Error('Should have removed scheduled task');
               } catch (e) {
-                expect(e.status).to.eql(404);
+                expect(e.meta.statusCode).to.eql(404);
               }
               break;
             default:
@@ -351,9 +352,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
                 .auth(user.username, user.password)
                 .expect(200);
               expect(typeof updatedAlert.scheduled_task_id).to.eql('string');
-              const { _source: taskRecord } = await getScheduledTask(
-                updatedAlert.scheduled_task_id
-              );
+              const taskRecord = await getScheduledTask(updatedAlert.scheduled_task_id);
               expect(taskRecord.type).to.eql('task');
               expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
               expect(JSON.parse(taskRecord.task.params)).to.eql({
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts
index 668de3eb4fb9e..21e5c782d185c 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts
@@ -20,7 +20,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default function createFindTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
index 2294cbcc95aa4..7bc3353898598 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
@@ -14,7 +14,7 @@ import { setupSpacesAndUsers } from '..';
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const esArchiver = getService('esArchiver');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
@@ -204,11 +204,11 @@ export default function alertTests({ getService }: FtrProviderContext) {
             // ensure the alert still runs and that it can schedule actions
             const numberOfAlertExecutions = (
               await esTestIndexTool.search('alert:test.always-firing', reference)
-            ).hits.total.value;
+            ).body.hits.total.value;
 
             const numberOfActionExecutions = (
               await esTestIndexTool.search('action:test.index-record', reference)
-            ).hits.total.value;
+            ).body.hits.total.value;
 
             // wait for alert to execute and for its action to be scheduled and run
             await retry.try(async () => {
@@ -222,8 +222,10 @@ export default function alertTests({ getService }: FtrProviderContext) {
                 reference
               );
 
-              expect(alertSearchResult.hits.total.value).to.be.greaterThan(numberOfAlertExecutions);
-              expect(actionSearchResult.hits.total.value).to.be.greaterThan(
+              expect(alertSearchResult.body.hits.total.value).to.be.greaterThan(
+                numberOfAlertExecutions
+              );
+              expect(actionSearchResult.body.hits.total.value).to.be.greaterThan(
                 numberOfActionExecutions
               );
             });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
index 2496800b8071c..3f4cef25ff65e 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts
@@ -13,7 +13,7 @@ const ES_TEST_INDEX_NAME = 'functional-test-actions-index';
 
 // eslint-disable-next-line import/no-default-export
 export default function indexTest({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertest = getService('supertest');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
 
@@ -149,5 +149,5 @@ async function getTestIndexItems(es: any) {
     index: ES_TEST_INDEX_NAME,
   });
 
-  return result.hits.hits;
+  return result.body.hits.hits;
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
index cf8a0f99d4394..fe0f5d3ecbade 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { getTestAlertData, ObjectRemover } from '../../../../common/lib';
 import { AlertHistoryDefaultIndexName } from '../../../../../../plugins/actions/common';
@@ -17,7 +17,7 @@ const ALERT_HISTORY_OVERRIDE_INDEX = 'kibana-alert-history-not-the-default';
 export default function preconfiguredAlertHistoryConnectorTests({
   getService,
 }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertest = getService('supertest');
   const retry = getService('retry');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
@@ -66,10 +66,10 @@ export default function preconfiguredAlertHistoryConnectorTests({
       await waitForStatus(response.body.id, new Set(['active']));
 
       await retry.try(async () => {
-        const result = await es.search({
+        const result: ApiResponse<estypes.SearchResponse<any>> = await es.search({
           index: AlertHistoryDefaultIndexName,
         });
-        const indexedItems = result.hits.hits;
+        const indexedItems = result.body.hits.hits;
         expect(indexedItems.length).to.eql(1);
 
         const indexedDoc = indexedItems[0]._source;
@@ -104,10 +104,10 @@ export default function preconfiguredAlertHistoryConnectorTests({
       await waitForStatus(response.body.id, new Set(['active']));
 
       await retry.try(async () => {
-        const result = await es.search({
+        const result: ApiResponse<estypes.SearchResponse<any>> = await es.search({
           index: ALERT_HISTORY_OVERRIDE_INDEX,
         });
-        const indexedItems = result.hits.hits;
+        const indexedItems = result.body.hits.hits;
         expect(indexedItems.length).to.eql(1);
 
         const indexedDoc = indexedItems[0]._source;
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/enqueue.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/enqueue.ts
index b6e47df315273..f937e63840937 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/enqueue.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/enqueue.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import type { estypes } from '@elastic/elasticsearch';
 import { Spaces } from '../../scenarios';
 import {
   ESTestIndexTool,
@@ -18,7 +19,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
@@ -70,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should cleanup task after a failure', async () => {
-      const testStart = new Date();
+      const testStart = new Date().toISOString();
       const { body: createdAction } = await supertest
         .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`)
         .set('kbn-xsrf', 'foo')
@@ -135,7 +136,7 @@ export default function ({ getService }: FtrProviderContext) {
             },
           },
         });
-        expect(searchResult.hits.total.value).to.eql(0);
+        expect((searchResult.body.hits.total as estypes.SearchTotalHits).value).to.eql(0);
       });
     });
   });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
index 38f3a17f317c2..d765512d6b5f1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
@@ -22,7 +22,7 @@ const NANOS_IN_MILLIS = 1000 * 1000;
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
@@ -76,8 +76,8 @@ export default function ({ getService }: FtrProviderContext) {
       expect(response.status).to.eql(200);
       expect(response.body).to.be.an('object');
       const searchResult = await esTestIndexTool.search('action:test.index-record', reference);
-      expect(searchResult.hits.total.value).to.eql(1);
-      const indexedRecord = searchResult.hits.hits[0];
+      expect(searchResult.body.hits.total.value).to.eql(1);
+      const indexedRecord = searchResult.body.hits.hits[0];
       expect(indexedRecord._source).to.eql({
         params: {
           reference,
@@ -211,8 +211,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       expect(response.status).to.eql(200);
       const searchResult = await esTestIndexTool.search('action:test.authorization', reference);
-      expect(searchResult.hits.total.value).to.eql(1);
-      const indexedRecord = searchResult.hits.hits[0];
+      expect(searchResult.body.hits.total.value).to.eql(1);
+      const indexedRecord = searchResult.body.hits.hits[0];
       expect(indexedRecord._source.state).to.eql({
         callClusterSuccess: true,
         callScopedClusterSuccess: true,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
index 2ddea4e3ef299..999135993d069 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { Response as SupertestResponse } from 'supertest';
 import { RecoveredActionGroup } from '../../../../../plugins/alerting/common';
 import { Space } from '../../../common/types';
@@ -21,10 +22,15 @@ import {
   ensureDatetimeIsWithinRange,
   TaskManagerUtils,
 } from '../../../common/lib';
+import {
+  TaskRunning,
+  TaskRunningStage,
+} from '../../../../../plugins/task_manager/server/task_running';
+import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 export function alertTests({ getService }: FtrProviderContext, space: Space) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
   const taskManagerUtils = new TaskManagerUtils(es, retry);
@@ -292,7 +298,7 @@ instanceStateValue: true
       await taskManagerUtils.waitForActionTaskParamsToBeCleanedUp(testStart);
 
       const actionTestRecord = await esTestIndexTool.search('action:test.index-record', reference);
-      expect(actionTestRecord.hits.total.value).to.eql(0);
+      expect(actionTestRecord.body.hits.total.value).to.eql(0);
       objectRemover.add(space.id, alertId, 'rule', 'alerting');
     });
 
@@ -327,7 +333,7 @@ instanceStateValue: true
 
     it('should handle custom retry logic', async () => {
       // We'll use this start time to query tasks created after this point
-      const testStart = new Date();
+      const testStart = new Date().toISOString();
       // We have to provide the test.rate-limit the next runAt, for testing purposes
       const retryDate = new Date(Date.now() + 60000);
 
@@ -370,8 +376,12 @@ instanceStateValue: true
 
       expect(response.statusCode).to.eql(200);
       objectRemover.add(space.id, response.body.id, 'rule', 'alerting');
-      const scheduledActionTask = await retry.try(async () => {
-        const searchResult = await es.search({
+      const scheduledActionTask: estypes.SearchHit<
+        TaskRunning<TaskRunningStage.RAN, ConcreteTaskInstance>
+      > = await retry.try(async () => {
+        const searchResult: ApiResponse<
+          estypes.SearchResponse<TaskRunning<TaskRunningStage.RAN, ConcreteTaskInstance>>
+        > = await es.search({
           index: '.kibana_task_manager',
           body: {
             query: {
@@ -404,10 +414,10 @@ instanceStateValue: true
             },
           },
         });
-        expect(searchResult.hits.total.value).to.eql(1);
-        return searchResult.hits.hits[0];
+        expect((searchResult.body.hits.total as estypes.SearchTotalHits).value).to.eql(1);
+        return searchResult.body.hits.hits[0];
       });
-      expect(scheduledActionTask._source.task.runAt).to.eql(retryDate.toISOString());
+      expect(scheduledActionTask._source!.task.runAt).to.eql(retryDate.toISOString());
     });
 
     it('should have proper callCluster and savedObjectsClient authorization for alert type executor', async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/alert.ts
index ebc03ffb0e952..29f2ed40be790 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/alert.ts
@@ -32,7 +32,7 @@ const ES_GROUPS_TO_WRITE = 3;
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
   const esTestIndexToolOutput = new ESTestIndexTool(es, retry, ES_TEST_OUTPUT_INDEX_NAME);
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/create_test_data.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/create_test_data.ts
index 8c8d8e84132a9..f3c707c58af1c 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/create_test_data.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/es_query/create_test_data.ts
@@ -54,7 +54,7 @@ async function createEsDocument(es: any, epochMillis: number, testedValue: numbe
     body: document,
   });
 
-  if (response.result !== 'created') {
+  if (response.body.result !== 'created') {
     throw new Error(`document not created: ${JSON.stringify(response)}`);
   }
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
index 3d7e391d7530f..6ea4cbf0e96ba 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
@@ -31,7 +31,7 @@ const ALERT_INTERVAL_MILLIS = ALERT_INTERVAL_SECONDS * 1000;
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
   const esTestIndexToolOutput = new ESTestIndexTool(es, retry, ES_TEST_OUTPUT_INDEX_NAME);
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
index 9c36831f61f76..b9faadcd3d4b7 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
@@ -66,7 +66,7 @@ async function createEsDocument(es: any, epochMillis: number, testedValue: numbe
   });
   // console.log(`writing document to ${ES_TEST_INDEX_NAME}:`, JSON.stringify(document, null, 4));
 
-  if (response.result !== 'created') {
+  if (response.body.result !== 'created') {
     throw new Error(`document not created: ${JSON.stringify(response)}`);
   }
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
index 4971a09f9632c..0a48e206e020e 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
@@ -17,7 +17,7 @@ const API_URI = 'api/triggers_actions_ui/data/_fields';
 export default function fieldsEndpointTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
   describe('fields endpoint', () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
index d994ada5842d3..6d4f4a6aa6cc9 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
@@ -18,7 +18,7 @@ const API_URI = 'api/triggers_actions_ui/data/_indices';
 export default function indicesEndpointTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
   describe('indices endpoint', () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
index 49fe427e50af4..741f198607c3e 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
@@ -51,7 +51,7 @@ const START_DATE_MINUS_2INTERVALS = getStartDate(-2 * INTERVAL_MILLIS);
 export default function timeSeriesQueryEndpointTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
   describe('time_series_query endpoint', () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
index 96534c192d67c..6f0f78b6d63ee 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { Spaces } from '../../scenarios';
 import {
   checkAAD,
@@ -13,24 +14,26 @@ import {
   getTestAlertData,
   ObjectRemover,
   getConsumerUnauthorizedErrorMessage,
+  TaskManagerDoc,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('create', () => {
     const objectRemover = new ObjectRemover(supertest);
 
     after(() => objectRemover.removeAll());
 
-    async function getScheduledTask(id: string) {
-      return await es.get({
+    async function getScheduledTask(id: string): Promise<TaskManagerDoc> {
+      const scheduledTask: ApiResponse<estypes.GetResponse<TaskManagerDoc>> = await es.get({
         id: `task:${id}`,
         index: '.kibana_task_manager',
       });
+      return scheduledTask.body._source!;
     }
 
     it('should handle create alert request appropriately', async () => {
@@ -96,7 +99,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
       expect(Date.parse(response.body.updated_at)).to.eql(Date.parse(response.body.created_at));
 
       expect(typeof response.body.scheduled_task_id).to.be('string');
-      const { _source: taskRecord } = await getScheduledTask(response.body.scheduled_task_id);
+      const taskRecord = await getScheduledTask(response.body.scheduled_task_id);
       expect(taskRecord.type).to.eql('task');
       expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
       expect(JSON.parse(taskRecord.task.params)).to.eql({
@@ -328,7 +331,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
         expect(Date.parse(response.body.updatedAt)).to.eql(Date.parse(response.body.createdAt));
 
         expect(typeof response.body.scheduledTaskId).to.be('string');
-        const { _source: taskRecord } = await getScheduledTask(response.body.scheduledTaskId);
+        const taskRecord = await getScheduledTask(response.body.scheduledTaskId);
         expect(taskRecord.type).to.eql('task');
         expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
         expect(JSON.parse(taskRecord.task.params)).to.eql({
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/delete.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/delete.ts
index 04ae217d47760..0a2df70b6316a 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/delete.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/delete.ts
@@ -13,7 +13,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createDeleteTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('delete', () => {
     const objectRemover = new ObjectRemover(supertest);
@@ -43,7 +43,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
         await getScheduledTask(createdAlert.scheduledTaskId);
         throw new Error('Should have removed scheduled task');
       } catch (e) {
-        expect(e.status).to.eql(404);
+        expect(e.meta.statusCode).to.eql(404);
       }
     });
 
@@ -81,7 +81,7 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
           await getScheduledTask(createdAlert.scheduledTaskId);
           throw new Error('Should have removed scheduled task');
         } catch (e) {
-          expect(e.status).to.eql(404);
+          expect(e.meta.statusCode).to.eql(404);
         }
       });
     });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
index 60749343cf269..7e93cf453929b 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
@@ -18,7 +18,7 @@ import {
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('disable', () => {
@@ -48,7 +48,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
         await getScheduledTask(createdAlert.scheduledTaskId);
         throw new Error('Should have removed scheduled task');
       } catch (e) {
-        expect(e.status).to.eql(404);
+        expect(e.meta.statusCode).to.eql(404);
       }
 
       // Ensure AAD isn't broken
@@ -93,7 +93,7 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
           await getScheduledTask(createdAlert.scheduledTaskId);
           throw new Error('Should have removed scheduled task');
         } catch (e) {
-          expect(e.status).to.eql(404);
+          expect(e.meta.statusCode).to.eql(404);
         }
 
         // Ensure AAD isn't broken
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
index f0b0d1f34a277..881931252ed5f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import { Spaces } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -14,11 +15,12 @@ import {
   getUrlPrefix,
   getTestAlertData,
   ObjectRemover,
+  TaskManagerDoc,
 } from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('enable', () => {
@@ -27,11 +29,12 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
 
     after(() => objectRemover.removeAll());
 
-    async function getScheduledTask(id: string) {
-      return await es.get({
+    async function getScheduledTask(id: string): Promise<TaskManagerDoc> {
+      const scheduledTask: ApiResponse<estypes.GetResponse<TaskManagerDoc>> = await es.get({
         id: `task:${id}`,
         index: '.kibana_task_manager',
       });
+      return scheduledTask.body._source!;
     }
 
     it('should handle enable alert request appropriately', async () => {
@@ -49,7 +52,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(typeof updatedAlert.scheduled_task_id).to.eql('string');
-      const { _source: taskRecord } = await getScheduledTask(updatedAlert.scheduled_task_id);
+      const taskRecord = await getScheduledTask(updatedAlert.scheduled_task_id);
       expect(taskRecord.type).to.eql('task');
       expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
       expect(JSON.parse(taskRecord.task.params)).to.eql({
@@ -100,7 +103,7 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
           .set('kbn-xsrf', 'foo')
           .expect(200);
         expect(typeof updatedAlert.scheduled_task_id).to.eql('string');
-        const { _source: taskRecord } = await getScheduledTask(updatedAlert.scheduled_task_id);
+        const taskRecord = await getScheduledTask(updatedAlert.scheduled_task_id);
         expect(taskRecord.type).to.eql('task');
         expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
         expect(JSON.parse(taskRecord.task.params)).to.eql({
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index 960deb692ac8d..e17b1400e6781 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -12,7 +12,7 @@ import { IEvent } from '../../../../plugins/event_log/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const supertest = getService('supertest');
   const log = getService('log');
   const config = getService('config');
@@ -41,7 +41,7 @@ export default function ({ getService }: FtrProviderContext) {
         .find((val: string) => val === '--xpack.eventLog.indexEntries=true');
       const result = await isIndexingEntries();
       const exists = await es.indices.exists({ index: '.kibana-event-log-*' });
-      expect(exists).to.be.eql(true);
+      expect(exists.body).to.be.eql(true);
       expect(configValue).to.be.eql(
         `--xpack.eventLog.indexEntries=${result.body.isIndexingEntries}`
       );

From dd20b8adb65c2d974ee8c04fe34fd6b3aac36b97 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Thu, 24 Jun 2021 18:22:14 +0200
Subject: [PATCH 56/95] Avoid using deprecated camelCase parameters for SAML
 APIs. (#103091)

---
 .../security/server/authentication/providers/saml.test.ts | 8 ++++----
 .../security/server/authentication/providers/saml.ts      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index dfcdb66e61c35..4a32383d18dec 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -1186,7 +1186,7 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { queryString: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
       });
     });
 
@@ -1286,7 +1286,7 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { queryString: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
       });
     });
 
@@ -1305,7 +1305,7 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { queryString: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
       });
     });
 
@@ -1324,7 +1324,7 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { queryString: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
       });
     });
 
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index ea818e5df6e12..37e7e868e4d3d 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -624,9 +624,9 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       await this.options.client.asInternalUser.transport.request({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        // Elasticsearch expects `queryString` without leading `?`, so we should strip it with `slice`.
+        // Elasticsearch expects `query_string` without leading `?`, so we should strip it with `slice`.
         body: {
-          queryString: request.url.search ? request.url.search.slice(1) : '',
+          query_string: request.url.search ? request.url.search.slice(1) : '',
           realm: this.realm,
         },
       })

From 5e898734d5c5fcd4d1d9cffaf4a02d78b94e6bd7 Mon Sep 17 00:00:00 2001
From: Bryan Clement <bclement01@gmail.com>
Date: Thu, 24 Jun 2021 09:31:57 -0700
Subject: [PATCH 57/95] [Asset management] Osquery app bug squashing (#102406)

* only display healthy agents to query

* updated toasts to clear on update

* null checking aggBuckets

* properly display expired actions

* clear the error toasts on success

* review comments

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../action_results/action_results_summary.tsx | 58 ++++++++++++-------
 .../action_results/use_action_results.ts      | 14 ++---
 .../public/actions/use_action_details.ts      | 10 ++--
 .../osquery/public/actions/use_all_actions.ts | 10 ++--
 .../agent_policies/use_agent_policies.ts      | 10 ++--
 .../public/agent_policies/use_agent_policy.ts | 10 ++--
 .../osquery/public/agents/use_agent_groups.ts | 10 ++--
 .../public/agents/use_agent_policies.ts       | 10 ++--
 .../osquery/public/agents/use_agent_status.ts | 10 ++--
 .../osquery/public/agents/use_all_agents.ts   | 25 ++++----
 .../public/agents/use_osquery_policies.ts     | 10 ++--
 .../public/common/hooks/use_error_toast.tsx   | 26 +++++++++
 .../common/hooks/use_osquery_integration.tsx  |  9 ++-
 .../public/live_queries/form/index.tsx        | 28 ++++++---
 .../osquery/public/queries/edit/tabs.tsx      | 11 +++-
 .../osquery/public/results/use_all_results.ts | 10 ++--
 .../routes/live_queries/details/index.tsx     | 23 ++++++--
 .../active_state_switch.tsx                   |  5 +-
 .../scheduled_query_groups/form/index.tsx     |  5 +-
 .../osquery/server/lib/parse_agent_groups.ts  |  4 +-
 20 files changed, 186 insertions(+), 112 deletions(-)
 create mode 100644 x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx

diff --git a/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx b/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx
index 23eaaeac1439d..257c89047aab0 100644
--- a/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx
+++ b/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx
@@ -36,6 +36,7 @@ const StyledEuiCard = styled(EuiCard)`
 
 interface ActionResultsSummaryProps {
   actionId: string;
+  expirationDate: Date;
   agentIds?: string[];
   isLive?: boolean;
 }
@@ -48,6 +49,7 @@ const renderErrorMessage = (error: string) => (
 
 const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
   actionId,
+  expirationDate,
   agentIds,
   isLive,
 }) => {
@@ -56,6 +58,7 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
   const [pageIndex, setPageIndex] = useState(0);
   // @ts-expect-error update types
   const [pageSize, setPageSize] = useState(50);
+  const expired = useMemo(() => expirationDate < new Date(), [expirationDate]);
   const {
     // @ts-expect-error update types
     data: { aggregations, edges },
@@ -66,7 +69,7 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
     limit: pageSize,
     direction: Direction.asc,
     sortField: '@timestamp',
-    isLive,
+    isLive: !expired && isLive,
   });
 
   const { data: logsResults } = useAllResults({
@@ -79,7 +82,7 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
         direction: Direction.asc,
       },
     ],
-    isLive,
+    isLive: !expired && isLive,
   });
 
   const notRespondedCount = useMemo(() => {
@@ -108,9 +111,13 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
         description: aggregations.successful,
       },
       {
-        title: i18n.translate('xpack.osquery.liveQueryActionResults.summary.pendingLabelText', {
-          defaultMessage: 'Not yet responded',
-        }),
+        title: expired
+          ? i18n.translate('xpack.osquery.liveQueryActionResults.summary.expiredLabelText', {
+              defaultMessage: 'Expired',
+            })
+          : i18n.translate('xpack.osquery.liveQueryActionResults.summary.pendingLabelText', {
+              defaultMessage: 'Not yet responded',
+            }),
         description: notRespondedCount,
       },
       {
@@ -124,7 +131,7 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
         ),
       },
     ],
-    [agentIds, aggregations.failed, aggregations.successful, notRespondedCount]
+    [agentIds, aggregations.failed, aggregations.successful, notRespondedCount, expired]
   );
 
   const renderAgentIdColumn = useCallback(
@@ -158,23 +165,30 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
     [logsResults]
   );
 
-  const renderStatusColumn = useCallback((_, item) => {
-    if (!item.fields.completed_at) {
-      return i18n.translate('xpack.osquery.liveQueryActionResults.table.pendingStatusText', {
-        defaultMessage: 'pending',
-      });
-    }
+  const renderStatusColumn = useCallback(
+    (_, item) => {
+      if (!item.fields.completed_at) {
+        return expired
+          ? i18n.translate('xpack.osquery.liveQueryActionResults.table.expiredStatusText', {
+              defaultMessage: 'expired',
+            })
+          : i18n.translate('xpack.osquery.liveQueryActionResults.table.pendingStatusText', {
+              defaultMessage: 'pending',
+            });
+      }
 
-    if (item.fields['error.keyword']) {
-      return i18n.translate('xpack.osquery.liveQueryActionResults.table.errorStatusText', {
-        defaultMessage: 'error',
-      });
-    }
+      if (item.fields['error.keyword']) {
+        return i18n.translate('xpack.osquery.liveQueryActionResults.table.errorStatusText', {
+          defaultMessage: 'error',
+        });
+      }
 
-    return i18n.translate('xpack.osquery.liveQueryActionResults.table.successStatusText', {
-      defaultMessage: 'success',
-    });
-  }, []);
+      return i18n.translate('xpack.osquery.liveQueryActionResults.table.successStatusText', {
+        defaultMessage: 'success',
+      });
+    },
+    [expired]
+  );
 
   const columns = useMemo(
     () => [
@@ -227,7 +241,7 @@ const ActionResultsSummaryComponent: React.FC<ActionResultsSummaryProps> = ({
       <EuiFlexGroup>
         <EuiFlexItem grow={false}>
           <StyledEuiCard title="" description="" textAlign="left">
-            {notRespondedCount ? <EuiProgress size="xs" position="absolute" /> : null}
+            {!expired && notRespondedCount ? <EuiProgress size="xs" position="absolute" /> : null}
             <EuiDescriptionList
               compressed
               textStyle="reverse"
diff --git a/x-pack/plugins/osquery/public/action_results/use_action_results.ts b/x-pack/plugins/osquery/public/action_results/use_action_results.ts
index d686a5a4364eb..ab69bf86dc326 100644
--- a/x-pack/plugins/osquery/public/action_results/use_action_results.ts
+++ b/x-pack/plugins/osquery/public/action_results/use_action_results.ts
@@ -23,6 +23,7 @@ import { ESTermQuery } from '../../common/typed_json';
 import { queryClient } from '../query_client';
 
 import { generateTablePaginationOptions, getInspectResponse, InspectResponse } from './helpers';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export interface ResultsArgs {
   results: ResultEdges;
@@ -56,10 +57,8 @@ export const useActionResults = ({
   skip = false,
   isLive = false,
 }: UseActionResults) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { data } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     ['actionResults', { actionId }],
@@ -103,9 +102,9 @@ export const useActionResults = ({
         aggregations: {
           totalResponded,
           // @ts-expect-error update types
-          successful: aggsBuckets.find((bucket) => bucket.key === 'success')?.doc_count ?? 0,
+          successful: aggsBuckets?.find((bucket) => bucket.key === 'success')?.doc_count ?? 0,
           // @ts-expect-error update types
-          failed: aggsBuckets.find((bucket) => bucket.key === 'error')?.doc_count ?? 0,
+          failed: aggsBuckets?.find((bucket) => bucket.key === 'error')?.doc_count ?? 0,
         },
         inspect: getInspectResponse(responseData, {} as InspectResponse),
       };
@@ -124,8 +123,9 @@ export const useActionResults = ({
       refetchInterval: isLive ? 1000 : false,
       keepPreviousData: true,
       enabled: !skip && !!agentIds?.length,
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.action_results.fetchError', {
             defaultMessage: 'Error while fetching action results',
           }),
diff --git a/x-pack/plugins/osquery/public/actions/use_action_details.ts b/x-pack/plugins/osquery/public/actions/use_action_details.ts
index bb260cd78ca76..445912b27bc93 100644
--- a/x-pack/plugins/osquery/public/actions/use_action_details.ts
+++ b/x-pack/plugins/osquery/public/actions/use_action_details.ts
@@ -18,6 +18,7 @@ import {
 import { ESTermQuery } from '../../common/typed_json';
 
 import { getInspectResponse, InspectResponse } from './helpers';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export interface ActionDetailsArgs {
   actionDetails: Record<string, string>;
@@ -33,10 +34,8 @@ interface UseActionDetails {
 }
 
 export const useActionDetails = ({ actionId, filterQuery, skip = false }: UseActionDetails) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { data } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     ['actionDetails', { actionId, filterQuery }],
@@ -61,8 +60,9 @@ export const useActionDetails = ({ actionId, filterQuery, skip = false }: UseAct
     },
     {
       enabled: !skip,
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.action_details.fetchError', {
             defaultMessage: 'Error while fetching action details',
           }),
diff --git a/x-pack/plugins/osquery/public/actions/use_all_actions.ts b/x-pack/plugins/osquery/public/actions/use_all_actions.ts
index 375d108c4dd8b..ae872d3c1ed52 100644
--- a/x-pack/plugins/osquery/public/actions/use_all_actions.ts
+++ b/x-pack/plugins/osquery/public/actions/use_all_actions.ts
@@ -21,6 +21,7 @@ import {
 import { ESTermQuery } from '../../common/typed_json';
 
 import { generateTablePaginationOptions, getInspectResponse, InspectResponse } from './helpers';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export interface ActionsArgs {
   actions: ActionEdges;
@@ -48,10 +49,8 @@ export const useAllActions = ({
   filterQuery,
   skip = false,
 }: UseAllActions) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { data } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     ['actions', { activePage, direction, limit, sortField }],
@@ -82,8 +81,9 @@ export const useAllActions = ({
     {
       keepPreviousData: true,
       enabled: !skip,
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.all_actions.fetchError', {
             defaultMessage: 'Error while fetching actions',
           }),
diff --git a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
index d4bd0a1f4277f..6f87610667198 100644
--- a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
@@ -14,12 +14,11 @@ import {
   GetAgentPoliciesResponse,
   GetAgentPoliciesResponseItem,
 } from '../../../fleet/common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = () => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery<GetAgentPoliciesResponse, unknown, GetAgentPoliciesResponseItem[]>(
     ['agentPolicies'],
@@ -34,8 +33,9 @@ export const useAgentPolicies = () => {
       placeholderData: [],
       keepPreviousData: true,
       select: (response) => response.items,
+      onSuccess: () => setErrorToast(),
       onError: (error) =>
-        toasts.addError(error as Error, {
+        setErrorToast(error as Error, {
           title: i18n.translate('xpack.osquery.agent_policies.fetchError', {
             defaultMessage: 'Error while fetching agent policies',
           }),
diff --git a/x-pack/plugins/osquery/public/agent_policies/use_agent_policy.ts b/x-pack/plugins/osquery/public/agent_policies/use_agent_policy.ts
index e87d8d1c9f28e..dcebf136b6773 100644
--- a/x-pack/plugins/osquery/public/agent_policies/use_agent_policy.ts
+++ b/x-pack/plugins/osquery/public/agent_policies/use_agent_policy.ts
@@ -10,6 +10,7 @@ import { useQuery } from 'react-query';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '../common/lib/kibana';
 import { agentPolicyRouteService } from '../../../fleet/common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 interface UseAgentPolicy {
   policyId: string;
@@ -17,10 +18,8 @@ interface UseAgentPolicy {
 }
 
 export const useAgentPolicy = ({ policyId, skip }: UseAgentPolicy) => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     ['agentPolicy', { policyId }],
@@ -29,8 +28,9 @@ export const useAgentPolicy = ({ policyId, skip }: UseAgentPolicy) => {
       enabled: !skip,
       keepPreviousData: true,
       select: (response) => response.item,
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.agent_policy_details.fetchError', {
             defaultMessage: 'Error while fetching agent policy details',
           }),
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
index 44737af9d3477..bfa224a23135b 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
@@ -18,6 +18,7 @@ import {
 
 import { generateTablePaginationOptions, processAggregations } from './helpers';
 import { Overlap, Group } from './types';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 interface UseAgentGroups {
   osqueryPolicies: string[];
@@ -25,10 +26,8 @@ interface UseAgentGroups {
 }
 
 export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseAgentGroups) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { data } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   const { agentPoliciesLoading, agentPolicyById } = useAgentPolicies(osqueryPolicies);
   const [platforms, setPlatforms] = useState<Group[]>([]);
@@ -100,8 +99,9 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
     },
     {
       enabled: !osqueryPoliciesLoading && !agentPoliciesLoading,
+      onSuccess: () => setErrorToast(),
       onError: (error) =>
-        toasts.addError(error as Error, {
+        setErrorToast(error as Error, {
           title: i18n.translate('xpack.osquery.agent_groups.fetchError', {
             defaultMessage: 'Error while fetching agent groups',
           }),
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
index ecb95fff8838e..115b5af9d3a1b 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
@@ -10,20 +10,20 @@ import { useQueries, UseQueryResult } from 'react-query';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '../common/lib/kibana';
 import { agentPolicyRouteService, GetOneAgentPolicyResponse } from '../../../fleet/common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = (policyIds: string[] = []) => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   const agentResponse = useQueries(
     policyIds.map((policyId) => ({
       queryKey: ['agentPolicy', policyId],
       queryFn: () => http.get(agentPolicyRouteService.getInfoPath(policyId)),
       enabled: policyIds.length > 0,
+      onSuccess: () => setErrorToast(),
       onError: (error) =>
-        toasts.addError(error as Error, {
+        setErrorToast(error as Error, {
           title: i18n.translate('xpack.osquery.action_policy_details.fetchError', {
             defaultMessage: 'Error while fetching policy details',
           }),
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_status.ts b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
index 4954eb0dc80c4..c8bc8d2fe5c0e 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_status.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
 import { GetAgentStatusResponse, agentRouteService } from '../../../fleet/common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
 interface UseAgentStatus {
@@ -17,10 +18,8 @@ interface UseAgentStatus {
 }
 
 export const useAgentStatus = ({ policyId, skip }: UseAgentStatus) => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery<GetAgentStatusResponse, unknown, GetAgentStatusResponse['results']>(
     ['agentStatus', policyId],
@@ -38,8 +37,9 @@ export const useAgentStatus = ({ policyId, skip }: UseAgentStatus) => {
     {
       enabled: !skip,
       select: (response) => response.results,
+      onSuccess: () => setErrorToast(),
       onError: (error) =>
-        toasts.addError(error as Error, {
+        setErrorToast(error as Error, {
           title: i18n.translate('xpack.osquery.agent_status.fetchError', {
             defaultMessage: 'Error while fetching agent status',
           }),
diff --git a/x-pack/plugins/osquery/public/agents/use_all_agents.ts b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
index 674deb3b339bd..30ba4d2f57907 100644
--- a/x-pack/plugins/osquery/public/agents/use_all_agents.ts
+++ b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
 import { GetAgentsResponse, agentRouteService } from '../../../fleet/common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
 interface UseAllAgents {
@@ -28,36 +29,30 @@ export const useAllAgents = (
   opts: RequestOptions = { perPage: 9000 }
 ) => {
   const { perPage } = opts;
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
   const { isLoading: agentsLoading, data: agentData } = useQuery<GetAgentsResponse>(
     ['agents', osqueryPolicies, searchValue, perPage],
     () => {
-      const kueryFragments: string[] = [];
-      if (osqueryPolicies.length) {
-        kueryFragments.push(`${osqueryPolicies.map((p) => `policy_id:${p}`).join(' or ')}`);
-      }
+      const policyFragment = osqueryPolicies.map((p) => `policy_id:${p}`).join(' or ');
+      let kuery = `last_checkin_status: online and (${policyFragment})`;
 
       if (searchValue) {
-        kueryFragments.push(
-          `local_metadata.host.hostname:*${searchValue}* or local_metadata.elastic.agent.id:*${searchValue}*`
-        );
+        kuery += `and (local_metadata.host.hostname:*${searchValue}* or local_metadata.elastic.agent.id:*${searchValue}*)`;
       }
 
       return http.get(agentRouteService.getListPath(), {
         query: {
-          kuery: kueryFragments.map((frag) => `(${frag})`).join(' and '),
+          kuery,
           perPage,
-          showInactive: true,
         },
       });
     },
     {
-      enabled: !osqueryPoliciesLoading,
+      enabled: !osqueryPoliciesLoading && osqueryPolicies.length > 0,
+      onSuccess: () => setErrorToast(),
       onError: (error) =>
-        toasts.addError(error as Error, {
+        setErrorToast(error as Error, {
           title: i18n.translate('xpack.osquery.agents.fetchError', {
             defaultMessage: 'Error while fetching agents',
           }),
diff --git a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
index 0eb94af73e3a8..9064dac1ae5d0 100644
--- a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
@@ -12,12 +12,11 @@ import { i18n } from '@kbn/i18n';
 import { useKibana } from '../common/lib/kibana';
 import { packagePolicyRouteService, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useOsqueryPolicies = () => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   const { isLoading: osqueryPoliciesLoading, data: osqueryPolicies = [] } = useQuery(
     ['osqueryPolicies'],
@@ -30,8 +29,9 @@ export const useOsqueryPolicies = () => {
     {
       select: (response) =>
         uniq<string>(response.items.map((p: { policy_id: string }) => p.policy_id)),
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.osquery_policies.fetchError', {
             defaultMessage: 'Error while fetching osquery policies',
           }),
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
new file mode 100644
index 0000000000000..fb17803a9d57b
--- /dev/null
+++ b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
@@ -0,0 +1,26 @@
+/*
+ * 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 { ErrorToastOptions, Toast } from 'kibana/public';
+import { useState } from 'react';
+import { useKibana } from '../../common/lib/kibana';
+
+export const useErrorToast = () => {
+  const [errorToast, setErrorToast] = useState<Toast>();
+  const {
+    notifications: { toasts },
+  } = useKibana().services;
+  return (error?: unknown, opts?: ErrorToastOptions) => {
+    if (errorToast) {
+      toasts.remove(errorToast);
+    }
+    if (error) {
+      // @ts-expect-error update types
+      setErrorToast(toasts.addError(error, opts));
+    }
+  };
+};
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_osquery_integration.tsx b/x-pack/plugins/osquery/public/common/hooks/use_osquery_integration.tsx
index ccfb407eab58b..236fdb1af1815 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_osquery_integration.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_osquery_integration.tsx
@@ -12,12 +12,11 @@ import { useQuery } from 'react-query';
 import { GetPackagesResponse, epmRouteService } from '../../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { useKibana } from '../lib/kibana';
+import { useErrorToast } from './use_error_toast';
 
 export const useOsqueryIntegration = () => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     'integrations',
@@ -31,7 +30,7 @@ export const useOsqueryIntegration = () => {
       select: ({ response }: GetPackagesResponse) =>
         find(['name', OSQUERY_INTEGRATION_NAME], response),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.osquery_integration.fetchError', {
             defaultMessage: 'Error while fetching osquery integration',
           }),
diff --git a/x-pack/plugins/osquery/public/live_queries/form/index.tsx b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
index 4cf2d4aa4fe91..6f2d1afec6fe9 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
@@ -19,6 +19,7 @@ import { useKibana } from '../../common/lib/kibana';
 import { ResultTabs } from '../../queries/edit/tabs';
 import { queryFieldValidation } from '../../common/validations';
 import { fieldValidators } from '../../shared_imports';
+import { useErrorToast } from '../../common/hooks/use_error_toast';
 
 const FORM_ID = 'liveQueryForm';
 
@@ -35,10 +36,9 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
   // onSubmit,
   onSuccess,
 }) => {
-  const {
-    http,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { http } = useKibana().services;
+
+  const setErrorToast = useErrorToast();
 
   const {
     data,
@@ -53,14 +53,20 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
         body: JSON.stringify(payload),
       }),
     {
-      onSuccess,
+      onSuccess: () => {
+        setErrorToast();
+        if (onSuccess) {
+          onSuccess();
+        }
+      },
       onError: (error) => {
-        // @ts-expect-error update types
-        toasts.addError(error, { title: error.body.error, toastMessage: error.body.message });
+        setErrorToast(error);
       },
     }
   );
 
+  const expirationDate = useMemo(() => new Date(data?.actions[0].expiration), [data?.actions]);
+
   const formSchema = {
     query: {
       type: FIELD_TYPES.TEXT,
@@ -173,7 +179,12 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
           defaultMessage: 'Check results',
         }),
         children: actionId ? (
-          <ResultTabs actionId={actionId} agentIds={agentIds} isLive={true} />
+          <ResultTabs
+            actionId={actionId}
+            expirationDate={expirationDate}
+            agentIds={agentIds}
+            isLive={true}
+          />
         ) : null,
         status: resultsStatus,
       },
@@ -185,6 +196,7 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
       queryComponentProps,
       queryStatus,
       queryValueProvided,
+      expirationDate,
       resultsStatus,
       submit,
     ]
diff --git a/x-pack/plugins/osquery/public/queries/edit/tabs.tsx b/x-pack/plugins/osquery/public/queries/edit/tabs.tsx
index 978c3f938f1d6..2c9421606ea30 100644
--- a/x-pack/plugins/osquery/public/queries/edit/tabs.tsx
+++ b/x-pack/plugins/osquery/public/queries/edit/tabs.tsx
@@ -14,6 +14,7 @@ import { ActionResultsSummary } from '../../action_results/action_results_summar
 interface ResultTabsProps {
   actionId: string;
   agentIds?: string[];
+  expirationDate: Date;
   isLive?: boolean;
   startDate?: string;
   endDate?: string;
@@ -22,6 +23,7 @@ interface ResultTabsProps {
 const ResultTabsComponent: React.FC<ResultTabsProps> = ({
   actionId,
   agentIds,
+  expirationDate,
   endDate,
   isLive,
   startDate,
@@ -34,7 +36,12 @@ const ResultTabsComponent: React.FC<ResultTabsProps> = ({
         content: (
           <>
             <EuiSpacer />
-            <ActionResultsSummary actionId={actionId} agentIds={agentIds} isLive={isLive} />
+            <ActionResultsSummary
+              expirationDate={expirationDate}
+              actionId={actionId}
+              agentIds={agentIds}
+              isLive={isLive}
+            />
           </>
         ),
       },
@@ -55,7 +62,7 @@ const ResultTabsComponent: React.FC<ResultTabsProps> = ({
         ),
       },
     ],
-    [actionId, agentIds, endDate, isLive, startDate]
+    [actionId, agentIds, endDate, isLive, startDate, expirationDate]
   );
 
   return (
diff --git a/x-pack/plugins/osquery/public/results/use_all_results.ts b/x-pack/plugins/osquery/public/results/use_all_results.ts
index d5e2bbc886940..1121898410278 100644
--- a/x-pack/plugins/osquery/public/results/use_all_results.ts
+++ b/x-pack/plugins/osquery/public/results/use_all_results.ts
@@ -21,6 +21,7 @@ import {
 import { ESTermQuery } from '../../common/typed_json';
 
 import { generateTablePaginationOptions, getInspectResponse, InspectResponse } from './helpers';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export interface ResultsArgs {
   results: ResultEdges;
@@ -50,10 +51,8 @@ export const useAllResults = ({
   skip = false,
   isLive = false,
 }: UseAllResults) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
+  const { data } = useKibana().services;
+  const setErrorToast = useErrorToast();
 
   return useQuery(
     ['allActionResults', { actionId, activePage, limit, sort }],
@@ -81,8 +80,9 @@ export const useAllResults = ({
     {
       refetchInterval: isLive ? 1000 : false,
       enabled: !skip,
+      onSuccess: () => setErrorToast(),
       onError: (error: Error) =>
-        toasts.addError(error, {
+        setErrorToast(error, {
           title: i18n.translate('xpack.osquery.results.fetchError', {
             defaultMessage: 'Error while fetching results',
           }),
diff --git a/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx b/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx
index 5a80e12d0fef3..64a1fb0791e83 100644
--- a/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx
+++ b/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx
@@ -43,6 +43,10 @@ const LiveQueryDetailsPageComponent = () => {
   const liveQueryListProps = useRouterNavigate('live_queries');
 
   const { data } = useActionDetails({ actionId });
+  const expirationDate = useMemo(() => new Date(data?.actionDetails._source.expiration), [
+    data?.actionDetails,
+  ]);
+  const expired = useMemo(() => expirationDate < new Date(), [expirationDate]);
   const { data: actionResultsData } = useActionResults({
     actionId,
     activePage: 0,
@@ -78,6 +82,18 @@ const LiveQueryDetailsPageComponent = () => {
     [liveQueryListProps]
   );
 
+  const failed = useMemo(() => {
+    let result = actionResultsData?.aggregations.failed;
+    if (expired) {
+      result = '-';
+      if (data?.actionDetails?.fields?.agents && actionResultsData?.aggregations) {
+        result =
+          data.actionDetails.fields.agents.length - actionResultsData.aggregations.successful;
+      }
+    }
+    return result;
+  }, [expired, actionResultsData?.aggregations, data?.actionDetails?.fields?.agents]);
+
   const RightColumn = useMemo(
     () => (
       <EuiFlexGroup justifyContent="flexEnd" direction="row">
@@ -114,15 +130,13 @@ const LiveQueryDetailsPageComponent = () => {
               />
             </EuiDescriptionListTitle>
             <EuiDescriptionListDescription className="eui-textNoWrap">
-              <EuiTextColor color={actionResultsData?.aggregations.failed ? 'danger' : 'default'}>
-                {actionResultsData?.aggregations.failed}
-              </EuiTextColor>
+              <EuiTextColor color={failed ? 'danger' : 'default'}>{failed}</EuiTextColor>
             </EuiDescriptionListDescription>
           </EuiDescriptionList>
         </EuiFlexItem>
       </EuiFlexGroup>
     ),
-    [actionResultsData?.aggregations.failed, data?.actionDetails?.fields?.agents?.length]
+    [data?.actionDetails?.fields?.agents?.length, failed]
   );
 
   return (
@@ -133,6 +147,7 @@ const LiveQueryDetailsPageComponent = () => {
       <EuiSpacer />
       <ResultTabs
         actionId={actionId}
+        expirationDate={expirationDate}
         agentIds={data?.actionDetails?.fields?.agents}
         startDate={get(data, ['actionDetails', 'fields', '@timestamp', '0'])}
         endDate={get(data, 'actionDetails.fields.expiration[0]')}
diff --git a/x-pack/plugins/osquery/public/scheduled_query_groups/active_state_switch.tsx b/x-pack/plugins/osquery/public/scheduled_query_groups/active_state_switch.tsx
index 56dbe721c31a9..bcb47d0adc833 100644
--- a/x-pack/plugins/osquery/public/scheduled_query_groups/active_state_switch.tsx
+++ b/x-pack/plugins/osquery/public/scheduled_query_groups/active_state_switch.tsx
@@ -21,6 +21,7 @@ import { useKibana } from '../common/lib/kibana';
 import { useAgentStatus } from '../agents/use_agent_status';
 import { useAgentPolicy } from '../agent_policies/use_agent_policy';
 import { ConfirmDeployAgentPolicyModal } from './form/confirmation_modal';
+import { useErrorToast } from '../common/hooks/use_error_toast';
 
 const StyledEuiLoadingSpinner = styled(EuiLoadingSpinner)`
   margin-right: ${({ theme }) => theme.eui.paddingSizes.s};
@@ -36,6 +37,7 @@ const ActiveStateSwitchComponent: React.FC<ActiveStateSwitchProps> = ({ item })
     http,
     notifications: { toasts },
   } = useKibana().services;
+  const setErrorToast = useErrorToast();
   const [confirmationModal, setConfirmationModal] = useState(false);
 
   const hideConfirmationModal = useCallback(() => setConfirmationModal(false), []);
@@ -51,6 +53,7 @@ const ActiveStateSwitchComponent: React.FC<ActiveStateSwitchProps> = ({ item })
     {
       onSuccess: (response) => {
         queryClient.invalidateQueries('scheduledQueries');
+        setErrorToast();
         toasts.addSuccess(
           response.item.enabled
             ? i18n.translate(
@@ -75,7 +78,7 @@ const ActiveStateSwitchComponent: React.FC<ActiveStateSwitchProps> = ({ item })
       },
       onError: (error) => {
         // @ts-expect-error update types
-        toasts.addError(error, { title: error.body.error, toastMessage: error.body.message });
+        setErrorToast(error, { title: error.body.error, toastMessage: error.body.message });
       },
     }
   );
diff --git a/x-pack/plugins/osquery/public/scheduled_query_groups/form/index.tsx b/x-pack/plugins/osquery/public/scheduled_query_groups/form/index.tsx
index 64efdf61fc735..c940b1f8527b5 100644
--- a/x-pack/plugins/osquery/public/scheduled_query_groups/form/index.tsx
+++ b/x-pack/plugins/osquery/public/scheduled_query_groups/form/index.tsx
@@ -45,6 +45,7 @@ import { PolicyIdComboBoxField } from './policy_id_combobox_field';
 import { QueriesField } from './queries_field';
 import { ConfirmDeployAgentPolicyModal } from './confirmation_modal';
 import { useAgentPolicies } from '../../agent_policies';
+import { useErrorToast } from '../../common/hooks/use_error_toast';
 
 const GhostFormField = () => <></>;
 
@@ -68,6 +69,7 @@ const ScheduledQueryGroupFormComponent: React.FC<ScheduledQueryGroupFormProps> =
     http,
     notifications: { toasts },
   } = useKibana().services;
+  const setErrorToast = useErrorToast();
   const [showConfirmationModal, setShowConfirmationModal] = useState(false);
   const handleHideConfirmationModal = useCallback(() => setShowConfirmationModal(false), []);
 
@@ -110,6 +112,7 @@ const ScheduledQueryGroupFormComponent: React.FC<ScheduledQueryGroupFormProps> =
           return;
         }
 
+        setErrorToast();
         navigateToApp(PLUGIN_ID, { path: `scheduled_query_groups/${data.item.id}` });
         toasts.addSuccess(
           i18n.translate('xpack.osquery.scheduledQueryGroup.form.updateSuccessToastMessageText', {
@@ -122,7 +125,7 @@ const ScheduledQueryGroupFormComponent: React.FC<ScheduledQueryGroupFormProps> =
       },
       onError: (error) => {
         // @ts-expect-error update types
-        toasts.addError(error, { title: error.body.error, toastMessage: error.body.message });
+        setErrorToast(error, { title: error.body.error, toastMessage: error.body.message });
       },
     }
   );
diff --git a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
index a120d7deddf50..8fe60f59f01d7 100644
--- a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
+++ b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
@@ -63,7 +63,7 @@ export const parseAgentSelection = async (
           perPage,
           page,
           kuery,
-          showInactive: true,
+          showInactive: false,
         });
         return { results: res.agents.map((agent) => agent.id), total: res.total };
       });
@@ -84,7 +84,7 @@ export const parseAgentSelection = async (
             perPage,
             page,
             kuery,
-            showInactive: true,
+            showInactive: false,
           });
           return { results: res.agents.map((agent) => agent.id), total: res.total };
         });

From 119845483f695431a153c9ce92a98b5803e7241b Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Thu, 24 Jun 2021 17:44:13 +0100
Subject: [PATCH 58/95] [ML] Fixes data frame analytics models list pipelines
 tab (#103235)

---
 .../components/models_management/expanded_row.tsx               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
index 93be45bbdaf97..87a3f10992c06 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
@@ -430,7 +430,7 @@ export const ExpandedRow: FC<ExpandedRowProps> = ({ item }) => {
                               </h6>
                             </EuiTitle>
                             <EuiCodeBlock
-                              language="painless"
+                              language="json"
                               fontSize="m"
                               paddingSize="m"
                               overflowHeight={300}

From 9ead1fc96b8f2938f3b596149dca4b48ed2d1b51 Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Thu, 24 Jun 2021 17:49:56 +0100
Subject: [PATCH 59/95] [ML] Add description and owner to kibana.json for ML
 owned plugins (#103254)

---
 x-pack/plugins/data_visualizer/kibana.json | 7 ++++++-
 x-pack/plugins/file_upload/kibana.json     | 7 ++++++-
 x-pack/plugins/ml/kibana.json              | 7 ++++++-
 x-pack/plugins/transform/kibana.json       | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index 00eb3d7bf142c..01aca7c2bbaee 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -27,5 +27,10 @@
   ],
   "extraPublicDirs": [
     "common"
-  ]
+  ],
+  "owner": {
+    "name": "Machine Learning UI",
+    "githubTeam": "ml-ui"
+  },
+  "description": "The Data Visualizer tools help you understand your data, by analyzing the metrics and fields in a log file or an existing Elasticsearch index."
 }
diff --git a/x-pack/plugins/file_upload/kibana.json b/x-pack/plugins/file_upload/kibana.json
index 6f93874cdbcaa..e69c5e34bc09b 100644
--- a/x-pack/plugins/file_upload/kibana.json
+++ b/x-pack/plugins/file_upload/kibana.json
@@ -16,5 +16,10 @@
   ],
   "extraPublicDirs": [
     "common"
-  ]
+  ],
+  "owner": {
+    "name": "Machine Learning UI",
+    "githubTeam": "ml-ui"
+  },
+  "description": "The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON."
 }
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 7b3f457106033..7f3ad80968b7a 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -43,5 +43,10 @@
   ],
   "extraPublicDirs": [
     "common"
-  ]
+  ],
+  "owner": {
+    "name": "Machine Learning UI",
+    "githubTeam": "ml-ui"
+  },
+  "description": "This plugin provides access to the machine learning features provided by Elastic."
 }
diff --git a/x-pack/plugins/transform/kibana.json b/x-pack/plugins/transform/kibana.json
index 4216ac9761e86..c9f6beeee5aff 100644
--- a/x-pack/plugins/transform/kibana.json
+++ b/x-pack/plugins/transform/kibana.json
@@ -23,5 +23,10 @@
     "kibanaUtils",
     "kibanaReact",
     "ml"
-  ]
+  ],
+  "owner": {
+    "name": "Machine Learning UI",
+    "githubTeam": "ml-ui"
+  },
+  "description": "This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics."
 }

From bfb98053d6b361a18acd58e7f0ab34eb8a43a0ac Mon Sep 17 00:00:00 2001
From: Janeen Mikell-Straughn <57149392+jmikell821@users.noreply.github.com>
Date: Thu, 24 Jun 2021 12:53:56 -0400
Subject: [PATCH 60/95] [DOCS] Security Overview  (#103151)

* updating overview topic for Kibana

* formatting fixes

* small formatting tweaks

* small formatting tweaks

* Update index.asciidoc

Updating index file; removing siem-UI and machine learning topics from the TOC.

* [DOCS] Change part to chapter

* Update index.asciidoc

* Adding <titleabbrev> attribute

Co-authored-by: lcawl <lcawley@elastic.co>
---
 docs/siem/index.asciidoc | 198 +++++++++++++++++++++++++++++----------
 1 file changed, 151 insertions(+), 47 deletions(-)

diff --git a/docs/siem/index.asciidoc b/docs/siem/index.asciidoc
index 18895f0533fd7..05b1ec0b5b797 100644
--- a/docs/siem/index.asciidoc
+++ b/docs/siem/index.asciidoc
@@ -1,60 +1,164 @@
+[chapter]
 [role="xpack"]
 [[xpack-siem]]
-= Elastic Security
+= Elastic Security overview
+++++
+<titleabbrev>Security</titleabbrev>
+++++
 
-[partintro]
---
+https://www.elastic.co/security[Elastic Security] combines SIEM threat detection features with endpoint
+prevention and response capabilities in one solution. These analytical and
+protection capabilities, leveraged by the speed and extensibility of
+Elasticsearch, enable analysts to defend their organization from threats before
+damage and loss occur.
 
-Elastic Security combines SIEM threat detection features with endpoint
-prevention and response capabilities in one solution, including:
+Elastic Security provides the following security benefits and capabilities:
 
-* A detection engine to identify attacks and system misconfiguration
+* A detection engine to identify attacks and system misconfigurations
 * A workspace for event triage and investigations
 * Interactive visualizations to investigate process relationships
-* Embedded case management and automated actions
-* Detection of signatureless attacks with prebuilt {ml} anomaly jobs and
-detection rules
+* Inbuilt case management with automated actions
+* Detection of signatureless attacks with prebuilt machine learning anomaly jobs
+and detection rules
 
-[role="screenshot"]
-image::siem/images/overview-ui.png[Elastic Security in Kibana]
-
-[float]
-== Add data
-
-Kibana provides step-by-step instructions to help you add data. The
-{security-guide}[Security Guide] is a good source for more
-detailed information and instructions.
-
-[float]
-=== {Beats}
-
-https://www.elastic.co/products/beats/auditbeat[{auditbeat}],
-https://www.elastic.co/products/beats/filebeat[{filebeat}],
-https://www.elastic.co/products/beats/winlogbeat[{winlogbeat}], and
-https://www.elastic.co/products/beats/packetbeat[{packetbeat}]
-send security events and other data to Elasticsearch.
+[discrete]
+== Elastic Security components and workflow
 
-The default index patterns for Elastic Security events are `auditbeat-*`, `winlogbeat-*`,
-`filebeat-*`, `packetbeat-*`, `endgame-*`, `logs-*`, and `apm-*-transaction*`. To change the default pattern patterns, go to *Stack Management > Advanced Settings > securitySolution:defaultIndex*.
+The following diagram provides a comprehensive illustration of the Elastic Security workflow.
 
-[float]
-=== Elastic Security endpoint agent
-
-The agent detects and protects against malware, and ships host and network
-events directly to Elastic Security.
-
-[float]
-=== Elastic Common Schema (ECS) for normalizing data
-
-The {ecs-ref}[Elastic Common Schema (ECS)] defines a common set of fields to be
-used for storing event data in Elasticsearch. ECS helps users normalize their
-event data to better analyze, visualize, and correlate the data represented in
-their events.
-
-Elastic Security can ingest and normalize events from ECS-compatible data sources.
+[role="screenshot"]
+image::../siem/images/workflow.png[]
+
+Here's an overview of the flow and its components:
+
+* Data is shipped from your hosts to {es} via beat modules and the Elastic https://www.elastic.co/endpoint-security/[Endpoint Security agent integration]. This integration provides capabilities such as collecting events, detecting and preventing {security-guide}/detection-engine-overview.html#malware-prevention[malicious activity], and artifact delivery. The {fleet-guide}/fleet-overview.html[{fleet}] app is used to
+install and manage agents and integrations on your hosts.
++
+The Endpoint Security integration ships the following data sets:
++
+***  *Windows*: Process, network, file, DNS, registry, DLL and driver loads,
+malware security detections
+*** *Linux/macOS*: Process, network, file
++
+* https://www.elastic.co/integrations?solution=security[Beat modules]: {beats}
+are lightweight data shippers. Beat modules provide a way of collecting and
+parsing specific data sets from common sources, such as cloud and OS events,
+logs, and metrics. Common security-related modules are listed {security-guide}/ingest-data.html#enable-beat-modules[here].
+* The {security-app} in {kib} is used to manage the *Detection engine*,
+*Cases*, and *Timeline*, as well as administer hosts running Endpoint Security:
+** Detection engine: Automatically searches for suspicious host and network
+activity via the following:
+*** {security-guide}/detection-engine-overview.html#detection-engine-overview[Detection rules]: Periodically search the data
+({es} indices) sent from your hosts for suspicious events. When a suspicious
+event is discovered, a detection alert is generated. External systems, such as
+Slack and email, can be used to send notifications when alerts are generated.
+You can create your own rules and make use of our {security-guide}/prebuilt-rules.html[prebuilt ones].
+*** {security-guide}/detections-ui-exceptions.html[Exceptions]: Reduce noise and the number of
+false positives. Exceptions are associated with rules and prevent alerts when
+an exception's conditions are met. *Value lists* contain source event
+values that can be used as part of an exception's conditions. When
+Elastic {endpoint-sec} is installed on your hosts, you can add malware exceptions
+directly to the endpoint from the Security app.
+*** {security-guide}/machine-learning.html#included-jobs[{ml-cap} jobs]: Automatic anomaly detection of host and
+network events. Anomaly scores are provided per host and can be used with
+detection rules.
+** {security-guide}/timelines-ui.html[Timeline]: Workspace for investigating alerts and events.
+Timelines use queries and filters to drill down into events related to
+a specific incident. Timeline templates are attached to rules and use predefined
+queries when alerts are investigated. Timelines can be saved and shared with
+others, as well as attached to Cases.
+** {security-guide}/cases-overview.html[Cases]: An internal system for opening, tracking, and sharing
+security issues directly in the Security app. Cases can be integrated with
+external ticketing systems.
+** {security-guide}/admin-page-ov.html[Administration]: View and manage hosts running {endpoint-sec}.
+
+{security-guide}/ingest-data.html[Ingest data to Elastic Security] and {security-guide}/install-endpoint.html[Configure and install the Elastic Endpoint integration] describe how to ship security-related
+data to {es}.
+
+
+For more background information, see:
+
+* https://www.elastic.co/products/elasticsearch[{es}]: A real-time,
+distributed storage, search, and analytics engine. {es} excels at indexing
+streams of semi-structured data, such as logs or metrics.
+* https://www.elastic.co/products/kibana[{kib}]: An open-source analytics and
+visualization platform designed to work with {es}. You use {kib} to search,
+view, and interact with data stored in {es} indices. You can easily compile
+advanced data analysis and visualize your data in a variety of charts, tables,
+and maps.
+
+[discrete]
+=== Compatibility with cold tier nodes
+
+Cold tier is a {ref}/data-tiers.html[data tier] that holds time-series data that is accessed only occasionally. In {stack} version >=7.11.0, {elastic-sec} supports cold tier data for the following {es} indices:
+
+* Index patterns specified in `securitySolution:defaultIndex`
+* Index patterns specified in the definitions of detection rules, except for indicator match rules
+* Index patterns specified in the data sources selector on various {security-app} pages
+
+{elastic-sec} does NOT support cold tier data for the following {es} indices:
+
+* Index patterns controlled by {elastic-sec}, including signals and list indices
+* Index patterns specified in indicator match rules
+
+Using cold tier data for unsupported indices may result in detection rule timeouts and overall performance degradation.
+
+[discrete]
+[[self-protection]]
+==== Elastic Endpoint self-protection
+
+Self-protection means that {elastic-endpoint} has guards against users and attackers that may try to interfere with its functionality. This protection feature is consistently enhanced to prevent attackers who may attempt to use newer, more sophisticated tactics to interfere with the {elastic-endpoint}. Self-protection is enabled by default when {elastic-endpoint} installs on supported platforms, listed below.
+
+Self-protection is enabled on the following 64-bit Windows versions:
+
+* Windows 8.1
+* Windows 10
+* Windows Server 2012 R2
+* Windows Server 2016
+* Windows Server 2019
+
+And on the following macOS versions:
+
+* macOS 10.15 (Catalina)
+* macOS 11 (Big Sur)
+
+NOTE: Other Windows and macOS variants (and all Linux distributions) do not have self-protection.
+
+For {stack} version >= 7.11.0, self-protection defines the following permissions:
+
+* Users -- even Administrator/root -- *cannot* delete {elastic-endpoint} files (located at `c:\Program Files\Elastic\Endpoint` on Windows, and `/Library/Elastic/Endpoint` on macOS).
+* Users *cannot* terminate the {elastic-endpoint} program or service.
+* Administrator/root users *can* read the endpoint's files. On Windows, the easiest way to read Endpoint files is to start an Administrator `cmd.exe` prompt. On macOS, an Administrator can use the `sudo` command.
+* Administrator/root users *can* stop the {elastic-agent}'s service. On Windows, run the `sc stop "Elastic Agent"` command. On macOS, run the `sudo launchctl stop elastic-agent` command.
+
+
+[discrete]
+[[siem-integration]]
+=== Integration with other Elastic products
+
+You can use {elastic-sec} with other Elastic products and features to help you
+identify and investigate suspicious activity:
+
+* https://www.elastic.co/products/stack/machine-learning[{ml-cap}]
+* https://www.elastic.co/products/stack/alerting[Alerting]
+* https://www.elastic.co/products/stack/canvas[Canvas]
+
+[discrete]
+[[data-sources]]
+=== APM transaction data sources
+
+By default, {elastic-sec} monitors {apm-app-ref}/apm-getting-started.html[APM]
+`apm-*-transaction*` indices. To add additional APM indices, update the
+index patterns in the `securitySolution:defaultIndex` setting ({kib} -> Stack Management -> Advanced Settings -> `securitySolution:defaultIndex`).
 
---
+[discrete]
+[[ecs-compliant-reqs]]
+=== ECS compliance data requirements
 
+The {ecs-ref}[Elastic Common Schema (ECS)] defines a common set of fields used for
+storing event data in Elasticsearch. ECS helps users normalize their event data
+to better analyze, visualize, and correlate the data represented in their
+events. {elastic-sec} supports events and indicator index data from any ECS-compliant data source.
 
-include::siem-ui.asciidoc[]
-include::machine-learning.asciidoc[]
+IMPORTANT: {elastic-sec} requires {ecs-ref}[ECS-compliant data]. If you use third-party data collectors to ship data to {es}, the data must be mapped to ECS.
+{security-guide}/siem-field-reference.html[Elastic Security ECS field reference] lists ECS fields used in {elastic-sec}.

From eb8e9d7cc9a36b2a6cf1da3561aed572da6710eb Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Thu, 24 Jun 2021 12:56:48 -0400
Subject: [PATCH 61/95] [Fleet] Remove duplication between two files #103282

## Summary

`public/applications/integrations/constants.tsx` and
`public/applications/integrations/sections/epm/constants.tsx` are identical except for this line in `public/applications/integrations/constants.tsx`

```ts
export * from '../../constants';
```

This PR removes all the duplication from the "upper" file (`public/applications/integrations/constants.tsx`) and leaves the other code "down" in `/sections/epm/` closer to where it's used.

Initially, I deleted `public/applications/integrations/constants.tsx` entirely but several files do `import` the constants it exports, so I left it.
---
 .../applications/integrations/constants.tsx   | 53 -------------------
 .../detail/assets/assets_accordion.tsx        |  2 +-
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/integrations/constants.tsx b/x-pack/plugins/fleet/public/applications/integrations/constants.tsx
index 08197e18fec02..f2cb57301f49c 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/constants.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/constants.tsx
@@ -5,57 +5,4 @@
  * 2.0.
  */
 
-import type { IconType } from '@elastic/eui';
-
-import type { ServiceName } from '../../types';
-import { ElasticsearchAssetType, KibanaAssetType } from '../../types';
-
 export * from '../../constants';
-
-// only allow Kibana assets for the kibana key, ES asssets for elasticsearch, etc
-type ServiceNameToAssetTypes = Record<Extract<ServiceName, 'kibana'>, KibanaAssetType[]> &
-  Record<Extract<ServiceName, 'elasticsearch'>, ElasticsearchAssetType[]>;
-
-export const DisplayedAssets: ServiceNameToAssetTypes = {
-  kibana: Object.values(KibanaAssetType),
-  elasticsearch: Object.values(ElasticsearchAssetType),
-};
-export type DisplayedAssetType = KibanaAssetType | ElasticsearchAssetType;
-
-export const AssetTitleMap: Record<DisplayedAssetType, string> = {
-  dashboard: 'Dashboard',
-  ilm_policy: 'ILM Policy',
-  ingest_pipeline: 'Ingest Pipeline',
-  transform: 'Transform',
-  index_pattern: 'Index Pattern',
-  index_template: 'Index Template',
-  component_template: 'Component Template',
-  search: 'Saved Search',
-  visualization: 'Visualization',
-  map: 'Map',
-  data_stream_ilm_policy: 'Data Stream ILM Policy',
-  lens: 'Lens',
-  security_rule: 'Security Rule',
-  ml_module: 'ML Module',
-};
-
-export const ServiceTitleMap: Record<ServiceName, string> = {
-  kibana: 'Kibana',
-  elasticsearch: 'Elasticsearch',
-};
-
-export const AssetIcons: Record<KibanaAssetType, IconType> = {
-  dashboard: 'dashboardApp',
-  index_pattern: 'indexPatternApp',
-  search: 'searchProfilerApp',
-  visualization: 'visualizeApp',
-  map: 'emsApp',
-  lens: 'lensApp',
-  security_rule: 'securityApp',
-  ml_module: 'mlApp',
-};
-
-export const ServiceIcons: Record<ServiceName, IconType> = {
-  elasticsearch: 'logoElasticsearch',
-  kibana: 'logoKibana',
-};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets_accordion.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets_accordion.tsx
index abfdd88d27162..12d4a0014b976 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets_accordion.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets_accordion.tsx
@@ -20,7 +20,7 @@ import {
   EuiNotificationBadge,
 } from '@elastic/eui';
 
-import { AssetTitleMap } from '../../../../../constants';
+import { AssetTitleMap } from '../../../constants';
 
 import { getHrefToObjectInKibanaApp, useStartServices } from '../../../../../hooks';
 

From 5af69edfbaf58d3874b043c1fc3674080a1b2430 Mon Sep 17 00:00:00 2001
From: Dmitry Shevchenko <dmshevch@gmail.com>
Date: Thu, 24 Jun 2021 19:17:09 +0200
Subject: [PATCH 62/95] Fix "Deleted rule" badge is not displayed if 'Rule
 Name' contains more than 55 words (#103164)

---
 .../__snapshots__/index.test.tsx.snap         |  4 ++--
 .../__snapshots__/title.test.tsx.snap         | 16 +++++++------
 .../common/components/header_page/index.tsx   | 12 ++++++++--
 .../common/components/header_page/title.tsx   | 23 +++++++++++++++----
 .../common/components/header_page/types.ts    |  2 ++
 .../detection_engine/rules/details/index.tsx  | 22 +++++++++++-------
 .../network/pages/details/index.test.tsx      |  2 +-
 7 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
index 9cb9f28612b15..d00bd7040c164 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`HeaderPage it renders 1`] = `
     alignItems="center"
     bottomBorder={true}
   >
-    <EuiPageHeaderSection>
+    <HeaderSection>
       <Memo(TitleComponent)
         badgeOptions={
           Object {
@@ -25,7 +25,7 @@ exports[`HeaderPage it renders 1`] = `
         data-test-subj="header-page-subtitle-2"
         items="Test subtitle 2"
       />
-    </EuiPageHeaderSection>
+    </HeaderSection>
     <EuiPageHeaderSection
       data-test-subj="header-page-supplements"
     >
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
index ca02d0ac5cb2d..176902ae38d20 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
@@ -4,20 +4,22 @@ exports[`Title it renders 1`] = `
 <EuiTitle
   size="l"
 >
-  <h1
+  <Header
     data-test-subj="header-page-title"
   >
-    <TruncatableText
-      tooltipContent="Test title"
-    >
-      Test title
-    </TruncatableText>
+    <TitleWrapper>
+      <TruncatableText
+        tooltipContent="Test title"
+      >
+        Test title
+      </TruncatableText>
+    </TitleWrapper>
      
     <StyledEuiBetaBadge
       label="Beta"
       tooltipContent="Test tooltip"
       tooltipPosition="bottom"
     />
-  </h1>
+  </Header>
 </EuiTitle>
 `;
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
index 1c87d70c0c7cb..75453f2d759fb 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
@@ -55,6 +55,14 @@ const Badge = (styled(EuiBadge)`
 ` as unknown) as typeof EuiBadge;
 Badge.displayName = 'Badge';
 
+const HeaderSection = styled(EuiPageHeaderSection)`
+  // Without  min-width: 0, as a flex child, it wouldn't shrink properly
+  // and could overflow its parent.
+  min-width: 0;
+  max-width: 100%;
+`;
+HeaderSection.displayName = 'HeaderSection';
+
 interface BackOptions {
   href: LinkIconProps['href'];
   text: LinkIconProps['children'];
@@ -105,7 +113,7 @@ const HeaderPageComponent: React.FC<HeaderPageProps> = ({
   return (
     <>
       <EuiPageHeader alignItems="center" bottomBorder={border}>
-        <EuiPageHeaderSection>
+        <HeaderSection>
           {backOptions && (
             <LinkBack>
               <LinkIcon
@@ -132,7 +140,7 @@ const HeaderPageComponent: React.FC<HeaderPageProps> = ({
           {subtitle && <Subtitle data-test-subj="header-page-subtitle" items={subtitle} />}
           {subtitle2 && <Subtitle data-test-subj="header-page-subtitle-2" items={subtitle2} />}
           {border && isLoading && <EuiProgress size="xs" color="accent" />}
-        </EuiPageHeaderSection>
+        </HeaderSection>
 
         {children && (
           <EuiPageHeaderSection data-test-subj="header-page-supplements">
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
index 471d539ea03f4..a99132d5c7f62 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
@@ -24,6 +24,19 @@ const Badge = (styled(EuiBadge)`
 ` as unknown) as typeof EuiBadge;
 Badge.displayName = 'Badge';
 
+const Header = styled.h1`
+  display: flex;
+  align-items: center;
+`;
+Header.displayName = 'Header';
+
+const TitleWrapper = styled.span`
+  // Without  min-width: 0, as a flex child, it wouldn't shrink properly
+  // and could overflow its parent.
+  min-width: 0;
+`;
+TitleWrapper.displayName = 'TitleWrapper';
+
 interface Props {
   badgeOptions?: BadgeOptions;
   title: TitleProp;
@@ -32,9 +45,11 @@ interface Props {
 
 const TitleComponent: React.FC<Props> = ({ draggableArguments, title, badgeOptions }) => (
   <EuiTitle size="l">
-    <h1 data-test-subj="header-page-title">
+    <Header data-test-subj="header-page-title">
       {!draggableArguments ? (
-        <TruncatableText tooltipContent={title}>{title}</TruncatableText>
+        <TitleWrapper>
+          <TruncatableText tooltipContent={title}>{title}</TruncatableText>
+        </TitleWrapper>
       ) : (
         <DefaultDraggable
           data-test-subj="header-page-draggable"
@@ -53,13 +68,13 @@ const TitleComponent: React.FC<Props> = ({ draggableArguments, title, badgeOptio
               tooltipPosition="bottom"
             />
           ) : (
-            <Badge color="hollow" title="">
+            <Badge color={badgeOptions.color || 'hollow'} title="">
               {badgeOptions.text}
             </Badge>
           )}
         </>
       )}
-    </h1>
+    </Header>
   </EuiTitle>
 );
 
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/types.ts b/x-pack/plugins/security_solution/public/common/components/header_page/types.ts
index e95d0c8e1e69c..f099144eeb4be 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/types.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { EuiBadgeProps } from '@elastic/eui';
 import type React from 'react';
 export type TitleProp = string | React.ReactNode;
 
@@ -17,4 +18,5 @@ export interface BadgeOptions {
   beta?: boolean;
   text: string;
   tooltip?: string;
+  color?: EuiBadgeProps['color'];
 }
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index b4f1af41a0606..92679cb2662d7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -18,7 +18,6 @@ import {
   EuiTabs,
   EuiToolTip,
   EuiWindowEvent,
-  EuiBadge,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { noop } from 'lodash/fp';
@@ -115,6 +114,7 @@ import { NeedAdminForUpdateRulesCallOut } from '../../../../components/callouts/
 import { getRuleStatusText } from '../../../../../../common/detection_engine/utils';
 import { MissingPrivilegesCallOut } from '../../../../components/callouts/missing_privileges_callout';
 import { useRuleWithFallback } from '../../../../containers/detection_engine/rules/use_rule_with_fallback';
+import { BadgeOptions } from '../../../../../common/components/header_page/types';
 
 /**
  * Need a 100% height here to account for the graph/analyze tool, which sets no explicit height parameters, but fills the available space.
@@ -253,15 +253,20 @@ const RuleDetailsPageComponent = () => {
   const title = useMemo(
     () => (
       <>
-        {rule?.name}{' '}
-        {ruleLoading ? (
-          <EuiLoadingSpinner size="m" />
-        ) : (
-          !isExistingRule && <EuiBadge>{i18n.DELETED_RULE}</EuiBadge>
-        )}
+        {rule?.name} {ruleLoading && <EuiLoadingSpinner size="m" />}
       </>
     ),
-    [rule, ruleLoading, isExistingRule]
+    [rule, ruleLoading]
+  );
+  const badgeOptions = useMemo<BadgeOptions | undefined>(
+    () =>
+      !ruleLoading && !isExistingRule
+        ? {
+            text: i18n.DELETED_RULE,
+            color: 'default',
+          }
+        : undefined,
+    [isExistingRule, ruleLoading]
   );
   const subTitle = useMemo(
     () =>
@@ -595,6 +600,7 @@ const RuleDetailsPageComponent = () => {
                   </>,
                 ]}
                 title={title}
+                badgeOptions={badgeOptions}
               >
                 <EuiFlexGroup alignItems="center">
                   <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
index a9a97f6bac652..d9d5ac9241f19 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
@@ -149,7 +149,7 @@ describe('Network Details', () => {
     );
     expect(
       wrapper
-        .find('[data-test-subj="network-details-headline"] [data-test-subj="header-page-title"]')
+        .find('[data-test-subj="network-details-headline"] h1[data-test-subj="header-page-title"]')
         .text()
     ).toEqual('fe80::24ce:f7ff:fede:a571');
   });

From 5abac25ba3ca4fb20dbba49e354da7f1a6285a46 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Thu, 24 Jun 2021 19:19:20 +0200
Subject: [PATCH 63/95] [Lens] Update formula icons (#103287)

* :lipstick: Updated formula reference icon

* :lipstick: Replace wordwrap icons
---
 .../definitions/formula/editor/formula_editor.tsx          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
index d1b0ec8876feb..83a782b519248 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
@@ -585,7 +585,6 @@ export function FormulaEditor({
             <div className="lnsFormula__editorHeader">
               <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
                 <EuiFlexItem className="lnsFormula__editorHeaderGroup">
-                  {/* TODO: Replace `bolt` with `wordWrap` icon (after latest EUI is deployed) and hook up button to enable/disable word wrapping. */}
                   <EuiToolTip
                     content={
                       isWordWrapped
@@ -599,7 +598,7 @@ export function FormulaEditor({
                     position="top"
                   >
                     <EuiButtonIcon
-                      iconType="bolt"
+                      iconType={isWordWrapped ? 'wordWrap' : 'wordWrapDisabled'}
                       display={!isWordWrapped ? 'fill' : undefined}
                       color={'text'}
                       aria-label={
@@ -725,7 +724,7 @@ export function FormulaEditor({
                         color="text"
                         onClick={() => setIsHelpOpen(!isHelpOpen)}
                       >
-                        <EuiIcon type="help" />
+                        <EuiIcon type="documentation" />
                         <EuiIcon type={isHelpOpen ? 'arrowDown' : 'arrowUp'} />
                       </EuiLink>
                     </EuiToolTip>
@@ -747,7 +746,7 @@ export function FormulaEditor({
                           <EuiButtonIcon
                             className="lnsFormula__editorHelp lnsFormula__editorHelp--overlay"
                             onClick={() => setIsHelpOpen(!isHelpOpen)}
-                            iconType="help"
+                            iconType="documentation"
                             color="text"
                             size="s"
                             aria-label={i18n.translate(

From bf6c53bb45a3488000c836a8cba1432f1f2dc2eb Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Thu, 24 Jun 2021 19:31:24 +0200
Subject: [PATCH 64/95] Improved Visualize button in field popover (#103099)

* Improve field popover

* Slightly improve type safteyness

* Add unit tests for visualize trigger utils

* Remove unused div

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...iscover_field_details_footer.test.tsx.snap | 705 ------------------
 .../components/sidebar/discover_field.tsx     |  37 +-
 .../sidebar/discover_field_details.scss       |  10 -
 .../sidebar/discover_field_details.test.tsx   |  41 +-
 .../sidebar/discover_field_details.tsx        | 100 +--
 .../discover_field_details_footer.test.tsx    |  71 --
 .../sidebar/discover_field_details_footer.tsx |  59 --
 .../sidebar/discover_field_visualize.tsx      |  66 ++
 .../components/sidebar/lib/get_warnings.ts    |  33 -
 .../lib/visualize_trigger_utils.test.ts       | 116 +++
 .../sidebar/lib/visualize_trigger_utils.ts    |  84 ++-
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 13 files changed, 288 insertions(+), 1038 deletions(-)
 delete mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
 delete mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss
 delete mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
 delete mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
 create mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx
 delete mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
 create mode 100644 src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.test.ts

diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
deleted file mode 100644
index f976b961d8520..0000000000000
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
+++ /dev/null
@@ -1,705 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`discover sidebar field details footer renders properly 1`] = `
-<DiscoverFieldDetailsFooter
-  details={
-    Object {
-      "buckets": Array [],
-      "columns": Array [],
-      "error": "",
-      "exists": 1,
-      "total": 2,
-    }
-  }
-  field={
-    Object {
-      "aggregatable": true,
-      "conflictDescriptions": undefined,
-      "count": 10,
-      "customLabel": undefined,
-      "esTypes": Array [
-        "long",
-      ],
-      "lang": undefined,
-      "name": "bytes",
-      "readFromDocValues": true,
-      "script": undefined,
-      "scripted": false,
-      "searchable": true,
-      "subType": undefined,
-      "type": "number",
-    }
-  }
-  indexPattern={
-    StubIndexPattern {
-      "_reindexFields": [Function],
-      "fieldFormatMap": Object {},
-      "fields": FldList [
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 10,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "long",
-          ],
-          "lang": undefined,
-          "name": "bytes",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "number",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 20,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "boolean",
-          ],
-          "lang": undefined,
-          "name": "ssl",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "boolean",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 30,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "date",
-          ],
-          "lang": undefined,
-          "name": "@timestamp",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "date",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 30,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "date",
-          ],
-          "lang": undefined,
-          "name": "time",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "date",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "keyword",
-          ],
-          "lang": undefined,
-          "name": "@tags",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "date",
-          ],
-          "lang": undefined,
-          "name": "utc_time",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "date",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "integer",
-          ],
-          "lang": undefined,
-          "name": "phpmemory",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "number",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "ip",
-          ],
-          "lang": undefined,
-          "name": "ip",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "ip",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "attachment",
-          ],
-          "lang": undefined,
-          "name": "request_body",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "attachment",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "geo_point",
-          ],
-          "lang": undefined,
-          "name": "point",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "geo_point",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "geo_shape",
-          ],
-          "lang": undefined,
-          "name": "area",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "geo_shape",
-        },
-        Object {
-          "aggregatable": false,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "murmur3",
-          ],
-          "lang": undefined,
-          "name": "hashed",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "murmur3",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "geo_point",
-          ],
-          "lang": undefined,
-          "name": "geo.coordinates",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "geo_point",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "text",
-          ],
-          "lang": undefined,
-          "name": "extension",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "keyword",
-          ],
-          "lang": undefined,
-          "name": "extension.keyword",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": Object {
-            "multi": Object {
-              "parent": "extension",
-            },
-          },
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "text",
-          ],
-          "lang": undefined,
-          "name": "machine.os",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "keyword",
-          ],
-          "lang": undefined,
-          "name": "machine.os.raw",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": Object {
-            "multi": Object {
-              "parent": "machine.os",
-            },
-          },
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "keyword",
-          ],
-          "lang": undefined,
-          "name": "geo.src",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "_id",
-          ],
-          "lang": undefined,
-          "name": "_id",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "_type",
-          ],
-          "lang": undefined,
-          "name": "_type",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "_source",
-          ],
-          "lang": undefined,
-          "name": "_source",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "_source",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "text",
-          ],
-          "lang": undefined,
-          "name": "non-filterable",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": false,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": false,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "text",
-          ],
-          "lang": undefined,
-          "name": "non-sortable",
-          "readFromDocValues": false,
-          "script": undefined,
-          "scripted": false,
-          "searchable": false,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "conflict",
-          ],
-          "lang": undefined,
-          "name": "custom_user_field",
-          "readFromDocValues": true,
-          "script": undefined,
-          "scripted": false,
-          "searchable": true,
-          "subType": undefined,
-          "type": "conflict",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "text",
-          ],
-          "lang": "expression",
-          "name": "script string",
-          "readFromDocValues": false,
-          "script": "'i am a string'",
-          "scripted": true,
-          "searchable": true,
-          "subType": undefined,
-          "type": "string",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "long",
-          ],
-          "lang": "expression",
-          "name": "script number",
-          "readFromDocValues": false,
-          "script": "1234",
-          "scripted": true,
-          "searchable": true,
-          "subType": undefined,
-          "type": "number",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "date",
-          ],
-          "lang": "painless",
-          "name": "script date",
-          "readFromDocValues": false,
-          "script": "1234",
-          "scripted": true,
-          "searchable": true,
-          "subType": undefined,
-          "type": "date",
-        },
-        Object {
-          "aggregatable": true,
-          "conflictDescriptions": undefined,
-          "count": 0,
-          "customLabel": undefined,
-          "esTypes": Array [
-            "murmur3",
-          ],
-          "lang": "expression",
-          "name": "script murmur3",
-          "readFromDocValues": false,
-          "script": "1234",
-          "scripted": true,
-          "searchable": true,
-          "subType": undefined,
-          "type": "murmur3",
-        },
-      ],
-      "fieldsFetcher": Object {
-        "apiClient": Object {
-          "baseUrl": "",
-        },
-      },
-      "flattenHit": [Function],
-      "formatField": [Function],
-      "formatHit": [Function],
-      "getComputedFields": [Function],
-      "getConfig": [Function],
-      "getFieldByName": [Function],
-      "getFormatterForField": [Function],
-      "getNonScriptedFields": [Function],
-      "getScriptedFields": [Function],
-      "getSourceFiltering": [Function],
-      "id": "logstash-*",
-      "isTimeBased": [Function],
-      "metaFields": Array [
-        "_id",
-        "_type",
-        "_source",
-      ],
-      "popularizeField": [Function],
-      "setFieldFormat": [Function],
-      "stubSetFieldFormat": [Function],
-      "timeFieldName": "time",
-      "title": "logstash-*",
-    }
-  }
-  intl={
-    Object {
-      "defaultFormats": Object {},
-      "defaultLocale": "en",
-      "formatDate": [Function],
-      "formatHTMLMessage": [Function],
-      "formatMessage": [Function],
-      "formatNumber": [Function],
-      "formatPlural": [Function],
-      "formatRelative": [Function],
-      "formatTime": [Function],
-      "formats": Object {
-        "date": Object {
-          "full": Object {
-            "day": "numeric",
-            "month": "long",
-            "weekday": "long",
-            "year": "numeric",
-          },
-          "long": Object {
-            "day": "numeric",
-            "month": "long",
-            "year": "numeric",
-          },
-          "medium": Object {
-            "day": "numeric",
-            "month": "short",
-            "year": "numeric",
-          },
-          "short": Object {
-            "day": "numeric",
-            "month": "numeric",
-            "year": "2-digit",
-          },
-        },
-        "number": Object {
-          "currency": Object {
-            "style": "currency",
-          },
-          "percent": Object {
-            "style": "percent",
-          },
-        },
-        "relative": Object {
-          "days": Object {
-            "units": "day",
-          },
-          "hours": Object {
-            "units": "hour",
-          },
-          "minutes": Object {
-            "units": "minute",
-          },
-          "months": Object {
-            "units": "month",
-          },
-          "seconds": Object {
-            "units": "second",
-          },
-          "years": Object {
-            "units": "year",
-          },
-        },
-        "time": Object {
-          "full": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "long": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "medium": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-          },
-          "short": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-          },
-        },
-      },
-      "formatters": Object {
-        "getDateTimeFormat": [Function],
-        "getMessageFormat": [Function],
-        "getNumberFormat": [Function],
-        "getPluralFormat": [Function],
-        "getRelativeFormat": [Function],
-      },
-      "locale": "en",
-      "messages": Object {},
-      "now": [Function],
-      "onError": [Function],
-      "textComponent": Symbol(react.fragment),
-      "timeZone": null,
-    }
-  }
-  onAddFilter={[MockFunction]}
->
-  <EuiPopoverFooter>
-    <div
-      className="euiPopoverFooter"
-    >
-      <EuiText
-        size="xs"
-        textAlign="center"
-      >
-        <div
-          className="euiText euiText--extraSmall"
-        >
-          <EuiTextAlign
-            textAlign="center"
-          >
-            <div
-              className="euiTextAlign euiTextAlign--center"
-            >
-              <EuiLink
-                data-test-subj="onAddFilterButton"
-                onClick={[Function]}
-              >
-                <button
-                  className="euiLink euiLink--primary"
-                  data-test-subj="onAddFilterButton"
-                  disabled={false}
-                  onClick={[Function]}
-                  type="button"
-                >
-                  <FormattedMessage
-                    defaultMessage="Exists in {value} / {totalValue} records"
-                    id="discover.fieldChooser.detailViews.existsInRecordsText"
-                    values={
-                      Object {
-                        "totalValue": 2,
-                        "value": 1,
-                      }
-                    }
-                  >
-                    Exists in 1 / 2 records
-                  </FormattedMessage>
-                </button>
-              </EuiLink>
-            </div>
-          </EuiTextAlign>
-        </div>
-      </EuiText>
-    </div>
-  </EuiPopoverFooter>
-</DiscoverFieldDetailsFooter>
-`;
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
index 26a3c482e9d3c..301866c762fbd 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
@@ -8,7 +8,7 @@
 
 import './discover_field.scss';
 
-import React, { useState, useCallback, memo } from 'react';
+import React, { useState, useCallback, memo, useMemo } from 'react';
 import {
   EuiPopover,
   EuiPopoverTitle,
@@ -18,6 +18,7 @@ import {
   EuiIcon,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
@@ -27,7 +28,7 @@ import { FieldIcon, FieldButton } from '../../../../../../../kibana_react/public
 import { FieldDetails } from './types';
 import { IndexPatternField, IndexPattern } from '../../../../../../../data/public';
 import { getFieldTypeName } from './lib/get_field_type_name';
-import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
+import { DiscoverFieldVisualize } from './discover_field_visualize';
 
 function wrapOnDot(str?: string) {
   // u200B is a non-width white-space character, which allows
@@ -172,6 +173,7 @@ const MultiFields: React.FC<MultiFieldsProps> = memo(
           })}
         </h5>
       </EuiTitle>
+      <EuiSpacer size="xs" />
       {multiFields.map((entry) => (
         <FieldButton
           size="s"
@@ -282,6 +284,8 @@ function DiscoverFieldComponent({
     setOpen(!infoIsOpen);
   }, [infoIsOpen]);
 
+  const rawMultiFields = useMemo(() => multiFields?.map((f) => f.field), [multiFields]);
+
   if (field.type === '_source') {
     return (
       <FieldButton
@@ -399,23 +403,24 @@ function DiscoverFieldComponent({
             field={field}
             details={details}
             onAddFilter={onAddFilter}
-            trackUiMetric={trackUiMetric}
           />
           {multiFields && (
-            <MultiFields
-              multiFields={multiFields}
-              alwaysShowActionButton={alwaysShowActionButton}
-              toggleDisplay={toggleDisplay}
-            />
-          )}
-          {!details.error && (
-            <DiscoverFieldDetailsFooter
-              indexPattern={indexPattern}
-              field={field}
-              details={details}
-              onAddFilter={onAddFilter}
-            />
+            <>
+              <EuiSpacer size="m" />
+              <MultiFields
+                multiFields={multiFields}
+                alwaysShowActionButton={alwaysShowActionButton}
+                toggleDisplay={toggleDisplay}
+              />
+            </>
           )}
+          <DiscoverFieldVisualize
+            field={field}
+            indexPattern={indexPattern}
+            multiFields={rawMultiFields}
+            trackUiMetric={trackUiMetric}
+            details={details}
+          />
         </>
       )}
     </EuiPopover>
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss
deleted file mode 100644
index ca48d67f75dec..0000000000000
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.dscFieldDetails {
-  color: $euiTextColor;
-  margin-bottom: $euiSizeS;
-}
-
-.dscFieldDetails__visualizeBtn {
-  @include euiFontSizeXS;
-  height: $euiSizeL !important;
-  min-width: $euiSize * 4;
-}
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
index a798abb60b833..8c9ad5bc9708a 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
@@ -25,10 +25,11 @@ const indexPattern = getStubIndexPattern(
 );
 
 describe('discover sidebar field details', function () {
+  const onAddFilter = jest.fn();
   const defaultProps = {
     indexPattern,
     details: { buckets: [], error: '', exists: 1, total: 2, columns: [] },
-    onAddFilter: jest.fn(),
+    onAddFilter,
   };
 
   function mountComponent(field: IndexPatternField) {
@@ -36,7 +37,7 @@ describe('discover sidebar field details', function () {
     return mountWithIntl(<DiscoverFieldDetails {...compProps} />);
   }
 
-  it('should enable the visualize link for a number field', function () {
+  it('click on addFilter calls the function', function () {
     const visualizableField = new IndexPatternField({
       name: 'bytes',
       type: 'number',
@@ -47,37 +48,9 @@ describe('discover sidebar field details', function () {
       aggregatable: true,
       readFromDocValues: true,
     });
-    const comp = mountComponent(visualizableField);
-    expect(findTestSubject(comp, 'fieldVisualize-bytes')).toBeTruthy();
-  });
-
-  it('should disable the visualize link for an _id field', function () {
-    const conflictField = new IndexPatternField({
-      name: '_id',
-      type: 'string',
-      esTypes: ['_id'],
-      count: 0,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const comp = mountComponent(conflictField);
-    expect(findTestSubject(comp, 'fieldVisualize-_id')).toEqual({});
-  });
-
-  it('should disable the visualize link for an unknown field', function () {
-    const unknownField = new IndexPatternField({
-      name: 'test',
-      type: 'unknown',
-      esTypes: ['double'],
-      count: 0,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const comp = mountComponent(unknownField);
-    expect(findTestSubject(comp, 'fieldVisualize-test')).toEqual({});
+    const component = mountComponent(visualizableField);
+    const onAddButton = findTestSubject(component, 'onAddFilterButton');
+    onAddButton.simulate('click');
+    expect(onAddFilter).toHaveBeenCalledWith('_exists_', visualizableField.name, '+');
   });
 });
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
index ffa7b30de5280..e29799b720e21 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
@@ -6,27 +6,18 @@
  * Side Public License, v 1.
  */
 
-import React, { useState, useEffect } from 'react';
-import { EuiIconTip, EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
+import React from 'react';
+import { EuiText, EuiSpacer, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
 import { DiscoverFieldBucket } from './discover_field_bucket';
-import { getWarnings } from './lib/get_warnings';
-import {
-  triggerVisualizeActions,
-  isFieldVisualizable,
-  getVisualizeHref,
-} from './lib/visualize_trigger_utils';
 import { Bucket, FieldDetails } from './types';
 import { IndexPatternField, IndexPattern } from '../../../../../../../data/public';
-import './discover_field_details.scss';
 
 interface DiscoverFieldDetailsProps {
   field: IndexPatternField;
   indexPattern: IndexPattern;
   details: FieldDetails;
   onAddFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
-  trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
 }
 
 export function DiscoverFieldDetails({
@@ -34,46 +25,12 @@ export function DiscoverFieldDetails({
   indexPattern,
   details,
   onAddFilter,
-  trackUiMetric,
 }: DiscoverFieldDetailsProps) {
-  const warnings = getWarnings(field);
-  const [showVisualizeLink, setShowVisualizeLink] = useState<boolean>(false);
-  const [visualizeLink, setVisualizeLink] = useState<string>('');
-
-  useEffect(() => {
-    isFieldVisualizable(field, indexPattern.id, details.columns).then(
-      (flag) => {
-        setShowVisualizeLink(flag);
-        // get href only if Visualize button is enabled
-        getVisualizeHref(field, indexPattern.id, details.columns).then(
-          (uri) => {
-            if (uri) setVisualizeLink(uri);
-          },
-          () => {
-            setVisualizeLink('');
-          }
-        );
-      },
-      () => {
-        setShowVisualizeLink(false);
-      }
-    );
-  }, [field, indexPattern.id, details.columns]);
-
-  const handleVisualizeLinkClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-    // regular link click. let the uiActions code handle the navigation and show popup if needed
-    event.preventDefault();
-    if (trackUiMetric) {
-      trackUiMetric(METRIC_TYPE.CLICK, 'visualize_link_click');
-    }
-    triggerVisualizeActions(field, indexPattern.id, details.columns);
-  };
-
   return (
     <>
-      <div className="dscFieldDetails">
-        {details.error && <EuiText size="xs">{details.error}</EuiText>}
-        {!details.error && (
+      {details.error && <EuiText size="xs">{details.error}</EuiText>}
+      {!details.error && (
+        <>
           <div style={{ marginTop: '4px' }}>
             {details.buckets.map((bucket: Bucket, idx: number) => (
               <DiscoverFieldBucket
@@ -84,30 +41,35 @@ export function DiscoverFieldDetails({
               />
             ))}
           </div>
-        )}
-
-        {showVisualizeLink && (
-          <>
-            <EuiSpacer size="xs" />
-            {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
-            <EuiButton
-              onClick={(e) => handleVisualizeLinkClick(e)}
-              href={visualizeLink}
-              size="s"
-              className="dscFieldDetails__visualizeBtn"
-              data-test-subj={`fieldVisualize-${field.name}`}
-            >
+          <EuiSpacer size="xs" />
+          <EuiText size="xs">
+            {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
+              <EuiLink
+                onClick={() => onAddFilter('_exists_', field.name, '+')}
+                data-test-subj="onAddFilterButton"
+              >
+                <FormattedMessage
+                  id="discover.fieldChooser.detailViews.existsInRecordsText"
+                  defaultMessage="Exists in {value} / {totalValue} records"
+                  values={{
+                    value: details.exists,
+                    totalValue: details.total,
+                  }}
+                />
+              </EuiLink>
+            ) : (
               <FormattedMessage
-                id="discover.fieldChooser.detailViews.visualizeLinkText"
-                defaultMessage="Visualize"
+                id="discover.fieldChooser.detailViews.valueOfRecordsText"
+                defaultMessage="{value} / {totalValue} records"
+                values={{
+                  value: details.exists,
+                  totalValue: details.total,
+                }}
               />
-            </EuiButton>
-            {warnings.length > 0 && (
-              <EuiIconTip type="alert" color="warning" content={warnings.join(' ')} />
             )}
-          </>
-        )}
-      </div>
+          </EuiText>
+        </>
+      )}
     </>
   );
 }
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
deleted file mode 100644
index aa93b2a663736..0000000000000
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
+++ /dev/null
@@ -1,71 +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 { findTestSubject } from '@elastic/eui/lib/test';
-import { mountWithIntl } from '@kbn/test/jest';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
-import { coreMock } from '../../../../../../../../core/public/mocks';
-import { IndexPatternField } from '../../../../../../../data/public';
-import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
-import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
-
-const indexPattern = getStubIndexPattern(
-  'logstash-*',
-  (cfg: unknown) => cfg,
-  'time',
-  stubbedLogstashFields(),
-  coreMock.createSetup()
-);
-
-describe('discover sidebar field details footer', function () {
-  const onAddFilter = jest.fn();
-  const defaultProps = {
-    indexPattern,
-    details: { buckets: [], error: '', exists: 1, total: 2, columns: [] },
-    onAddFilter,
-  };
-
-  function mountComponent(field: IndexPatternField) {
-    const compProps = { ...defaultProps, field };
-    return mountWithIntl(<DiscoverFieldDetailsFooter {...compProps} />);
-  }
-
-  it('renders properly', function () {
-    const visualizableField = new IndexPatternField({
-      name: 'bytes',
-      type: 'number',
-      esTypes: ['long'],
-      count: 10,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const component = mountComponent(visualizableField);
-    expect(component).toMatchSnapshot();
-  });
-
-  it('click on addFilter calls the function', function () {
-    const visualizableField = new IndexPatternField({
-      name: 'bytes',
-      type: 'number',
-      esTypes: ['long'],
-      count: 10,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const component = mountComponent(visualizableField);
-    const onAddButton = findTestSubject(component, 'onAddFilterButton');
-    onAddButton.simulate('click');
-    expect(onAddFilter).toHaveBeenCalledWith('_exists_', visualizableField.name, '+');
-  });
-});
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
deleted file mode 100644
index 148dfc67c3e41..0000000000000
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
+++ /dev/null
@@ -1,59 +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 { EuiLink, EuiPopoverFooter, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { IndexPatternField } from '../../../../../../../data/common/index_patterns/fields';
-import { IndexPattern } from '../../../../../../../data/common/index_patterns/index_patterns';
-import { FieldDetails } from './types';
-
-interface DiscoverFieldDetailsFooterProps {
-  field: IndexPatternField;
-  indexPattern: IndexPattern;
-  details: FieldDetails;
-  onAddFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
-}
-
-export function DiscoverFieldDetailsFooter({
-  field,
-  indexPattern,
-  details,
-  onAddFilter,
-}: DiscoverFieldDetailsFooterProps) {
-  return (
-    <EuiPopoverFooter>
-      <EuiText size="xs" textAlign="center">
-        {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
-          <EuiLink
-            onClick={() => onAddFilter('_exists_', field.name, '+')}
-            data-test-subj="onAddFilterButton"
-          >
-            <FormattedMessage
-              id="discover.fieldChooser.detailViews.existsInRecordsText"
-              defaultMessage="Exists in {value} / {totalValue} records"
-              values={{
-                value: details.exists,
-                totalValue: details.total,
-              }}
-            />
-          </EuiLink>
-        ) : (
-          <FormattedMessage
-            id="discover.fieldChooser.detailViews.valueOfRecordsText"
-            defaultMessage="{value} / {totalValue} records"
-            values={{
-              value: details.exists,
-              totalValue: details.total,
-            }}
-          />
-        )}
-      </EuiText>
-    </EuiPopoverFooter>
-  );
-}
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx
new file mode 100644
index 0000000000000..baf740531e6bf
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx
@@ -0,0 +1,66 @@
+/*
+ * 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, { useEffect, useState } from 'react';
+import { EuiButton, EuiPopoverFooter } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
+import type { IndexPattern, IndexPatternField } from 'src/plugins/data/common';
+
+import { triggerVisualizeActions, VisualizeInformation } from './lib/visualize_trigger_utils';
+import type { FieldDetails } from './types';
+import { getVisualizeInformation } from './lib/visualize_trigger_utils';
+
+interface Props {
+  field: IndexPatternField;
+  indexPattern: IndexPattern;
+  details: FieldDetails;
+  multiFields?: IndexPatternField[];
+  trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
+}
+
+export const DiscoverFieldVisualize: React.FC<Props> = React.memo(
+  ({ field, indexPattern, details, trackUiMetric, multiFields }) => {
+    const [visualizeInfo, setVisualizeInfo] = useState<VisualizeInformation>();
+
+    useEffect(() => {
+      getVisualizeInformation(field, indexPattern.id, details.columns, multiFields).then(
+        setVisualizeInfo
+      );
+    }, [details.columns, field, indexPattern, multiFields]);
+
+    if (!visualizeInfo) {
+      return null;
+    }
+
+    const handleVisualizeLinkClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+      // regular link click. let the uiActions code handle the navigation and show popup if needed
+      event.preventDefault();
+      trackUiMetric?.(METRIC_TYPE.CLICK, 'visualize_link_click');
+      triggerVisualizeActions(visualizeInfo.field, indexPattern.id, details.columns);
+    };
+
+    return (
+      <EuiPopoverFooter>
+        {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
+        <EuiButton
+          fullWidth
+          size="s"
+          href={visualizeInfo.href}
+          onClick={handleVisualizeLinkClick}
+          data-test-subj={`fieldVisualize-${field.name}`}
+        >
+          <FormattedMessage
+            id="discover.fieldChooser.visualizeButton.label"
+            defaultMessage="Visualize"
+          />
+        </EuiButton>
+      </EuiPopoverFooter>
+    );
+  }
+);
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
deleted file mode 100644
index 60ce5351e2cd3..0000000000000
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
+++ /dev/null
@@ -1,33 +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 { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../../../../../data/public';
-
-export function getWarnings(field: IndexPatternField) {
-  let warnings = [];
-
-  if (field.scripted) {
-    warnings.push(
-      i18n.translate(
-        'discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription',
-        {
-          defaultMessage: 'Scripted fields can take a long time to execute.',
-        }
-      )
-    );
-  }
-
-  if (warnings.length > 1) {
-    warnings = warnings.map(function (warning, i) {
-      return (i > 0 ? '\n' : '') + (i + 1) + ' - ' + warning;
-    });
-  }
-
-  return warnings;
-}
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.test.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.test.ts
new file mode 100644
index 0000000000000..0a61bf1ea6029
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.test.ts
@@ -0,0 +1,116 @@
+/*
+ * 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 type { IndexPatternField } from 'src/plugins/data/common';
+import type { Action } from 'src/plugins/ui_actions/public';
+import { getVisualizeInformation } from './visualize_trigger_utils';
+
+const field = {
+  name: 'fieldName',
+  type: 'string',
+  esTypes: ['text'],
+  count: 1,
+  scripted: false,
+  searchable: true,
+  aggregatable: true,
+  readFromDocValues: true,
+  visualizable: true,
+} as IndexPatternField;
+
+const mockGetActions = jest.fn<Promise<Array<Action<object>>>, [string, { fieldName: string }]>(
+  () => Promise.resolve([])
+);
+
+jest.mock('../../../../../../kibana_services', () => ({
+  getUiActions: () => ({
+    getTriggerCompatibleActions: mockGetActions,
+  }),
+}));
+
+const action: Action = {
+  id: 'action',
+  type: 'VISUALIZE_FIELD',
+  getIconType: () => undefined,
+  getDisplayName: () => 'Action',
+  isCompatible: () => Promise.resolve(true),
+  execute: () => Promise.resolve(),
+};
+
+describe('visualize_trigger_utils', () => {
+  afterEach(() => {
+    mockGetActions.mockReset();
+  });
+
+  describe('getVisualizeInformation', () => {
+    it('should return for a visualizeable field with an action', async () => {
+      mockGetActions.mockResolvedValue([action]);
+      const information = await getVisualizeInformation(field, '1', [], undefined);
+      expect(information).not.toBeUndefined();
+      expect(information?.field).toHaveProperty('name', 'fieldName');
+      expect(information?.href).toBeUndefined();
+    });
+
+    it('should return field and href from the action', async () => {
+      mockGetActions.mockResolvedValue([{ ...action, getHref: () => Promise.resolve('hreflink') }]);
+      const information = await getVisualizeInformation(field, '1', [], undefined);
+      expect(information).not.toBeUndefined();
+      expect(information?.field).toHaveProperty('name', 'fieldName');
+      expect(information).toHaveProperty('href', 'hreflink');
+    });
+
+    it('should return undefined if no field has a compatible action', async () => {
+      mockGetActions.mockResolvedValue([]);
+      const information = await getVisualizeInformation(
+        { ...field, name: 'rootField' } as IndexPatternField,
+        '1',
+        [],
+        [
+          { ...field, name: 'multi1' },
+          { ...field, name: 'multi2' },
+        ] as IndexPatternField[]
+      );
+      expect(information).toBeUndefined();
+    });
+
+    it('should return information for the root field, when multi fields and root are having actions', async () => {
+      mockGetActions.mockResolvedValue([action]);
+      const information = await getVisualizeInformation(
+        { ...field, name: 'rootField' } as IndexPatternField,
+        '1',
+        [],
+        [
+          { ...field, name: 'multi1' },
+          { ...field, name: 'multi2' },
+        ] as IndexPatternField[]
+      );
+      expect(information).not.toBeUndefined();
+      expect(information?.field).toHaveProperty('name', 'rootField');
+    });
+
+    it('should return information for first multi field that has a compatible action', async () => {
+      mockGetActions.mockImplementation(async (_, { fieldName }) => {
+        if (fieldName === 'multi2' || fieldName === 'multi3') {
+          return [action];
+        }
+        return [];
+      });
+      const information = await getVisualizeInformation(
+        { ...field, name: 'rootField' } as IndexPatternField,
+        '1',
+        [],
+        [
+          { ...field, name: 'multi1' },
+          { ...field, name: 'multi2' },
+          { ...field, name: 'multi3' },
+        ] as IndexPatternField[]
+      );
+      expect(information).not.toBeUndefined();
+      expect(information?.field).toHaveProperty('name', 'multi2');
+    });
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
index 2fabaa0ddd100..f00b430e5acef 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
@@ -41,30 +41,6 @@ async function getCompatibleActions(
   return compatibleActions;
 }
 
-export async function getVisualizeHref(
-  field: IndexPatternField,
-  indexPatternId: string | undefined,
-  contextualFields: string[]
-) {
-  if (!indexPatternId) return undefined;
-  const triggerOptions = {
-    indexPatternId,
-    fieldName: field.name,
-    contextualFields,
-    trigger: getTrigger(field.type),
-  };
-  const compatibleActions = await getCompatibleActions(
-    field.name,
-    indexPatternId,
-    contextualFields,
-    getTriggerConstant(field.type)
-  );
-  // enable the link only if only one action is registered
-  return compatibleActions.length === 1
-    ? compatibleActions[0].getHref?.(triggerOptions)
-    : undefined;
-}
-
 export function triggerVisualizeActions(
   field: IndexPatternField,
   indexPatternId: string | undefined,
@@ -80,21 +56,55 @@ export function triggerVisualizeActions(
   getUiActions().getTrigger(trigger).exec(triggerOptions);
 }
 
-export async function isFieldVisualizable(
+export interface VisualizeInformation {
+  field: IndexPatternField;
+  href?: string;
+}
+
+/**
+ * Returns the field name and potentially href of the field or the first multi-field
+ * that has a compatible visualize uiAction.
+ */
+export async function getVisualizeInformation(
   field: IndexPatternField,
   indexPatternId: string | undefined,
-  contextualFields: string[]
-) {
+  contextualFields: string[],
+  multiFields: IndexPatternField[] = []
+): Promise<VisualizeInformation | undefined> {
   if (field.name === '_id' || !indexPatternId) {
-    // for first condition you'd get a 'Fielddata access on the _id field is disallowed' error on ES side.
-    return false;
+    // _id fields are not visualizeable in ES
+    return undefined;
   }
-  const trigger = getTriggerConstant(field.type);
-  const compatibleActions = await getCompatibleActions(
-    field.name,
-    indexPatternId,
-    contextualFields,
-    trigger
-  );
-  return compatibleActions.length > 0 && field.visualizable;
+
+  for (const f of [field, ...multiFields]) {
+    if (!f.visualizable) {
+      continue;
+    }
+    // Retrieve compatible actions for the specific field
+    const actions = await getCompatibleActions(
+      f.name,
+      indexPatternId,
+      contextualFields,
+      getTriggerConstant(f.type)
+    );
+
+    // if the field has compatible actions use this field for visualizing
+    if (actions.length > 0) {
+      const triggerOptions = {
+        indexPatternId,
+        fieldName: f.name,
+        contextualFields,
+        trigger: getTrigger(f.type),
+      };
+
+      return {
+        field: f,
+        // We use the href of the first action always. Multiple actions will only work
+        // via the modal shown by triggerVisualizeActions that should be called via onClick.
+        href: await actions[0].getHref?.(triggerOptions),
+      };
+    }
+  }
+
+  return undefined;
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 837716ec9dd5a..5f86e020a0407 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1625,7 +1625,6 @@
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "{field}を除外：\"{value}\"",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "{field}を除外：\"{value}\"",
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue}件のレコード",
-    "discover.fieldChooser.detailViews.visualizeLinkText": "可視化",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "{field}を表に追加",
     "discover.fieldChooser.discoverField.addFieldTooltip": "フィールドを列として追加",
     "discover.fieldChooser.discoverField.deleteFieldLabel": "インデックスパターンフィールドを削除",
@@ -1634,7 +1633,6 @@
     "discover.fieldChooser.discoverField.multiFields": "マルチフィールド",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "{field}を表から削除",
     "discover.fieldChooser.discoverField.removeFieldTooltip": "フィールドを表から削除",
-    "discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "スクリプトフィールドは実行に時間がかかる場合があります。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "ジオフィールドは分析できません。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "オブジェクトフィールドは分析できません。",
     "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "このフィールドはElasticsearchマッピングに表示されますが、ドキュメントテーブルの{hitsLength}件のドキュメントには含まれません。可視化や検索は可能な場合があります。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0192566db0731..acad67a0b1c7a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1634,7 +1634,6 @@
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除 {field}：“{value}”",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留 {field}：“{value}”",
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue} 条记录",
-    "discover.fieldChooser.detailViews.visualizeLinkText": "Visualize",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "将 {field} 添加到表中",
     "discover.fieldChooser.discoverField.addFieldTooltip": "将字段添加为列",
     "discover.fieldChooser.discoverField.deleteFieldLabel": "删除索引模式字段",
@@ -1643,7 +1642,6 @@
     "discover.fieldChooser.discoverField.multiFields": "多字段",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "从表中移除 {field}",
     "discover.fieldChooser.discoverField.removeFieldTooltip": "从表中移除字段",
-    "discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "脚本字段执行时间会很长。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "分析不适用于地理字段。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "分析不适用于对象字段。",
     "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "此字段在您的 Elasticsearch 映射中，但不在文档表中显示的 {hitsLength} 个文档中。您可能仍能够基于它可视化或搜索。",

From 23c8d181989b69b8178d0c89c757fc9ce0e9df68 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 24 Jun 2021 10:59:49 -0700
Subject: [PATCH 65/95] [ui-shared-deps] reuse react-beautiful-dnd from eui
 (#102834)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 packages/kbn-ui-shared-deps/src/entry.js | 1 +
 packages/kbn-ui-shared-deps/src/index.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/packages/kbn-ui-shared-deps/src/entry.js b/packages/kbn-ui-shared-deps/src/entry.js
index b8d21a473c65f..0e91c45ae6392 100644
--- a/packages/kbn-ui-shared-deps/src/entry.js
+++ b/packages/kbn-ui-shared-deps/src/entry.js
@@ -40,6 +40,7 @@ export const ElasticEui = require('@elastic/eui');
 export const ElasticEuiLibServices = require('@elastic/eui/lib/services');
 export const ElasticEuiLibServicesFormat = require('@elastic/eui/lib/services/format');
 export const ElasticEuiChartsTheme = require('@elastic/eui/dist/eui_charts_theme');
+export const ReactBeautifulDnD = require('react-beautiful-dnd');
 export const Theme = require('./theme.ts');
 export const Lodash = require('lodash');
 export const LodashFp = require('lodash/fp');
diff --git a/packages/kbn-ui-shared-deps/src/index.js b/packages/kbn-ui-shared-deps/src/index.js
index c5853dc091875..36c2e6b02879e 100644
--- a/packages/kbn-ui-shared-deps/src/index.js
+++ b/packages/kbn-ui-shared-deps/src/index.js
@@ -85,6 +85,8 @@ exports.externals = {
   '@elastic/eui/dist/eui_charts_theme': '__kbnSharedDeps__.ElasticEuiChartsTheme',
   '@elastic/eui/dist/eui_theme_light.json': '__kbnSharedDeps__.Theme.euiLightVars',
   '@elastic/eui/dist/eui_theme_dark.json': '__kbnSharedDeps__.Theme.euiDarkVars',
+  // transient dep of eui
+  'react-beautiful-dnd': '__kbnSharedDeps__.ReactBeautifulDnD',
   lodash: '__kbnSharedDeps__.Lodash',
   'lodash/fp': '__kbnSharedDeps__.LodashFp',
   fflate: '__kbnSharedDeps__.Fflate',

From fb7b596841be2c115cd2ef78d62eeaf5d994aa78 Mon Sep 17 00:00:00 2001
From: Kyle Pollich <kyle.pollich@elastic.co>
Date: Thu, 24 Jun 2021 14:29:56 -0400
Subject: [PATCH 66/95] Fix missing setting modal in integrations app (#103317)

---
 .../public/applications/integrations/app.tsx  | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index c69b6805e0e86..cad51a54d7074 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo, useEffect, useState } from 'react';
 import type { AppMountParameters } from 'kibana/public';
-import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel } from '@elastic/eui';
+import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel, EuiPortal } from '@elastic/eui';
 import type { History } from 'history';
 import { createHashHistory } from 'history';
 import { Router, Redirect, Route, Switch } from 'react-router-dom';
@@ -29,10 +29,10 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
 
-import { AgentPolicyContextProvider } from './hooks';
+import { AgentPolicyContextProvider, useUrlModal } from './hooks';
 import { INTEGRATIONS_ROUTING_PATHS } from './constants';
 
-import { Error, Loading } from './components';
+import { Error, Loading, SettingFlyout } from './components';
 
 import type { UIExtensionsStorage } from './types';
 
@@ -234,12 +234,24 @@ export const IntegrationsAppContext: React.FC<{
 );
 
 export const AppRoutes = memo(() => {
+  const { modal, setModal } = useUrlModal();
   return (
-    <Switch>
-      <Route path={INTEGRATIONS_ROUTING_PATHS.integrations}>
-        <EPMApp />
-      </Route>
-      <Redirect to={INTEGRATIONS_ROUTING_PATHS.integrations_all} />
-    </Switch>
+    <>
+      {modal === 'settings' && (
+        <EuiPortal>
+          <SettingFlyout
+            onClose={() => {
+              setModal(null);
+            }}
+          />
+        </EuiPortal>
+      )}
+      <Switch>
+        <Route path={INTEGRATIONS_ROUTING_PATHS.integrations}>
+          <EPMApp />
+        </Route>
+        <Redirect to={INTEGRATIONS_ROUTING_PATHS.integrations_all} />
+      </Switch>
+    </>
   );
 });

From fbcf405f156ab99ab40d0de6993479712a24f55b Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:47:38 +0200
Subject: [PATCH 67/95] Add telemetry for Elastic Cloud (#102390)

---
 NOTICE.txt                                    |   4 +
 package.json                                  |   9 +-
 x-pack/plugins/cloud/public/fullstory.ts      | 100 +++++++++++
 .../plugins/cloud/public/plugin.test.mocks.ts |  13 ++
 x-pack/plugins/cloud/public/plugin.test.ts    | 164 ++++++++++++++++--
 x-pack/plugins/cloud/public/plugin.ts         |  79 ++++++++-
 .../cloud/server/assets/fullstory_library.js  |  13 ++
 x-pack/plugins/cloud/server/config.test.ts    |   6 +-
 x-pack/plugins/cloud/server/plugin.ts         |   8 +
 .../cloud/server/routes/fullstory.test.ts     |  62 +++++++
 .../plugins/cloud/server/routes/fullstory.ts  |  75 ++++++++
 x-pack/test/cloud_integration/config.ts       |  87 ++++++++++
 x-pack/test/cloud_integration/constants.ts    |   8 +
 .../fixtures/saml/saml_provider/kibana.json   |   7 +
 .../fixtures/saml/saml_provider/metadata.xml  |  41 +++++
 .../saml/saml_provider/server/index.ts        |  15 ++
 .../saml/saml_provider/server/init_routes.ts  |  58 +++++++
 .../saml/saml_provider/server/saml_tools.ts   | 161 +++++++++++++++++
 .../ftr_provider_context.d.ts                 |  13 ++
 .../test/cloud_integration/tests/fullstory.ts |  66 +++++++
 yarn.lock                                     |   5 +
 21 files changed, 973 insertions(+), 21 deletions(-)
 create mode 100644 x-pack/plugins/cloud/public/fullstory.ts
 create mode 100644 x-pack/plugins/cloud/public/plugin.test.mocks.ts
 create mode 100644 x-pack/plugins/cloud/server/assets/fullstory_library.js
 create mode 100644 x-pack/plugins/cloud/server/routes/fullstory.test.ts
 create mode 100644 x-pack/plugins/cloud/server/routes/fullstory.ts
 create mode 100644 x-pack/test/cloud_integration/config.ts
 create mode 100644 x-pack/test/cloud_integration/constants.ts
 create mode 100644 x-pack/test/cloud_integration/fixtures/saml/saml_provider/kibana.json
 create mode 100644 x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
 create mode 100644 x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
 create mode 100644 x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
 create mode 100644 x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/saml_tools.ts
 create mode 100644 x-pack/test/cloud_integration/ftr_provider_context.d.ts
 create mode 100644 x-pack/test/cloud_integration/tests/fullstory.ts

diff --git a/NOTICE.txt b/NOTICE.txt
index 4eec329b7a603..b0f7e65f46fa9 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -235,6 +235,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+---
+Portions of this code are licensed under the following license:
+For license information please see https://edge.fullstory.com/s/fs.js.LICENSE.txt
+
 ---
 This product bundles bootstrap@3.3.6 which is available under a
 "MIT" license.
diff --git a/package.json b/package.json
index ecedb64c343ec..ceb178d068519 100644
--- a/package.json
+++ b/package.json
@@ -128,25 +128,26 @@
     "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics",
     "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader",
     "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils",
+    "@kbn/common-utils": "link:bazel-bin/packages/kbn-common-utils",
     "@kbn/config": "link:bazel-bin/packages/kbn-config",
     "@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema",
     "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
-    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
     "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
     "@kbn/interpreter": "link:bazel-bin/packages/kbn-interpreter",
     "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils",
     "@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging",
     "@kbn/logging": "link:bazel-bin/packages/kbn-logging",
+    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
     "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco",
     "@kbn/rule-data-utils": "link:bazel-bin/packages/kbn-rule-data-utils",
-    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants",
     "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils",
     "@kbn/securitysolution-hook-utils": "link:bazel-bin/packages/kbn-securitysolution-hook-utils",
-    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types",
     "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types",
     "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types",
+    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types",
     "@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils",
     "@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api",
+    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants",
     "@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks",
     "@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils",
     "@kbn/securitysolution-t-grid": "link:bazel-bin/packages/kbn-securitysolution-t-grid",
@@ -158,7 +159,6 @@
     "@kbn/ui-framework": "link:bazel-bin/packages/kbn-ui-framework",
     "@kbn/ui-shared-deps": "link:bazel-bin/packages/kbn-ui-shared-deps",
     "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types",
-    "@kbn/common-utils": "link:bazel-bin/packages/kbn-common-utils",
     "@kbn/utils": "link:bazel-bin/packages/kbn-utils",
     "@loaders.gl/core": "^2.3.1",
     "@loaders.gl/json": "^2.3.1",
@@ -273,6 +273,7 @@
     "jquery": "^3.5.0",
     "js-levenshtein": "^1.1.6",
     "js-search": "^1.4.3",
+    "js-sha256": "^0.9.0",
     "js-yaml": "^3.14.0",
     "json-stable-stringify": "^1.0.1",
     "json-stringify-pretty-compact": "1.2.0",
diff --git a/x-pack/plugins/cloud/public/fullstory.ts b/x-pack/plugins/cloud/public/fullstory.ts
new file mode 100644
index 0000000000000..31e5ec128b9a3
--- /dev/null
+++ b/x-pack/plugins/cloud/public/fullstory.ts
@@ -0,0 +1,100 @@
+/*
+ * 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 { sha256 } from 'js-sha256';
+import type { IBasePath, PackageInfo } from '../../../../src/core/public';
+
+export interface FullStoryDeps {
+  basePath: IBasePath;
+  orgId: string;
+  packageInfo: PackageInfo;
+  userIdPromise: Promise<string | undefined>;
+}
+
+interface FullStoryApi {
+  identify(userId: string, userVars?: Record<string, any>): void;
+  event(eventName: string, eventProperties: Record<string, any>): void;
+}
+
+export const initializeFullStory = async ({
+  basePath,
+  orgId,
+  packageInfo,
+  userIdPromise,
+}: FullStoryDeps) => {
+  // @ts-expect-error
+  window._fs_debug = false;
+  // @ts-expect-error
+  window._fs_host = 'fullstory.com';
+  // @ts-expect-error
+  window._fs_script = basePath.prepend(`/internal/cloud/${packageInfo.buildNum}/fullstory.js`);
+  // @ts-expect-error
+  window._fs_org = orgId;
+  // @ts-expect-error
+  window._fs_namespace = 'FSKibana';
+
+  /* eslint-disable */
+  (function(m,n,e,t,l,o,g,y){
+      if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
+      // @ts-expect-error
+      g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
+      // @ts-expect-error
+      o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src=_fs_script;
+      // @ts-expect-error
+      y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
+      // @ts-expect-error
+      g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
+      // @ts-expect-error
+      g.anonymize=function(){g.identify(!!0)};
+      // @ts-expect-error
+      g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
+      // @ts-expect-error
+      g.log = function(a,b){g("log",[a,b])};
+      // @ts-expect-error
+      g.consent=function(a){g("consent",!arguments.length||a)};
+      // @ts-expect-error
+      g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
+      // @ts-expect-error
+      g.clearUserCookie=function(){};
+      // @ts-expect-error
+      g.setVars=function(n, p){g('setVars',[n,p]);};
+      // @ts-expect-error
+      g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
+      // @ts-expect-error
+      if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
+      // @ts-expect-error
+      g._v="1.3.0";
+      // @ts-expect-error
+  })(window,document,window['_fs_namespace'],'script','user');
+  /* eslint-enable */
+
+  // @ts-expect-error
+  const fullstory: FullStoryApi = window.FSKibana;
+
+  // Record an event that Kibana was opened so we can easily search for sessions that use Kibana
+  // @ts-expect-error
+  window.FSKibana.event('Loaded Kibana', {
+    kibana_version_str: packageInfo.version,
+  });
+
+  // Use a promise here so we don't have to wait to retrieve the user to start recording the session
+  userIdPromise
+    .then((userId) => {
+      if (!userId) return;
+      // Do the hashing here to keep it at clear as possible in our source code that we do not send literal user IDs
+      const hashedId = sha256(userId.toString());
+      // @ts-expect-error
+      window.FSKibana.identify(hashedId);
+    })
+    .catch((e) => {
+      // eslint-disable-next-line no-console
+      console.error(
+        `[cloud.full_story] Could not call FS.identify due to error: ${e.toString()}`,
+        e
+      );
+    });
+};
diff --git a/x-pack/plugins/cloud/public/plugin.test.mocks.ts b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
new file mode 100644
index 0000000000000..889b8492d5b1b
--- /dev/null
+++ b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 type { FullStoryDeps } from './fullstory';
+
+export const initializeFullStoryMock = jest.fn<void, [FullStoryDeps]>();
+jest.doMock('./fullstory', () => {
+  return { initializeFullStory: initializeFullStoryMock };
+});
diff --git a/x-pack/plugins/cloud/public/plugin.test.ts b/x-pack/plugins/cloud/public/plugin.test.ts
index 981c5138d98d2..af4d3c4c9005d 100644
--- a/x-pack/plugins/cloud/public/plugin.test.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.ts
@@ -9,11 +9,98 @@ import { nextTick } from '@kbn/test/jest';
 import { coreMock } from 'src/core/public/mocks';
 import { homePluginMock } from 'src/plugins/home/public/mocks';
 import { securityMock } from '../../security/public/mocks';
-import { CloudPlugin } from './plugin';
+import { initializeFullStoryMock } from './plugin.test.mocks';
+import { CloudPlugin, CloudConfigType, loadFullStoryUserId } from './plugin';
 
 describe('Cloud Plugin', () => {
+  describe('#setup', () => {
+    describe('setupFullstory', () => {
+      beforeEach(() => {
+        initializeFullStoryMock.mockReset();
+      });
+
+      const setupPlugin = async ({
+        config = {},
+        securityEnabled = true,
+        currentUserProps = {},
+      }: {
+        config?: Partial<CloudConfigType>;
+        securityEnabled?: boolean;
+        currentUserProps?: Record<string, any>;
+      }) => {
+        const initContext = coreMock.createPluginInitializerContext({
+          id: 'cloudId',
+          base_url: 'https://cloud.elastic.co',
+          deployment_url: '/abc123',
+          profile_url: '/profile/alice',
+          organization_url: '/org/myOrg',
+          full_story: {
+            enabled: false,
+          },
+          ...config,
+        });
+        const plugin = new CloudPlugin(initContext);
+
+        const coreSetup = coreMock.createSetup();
+        const securitySetup = securityMock.createSetup();
+        securitySetup.authc.getCurrentUser.mockResolvedValue(
+          securityMock.createMockAuthenticatedUser(currentUserProps)
+        );
+
+        const setup = plugin.setup(coreSetup, securityEnabled ? { security: securitySetup } : {});
+        // Wait for fullstory dynamic import to resolve
+        await new Promise((r) => setImmediate(r));
+
+        return { initContext, plugin, setup };
+      };
+
+      it('calls initializeFullStory with correct args when enabled and org_id are set', async () => {
+        const { initContext } = await setupPlugin({
+          config: { full_story: { enabled: true, org_id: 'foo' } },
+          currentUserProps: {
+            username: '1234',
+          },
+        });
+
+        expect(initializeFullStoryMock).toHaveBeenCalled();
+        const {
+          basePath,
+          orgId,
+          packageInfo,
+          userIdPromise,
+        } = initializeFullStoryMock.mock.calls[0][0];
+        expect(basePath.prepend).toBeDefined();
+        expect(orgId).toEqual('foo');
+        expect(packageInfo).toEqual(initContext.env.packageInfo);
+        expect(await userIdPromise).toEqual('1234');
+      });
+
+      it('passes undefined user ID when security is not available', async () => {
+        await setupPlugin({
+          config: { full_story: { enabled: true, org_id: 'foo' } },
+          securityEnabled: false,
+        });
+
+        expect(initializeFullStoryMock).toHaveBeenCalled();
+        const { orgId, userIdPromise } = initializeFullStoryMock.mock.calls[0][0];
+        expect(orgId).toEqual('foo');
+        expect(await userIdPromise).toEqual(undefined);
+      });
+
+      it('does not call initializeFullStory when enabled=false', async () => {
+        await setupPlugin({ config: { full_story: { enabled: false, org_id: 'foo' } } });
+        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+      });
+
+      it('does not call initializeFullStory when org_id is undefined', async () => {
+        await setupPlugin({ config: { full_story: { enabled: true } } });
+        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+      });
+    });
+  });
+
   describe('#start', () => {
-    function setupPlugin() {
+    const startPlugin = () => {
       const plugin = new CloudPlugin(
         coreMock.createPluginInitializerContext({
           id: 'cloudId',
@@ -21,6 +108,9 @@ describe('Cloud Plugin', () => {
           deployment_url: '/abc123',
           profile_url: '/profile/alice',
           organization_url: '/org/myOrg',
+          full_story: {
+            enabled: false,
+          },
         })
       );
       const coreSetup = coreMock.createSetup();
@@ -29,10 +119,10 @@ describe('Cloud Plugin', () => {
       plugin.setup(coreSetup, { home: homeSetup });
 
       return { coreSetup, plugin };
-    }
+    };
 
     it('registers help support URL', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -47,7 +137,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('does not register custom nav links on anonymous pages', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       coreStart.http.anonymousPaths.isAnonymous.mockReturnValue(true);
@@ -68,7 +158,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('registers a custom nav link for superusers', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -94,7 +184,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('registers a custom nav link when there is an error retrieving the current user', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -116,7 +206,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('does not register a custom nav link for non-superusers', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -133,7 +223,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('registers user profile links for superusers', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -169,7 +259,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('registers profile links when there is an error retrieving the current user', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -201,7 +291,7 @@ describe('Cloud Plugin', () => {
     });
 
     it('does not register profile links for non-superusers', async () => {
-      const { plugin } = setupPlugin();
+      const { plugin } = startPlugin();
 
       const coreStart = coreMock.createStart();
       const securityStart = securityMock.createStart();
@@ -217,4 +307,56 @@ describe('Cloud Plugin', () => {
       expect(securityStart.navControlService.addUserMenuLinks).not.toHaveBeenCalled();
     });
   });
+
+  describe('loadFullStoryUserId', () => {
+    let consoleMock: jest.SpyInstance<void, [message?: any, ...optionalParams: any[]]>;
+
+    beforeEach(() => {
+      consoleMock = jest.spyOn(console, 'debug').mockImplementation(() => {});
+    });
+    afterEach(() => {
+      consoleMock.mockRestore();
+    });
+
+    it('returns principal ID when username specified', async () => {
+      expect(
+        await loadFullStoryUserId({
+          getCurrentUser: jest.fn().mockResolvedValue({
+            username: '1234',
+          }),
+        })
+      ).toEqual('1234');
+      expect(consoleMock).not.toHaveBeenCalled();
+    });
+
+    it('returns undefined if getCurrentUser throws', async () => {
+      expect(
+        await loadFullStoryUserId({
+          getCurrentUser: jest.fn().mockRejectedValue(new Error(`Oh no!`)),
+        })
+      ).toBeUndefined();
+    });
+
+    it('returns undefined if getCurrentUser returns undefined', async () => {
+      expect(
+        await loadFullStoryUserId({
+          getCurrentUser: jest.fn().mockResolvedValue(undefined),
+        })
+      ).toBeUndefined();
+    });
+
+    it('returns undefined and logs if username undefined', async () => {
+      expect(
+        await loadFullStoryUserId({
+          getCurrentUser: jest.fn().mockResolvedValue({
+            username: undefined,
+            metadata: { foo: 'bar' },
+          }),
+        })
+      ).toBeUndefined();
+      expect(consoleMock).toHaveBeenLastCalledWith(
+        `[cloud.full_story] username not specified. User metadata: {"foo":"bar"}`
+      );
+    });
+  });
 });
diff --git a/x-pack/plugins/cloud/public/plugin.ts b/x-pack/plugins/cloud/public/plugin.ts
index 5820452706539..68dece1bc5d3d 100644
--- a/x-pack/plugins/cloud/public/plugin.ts
+++ b/x-pack/plugins/cloud/public/plugin.ts
@@ -5,9 +5,20 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext, HttpStart } from 'src/core/public';
+import {
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  PluginInitializerContext,
+  HttpStart,
+  IBasePath,
+} from 'src/core/public';
 import { i18n } from '@kbn/i18n';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/public';
+import type {
+  AuthenticatedUser,
+  SecurityPluginSetup,
+  SecurityPluginStart,
+} from '../../security/public';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
 import { ELASTIC_SUPPORT_LINK } from '../common/constants';
 import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
@@ -21,6 +32,10 @@ export interface CloudConfigType {
   profile_url?: string;
   deployment_url?: string;
   organization_url?: string;
+  full_story: {
+    enabled: boolean;
+    org_id?: string;
+  };
 }
 
 interface CloudSetupDependencies {
@@ -51,7 +66,12 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     this.isCloudEnabled = false;
   }
 
-  public setup(core: CoreSetup, { home }: CloudSetupDependencies) {
+  public setup(core: CoreSetup, { home, security }: CloudSetupDependencies) {
+    this.setupFullstory({ basePath: core.http.basePath, security }).catch((e) =>
+      // eslint-disable-next-line no-console
+      console.debug(`Error setting up FullStory: ${e.toString()}`)
+    );
+
     const {
       id,
       cname,
@@ -135,4 +155,57 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     const user = await security.authc.getCurrentUser().catch(() => null);
     return user?.roles.includes('superuser') ?? true;
   }
+
+  private async setupFullstory({
+    basePath,
+    security,
+  }: CloudSetupDependencies & { basePath: IBasePath }) {
+    const { enabled, org_id: orgId } = this.config.full_story;
+    if (!enabled || !orgId) {
+      return;
+    }
+
+    // Keep this import async so that we do not load any FullStory code into the browser when it is disabled.
+    const { initializeFullStory } = await import('./fullstory');
+    const userIdPromise: Promise<string | undefined> = security
+      ? loadFullStoryUserId({ getCurrentUser: security.authc.getCurrentUser })
+      : Promise.resolve(undefined);
+
+    initializeFullStory({
+      basePath,
+      orgId,
+      packageInfo: this.initializerContext.env.packageInfo,
+      userIdPromise,
+    });
+  }
 }
+
+/** @internal exported for testing */
+export const loadFullStoryUserId = async ({
+  getCurrentUser,
+}: {
+  getCurrentUser: () => Promise<AuthenticatedUser>;
+}) => {
+  try {
+    const currentUser = await getCurrentUser().catch(() => undefined);
+    if (!currentUser) {
+      return undefined;
+    }
+
+    // Log very defensively here so we can debug this easily if it breaks
+    if (!currentUser.username) {
+      // eslint-disable-next-line no-console
+      console.debug(
+        `[cloud.full_story] username not specified. User metadata: ${JSON.stringify(
+          currentUser.metadata
+        )}`
+      );
+    }
+
+    return currentUser.username;
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.error(`[cloud.full_story] Error loading the current user: ${e.toString()}`, e);
+    return undefined;
+  }
+};
diff --git a/x-pack/plugins/cloud/server/assets/fullstory_library.js b/x-pack/plugins/cloud/server/assets/fullstory_library.js
new file mode 100644
index 0000000000000..487d6c8e8528c
--- /dev/null
+++ b/x-pack/plugins/cloud/server/assets/fullstory_library.js
@@ -0,0 +1,13 @@
+/*
+ * 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.
+ */
+
+/* @notice
+ * Portions of this code are licensed under the following license:
+ * For license information please see https://edge.fullstory.com/s/fs.js.LICENSE.txt
+ */
+/* eslint-disable */
+!function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/s",n(n.s=4)}([function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},i=this&&this.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n),Object.defineProperty(e,r,{enumerable:!0,get:function(){return t[n]}})}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]});t.__esModule=!0,t.omit=t.pick=t.assertExhaustive=t.isNonEmpty=void 0,i(t,n(6),"ExtendedObject","Object"),t.isNonEmpty=function(e){return e.length>0},t.assertExhaustive=function(e,t){throw void 0===t&&(t="Reached unexpected case in exhaustive switch"),new Error(t)},t.pick=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r={};return t.forEach(function(t){r[t]=e[t]}),r},t.omit=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=r({},e);return Object.keys(i).forEach(function(e){var n=e;-1!==t.indexOf(n)&&delete i[n]}),i}},function(e,t){},function(e){e.exports={Any:{iframe:{src:"scrubUrl",srcdoc:"erase"},frame:{src:"scrubUrl",srcdoc:"erase"}},Exclude:{"*":{alt:"erase",checked:"erase",data:"erase",placeholder:"erase",src:"erase",srcset:"erase",href:"erase",title:"erase",value:"erase"}},Mask:{"*":{checked:"erase",data:"erase",alt:"maskText",placeholder:"maskText",title:"maskText",value:"maskText"},option:{label:"maskText"}}}},function(e){e.exports=[{Selector:"object:not([type^=\"image/\"])",Consent:!1,Type:1},{Selector:"embed:not([type^=\"image/\"])",Consent:!1,Type:1},{Selector:"canvas",Consent:!1,Type:1},{Selector:"noscript",Consent:!1,Type:1},{Selector:".fs-hide",Consent:!1,Type:1},{Selector:".fs-exclude",Consent:!1,Type:1},{Selector:".fs-exclude-without-consent",Consent:!0,Type:1},{Selector:".fs-mask",Consent:!1,Type:2},{Selector:".fs-mask-without-consent",Consent:!0,Type:2},{Selector:".fs-unmask",Consent:!1,Type:3},{Selector:".fs-unmask-with-consent",Consent:!0,Type:3},{Selector:".fs-block",Consent:!1,Type:1},{Selector:".fs-record-with-consent",Consent:!0,Type:1}]},function(e,t,n){e.exports=n(7)},function(e,t){},function(e,t,n){"use strict";t.__esModule=!0,t.ExtendedObject=void 0,t.ExtendedObject=Object},function(e,t,n){"use strict";n.r(t);n(5);var r=!1;function i(){return r}function o(e){i()&&window.console&&console.log(e)}n(1);var s=new(function(){function e(e){this.rebuildFromSnapshot(e)}return e.prototype.rebuildFromSnapshot=function(e){var t=this.snapshot;if(this.snapshot=e,!t||t.functions!==e.functions){var n=e.functions;this.jsonParse=n.jsonParse,this.jsonStringify=n.jsonStringify,this.arrayIsArray=n.arrayIsArray,this.objectKeys=n.objectKeys,this.objectValues=n.objectValues||null,this.dateNow=n.dateNow,this.objectHasOwnProp=u(n.objectHasOwnProp),this.dateGetTime=u(n.dateGetTime),this.matchMedia=c(n.matchMedia),this.setWindowTimeout=u(n.setWindowTimeout),this.setWindowInterval=u(n.setWindowInterval),this.clearWindowTimeout=u(n.clearWindowTimeout),this.clearWindowInterval=u(n.clearWindowInterval),this.requestWindowAnimationFrame=c(n.requestWindowAnimationFrame),this.requestWindowIdleCallback=c(n.requestWindowIdleCallback),this.mathAbs=n.mathAbs,this.mathFloor=n.mathFloor,this.mathMax=n.mathMax,this.mathMin=n.mathMin,this.mathPow=n.mathPow,this.mathRandom=n.mathRandom,this.mathRound=n.mathRound}},e}())(a(window));function a(e,t){void 0===t&&(t=0);var n=t,r=function(e){try{return e()}catch(e){return n=2,function(){throw new Error("Invoked failed snapshot")}}},i={jsonParse:r(function(){return e.JSON.parse}),jsonStringify:r(function(){return e.JSON.stringify}),arrayIsArray:r(function(){return e.Array.isArray}),objectKeys:r(function(){return e.Object.keys}),objectValues:r(function(){return e.Object.values}),dateNow:r(function(){return e.Date.now}),objectHasOwnProp:r(function(){return e.Object.prototype.hasOwnProperty}),dateGetTime:r(function(){return e.Date.prototype.getTime}),matchMedia:r(function(){return e.matchMedia}),setWindowTimeout:r(function(){return e.setTimeout}),setWindowInterval:r(function(){return e.setInterval}),clearWindowTimeout:r(function(){return e.clearTimeout}),clearWindowInterval:r(function(){return e.clearInterval}),requestWindowAnimationFrame:r(function(){return e.requestAnimationFrame}),requestWindowIdleCallback:r(function(){return e.requestIdleCallback}),mathAbs:r(function(){return e.Math.abs}),mathFloor:r(function(){return e.Math.floor}),mathMax:r(function(){return e.Math.max}),mathMin:r(function(){return e.Math.min}),mathPow:r(function(){return e.Math.pow}),mathRandom:r(function(){return e.Math.random}),mathRound:r(function(){return e.Math.round})},o={functionToString:r(function(){return e.Function.prototype.toString}),objectToString:r(function(){return e.Object.prototype.toString})};return{status:n,functions:i,helpers:o}}function u(e){return function(t){for(var n=[],r=1;r<arguments.length;r++)n[r-1]=arguments[r];return e.apply(t,n)}}function c(e){return e?u(e):null}var h,d="number"==typeof(h=s.dateNow())?{now:function(){return s.dateNow()},timeOrigin:h}:{now:function(){return s.dateGetTime(new Date)},timeOrigin:h=s.dateGetTime(new Date)};var l=function(){var e,t=window.performance;if(t&&t.now){var n=t.now();if("number"==typeof n&&isFinite(n)&&!(n<=0)){var r=t.timeOrigin;if("number"!=typeof r){var i=d.now()-t.now(),o=null===(e=t.timing)||void 0===e?void 0:e.navigationStart;r=o?Math.min(i,o):i}var s=Math.round(r);if("number"==typeof s&&isFinite(s)&&!(s<=0))return{now:function(){return Math.round(s+t.now())},timeOrigin:s}}}}();function p(){return l?l.now():d.now()}var f=["","0","1","-1","true","false","n/a","nan","undefined","null","nil","the_id_that_you_use_in_your_app_for_this_user"],v=["811c9dc5","350ca8af","340ca71c","14cd0a2b","4db211e5","0b069958","3613e041","2f8f13ba","9b61ad43","77074ba4","0da3f8ec","1c750511"],_=function(){return s.mathFloor(p()/1e3)},g=function(){return _()+31536e3};function m(e){if(!e)return null;var t=e.split("/"),n=t[0],r=t[1],i=parseInt(r),s=_(),a=g();if(isNaN(i)&&(i=a),i<=s)return null;i>a&&(i=a);var u=n.split(/[#,]/);if(u.length<3&&(u=n.split("`")).length<3)return null;var c=u[0],h=u[1],d=u[2],l=u[3],p="";void 0!==l&&(p=decodeURIComponent(l),(f.indexOf(p)>=0||v.indexOf(p)>=0)&&(o("Ignoring invalid app key \""+p+"\" from cookie."),p=""));var m=d.split(":");return{expirationAbsTimeSeconds:i,host:c,orgId:h,userId:m[0],sessionId:m[1]||"",appKeyHash:p}}function y(e){for(var t={},n=e.cookie.split(";"),r=0;r<n.length;r++){var i=n[r].replace(/^\s+|\s+$/g,"").split("=");t[i[0]]||(t[i[0]]=i[1])}return t}var w="_fs_loaded",b="_fs_namespace";var S,E="FS";function T(e){if(S)return S;var t=k(e);return t?(S=t,t):(t=e[b])?(S=t,t):S=E}function k(e){return e[w]}function I(e){return e[T(e)]}function C(e){return"localhost"==e||"127.0.0.1"==e}var R,A,x,O,M=/^([^.]+\.)*(fullstory|onfire).[^.]+(\/|$)/;function L(e){return!!e._fs_ext_debug||!!e._fs_debug}function F(e){return e._fs_rec_host||((t=D(e))&&M.test(t)?0===t.lastIndexOf("rs.",0)||0===t.lastIndexOf("rs-2.",0)?t:0==t.lastIndexOf("www.",0)?"rs."+t.slice(4):0==t.lastIndexOf("app.",0)?"rs."+t.slice(4):"rs."+t:t);var t}function P(e){return e._fs_ext_org||e._fs_org}function q(e){return!!e._fs_is_outer_script}function U(e){return e._fs_replay_flags}function N(e){return e._fs_transport}function W(e,t){var n=I(e);if(n){var r=n.q;r||(r=n.q=[]),r.push(t)}}function D(e){return e._fs_ext_host||e._fs_host}function B(e){return e?C(function(e){var t=e,n=t.indexOf(":");return n>=0&&(t=t.slice(0,n)),t}(e))?e:0==e.indexOf("www.")?"app."+e.slice(4):"app."+e:e}function H(e){return e?e+"/s/fs.js":void 0}!function(e){e.MUT_INSERT=2,e.MUT_REMOVE=3,e.MUT_ATTR=4,e.MUT_TEXT=6,e.MOUSEMOVE=8,e.MOUSEMOVE_CURVE=9,e.SCROLL_LAYOUT=10,e.SCROLL_LAYOUT_CURVE=11,e.MOUSEDOWN=12,e.MOUSEUP=13,e.KEYDOWN=14,e.KEYUP=15,e.CLICK=16,e.FOCUS=17,e.VALUECHANGE=18,e.RESIZE_LAYOUT=19,e.DOMLOADED=20,e.LOAD=21,e.PLACEHOLDER_SIZE=22,e.UNLOAD=23,e.BLUR=24,e.SET_FRAME_BASE=25,e.TOUCHSTART=32,e.TOUCHEND=33,e.TOUCHCANCEL=34,e.TOUCHMOVE=35,e.TOUCHMOVE_CURVE=36,e.NAVIGATE=37,e.PLAY=38,e.PAUSE=39,e.RESIZE_VISUAL=40,e.RESIZE_VISUAL_CURVE=41,e.RESIZE_DOCUMENT=42,e.LOG=48,e.ERROR=49,e.DBL_CLICK=50,e.FORM_SUBMIT=51,e.WINDOW_FOCUS=52,e.WINDOW_BLUR=53,e.HEARTBEAT=54,e.WATCHED_ELEM=56,e.PERF_ENTRY=57,e.REC_FEAT_SUPPORTED=58,e.SELECT=59,e.CSSRULE_INSERT=60,e.CSSRULE_DELETE=61,e.FAIL_THROTTLED=62,e.AJAX_REQUEST=63,e.SCROLL_VISUAL_OFFSET=64,e.SCROLL_VISUAL_OFFSET_CURVE=65,e.MEDIA_QUERY_CHANGE=66,e.RESOURCE_TIMING_BUFFER_FULL=67,e.MUT_SHADOW=68,e.DISABLE_STYLESHEET=69,e.FULLSCREEN=70,e.FULLSCREEN_ERROR=71,e.ADOPTED_STYLESHEETS=72,e.CUSTOM_ELEMENT_DEFINED=73,e.MODAL_OPEN=74,e.MODAL_CLOSE=75,e.SLOW_INTERACTION=76,e.LONG_FRAME=77,e.TIMING=78,e.STORAGE_WRITE_FAILURE=79,e.KEEP_ELEMENT=2e3,e.KEEP_URL=2001,e.KEEP_BOUNCE=2002,e.SYS_SETVAR=8193,e.SYS_RESOURCEHASH=8195,e.SYS_SETCONSENT=8196,e.SYS_CUSTOM=8197,e.SYS_REPORTCONSENT=8198}(R||(R={})),function(e){e.Unknown=0,e.Serialization=1}(A||(A={})),function(e){e.Unknown=0,e.DomSnapshot=1,e.NodeEncoding=2,e.LzEncoding=3}(x||(x={})),function(e){e.Internal=0,e.Public=1}(O||(O={}));var j,K,V,z,Y,G,Q,X,J,$,Z,ee,te,ne=["print","alert","confirm"];function re(e){switch(e){case R.MOUSEDOWN:case R.MOUSEMOVE:case R.MOUSEMOVE_CURVE:case R.MOUSEUP:case R.KEYDOWN:case R.KEYUP:case R.TOUCHSTART:case R.TOUCHEND:case R.TOUCHMOVE:case R.TOUCHMOVE_CURVE:case R.TOUCHCANCEL:case R.CLICK:case R.SCROLL_LAYOUT:case R.SCROLL_LAYOUT_CURVE:case R.SCROLL_VISUAL_OFFSET:case R.SCROLL_VISUAL_OFFSET_CURVE:case R.NAVIGATE:return!0;}return!1}!function(e){e.GrantConsent=!0,e.RevokeConsent=!1}(j||(j={})),function(e){e.Page=0,e.Document=1}(K||(K={})),function(e){e.Unknown=0,e.Api=1,e.FsShutdownFrame=2,e.Hibernation=3,e.Reidentify=4,e.SettingsBlocked=5,e.Size=6,e.Unload=7}(V||(V={})),function(e){e.Timing=0,e.Navigation=1,e.Resource=2,e.Paint=3,e.Mark=4,e.Measure=5,e.Memory=6}(z||(z={})),function(e){e.Performance=0,e.PerformanceEntries=1,e.PerformanceMemory=2,e.Console=3,e.Ajax=4,e.PerformanceObserver=5,e.AjaxFetch=6}(Y||(Y={})),function(e){e.Node=1,e.Sheet=2}(G||(G={})),function(e){e.StyleSheetHooks=0,e.SetPropertyHooks=1}(Q||(Q={})),function(e){e.User="user",e.Account="acct",e.Event="evt"}(X||(X={})),function(e){e.Elide=0,e.Record=1,e.Whitelist=2}(J||(J={})),function(e){e.ReasonNoSuchOrg=1,e.ReasonOrgDisabled=2,e.ReasonOrgOverQuota=3,e.ReasonBlockedDomain=4,e.ReasonBlockedIp=5,e.ReasonBlockedUserAgent=6,e.ReasonBlockedGeo=7,e.ReasonBlockedTrafficRamping=8,e.ReasonInvalidURL=9,e.ReasonUserOptOut=10,e.ReasonInvalidRecScript=11,e.ReasonDeletingUser=12,e.ReasonNativeHookFailure=13}($||($={})),function(e){e.Unset=0,e.Exclude=1,e.Mask=2,e.Unmask=3,e.Watch=4,e.Keep=5}(Z||(Z={})),function(e){e.Unset=0,e.Click=1}(ee||(ee={})),function(e){e.MaxLogsPerPage=1024,e.MutationProcessingInterval=250,e.CurveSamplingInterval=142,e.DefaultBundleUploadInterval=5e3,e.HeartbeatInitial=4e3,e.HeartbeatMax=256200,e.PageInactivityTimeout=18e5,e.BackoffMax=3e5,e.ScrollSampleInterval=e.MutationProcessingInterval/5,e.InactivityThreshold=4e3,e.MaxPayloadLength=16384}(te||(te={}));function ie(e,t){return function(){try{return e.apply(this,arguments)}catch(e){try{t&&t(e)}catch(e){}}}}var oe=function(){},se=navigator.userAgent,ae=se.indexOf("MSIE ")>-1||se.indexOf("Trident/")>-1,ue=(ae&&se.indexOf("Trident/5"),ae&&se.indexOf("Trident/6"),ae&&se.indexOf("rv:11")>-1),ce=se.indexOf("Edge/")>-1;se.indexOf("CriOS");var he=/^((?!chrome|android).)*safari/i.test(window.navigator.userAgent);function de(){var e=window.navigator.userAgent.match(/Version\/(\d+)/);return e?parseInt(e[1]):-1}function le(e){if(!he)return!1;var t=de();return t>=0&&t===e}function pe(e){if(!he)return!1;var t=de();return t>=0&&t<e}le(9),le(10),pe(8),pe(10),pe(12);function fe(e,t){for(var n=0===t.indexOf("on")?function(e){return"on"+e+t.slice(2)}:function(e){return""+e+t.charAt(0).toUpperCase()+t.slice(1)},r=0,i=[function(){return t},function(){return n("webkit")},function(){return n("moz")},function(){return n("ms")}];r<i.length;r++){var o=(0,i[r])();if(o in e)return o}return t}function ve(e){return"function"==typeof e}var _e=Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)},ge=0,me=function(e,t){Ce[ge]=e,Ce[ge+1]=t,2===(ge+=2)&&be()};var ye=window.MutationObserver||window.WebKitMutationObserver,we="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof self&&void 0!==self.importScripts&&"undefined"!=typeof MessageChannel;var be,Se,Ee,Te,ke,Ie,Ce=new Array(1e3);function Re(){for(var e=0;e<ge;e+=2){(0,Ce[e])(Ce[e+1]),Ce[e]=void 0,Ce[e+1]=void 0}ge=0}function Ae(e,t){var n=arguments,r=this,i=new this.constructor(Me);void 0===i[Oe]&&Qe(i);var o,s=r._state;return s?(o=n[s-1],me(function(){return Ye(s,i,o,r._result)})):je(r,i,e,t),i}function xe(e){if(e&&"object"==typeof e&&e.constructor===this)return e;var t=new this(Me);return We(t,e),t}ye?(Te=0,ke=new ye(Re),Ie=document.createTextNode(""),ke.observe(Ie,{characterData:!0}),be=function(){var e=Te=++Te%2;Ie.data=e+""}):we?((Ee=new MessageChannel).port1.onmessage=Re,be=function(){return Ee.port2.postMessage(0)}):(Se=setTimeout,be=function(){return Se(Re,1)});var Oe=Math.random().toString(36).substring(16);function Me(){}var Le=void 0,Fe=1,Pe=2,qe=new Ve;function Ue(e){try{return e.then}catch(e){return qe.error=e,qe}}function Ne(e,t,n){t.constructor===e.constructor&&n===Ae&&t.constructor.resolve===xe?function(e,t){t._state===Fe?Be(e,t._result):t._state===Pe?He(e,t._result):je(t,void 0,function(t){return We(e,t)},function(t){return He(e,t)})}(e,t):n===qe?(He(e,qe.error),qe.error=null):void 0===n?Be(e,t):ve(n)?function(e,t,n){me(function(e){var r=!1,i=function(e,t,n,r,i){try{e.call(t,n,r)}catch(e){return e}}(n,t,function(n){r||(r=!0,t!==n?We(e,n):Be(e,n))},function(t){r||(r=!0,He(e,t))},e._label);!r&&i&&(r=!0,He(e,i))},e)}(e,t,n):Be(e,t)}function We(e,t){var n;e===t?He(e,new TypeError("You cannot resolve a promise with itself")):"function"==typeof(n=t)||"object"==typeof n&&null!==n?Ne(e,t,Ue(t)):Be(e,t)}function De(e){e._onerror&&e._onerror(e._result),Ke(e)}function Be(e,t){e._state===Le&&(e._result=t,e._state=Fe,0!==e._subscribers.length&&me(Ke,e))}function He(e,t){e._state===Le&&(e._state=Pe,e._result=t,me(De,e))}function je(e,t,n,r){var i=e._subscribers,o=i.length;e._onerror=null,i[o]=t,i[o+Fe]=n,i[o+Pe]=r,0===o&&e._state&&me(Ke,e)}function Ke(e){var t=e._subscribers,n=e._state;if(0!==t.length){for(var r,i,o=e._result,s=0;s<t.length;s+=3)r=t[s],i=t[s+n],r?Ye(n,r,i,o):i(o);e._subscribers.length=0}}function Ve(){this.error=null}var ze=new Ve;function Ye(e,t,n,r){var i,o,s,a,u=ve(n);if(u){if((i=function(e,t){try{return e(t)}catch(e){return ze.error=e,ze}}(n,r))===ze?(a=!0,o=i.error,i.error=null):s=!0,t===i)return void He(t,new TypeError("A promises callback cannot return that same promise."))}else i=r,s=!0;t._state!==Le||(u&&s?We(t,i):a?He(t,o):e===Fe?Be(t,i):e===Pe&&He(t,i))}var Ge=0;function Qe(e){e[Oe]=Ge++,e._state=void 0,e._result=void 0,e._subscribers=[]}function Xe(e,t){this._instanceConstructor=e,this.promise=new e(Me),this.promise[Oe]||Qe(this.promise),_e(t)?(this._input=t,this.length=t.length,this._remaining=t.length,this._result=new Array(this.length),0===this.length?Be(this.promise,this._result):(this.length=this.length||0,this._enumerate(),0===this._remaining&&Be(this.promise,this._result))):He(this.promise,new Error("Array Methods must be provided an Array"))}Xe.prototype._enumerate=function(){for(var e=this.length,t=this._input,n=0;this._state===Le&&n<e;n++)this._eachEntry(t[n],n)},Xe.prototype._eachEntry=function(e,t){var n=this._instanceConstructor,r=n.resolve;if(r===xe){var i=Ue(e);if(i===Ae&&e._state!==Le)this._settledAt(e._state,t,e._result);else if("function"!=typeof i)this._remaining--,this._result[t]=e;else if(n===Je){var o=new n(Me);Ne(o,e,i),this._willSettleAt(o,t)}else this._willSettleAt(new n(function(t){return t(e)}),t)}else this._willSettleAt(r(e),t)},Xe.prototype._settledAt=function(e,t,n){var r=this.promise;r._state===Le&&(this._remaining--,e===Pe?He(r,n):this._result[t]=n),0===this._remaining&&Be(r,this._result)},Xe.prototype._willSettleAt=function(e,t){var n=this;je(e,void 0,function(e){return n._settledAt(Fe,t,e)},function(e){return n._settledAt(Pe,t,e)})};var Je=function(e){this[Oe]=Ge++,this._result=this._state=void 0,this._subscribers=[],Me!==e&&("function"!=typeof e&&function(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}(),this instanceof Je?function(e,t){try{t(function(t){We(e,t)},function(t){He(e,t)})}catch(t){He(e,t)}}(this,e):function(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}())};Je.all=function(e){return new Xe(this,e).promise},Je.race=function(e){var t=this;return _e(e)?new t(function(n,r){for(var i=e.length,o=0;o<i;o++)t.resolve(e[o]).then(n,r)}):new t(function(e,t){return t(new TypeError("You must pass an array to race."))})},Je.resolve=xe,Je.reject=function(e){var t=new this(Me);return He(t,e),t},Je._setAsap=function(e){me=e},Je._asap=me,Je.prototype={constructor:Je,then:Ae,"catch":function(e){return this.then(null,e)}};var $e,Ze,et="function"==typeof window.Promise?window.Promise:Je,tt=function(){return(tt=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function nt(e){return s.arrayIsArray(e)}var rt,it,ot,st,at,ut;function ct(e,t){return 0==e.lastIndexOf(t,0)}function ht(e,t){for(var n in e)s.objectHasOwnProp(e,n)&&t(e[n],n,e)}function dt(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))return e[t]}function lt(e,t){var n=0;for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&++n>t)return!1;return n==t}function pt(e,t){var n=0;for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&++n>t)return!0;return!1}Ze="function"==typeof s.objectKeys?function(e){return s.objectKeys(e)}:function(e){var t=[];for(var n in e)s.objectHasOwnProp(e,n)&&t.push(n);return t},st=(ot=function(e){return e.matches||e.msMatchesSelector||e.webkitMatchesSelector})(window.Element.prototype),!(at=window.document?window.document.documentElement:void 0)||st&&at instanceof window.Element||(st=ot(at)),it=($e=[st,function(e,t){return st.call(e,t)}])[0],rt=$e[1];var ft;ut=ae?function(e){var t=e.nextSibling;return t&&e.parentNode&&t===e.parentNode.firstChild?null:t}:function(e){return e.nextSibling};var vt;ft=ae?function(e,t){if(e){var n=e.parentNode?e.parentNode.firstChild:null;do{t(e),e=e.nextSibling}while(e&&e!=n)}}:function(e,t){for(;e;e=e.nextSibling)t(e)};vt=ae?function(e){var t=e.previousSibling;return t&&e.parentNode&&t===e.parentNode.lastChild?null:t}:function(e){return e.previousSibling};function _t(e,t){if(!e)return oe;var n=function(e){try{var t=window;return t.Zone&&t.Zone.root&&"function"==typeof t.Zone.root.wrap?t.Zone.root.wrap(e):e}catch(t){return e}}(e);return t&&(n=n.bind(t)),ie(n,function(e){o("Unexpected error: "+e)})}function gt(e){var t,n=Array.prototype.toJSON,r=String.prototype.toJSON;n&&(Array.prototype.toJSON=void 0),r&&(String.prototype.toJSON=void 0);try{t=s.jsonStringify(e)}catch(e){t=mt(e)}finally{n&&(Array.prototype.toJSON=n),r&&(String.prototype.toJSON=r)}return t}function mt(e){var t="Internal error: unable to determine what JSON error was";try{t=(t=""+e).replace(/[^a-zA-Z0-9\.\:\!\, ]/g,"_")}catch(e){}return"\""+t+"\""}function yt(e){var t=e.doctype;if(!t)return"";var n="<!DOCTYPE ";return n+=t.name,t.publicId&&(n+=" PUBLIC \""+t.publicId+"\""),t.systemId&&(n+=" \""+t.systemId+"\""),n+">"}function wt(e){return s.jsonParse(e)}function bt(e){var t=0,n=0;return null==e.screen?[t,n]:(t=parseInt(String(e.screen.width)),n=parseInt(String(e.screen.height)),[t=isNaN(t)?0:t,n=isNaN(n)?0:n])}var St=function(){function e(e,t){this.target=e,this.propertyName=t,this._before=oe,this._afterSync=oe,this._afterAsync=oe,this.on=!1}return e.prototype.before=function(e){return this._before=_t(e),this},e.prototype.afterSync=function(e){return this._afterSync=_t(e),this},e.prototype.afterAsync=function(e){return this._afterAsync=_t(function(t){s.setWindowTimeout(window,ie(function(){e(t)}),0)}),this},e.prototype.disable=function(){if(this.on=!1,this.shim){var e=this.shim,t=e.override,n=e["native"];this.target[this.propertyName]===t&&(this.target[this.propertyName]=n,this.shim=void 0)}},e.prototype.enable=function(){if(this.on=!0,this.shim)return!0;this.shim=this.makeShim();try{this.target[this.propertyName]=this.shim.override}catch(e){return!1}return!0},e.prototype.makeShim=function(){var e=this,t=this.target[this.propertyName];return{"native":t,override:function(){var n={that:this,args:arguments,result:null};e.on&&e._before(n);var r=t.apply(this,arguments);return e.on&&(n.result=r,e._afterSync(n),e._afterAsync(n)),r}}},e}(),Et={};function Tt(e,t){if(!e||"function"!=typeof e[t])return null;var n;Et[t]=Et[t]||[];for(var r=0;r<Et[t].length;r++)Et[t][r].obj==e&&(n=Et[t][r].hook);return n||(n=new St(e,t),Et[t].push({obj:e,hook:n})),n.enable()?n:null}function kt(e,t,n){if(!e)return function(){};var r=Object.getOwnPropertyDescriptor(e.prototype,t);if(!r||!r.set)return function(){};var i=r.set,o=_t(n),s=!0;function a(e){i.call(this,e),s&&o(this,e)}return Object.defineProperty(e.prototype,t,tt(tt({},r),{set:a})),function(){s=!1;var n=Object.getOwnPropertyDescriptor(e.prototype,t);n&&a===n.set&&Object.defineProperty(e.prototype,t,tt(tt({},n),{set:i}))}}var It=10,Ct="[anonymous]",Rt=/function\s*([\w\-$]+)?\s*\(/i;function At(e){return e.stack||e.backtrace||e.stacktrace}function xt(){var e,t;try{throw new Error("")}catch(n){e="<generated>\n",t=At(n)}if(!t){e="<generated-ie>\n";var n=[];try{for(var r=arguments.callee.caller.caller;r&&n.length<It;){var i=Rt.test(r.toString())&&RegExp.$1||Ct;n.push(i),r=r.caller}}catch(e){o(e)}t=n.join("\n")}return e+t}function Ot(){try{return window.self!==window.top}catch(e){return!0}}var Mt=function(){function e(){}return e.wrap=function(t,n){return void 0===n&&(n="error"),ie(t,function(t){return e.sendToBugsnag(t,n)})},e.errorLimit=15,e.sendToBugsnag=function(t,n,r){if(!(e.errorLimit<=0)){e.errorLimit--,"string"==typeof t&&(t=new Error(t));var i=y(document).fs_uid,o=i?m(i):void 0;o&&o.orgId!=P(window)&&(o=void 0);var s=new Date(1591209308e3).toISOString(),a={projectRoot:window.location.origin,deviceTime:p(),inIframe:Ot(),CompiledTimestamp:1591209308,CompiledTime:s,orgId:P(window),"userId:sessionId":o?o.userId+":"+o.sessionId:"NA",context:document.location&&document.location.pathname,message:t.message,name:"Recording Error",releaseStage:"production "+s,severity:n,language:navigator.language||navigator.userLanguage||"en-GB",stacktrace:At(t)||xt()};if(r)for(var u in r){var c=typeof r[u];a["aux_"+u]="string"===c||"number"===c?r[u]:gt(r[u])}var h=[];for(var u in a)h.push(encodeURIComponent(u)+"="+encodeURIComponent(a[u]));new Image().src="https://"+F(window)+"/rec/except?"+h.join("&")}},e}(),Lt={};function Ft(e,t,n){if(void 0===n&&(n=1),e)return!0;if(Lt[t]=Lt[t]||0,Lt[t]++,Lt[t]>n)return!1;var r=new Error("Assertion failed: "+t);return Mt.sendToBugsnag(r,"error"),e}function Pt(e,t,n,r){void 0!==n&&("function"==typeof e.addEventListener?e.addEventListener(t,n,r):"function"==typeof e.addListener?e.addListener(n):o("Target of "+t+" doesn't seem to support listeners"))}function qt(e,t,n,r){void 0!==n&&("function"==typeof e.removeEventListener?e.removeEventListener(t,n,r):"function"==typeof e.removeListener?e.removeListener(n):o("Target of "+t+" doesn't seem to support listeners"))}var Ut=function(){function e(){var e=this;this._listeners=[],this._children=[],this._yesCapture=!0,this._noCapture=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e._yesCapture={capture:!0,passive:!0},e._noCapture={capture:!1,passive:!0}}});window.addEventListener("test",oe,t)}catch(e){}}return e.prototype.add=function(e,t,n,r,i){return void 0===i&&(i=!1),this.addCustom(e,t,n,r,i)},e.prototype.addCustom=function(e,t,n,r,i){void 0===i&&(i=!1);var o={target:e,type:t,fn:Mt.wrap(function(e){(i||!1!==e.isTrusted||"message"==t||e._fs_trust_event)&&r(e)}),options:n?this._yesCapture:this._noCapture,index:this._listeners.length};return this._listeners.push(o),Pt(e,t,o.fn,o.options),o},e.prototype.remove=function(e){e.target&&(qt(e.target,e.type,e.fn,e.options),e.target=null,e.fn=void 0)},e.prototype.clear=function(){for(var e=0;e<this._listeners.length;e++)this._listeners[e].target&&this.remove(this._listeners[e]);this._listeners=[]},e.prototype.createChild=function(){var t=new e;return this._children.push(t),t},e.prototype.refresh=function(){for(var e=0,t=this._listeners;e<t.length;e++){var n=t[e];n.target&&(qt(n.target,n.type,n.fn,n.options),Pt(n.target,n.type,n.fn,n.options))}for(var r=0,i=this._children;r<i.length;r++){i[r].refresh()}},e}();function Nt(e,t){return t&&e.pageLeft==t.pageLeft&&e.pageTop==t.pageTop}function Wt(e,t){return t&&e.width==t.width&&e.height==t.height}function Dt(e){return{pageLeft:e.pageLeft,pageTop:e.pageTop,width:e.width,height:e.height}}var Bt=[["@import\\s+\"","\""],["@import\\s+'","'"]].concat([["url\\(\\s*\"","\"\\s*\\)"],["url\\(\\s*'","'\\s*\\)"],["url\\(\\s*","\\s*\\)"]]),Ht=".*?"+/(?:[^\\](?:\\\\)*)/.source;new RegExp(Bt.map(function(e){var t=e[0],n=e[1];return"("+t+")("+Ht+")("+n+")"}).join("|"),"g");var jt=/url\(["']?(.+?)["']?\)/g,Kt=/^\s*\/\//;function Vt(e){return e&&e.body&&e.documentElement?"BackCompat"==e.compatMode?[e.body.clientWidth,e.body.clientHeight]:[e.documentElement.clientWidth,e.documentElement.clientHeight]:[0,0]}var zt=function(){function e(e,t){var n,r;this.hasKnownPosition=!1,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.clientWidth=0,this.clientHeight=0;var i=e.document;if(i&&i.documentElement&&i.body){if("visualViewport"in e){var o=i.documentElement.getBoundingClientRect();this.hasKnownPosition=!0,this.pageLeft=0==o.left?0:-o.left,this.pageTop=0==o.top?0:-o.top}if(n=Vt(i),this.clientWidth=n[0],this.clientHeight=n[1],void 0!==t&&this.clientWidth==t.clientWidth&&this.clientHeight==t.clientHeight&&t.width>0&&t.height>0)return this.width=t.width,void(this.height=t.height);r=this.computeLayoutViewportSizeFromMediaQueries(e),this.width=r[0],this.height=r[1]}}return e.prototype.computeLayoutViewportSizeFromMediaQueries=function(e){var t=this.findMediaValue(e,"width",this.clientWidth,this.clientWidth+128);void 0===t&&(t=this.tryToGet(e,"innerWidth")),void 0===t&&(t=this.clientWidth);var n=this.findMediaValue(e,"height",this.clientHeight,this.clientHeight+128);return void 0===n&&(n=this.tryToGet(e,"innerHeight")),void 0===n&&(n=this.clientHeight),[t,n]},e.prototype.findMediaValue=function(e,t,n,r){if(s.matchMedia){var i=s.matchMedia(e,"(min-"+t+": "+n+"px)");if(null!=i){if(i.matches&&s.matchMedia(e,"(max-"+t+": "+n+"px)").matches)return n;for(;n<=r;){var o=s.mathFloor((n+r)/2);if(s.matchMedia(e,"(min-"+t+": "+o+"px)").matches){if(s.matchMedia(e,"(max-"+t+": "+o+"px)").matches)return o;n=o+1}else r=o-1}}}},e.prototype.tryToGet=function(e,t){try{return e[t]}catch(e){return}},e}();function Yt(e,t){return new zt(e,t)}var Gt=function(e,t){this.offsetLeft=0,this.offsetTop=0,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.scale=0;var n=e.document;if(n.body){var r="BackCompat"==n.compatMode;"pageXOffset"in e?(this.pageLeft=e.pageXOffset,this.pageTop=e.pageYOffset):n.scrollingElement?(this.pageLeft=n.scrollingElement.scrollLeft,this.pageTop=n.scrollingElement.scrollTop):r?(this.pageLeft=n.body.scrollLeft,this.pageTop=n.body.scrollTop):n.documentElement&&(n.documentElement.scrollLeft>0||n.documentElement.scrollTop>0)?(this.pageLeft=n.documentElement.scrollLeft,this.pageTop=n.documentElement.scrollTop):(this.pageLeft=n.body.scrollLeft||0,this.pageTop=n.body.scrollTop||0),this.offsetLeft=this.pageLeft-t.pageLeft,this.offsetTop=this.pageTop-t.pageTop;try{var i=e.innerWidth,o=e.innerHeight}catch(e){return}if(0!=i&&0!=o){this.scale=t.width/i,this.scale<1&&(this.scale=1);var s=t.width-t.clientWidth,a=t.height-t.clientHeight;this.width=i-s/this.scale,this.height=o-a/this.scale}}};var Qt,Xt=(Qt=function(e,t){return(Qt=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(e,t)},function(e,t){function n(){this.constructor=e}Qt(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),Jt=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},$t=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Zt=function(){function e(){var t=this;this._wrappedTick=Mt.wrap(function(){t.unregister(),t._tick()}),this._due=0,this._id=e.nextId++}return e._rearm=function(){e.checkedAlready=!1,e.lastCheck=0},e.checkForBrokenSchedulers=function(){return Jt(this,void 0,et,function(){var t,n;return $t(this,function(r){switch(r.label){case 0:return!s.requestWindowAnimationFrame||e.checkedAlready?[2,void 0]:(t=p())-e.lastCheck<100?[2,void 0]:(e.lastCheck=t,e.checkedAlready=!0,[4,new et(function(e){return s.requestWindowAnimationFrame(window,e)})]);case 1:return r.sent(),n=[],ht(e.registry,function(e){var r=e.maybeForceTick(t);r&&n.push(r)}),[2,et.all(n).then(function(){s.requestWindowAnimationFrame(window,Mt.wrap(function(){e.checkedAlready=!1}))})];}})})},e.stopAll=function(){ht(this.registry,function(e){return e.stop()})},e.prototype.setTick=function(e){this._tick=e},e.prototype.stop=function(){this.cancel(),delete e.registry[this._id]},e.prototype.register=function(t){this._due=p()+100+1.5*t,e.registry[this._id]=this},e.prototype.unregister=function(){delete e.registry[this._id]},e.prototype.maybeForceTick=function(e){if(e>this._due)return et.resolve().then(this._wrappedTick)["catch"](function(){})},e.registry={},e.nextId=0,e.checkedAlready=!1,e.lastCheck=0,e}(),en=function(e){function t(t){var n=e.call(this)||this;return n._interval=t,n._handle=-1,n}return Xt(t,e),t.prototype.start=function(e){var t=this;-1==this._handle&&(this.setTick(function(){e(),t.register(t._interval)}),this._handle=s.setWindowInterval(window,this._wrappedTick,this._interval),this.register(this._interval))},t.prototype.cancel=function(){-1!=this._handle&&(s.clearWindowInterval(window,this._handle),this._handle=-1,this.setTick(function(){}))},t}(Zt),tn=function(e){function t(t,n,r){void 0===n&&(n=0);for(var i=[],o=3;o<arguments.length;o++)i[o-3]=arguments[o];var s=e.call(this)||this;return s.delay=n,s.timer=-1,s.setTick(function(){t.apply(void 0===r?window:r,i),s.stop()}),s}return Xt(t,e),t.prototype.start=function(e){return void 0===e&&(e=this.delay),this.delay=e,s.clearWindowTimeout(window,this.timer),this.timer=s.setWindowTimeout(window,this._wrappedTick,this.delay),this.register(e),this},t.prototype.cancel=function(){-1!=this.timer&&(s.clearWindowTimeout(window,this.timer),this.timer=-1)},t}(Zt);!function(){function e(e){this.deadlineTime=e,this.didTimeout=this.deadlineTime<=p()}e.prototype.timeRemaining=function(){return this.deadlineTime-p()}}();var nn=function(){function e(e,t,n){this.limit=e,this.breaker=n,this.remaining=0,this.ticker=new en(t),this.open()}return e.prototype.guard=function(e){var t=this;return function(){return 0==t.remaining?(t.breaker(),void t.remaining--):t.remaining<0?void 0:(t.remaining--,e.apply(this,arguments))}},e.prototype.close=function(){return this.ticker.stop(),this},e.prototype.open=function(){var e=this;return this.remaining=this.limit,this.ticker.start(function(){e.remaining=e.limit}),this},e}(),rn=function(){function e(){this._reported=0,this._skew=0,this._startTime=l?l.timeOrigin:d.timeOrigin}return e.prototype.wallTime=function(){return p()},e.prototype.now=function(){var e=this.wallTime()-this._startTime;return e<0&&this._reportTimeSkew("timekeeper now() is negative"),e},e.prototype.startTime=function(){return this._startTime},e.prototype.setStartTime=function(e){var t=this.wallTime();this._startTime=e,e>t&&(this._skew=e-t,this._reportTimeSkew("timekeeper set with future ts"))},e.prototype._reportTimeSkew=function(e){this._reported++<=2&&Mt.sendToBugsnag(e,"error",{skew:this._skew,startTime:this._startTime,wallTime:this.wallTime()})},e}();function on(e){var t=e;return t.tagName?"object"==typeof t.tagName?"form":t.tagName.toLowerCase():null}var sn,an,un=n(3),cn=n(0),hn=Object.defineProperty,dn=p()%1e9,ln=window.WeakMap||((sn=function(){this.name="__st"+(1e9*s.mathRandom()>>>0)+dn++ +"__"}).prototype={set:function(e,t){var n=e[this.name];n&&n[0]===e?n[1]=t:hn(e,this.name,{value:[e,t],writable:!0})},get:function(e){var t;return(t=e[this.name])&&t[0]===e?t[1]:void 0}},sn),pn=1,fn=4,vn=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r};function _n(e){if(null==e)return 0;switch(e){case an.Exclude:return 5;case an.Mask:return 4;case an.Unmask:return 3;case an.Watch:return 2;case an.Keep:return 1;default:return Object(cn.assertExhaustive)(e,"Undefined watch kind: "+e);}}!function(e){e[e.Exclude=1]="Exclude",e[e.Mask=2]="Mask",e[e.Unmask=3]="Unmask",e[e.Watch=4]="Watch",e[e.Keep=5]="Keep"}(an||(an={}));var gn={1:"exclude",2:"mask",3:"unmask",4:"watch",5:"keep"},mn=[an.Exclude,an.Mask,an.Unmask,an.Watch,an.Keep],yn=function(){function e(e){void 0===e&&(e="matches"),this._watchStrategy=e,this._hasWatched=!1,this._rules=Sn(),this._consentRules=Sn()}return e.prototype.initialize=function(e){var t=e.blocks,n=e.keeps,r=e.watches,i=e.flags;this._watchStrategy=i.watchStrategy;var o=vn(un);if(i.whitelist&&o.push({Type:Z.Mask,Consent:j.RevokeConsent,Selector:"body"}),t)for(var s=0,a=t;s<a.length;s++){var u=a[s];o.push(u)}if(r)for(var c=0,h=r;c<h.length;c++){var d=h[c];o.push({Type:Z.Watch,Consent:j.RevokeConsent,Selector:d.Selector})}this._batchElementBlocks(o),n&&this._batchElementKeeps(n)},e.prototype.isWatched=function(e){var t=[an.Exclude,an.Mask,an.Unmask,an.Watch,an.Keep];return this._firstMatch(t,e)},e.prototype.matchesAnyKeepRule=function(e){var t=[an.Keep];return null!==this._firstMatch(t,e)},e.prototype.matchesAnyConsentRule=function(e){var t=[an.Exclude,an.Mask,an.Unmask,an.Keep];return null!==this._firstConsentMatch(t,e)},e.prototype._firstMatch=function(e,t){this._hasWatched=!0;for(var n=0,r=e;n<r.length;n++)for(var i=r[n],o=0,s=this._rules[i];o<s.length;o++){var a=s[o];if(rt(t,a))return i}return this._consent?null:this._firstConsentMatch(e,t)},e.prototype._firstConsentMatch=function(e,t){for(var n=0,r=e;n<r.length;n++)for(var i=r[n],o=0,s=this._consentRules[i];o<s.length;o++){var a=s[o];if(rt(t,a))return i}return null},e.prototype._batchElementBlocks=function(e){var t=this,n=Sn(),r=Sn();e.map(wn).filter(function(e){return bn(e.selector)}).forEach(function(e){e.consent?r[e.kind].push(e):n[e.kind].push(e)});for(var i=document.documentElement||document.createElement("div"),o=function(e,n){try{var r=e.map(function(e){return e.selector}).join(", ");rt(i,r),n.push(r)}catch(n){Mt.sendToBugsnag("Browser rejected optimistic merge rule","warning"),t._fallback(e)}},s=0,a=mn;s<a.length;s++){var u=a[s];n[u].length>0&&o(n[u],this._rules[u]),r[u].length>0&&o(r[u],this._consentRules[u])}},e.prototype._fallback=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t],i=r.kind,o=r.consent,s=r.selector;this.addRule(i,o,s)}},e.prototype.addElementBlock=function(e){var t=wn(e),n=t.kind,r=t.consent,i=t.selector;return this.addRule(n,r,i)},e.prototype._batchElementKeeps=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t];this.addElementKeep(r)}},e.prototype.addElementKeep=function(e){var t=an.Keep;switch(e.Type){case ee.Click:break;default:return!1;}return this.addRule(t,e.Consent,e.Selector)},e.prototype.addRule=function(e,t,n){if(this.tryToAddRule(e,t,n))return!0;switch(e){case an.Watch:case an.Unmask:case an.Keep:break;case an.Mask:case an.Exclude:default:this._rules[e]=["*"];}return!1},e.prototype.tryToAddRule=function(e,t,n){try{return!bn(n)||this.mergeRule(e,t,n)}catch(e){return Mt.sendToBugsnag("Error adding block rule","error",{selector:n,error:e.toString()}),!1}},e.prototype.getConsent=function(){return this._consent},e.prototype.initializeConsent=function(e){void 0===this._consent&&this.setConsent(e)},e.prototype.setConsent=function(e){this._consent!==e&&(this._consent=e,this._hasWatched&&this.onConsentChange&&this.onConsentChange())},e.prototype.mergeRule=function(e,t,n){var r=t?this._consentRules:this._rules,i=document.documentElement||document.createElement("div"),o=function(){try{return rt(i,n),!0}catch(t){return Mt.sendToBugsnag("Browser rejected rule","warning",{kind:gn[e],selector:n,error:t.toString()}),!1}};switch(e){case an.Exclude:case an.Mask:case an.Unmask:case an.Watch:case an.Keep:break;default:e=an.Exclude;}if(0==r[e].length)return!!o()&&(r[e].push(n),!0);var s=r[e].length-1,a=r[e][s].concat(", ",n);try{rt(i,a)}catch(t){return!!o()&&(r[e].push(n),Mt.sendToBugsnag("Browser rejected merged rule","warning",{kind:gn[e],selector:n,error:t.toString()}),!0)}return r[e][s]=a,!0},e.prototype.allConsentSensitiveElements=function(e){for(var t=[],n=0,r=[an.Exclude,an.Mask,an.Unmask,an.Keep];n<r.length;n++)for(var i=r[n],o=0,s=this._consentRules[i];o<s.length;o++)for(var a=s[o],u=e.querySelectorAll(a),c=0;c<u.length;c++)t.push(u[c]);return t},e.prototype.allWatchedElements=function(e){var t=this;if("matches"===this._watchStrategy)return null;this._hasWatched=!0;for(var n=new ln,r=function(e,r,i){var o=n.get(e)||{kind:null,matchesAnyKeepRule:!1,matchesAnyConsentRule:i};(!i||i&&!t._consent)&&(null==o.kind&&(o.kind=r),r===an.Keep&&(o.matchesAnyKeepRule=!0)),i&&(o.matchesAnyConsentRule=!0),n.set(e,o)},i=0,o=[[this._rules,!1],[this._consentRules,!0]];i<o.length;i++)for(var s=o[i],a=s[0],u=s[1],c=0,h=mn;c<h.length;c++)for(var d=h[c],l=0,p=a[d];l<p.length;l++){var f=p[l];En(e)&&rt(e,f)&&r(e,d,u);for(var v=e.querySelectorAll(f),_=0;_<v.length;_++)r(v[_],d,u)}return n},e.prototype.getWatchStrategy=function(){return this._watchStrategy},e}();function wn(e){var t=an.Exclude;switch(e.Type){case Z.Unset:case Z.Exclude:t=an.Exclude;break;case Z.Mask:t=an.Mask;break;case Z.Unmask:t=an.Unmask;break;case Z.Watch:t=an.Watch;break;case Z.Keep:t=an.Keep;}return{kind:t,consent:e.Consent,selector:e.Selector}}function bn(e){return!e.match(Kt)&&""!=e.trim()}function Sn(){for(var e=Object.create?Object.create(null):{},t=0,n=mn;t<n.length;t++){e[n[t]]=[]}return e}function En(e){return e.nodeType===pn}var Tn={},kn=1;function In(e){var t=xn(e);return!!t&&void 0!==t.watchKind}function Cn(e){var t=xn(e);return!!t&&t.watchKind==an.Exclude}function Rn(e){var t=xn(e);return!!t&&!!t.mask}function An(e){var t=xn(e);return t?t.watchKind:void 0}function xn(e){return e?Tn[e._fs]:null}function On(e){return Tn[e]}function Mn(e){try{return e&&e._fs||0}catch(e){return 0}}function Ln(e){return Cn(e)?0:Mn(e)}function Fn(e,t){e.parent&&(t.unobserveSubtree(e.node),e.parent.child==e&&(e.parent.child=e.next),e.parent.lastChild==e&&(e.parent.lastChild=e.prev),e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent=e.prev=e.next=null,delete Tn[e.id],e.node._fs==e.id&&(e.node._fs=0),e.id=0,e.child&&Pn(e.child))}function Pn(e){for(var t=[e];t.length>0&&t.length<1e4;){var n=t.pop();delete Tn[n.id],n.node._fs==n.id&&(n.node._fs=0),n.id=0,n.next&&t.push(n.next),n.child&&t.push(n.child)}Ft(t.length<1e4,"clearIds is fast")}var qn,Un=function(){function e(e,t){this._onchange=e,this._checkElem=t,this._fallback=!1,this._elems={},this.values={},this.radios={},qn=this}return e.prototype.hookEvents=function(){(function(){var e=Object.getOwnPropertyDescriptor(HTMLInputElement.prototype,"value");if(!e||!e.set)return!1;Nn||(kt(HTMLInputElement,"value",jn),kt(HTMLInputElement,"checked",jn),kt(HTMLSelectElement,"value",jn),kt(HTMLTextAreaElement,"value",jn),kt(HTMLSelectElement,"selectedIndex",jn),kt(HTMLOptionElement,"selected",jn),Nn=!0);return!0})()||(this._fallback=!0)},e.prototype.addInput=function(e){var t=Mn(e);if(this._elems[t]=e,Vn(e)){var n=Hn(e);e.checked&&(this.radios[n]=t)}else this.values[t]=Kn(e);(function(e){switch(e.type){case"checkbox":case"radio":return e.checked!=e.hasAttribute("checked");default:return(e.value||"")!=function(e){if("select"!=on(e))return e.getAttribute("value")||"";var t=e,n=t.querySelector("option[selected]")||t.querySelector("option");if(!n)return"";return n.value||""}(e);}})(e)&&this._onchange(e)},e.prototype.diffValue=function(e,t){var n=Mn(e);if(Vn(e)){var r=Hn(e);return this.radios[r]==n!=("true"==t)}return this.values[n]!=t},e.prototype.onChange=function(e,t){void 0===t&&(t=Kn(e));var n=Mn(e);if((e=this._elems[n])&&this.diffValue(e,t))if(this._onchange(e),Vn(e)){var r=Hn(e);"false"==t&&this.radios[r]==n?delete this.radios[r]:this.radios[r]=n}else this.values[n]=t},e.prototype.tick=function(){for(var e in this._elems){var t=this._elems[e];if(this._checkElem(t)){if(this._fallback){var n=Kn(t);if(t&&this.diffValue(t,n))if(this._onchange(t),Vn(t)){var r=Hn(t);this.radios[r]=+e}else this.values[e]=n}}else delete this._elems[e],delete this.values[e],Vn(t)&&delete this.radios[Hn(t)]}},e.prototype.shutdown=function(){qn=null},e.prototype._usingFallback=function(){return this._fallback},e.prototype._trackingElem=function(e){return!!this._elems[e]},e}(),Nn=!1;var Wn,Dn={};function Bn(){try{if(qn)for(var e in Dn){var t=Dn[e],n=t[0],r=t[1];qn.onChange(n,r)}}finally{Wn=null,Dn={}}}function Hn(e){if(!e)return"";for(var t=e;t&&"form"!=on(t);)t=t.parentElement;return(t&&"form"==on(t)?Mn(t):0)+":"+e.name}function jn(e,t){var n=function e(t,n){if(void 0===n&&(n=2),n<=0)return t;var r=on(t);return"option"!=r&&"optgroup"!=r||!t.parentElement?t:e(t.parentElement,n-1)}(e),r=Mn(n);r&&qn&&qn.diffValue(n,""+t)&&(Dn[r]=[n,""+t],Wn||(Wn=new tn(Bn)).start())}function Kn(e){switch(e.type){case"checkbox":case"radio":return""+e.checked;default:var t=e.value;return t||(t=""),""+t;}}function Vn(e){return e&&"radio"==e.type}var zn={};var Yn="__default";function Gn(e){void 0===e&&(e=Yn);var t=zn[e];return t||(t=function(){var e=document.implementation.createHTMLDocument("");return e.head||e.documentElement.appendChild(e.createElement("head")),e.body||e.documentElement.appendChild(e.createElement("body")),e}(),e!==Yn&&(t.open(),t.write(e),t.close()),zn[e]=t),t}var Qn=new(function(){function e(){var e=Gn(),t=e.getElementById("urlresolver-base");t||((t=e.createElement("base")).id="urlresolver-base",e.head.appendChild(t));var n=e.getElementById("urlresolver-parser");n||((n=e.createElement("a")).id="urlresolver-parser",e.head.appendChild(n)),this.base=t,this.parser=n}return e.prototype.parseUrl=function(e,t){if("undefined"!=typeof URL)try{e||(e=document.baseURI);var n=e?new URL(t,e):new URL(t);if(n.href)return n}catch(e){}return this.parseUrlUsingBaseAndAnchor(e,t)},e.prototype.parseUrlUsingBaseAndAnchor=function(e,t){this.base.setAttribute("href",e),this.parser.setAttribute("href",t);var n=document.createElement("a");return n.href=this.parser.href,n},e.prototype.resolveUrl=function(e,t){return this.parseUrl(e,t).href},e.prototype.resolveToDocument=function(e,t){var n=Jn(e);return null==n?t:this.resolveUrl(n,t)},e}());function Xn(e,t){return Qn.parseUrl(e,t)}function Jn(e){var t=e.document,n=e.location.href;if("string"==typeof t.baseURI)n=t.baseURI;else{var r=t.getElementsByTagName("base")[0];r&&r.href&&(n=r.href)}return"about:blank"==n&&e.parent!=e?Jn(e.parent):n}var $n=new RegExp("[^\\s]"),Zn=new RegExp("[\\s]*$");String.prototype;function er(e){var t=$n.exec(e);if(!t)return e;for(var n=t.index,r=(t=Zn.exec(e))?e.length-t.index:0,i="\uFFFF",o=e.slice(n,e.length-r).split(/\r\n?|\n/g),s=0;s<o.length;s++)i+=""+o[s].length,s!=o.length-1&&(i+=":");return(n||r)&&(i+=" "+n+" "+r),i}var tr=["allowReorder","attributeName","attributeType","autoReverse","baseFrequency","baseProfile","calcMode","clipPathUnits","contentScriptType","contentStyleType","diffuseConstant","edgeMode","externalResourcesRequired","filterRes","filterUnits","glyphRef","gradientTransform","gradientUnits","kernelMatrix","kernelUnitLength","keyPoints","keySplines","keyTimes","lengthAdjust","limitingConeAngle","markerHeight","markerUnits","markerWidth","maskContentUnits","maskUnits","numOctaves","pathLength","patternContentUnits","patternTransform","patternUnits","pointsAtX","pointsAtY","pointsAtZ","preserveAlpha","preserveAspectRatio","primitiveUnits","refX","refY","referrerPolicy","repeatCount","repeatDur","requiredExtensions","requiredFeatures","specularConstant","specularExponent","spreadMethod","startOffset","stdDeviation","stitchTiles","surfaceScale","systemLanguage","tableValues","targetX","targetY","textLength","viewBox","viewTarget","xChannelSelector","yChannelSelector","zoomAndPan"].reduce(function(e,t){return e[t]=t,e[t.toUpperCase()]=t,e},{}),nr=n(2),rr="(redacted)",ir=16e6;function or(e,t){var n=e.textContent;if(!n)return"";if(!t&&!(t=xn(e)))return"";var r=n.length;return r>ir?(Mt.sendToBugsnag("Ignoring huge text node","warning",{length:r}),""):e.parentNode&&"style"==on(e.parentNode)?n:t.mask?er(n):n}function sr(e){return tr[e]||e.toLowerCase()}function ar(e,t,n,r){var i,o=on(t);if(null===o)return null;var s=function(e){var t,r,s;i=null!==(r=null===(t=nr[e][o])||void 0===t?void 0:t[n])&&void 0!==r?r:null===(s=nr[e]["*"])||void 0===s?void 0:s[n]};if(s("Any"),void 0===i){var a=xn(t);if(!a)return null;a.watchKind==an.Exclude?s("Exclude"):a.mask&&s("Mask")}if(void 0===i)return r;switch(i){case"erase":return null;case"scrubUrl":return ur(r,e,{source:"dom",type:o});case"maskText":return er(r);default:return Object(cn.assertExhaustive)(i);}}function ur(e,t,n){switch(n.source){case"dom":switch(r=n.type){case"frame":case"iframe":return hr(e,t);default:return cr(e,t);}case"event":switch(r=n.type){case R.AJAX_REQUEST:case R.NAVIGATE:return cr(e,t);case R.SET_FRAME_BASE:return hr(e,t);default:return Object(cn.assertExhaustive)(r);}case"log":return hr(e,t);case"page":var r;switch(r=n.type){case"base":return hr(e,t);case"referrer":case"url":return cr(e,t);default:return Object(cn.assertExhaustive)(r);}case"perfEntry":switch(n.type){case"frame":case"iframe":case"navigation":case"other":return hr(e,t);default:return cr(e,t);}default:return Object(cn.assertExhaustive)(n);}}function cr(e,t){return lr(e,t,function(e){if(!(e in pr)){var t=["password","token","^jwt$"];switch("4K3FQ"!==e&&"NQ829"!==e&&"KCF98"!==e&&t.push("^code$"),e){case"2FVM4":t.push("^e$","^eref$","^fn$");break;case"35500":t.push("share_token","password-reset-key");break;case"1HWDJ":t.push("email_id","invite","join");break;case"J82WF":t=[".*"];break;case"8MM83":t=["^creditCard"];break;case"PAN8Z":t.push("code","hash","ol","aeh");break;case"BKP05":t.push("api_key","session_id","encryption_key");break;case"QKM7G":t.push("postcode","encryptedQuoteId","registrationId","productNumber","customerName","agentId","qqQuoteId");break;case"FP60X":t.push("phrase");break;case"GDWG7":t=["^(?!productType|utmSource).*$"];break;case"RV68C":t.push("drivingLicense");break;case"S3VEC":t.push("data");break;case"Q8RZE":t.push("myLowesCardNumber");}pr[e]=new RegExp(t.join("|"),"i")}return pr[e]}(t))}function hr(e,t){return lr(e,t,fr)}function dr(e,t,n,r){var i=new RegExp("(\\/"+t+"\\/).*$","i");n==r&&e.pathname.indexOf(t)>=0&&(e.pathname=e.pathname.replace(i,"$1"+rr))}function lr(e,t,n){var r=Xn("",e);return r.hash&&r.hash.indexOf("access_token")>=0&&(r.hash="#"+rr),dr(r,"visitor",t,"QS8RG"),dr(r,"account",t,"QS8RG"),dr(r,"parentAccount",t,"QS8RG"),dr(r,"reset_password",t,"AGQFM"),dr(r,"reset-password",t,"95NJ7"),dr(r,"dl",t,"RV68C"),dr(r,"retailer",t,"FP60X"),dr(r,"ocadotech",t,"FP60X"),dr(r,"serviceAccounts",t,"FP60X"),dr(r,"signup",t,"7R98D"),r.search&&r.search.length>0&&(r.search=function(e,t){return e.split("?").map(function(e){return function(e,t){return e.replace("?","").split("&").map(function(e){return e.split("=")}).map(function(e){var n=e[0],r=e[1],i=e.slice(2);return t.test(n)&&void 0!==r?[n,rr].concat(i):[n,r].concat(i)}).map(function(e){var t=e[0],n=e[1],r=e.slice(2);return void 0===n?t:[t,n].concat(r).join("=")}).join("&")}(e,t)}).join("?")}(r.search,n)),r.href.substring(0,2048)}var pr={};var fr=new RegExp(".*","i");var vr=/([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)/gi,_r=/(?:(http)|(ftp)|(file))[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+#]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+/gi;function gr(e){return"function"==typeof(t=e.constructor)&&Function.prototype.toString.call(t).indexOf("[native code]")>-1;var t}var mr=function(){function e(e,t,n){this._watcher=e,this._resizer=t,this._orgId=n,Tn={},kn=1}return e.prototype.tokenizeNode=function(e,t,n,r,i,o,s){var a=this,u=xn(t),c=xn(n),h=[];return function(e){var t=kn;try{return e(),!0}catch(e){return kn=t,!1}}(function(){a.tokeNode(e,u,c,r,h,i,o,s)})||(h=[]),h},e.prototype.tokeNode=function(e,t,n,r,i,o,s,a){for(var u=[{parentMirror:t,nextMirror:n,node:r}],c=function(){var t=u.pop();if(!t)return"continue";if("string"==typeof t)return i.push(t),"continue";var n=t.parentMirror,r=t.nextMirror,c=t.node,d=h._encodeTagAndAttributes(e,n,r,c,i,o,s);if(null==d||d.watchKind===an.Exclude)return"continue";var l=c.nodeType===pn?c.shadowRoot:null;return(l||c.firstChild)&&a(d)?(u.push("]"),function(e,t){if(!e)return;var n=[];ft(e,function(e){return n.push(e)});for(;n.length>0;){var r=n.pop();r&&t(r)}}(c.firstChild,function(e){u.push({parentMirror:d,nextMirror:null,node:e})}),l&&u.push({parentMirror:d,nextMirror:null,node:l}),void u.push("[")):"continue"},h=this;u.length;)c()},e.prototype._encodeTagAndAttributes=function(e,t,n,r,i,o,s){if("script"==on(r)||8==r.nodeType)return null;var a,u,c,h,d=function(e){return e.constructor===window.ShadowRoot}(r),l=function(e){var t={id:kn++,node:e};return Tn[t.id]=t,e._fs=t.id,t}(r);if((d||(null==t?void 0:t.isInShadowDOM))&&(l.isInShadowDOM=!0),t&&(d?t.shadow=l:(a=t,u=l,c=n,h=this._resizer,Fn(u,h),u.parent=a,u.next=c,c&&(u.prev=c.prev,c.prev=u),null==u.next?(u.prev=a.lastChild,a.lastChild=u):u.next.prev=u,null==u.prev?a.child=u:u.prev.next=u)),10==r.nodeType){var p=r;return i.push("<!DOCTYPE",":name",p.name,":publicId",p.publicId||"",":systemId",p.systemId||""),l}try{switch(r.nodeType){default:i.push("<"+r.nodeName),yr(r,o);break;case 11:case 9:var f;f=d?gr(r)?"#shadow":"#polyfillshadow":r.nodeName,i.push("<"+f),yr(r,o);break;case 3:void 0===l.mask&&(l.mask=!l.parent||l.parent.mask),l.mask&&this._resizer.observe(r.parentElement),yr(r,o),i.push("<"+r.nodeName,or(r,l));break;case pn:var v=r,_=v.nodeName;"http://www.w3.org/2000/svg"==v.namespaceURI&&(_="svg:"+_),i.push("<"+_);var g=this.getWatchState(v,!!l.isInShadowDOM,e),m=g.watchKind,y=g.matchesAnyKeepRule,w=g.matchesAnyConsentRule;if(l.matchesAnyKeepRule=y,l.matchesAnyConsentRule=w,null!=m)switch(l.watchKind=m,m){case an.Watch:this._resizer.observe(v);break;case an.Exclude:this._resizer.observe(v),i.push(":_fs_excluded","true");break;case an.Unmask:l.mask=!1;break;case an.Mask:l.mask=!0;}m!==an.Unmask&&m!==an.Mask&&l.parent&&(l.mask=l.parent.mask),l.mask&&i.push(":_fs_masked","true"),l.watchKind!=an.Exclude&&yr(r,o),function(e,t,n){if(ce&&"output"===on(t))return;var r=t;if(void 0!==r.hasAttributes&&!r.hasAttributes()||void 0===r.hasAttributes&&r.attributes&&r.attributes.length<=0)return;var i=function(r,i){null!==i&&(r=sr(r),null!==(i=ar(e,t,r,i))&&n(r,i))};if(void 0!==r.getAttributeNames)for(var o=0,s=r.getAttributeNames();o<s.length;o++){var a=s[o];i(a,r.getAttribute(a))}else for(var u=0;u<r.attributes.length;u++){var c=r.attributes[u];null!=c&&i(c.name,c.value)}}(this._orgId,v,function(e,t){i.push(":"+e),i.push(t);try{s(v,e,t)}catch(e){Mt.sendToBugsnag(e,"error")}});}}catch(e){Mt.sendToBugsnag(e,"error")}return l},e.prototype.getWatchState=function(e,t,n){var r=t||null==n?"matches":this._watcher.getWatchStrategy();switch(r){case"matches":return{watchKind:this._watcher.isWatched(e),matchesAnyKeepRule:this._watcher.matchesAnyKeepRule(e),matchesAnyConsentRule:this._watcher.matchesAnyConsentRule(e)};case"qsa":var i=n.get(e);return i?{watchKind:i.kind,matchesAnyKeepRule:i.matchesAnyKeepRule,matchesAnyConsentRule:i.matchesAnyConsentRule}:{watchKind:null,matchesAnyKeepRule:!1,matchesAnyConsentRule:!1};case"verify":var o=n.get(e),s={watchKind:this._watcher.isWatched(e),matchesAnyKeepRule:this._watcher.matchesAnyKeepRule(e),matchesAnyConsentRule:this._watcher.matchesAnyConsentRule(e)};return null!==s.watchKind&&void 0===o?Mt.sendToBugsnag("Watch strategy qsa digest doesn't contain el","error",{matchesDigest:s,qsaDigest:o}):null!==s.watchKind&&void 0!==o?s.watchKind===o.kind&&s.matchesAnyConsentRule===o.matchesAnyConsentRule&&s.matchesAnyKeepRule===o.matchesAnyKeepRule||Mt.sendToBugsnag("Watch strategy qsa digest inconsistency","error",{matchesDigest:s,qsaDigest:o}):null===s.watchKind&&void 0!==o&&null!==o.kind&&Mt.sendToBugsnag("Watch strategy qsa digest flagged an element matches didn't","error",{matchesDigest:s,qsaDigest:o}),s;default:return Object(cn.assertExhaustive)(r);}},e}();function yr(e,t){try{t(e)}catch(e){Mt.sendToBugsnag(e,"error")}}var wr=function(){function e(){this.dict={idx:-1,map:{}},this.nodeCount=1,this.startIdx=0}return e.prototype.encode=function(t){if(0==t.length)return[];var n,r,i=t[0],o=Object.prototype.hasOwnProperty.call(this.dict.map,i)?this.dict.map[i]:null,s=[],a=1;function u(){o?a>1?s.push([o.idx,a]):s.push(o.idx):s.push(i)}for(n=1;n<t.length;n++)if(r=t[n],o&&Object.prototype.hasOwnProperty.call(o.map,r))a++,i=r,o=o.map[r];else{u();var c=this.startIdx+n-a;null==o&&this.nodeCount<e.MAX_NODES&&(o={idx:c,map:{}},this.dict.map[i]=o,this.nodeCount++),o&&this.nodeCount<e.MAX_NODES&&(o.map[r]={idx:c,map:{}},this.nodeCount++),a=1,i=r,o=Object.prototype.hasOwnProperty.call(this.dict.map,r)?this.dict.map[r]:null}return u(),this.startIdx+=t.length,s},e.MAX_NODES=1e4,e}(),br=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Sr=function(){return(Sr=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Er=function(){function e(e){this._ctx=e,this._recordedDims={},this._observedDims={}}return e.create=function(e){return Tr.isSupported(e.window)?new Tr(e):new kr(e)},e.prototype.collect=function(e){var t=[];for(var n in this._observedDims)this.addPlaceholderResize(e,t,Number(n));return this._observedDims={},t},e.prototype.addEntry=function(e){try{var t=Mn(e);if(!t)return;if(e.nodeType!=pn)return;var n=e;if(this._observedDims[t]=n.getBoundingClientRect(),!this._recordedDims[t]){var r=this.flushSizeEvent(t);if(!r)return;this._ctx.queue().enqueue(r)}}catch(e){}},e.prototype.addPlaceholderResize=function(e,t,n){var r=this.flushSizeEvent(n);r&&t.push(Sr(Sr({},r),{When:e}))},e.prototype.flushSizeEvent=function(e){var t=this._observedDims[e];if(!t)return null;var n=On(e);if(!n)return null;var r=n.watchKind,i=t.width,o=t.height,s=this._recordedDims[e];if(s&&s.w==i&&s.h==o)return null;if(this._recordedDims[e]={w:i,h:o},r==an.Watch){var a=0!=i&&0!=o;if((!!s&&0!=s.w&&0!=s.h)!=a)return{Kind:R.WATCHED_ELEM,Args:[e,a]}}return{Kind:R.PLACEHOLDER_SIZE,Args:[e,i,o]}},e}(),Tr=function(e){function t(t){var n=e.call(this,t)||this;return n._inlineGroups=new ln,n._observedInlines=new ln,n._obs=new t.window.ResizeObserver(function(e){for(var t=0,r=e;t<r.length;t++){var i=r[t].target;n.addEntry(i)}}),n._inlineGroupObs=new t.window.ResizeObserver(function(e){for(var t=0,r=e;t<r.length;t++){var i=r[t].target;n._addEntriesForInlineGroup(i)}}),n}return br(t,e),t.isSupported=function(e){return"ResizeObserver"in e},t.prototype.observe=function(e){var t=this;if(e&&e.nodeType==pn){var n=e;this._obs.unobserve(n),this._obs.observe(n),this._ctx.measurer.requestMeasureTask(function(){t._addToInlineGroupIfNeeded(n)})}},t.prototype.unobserveSubtree=function(e){},t.prototype.nodeChanged=function(e){var t=this,n=this._observedInlines.get(e);"number"==typeof n&&Mn(e)===n&&this._ctx.measurer.requestMeasureTask(function(){t.addEntry(e)})},t.prototype._addEntriesForInlineGroup=function(e){var t=this._inlineGroups.get(e);if(t)for(var n in t){var r=On(t[n]);r?this.addEntry(r.node):delete t[n]}},t.prototype._addToInlineGroupIfNeeded=function(e){var t=this,n=Mn(e);if(n){var r=this._nearestNonInlineElementAncestorOf(e);if(r&&r!==e){this._observedInlines.set(e,n),this.addEntry(e);var i=this._inlineGroups.get(r);i||(i=Object.create(null),this._inlineGroups.set(r,i)),i[n]=n,s.setWindowTimeout(this._ctx.window,ie(function(){t._inlineGroupObs.observe(r)}),0)}}},t.prototype._nearestNonInlineElementAncestorOf=function(e){for(var t=0,n=e;;){if(t++>1e3)return null;if(!n||n.nodeType!=pn)return null;var r=n;if(getComputedStyle(r).display.indexOf("inline")<0)return r;n=n.parentNode}},t}(Er),kr=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return br(t,e),t.prototype.observe=function(e){var t=this;if(e&&e.nodeType==pn){var n=e;this.growWatchedIndex(xn(e)),this._ctx.measurer.requestMeasureTask(function(){t.addEntry(n)})}},t.prototype.unobserveSubtree=function(e){var t=xn(e);t&&this.clearWatchedIndex(t)},t.prototype.nodeChanged=function(e){var t=this,n=this.relatedWatched(e);this._ctx.measurer.requestMeasureTask(function(){for(var e=0,r=n;e<r.length;e++){var i=r[e];t.addEntry(i)}})},t.prototype.watchedChildren=function(e){return e.watchedChildren},t.prototype.growWatchedIndex=function(e){if(e&&In(e.node))for(var t=e,n=e.parent;n;n=n.parent){if(this.watchedChildren(n)||(n.watchedChildren={}),this.watchedChildren(t))for(var r in this.watchedChildren(t))delete this.watchedChildren(n)[r];if(this.watchedChildren(n)[t.id]=t,lt(this.watchedChildren(n),2))t=n;else if(pt(this.watchedChildren(n),2))break}},t.prototype.relatedWatched=function(e){var t=[],n=xn(e);if(n)for(var r=[n],i=0;r.length&&++i<1e3;){var o=r.pop();In(o.node)&&t.push(o.node),this.watchedChildren(o)&&ht(this.watchedChildren(o),function(e){r.push(e)})}else{for(var s=e;s&&!Mn(s);)s=s.parentNode;s&&In(s)&&t.push(s)}return t},t.prototype.clearWatchedIndex=function(e){if(pt(this.watchedChildren(e),0)||In(e.node))for(var t=this.watchedChildren(e)&&pt(this.watchedChildren(e),1)||In(e.node)?e.id:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))return t}(this.watchedChildren(e)),n=t?e.parent:null;n&&this.watchedChildren(n)&&this.watchedChildren(n)[t];){if(delete this.watchedChildren(n)[t],lt(this.watchedChildren(n),1)){var r=n.id,i=dt(this.watchedChildren(n));for(n=n.parent;n&&this.watchedChildren(n)&&this.watchedChildren(n)[r];)delete this.watchedChildren(n)[r],this.watchedChildren(n)[i.id]=i,n=n.parent;break}n=n.parent}},t}(Er),Ir=function(){return(Ir=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Cr={attributeName:null,attributeNamespace:null,addedNodes:[],removedNodes:[],nextSibling:null,previousSibling:null,oldValue:null};function Rr(e){return Ir(Ir(Ir({},Cr),e),{type:"childList"})}function Ar(e,t){return 0===t.length?Rr({target:e}):Rr({addedNodes:t,nextSibling:ut(t[t.length-1]),previousSibling:vt(t[0]),target:e})}var xr=ae&&!ue?Dr:window.MutationObserver||window.WebKitMutationObserver||Dr,Or=new ln,Mr=window.setImmediate||window.msSetImmediate;if(!Mr){var Lr=[],Fr=String(s.mathRandom());window.addEventListener("message",function(e){if(e.data===Fr){var t=Lr;Lr=[],t.forEach(function(e){e()})}}),Mr=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return Lr.push(e),window.postMessage(Fr,"*"),0}}var Pr=!1,qr=[];function Ur(){Pr=!1;var e=qr;qr=[],e.sort(function(e,t){return e.uid_-t.uid_});var t=!1;e.forEach(function(e){var n=e.takeRecords();!function(e){e.nodes_.forEach(function(t){var n=Or.get(t);n&&n.forEach(function(t){t.observer===e&&t.removeTransientObservers()})})}(e),n.length&&(e.callback_(n,e),t=!0)}),t&&Ur()}function Nr(e,t){for(var n=e;n;n=n.parentNode){var r=Or.get(n);if(r)for(var i=0;i<r.length;i++){var o=r[i],s=o.options;if(n===e||s.subtree){var a=t(s);a&&o.enqueue(a)}}}}var Wr=0;function Dr(e){this.callback_=e,this.nodes_=[],this.records_=[],this.uid_=++Wr}Dr.prototype={observe:function(e,t){if(e=function(e){return window.ShadowDOMPolyfill&&window.ShadowDOMPolyfill.wrapIfNeeded(e)||e}(e),!t.childList&&!t.attributes&&!t.characterData||t.attributeOldValue&&!t.attributes||t.attributeFilter&&t.attributeFilter.length&&!t.attributes||t.characterDataOldValue&&!t.characterData)throw new SyntaxError;var n,r=Or.get(e);r||Or.set(e,r=[]);for(var i=0;i<r.length;i++)if(r[i].observer===this){(n=r[i]).removeListeners(),n.options=t;break}n||(n=new Yr(this,e,t),r.push(n),this.nodes_.push(e)),n.addListeners()},disconnect:function(){this.nodes_.forEach(function(e){for(var t=Or.get(e),n=0;n<t.length;n++){var r=t[n];if(r.observer===this){r.removeListeners(),t.splice(n,1);break}}},this),this.records_=[]},takeRecords:function(){var e=this.records_;return this.records_=[],e}};var Br,Hr,jr=function(e,t){this.type=e,this.target=t,this.addedNodes=[],this.removedNodes=[],this.previousSibling=null,this.nextSibling=null,this.attributeName=null,this.attributeNamespace=null,this.oldValue=null};function Kr(e,t){return Br=new jr(e,t)}function Vr(e){return Hr||((n=new jr((t=Br).type,t.target)).addedNodes=t.addedNodes.slice(),n.removedNodes=t.removedNodes.slice(),n.previousSibling=t.previousSibling,n.nextSibling=t.nextSibling,n.attributeName=t.attributeName,n.attributeNamespace=t.attributeNamespace,n.oldValue=t.oldValue,(Hr=n).oldValue=e,Hr);var t,n}function zr(e,t){return e===t?e:Hr&&((n=e)===Hr||n===Br)?Hr:null;var n}function Yr(e,t,n){var r=this;this.observer=e,this.target=t,this.options=n,this.transientObservedNodes=[],this.handleEventBound=function(e){return r.handleEvent_(e)}}Yr.prototype={enqueue:function(e){var t=this.observer.records_,n=t.length;if(t.length>0){var r=zr(t[n-1],e);if(r)return void(t[n-1]=r)}else!function(e){qr.push(e),Pr||(Pr=!0,Mr(Ur))}(this.observer);t[n]=e},addListeners:function(){this.addListeners_(this.target)},addListeners_:function(e){var t=this.options;t.attributes&&e.addEventListener("DOMAttrModified",this.handleEventBound,!0),t.characterData&&e.addEventListener("DOMCharacterDataModified",this.handleEventBound,!0),t.childList&&e.addEventListener("DOMNodeInserted",this.handleEventBound,!0),(t.childList||t.subtree)&&e.addEventListener("DOMNodeRemoved",this.handleEventBound,!0)},removeListeners:function(){this.removeListeners_(this.target)},removeListeners_:function(e){var t=this.options;t.attributes&&e.removeEventListener("DOMAttrModified",this.handleEventBound,!0),t.characterData&&e.removeEventListener("DOMCharacterDataModified",this.handleEventBound,!0),t.childList&&e.removeEventListener("DOMNodeInserted",this.handleEventBound,!0),(t.childList||t.subtree)&&e.removeEventListener("DOMNodeRemoved",this.handleEventBound,!0)},addTransientObserver:function(e){if(e!==this.target){this.addListeners_(e),this.transientObservedNodes.push(e);var t=Or.get(e);t||Or.set(e,t=[]),t.push(this)}},removeTransientObservers:function(){var e=this.transientObservedNodes;this.transientObservedNodes=[],e.forEach(function(e){this.removeListeners_(e);for(var t=Or.get(e),n=0;n<t.length;n++)if(t[n]===this){t.splice(n,1);break}},this)},handleEvent_:function(e){switch(e.type){case"DOMAttrModified":var t=e.attrName,n=e.relatedNode.namespaceURI,r=Kr("attributes",a=e.target);r.attributeName=t,r.attributeNamespace=n;var i=e.attrChange===MutationEvent.ADDITION?null:e.prevValue;Nr(a,function(e){if(e.attributes&&(!e.attributeFilter||!e.attributeFilter.length||-1!==e.attributeFilter.indexOf(t)||-1!==e.attributeFilter.indexOf(n)))return e.attributeOldValue?Vr(i):r});break;case"DOMCharacterDataModified":var o=Kr("characterData",a=e.target),s=e.prevValue;Nr(a,function(e){if(e.characterData)return e.characterDataOldValue?Vr(s):o});break;case"DOMNodeRemoved":case"DOMNodeInserted":"DOMNodeRemoved"==e.type&&this.addTransientObserver(e.target);var a=e.relatedNode,u=e.target,c=void 0,h=void 0;"DOMNodeInserted"===e.type?(c=[u],h=[]):(c=[],h=[u]);var d=vt(u),l=ut(u),p=Kr("childList",a);p.addedNodes=c,p.removedNodes=h,p.previousSibling=d,p.nextSibling=l,Nr(a,function(e){if(e.childList)return p});}Br=Hr=void 0}};var Gr=function(){return(Gr=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Qr=function(){function e(e,t,n,r,i,o,s){var a=this;void 0===n&&(n=!0),void 0===r&&(r=function(){}),void 0===i&&(i=function(){}),void 0===o&&(o=function(){}),void 0===s&&(s=function(){return!0}),this._ctx=e,this._watcher=t,this._compress=n,this._nodeVisitor=r,this._beforeRemove=i,this._attrVisitor=o,this._visitChildren=s,this._sentDomSnapshot=!1,this._newShadowContainers=[],this._toRefresh=[],this._records=[],this._setPropertyWasThrottled=!1,this._wnd=e.window,this._resizer=Er.create(e),this._encoder=new mr(t,this._resizer,e.options.orgId),Ft(!this._watcher.onConsentChange,"This is the only consent change listener."),this._watcher.onConsentChange=function(){return a.updateConsent()}}return e.prototype.hookMutations=function(e){void 0===e&&(e=this._wnd.document),this._root=e,this._sentDomSnapshot=!1,this._compress&&(this._lz=new wr);var t=!0;if(ae)try{this.setUpIEWorkarounds()}catch(e){o("Error setting up IE workarounds for mutation watcher: "+e),t=!1}t&&(this._observer=new xr(this._addMutations.bind(this)))},e.prototype._observerOff=function(){this._observer&&this._observer.disconnect()},e.prototype._addMutations=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t];this._records.push(r)}},e.prototype.resizer=function(){return this._resizer},e.prototype.shutdown=function(){this._observer&&this._observer.disconnect();var e=xn(this._root);e&&Pn(e),this._records=[],ae&&this.tearDownIEWorkarounds(),this._watcher.onConsentChange=null,this._attachShadowHook&&(this._attachShadowHook.disable(),this._attachShadowHook=null)},e.prototype.processMutations=function(e){if(!this._root)return[];var t=[];if(this.maybeGetInitialSnapshot(e,t),this._setPropertyWasThrottled&&(t.push({Kind:R.FAIL_THROTTLED,When:e,Args:[Q.SetPropertyHooks]}),this._setPropertyWasThrottled=!1),this._records.length>0||this._toRefresh.length>0){var n={},r={};for(var i in this.processRecords(e,t,r,n),r){var o=i.split("\t");t.push({Kind:R.MUT_ATTR,When:e,Args:[parseInt(o[0]),o[1],r[i]]})}for(var i in n)t.push({Kind:R.MUT_TEXT,When:e,Args:[parseInt(i),n[i]]})}var s=this._newShadowContainers;this._newShadowContainers=[];for(var a=0;a<s.length;a++){var u=s[a].shadowRoot;u&&0!=Mn(s[a])&&0==Mn(u)&&(this.observe(u),this.genShadow(null,e,t,s[a],u))}return t.push.apply(t,this._resizer.collect(e)),this._records=[],t},e.prototype.recordingIsDetached=function(){return this._root&&this._root!=this._wnd.document},e.prototype.maybeGetInitialSnapshot=function(e,t){if(!this._sentDomSnapshot){var n=this._watcher.allWatchedElements(this._root);this.genInsert(n,e,t,null,this._root,null),this._resizer.nodeChanged(this._root),this._observer&&this.observe(this._root),this._sentDomSnapshot=!0,this.hookAttachShadow()}},e.prototype.hookAttachShadow=function(){var e=this;this._attachShadowHook=Tt(Element.prototype,"attachShadow"),this._attachShadowHook&&this._attachShadowHook.before(function(t){t.that.shadowRoot||e._newShadowContainers.push(t.that)})},e.prototype.observe=function(e){try{this._observer.observe(e,{childList:!0,attributes:!0,characterData:!0,subtree:!0,attributeOldValue:!0,characterDataOldValue:!0})}catch(e){}},e.prototype.processRecords=function(e,t,n,r){for(var i=this,o={},s={},a=function(n){if(xn(n)){i.genRemove(e,t,xn(n));var r=xn(n.parentNode);r&&(s[r.id]=r.node)}},u=0;u<this._records.length;++u)try{var c=this._records[u],h=Mn(c.target);if(!h)continue;switch(o[h]=c.target,c.type){case"childList":if(c.removedNodes.length>0)for(var d=0;d<c.removedNodes.length;++d){var l=xn(c.removedNodes[d]);l&&l.id&&this.genRemove(e,t,l)}if(c.addedNodes.length>0){s[h]=c.target;var p=Jr(c.target);p&&(s[p.id]=p.node)}break;case"characterData":Cn(c.target)||c.oldValue!=c.target.textContent&&(r[h]=or(c.target));break;case"attributes":var f=An(w=c.target);if(_n(this._watcher.isWatched(w))>_n(f)){a(w);break}var v=Xr(c.attributeNamespace)+(c.attributeName||""),_=sr(v);if(w.hasAttribute(v)){var g=c.target.getAttribute(v);c.oldValue!=g&&(g=ar(this._ctx.options.orgId,c.target,_,g||""),this._attrVisitor(c.target,_,g||""),null!==g&&(n[h+"\t"+_]=g))}else n[h+"\t"+_]=null;}}catch(e){}for(var m=0,y=this._toRefresh;m<y.length;m++){var w=y[m];try{a(w)}catch(e){Mt.sendToBugsnag(e,"error")}}for(var b in this._toRefresh=[],s){var S=xn(E=s[b]);S&&S.id&&this.diff(e,t,E,S.child,E.firstChild)}for(var b in o){var E=o[b];this._resizer.nodeChanged(E)}},e.prototype._checkForMissingInsertions=function(e){if(!this._sentDomSnapshot||!e)return[];return this.walkAddRecords(this._root),[]},e.prototype.walkAddRecords=function(e){var t=this;Mn(e)||null===e.parentNode?ft(e.firstChild,function(e){t.walkAddRecords(e)}):this._records.push(Ar(e.parentNode,[e]))},e.prototype.diff=function(e,t,n,r,i){for(var o=[],s=r,a=i;s&&a;){var u=xn(a);Mn(a)?u&&s.id==u.id?(s=s.next,a=ut(a)):(o.push({remove:s}),s=s.next):(o.push({insert:[n,a,s.node]}),a=ut(a))}for(;s;s=s.next)o.push({remove:s});ft(a,function(e){o.push({insert:[n,e,null]})});for(var c=!1,h=0;h<o.length;h++){var d=o[h];d.insert?this.genInsert(null,e,t,d.insert[0],d.insert[1],d.insert[2]):d.remove&&(c=!0,this.genRemove(e,t,d.remove))}Ft(!c,"All remove events should have been generated earlier, in MutationWatcher.processMutations")},e.prototype.genShadow=function(e,t,n,r,i){var o=Mn(r),s=this.genDocStream(e,r,i,null);s.length>0&&n.push({When:t,Kind:R.MUT_SHADOW,Args:[o,this._compress?this._lz.encode(s):s]})},e.prototype.genInsert=function(e,t,n,r,i,o){var s=Mn(r)||-1,a=Mn(o)||-1,u=-1===s&&-1===a,c=p(),h=this.genDocStream(e,r,i,o),d=p()-c;if(h.length>0){var l=p(),f=this._compress?this._lz.encode(h):h,v=p()-l;n.push({When:t,Kind:R.MUT_INSERT,Args:[s,a,f]},{When:t,Kind:R.TIMING,Args:[[O.Internal,A.Serialization,u?x.DomSnapshot:x.NodeEncoding,t,d,[x.LzEncoding,v]]]})}},e.prototype.genDocStream=function(e,t,n,r){var i=this;if(t&&Cn(t))return[];for(var o=[],s=this._encoder.tokenizeNode(e,t,r,n,function(e){if(e.nodeType==pn){var t=e;t.shadowRoot&&i.observe(t.shadowRoot)}i._nodeVisitor(e,o)},this._attrVisitor,this._visitChildren),a=0,u=o;a<u.length;a++){(0,u[a])()}return s},e.prototype.genRemove=function(e,t,n){var r=n.id;if(this._beforeRemove(n),Fn(n,this._resizer),t.length>0){var i=t[t.length-1];if(i.Kind==R.MUT_REMOVE)return void i.Args.push(r)}t.push({When:e,Kind:R.MUT_REMOVE,Args:[r]})},e.prototype.setUpIEWorkarounds=function(){var t=this;if(ue){var n=Object.getOwnPropertyDescriptor(Node.prototype,"textContent"),r=n&&n.set;if(!n||!r)throw new Error("Missing textContent setter -- not safe to record mutations.");Object.defineProperty(Element.prototype,"textContent",Gr(Gr({},n),{set:function(e){try{for(var t=void 0;t=this.firstChild;)this.removeChild(t);if(null===e||""==e)return;var n=(this.ownerDocument||document).createTextNode(e);this.appendChild(n)}catch(t){r&&r.call(this,e)}}}))}this._setPropertyThrottle=new nn(e.ThrottleMax,e.ThrottleInterval,function(){return new tn(function(){t._setPropertyWasThrottled=!0,t.tearDownIEWorkarounds()}).start()});var i=this._setPropertyThrottle.guard(function(e){e.cssText=e.cssText});this._setPropertyThrottle.open(),this._setPropertyHook=Tt(CSSStyleDeclaration.prototype,"setProperty"),this._setPropertyHook&&this._setPropertyHook.afterSync(function(e){i(e.that)}),this._removePropertyHook=Tt(CSSStyleDeclaration.prototype,"removeProperty"),this._removePropertyHook&&this._removePropertyHook.afterSync(function(e){i(e.that)})},e.prototype.tearDownIEWorkarounds=function(){this._setPropertyThrottle&&this._setPropertyThrottle.close(),this._setPropertyHook&&this._setPropertyHook.disable(),this._removePropertyHook&&this._removePropertyHook.disable()},e.prototype.updateConsent=function(){var e=this,t=xn(this._root);t&&function(e,t){for(var n=[e];n.length;){var r=n.pop();if(r){t(r);for(var i=r.child,o=r.shadow;i;)n.push(i),i=i.next;o&&n.push(o)}}}(t,function(t){var n=t.node;t.matchesAnyConsentRule&&e.refreshElement(n)})},e.prototype.refreshElement=function(e){Mn(e)&&this._toRefresh.push(e)},e.ThrottleMax=1024,e.ThrottleInterval=1e4,e}();function Xr(e){return void 0===e&&(e=""),null===e?"":{"http://www.w3.org/1999/xlink":"xlink:","http://www.w3.org/XML/1998/namespace":"xml:","http://www.w3.org/2000/xmlns/":"xmlns:"}[e]||""}function Jr(e){return!(null==e?void 0:e.shadowRoot)||gr(e.shadowRoot)?null:xn(e.shadowRoot)}var $r=["navigationStart","unloadEventStart","unloadEventEnd","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","domLoading","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd"],Zr=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","unloadEventStart","unloadEventEnd","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd","type","redirectCount","decodedBodySize","encodedBodySize","transferSize"],ei=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","decodedBodySize","encodedBodySize","transferSize"],ti=["name","startTime","duration"],ni=["jsHeapSizeLimit","totalJSHeapSize","usedJSHeapSize"],ri=function(){function e(e,t,n){this._ctx=e,this._queue=t,this._perfSupported=!1,this._timingSupported=!1,this._getEntriesSupported=!1,this._memorySupported=!1,this._lastUsedJSHeapSize=0,this._gotLoad=!1,this._observer=null,this._observedBatches=[];var r=window.performance;r&&(this._perfSupported=!0,r.timing&&(this._timingSupported=!0),r.memory&&(this._memorySupported=!0),"function"==typeof r.getEntries&&(this._getEntriesSupported=!0),this._listeners=n.createChild())}return e.prototype.start=function(e){var t=this;this._resourceUploader=e;var n=window.performance;n&&(this._ctx.recording.inFrame||this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Performance,this._timingSupported,Y.PerformanceEntries,this._getEntriesSupported,Y.PerformanceMemory,this._memorySupported,Y.PerformanceObserver,!!window.PerformanceObserver]}),this.observe(),!this._observer&&n.addEventListener&&n.removeEventListener&&this._listeners.add(n,"resourcetimingbufferfull",!0,function(){t._queue.enqueue({Kind:R.RESOURCE_TIMING_BUFFER_FULL,Args:[]})}),this.checkMemory())},e.prototype.onLoad=function(){this._gotLoad||(this._gotLoad=!0,this._timingSupported&&(this.recordTiming(performance.timing),this.checkForNewEntries()))},e.prototype.tick=function(e){this.checkMemory(),e&&this.checkForNewEntries()},e.prototype.shutdown=function(){this._listeners&&this._listeners.clear(),this._resourceUploader=void 0;var e=[];this._observer?(this._observer.takeRecords&&(e=this._observer.takeRecords()),this._observer.disconnect()):window.performance&&window.performance.getEntries&&(e=window.performance.getEntries()),e.length>300&&(e=e.slice(0,300),this._queue.enqueue({Kind:R.RESOURCE_TIMING_BUFFER_FULL,Args:[]})),this._observedBatches.push(e),this.tick(!0)},e.prototype.observe=function(){var e=this;if(!this._observer&&this._getEntriesSupported&&window.PerformanceObserver){this._observedBatches.push(performance.getEntries()),this._observer=new window.PerformanceObserver(function(t){var n=t.getEntries();e._observedBatches.push(n)});var t=["navigation","resource","measure","mark"];window.PerformancePaintTiming&&t.push("paint"),this._observer.observe({entryTypes:t})}},e.prototype.checkMemory=function(){if(this._memorySupported&&!this._ctx.recording.inFrame){var e=performance.memory;if(e){var t=e.usedJSHeapSize-this._lastUsedJSHeapSize;(0==this._lastUsedJSHeapSize||s.mathAbs(t/this._lastUsedJSHeapSize)>.2)&&(this.addPerfEvent(z.Memory,e,ni),this._lastUsedJSHeapSize=e.usedJSHeapSize)}}},e.prototype.recordEntry=function(e){switch(e.entryType){case"navigation":this.recordNavigation(e);break;case"resource":this.recordResource(e);break;case"paint":this.recordPaint(e);break;case"measure":this.recordMeasure(e);break;case"mark":this.recordMark(e);}},e.prototype.checkForNewEntries=function(){if(this._perfSupported&&this._getEntriesSupported){var e=this._observedBatches;this._observedBatches=[];for(var t=0,n=e;t<n.length;t++)for(var r=0,i=n[t];r<i.length;r++){var o=i[r];this.recordEntry(o)}}},e.prototype.recordTiming=function(e){this.addPerfEvent(z.Timing,e,$r)},e.prototype.recordNavigation=function(e){this.addPerfEvent(z.Navigation,e,Zr,{name:"navigation"})},e.prototype.recordResource=function(e){var t=this._ctx.options.orgId;"3E938"!=t&&"GDWG7"!=t&&this.addPerfEvent(z.Resource,e,ei,{name:e.initiatorType})},e.prototype.recordPaint=function(e){this.addPerfEvent(z.Paint,e,ti)},e.prototype.recordMark=function(e){this.addPerfEvent(z.Mark,e,ti)},e.prototype.recordMeasure=function(e){this.addPerfEvent(z.Measure,e,ti)},e.prototype.addPerfEvent=function(e,t,n,r){void 0===r&&(r={});for(var i=[e],o=0,s=n;o<s.length;o++){var a=s[o],u=t[a];if(void 0===u&&(u=-1),a in r){var c=ur(u,this._ctx.options.orgId,{source:"perfEntry",type:r[a]});u===c&&this.maybeUploadResource(e,t,c),u=c}i.push(u)}this._queue.enqueue({Kind:R.PERF_ENTRY,Args:i})},e.prototype.maybeUploadResource=function(e,t,n){this._resourceUploader&&e===z.Resource&&"css"===t.initiatorType&&this._resourceUploader.uploadIfNeeded(this._ctx.window,n)},e}();function ii(e){var t=0,n={id:t++,edges:{}};return e.split("\n").forEach(function(e){if(""!=(e=e.trim())){if(0==e.indexOf("/")||e.lastIndexOf("/")==e.length-1)throw new Error("Leading and trailing slashes are not supported");var r=n,i=e.split("/");i.forEach(function(e,n){if(""===(e=e.trim()))throw new Error("Empty elements are not allowed");if("**"!=e&&"*"!=e&&-1!=e.indexOf("*"))throw new Error("Embedded wildcards are not supported");var o=null;"**"==e?(r.loop=!0,o=r):e in r.edges&&(o=r.edges[e]),o||(o={id:t++,edges:{}},r.edges[e]=o),n==i.length-1&&(o.term=!0),r=o})}}),n}var oi=ii("**"),si="__fs__redacted";function ai(e,t,n){var r;if(n){r=1==n?oi:n;try{var i=0,o=[1],a=[],u={};return u[r.id]=r,a.push(u),s.jsonStringify(e,function(e,n){var r=n&&"object"==typeof n;if(""==e&&1==o.length)return o[0]--,r&&o.push(s.objectKeys(n).length),n;var u={},c=a[a.length-1],h=!0,d=!1,l=function(e){u[e.id]=e,h=!1,e.term&&(d=!0)};for(var p in c){var f=c[p];e in f.edges&&l(f.edges[e]),"*"in f.edges&&l(f.edges["*"]),f.loop&&l(f)}for((h||!r&&!d)&&(n=si),i+=e.length+2,(i+=r?2:null===n?4:n.toString().length)>=t&&(n=void 0),o[o.length-1]--,n&&n!==si&&r&&(o.push(s.objectKeys(n).length),a.push(u));o[o.length-1]<=0;)o.pop(),a.pop();return n})}catch(e){}return"[error serializing "+e.constructor.name+"]"}}var ui=function(){function e(e){this._requestTracker=e}return e.prototype.disable=function(){this._hook&&(this._hook.disable(),this._hook=null)},e.prototype.enable=function(e){var t,n=this,r=I(e),i=null===(t=null==r?void 0:r._w)||void 0===t?void 0:t.fetch;(i||e.fetch)&&(this._hook=Tt(i?r._w:e,"fetch"),this._hook&&this._hook.afterSync(function(e){return n.recordFetch(e.that,e.result,e.args[0],e.args[1])}))},e.prototype.recordFetch=function(e,t,n,r){var i,o="GET",s="",a={};if("string"==typeof n?s=n:"url"in n?(s=n.url,o=n.method,i=n.body,n.headers&&n.headers.forEach(function(e,t){a[e]=t})):s=""+n,r){o=r.method||o;var u=r.headers;if(u)if(nt(u))for(var c=0,h=u;c<h.length;c++){var d=h[c],l=d[0],p=d[1];a[l]=p}else if("function"==typeof u.forEach)u.forEach(function(e,t,n){a[t]=e});else for(var l in u)a[l]=u[l];i=r.body||i}if(s){for(var l in s=this._requestTracker.addPendingReq(t,o,s),a)this._requestTracker.addHeader(t,l,a[l]);i&&this._requestTracker.addRequestBody(t,i)}this.instrumentResponse(t,s,!!this._requestTracker.getRspWhitelist(s))},e.prototype.instrumentResponse=function(e,t,n){var r=this;e.then(Mt.wrap(function(t){var i=(t.headers.get("content-type")||"default").split(";")[0],o=["default","text/plain","text/json","application/json"].indexOf(i)>-1;n&&o?t.clone().text().then(Mt.wrap(function(i){var o=mi(i,n),s=o[0],a=o[1];r.onComplete(e,t,s,a)}))["catch"](Mt.wrap(function(n){r.onComplete(e,t,-1,void 0)})):r.onComplete(e,t,-1,void 0)}))["catch"](Mt.wrap(function(t){r.onComplete(e,t,-1,void 0)}))},e.prototype.onComplete=function(e,t,n,r){var i=this,o=-1,s="";if("headers"in t){o=t.status;s=this.serializeFetchHeaders(t.headers,function(e){return i._requestTracker.isHeaderInResponseHeaderWhitelist(e[0])})}return this._requestTracker.onComplete(e,s,o,n,r)},e.prototype.serializeFetchHeaders=function(e,t){var n="";return e.forEach(function(e,r){r=r.toLowerCase();var i=t([r,e]);n+=r+(i?": "+e:"")+di}),n},e}(),ci=function(){function e(e){this._requestTracker=e}return e.prototype.disable=function(){this._xhrOpenHook&&(this._xhrOpenHook.disable(),this._xhrOpenHook=null),this._xhrSetHeaderHook&&(this._xhrSetHeaderHook.disable(),this._xhrSetHeaderHook=null)},e.prototype.enable=function(e){var t,n=this,r=I(e),i=(null===(t=null==r?void 0:r._w)||void 0===t?void 0:t.XMLHttpRequest)||e.XMLHttpRequest;if(i){var o=i.prototype;this._xhrOpenHook=Tt(o,"open"),this._xhrOpenHook&&this._xhrOpenHook.before(function(e){var t=e.args[0],r=e.args[1];n._requestTracker.addPendingReq(e.that,t,r),e.that.addEventListener("load",Mt.wrap(function(t){n.onComplete(e.that)})),e.that.addEventListener("error",Mt.wrap(function(t){n.onComplete(e.that)}))}),this._xhrSendHook=Tt(o,"send"),this._xhrSendHook&&this._xhrSendHook.before(function(e){var t=e.args[0];n._requestTracker.addRequestBody(e.that,t)}),this._xhrSetHeaderHook=Tt(o,"setRequestHeader"),this._xhrSetHeaderHook&&this._xhrSetHeaderHook.before(function(e){var t=e.args[0],r=e.args[1];n._requestTracker.addHeader(e.that,t,r)})}},e.prototype.onComplete=function(e){var t=this,n=this.responseBody(e),r=n[0],i=n[1],o=Ei(function(e){var t=[];return e.split(di).forEach(function(e){var n=e.indexOf(":");-1!=n?t.push([e.slice(0,n).trim(),e.slice(n+1,e.length).trim()]):t.push([e.trim(),null])}),t}(e.getAllResponseHeaders()),function(e){return t._requestTracker.isHeaderInResponseHeaderWhitelist(e[0])});return this._requestTracker.onComplete(e,o,e.status,r,i)},e.prototype.responseBody=function(e){var t=this._requestTracker.pendingReq(e);if(!t)return[-1,void 0];var n=this._requestTracker.getRspWhitelist(t.url);if(e.responseType){var r=e.response;switch(r||o("Maybe response type was different that expected."),e.responseType){case"text":return mi(e.responseText,n);case"json":return function(e,t){if(!e)return[-1,void 0];return[yi(e),ai(e,te.MaxPayloadLength,t)]}(r,n);case"arraybuffer":return function(e,t){return[e?e.byteLength:-1,t?"[ArrayBuffer]":void 0]}(r,n);case"blob":return function(e,t){return[e?e.size:-1,t?"[Blob]":void 0]}(r,n);case"document":return function(e,t){return[-1,t?"[Document]":void 0]}(0,n);}}return mi(e.responseText,n)},e}();var hi,di="\r\n",li=["a-im","accept","accept-charset","accept-encoding","accept-language","accept-datetime","access-control-request-method,","access-control-request-headers","cache-control","connection","content-length","content-md5","content-type","date","expect","forwarded","from","host","if-match","if-modified-since","if-none-match","if-range","if-unmodified-since","max-forwards","origin","pragma","range","referer","te","user-agent","upgrade","via","warning"],pi=["access-control-allow-origin","access-control-allow-credentials","access-control-expose-headers","access-control-max-age","access-control-allow-methods","access-control-allow-headers","accept-patch","accept-ranges","age","allow","alt-svc","cache-control","connection","content-disposition","content-encoding","content-language","content-length","content-location","content-md5","content-range","content-type","date","delta-base","etag","expires","im","last-modified","link","location","permanent","p3p","pragma","proxy-authenticate","public-key-pins","retry-after","permanent","server","status","strict-transport-security","trailer","transfer-encoding","tk","upgrade","vary","via","warning","www-authenticate","x-frame-options"],fi={BM7A6:["x-b3-traceid"],KD87S:["transactionid"],NHYJM:["x-att-conversationid"],GBNRN:["x-trace-id"],R16RC:["x-request-id"],DE9CX:["x-client","x-client-id","ot-baggage-original-client","x-req-id","x-datadog-trace-id","x-datadog-parent-id","x-datadog-sampling-priority"]},vi={"thefullstory.com":["x-cloud-trace-context"],TN1:["x-cloud-trace-context"],KD87S:["transactionid"],PPE96:["x-b3-traceid"],HWT6H:["x-b3-traceid"],PPEY7:["x-b3-traceid"],PPK3W:["x-b3-traceid"],NHYJM:["x-att-conversationid"],GBNRN:["x-trace-id"],NK5T9:["traceid","requestid"]},_i=function(){function e(e,t){this._ctx=e,this._queue=t,this._enabled=!1,this._tracker=new gi(e,t),this._xhr=new ci(this._tracker),this._fetch=new ui(this._tracker)}return e.prototype.isEnabled=function(){return this._enabled},e.prototype.enable=function(e){this._enabled||(this._enabled=!0,this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Ajax,!0,Y.AjaxFetch,!!e]}),this._xhr.enable(this._ctx.window),e&&this._fetch.enable(this._ctx.window))},e.prototype.disable=function(){this._enabled&&(this._enabled=!1,this._xhr.disable(),this._fetch.disable())},e.prototype.tick=function(e){this._tracker.tick(e)},e.prototype.setWatches=function(e){this._tracker.setWatches(e)},e}(),gi=function(){function e(e,t){this._ctx=e,this._queue=t,this._reqHeaderWhitelist={},this._rspHeaderWhitelist={},this._pendingReqs={},this._events=[],this._curId=1,this.addHeaderWhitelist(li,pi),this.addHeaderWhitelist(fi[e.options.orgId],vi[e.options.orgId])}return e.prototype.getReqWhitelist=function(e){var t=this.findWhitelistIndexFor(e);return t>=0&&this._reqWhitelist[t]},e.prototype.getRspWhitelist=function(e){var t=this.findWhitelistIndexFor(e);return t>=0&&this._rspWhitelist[t]},e.prototype.isHeaderInRequestHeaderWhitelist=function(e){return e in this._reqHeaderWhitelist},e.prototype.isHeaderInResponseHeaderWhitelist=function(e){return e in this._rspHeaderWhitelist},e.prototype.pushEvent=function(e){this._events.push(e)},e.prototype.setWatches=function(e){var t=this,n=[];this._reqWhitelist=[],this._rspWhitelist=[],e.forEach(function(e){n.push(e.URLRegex),t._reqWhitelist.push(Si(e.RecordReq,e.ReqWhitelist)),t._rspWhitelist.push(Si(e.RecordRsp,e.RspWhitelist))}),this._reqBodyRegex=new RegExp("("+n.join(")|(")+")")},e.prototype.addHeaderWhitelist=function(e,t){var n=this;e&&e.forEach(function(e){return n._reqHeaderWhitelist[e]=!0}),t&&t.forEach(function(e){return n._rspHeaderWhitelist[e]=!0})},e.prototype.tick=function(e){if(e){for(var t=0;t<this._events.length;t++)this._queue.enqueue({Kind:R.AJAX_REQUEST,Args:this._events[t]});this._events=[]}},e.prototype.pendingReq=function(e){var t=wi(e);return t?this._pendingReqs[t]:(o("missing xhr req id"),null)},e.prototype.deletePending=function(e){var t=wi(e);t&&delete this._pendingReqs[t]},e.prototype.addPendingReq=function(e,t,n){this.deletePending(e);var r=this._curId++;return n=function(e,t){return Qn.resolveToDocument(e,t)}(this._ctx.window,n),this._pendingReqs[r]={id:r,xhr:e,method:t,url:n,startTime:p(),headers:[],reqSize:0,reqBody:void 0},function(e,t){e._fs=t}(e,r),n},e.prototype.addHeader=function(e,t,n){var r=this.pendingReq(e);r&&r.headers.push([t,n])},e.prototype.addRequestBody=function(e,t){var n,r=this.pendingReq(e);r&&(n=this.requestBody(r.url,t),r.reqSize=n[0],r.reqBody=n[1])},e.prototype.onComplete=function(e,t,n,r,i){var o=this,s=this.pendingReq(e);if(s){this.deletePending(e);var a=p()-s.startTime,u=Ei(s.headers,function(e){return o.isHeaderInRequestHeaderWhitelist(e[0])}),c=s.reqBody||null,h=[s.method,ur(s.url,this._ctx.options.orgId,{source:"event",type:R.AJAX_REQUEST}),a,n,u,t,s.startTime,s.reqSize,r,c,i||null];this.pushEvent(h)}},e.prototype.findWhitelistIndexFor=function(e){if(this._reqBodyRegex){var t=this._reqBodyRegex.exec(e);if(t)for(var n=1;n<t.length;n++)if(void 0!==t[n])return n-1}return-1},e.prototype.requestBody=function(e,t){if(null==t)return[0,void 0];var n=this.getReqWhitelist(e),r=typeof t;if("string"==r)return function(e,t){return[e.length,bi(e,t)]}(t,n);if("object"==r){var i=r.constructor;switch(i){case String:case Object:default:return function(e,t){var n=void 0;!1!==t&&(n=ai(e,te.MaxPayloadLength,t));return[yi(e),n]}(t,n);case Blob:return function(e,t){var n=e.size,r=void 0;t&&(r="[Blob]");return[n,r]}(t,n);case ArrayBuffer:return function(e,t){var n=e.byteLength,r=void 0;t&&(r="[ArrayBuffer]");return[n,r]}(t,n);case Document:case FormData:case URLSearchParams:case ReadableStream:return[-1,n?""+i.name:void 0];}}return[-1,n?"[unknown]":void 0]},e}();function mi(e,t){return e?[e.length,bi(e,t)]:[-1,void 0]}function yi(e){try{return s.jsonStringify(e).length}catch(e){}return 0}function wi(e){return e._fs}function bi(e,t){if(0!=t)try{return ai(s.jsonParse(e),te.MaxPayloadLength,t)}catch(n){return 1==t?e.slice(0,te.MaxPayloadLength):void 0}}function Si(e,t){switch(e){default:case J.Elide:return!1;case J.Record:return!0;case J.Whitelist:try{return ii(t)}catch(e){return o("error parsing field whitelist ("+t+": "+e),!1}}}function Ei(e,t){var n="";return e.forEach(function(e){e[0]=e[0].toLowerCase();var r=t(e);n+=e[0]+(r?": "+e[1]:"")+di}),n}function Ti(e){return e?e.sheet:void 0}function ki(e){try{return e?e.cssRules||e.rules:void 0}catch(e){return}}function Ii(e,t){var n=function(e,t){var n=e;if("function"==typeof n.getPropertyCSSValue){var r=n.getPropertyCSSValue(t);if(null!=r){var i;switch(r.cssValueType){case 1:i=r;break;case 2:if(1!==r.length)return;var o=r.item(0);if(null==o)return;if(1!==o.cssValueType)return;i=o;break;default:return;}if(19===i.primitiveType){var s=Gn();hi||(hi=s.createElement("div"));var a=i.cssText;try{hi.style.cssText=t+": \""+a+"\";";var u=hi.style.getPropertyCSSValue(t);if(null==u)return;if(a!==u.cssText)return}catch(e){return}finally{hi.style.cssText=""}return"\""+a+"\""}}}}(e,t);return void 0!==n?n:e.getPropertyValue(t)}var Ci,Ri="EventQueue not defined for 'withEventQueueFor', likely caused by holding ref to callback",Ai=function(e){var t=e.ownerDocument;return t&&t.defaultView},xi=function(){function e(t,n){var r=this;this.ctx=t,this.queue=n,this.hooks=[],this.removeShims=[],this.nextSheetId=1;var i=e;this.throttle=new nn(i.ThrottleMax,i.ThrottleInterval,function(){return setTimeout(function(){r.queue.enqueue({Kind:R.FAIL_THROTTLED,Args:[Q.StyleSheetHooks]}),r.stop()})}),this.addInsert=this.throttle.guard(this.addInsert),this.addDelete=this.throttle.guard(this.addDelete)}return e.prototype.start=function(){var e=this;this.throttle.open();var t=this.ctx.window;if(t.CSSStyleSheet&&t.StyleSheet){var n,r=t.CSSStyleSheet.prototype;(n=Tt(r,"insertRule"))&&(n.afterSync(function(t){e.addInsert(t.that,t.args[0],t.args[1])}),this.hooks.push(n)),(n=Tt(r,"deleteRule"))&&(n.afterSync(function(t){e.addDelete(t.that,t.args[0])}),this.hooks.push(n)),this.removeShims.push(kt(t.StyleSheet,"disabled",function(t,n){return e.onDisableSheet(t,n)}),kt(t.Document,"adoptedStyleSheets",function(t,n){return e.onSetAdoptedStyleSheets(t)}),kt(t.ShadowRoot,"adoptedStyleSheets",function(t,n){return e.onSetAdoptedStyleSheets(t)}))}},e.prototype.onSetAdoptedStyleSheets=function(e){if(Mn(e)){var t=e.adoptedStyleSheets;if(t){for(var n=[],r=0,i=t;r<i.length;r++){var o=i[r],s=this.snapshotConstructedStylesheet(o);n.push(s),!0===o.disabled&&this.onDisableSheet(o,!0)}this.queue.enqueue({Kind:R.ADOPTED_STYLESHEETS,Args:[Mn(e),n]})}}},e.prototype.snapshotEl=function(e,t){void 0===t&&(t=0);var n=Mn(e);if(n){var r=Ti(e);r&&this.snapshot([G.Node,n],r,t)}},e.prototype.snapshotConstructedStylesheet=function(e){var t=Pi(e);if(void 0!==t)return t;var n=this.nextSheetId++;return function(e,t){e._fs=t}(e,n),this.snapshot([G.Sheet,n],e),n},e.prototype.snapshot=function(e,t,n){void 0===n&&(n=0);var r=ki(t);if(r){for(var i=[],o=n;o<r.length;o++)try{i.push(Ci(r[o]))}catch(e){i.push("html {}")}this.queue.enqueue({Kind:R.CSSRULE_INSERT,Args:[e,i,n]})}},e.prototype.addInsert=function(t,n,r){var i=Fi(t,G.Node);i&&"string"==typeof n&&(n.length>e.MaxRuleBytes&&(o("CSSRule too large, inserting dummy instead: "+n.length),n="dummy {}"),this.withEventQueueForSheet(t,function(e){return e.enqueue({Kind:R.CSSRULE_INSERT,Args:"number"==typeof r?[i,[n],r]:[i,[n]]})}))},e.prototype.addDelete=function(e,t){var n=Fi(e,G.Node);n&&this.withEventQueueForSheet(e,function(e){return e.enqueue({Kind:R.CSSRULE_DELETE,Args:[n,t]})})},e.prototype.onDisableSheet=function(e,t){var n=Fi(e,G.Node);n&&this.withEventQueueForSheet(e,function(e){return e.enqueue({Kind:R.DISABLE_STYLESHEET,Args:[n,!!t]})})},e.prototype.withEventQueueForSheet=function(e,t){if(e.ownerNode)return n=this.ctx,r=e.ownerNode,i=t,void((o=I(Ai(r)||n.window))&&"function"==typeof o._withEventQueue&&o._withEventQueue(n.recording.pageSignature(),function(e){i({enqueue:function(t){Ft(null!=e,Ri)&&e.enqueue(t)},enqueueFirst:function(t){Ft(null!=e,Ri)&&e.enqueueFirst(t)}}),e=null}));var n,r,i,o;t(this.queue)},e.prototype.stop=function(){this.throttle.close();for(var e=0,t=this.hooks;e<t.length;e++){t[e].disable()}this.hooks=[];for(var n=0,r=this.removeShims;n<r.length;n++){(0,r[n])()}this.removeShims=[]},e.ThrottleMax=1e4,e.ThrottleInterval=1e4,e.MaxRuleBytes=16384,e}(),Oi=document.createElement("div");function Mi(e,t){if(void 0===t&&(t=0),!Ft(t<=20,"No deep recursion for CSS rules"))return"html { /* Depth limit exceeded! */ }";var n=function(e){switch(e.type){case CSSRule.PAGE_RULE:var t=e.selectorText||"";return t&&ct(t,"@page")?t:"@page "+t;case CSSRule.KEYFRAME_RULE:return e.keyText;case CSSRule.STYLE_RULE:return e.selectorText;case CSSRule.MEDIA_RULE:return"@media "+e.media.mediaText;case CSSRule.KEYFRAMES_RULE:return"@keyframes "+e.name;case CSSRule.SUPPORTS_RULE:return"@supports "+e.conditionText;default:return null;}}(e);if(null==n)return e.cssText;var r=function(e,t){var n=e,r=n.style;if(r){for(var i="",o=0;o<r.length;o++){var s=r[o],a=Ii(r,s);"initial"!==a&&("\""!==(u=a)[0]&&"'"!==u[0]||u[u.length-1]!==u[0])||(i+=s+": "+a,"important"===r.getPropertyPriority(s)&&(i+=" !important"),i+="; ")}return[r.cssText,i].filter(Boolean).join("\n")}var u;var c=n.cssRules;if(!c)return null;var h="";for(o=0;o<c.length;o++)h+=Mi(c[o],t+1);return h}(e,t);return null==r?e.cssText:n+" { "+r+"} "}Oi.style.width="initial",Ci=""!=Oi.style.cssText?function(e){return e.cssText}:Mi;var Li=/^\s*$/;function Fi(e,t){var n=function(e){var t=Pi(e);if(t)return[G.Sheet,t];var n=Mn(e.ownerNode);if(n)return[G.Node,n];return}(e);if(n){var r=n[0],i=n[1];return r===t?i:n}}function Pi(e){return e._fs}var qi=function(){function e(e,t,n){this._ctx=e,this._q=t,this._listeners=n.createChild()}return e.prototype.start=function(){var e=this,t=this._ctx.window.document;this._listeners.addCustom(t,this.getFullscreenChangeEvent(),!0,function(t){e.onFullscreenChange(t)}),this._listeners.addCustom(t,this.getFullscreenErrorEvent(),!0,function(t){e.onFullscreenError(t)})},e.prototype.stop=function(){this._listeners&&this._listeners.clear()},e.prototype.onFullscreenChange=function(e){var t=this.getFullscreenElement();if(t){var n=Mn(t);Ft(null==this._previousFullscreenFSID,"Error: Received fullscreen signal but we think we are already in fullscreen?"),this._q.enqueue({Kind:R.FULLSCREEN,Args:[n,!0]}),this._previousFullscreenFSID=n}else Ft(null!=this._previousFullscreenFSID,"Error: Received fullscreen exit signal but have no previous fullscreen event?"),this._q.enqueue({Kind:R.FULLSCREEN,Args:[this._previousFullscreenFSID,!1]}),this._previousFullscreenFSID=void 0},e.prototype.onFullscreenError=function(e){this._q.enqueue({Kind:R.FULLSCREEN_ERROR,Args:[]})},e.prototype.getFullscreenElement=function(){var e=this._ctx.window.document;return e[fe(e,"fullscreenElement")]},e.prototype.getFullscreenChangeEvent=function(){return fe(this._ctx.window.document,"onfullscreenchange").slice(2)},e.prototype.getFullscreenErrorEvent=function(){return fe(this._ctx.window.document,"onfullscreenerror").slice(2)},e}(),Ui=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Ni=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Wi=function(){function e(e,t){this._queue=t,this._registry=null,this._checkedNodeTags={};var n=e.window;this._registry=n.customElements&&n.customElements.get&&n.customElements.whenDefined&&n.customElements}return e.prototype.onCustomNodeVisited=function(e){return Ui(this,void 0,et,function(){var t,n;return Ni(this,function(r){switch(r.label){case 0:if(!this._registry)return[2];if(t=e.nodeName.toLowerCase(),this._checkedNodeTags.hasOwnProperty(t))return[2];r.label=1;case 1:return r.trys.push([1,3,,4]),n=!!this._registry.get(t),this._checkedNodeTags[t]=n,[4,this._registry.whenDefined(t)];case 2:return r.sent(),this._enqueue(t),[3,4];case 3:return r.sent(),[3,4];case 4:return[2];}})})},e.prototype._enqueue=function(e){this._queue.enqueue({Kind:R.CUSTOM_ELEMENT_DEFINED,Args:[e]})},e}(),Di=function(){function e(e,t,n,r,i,o,s,a){var u=this;this._ctx=e,this._queue=t,this._keep=n,this._onFrameCreated=o,this._beforeFrameRemoved=s,this._resourceUploader=a,this._curSelection=[],this._scrollTimeouts={},this._uploadResources=!1,this._modalHooks=[],this._initialized=!1,this._wnd=e.window,this._doc=this._wnd.document,this._loc=this._wnd.location,this._hst=this._wnd.history,this._listeners=i.createChild(),this._currentUrl=this._loc.href,this._inputWatcher=new Un(function(e){u.addChangeElem(e)},function(e){return!!Mn(e)}),this._ajaxWatcher=new _i(e,t),this._perfWatcher=new ri(e,t,this._listeners),this._styleSheetWatcher=new xi(e,t),this._fullscreenWatcher=new qi(e,t,this._listeners),this._customElementWatcher=new Wi(e,t),this._mutWatcher=new Qr(e,r,!0,function(e,t){return u.visitNode(e,t)},function(e){var t=e.node;if("iframe"==on(e.node))u._beforeFrameRemoved(e.node);else if("function"==typeof t.getElementsByTagName)for(var n=t.getElementsByTagName("iframe"),r=0;r<n.length;r++){var i=n[r];u._beforeFrameRemoved(i)}},function(e,t,n){if(!function(e){return Cn(e)||Rn(e)}(e)&&u._uploadResources)for(var r=0,i=function(e,t,n){var r,i=on(e);if(Hi[t]&&Hi[t][i])return[n];if("link"==i&&"href"==t&&(r=e.getAttribute("rel"))&&r.indexOf("stylesheet")>-1)return[n];if("srcset"==t&&("img"==i||"source"==i)){return null!=n.match(/^\s*$/)?[]:n.split(",").map(function(e){return e.trim().split(/\s+/)[0]})}var o=e;if("style"==t&&o.style){var s=o.style.backgroundImage;if(!s)return[];if(s.length>300)return[];var a=[],u=void 0;for(jt.lastIndex=0;u=jt.exec(s);){var c=u[1];c&&a.push(c.trim())}return a}return[]}(e,t,n);r<i.length;r++){var o=i[r];u._resourceUploader.uploadIfNeeded(u._wnd,o)}})}return e.prototype.watchEvents=function(){var e=this;this._mutWatcher.hookMutations(),this._inputWatcher.hookEvents(),this._styleSheetWatcher.start(),this._perfWatcher.start(this._resourceUploader),this._fullscreenWatcher.start(),this._listeners.add(this._wnd,"mousemove",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseMove(t)}),this._listeners.add(this._wnd,"mousedown",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseDown(t)}),this._listeners.add(this._wnd,"mouseup",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseUp(t)}),this._listeners.add(this._wnd,"keydown",!0,function(){e.addKeyDown()}),this._listeners.add(this._wnd,"keyup",!0,function(){e.addKeyUp()}),this._listeners.add(this._wnd,"click",!0,function(t){e.isSafePointerEvent(t)&&e.addClick(t)}),this._listeners.add(this._wnd,"dblclick",!0,function(t){e.addDblClick(t)}),this._listeners.add(this._wnd,"focus",!0,function(t){e.addFocus(t)}),this._listeners.add(this._wnd,"blur",!0,function(t){e.addBlur(t)}),this._listeners.add(this._wnd,"change",!0,function(t){e.addChange(t)},!0),this._listeners.add(this._wnd,"touchstart",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHSTART),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchend",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHEND),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchmove",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHMOVE),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchcancel",!0,function(t){e.isSafePointerEvent(t)&&e.addTouchEvent(t,R.TOUCHCANCEL)}),this._listeners.add(this._wnd,"play",!0,function(t){e.addPlayEvent(t)}),this._listeners.add(this._wnd,"pause",!0,function(t){e.addPauseEvent(t)}),this._listeners.add(this._wnd,"scroll",!1,function(){e.addWindowScrollOrResize()}),this._listeners.add(this._wnd,"resize",!1,function(){e.addWindowScrollOrResize()}),this._listeners.add(this._wnd,"submit",!1,function(t){e.addFormSubmit(t)}),this._listeners.add(this._wnd,"focus",!1,function(){e.addWindowFocus()}),this._listeners.add(this._wnd,"blur",!1,function(){e.addWindowBlur()}),this._listeners.add(this._wnd,"popstate",!1,function(){e.addNavigate()}),this._listeners.add(this._wnd,"selectstart",!0,function(){e.addSelection()}),this._listeners.add(this._doc,"selectionchange",!0,function(){e.addSelection()});var t=this._wnd.visualViewport;t?(this._listeners.add(t,"scroll",!0,function(){return e.addWindowScrollOrResize()}),this._listeners.add(t,"resize",!0,function(){return e.addWindowScrollOrResize()})):this._listeners.add(this._wnd,"mousewheel",!0,function(){e.addWindowScrollOrResize()}),this._pushHook=Tt(this._hst,"pushState"),this._pushHook&&this._pushHook.afterSync(function(){return e.addNavigate()}),this._replaceHook=Tt(this._hst,"replaceState"),this._replaceHook&&this._replaceHook.afterSync(function(){return e.addNavigate()});for(var n=function(t){var n=Tt(r._wnd,t);if(!n)return"continue";r._modalHooks.push(n),n.before(function(){e._queue.enqueue({Kind:R.MODAL_OPEN,Args:[t]})}).afterSync(function(){e._queue.enqueue({Kind:R.MODAL_CLOSE,Args:[t]})})},r=this,i=0,o=ne;i<o.length;i++){n(o[i])}if("function"==typeof this._wnd.document.hasFocus&&this._queue.enqueue({Kind:this._wnd.document.hasFocus()?R.WINDOW_FOCUS:R.WINDOW_BLUR,Args:[]}),s.matchMedia)for(var a=function(t,n,r){var i=s.matchMedia(u._wnd,r);if(!i)return"continue";var o=function(){i.matches&&e._queue.enqueue({Kind:R.MEDIA_QUERY_CHANGE,Args:[t,n]})};u._listeners.add(i,"change",!0,o),o()},u=this,c=0,h=[["any-pointer","coarse","not screen and (any-pointer: fine)"],["any-pointer","fine","only screen and (any-pointer: fine)"],["any-hover","none","not screen and (any-hover: hover)"],["any-hover","hover","only screen and (any-hover: hover)"],["pointer","none","(pointer: none)"],["pointer","coarse","(pointer: coarse)"],["pointer","fine","(pointer: fine)"]];c<h.length;c++){var d=h[c];a(d[0],d[1],d[2])}this._initialized=!0},e.prototype.initResourceUploading=function(){this._resourceUploader.init(),this._uploadResources=!0},e.prototype.onDomLoad=function(){this.addDomLoaded(),this.addViewportChange(),this._mutWatcher._checkForMissingInsertions(ae)},e.prototype.onLoad=function(){var e=this,t=!1,n=Mt.wrap(function(){t||(t=!0,e._perfWatcher.onLoad(),e.addLoad(),e.addViewportChange())},"error");new tn(n,0).start(),s.requestWindowAnimationFrame&&s.requestWindowAnimationFrame(this._wnd,n)},e.prototype.ajaxWatcher=function(){return this._ajaxWatcher},e.prototype.bundleEvents=function(e){var t=this;return this._queue.enqueueSimultaneousEventsIn(function(n){return t._inputWatcher.tick(),t._perfWatcher.tick(e),t._ajaxWatcher.tick(e),t.addViewportChange(),t._mutWatcher.processMutations(n)})},e.prototype.shutdown=function(e){if(this._initialized){this._initialized=!1,this._listeners&&this._listeners.clear(),this._pushHook&&this._pushHook.disable(),this._replaceHook&&this._replaceHook.disable();for(var t=0,n=this._modalHooks;t<n.length;t++){n[t].disable()}this._modalHooks=[],this._perfWatcher.onLoad(),this._ctx.measurer.performMeasurementsNow(),this._queue.processEvents(),this._inputWatcher.shutdown(),this._mutWatcher.shutdown(),this._ajaxWatcher.disable(),this._perfWatcher.shutdown(),this._styleSheetWatcher.stop(),this._fullscreenWatcher.stop(),this._queue.shutdown(e)}},e.prototype.recordingIsDetached=function(){return this._mutWatcher.recordingIsDetached()},e.prototype.visitNode=function(e,t){var n=this;switch(e.nodeName){case"#document":case"#document-fragment":"#document-fragment"===e.nodeName&&this._listeners.add(e,"scroll",!0,function(e){return n.addScroll(Ki(e))});var r=e;try{if(!r.adoptedStyleSheets||0===r.adoptedStyleSheets.length)break}catch(e){break}t.push(function(){n._styleSheetWatcher.onSetAdoptedStyleSheets(e)});break;case"HTML":this._docElScrollListener&&this._listeners.remove(this._docElScrollListener),this._docElScrollListener=this._listeners.add(e,"scroll",!0,function(e){n.addScroll(Ki(e))});break;case"BODY":this.addViewportChange(),this.addSelection();break;case"INPUT":case"TEXTAREA":case"SELECT":this._inputWatcher.addInput(e);break;case"FRAME":case"IFRAME":this._onFrameCreated(e);break;case"VIDEO":case"AUDIO":e.paused||this._queue.enqueue({Kind:R.PLAY,Args:[Mn(e)]});break;case"LINK":if(!(i=e.sheet))break;!0===i.disabled&&this._styleSheetWatcher.onDisableSheet(i,!0);break;case"STYLE":var i,o=e;if(!(i=o.sheet))break;!0===i.disabled&&this._styleSheetWatcher.onDisableSheet(i,!0);var s=function(e){var t=e.textContent||"";if(!(t.length>5e5)){var n=ki(Ti(e));if(n){if(n.length>0&&Li.test(t))return 0;var r,i=Gn();ae?(r=i.createElement("style")).textContent=e.textContent:r=i.importNode(e,!0),i.head.appendChild(r);var o=ki(Ti(r));if(i.head.removeChild(r),o)return n.length>o.length?o.length:void 0}}}(o);void 0!==s&&t.push(function(){n._styleSheetWatcher.snapshotEl(o,s)});break;default:"#"!==e.nodeName[0]&&e.nodeName.indexOf("-")>-1&&this._customElementWatcher.onCustomNodeVisited(e);}if("scrollLeft"in e&&"scrollTop"in e){var a=e;this._ctx.measurer.requestMeasureTask(function(){0==a.scrollLeft&&0==a.scrollTop||n.addScroll(a)})}},e.prototype.isSafePointerEvent=function(e){var t=Ki(e);return!!Mn(t)&&!Cn(t)},e.prototype.addMouseMove=function(e){var t=Mn(Ki(e));this._queue.enqueue({Kind:R.MOUSEMOVE,Args:t?[e.clientX,e.clientY,t]:[e.clientX,e.clientY]})},e.prototype.addMouseDown=function(e){this._queue.enqueue({Kind:R.MOUSEDOWN,Args:[e.clientX,e.clientY]})},e.prototype.addMouseUp=function(e){this._queue.enqueue({Kind:R.MOUSEUP,Args:[e.clientX,e.clientY]})},e.prototype.addTouchEvent=function(e,t){if(void 0!==e.changedTouches)for(var n=0;n<e.changedTouches.length;++n){var r=e.changedTouches[n];isNaN(parseInt(r.identifier))&&(r.identifier=0);var i=[r.identifier,r.clientX,r.clientY];this._queue.enqueue({Kind:t,Args:i})}},e.prototype.addPlayEvent=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.PLAY,Args:[t]})},e.prototype.addPauseEvent=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.PAUSE,Args:[t]})},e.prototype.addWindowFocus=function(){this._queue.enqueue({Kind:R.WINDOW_FOCUS,Args:[]})},e.prototype.addWindowBlur=function(){this._queue.enqueue({Kind:R.WINDOW_BLUR,Args:[]})},e.prototype.maybeAddValueChange=function(){var e=ji(this._doc);e&&this._inputWatcher.onChange(e)},e.prototype.addKeyDown=function(){var e=ji(this._doc);e&&!Ln(e)||(this.maybeAddValueChange(),this._queue.enqueue({Kind:R.KEYDOWN,Args:[]}))},e.prototype.addKeyUp=function(){var e=ji(this._doc);e&&!Ln(e)||(this.maybeAddValueChange(),this._queue.enqueue({Kind:R.KEYUP,Args:[]}))},e.prototype.addViewportChange=function(){var e=this;this._ctx.measurer.requestMeasureTask(function(){return e._addViewportChangeImpl()})},e.prototype._addViewportChangeImpl=function(){var e=this.getWindowScrollingElement(),t=Mn(e);if(t){var n=function(e,t){var n=e.documentElement.getBoundingClientRect(),r=t.scrollWidth,i=t.scrollHeight;return{width:s.mathMax(n.width,r),height:s.mathMax(n.height,i)}}(this._wnd.document,e);Wt(n,this._curDocSize)||(this._curDocSize=n,this._queue.enqueue({Kind:R.RESIZE_DOCUMENT,Args:[n.width,n.height]}));var r,i,o,a,u=Yt(this._wnd,this._curLayoutViewport),c=function(e,t){return"visualViewport"in e?e.visualViewport:(void 0===t&&(t=Yt(e)),new Gt(e,t))}(this._wnd,u);u.hasKnownPosition?(Nt(u,this._curLayoutViewport)||this._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[t,u.pageLeft,u.pageTop]}),r=c,(i=this._curVisualViewport)&&r.offsetLeft==i.offsetLeft&&r.offsetTop==i.offsetTop||this._queue.enqueue({Kind:R.SCROLL_VISUAL_OFFSET,Args:[t,c.offsetLeft,c.offsetTop]})):Nt(c,this._curVisualViewport)||this._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[t,c.pageLeft,c.pageTop]}),function(e,t){return t&&e.width==t.width&&e.height==t.height&&e.clientWidth==t.clientWidth&&e.clientHeight==t.clientHeight}(u,this._curLayoutViewport)||(u.width==u.clientWidth&&u.height==u.clientHeight?this._queue.enqueue({Kind:R.RESIZE_LAYOUT,Args:[u.clientWidth,u.clientHeight]}):this._queue.enqueue({Kind:R.RESIZE_LAYOUT,Args:[u.clientWidth,u.clientHeight,u.width,u.height]})),Wt(c,this._curVisualViewport)||this._queue.enqueue({Kind:R.RESIZE_VISUAL,Args:[c.width,c.height]}),this._curLayoutViewport=((a=Dt(o=u)).clientWidth=o.clientWidth,a.clientHeight=o.clientHeight,a),this._curVisualViewport=function(e){var t=Dt(e);return t.offsetLeft=e.offsetLeft,t.offsetTop=e.offsetTop,t}(c)}},e.prototype.doWorkInScrollTimeout=function(e,t){var n=this;e in this._scrollTimeouts||(this._scrollTimeouts[e]=t,new tn(function(){n._ctx.measurer.requestMeasureTask(function(){if(e in n._scrollTimeouts){var t=n._scrollTimeouts[e];delete n._scrollTimeouts[e],t()}})},te.ScrollSampleInterval).start())},e.prototype._fireScrollTimeouts=function(){for(var e in this._scrollTimeouts)this._scrollTimeouts[e](),delete this._scrollTimeouts[e];this._scrollTimeouts=[]},e.prototype.getWindowScrollingElement=function(){return this._doc.scrollingElement||this._doc.body||this._doc.documentElement},e.prototype.addWindowScrollOrResize=function(){var e=this;this.doWorkInScrollTimeout(1,function(){return e.addViewportChange()})},e.prototype.addScroll=function(e){var t=this,n=Mn(e);n&&this.doWorkInScrollTimeout(n,function(){if(Mn(e)===n){var r=e;n&&"number"==typeof r.scrollLeft&&t._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[n,r.scrollLeft,r.scrollTop]})}})},e.prototype.addDomLoaded=function(){this._queue.enqueue({Kind:R.DOMLOADED,Args:[]})},e.prototype.addLoad=function(){this._queue.enqueue({Kind:R.LOAD,Args:[]})},e.prototype.addNavigate=function(){var e=this._loc.href;this._currentUrl!=e&&(this._currentUrl=e,this._keep.onNavigate(e),this._queue.enqueue({Kind:R.NAVIGATE,Args:[ur(this._loc.href,this._ctx.options.orgId,{source:"event",type:R.NAVIGATE}),this._doc.title]}))},e.prototype.addClick=function(e){var t=Ki(e),n=Mn(t);if(n){var r=0,i=0,o=0,s=0;if(t&&t.getBoundingClientRect){var a=t.getBoundingClientRect();r=a.left,i=a.top,o=a.width,s=a.height}var u=xn(t);this._keep.onClick(u),this._queue.enqueue({Kind:R.CLICK,Args:[n,e.clientX,e.clientY,r,i,o,s]})}},e.prototype.addDblClick=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.DBL_CLICK,Args:[t]})},e.prototype.addFormSubmit=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.FORM_SUBMIT,Args:[t]})},e.prototype.addFocus=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.FOCUS,Args:[t]})},e.prototype.addBlur=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.BLUR,Args:[t]})},e.prototype.addChange=function(e){this._inputWatcher.onChange(Ki(e))},e.prototype.addChangeElem=function(e){var t=Ln(e);if(t){var n=Kn(e);Rn(e)&&(n=er(n)),this._queue.enqueue({Kind:R.VALUECHANGE,Args:[t,n]})}},e.prototype.addSelection=function(){var e=this;this._ctx.measurer.requestMeasureTask(function(){var t;try{t=e.selectionArgs()}catch(e){return}for(var n=!1,r=0;r<4;r++)if(e._curSelection[r]!==t[r]){n=!0;break}n&&(e._curSelection=t,e._queue.enqueue({Kind:R.SELECT,Args:t}))})},e.prototype.selectionArgs=function(){if(!this._wnd.getSelection)return[];var e=this._wnd.getSelection();if(!e)return[];if("None"==e.type)return[];if("Caret"==e.type){var t=Mn(e.anchorNode);return t?[t,e.anchorOffset]:[]}if(!e.anchorNode||!e.focusNode)return[];var n=Bi(e.anchorNode,e.anchorOffset),r=n[0],i=n[1],o=Bi(e.focusNode,e.focusOffset),s=o[0],a=o[1],u=Boolean(r.compareDocumentPosition(s)&Node.DOCUMENT_POSITION_FOLLOWING),c=u?[r,s]:[s,r],h=c[0],d=c[1],l=u?[i,a]:[a,i],p=l[0],f=l[1];for(Mn(h)||(p=0);h&&!Mn(h)&&h!=d;)h=ut(h)||h.parentNode;for(Mn(d)||(f=0);d&&!Mn(d)&&d!=h;)d=vt(d)||d.parentNode;if(h==d&&p==f)return[];var v=Mn(h),_=Mn(d);return h&&d&&v&&_?[v,p,_,f,u]:[]},e}();function Bi(e,t){if(!e.firstChild)return[e,t];e=e.firstChild;for(var n=0;n<t-1;n++){var r=ut(e);if(!r)return[e,0];e=r}return[e,0]}var Hi={src:{img:!0,embed:!0},href:{use:!0,image:!0},data:{object:!0}};function ji(e){for(var t=e.activeElement;t&&t.shadowRoot;){var n=t.shadowRoot.activeElement;if(!n)return t;t=n}return t}function Ki(e){if(e.composed&&e.target){var t=e.target;if(t.nodeType==pn&&t.shadowRoot){var n=e.composedPath();if(n.length>0)return n[0]}}return e.target}var Vi=/^\s*at .*(\S+\:\d+|native|(<anonymous>))/m,zi=/^(eval@)?(\[native code\])?$/;function Yi(e){if(!e||"string"!=typeof e.stack)return[];var t=e;return t.stack.match(Vi)?t.stack.split("\n").filter(function(e){return!!e.match(Vi)}).map(function(e){e.indexOf("(eval ")>-1&&(e=e.replace(/eval code/g,"eval").replace(/(\(eval at [^\()]*)|(\)\,.*$)/g,""));var t=e.replace(/^\s+/,"").replace(/\(eval code/g,"(").replace(/\(native code\)/,"").split(/\s+/).slice(1),n=Qi(t.pop());return Gi(t.join(" "),["eval","<anonymous>"].indexOf(n[0])>-1?"":n[0],n[1],n[2])}):function(e){return e.split("\n").filter(function(e){return!e.match(zi)}).map(function(e){if(e.indexOf(" > eval")>-1&&(e=e.replace(/ line (\d+)(?: > eval line \d+)* > eval\:\d+\:\d+/g,":$1")),-1===e.indexOf("@")&&-1===e.indexOf(":"))return[e,"",-1,-1];var t=e.split("@"),n=Qi(t.pop());return Gi(t.join("@"),n[0],n[1],n[2])})}(t.stack)}function Gi(e,t,n,r){return[e||"",t||"",parseInt(n||"-1"),parseInt(r||"-1")]}function Qi(e){if(!e||-1===e.indexOf(":"))return["","",""];var t=/(.+?)(?:\:(\d+))?(?:\:(\d+))?$/.exec(e.replace(/[\(\)]/g,""));return t?[t[1]||"",t[2]||"",t[3]||""]:["","",""]}var Xi=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r},Ji=function(){function e(e,t,n){this._queue=t,this._enabled=!1,this._overflow=!1,this._total=0,this._hooks=[],this._wnd=e.window,this._listeners=n.createChild();var r=e.options.orgId;this.orgId=r,this.maxLogsPerPage="P2C"==r||"ESHFX"==r||"6HFXR"==r||"A0W9W"==r||"5V0ND"==r?3e3:"GF6RM"==r?1600:te.MaxLogsPerPage}return e.prototype._overflowMsg=function(){return"\"[received more than "+this.maxLogsPerPage+" messages]\""},e.prototype.enable=function(){var e=this;if(this._listeners.add(this._wnd,"error",!0,function(t){return e.addError(t)}),this._listeners.add(this._wnd,"unhandledrejection",!0,function(t){e.addLog("error",["Uncaught (in promise)",t.reason])},!0),!this._enabled)if(this._enabled=!0,this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Console,!0]}),this._wnd.console)for(var t=function(t){var r=Tt(n._wnd.console,t);if(!r)return"continue";r.before(function(n){var r=n.args;return e.addLog(t,r)}),n._hooks.push(r)},n=this,r=0,i=["log","info","warn","error"];r<i.length;r++){t(i[r])}else this.addLog("log",["NOTE: Log messages cannot be captured on IE9"])},e.prototype.isEnabled=function(){return this._enabled},e.prototype.disable=function(){var e;if(this._listeners&&this._listeners.clear(),this._enabled)for(this._enabled=!1;e=this._hooks.pop();)e.disable()},e.prototype.logEvent=function(e,t){if(!this.checkOverflow())return null;var n;n=-1==["log","info","warn","error","debug","_fs_debug"].indexOf(e)?["log",$i(e,1e3,this.orgId)]:[e];for(var r=0;r<t.length;++r)n.push($i(t[r],1e3,this.orgId));return{Kind:R.LOG,Args:n}},e.prototype.addLog=function(e,t){var n=this.logEvent(e,t);n&&this._queue.enqueue(n)},e.prototype.addError=function(e){var t=e.message,n=e.filename,r=e.lineno;(t||n||r)&&this.checkOverflow()&&("object"==typeof t&&(t=$i(t,1e3,this.orgId)),"object"==typeof n&&(n=$i(n,100,this.orgId,!1)),"object"==typeof r&&(r=-1),this._queue.enqueue({Kind:R.ERROR,Args:Xi([t,n,r],Yi(e.error))}))},e.prototype.checkOverflow=function(){return!this._overflow&&(this._total==this.maxLogsPerPage?(this._queue.enqueue({Kind:R.LOG,Args:["warn",this._overflowMsg()]}),this._overflow=!0,!1):(this._total++,!0))},e}();function $i(e,t,n,r){void 0===r&&(r=!0);try{var i={tokens:[],opath:[],cyclic:Zi(e,t/4)};!function e(t,n,r,i){if(n<1)return 0;var o=t&&t.constructor==Date?eo(t):function(e){return"object"==typeof Node?e instanceof Node:e&&"object"==typeof e&&e.nodeType>0&&"string"==typeof e.nodeName}(t)?function(e){return e.toString()}(t):void 0===t?"undefined":"object"!=typeof t||null==t?t:t instanceof Error?t.stack||t.name+": "+t.message:void 0;if(void 0!==o)return void 0===(o=s.jsonStringify(o))?0:("\""==o[0]&&(o=to(o,n,"...\"")),o.length<=n?(i.tokens.push(o),o.length):0);if(i.cyclic){i.opath.splice(r);var a=i.opath.lastIndexOf(t);if(a>-1){var u="<Cycle to ancestor #"+(r-a-1)+">";return u="\""+to(u,n-2)+"\"",i.tokens.push(u),u.length}i.opath.push(t)}var c=n,h=function(e){return c>=e.length&&(c-=e.length,i.tokens.push(e),!0)},d=function(e){","==i.tokens[i.tokens.length-1]?i.tokens[i.tokens.length-1]=e:h(e)};if(c<2)return 0;if(nt(t)){h("[");for(var l=0;l<t.length&&c>0;l++){var p=e(t[l],c-1,r+1,i);if(c-=p,0==p&&!h("null"))break;h(",")}d("]")}else{h("{");var f=Ze(t);for(l=0;l<f.length&&c>0;l++){var v=f[l],_=t[v];if(!h("\""+v+"\":"))break;if(0==(p=e(_,c-1,r+1,i))){i.tokens.pop();break}c-=p,h(",")}d("}")}return n==1/0?1:n-c}(e,t,0,i);var o=i.tokens.join("");return r?function(e,t){var n=t.replace(vr,"<email>");return n=n.replace(_r,function(t){return ur(t,e,{source:"log",type:"debug"})})}(n,o):o}catch(e){return mt(e)}}function Zi(e,t){var n=0;try{s.jsonStringify(e,function(e,r){if(n++>t)throw"break";if("object"==typeof r)return r})}catch(e){return"break"!=e}return!1}var eo=function(e){return isNaN(e)?"Invalid Date":e.toUTCString()},to=function(e,t,n){return void 0===n&&(n="..."),e.length<=t?e:e.length<=n.length||t<=n.length?e.substring(0,t):e.substring(0,t-n.length)+n};var no=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r},ro=function(){function e(e,t){this._q=e,this._valueIndices=t,this._evts=[],this._curveEndMs=0}return e.prototype.add=function(e){0==this._evts.length?(this._q.push(e),this._curveEndMs=e.When):e.When>this._curveEndMs&&(this._curveEndMs=e.When),this._evts.push(e)},e.prototype.finish=function(e,t){void 0===t&&(t=[]);var n=this._evts.length;if(n<=1)return!1;for(var r=no([this._curveEndMs],t),i=this._evts[0].When,o=this._evts[n-1].When,s=0;s<this._valueIndices.length;++s){var a=this._valueIndices[s],u=this._evts[0].Args[a],c=(this._evts[1].When-i)/(o-i),h=(this._evts[1].Args[a]-u)/c,d=this._evts[n-2].Args[a],l=(o-this._evts[n-2].When)/(o-i),p=this._evts[n-1].Args[a],f=(p-d)/l;r.push(u,p,h,f)}return this._evts[0].Kind=e,this._evts[0].Args=r,!0},e.prototype.evts=function(){return this._evts},e}();var io=function(){function e(e,t,n,r){void 0===n&&(n=function(){return[]}),void 0===r&&(r=en),this._ctx=e,this._transport=t,this._gatherExternalEvents=n,this._tickerFactory=r,this._recordingDisabled=!1,this._activeSimultaneousEventsTransactions=0,this._lastWhen=-1,this._gotUnload=!1,this._eventQueue=[],this._sampleCurvesTicker=new this._tickerFactory(te.CurveSamplingInterval),this._processMutationsTicker=new this._tickerFactory(te.MutationProcessingInterval)}return e.prototype.startPipeline=function(e){var t,n,r=this;this._recordingDisabled||this._pipelineStarted||(this._pipelineStarted=!0,this._frameId=null!==(t=e.frameId)&&void 0!==t?t:0,this._parentIds=null!==(n=e.parentIds)&&void 0!==n?n:[],this.processEvents(),this._processMutationsTicker.start(function(){r.processEvents()}),this._sampleCurvesTicker.start(function(){r.processEvents(!0)}),this._transport.startPipeline(e))},e.prototype.enqueueSimultaneousEventsIn=function(e){0===this._activeSimultaneousEventsTransactions&&(this._lastWhen=this._ctx.time.now());try{return this._activeSimultaneousEventsTransactions++,e(this._lastWhen)}finally{this._activeSimultaneousEventsTransactions--,this._activeSimultaneousEventsTransactions<0&&(this._activeSimultaneousEventsTransactions=0)}},e.prototype.enqueue=function(e){var t=this._activeSimultaneousEventsTransactions>0?this._lastWhen:this._ctx.time.now();this.enqueueAt(t,e),Zt.checkForBrokenSchedulers()},e.prototype.enqueueAt=function(e,t){if(!this._recordingDisabled){e<this._lastWhen&&(e=this._lastWhen),this._lastWhen=e;var n=t;n.When=e,this._eventQueue.push(n)}},e.prototype.enqueueFirst=function(e){if(this._eventQueue.length>0){var t=e;t.When=this._eventQueue[0].When,this._eventQueue.unshift(t)}else this.enqueue(e)},e.prototype.addUnload=function(e){this._gotUnload||(this._gotUnload=!0,this.enqueue({Kind:R.UNLOAD,Args:[e]}),this.singSwanSong())},e.prototype.shutdown=function(e){this._flush(),this.addUnload(e),this._flush(),this._recordingDisabled=!0,this.stopPipeline()},e.prototype._flush=function(){this.processEvents(),this._transport.flush()},e.prototype.singSwanSong=function(){this._recordingDisabled||(this.processEvents(),this._transport.singSwanSong())},e.prototype.rebaseIframe=function(e){for(var t=0,n=this._eventQueue.length;t<n;t++){var r=this._eventQueue[t],i=r.When+this._ctx.time.startTime()-e;i<0&&(i=0),r.When=i}},e.prototype.processEvents=function(e){if(this._pipelineStarted){var t=this._eventQueue;this._eventQueue=[];var n=function(e){if(0==e.length)return e;for(var t,n=[],r=new ro(n,[0,1]),i={},o={},s={},a=0,u=e;a<u.length;a++){var c=u[a];switch(c.Kind){case R.MOUSEMOVE:r.add(c);break;case R.TOUCHMOVE:(l=c.Args[0])in i||(i[l]=new ro(n,[1,2])),i[l].add(c);break;case R.SCROLL_LAYOUT:(l=c.Args[0])in o||(o[l]=new ro(n,[1,2])),o[l].add(c);break;case R.SCROLL_VISUAL_OFFSET:(l=c.Args[0])in s||(s[l]=new ro(n,[1,2])),s[l].add(c);break;case R.RESIZE_VISUAL:t||(t=new ro(n,[0,1])),t.add(c);break;default:n.push(c);}}if(r.finish(R.MOUSEMOVE_CURVE)){var h=r.evts();if(h.length>0){var d=h[h.length-1].Args[2];if(d)h[0].Args[9]=d}}for(var l in o){o[p=parseInt(l)].finish(R.SCROLL_LAYOUT_CURVE,[p])}for(var l in s){s[p=parseInt(l)].finish(R.SCROLL_VISUAL_OFFSET_CURVE,[p])}for(var l in i){var p;i[p=parseInt(l)].finish(R.TOUCHMOVE_CURVE,[p])}return t&&t.finish(R.RESIZE_VISUAL_CURVE),n}(t);e||(n=n.concat(this._gatherExternalEvents(0!=n.length))),this.ensureFrameIds(n),0!=n.length&&this._transport.enqueueEvents(this._ctx.recording.pageSignature(),n)}},e.prototype.ensureFrameIds=function(e){if(this._frameId)for(var t=this._parentIds,n=t&&t.length>0,r=0;r<e.length;++r){var i=e[r];i.FId||(i.FId=this._frameId),n&&!i.PIds&&(i.PIds=t)}},e.prototype.stopPipeline=function(){this._pipelineStarted&&(this._sampleCurvesTicker.stop(),this._processMutationsTicker.stop(),this._eventQueue=[],this._transport.stopPipeline())},e}();function oo(){var e,t;return{promise:new et(function(n,r){e=n,t=r}),resolve:e,reject:t}}function so(e){return new et(function(t){s.setWindowTimeout(window,ie(t),e)})}var ao=function(){function e(e){void 0===e&&(e=4),this.hashCount=e,this.idx=0,this.hashMask=e-1,this.reset()}return e.prototype.reset=function(){this.idx=0,this.hash=[];for(var e=0;e<this.hashCount;++e)this.hash.push(2166136261)},e.prototype.write=function(e){for(var t=this.hashMask,n=this.idx,r=0;r<e.length;r++)this.hash[n]=this.hash[n]^e[r],this.hash[n]+=(this.hash[n]<<1)+(this.hash[n]<<4)+(this.hash[n]<<7)+(this.hash[n]<<8)+(this.hash[n]<<24),n=n+1&t;this.idx=n},e.prototype.writeAscii=function(e){for(var t=this.hashMask,n=this.idx,r=0;r<e.length;r++)this.hash[n]=this.hash[n]^e.charCodeAt(r),this.hash[n]+=(this.hash[n]<<1)+(this.hash[n]<<4)+(this.hash[n]<<7)+(this.hash[n]<<8)+(this.hash[n]<<24),n=n+1&t;this.idx=n},e.prototype.sum=function(){var e,t=this.sumAsHex();return e=t.replace(/\r|\n/g,"").replace(/([\da-fA-F]{2}) ?/g,"0x$1 ").replace(/ +$/,"").split(" ").map(Number),lo(String.fromCharCode.apply(window,e))},e.prototype.sumAsHex=function(){for(var e="",t=0;t<this.hashCount;++t)e+=("00000000"+(this.hash[t]>>>0).toString(16)).slice(-8);return e},e}();function uo(e){var t=new ao(1);return t.writeAscii(e),t.sumAsHex()}function co(e){var t=new Uint8Array(e);return lo(String.fromCharCode.apply(null,t))}var ho="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function lo(e){var t;return(null!==(t=window.btoa)&&void 0!==t?t:po)(e).replace(/\+/g,"-").replace(/\//g,"_")}function po(e){for(var t=String(e),n=[],r=0,i=0,o=0,s=ho;t.charAt(0|o)||(s="=",o%1);n.push(s.charAt(63&r>>8-o%1*8))){if((i=t.charCodeAt(o+=.75))>255)throw new Error("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");r=r<<8|i}return n.join("")}var fo=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},vo=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},_o=1e4,go=25,mo=100;function yo(e,t,n,r){return void 0===r&&(r=new ao),fo(this,void 0,et,function(){var i,o,s,a;return vo(this,function(u){switch(u.label){case 0:i=e.now(),o=n.byteLength,s=0,u.label=1;case 1:return s<o?e.now()-i>go?[4,t(mo)]:[3,3]:[3,5];case 2:u.sent(),i=e.now(),u.label=3;case 3:a=new Uint8Array(n,s,Math.min(o-s,_o)),r.write(a),u.label=4;case 4:return s+=_o,[3,1];case 5:return[2,{hash:r.sum(),hasher:r}];}})})}var wo=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},bo=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},So=6e6,Eo=function(){function e(e,t,n,r,i){void 0===r&&(r=window.FormData),void 0===i&&(i=tn),this.ctx=e,this.queue=t,this.protocol=n,this.FormDataCtr=r,this.Timeout=i,this.started={},this.byUrl={},this.batchReady=!1,this.existsBatch=[],this._sentToBugsnag=!1}return e.prototype.init=function(){this.FormDataCtr&&this.main()["catch"](function(e){Mt.sendToBugsnag(e,"error")})},e.prototype.main=function(){return wo(this,void 0,et,function(){var e,t,n,r,i,s,a,u,c,h,d,l,p,f,v,_,g,m,y,w,b,S,E,T,k,I;return bo(this,function(C){switch(C.label){case 0:e=this.ctx.options.orgId,C.label=1;case 1:return[4,this.getBatch()];case 2:for(t=C.sent(),n={fsnv:[],sha1:[]},r=0,i=t;r<i.length;r++)s=i[r],a=s.hash,v=s.hashAlgorithm,n[v].push(a);for(u={},c=0,h=t;c<h.length;c++)d=h[c],u[d.hash]=d;l=void 0,C.label=3;case 3:return C.trys.push([3,5,,6]),[4,this.protocol.queryResources({OrgId:e,HashesByAlgorithm:n})];case 4:return l=C.sent(),[3,6];case 5:return o("/rec/queryResources failed with status "+C.sent()),[3,1];case 6:for(p=0,f=l;p<f.length;p++)if((m=f[p]).Found&&m.CanonicalHash){if(!(y=u[m.QueryHash])){this.sendOnceToBugsnag("No resource found for hash");continue}if(y.blob=y.stringData=null,"fsnv"!==(v=m.CanonicalHash.Algorithm)){this.sendOnceToBugsnag("Unrecognized canonical hash type",{hashAlgorithm:v});continue}this.queue.enqueue({Kind:R.SYS_RESOURCEHASH,Args:["url",y.url,m.CanonicalHash.Hash]})}else;_=0,g=l,C.label=7;case 7:if(!(_<g.length))return[3,12];if((m=g[_]).Found&&m.CanonicalHash)return[3,11];if(null==(y=u[m.QueryHash]))return this.sendOnceToBugsnag("Server told us to upload a hash we don't have"),[3,11];if(w=y.url,b=y.contentType,!(S=y.blob||y.stringData))return this.sendOnceToBugsnag("Missing resource contents"),[3,11];if(E=y.blob||new Blob([S],{type:b}),null==S)return this.sendOnceToBugsnag("Tried to re-upload a resource"),[3,11];if((T=new this.FormDataCtr).append("orgId",e),T.append("baseUrl",w),"fsnv"===m.QueryAlgorithm)T.append("fsnvHash",m.QueryHash);else{if("sha1"!==m.QueryAlgorithm)return this.sendOnceToBugsnag("Unrecognized hash type from resource query",{hashAlgorithm:m.QueryAlgorithm}),[3,11];T.append("sha1Hash",m.QueryHash)}T.append("contents",E,"blob"),y.blob=y.stringData=null,C.label=8;case 8:return C.trys.push([8,10,,11]),[4,this.protocol.uploadResource(T)];case 9:return k=C.sent(),"fsnv"!=(I=JSON.parse(k)).Algorithm&&this.sendOnceToBugsnag("Unexpected hash type from resource upload",{hashAlgorithm:I.Algorithm}),this.queue.enqueue({Kind:R.SYS_RESOURCEHASH,Args:["url",w,I.Hash]}),[3,11];case 10:return C.sent(),o("Server error uploading resource"),[3,11];case 11:return _++,[3,7];case 12:return[3,1];case 13:return[2];}})})},e.prototype.getBatch=function(){var e=this,t=oo(),n=t.resolve,r=t.promise,i=function(){e.popBatch=null,e.batchReady=!1;var t=e.existsBatch;e.existsBatch=[],n(t)};return this.batchReady?i():this.popBatch=i,r},e.prototype.uploadIfNeeded=function(e,t){return wo(this,void 0,et,function(){var n,r,i=this;return bo(this,function(o){switch(o.label){case 0:return this.FormDataCtr?this.started[t]?[2]:function(e,t){var n=Xn(Jn(e),t);switch(n.protocol){case"blob:":return!0;case"http:":case"https:":switch(n.hostname){case"localhost":case"127.0.0.1":case"[::1]":return e.location.protocol===n.protocol&&e.location.host===n.host;case"::1":var r=n.port?"[::1]:"+n.port:"[::1]";return e.location.protocol===n.protocol&&e.location.host===r;default:return!1;}default:return!1;}}(e,t)?(this.started[t]=!0,[4,this.processResource(t)]):[2]:[2];case 1:return(n=o.sent())?(r=0==this.existsBatch.length,this.existsBatch.push(n),r&&new this.Timeout(function(){i.batchReady=!0,i.popBatch&&i.popBatch()},50).start(),[2]):[2];}})})},e.prototype.processResource=function(e){return wo(this,void 0,et,function(){var t,n,r,i,o;return bo(this,function(s){switch(s.label){case 0:return this.byUrl[e]?[2,this.byUrl[e]]:[4,To(e,this.ctx.options.orgId)];case 1:return(t=s.sent())?[4,ko(this.ctx,t.buffer)]:[2,null];case 2:return n=s.sent(),r=n.hash,i=n.algorithm,o={hash:r,hashAlgorithm:i,url:e,blob:t.blob,contentType:t.contentType},this.byUrl[o.url]=o,[2,o];}})})},e.prototype.sendOnceToBugsnag=function(e,t){this._sentToBugsnag||(this._sentToBugsnag=!0,o(e),Mt.sendToBugsnag(e,"error",t))},e}();function To(e,t){var n=oo(),r=n.resolve,i=n.promise,s=new XMLHttpRequest;return"string"!=typeof s.responseType?(r(null),i):(s.open("GET",e),s.responseType="blob",s.onerror=function(){r(null)},s.onload=function(){if(200!=s.status)return o("Error loading blob resource "+ur(e,t,{source:"log",type:"debug"})),void r(null);var n=s.response;if((n.size||n.length)>So){var i=ur(e,t,{source:"log",type:"bugsnag"});return Mt.sendToBugsnag("Size of blob resource exceeds limit","warning",{url:i,MaxResourceSizeBytes:So}),void r(null)}(function(e){var t=oo(),n=t.resolve,r=t.promise,i=new FileReader;return i.readAsArrayBuffer(e),i.onload=function(){n(i.result)},i.onerror=function(e){Mt.sendToBugsnag(e,"error"),n(null)},r})(n).then(function(e){r(e?{buffer:e,blob:n,contentType:n.type}:null)})},s.send(),i)}function ko(e,t){var n,r;return wo(this,void 0,et,function(){var i;return bo(this,function(o){switch(o.label){case 0:return i=e.window,(null===(r=null===(n=i.crypto)||void 0===n?void 0:n.subtle)||void 0===r?void 0:r.digest)?[4,i.crypto.subtle.digest({name:"sha-1"},t)]:[3,2];case 1:return[2,{hash:co(o.sent()),algorithm:"sha1"}];case 2:return[4,yo(e.time,so,t)];case 3:return[2,{hash:o.sent().hash,algorithm:"fsnv"}];}})})}var Io=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Co=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Ro=function(){function e(e){this._byteCount=0,this._scheme=e.options.scheme,this._recHost=e.options.recHost}return e.prototype.page=function(e,t,n){this.post("/rec/page",gt(e),function(e){try{t(wt(e))}catch(e){n(0)}},function(e,t){if(t)try{return n(0,wt(t))}catch(e){}n(0)})},e.prototype.bundle=function(e){var t=gt(e.bundle);this._byteCount+=t.length,o("total bytes written: "+this._byteCount);var n=xo(e.bundle.Seq,e);return this.post(n,t,function(t){try{e.win(wt(t))}catch(n){Mt.sendToBugsnag("Failed to JSON parse /rec/bundle response","error",{rsp:t,error:n.toString()}),e.lose(0)}},e.lose),this._byteCount},e.prototype.bundleBeacon=function(e){return Mo(this._scheme,this._recHost,e)},e.prototype.exponentialBackoffMs=function(e,t){var n=s.mathMin(te.BackoffMax,5e3*s.mathPow(2,e));return t?n+.25*s.mathRandom()*n:n},e.prototype.post=function(e,t,n,r){Oo(this._scheme,this._recHost,e,t,n,r)},e}(),Ao=function(){function e(e){this._scheme=e.options.scheme,this._recHost=e.options.recHost}return e.prototype.uploadResource=function(e){var t=this;return new et(function(n,r){Oo(t._scheme,t._recHost,"/rec/uploadResource",e,n,r)})},e.prototype.queryResources=function(e){return Io(this,void 0,et,function(){var t,n,r=this;return Co(this,function(i){switch(i.label){case 0:return t=JSON.stringify(e),[4,new et(function(e,n){Oo(r._scheme,r._recHost,"/rec/queryResources",t,e,n)})];case 1:return n=i.sent(),[2,JSON.parse(n)];}})})},e}();function xo(e,t){var n="/rec/bundle?OrgId="+t.orgId+"&UserId="+t.userId+"&SessionId="+t.sessionId+"&PageId="+t.pageId+"&Seq="+e;return null!=t.serverPageStart&&(n+="&PageStart="+t.serverPageStart),null!=t.serverBundleTime&&(n+="&PrevBundleTime="+t.serverBundleTime),null!=t.lastUserActivity&&(n+="&LastActivity="+t.lastUserActivity),t.isNewSession&&(n+="&IsNewSession=true"),null!=t.deltaT&&(n+="&DeltaT="+t.deltaT),n}function Oo(e,t,n,r,i,o){var s="//"+t+n,a=!1,u=new XMLHttpRequest;if("withCredentials"in u)u.onreadystatechange=function(){if(u.readyState==fn){if(a)return;a=!0;try{200==u.status?i(u.responseText):o&&o(u.status,u.responseText)}catch(e){Mt.sendToBugsnag(e,"error")}}},u.open("POST",e+s,!0),u.withCredentials=!0,"function"!=typeof r.append&&u.setRequestHeader("Content-Type","text/plain"),u.send(r);else{var c=new XDomainRequest;c.onload=function(){i(c.responseText)},c.onerror=function(){o&&o("Not Found"==c.responseText?404:500,c.responseText)},c.onprogress=function(){},c.open("POST",s),c.send(r)}}function Mo(e,t,n){if("function"==typeof navigator.sendBeacon){var r=e+"//"+t+xo(n.bundle.Seq,n)+"&SkipResponseBody=true",i=gt(n.bundle);try{return navigator.sendBeacon(r,i)}catch(e){Mt.sendToBugsnag(e,"error",{url:r,data:i})}}return!1}var Lo=function(){function e(e,t,n){void 0===n&&(n=new Fo),this._ctx=e,this._q=t,this._matcher=n}return e.prototype.initialize=function(e){var t;if(e){this._setUrlKeeps(e);var n=null===(t=this._ctx.window.location)||void 0===t?void 0:t.href;this.onNavigate(n)}},e.prototype.onNavigate=function(e){return!!this._matcher.matches(e)&&(this._q.enqueue({Kind:R.KEEP_URL,Args:[this._scrubUrl(e)]}),!0)},e.prototype.onClick=function(e){return!(!e||!function(e){var t=xn(e);return!!t&&!0===t.matchesAnyKeepRule}(e.node))&&(this._q.enqueue({Kind:R.KEEP_ELEMENT,Args:[e.id]}),!0)},e.prototype.urlMatches=function(e){return this._matcher.matches(e)},e.prototype._setUrlKeeps=function(e){this._matcher.setRules(e)},e.prototype._scrubUrl=function(e){return ur(e,this._ctx.options.orgId,{source:"page",type:"base"})},e}(),Fo=function(){function e(){this._regexes=null}return e.prototype.setRules=function(e){var t=e.map(function(e){return e.Regex}).filter(this._isValidRegex);t.length>0&&(this._regexes=this._joinRegexes(t))},e.prototype.matches=function(e){return!!this._regexes&&this._regexes.test(e)},e.prototype._isValidRegex=function(e){try{return new RegExp(e),!0}catch(t){return Mt.sendToBugsnag("Browser rejected UrlKeep.Regex","error",{expr:e,error:t.toString()}),!1}},e.prototype._joinRegexes=function(e){try{return new RegExp("("+e.join(")|(")+")","i")}catch(t){return Mt.sendToBugsnag("Browser rejected joining UrlKeep.Regexs","error",{exprs:e,error:t.toString()}),null}},e}();function Po(e,t){var n=Mn(e)+" ";return e.id&&(n+="#"+e.id),n+="[src="+ur(e.src,t,{source:"log",type:"debug"})+"]"}var qo,Uo=function(e){var t=e.transport,n=e.frame,r=e.orgId,s=e.scheme,a=e.script,u=e.recHost,c=e.appHost,h=Po(n,r);o("Injecting into Frame "+h);try{if(function(e){return e.id==e.name&&No.test(e.id)}(n))return void o("Blacklisted iframe: "+h);if(function(e){if(!e.contentDocument||!e.contentWindow||!e.contentWindow.location)return!0;return function(e){return!!e.src&&"about:blank"!=e.src&&e.src.indexOf("javascript:")<0}(e)&&e.src!=e.contentWindow.location.href&&"loading"==e.contentDocument.readyState}(n))return void o("Frame not yet loaded: "+h);var d=n.contentWindow,l=n.contentDocument;if(!d||!l)return void o("Missing contentWindow or contentDocument: "+h);if(!l.head)return void o("Missing contentDocument.head: "+h);if(I(d))return void o("FS already defined in Frame contentWindow: "+h+". Ignoring.");d._fs_org=r,d._fs_script=a,d._fs_rec_host=u,d._fs_app_host=c,d._fs_debug=i(),d._fs_run_in_iframe=!0,t&&(d._fs_transport=t);var p=l.createElement("script");p.async=!0,p.crossOrigin="anonymous",p.src=s+"//"+a,"testdrive"==r&&(p.src+="?allowMoo=true"),l.head.appendChild(p)}catch(e){o("iFrame no injecty. Probably not same origin.")}},No=/^fb\d{18}$/;!function(e){e[e.NoInfoYet=1]="NoInfoYet",e[e.Enabled=2]="Enabled",e[e.Disabled=3]="Disabled"}(qo||(qo={}));var Wo=function(){function e(e,t,n,r){var i=this;this._ctx=e,this._transport=n,this._injector=r,this._bundleUploadInterval=te.DefaultBundleUploadInterval,this._iFrames=[],this._pendingChildFrameIdInits=[],this._listeners=new Ut,this._getCurrentSessionEnabled=qo.NoInfoYet,this._resourceUploadingEnabled=!1,this._tickerTasks=[],this._pendingIframes={},this._watcher=new yn,this._queue=new io(e,this._transport,function(e){for(var t=i._eventWatcher.bundleEvents(e),n=void 0;n=i._tickerTasks.pop();)n();return t},t),this._keep=new Lo(e,this._queue),this._eventWatcher=new Di(e,this._queue,this._keep,this._watcher,this._listeners,function(e){i.onFrameCreated(e)},function(e){i.beforeFrameRemoved(e)},new Eo(e,this._queue,new Ao(e))),this._consoleWatcher=new Ji(e,this._queue,this._listeners),this._scheme=e.options.scheme,this._script=e.options.script,this._recHost=e.options.recHost,this._appHost=e.options.appHost,this._orgId=e.options.orgId,this._wnd=e.window}return e.prototype.bundleUploadInterval=function(){return this._bundleUploadInterval},e.prototype.start=function(e,t){var n=this;this._onFullyStarted=t,"onpagehide"in this._wnd?this._listeners.add(this._wnd,"pagehide",!1,function(e){n.onUnload()}):this._listeners.add(this._wnd,"unload",!1,function(e){n.onUnload()}),this._listeners.add(this._wnd,"message",!1,function(e){if("string"==typeof e.data){var t=e.source;n.postMessageReceived(t,Bo(e.data))}});var r=this._wnd.Document?this._wnd.Document.prototype:this._wnd.document;this._docCloseHook=Tt(r,"close"),this._docCloseHook&&this._docCloseHook.afterAsync(function(){n._listeners.refresh()})},e.prototype.queue=function(){return this._queue},e.prototype.eventWatcher=function(){return this._eventWatcher},e.prototype.console=function(){return this._consoleWatcher},e.prototype.onDomLoad=function(){this._eventWatcher.onDomLoad()},e.prototype.onLoad=function(){this._eventWatcher.onLoad()},e.prototype.shutdown=function(e){this._eventWatcher.shutdown(e),this._consoleWatcher.disable(),this._listeners&&this._listeners.clear(),this._docCloseHook&&this._docCloseHook.disable(),this.tellAllFramesTo(["ShutdownFrame"])},e.prototype.tellAllFramesTo=function(e){for(var t=0;t<this._iFrames.length;t++){var n=this._iFrames[t];n.contentWindow&&Do(n.contentWindow,e)}},e.prototype.getCurrentSessionURL=function(e){var t=this._getCurrentSessionEnabled;if(t==qo.NoInfoYet)return null;if(t==qo.Disabled)return this._scheme+"//"+this._appHost+"/opt/upgrade";var n=this.getCurrentSession();return n?(e&&(n+=":"+this._ctx.time.wallTime()),this._scheme+"//"+this._appHost+"/ui/"+this._ctx.options.orgId+"/session/"+encodeURIComponent(n)):null},e.prototype.getCurrentSession=function(){var e=this._getCurrentSessionEnabled;return e==qo.NoInfoYet||e==qo.Disabled?null:this._userId?this._userId+":"+this._sessionId:null},e.prototype.setConsent=function(e){var t=this,n=function(){t._watcher.setConsent(e),t._queue.processEvents()},r=function(){t._queue.enqueue({Kind:R.SYS_SETCONSENT,Args:[e,K.Document]})};switch(e){case j.GrantConsent:r(),n();break;case j.RevokeConsent:n(),r();}this.tellAllFramesTo(["SetConsent",e])},e.prototype.pageSignature=function(){return this._userId+":"+this._sessionId+":"+this._pageId},e.prototype.fireFsReady=function(e){void 0===e&&(e=!1);var t=this._wnd._fs_ready;if(t)try{e?t(!0):t()}catch(e){o("exception in _fs_ready(): "+e)}},e.prototype.onUnload=function(){this._queue.addUnload(V.Unload),Zt.stopAll()},e.prototype.handleResponse=function(e){var t=e.Flags,n=t.AjaxFetch,r=t.AjaxWatcher,i=t.ConsoleWatcher,o=t.GetCurrentSession,s=t.WatchStrategy,a=t.ResourceUploading,u=t.WhitelistElements;this._pageRsp=e,this._userId=e.UserIntId,this._sessionId=e.SessionIntId,this._pageId=e.PageIntId,this._serverPageStart=e.PageStart,this._getCurrentSessionEnabled=o?qo.Enabled:qo.Disabled,"number"==typeof e.BundleUploadInterval&&(this._bundleUploadInterval=e.BundleUploadInterval),a&&this.enableResourceUploading(),r&&this.enableAjaxWatcher(!!n),i&&this.enableConsoleWatcher(),r&&e.AjaxWatches&&this._eventWatcher.ajaxWatcher().setWatches(e.AjaxWatches),this._watcher.initialize({blocks:e.ElementBlocks,keeps:e.ElementKeeps,watches:e.ElementWatches,flags:{whitelist:!!u,watchStrategy:null!=s?s:"matches"}}),this._keep.initialize(e.UrlKeeps),this._watcher.initializeConsent(!!e.Consented)},e.prototype.fullyStarted=function(){this._onFullyStarted()},e.prototype.enableResourceUploading=function(){this._resourceUploadingEnabled=!0,this._eventWatcher.initResourceUploading()},e.prototype.enableAjaxWatcher=function(e){this.eventWatcher().ajaxWatcher().enable(e)},e.prototype.enableConsoleWatcher=function(){this.console().enable()},e.prototype.flushPendingChildFrameInits=function(){if(this._pendingChildFrameIdInits.length>0){for(var e=0;e<this._pendingChildFrameIdInits.length;e++)this._pendingChildFrameIdInits[e]();this._pendingChildFrameIdInits=[]}},e.prototype.inject=function(e){var t=this;this._ctx.measurer.requestMeasureTask(function(){i()&&o("Injecting into a "+("none"!==getComputedStyle(e,null).display?"hidden":"visible")+" iframe: "+Po(e,t._orgId));var n={send:function(n,r,i){et.resolve().then(Mt.wrap(function(){t.postMessageReceived(e.contentWindow,[n,s.jsonParse(r),i])}))}};t._injector({frame:e,transport:n,orgId:t._orgId,scheme:t._scheme,script:t._script,recHost:t._recHost,appHost:t._appHost})})},e.prototype.onFrameCreated=function(e){var t=Mn(e);if(t){this._iFrames.push(e);var n=!1;if(e.contentWindow)try{n=!!I(e.contentWindow)}catch(e){n=!0}var r=function(e){var t=e.src,n=location.protocol+"//"+location.host;return!t||"about:blank"==t||ct(t,"javascript:")||ct(t,n)}(e),i=e.contentWindow&&e.contentWindow.postMessage;r&&!n||!i?r?this.initSameOriginIframe(e):o("Frame Doesn't need injecting. Probably cross domain "+Po(e,this._orgId)):this.initCrossOriginIframe(e,t)}else o("fsid missing or invalid for iFrame "+Po(e,this._orgId))},e.prototype.initCrossOriginIframe=function(e,t){var n=this;e.contentWindow&&e.contentWindow.postMessage?(o("Cross-origin iframe "+Po(e,this._orgId)),Do(e.contentWindow,["GreetFrame"]),i()&&(this._pendingIframes[t]=!0,setTimeout(function(){n._pendingIframes[t]&&o("iframe "+e.src+" is unresponsive")},5e3))):o("No content window on init of cross-origin iframe "+Po(e,this._orgId))},e.prototype.initSameOriginIframe=function(e){var t=this;o("Attempting to setup Frame "+Po(e,this._orgId)),this.inject(e),e.addEventListener("load",Mt.wrap(function(n){o("onload for frame "+Po(e,t._orgId)),t.inject(e)}))},e.prototype.beforeFrameRemoved=function(e){for(var t=0;t<this._iFrames.length;t++){if(e==this._iFrames[t])return void this._iFrames.splice(t,1)}},e.prototype.postMessageReceived=function(e,t){if(!e||e.parent==this._wnd)switch(t[0]){case"EvtBundle":var n=t[1],r=this.pageSignature(),i=t[2];if(r!=i)return Mt.sendToBugsnag("Page signature mismatch","warning",{pageSignature:r,messageSignature:i}),void(e&&Do(e,["ShutdownFrame"]));n.length>0&&this._transport.enqueueEvents(r,n);break;case"RequestFrameId":if(!e)return void o("No MessageEvent.source, iframe may have unloaded.");var s=this.iFrameWndToFsId(e);s?(o("Responding to FID request for frame "+s),this._pendingIframes[s]=!1,this.sendFrameIdToInnerFrame(e,s)):o("No FrameId found. Hoping to send one later.");}},e.prototype.sendFrameIdToInnerFrame=function(e,t){var n=this,r=function(){var r=[];0!=n._frameId&&(r=n._parentIds?n._parentIds.concat(n._frameId):[n._frameId]);var i=n._ctx.time.startTime();Do(e,["SetFrameId",t,r,i,n._scheme,n._script,n._appHost,n._orgId,n._pageRsp])};null==this._frameId?this._pendingChildFrameIdInits.push(r):r()},e.prototype.iFrameWndToFsId=function(e){for(var t=0;t<this._iFrames.length;t++)if(this._iFrames[t].contentWindow==e)return Mn(this._iFrames[t]);return o("Unable to locate frame for window"),NaN},e}();function Do(e,t){e&&e.postMessage&&e.postMessage(gt({__fs:t}),"*")}function Bo(e){try{var t=wt(e);if("__fs"in t)return t.__fs}catch(e){}return[]}function Ho(e){return e>=400&&502!==e||202==e||206==e}var jo=function(){return(jo=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Ko=function(){function e(e,t,n,r){void 0===r&&(r=tn),this._ctx=e,this._protocol=t,this._identity=n,this._timeoutFactory=r,this._recover()}return e.prototype.sing=function(e){o("Saving "+e.bundles.length+" bundles in swan-song.");var t=gt({OrgId:this._identity.orgId(),UserId:this._identity.userId(),SessionId:this._identity.sessionId(),PageId:e.pageId,Bundles:e.bundles,PageStartTime:this._ctx.time.startTime(),LastBundleTime:e.lastBundleTime,ServerPageStart:e.serverPageStart,ServerBundleTime:e.serverBundleTime,IsNewSession:e.isNewSession});if(!(t.length>2e6))try{localStorage._fs_swan_song=t}catch(e){}},e.prototype._recover=function(){try{if("_fs_swan_song"in localStorage){var e=localStorage._fs_swan_song||localStorage.singSwanSong;delete localStorage._fs_swan_song,delete localStorage.singSwanSong;var t=wt(e);if(!(t.Bundles&&t.UserId&&t.SessionId&&t.PageId))return void o("Malformed swan song found. Ignoring it.");t.OrgId||(t.OrgId=this._identity.orgId()),t.Bundles.length>0&&(o("Sending "+t.Bundles.length+" bundles as prior page swan song"),this.sendSwanSongBundles(t))}}catch(e){o("Error recovering swan-song: "+e)}},e.prototype.sendSwanSongBundles=function(e,t){var n=this;void 0===t&&(t=0);var r=null;if(nt(e.Bundles)&&0!==e.Bundles.length&&void 0!==e.Bundles[0]){1==e.Bundles.length&&(r=this._ctx.time.wallTime()-(e.LastBundleTime||0));this._protocol.bundle({bundle:e.Bundles[0],deltaT:r,orgId:e.OrgId,pageId:e.PageId,serverBundleTime:e.ServerBundleTime,serverPageStart:e.ServerPageStart,sessionId:e.SessionId,userId:e.UserId,isNewSession:e.IsNewSession,win:function(t){o("Sent "+e.Bundles[0].Evts.length+" trailing events from last session as Seq "+e.Bundles[0].Seq),e.Bundles.shift(),e.Bundles.length>0?n.sendSwanSongBundles(jo(jo({},e),{ServerBundleTime:t.BundleTime})):o("Done with prior page swan song")},lose:function(r){Ho(r)?o("Fatal error while sending events, giving up"):(o("Failed to send events from last session, will retry while on this page"),n._lastSwanSongRetryTimeout=new n._timeoutFactory(n.sendSwanSongBundles,n._protocol.exponentialBackoffMs(t,!0),n,e,t+1).start())}})}},e}(),Vo=function(){function e(e,t,n,r){var i=this;void 0===t&&(t=new Ro(e)),void 0===n&&(n=en),void 0===r&&(r=tn),this._ctx=e,this._protocol=t,this._tickerFactory=n,this._backoffRetries=0,this._backoffTime=0,this._bundleSeq=1,this._lastPostTime=0,this._serverBundleTime=0,this._isNewSession=!1,this._largePageSize=16e6,this._outgoingEventQueue=[],this._bundleQueue=[],this._hibernating=!1,this._heartbeatInterval=0,this._lastUserActivity=this._ctx.time.wallTime(),this._finished=!1,this._scheme=e.options.scheme,this._identity=e.recording.identity,this._lastBundleTime=e.time.wallTime(),this._swanSong=new Ko(e,this._protocol,this._identity,r),this._heartbeatTimeout=new r(function(){i.onHeartbeat()}),this._hibernationTimeout=new r(function(){i.onHibernate()},te.PageInactivityTimeout)}return e.prototype.onShutdown=function(e){this._onShutdown=e},e.prototype.scheme=function(){return this._scheme},e.prototype.enqueueEvents=function(e,t){if(this.maybeHibernate(),this._hibernating){if(this._finished)return;for(var n=0,r=t;n<r.length;n++){if(re((u=r[n]).Kind)){this._ctx.recording.splitPage(V.Hibernation),this._finished=!0;break}}}else{for(var i=0,o=t;i<o.length;i++){if(re((u=o[i]).Kind)){this._hibernationTimeout.start(),this._heartbeatInterval=te.HeartbeatInitial,this._heartbeatTimeout.start(this._heartbeatInterval),this._lastUserActivity=this._ctx.time.wallTime();break}}for(var s=0,a=t;s<a.length;s++){var u=a[s];this._outgoingEventQueue.push(u)}}},e.prototype.initUploadTicker=function(){this._uploadTicker=new this._tickerFactory(this._ctx.recording.bundleUploadInterval())},e.prototype.startPipeline=function(e){var t=this;this._pageId=e.pageId,this._serverPageStart=e.serverPageStart,this._isNewSession=e.isNewSession,this.enqueueAndSendBundle(),this._uploadTicker||this.initUploadTicker(),this._uploadTicker.start(function(){t.enqueueAndSendBundle()}),this._heartbeatInterval=te.HeartbeatInitial,this._heartbeatTimeout.start(this._heartbeatInterval),this._hibernationTimeout.start()},e.prototype.stopPipeline=function(){this._uploadTicker&&this._uploadTicker.stop(),this._outgoingEventQueue=[],this._bundleQueue=[],this._hibernationTimeout.stop(),this._heartbeatTimeout.stop()},e.prototype.flush=function(){this.maybeSendNextBundle()},e.prototype.singSwanSong=function(){if(!this._hibernating&&(this._outgoingEventQueue.length>0&&this.enqueueNextBundle(!0),this._bundleQueue.length>0||this._pendingBundle)){var e=this._bundleQueue.concat();this._pendingBundle&&e.unshift(this._pendingBundle),this._swanSong.sing({pageId:this._pageId,bundles:e,lastBundleTime:this._lastBundleTime,serverPageStart:this._serverPageStart,serverBundleTime:this._serverBundleTime,isNewSession:this._isNewSession})}},e.prototype.maybeHibernate=function(){this._hibernating||this.calcLastUserActivityDuration()>=te.PageInactivityTimeout+5e3&&this.onHibernate()},e.prototype.calcLastUserActivityDuration=function(){return s.mathFloor(this._ctx.time.wallTime()-this._lastUserActivity)},e.prototype.onHeartbeat=function(){var e=this.calcLastUserActivityDuration();this._outgoingEventQueue.push({When:this._ctx.time.now(),Kind:R.HEARTBEAT,Args:[e]}),this._heartbeatInterval*=2,this._heartbeatInterval>te.HeartbeatMax&&(this._heartbeatInterval=te.HeartbeatMax),this._heartbeatTimeout.start(this._heartbeatInterval)},e.prototype.onHibernate=function(){this._hibernating||(this.calcLastUserActivityDuration()<=2*te.PageInactivityTimeout&&(this._outgoingEventQueue.push({When:this._ctx.time.now(),Kind:R.UNLOAD,Args:[V.Hibernation]}),this.singSwanSong()),this.stopPipeline(),this._hibernating=!0)},e.prototype.enqueueAndSendBundle=function(){this._pendingBundle?this._pendingBundleFailed&&this._sendPendingBundle():0!=this._outgoingEventQueue.length?this.enqueueNextBundle():this.maybeSendNextBundle()},e.prototype.enqueueNextBundle=function(e){void 0===e&&(e=!1);var t={When:this._outgoingEventQueue[0].When,Seq:this._bundleSeq++,Evts:this._outgoingEventQueue};this._outgoingEventQueue=[],this._bundleQueue.push(t),e?this._protocol.bundleBeacon({bundle:t,deltaT:null,orgId:this._identity.orgId(),pageId:this._pageId,serverBundleTime:this._serverBundleTime,serverPageStart:this._serverPageStart,isNewSession:this._isNewSession,sessionId:this._identity.sessionId(),userId:this._identity.userId(),win:function(){},lose:function(){}}):this.maybeSendNextBundle()},e.prototype.maybeSendNextBundle=function(){this._pageId&&this._serverPageStart&&!this._pendingBundle&&0!=this._bundleQueue.length&&(this._pendingBundle=this._bundleQueue.shift(),this._sendPendingBundle())},e.prototype._sendPendingBundle=function(){var e=this,t=this._ctx.time.wallTime();if(!(t<this._backoffTime)){var n=this._pendingBundle;n&&(this._pendingBundleFailed=!1,this._lastPostTime=this._lastBundleTime=t,this.sendBundle(n,function(t){o("Sent bundle "+n.Seq+" with "+n.Evts.length+" events"),e._serverBundleTime=t.BundleTime,e._pendingBundle=null,e._backoffTime=0,e._backoffRetries=0,e._ctx.time.wallTime()-e._lastPostTime>e._ctx.recording.bundleUploadInterval()&&e.maybeSendNextBundle()},function(t){if(o("Failed to send events."),Ho(t))return 206==t?Mt.sendToBugsnag("Failed to send bundle, probably because of its large size","error"):t>=500&&Mt.sendToBugsnag("Failed to send bundle, recording outage likely","error"),void(e._onShutdown&&e._onShutdown());e._pendingBundleFailed=!0,e._backoffTime=e._lastPostTime+e._protocol.exponentialBackoffMs(e._backoffRetries++,!1)}))}},e.prototype.sendBundle=function(e,t,n){var r=s.mathFloor(this._ctx.time.wallTime()-this._lastUserActivity),i=this._protocol.bundle({bundle:e,deltaT:null,lastUserActivity:r,orgId:this._identity.orgId(),pageId:this._pageId,serverBundleTime:this._serverBundleTime,serverPageStart:this._serverPageStart,isNewSession:this._isNewSession,sessionId:this._identity.sessionId(),userId:this._identity.userId(),win:t,lose:n});i>this._largePageSize&&this._bundleSeq>16&&(o("splitting large page: "+i),this._ctx.recording.splitPage(V.Size))},e}(),zo=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Yo=function(e){function t(t,n,r,i,o){void 0===r&&(r=new Vo(t,n)),void 0===i&&(i=en),void 0===o&&(o=Uo);var s,a,u=e.call(this,t,i,r,o)||this;return u._protocol=n,u._domLoaded=!1,u._recordingDisabled=!1,u._integrationScriptFetched=!1,r.onShutdown(function(){return u.shutdown(V.SettingsBlocked)}),u._doc=u._wnd.document,u._frameId=0,u._identity=t.recording.identity,u._getCurrentSessionEnabled=qo.NoInfoYet,s=u._wnd,a=function(e){if(u._eventWatcher.shutdown(V.Api),e){var t=u._doc.getElementById(e);t&&t.setAttribute("_fs_embed_token",u._embedToken)}},s._fs_shutdown=a,u}return zo(t,e),t.prototype.onDomLoad=function(){var t=this;e.prototype.onDomLoad.call(this),this._domLoaded=!0,this.injectIntegrationScript(function(){t.fireFsReady(t._recordingDisabled)})},t.prototype.getReplayFlags=function(){var e=U(this._wnd);if(/[?&]_fs_force_session=true(&|#|$)/.test(location.search)&&(e+=",forceSession",this._wnd.history)){var t=location.search.replace(/(^\?|&)_fs_force_session=true(&|$)/,function(e,t,n){return n?t:""});this._wnd.history.replaceState({},"",this._wnd.location.href.replace(location.search,t))}return e},t.prototype.start=function(t,n){var r,i,o,s=this;e.prototype.start.call(this,t,n);var a=this.getReplayFlags(),u=Vt(this._doc),c=u[0],h=u[1],d=bt(this._wnd),l=d[0],p=d[1],f="";t||(f=this._identity.userId());var v=null!==(o=null===(i=null===(r=this._ctx)||void 0===r?void 0:r.recording)||void 0===i?void 0:i.preroll)&&void 0!==o?o:-1,_=ur(Jn(this._wnd),this._orgId,{source:"page",type:"base"}),g=ur(this._doc.referrer,this._orgId,{source:"page",type:"referrer"}),m=ur(this._wnd.location.href,this._orgId,{source:"page",type:"url"}),y={OrgId:this._orgId,UserId:f,Url:m,Base:_,Width:c,Height:h,ScreenWidth:l,ScreenHeight:p,Referrer:g,Preroll:v,Doctype:yt(this._doc),CompiledTimestamp:1591209308,AppId:this._identity.appId()};a&&(y.ReplayFlags=a),this._protocol.page(y,function(e){s.handleResponse(e),s.handleIdentity(e.CookieDomain,e.UserIntId,e.SessionIntId,e.PageIntId,e.EmbedToken),s.handleIntegrationScript(e.IntegrationScript),e.PreviewMode&&s.maybeInjectPreviewScript();var t=s._wnd._fs_pagestart;t&&t();var n=!!e.Consented;s._queue.enqueueFirst({Kind:R.SYS_REPORTCONSENT,Args:[n,K.Document]}),s._queue.enqueueFirst({Kind:R.SET_FRAME_BASE,Args:[ur(Jn(s._wnd),s._orgId,{source:"event",type:R.SET_FRAME_BASE}),yt(s._doc)]}),s._queue.startPipeline({pageId:e.PageIntId,serverPageStart:e.PageStart,isNewSession:!!e.IsNewSession}),s.fullyStarted()},function(e,t){t&&t.user_id&&t.cookie_domain&&t.reason_code==$.ReasonBlockedTrafficRamping&&f!=t.user_id&&s.handleIdentity(t.cookie_domain,t.user_id,"","",""),s.disableBecauseRecPageSaidSo()})},t.prototype.handleIntegrationScript=function(e){var t=this;this._integrationScriptFetched=!0,this._integrationScript=e,this.injectIntegrationScript(function(){t.fireFsReady(t._recordingDisabled)})},t.prototype.handleIdentity=function(e,t,n,r,i){var s=this._identity;s.setIds(this._wnd,e,t,n),this._embedToken=i,o("/User,"+s.userId()+"/Session,"+s.sessionId()+"/Page,"+r)},t.prototype.injectIntegrationScript=function(e){if(this._domLoaded&&this._integrationScriptFetched)if(this._integrationScript){var t=this._doc.createElement("script");this._wnd._fs_csp?(t.addEventListener("load",e),t.addEventListener("error",e),t.async=!0,t.src=this._scheme+"//"+this._recHost+"/rec/integrations?OrgId="+this._orgId,this._doc.head.appendChild(t)):(t.text=this._integrationScript,this._doc.head.appendChild(t),e())}else e()},t.prototype.maybeInjectPreviewScript=function(){if(!this._doc.getElementById("FullStory-preview-script")){var e=this._doc.createElement("script");e.id="FullStory-preview-script",e.async=!0,e.src=this._scheme+"//"+this._appHost+"/s/fspreview.js",this._doc.head.appendChild(e)}},t.prototype.disableBecauseRecPageSaidSo=function(){this.shutdown(V.SettingsBlocked),o("Disabling FS."),this._recordingDisabled=!0,this.fireFsReady(this._recordingDisabled)},t}(Wo),Go=function(){function e(e,t){void 0===t&&(t=new Qo(e)),this._wnd=e,this._messagePoster=t}return e.prototype.enqueueEvents=function(e,t){this._messagePoster.postMessage(this._wnd.parent,"EvtBundle",t,e)},e.prototype.startPipeline=function(){},e.prototype.stopPipeline=function(){},e.prototype.flush=function(){},e.prototype.singSwanSong=function(){},e.prototype.onShutdown=function(e){},e}(),Qo=function(){function e(e){this.wnd=e}return e.prototype.postMessage=function(e,t,n,r){var i=N(this.wnd);if(i)try{i.send(t,gt(n),r)}catch(e){i.send(t,gt(n))}else e.postMessage(function(e,t,n){var r=[e,t];n&&r.push(n);return gt({__fs:r})}(t,n,r),"*")},e}();var Xo,Jo=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),$o=function(e){function t(t,n,r,i,o){void 0===n&&(n=new Qo(t.window)),void 0===r&&(r=new Go(t.window)),void 0===i&&(i=en),void 0===o&&(o=Uo);var s=e.call(this,t,i,r,o)||this;return s._messagePoster=n,s}return Jo(t,e),t.prototype.start=function(t,n){var r=this;e.prototype.start.call(this,t,n),this.sendRequestForFrameId(),this._listeners.add(this._wnd,"load",!1,function(){r._eventWatcher.recordingIsDetached()&&(o("Recording wrong document. Restarting recording in iframe."),r._ctx.recording.splitPage(V.FsShutdownFrame))})},t.prototype.postMessageReceived=function(t,n){if(e.prototype.postMessageReceived.call(this,t,n),t==this._wnd.parent||t==this._wnd)switch(n[0]){case"GreetFrame":this.sendRequestForFrameId();break;case"SetFrameId":try{var r=n[1],i=n[2],s=n[3],a=n[4],u=n[5],c=n[6],h=n[7],d=n[8];if(!r)return void o("Outer page gave us a bogus frame Id! Iframe: "+ur(location.href,h,{source:"log",type:"debug"}));this.setFrameIdFromOutside(r,i,s,a,u,c,h,d)}catch(e){o("Failed to parse frameId from message: "+gt(n))}break;case"SetConsent":var l=n[1];this.setConsent(l);break;case"InitFrameMobile":try{var p=JSON.parse(n[1]),f=p.StartTime;if(n.length>2){var v=n[2];if(v.hasOwnProperty("ProtocolVersion"))v.ProtocolVersion>=20180723&&v.hasOwnProperty("OuterStartTime")&&(f=v.OuterStartTime)}var _=p.Host;this.setFrameIdFromOutside(0,[],f,"https:",H(_),B(_),p.OrgId,p.PageResponse)}catch(e){o("Failed to initialize mobile web recording from message: "+gt(n))}}},t.prototype.sendRequestForFrameId=function(){this._frameId||(0!=this._frameId?this._wnd.parent?(o("Asking for a frame ID."),this._messagePoster.postMessage(this._wnd.parent,"RequestFrameId",[])):o("Orphaned window."):o("For some reason the outer window attempted to request a frameId"))},t.prototype.setFrameIdFromOutside=function(e,t,n,r,i,s,a,u){if(this._frameId)this._frameId!=e?(o("Updating frame id from "+this._frameId+" to "+e),this._ctx.recording.splitPage(V.FsShutdownFrame)):o("frame Id is already set to "+this._frameId);else{o("FrameId received within frame "+ur(location.href,a,{source:"log",type:"debug"})+": "+e),this._scheme=r,this._script=i,this._appHost=s,this._orgId=a,this._frameId=e,this._parentIds=t,this.handleResponse(u),this.fireFsReady();var c=!!u.Consented;this._queue.enqueueFirst({Kind:R.SYS_REPORTCONSENT,Args:[c,K.Document]}),this._queue.enqueueFirst({Kind:R.SET_FRAME_BASE,Args:[ur(Jn(this._wnd),a,{source:"event",type:R.SET_FRAME_BASE}),yt(this._wnd.document)]}),this._queue.rebaseIframe(n),this._ctx.time.setStartTime(n),this._queue.startPipeline({pageId:this._pageId,serverPageStart:u.PageStart,isNewSession:!!u.IsNewSession,frameId:e,parentIds:t}),this.flushPendingChildFrameInits(),this.fullyStarted()}},t}(Wo),Zo="fsidentity",es="newuid",ts=function(){function e(e,t){void 0===e&&(e=document),void 0===t&&(t=function(){}),this._doc=e,this._onWriteFailure=t,this._cookies={},this._appId=void 0}return e.prototype.initFromCookies=function(e,t){this._cookies=y(this._doc);var n=this._cookies.fs_uid;if(!n)try{n=localStorage._fs_uid}catch(e){}var r=m(n);r&&r.host.replace(/^www\./,"")==e.replace(/^www\./,"")&&r.orgId==t?this._cookie=r:this._cookie={expirationAbsTimeSeconds:g(),host:e,orgId:t,userId:"",sessionId:"",appKeyHash:""}},e.prototype.initFromParsedCookie=function(e){this._cookie=e},e.prototype.clear=function(){this._cookie.userId=this._cookie.sessionId=this._cookie.appKeyHash=this._appId="",this._cookie.expirationAbsTimeSeconds=g(),this._write()},e.prototype.host=function(){return this._cookie.host},e.prototype.orgId=function(){return this._cookie.orgId},e.prototype.userId=function(){return this._cookie.userId},e.prototype.sessionId=function(){return this._cookie.sessionId},e.prototype.appKeyHash=function(){return this._cookie.appKeyHash},e.prototype.cookieData=function(){return this._cookie},e.prototype.cookies=function(){return this._cookies},e.prototype.setCookie=function(e,t,n){void 0===n&&(n=new Date(p()+6048e5).toUTCString());var r=e+"="+t;this._domain?r+="; domain=."+encodeURIComponent(this._domain):r+="; domain=",r+="; Expires="+n+"; path=/; SameSite=Strict","https:"===location.protocol&&(r+="; Secure"),this._doc.cookie=r},e.prototype.setIds=function(e,t,n,r){(C(t)||t.match(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/g))&&(t="");var i=function(e){return e._fs_cookie_domain}(e);"string"==typeof i&&(t=i),this._domain=t,this._cookie.userId=n,this._cookie.sessionId=r,this._write()},e.prototype.clearAppId=function(){return!!this._cookie.appKeyHash&&(this._appId="",this._cookie.appKeyHash="",this._write(),!0)},e.prototype.setAppId=function(e){this._appId=e,this._cookie.appKeyHash=uo(e),this._write()},e.prototype.appId=function(){return this._appId},e.prototype.encode=function(){var e=this._cookie.host+"#"+this._cookie.orgId+"#"+this._cookie.userId+":"+this._cookie.sessionId;return this._cookie.appKeyHash&&(e+="#"+encodeURIComponent(this._cookie.appKeyHash)+"#"),e+="/"+this._cookie.expirationAbsTimeSeconds},e.prototype._write=function(){if(null!=this._domain){var e=this.encode(),t=new Date(1e3*this._cookie.expirationAbsTimeSeconds).toUTCString();this.setCookie("fs_uid",e,t);var n=[];-1===this._doc.cookie.indexOf(e)&&n.push(["fs_uid","cookie"]);try{localStorage._fs_uid=e,localStorage._fs_uid!==e&&n.push(["fs_uid","localStorage"])}catch(e){n.push(["fs_uid","localStorage",String(e)])}n.length>0&&this._onWriteFailure(n)}},e}();!function(e){e.rec="rec",e.user="user",e.account="account",e.consent="consent",e.customEvent="event",e.log="log"}(Xo||(Xo={}));var ns={acctId:"str",displayName:"str",website:"str"},rs={uid:"str",displayName:"str",email:"str"},is={str:os,bool:ss,real:as,"int":us,date:cs,strs:hs(os),bools:hs(ss),reals:hs(as),ints:hs(us),dates:hs(cs),objs:hs(ds),obj:ds};function os(e){return"string"==typeof e}function ss(e){return"boolean"==typeof e}function as(e){return"number"==typeof e}function us(e){return"number"==typeof e&&e-s.mathFloor(e)==0}function cs(e){return!!e&&(e.constructor===Date?!isNaN(e):("number"==typeof e||"string"==typeof e)&&!isNaN(new Date(e)))}function hs(e){return function(t){if(!(t instanceof Array))return!1;for(var n=0;n<t.length;n++)if(!e(t[n]))return!1;return!0}}function ds(e){return!!e&&"object"==typeof e}var ls=/^[a-zA-Z][a-zA-Z0-9_]*$/,ps=function(){function e(e){this._identity=e}return e.prototype.identity=function(){return this._identity},e.prototype.api=function(e,t,n){var r=!1,i=[];try{switch(e){case Xo.account:i.push.apply(i,this.rawEventsFromApi(X.Account,ns,t,n));break;case Xo.user:if("object"!=typeof t)o("Expected argument of type 'object' instead got type: '"+typeof t+"', value: "+gt(t));else if("uid"in t){var a=t.uid;if(!1===a)this._identity.clearAppId()&&(r=!0),delete t.uid;else{var u=function(e,t){"number"==typeof e&&s.mathFloor(e)==e&&(o("Expected appId of type 'string' instead got value: "+e+" of type: "+typeof e),e=""+e);if("string"!=typeof e)return o("blocking FS.identify API call; uid value ("+e+") must be a string"),[void 0,Zo];var n=e.trim();if(f.indexOf(n.toLowerCase())>=0)return o("blocking FS.identify API call; uid value ("+n+") is illegal"),[void 0,Zo];var r=uo(n),i=void 0;t&&t._cookie.appKeyHash&&t._cookie.appKeyHash!==r&&t._cookie.appKeyHash!==n&&(o("user re-identified; existing uid hash ("+t._cookie.appKeyHash+") does not match provided uid ("+n+")"),i=es);return[n,i]}(a,this._identity),c=u[0],h=u[1];if(!c){switch(h){case Zo:case void 0:break;default:o("unexpected failReason returned from setAppId: "+h);}return{events:i}}t.uid=c,this._identity.setAppId(t.uid),h==es&&(r=!0)}}i.push.apply(i,this.rawEventsFromApi(X.User,rs,t,n));break;case Xo.customEvent:var d=t.n,l=t.p;i.push.apply(i,this.rawEventsFromApi(X.Event,{},l,n,d));break;default:o("invalid operation \""+e+"\"; only \"rec\", \"account\", and \"user\" are supported at present");}}catch(t){o("unexpected exception handling "+e+" API call: "+t.message)}return{events:i,reidentify:r}},e.prototype.rawEventsFromApi=function(e,t,n,r,i){var a=function e(t,n,r){var i={PayloadToSend:{},ValidationErrors:[]},a=function(r){var o=e(t,n,r);return i.ValidationErrors=i.ValidationErrors.concat(o.ValidationErrors),o.PayloadToSend};return ht(r,function(e,r){var u=function(e,t,n,r){var i=t,a=typeof n;if("undefined"===a)return o("Cannot infer type of "+a+" "+n),r.push({Type:"vartype",FieldName:t,ValueType:a+" (unsupported)"}),null;if(s.objectHasOwnProp(e,t))return{name:t,type:e[t]};var u=t.lastIndexOf("_");if(-1==u||!vs(t.substring(u+1))){var c=function(e){for(var t in is)if(is[t](e))return t;return null}(n);if(null==c)return o("Cannot infer type of "+a+" "+n),n?r.push({Type:"vartype",FieldName:t}):r.push({Type:"vartype",FieldName:t,ValueType:"null (unsupported)"}),null;u=t.length,o("Warning: Inferring user variable \""+t+"\" to be of type \""+c+"\""),t=t+"_"+c}var h=[t.substring(0,u),t.substring(u+1)],d=h[0],l=h[1];if("object"===a&&!n)return o("null is not a valid object type"),r.push({Type:"vartype",FieldName:i,ValueType:"null (unsupported)"}),null;if(!ls.test(d)){d=d.replace(/[^a-zA-Z0-9_]/g,"").replace(/^[0-9]+/,""),/[0-9]/.test(d[0])&&(d=d.substring(1)),r.push({Type:"varname",FieldName:i});var p=d+"_"+l;if(o("Warning: variable \""+i+"\" has invalid characters. It should match /"+ls.source+"/. Converted name to \""+p+"\"."),""==d)return null;t=p}if(!vs(l))return o("Variable \""+i+"\" has invalid type \""+l+"\""),r.push({Type:"varname",FieldName:i}),null;if(!function(e,t){return is[e](t)}(l,n))return o("illegal value "+gt(n)+" for type "+l),"number"===a?a=n%1==0?"integer":"real":"object"==a&&null!=n&&n.constructor==Date&&(a=isNaN(n)?"invalid date":"date"),r.push({Type:"vartype",FieldName:i,ValueType:a}),null;return{name:t,type:l}}(n,r,e,i.ValidationErrors);if(u){var c=u.name,h=u.type;if("obj"!=h){if("objs"!=h){var d,l;i.PayloadToSend[c]=fs(h,e)}else{t!=X.Event&&i.ValidationErrors.push({Type:"vartype",FieldName:c,ValueType:"Array<Object> (unsupported)"});for(var p=e,f=[],v=0;v<p.length;v++){(_=a(p[v]))&&f.push(_)}f.length>0&&(i.PayloadToSend[c]=f)}}else{var _=a(e),g=(l="_obj").length>(d=r).length||d.substring(d.length-l.length)!=l?c.substring(0,c.length-"_obj".length):c;i.PayloadToSend[g]=_}}else i.PayloadToSend[r]=fs("",e)}),i}(e,t,n),u=[],c=e==X.Event,h=gt(a.PayloadToSend),d=!!r&&"fs"!==r;return c?u.push({When:0,Kind:R.SYS_CUSTOM,Args:d?[i,h,r]:[i,h]}):u.push({When:0,Kind:R.SYS_SETVAR,Args:d?[e,h,r]:[e,h]}),u},e}();function fs(e,t){return"str"==e&&null!=t&&(t=t.trim()),null==t||"date"!=e&&t.constructor!=Date||(t=function(e){var t,n=e.constructor===Date?e:new Date(e);try{t=n.toISOString()}catch(e){t=null}return t}(t)),t}function vs(e){return!!is[e]}var _s=function(){return(_s=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},gs=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},ms=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}};function ys(e,t){return gs(this,void 0,et,function(){var n,r,i,s,u;return ms(this,function(c){switch(c.label){case 0:if(c.trys.push([0,2,,3]),ae||ce)return[2,_s(_s({},t),{status:1})];if(!e.document||0!==t.status)return[2,t];if(1===(n=function(e,t){var n=t.functions,r={},i=_s({},t.helpers);if(i.functionToString=function(e,t){var n,r,i=null===(n=e["__core-js_shared__"])||void 0===n?void 0:n.inspectSource;if(bs(i,1))return function(){return i(this)};var o=null===(r=e["__core-js_shared__"])||void 0===r?void 0:r["native-function-to-string"];if(bs(o))return o;var s=t.__zone_symbol__OriginalDelegate;if(bs(s))return s;if(bs(t))return t;return}(e,i.functionToString),!i.functionToString)return t;var o=!1;for(var s in n)if(n[s]){if(r[s]=Ts(i.functionToString,n[s]),r[s]||(r[s]=ks(i.functionToString,i,s)),!r[s])return t;r[s]!==n[s]&&(o=!0)}else r[s]=void 0;return{status:1,functions:o?r:n,helpers:i}}(e,t)).status)return[2,n];o("The window is dirty; rebuilding Windex from a fresh global."),(r=e.document.createElement("iframe")).id="FullStory-iframe",r.className="fs-hide",r.style.display="none",i=e.document.body||e.document.head||e.document.documentElement||e.document;try{i.appendChild(r)}catch(e){return[2,_s(_s({},t),{status:1})]}return r.contentWindow?(s=a(r.contentWindow,1),r.parentNode&&r.parentNode.removeChild(r),2===s.status?[2,_s(_s({},t),{status:1})]:[4,ws(s,t)]):[2,_s(_s({},t),{status:1})];case 1:return[2,c.sent()];case 2:return u=c.sent(),Mt.sendToBugsnag(u,"error"),[2,_s(_s({},t),{status:1})];case 3:return[2];}})})}function ws(e,t){var n,r=new et(function(e){return n=e});return setTimeout(function(){try{e.functions.jsonParse("[]").push(0)}catch(e){n(_s(_s({},t),{status:1}))}n(e)}),r}function bs(e,t){var n;if(void 0===t&&(t=0),!e)return!1;var r=function(e){try{return void e.call(null)}catch(e){return(e.stack||"").replace(/__fs_nomangle_check_stack(.|\n)*$/,"")}},i=void 0;0!==t&&"number"==typeof Error.stackTraceLimit&&(i=Error.stackTraceLimit,Error.stackTraceLimit=Number.POSITIVE_INFINITY);var o=[function(){throw new Error("")},e],s=function __fs_nomangle_check_stack(){return o.map(r)}(),a=s[0],u=s[1];if(void 0!==i&&(Error.stackTraceLimit=i),!a||!u)return!1;for(var c="\n".charCodeAt(0),h=a.length>u.length?u.length:a.length,d=1,l=d;l<h;l++){var p=a.charCodeAt(a.length-l),f=u.charCodeAt(u.length-l);if(p!=f)break;f!=c&&l!=h-1||(d=l)}return(null!==(n=u.slice(0,u.length-d+1).match(/\.js:\d+([:)]|$)/gm))&&void 0!==n?n:[]).length<=t}function Ss(e,t){return e.call(t).indexOf("[native code]")>=0}var Es=["__zone_symbol__OriginalDelegate","nr@original"];function Ts(e,t){if(t){for(var n=0,r=Es;n<r.length;n++){var i=t[r[n]];if("function"==typeof i&&Ss(e,i))return i}return Ss(e,t)?t:void 0}}function ks(e,t,n){switch(n){case"arrayIsArray":var r=Ts(e,t.objectToString);if(!r)return;return t.objectToString=r,function(e){return"[object Array]"==r.call(e)};default:return;}}var Is=function(){function e(e,t){void 0===t&&(t=function(e){return new WebSocket(e)}),this._newSock=t,this._connecting=!1,this._connected=!1,this._queue={},this._seq=1,this._scheme=e.options.scheme,this._host=e.options.recHost}return e.isSupported=function(){return"WebSocket"in window},e.prototype.page=function(e,t,n){this.request({Cmd:1,Page:e},function(e){return t(e.Page)},n)},e.prototype.bundle=function(e){var t=e.deltaT,n=e.serverPageStart,r=e.serverBundleTime;return this.request({Cmd:2,Bundle:{OrgId:e.orgId,UserId:e.userId,SessionId:e.sessionId,PageId:e.pageId,Seq:e.bundle.Seq,DeltaT:null===t?void 0:t,PageStart:null==n?void 0:n,PrevBundleTime:null==r?void 0:r,Bundle:e.bundle}},function(t){return e.win(t.Bundle)},e.lose)},e.prototype.bundleBeacon=function(e){return Mo(this._scheme,this._host,e)},e.prototype.exponentialBackoffMs=function(e,t){var n=s.mathMin(te.BackoffMax,5e3*s.mathPow(2,e));return t?n+.25*s.mathRandom()*n:n},e.prototype.request=function(e,t,n){e.Seq=this._seq++;var r=gt(e);return this._queue[e.Seq]={payload:r,win:t,lose:n},this.maybeConnect(),r.length},e.prototype.handleMessage=function(e){var t;try{t=wt(e)}catch(e){return void o("socket: error parsing frame: "+e.toString())}var n=this._queue[t.Seq];delete this._queue[t.Seq],n?3==t.Cmd?(o(t.Fail.Error),n.lose(t.Fail.Status)):n.win(t):o("socket: mismatched request seq "+t.Seq+"; ignoring")},e.prototype.drainQueue=function(){if(this._connected)for(var e in this._queue){var t=this._queue[e];t.sent||(this._sock.send(t.payload),t.sent=!0)}else o("socket: attempt to drain queue when disconnected.")},e.prototype.failPending=function(){for(var e in this._queue){var t=this._queue[e];t.sent&&(delete this._queue[e],t.lose(0))}},e.prototype.maybeConnect=function(){var e=this;if(this._connected)this.drainQueue();else if(!this._connecting){this._connecting=!0;var t=("https:"==this._scheme?"wss:":"ws:")+"//"+this._host+"/rec/sock";this._sock=this._newSock(t),this._sock.onopen=function(t){e._connecting=!1,e._connected=!0,e.drainQueue()},this._sock.onmessage=function(t){e.handleMessage(t.data),e.drainQueue()},this._sock.onclose=function(t){o("socket: closed; reconnecting"),e._connecting=e._connected=!1,e.failPending()},this._sock.onerror=function(t){o("socket: error; reconnecting"),e._connecting=e._connected=!1,e.failPending()}}},e}(),Cs=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Rs=function(){function e(){var e=this;this.measurementTasks=null,this.performingMeasurements=!1,this.recursionDepth=0,this.performMeasurements=Mt.wrap(function(){if(e.performingMeasurements)Mt.sendToBugsnag("performMeasurements() already in progress","error");else{e.performingMeasurements=!0;try{if(!e.measurementTasks)return;for(var t=0;t<e.measurementTasks.length;t++)e.measurementTasks[t]();e.measurementTasks=null}finally{e.performingMeasurements=!1}}})}return e.create=function(e){return e.ResizeObserver?new As(e,e.ResizeObserver):s.requestWindowAnimationFrame&&e.MessageChannel?new xs(e,s.requestWindowAnimationFrame,e.MessageChannel):new Os(e)},e.prototype.requestMeasureTask=function(e){var t=this;if(this.recursionDepth>16)Mt.sendToBugsnag("Too much synchronous recursion in requestMeasureTask","error");else{var n=this.performingMeasurements?this.recursionDepth:0,r=Mt.wrap(function(){var r=t.recursionDepth;t.recursionDepth=n+1;try{e()}finally{t.recursionDepth=r}});this.measurementTasks?this.measurementTasks.push(r):(this.measurementTasks=[r],this.schedule())}},e.prototype.performMeasurementsNow=function(){this.performMeasurements()},e}(),As=function(e){function t(t,n){var r=e.call(this)||this;return r.wnd=t,r.ResizeObserver=n,r}return Cs(t,e),t.prototype.schedule=function(){var e=this,t=this.ResizeObserver,n=this.wnd.document,r=n.body||n.documentElement||n.head,i=new t(function(){i.unobserve(r),e.performMeasurements()});i.observe(r)},t}(Rs),xs=function(e){function t(t,n,r){var i=e.call(this)||this;return i.wnd=t,i.requestWindowAnimationFrame=n,i.onRAF=Mt.wrap(function(){i.ch.port2.postMessage(void 0)}),i.ch=new r,i}return Cs(t,e),t.prototype.schedule=function(){this.ch.port1.onmessage=this.performMeasurements,this.requestWindowAnimationFrame(this.wnd,this.onRAF)},t}(Rs),Os=function(e){function t(t){var n=e.call(this)||this;return n.wnd=t,n}return Cs(t,e),t.prototype.schedule=function(){s.setWindowTimeout(this.wnd,this.performMeasurements,0)},t}(Rs),Ms=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Ls=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Fs=function(){function e(){}return e.prototype.createTopRecorder=function(e){var t=e.window._fs_use_socket&&Is.isSupported()?new Is(e):new Ro(e);return new Yo(e,t)},e.prototype.createInnerRecorder=function(e){return new $o(e)},e}(),Ps=function(){function e(e,t){void 0===e&&(e=window),void 0===t&&(t=new Fs),this.wnd=e,this.recMaker=t,this.scheme="https:",this.domDoneLoaded=!1,this.waitingOnStart=!1,this.reidentifyCount=0}return e.prototype.init=function(){var e,t;k(this.wnd)||(e=this.wnd,t=T(this.wnd),e[w]=t,t in e||(e[t]={}),function(e){gs(this,void 0,et,function(){var t;return ms(this,function(n){switch(n.label){case 0:return[4,ys(e,s.snapshot)];case 1:return t=n.sent(),s.rebuildFromSnapshot(t),[2];}})})}(this.wnd),this.initApi(),this.start())},e.prototype.getCurrentSessionURL=function(e){return this.recorder?this.recorder.getCurrentSessionURL(e):null},e.prototype.getCurrentSession=function(){return this.recorder?this.recorder.getCurrentSession():null},e.prototype.enableConsole=function(){this.recorder&&this.recorder.console().enable()},e.prototype.disableConsole=function(){this.recorder&&this.recorder.console().disable()},e.prototype.log=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];this._api(Xo.log,e)},e.prototype.shutdownApi=function(){this.shutdown(V.Api)},e.prototype.shutdown=function(e){this.recorder&&!this.deferredStart?(this.recorder.shutdown(e),this.recorder=null):o("Recording already shut down.")},e.prototype.restart=function(){if(this.deferredStart)return this.deferredStart(),void(this.deferredStart=null);this.recorder?o("Recording already started."):this.recorder=this.createRecorder(!0)},e.prototype.splitPage=function(e,t){return Ms(this,void 0,et,function(){return Ls(this,function(n){switch(n.label){case 0:return t&&null==this.identity?(o("Can't re-identify from an iframe"),[2]):this.waitingOnStart?(this.splitPending=[e,t],[2]):(this.shutdown(e),[4,so(0)]);case 1:return n.sent(),[4,so(0)];case 2:return n.sent(),t&&this.identity&&this.identity.clear(),this.restart(),[2];}})})},e.prototype.executeApiSequence=function(e,t,n){if(this.inFrame())return o("API calls may only be made from the top-most frame"),null;for(var r,i,s=[],a=!1,u=0;u<t.length;u++)try{var c=t[u],h=c[0],d=c[1];switch(h){case Xo.rec:r=!!d;break;case Xo.log:var l=d,p=l[0],f=l.slice(1),v=e.console().logEvent(p,f);v&&s.push(v);break;case Xo.consent:i=!!d;break;case Xo.account:case Xo.user:case Xo.customEvent:var _=this.vars.api(h,d,n),g=_.events;_.reidentify&&(s=[],i=void 0,a=!0),s.push.apply(s,g);break;default:o("Unrecognized api: "+h);}}catch(e){Mt.sendToBugsnag(e,"error")}return{reidentified:a,recordingShouldBeEnabled:r,applyApi:function(){void 0!==i&&e.setConsent(i);for(var t=e.queue(),n=0,r=s;n<r.length;n++){var o=r[n];t.enqueue(o)}}}},e.prototype._api=function(e,t,n){var r;if(this.recorder){var i=null!==(r=this.executeApiSequence(this.recorder,[[e,t]],n))&&void 0!==r?r:{reidentified:!1,applyApi:function(){}},s=i.reidentified,a=i.recordingShouldBeEnabled,u=i.applyApi;if(s){if(this.reidentifyCount>=8)return void o("reidentified too many times; giving up");this.reidentifyCount++,W(this.wnd,[e,t]),this.splitPage(V.Reidentify,!0)}else u();void 0!==a&&(a?this.restart():this.shutdown(V.Api))}else W(this.wnd,[e,t])},e.prototype._cookies=function(){return this.identity?this.identity.cookies():(o("Error in FS integration: Can't get cookies from inside an iframe"),null)},e.prototype._setCookie=function(e,t){this.identity?this.identity.setCookie(e,t):o("Error in FS integration: Can't set cookies from inside an iframe")},e.prototype._withEventQueue=function(e,t){if(this.recorder){var n=this.recorder.queue(),r=this.recorder.pageSignature();null!=n&&null!=r?e===r?t(n):Mt.sendToBugsnag("Error in _withEventQueue: Page Signature mismatch","error",{pageSignature:r,callerSignature:e}):o("Error getting event queue or page signature: Recorder not initialized")}else o("Error in FS integration: Recorder not initialized")},e.prototype.initApi=function(){var e=I(this.wnd);e?(e.getCurrentSessionURL=_t(this.getCurrentSessionURL,this),e.getCurrentSession=_t(this.getCurrentSession,this),e.enableConsole=_t(this.enableConsole,this),e.disableConsole=_t(this.disableConsole,this),e.log=_t(this.log,this),e.shutdown=_t(this.shutdownApi,this),e.restart=_t(this.restart,this),e._api=_t(this._api,this),e._cookies=_t(this._cookies,this),e._setCookie=_t(this._setCookie,this),e._withEventQueue=_t(this._withEventQueue,this)):o("Missing browser API namespace; couldn't initialize API.")},e.prototype.start=function(){var e,t=this;e=L(this.wnd),r=e,o("script version UNSET (compiled at 1591209308)");var n=P(this.wnd);if(n){this.orgId=n;var i,s=(i=this.wnd)._fs_script||H(D(i));if(s){this.script=s;var a=F(this.wnd);if(a){this.recHost=a;var u=function(e){return e._fs_app_host||B(D(e))}(this.wnd);u?(this.appHost=u,o("script: "+this.script),o("recording host: "+this.recHost),o("orgid: "+this.orgId),"localhost:8080"==this.recHost&&(this.scheme="http:"),this.inFrame()||(this.identity=new ts(this.wnd.document,function(e){for(var n,r=0,i=e;r<i.length;r++){var o=i[r];null===(n=t.recorder)||void 0===n||n.queue().enqueue({Kind:R.STORAGE_WRITE_FAILURE,Args:o})}}),this.vars=new ps(this.identity),this.identity.initFromCookies(this.recHost,this.orgId)),this.canRecord(this.orgId)?(this.recorder=this.createRecorder(),this.recorder.eventWatcher().watchEvents(),this.hookLoadEvents(),this.wnd.addEventListener("message",Mt.wrap(function(e){if("string"==typeof e.data&&(e.source==t.wnd.parent||e.source==t.wnd))switch(Bo(e.data)[0]){case"ShutdownFrame":t.shutdown(V.FsShutdownFrame);break;case"RestartFrame":t.restart();}}))):this.hailMary()):o("Missing global _fs_host or _fs_app_host. Recording disabled.")}else o("Missing global _fs_host or _fs_rec_host. Recording disabled.")}else o("Missing global _fs_host or _fs_rec_host. Recording disabled.")}else o("Missing global _fs_org. Recording disabled.")},e.prototype._context=function(e){var t,n=this,r=s.mathRound(null!==(t=ie(function(){var e;return null===(e=window.performance)||void 0===e?void 0:e.now()})())&&void 0!==t?t:-1);return{window:this.wnd,time:new rn,measurer:Rs.create(this.wnd),options:{orgId:this.orgId,scheme:this.scheme,script:this.script,recHost:this.recHost,appHost:this.appHost},recording:{bundleUploadInterval:function(){return e().bundleUploadInterval()},preroll:r,inFrame:this.inFrame(),vars:this.vars,identity:this.identity,splitPage:function(e,t){return n.splitPage(e,t)},pageSignature:function(){return e().pageSignature()}},queue:function(){return e().queue()}}},e.prototype.createRecorder=function(e){var t,n,r=this,i=this._context(function(){return n}),o=!1,s=!1;if(this.inFrame())n=this.recMaker.createInnerRecorder(i);else{n=this.recMaker.createTopRecorder(i);var a=null!==(t=this.executeApiSequence(n,function(e){var t=I(e);if(!t)return[];var n=t.q;return n?(delete t.q,n):[]}(this.wnd)))&&void 0!==t?t:{applyApi:function(){}},u=a.reidentified,c=a.recordingShouldBeEnabled,h=a.applyApi;void 0!==c&&(s=!c),o=!!u,h()}this.waitingOnStart=!0;var d=function(){n.start(o,function(){r.waitingOnStart=!1,e&&n.tellAllFramesTo(["RestartFrame"]),r.splitPending&&(r.splitPage(r.splitPending[0],r.splitPending[1]),r.splitPending=null)}),e&&n.eventWatcher().watchEvents()};return s?this.deferredStart=d:d(),n},e.prototype.inFrame=function(){if("boolean"==typeof this._inFrame)return this._inFrame;var e=N(this.wnd);return q(this.wnd)?this._inFrame=!1:this.wnd!=top?this._inFrame=!0:e?e.init&&e.init(this.orgId)&&(this._inFrame=!0):this._inFrame=!1,this._inFrame},e.prototype.canRecord=function(e){return(this.wnd.MutationObserver||this.wnd.MutationEvent)&&this.wnd.postMessage&&it&&2!==s.snapshot.status?!!function e(t){if(t==top||q(t)||function(e){return!!e._fs_run_in_iframe}(t)||N(t))return!0;try{return t.parent.document,e(t.parent)}catch(e){return!1}}(this.wnd)||(o("FullStory recording for this page is NOT allowed within an iFrame."),!1):(o("missing required browser features"),!1)},e.prototype.hailMary=function(){var e,t=this;if(this.identity){var n=U(this.wnd);o("Unable to record playback stream.");var r=document.createElement("script");this.wnd.__fs_startResponse=function(e){e&&t.identity.setIds(t.wnd,e.CookieDomain,e.UserIntId,e.SessionIntId),document.head&&document.head.removeChild(r)};var i=Vt(this.wnd.document),a=i[0],u=i[1],c=bt(this.wnd),h=c[0],d=c[1],l=ur(Jn(this.wnd),this.orgId,{source:"page",type:"base"}),p=ur(document.referrer,this.orgId,{source:"page",type:"referrer"}),f=ur(this.wnd.location.href,this.orgId,{source:"page",type:"url"}),v=s.mathRound(null!==(e=ie(function(){var e;return null===(e=window.performance)||void 0===e?void 0:e.now()})())&&void 0!==e?e:-1);r.src="//"+this.recHost+"/rec/page?OrgId="+this.orgId+"&UserId="+this.identity.userId()+"&Url="+encodeURIComponent(f)+"&Base="+encodeURIComponent(l)+"&Width="+a+"&Height="+u+"&ScreenWidth="+h+"&ScreenHeight="+d+"&Referrer="+encodeURIComponent(p)+"&Doctype="+encodeURIComponent(yt(document))+"&Preroll="+v+"&CompiledTimestamp=1591209308&Fallback=true"+(n?"&ReplayFlags="+n:""),document.head&&document.head.appendChild(r)}},e.prototype.hookLoadEvents=function(){var e=this,t=function(){e.domDoneLoaded||(e.domDoneLoaded=!0,e.recorder&&e.recorder.onDomLoad())},n=!1,r=function(){n||(n=!0,e.recorder&&e.recorder.onLoad())};switch(document.readyState){case"interactive":document.attachEvent||t();break;case"complete":t(),r();}this.domDoneLoaded||document.addEventListener("DOMContentLoaded",Mt.wrap(t)),n||this.wnd.addEventListener("load",Mt.wrap(function(e){t(),r()}))},e}();!function(){try{new Ps().init()}catch(e){Mt.sendToBugsnag(e,"error"),L(window)&&window.console&&console.log&&console.log("Failed to initialize FullStory.")}}()}]);
\ No newline at end of file
diff --git a/x-pack/plugins/cloud/server/config.test.ts b/x-pack/plugins/cloud/server/config.test.ts
index 7cd3b71223423..9581bf8fd48b8 100644
--- a/x-pack/plugins/cloud/server/config.test.ts
+++ b/x-pack/plugins/cloud/server/config.test.ts
@@ -9,13 +9,13 @@ import { config } from './config';
 
 describe('xpack.cloud config', () => {
   describe('full_story', () => {
-    it('allows orgId when enabled: false', () => {
+    it('allows org_id when enabled: false', () => {
       expect(() =>
         config.schema.validate({ full_story: { enabled: false, org_id: 'asdf' } })
       ).not.toThrow();
     });
 
-    it('rejects undefined or empty orgId when enabled: true', () => {
+    it('rejects undefined or empty org_id when enabled: true', () => {
       expect(() =>
         config.schema.validate({ full_story: { enabled: true } })
       ).toThrowErrorMatchingInlineSnapshot(
@@ -28,7 +28,7 @@ describe('xpack.cloud config', () => {
       );
     });
 
-    it('accepts orgId when enabled: true', () => {
+    it('accepts org_id when enabled: true', () => {
       expect(() =>
         config.schema.validate({ full_story: { enabled: true, org_id: 'asdf' } })
       ).not.toThrow();
diff --git a/x-pack/plugins/cloud/server/plugin.ts b/x-pack/plugins/cloud/server/plugin.ts
index fea8be9f934e1..4c0b7b7f7eca6 100644
--- a/x-pack/plugins/cloud/server/plugin.ts
+++ b/x-pack/plugins/cloud/server/plugin.ts
@@ -11,6 +11,7 @@ import { CloudConfigType } from './config';
 import { registerCloudUsageCollector } from './collectors';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
 import { parseDeploymentIdFromDeploymentUrl } from './utils';
+import { registerFullstoryRoute } from './routes/fullstory';
 
 interface PluginsSetup {
   usageCollection?: UsageCollectionSetup;
@@ -40,6 +41,13 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     const isCloudEnabled = getIsCloudEnabled(this.config.id);
     registerCloudUsageCollector(usageCollection, { isCloudEnabled });
 
+    if (this.config.full_story.enabled) {
+      registerFullstoryRoute({
+        httpResources: core.http.resources,
+        packageInfo: this.context.env.packageInfo,
+      });
+    }
+
     return {
       cloudId: this.config.id,
       deploymentId: parseDeploymentIdFromDeploymentUrl(this.config.deployment_url),
diff --git a/x-pack/plugins/cloud/server/routes/fullstory.test.ts b/x-pack/plugins/cloud/server/routes/fullstory.test.ts
new file mode 100644
index 0000000000000..dae541a8c033c
--- /dev/null
+++ b/x-pack/plugins/cloud/server/routes/fullstory.test.ts
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+jest.mock('fs/promises');
+import { renderFullStoryLibraryFactory, FULLSTORY_LIBRARY_PATH } from './fullstory';
+import fs from 'fs/promises';
+
+const fsMock = fs as jest.Mocked<typeof fs>;
+
+describe('renderFullStoryLibraryFactory', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    fsMock.readFile.mockResolvedValue(Buffer.from('fake fs src'));
+  });
+  afterAll(() => jest.restoreAllMocks());
+
+  it('successfully returns file contents', async () => {
+    const render = renderFullStoryLibraryFactory();
+
+    const { body } = await render();
+    expect(fsMock.readFile).toHaveBeenCalledWith(FULLSTORY_LIBRARY_PATH);
+    expect(body.toString()).toEqual('fake fs src');
+  });
+
+  it('only reads from file system once callback is invoked', async () => {
+    const render = renderFullStoryLibraryFactory();
+    expect(fsMock.readFile).not.toHaveBeenCalled();
+    await render();
+    expect(fsMock.readFile).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not read from filesystem on subsequent calls', async () => {
+    const render = renderFullStoryLibraryFactory();
+    await render();
+    expect(fsMock.readFile).toHaveBeenCalledTimes(1);
+    await render();
+    expect(fsMock.readFile).toHaveBeenCalledTimes(1);
+    await render();
+    expect(fsMock.readFile).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns max-age cache-control in dist', async () => {
+    const render = renderFullStoryLibraryFactory(true);
+    const { headers } = await render();
+    expect(headers).toEqual({
+      'cache-control': 'max-age=31536000',
+    });
+  });
+
+  it('returns must-revalidate cache-control and sha1 etag in dev', async () => {
+    const render = renderFullStoryLibraryFactory(false);
+    const { headers } = await render();
+    expect(headers).toEqual({
+      'cache-control': 'must-revalidate',
+      etag: '1e02f94b45750ba9284c111d31ae7e59c13b8e6e',
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud/server/routes/fullstory.ts b/x-pack/plugins/cloud/server/routes/fullstory.ts
new file mode 100644
index 0000000000000..c614d803eed9f
--- /dev/null
+++ b/x-pack/plugins/cloud/server/routes/fullstory.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 path from 'path';
+import fs from 'fs/promises';
+import { createHash } from 'crypto';
+import { once } from 'lodash';
+import { HttpResources, HttpResponseOptions, PackageInfo } from '../../../../../src/core/server';
+
+const MINUTE = 60;
+const HOUR = 60 * MINUTE;
+const DAY = 24 * HOUR;
+
+/** @internal exported for testing */
+export const FULLSTORY_LIBRARY_PATH = path.join(__dirname, '..', 'assets', 'fullstory_library.js');
+
+/** @internal exported for testing */
+export const renderFullStoryLibraryFactory = (dist = true) =>
+  once(
+    async (): Promise<{
+      body: Buffer;
+      headers: HttpResponseOptions['headers'];
+    }> => {
+      const srcBuffer = await fs.readFile(FULLSTORY_LIBRARY_PATH);
+      const hash = createHash('sha1');
+      hash.update(srcBuffer);
+      const hashDigest = hash.digest('hex');
+
+      return {
+        body: srcBuffer,
+        // In dist mode, return a long max-age, otherwise use etag + must-revalidate
+        headers: dist
+          ? { 'cache-control': `max-age=${DAY * 365}` }
+          : { 'cache-control': 'must-revalidate', etag: hashDigest },
+      };
+    }
+  );
+
+export const registerFullstoryRoute = ({
+  httpResources,
+  packageInfo,
+}: {
+  httpResources: HttpResources;
+  packageInfo: Readonly<PackageInfo>;
+}) => {
+  const renderFullStoryLibrary = renderFullStoryLibraryFactory(packageInfo.dist);
+
+  /**
+   * Register a custom JS endpoint in order to acheive best caching possible with `max-age` similar to plugin bundles.
+   */
+  httpResources.register(
+    {
+      // Use the build number in the URL path to leverage max-age caching on production builds
+      path: `/internal/cloud/${packageInfo.buildNum}/fullstory.js`,
+      validate: false,
+      options: {
+        authRequired: false,
+      },
+    },
+    async (context, req, res) => {
+      try {
+        return res.renderJs(await renderFullStoryLibrary());
+      } catch (e) {
+        return res.customError({
+          body: `Could not load FullStory library from disk due to error: ${e.toString()}`,
+          statusCode: 500,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/test/cloud_integration/config.ts b/x-pack/test/cloud_integration/config.ts
new file mode 100644
index 0000000000000..a012dfd1ad34b
--- /dev/null
+++ b/x-pack/test/cloud_integration/config.ts
@@ -0,0 +1,87 @@
+/*
+ * 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 { resolve } from 'path';
+import { FtrConfigProviderContext } from '@kbn/test';
+import { services } from '../functional/services';
+import { pageObjects } from '../functional/page_objects';
+
+const FULLSTORY_ORG_ID = process.env.FULLSTORY_ORG_ID;
+const FULLSTORY_API_KEY = process.env.FULLSTORY_API_KEY;
+const RUN_FULLSTORY_TESTS = Boolean(FULLSTORY_ORG_ID && FULLSTORY_API_KEY);
+
+// the default export of config files must be a config provider
+// that returns an object with the projects config values
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const kibanaCommonConfig = await readConfigFile(
+    require.resolve('../../../test/common/config.js')
+  );
+  const kibanaFunctionalConfig = await readConfigFile(
+    require.resolve('../../../test/functional/config.js')
+  );
+
+  const kibanaPort = kibanaFunctionalConfig.get('servers.kibana.port');
+  const idpPath = resolve(__dirname, './fixtures/saml/saml_provider/metadata.xml');
+  const samlIdPPlugin = resolve(__dirname, './fixtures/saml/saml_provider');
+
+  return {
+    testFiles: [...(RUN_FULLSTORY_TESTS ? [resolve(__dirname, './tests/fullstory')] : [])],
+
+    services,
+    pageObjects,
+
+    servers: kibanaFunctionalConfig.get('servers'),
+
+    esTestCluster: {
+      license: 'trial',
+      from: 'snapshot',
+      serverArgs: [
+        'xpack.security.authc.token.enabled=true',
+        'xpack.security.authc.realms.saml.saml1.order=0',
+        `xpack.security.authc.realms.saml.saml1.idp.metadata.path=${idpPath}`,
+        'xpack.security.authc.realms.saml.saml1.idp.entity_id=http://www.elastic.co/saml1',
+        `xpack.security.authc.realms.saml.saml1.sp.entity_id=http://localhost:${kibanaPort}`,
+        `xpack.security.authc.realms.saml.saml1.sp.logout=http://localhost:${kibanaPort}/logout`,
+        `xpack.security.authc.realms.saml.saml1.sp.acs=http://localhost:${kibanaPort}/api/security/saml/callback`,
+        'xpack.security.authc.realms.saml.saml1.attributes.principal=http://saml.elastic-cloud.com/attributes/principal',
+        'xpack.security.authc.realms.saml.saml1.attributes.groups=http://saml.elastic-cloud.com/attributes/roles',
+      ],
+    },
+
+    kbnTestServer: {
+      ...kibanaCommonConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...kibanaCommonConfig.get('kbnTestServer.serverArgs'),
+        `--plugin-path=${samlIdPPlugin}`,
+        '--server.uuid=5b2de169-2785-441b-ae8c-186a1936b17d',
+        '--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
+        '--xpack.security.authc.selector.enabled=false',
+        '--xpack.security.authc.providers.saml.saml1.order=0',
+        '--xpack.security.authc.providers.saml.saml1.realm=saml1',
+        '--xpack.security.authc.providers.basic.basic1.order=1',
+        ...(RUN_FULLSTORY_TESTS
+          ? [
+              '--xpack.cloud.full_story.enabled=true',
+              `--xpack.cloud.full_story.org_id=${FULLSTORY_ORG_ID}`,
+            ]
+          : []),
+      ],
+    },
+    uiSettings: {
+      defaults: {
+        'accessibility:disableAnimations': true,
+        'dateFormat:tz': 'UTC',
+      },
+    },
+    apps: kibanaFunctionalConfig.get('apps'),
+    screenshots: { directory: resolve(__dirname, 'screenshots') },
+
+    junit: {
+      reportName: 'Chrome X-Pack Cloud Integration Functional Tests (SAML)',
+    },
+  };
+}
diff --git a/x-pack/test/cloud_integration/constants.ts b/x-pack/test/cloud_integration/constants.ts
new file mode 100644
index 0000000000000..95c5477fbe97b
--- /dev/null
+++ b/x-pack/test/cloud_integration/constants.ts
@@ -0,0 +1,8 @@
+/*
+ * 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 CLOUD_USER_ID = `1112244`;
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/kibana.json b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/kibana.json
new file mode 100644
index 0000000000000..81ec23fc3d2f3
--- /dev/null
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "samlProviderPlugin",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
new file mode 100644
index 0000000000000..19a6c13264144
--- /dev/null
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                     entityID="http://www.elastic.co/saml1">
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false"
+                       protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
+wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
+FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
+OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
+s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
+vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
+BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
+V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
+z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
++frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
+TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
+b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
+cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
+eOUsdwn1yDKHRxDHyA==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                            Location="/saml_provider/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+                            Location="/saml_provider/logout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                            Location="/saml_provider/login"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+                            Location="/saml_provider/login"/>
+  </md:IDPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
new file mode 100644
index 0000000000000..4ae669256d3a8
--- /dev/null
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { PluginInitializer } from '../../../../../../../src/core/server';
+import { initRoutes } from './init_routes';
+
+export const plugin: PluginInitializer<void, void> = () => ({
+  setup: (core) => initRoutes(core),
+  start: () => {},
+  stop: () => {},
+});
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
new file mode 100644
index 0000000000000..6bea9af2ed310
--- /dev/null
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 { CoreSetup } from '../../../../../../../src/core/server';
+import { getSAMLResponse, getSAMLRequestId } from './saml_tools';
+
+export function initRoutes(core: CoreSetup) {
+  const serverInfo = core.http.getServerInfo();
+  core.http.resources.register(
+    {
+      path: '/saml_provider/login',
+      validate: false,
+      options: { authRequired: false },
+    },
+    async (context, request, response) => {
+      const samlResponse = await getSAMLResponse({
+        inResponseTo: await getSAMLRequestId(request.url.href!),
+        destination: `${serverInfo.protocol}://${serverInfo.hostname}:${serverInfo.port}/api/security/saml/callback`,
+      });
+
+      return response.renderHtml({
+        body: `
+          <!DOCTYPE html>
+          <title>Kibana SAML Login</title>
+          <link rel="icon" href="data:,">
+          <script defer src="/saml_provider/login/submit.js"></script>
+          <body>
+            <form id="loginForm" method="post" action="/api/security/saml/callback">
+                <input name="SAMLResponse" type="hidden" value="${samlResponse}" />
+            </form>
+          </body>
+        `,
+      });
+    }
+  );
+
+  core.http.resources.register(
+    { path: '/saml_provider/login/submit.js', validate: false, options: { authRequired: false } },
+    (context, request, response) => {
+      return response.renderJs({ body: 'document.getElementById("loginForm").submit();' });
+    }
+  );
+
+  core.http.resources.register(
+    {
+      path: '/saml_provider/logout',
+      validate: false,
+      options: { authRequired: false },
+    },
+    async (context, request, response) => {
+      return response.redirected({ headers: { location: '/logout?SAMLResponse=something' } });
+    }
+  );
+}
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/saml_tools.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/saml_tools.ts
new file mode 100644
index 0000000000000..da902d332e6e7
--- /dev/null
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/saml_tools.ts
@@ -0,0 +1,161 @@
+/*
+ * 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 crypto from 'crypto';
+import fs from 'fs';
+import { stringify } from 'query-string';
+import url from 'url';
+import zlib from 'zlib';
+import { promisify } from 'util';
+import { parseString } from 'xml2js';
+import { SignedXml } from 'xml-crypto';
+import { KBN_KEY_PATH } from '@kbn/dev-utils';
+import { CLOUD_USER_ID } from '../../../../constants';
+
+/**
+ * @file Defines a set of tools that allow us to parse and generate various SAML XML messages.
+ * The format of these XML messages is a minimum accepted by Elasticsearch and based on the format
+ * used by `Auth0` identity provider, `auth0/node-samlp` package and SAML 2.0 Specification:
+ * http://docs.oasis-open.org/security/saml/v2.0/saml-bindings-2.0-os.pdf.
+ */
+
+const inflateRawAsync = promisify(zlib.inflateRaw);
+const deflateRawAsync = promisify(zlib.deflateRaw);
+const parseStringAsync = promisify(parseString);
+
+const signingKey = fs.readFileSync(KBN_KEY_PATH);
+const signatureAlgorithm = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
+
+export async function getSAMLRequestId(urlWithSAMLRequestId: string) {
+  const inflatedSAMLRequest = (await inflateRawAsync(
+    Buffer.from(
+      url.parse(urlWithSAMLRequestId, true /* parseQueryString */).query.SAMLRequest as string,
+      'base64'
+    )
+  )) as Buffer;
+
+  const parsedSAMLRequest = (await parseStringAsync(inflatedSAMLRequest.toString())) as any;
+  return parsedSAMLRequest['saml2p:AuthnRequest'].$.ID;
+}
+
+export async function getSAMLResponse({
+  destination,
+  inResponseTo,
+  sessionIndex,
+  username = 'a@b.c',
+  issuer = 'http://www.elastic.co/saml1',
+}: {
+  destination?: string;
+  inResponseTo?: string;
+  sessionIndex?: string;
+  username?: string;
+  issuer?: string;
+} = {}) {
+  const issueInstant = new Date().toISOString();
+  const notOnOrAfter = new Date(Date.now() + 3600 * 1000).toISOString();
+
+  const samlAssertionTemplateXML = `
+    <saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0"
+                    ID="_RPs1WfOkul8lZ72DtJtes0BKyPgaCamg" IssueInstant="${issueInstant}">
+      <saml:Issuer>${issuer}</saml:Issuer>
+      <saml:Subject>
+        <saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">a@b.c</saml:NameID>
+        <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+          <saml:SubjectConfirmationData NotOnOrAfter="${notOnOrAfter}"
+                                        Recipient="${destination}"
+                                        ${inResponseTo ? `InResponseTo="${inResponseTo}"` : ''} />
+        </saml:SubjectConfirmation>
+      </saml:Subject>
+      <saml:AuthnStatement AuthnInstant="${issueInstant}" SessionIndex="${sessionIndex}">
+        <saml:AuthnContext>
+          <saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef>
+        </saml:AuthnContext>
+      </saml:AuthnStatement>
+      <saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <saml:Attribute FriendlyName="principal" Name="http://saml.elastic-cloud.com/attributes/principal" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+          <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">${CLOUD_USER_ID}</saml:AttributeValue>
+        </saml:Attribute>
+        <saml:Attribute FriendlyName="roles" Name="http://saml.elastic-cloud.com/attributes/roles" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+          <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">superuser</saml:AttributeValue>
+        </saml:Attribute>
+      </saml:AttributeStatement>
+    </saml:Assertion>
+  `;
+
+  const signature = new SignedXml();
+  signature.signatureAlgorithm = signatureAlgorithm;
+  signature.signingKey = signingKey;
+
+  // Adds a reference to a `Assertion` xml element and an array of transform algorithms to be used during signing.
+  signature.addReference(
+    `//*[local-name(.)='Assertion']`,
+    [
+      'http://www.w3.org/2000/09/xmldsig#enveloped-signature',
+      'http://www.w3.org/2001/10/xml-exc-c14n#',
+    ],
+    'http://www.w3.org/2001/04/xmlenc#sha256'
+  );
+
+  signature.computeSignature(samlAssertionTemplateXML, {
+    location: { reference: `//*[local-name(.)='Issuer']`, action: 'after' },
+  });
+
+  return Buffer.from(
+    `
+    <samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" ID="_bdf1d51245ed0f71aa23"
+                  ${inResponseTo ? `InResponseTo="${inResponseTo}"` : ''} Version="2.0"
+                  IssueInstant="${issueInstant}"
+                  Destination="${destination}">
+      <saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">${issuer}</saml:Issuer>
+      <samlp:Status>
+        <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
+      </samlp:Status>${signature.getSignedXml()}
+    </samlp:Response>
+  `
+  ).toString('base64');
+}
+
+export async function getLogoutRequest({
+  destination,
+  sessionIndex,
+  issuer = 'http://www.elastic.co/saml1',
+}: {
+  destination: string;
+  sessionIndex: string;
+  issuer?: string;
+}) {
+  const issueInstant = new Date().toISOString();
+  const logoutRequestTemplateXML = `
+      <samlp:LogoutRequest ID="_d71a01e2f5ca2b88bf85" Version="2.0" IssueInstant="${issueInstant}"
+                         Destination="${destination}"
+                         Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
+                         xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol">
+      <Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">${issuer}</Issuer>
+      <NameID xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
+              Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">a@b.c</NameID>
+      <samlp:SessionIndex>${sessionIndex}</samlp:SessionIndex>
+    </samlp:LogoutRequest>
+  `;
+
+  // HTTP-Redirect with deflate encoding:
+  // http://docs.oasis-open.org/security/saml/v2.0/saml-bindings-2.0-os.pdf - section 3.4.4.1
+  const deflatedLogoutRequest = (await deflateRawAsync(
+    Buffer.from(logoutRequestTemplateXML)
+  )) as Buffer;
+
+  const queryStringParameters: Record<string, string> = {
+    SAMLRequest: deflatedLogoutRequest.toString('base64'),
+    SigAlg: signatureAlgorithm,
+  };
+
+  const signer = crypto.createSign('RSA-SHA256');
+  signer.update(stringify(queryStringParameters, { sort: false }));
+  queryStringParameters.Signature = signer.sign(signingKey.toString(), 'base64');
+
+  return queryStringParameters;
+}
diff --git a/x-pack/test/cloud_integration/ftr_provider_context.d.ts b/x-pack/test/cloud_integration/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..66d4e37b795ca
--- /dev/null
+++ b/x-pack/test/cloud_integration/ftr_provider_context.d.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 { GenericFtrProviderContext } from '@kbn/test';
+
+import { pageObjects } from '../functional/page_objects';
+import { services } from '../functional/services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/cloud_integration/tests/fullstory.ts b/x-pack/test/cloud_integration/tests/fullstory.ts
new file mode 100644
index 0000000000000..1cdad719e94e5
--- /dev/null
+++ b/x-pack/test/cloud_integration/tests/fullstory.ts
@@ -0,0 +1,66 @@
+/*
+ * 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';
+import fetch from 'node-fetch';
+import { sha256 } from 'js-sha256';
+import { FtrProviderContext } from '../ftr_provider_context';
+import { CLOUD_USER_ID } from '../constants';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const browser = getService('browser');
+  const find = getService('find');
+  const PageObjects = getPageObjects(['common']);
+
+  const delay = (ms: number) => new Promise((r) => setTimeout(r, ms));
+
+  describe('Cloud FullStory integration', function () {
+    before(async () => {
+      // Create role mapping so user gets superuser access
+      await getService('esSupertest')
+        .post('/_security/role_mapping/saml1')
+        .send({ roles: ['superuser'], enabled: true, rules: { field: { 'realm.name': 'saml1' } } })
+        .expect(200);
+    });
+
+    it('initializes FullStory', async () => {
+      await PageObjects.common.navigateToApp('home');
+      await find.byCssSelector('[data-test-subj="userMenuButton"]', 20000);
+
+      // Check FullStory library loaded
+      // @ts-expect-error
+      expect(await browser.execute(() => typeof window.FSKibana === 'function')).to.eql(true);
+    });
+
+    it('records a FullStory session with the associated SAML user', async () => {
+      // Get session ID once fullstory has initialized
+      let sessionUrl: string | null = null;
+      let attempts = 0;
+      while (sessionUrl === null && attempts < 30) {
+        // @ts-expect-error
+        sessionUrl = await browser.execute(() => window.FSKibana.getCurrentSessionURL());
+        attempts++;
+        await delay(1000);
+      }
+      expect(typeof sessionUrl).to.eql('string');
+      sessionUrl = sessionUrl!.replace('%3A', ':'); // undo encoding so comparisons work with API response
+
+      // Check that the session was recorded in the FS API for the given user based on their hashed ID
+      const hashedUserId = sha256(CLOUD_USER_ID);
+      const fsSessions = await fetch(
+        `https://www.fullstory.com/api/v1/sessions?uid=${hashedUserId}&limit=100`,
+        {
+          headers: {
+            'content-type': 'application/json',
+            Authorization: `Basic ${process.env.FULLSTORY_API_KEY}`,
+          },
+        }
+      ).then((r) => r.json());
+      expect(fsSessions.find((s: any) => s.FsUrl === sessionUrl)).not.to.be(undefined);
+    });
+  });
+}
diff --git a/yarn.lock b/yarn.lock
index 448c97ff82469..9d7569b6ab4f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17600,6 +17600,11 @@ js-search@^1.4.3:
   resolved "https://registry.yarnpkg.com/js-search/-/js-search-1.4.3.tgz#23a86d7e064ca53a473930edc48615b6b1c1954a"
   integrity sha512-Sny5pf00kX1sM1KzvUC9nGYWXOvBfy30rmvZWeRktpg+esQKedIXrXNee/I2CAnsouCyaTjitZpRflDACx4toA==
 
+js-sha256@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
+  integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
+
 js-sha3@0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"

From 67d4c3184efc3c909ae0e9ca819f3a7429327195 Mon Sep 17 00:00:00 2001
From: Kuldeep M <crudetoaster@gmail.com>
Date: Thu, 24 Jun 2021 20:10:22 +0100
Subject: [PATCH 68/95] [Workplace Search] source connection panel content
 vertical alignment (#103225)

* fix 1786 source connection panel vertical alignment

* Update x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Constance <constancecchen@users.noreply.github.com>
---
 .../components/add_source/configured_sources_list.tsx      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
index ac19043a30ca6..6da09acf45cbe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
@@ -70,7 +70,12 @@ export const ConfiguredSourcesList: React.FC<ConfiguredSourcesProps> = ({
         <React.Fragment key={i}>
           <EuiFlexItem>
             <EuiPanel paddingSize="s">
-              <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
+              <EuiFlexGroup
+                alignItems="center"
+                gutterSize="none"
+                responsive={false}
+                className="eui-fullHeight"
+              >
                 <EuiFlexItem>
                   <EuiFlexGroup
                     justifyContent="flexStart"

From 9ba1ead7c8fb640edbf80c9dc2f4aaa361b1baf0 Mon Sep 17 00:00:00 2001
From: Kerry Gallagher <471693+Kerry350@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:12:52 +0100
Subject: [PATCH 69/95] [Logs UI] Log threshold rule performance improvements
 (#102650)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add optimisations for executor / chart previews

Co-authored-by: Felix Stürmer <weltenwort@users.noreply.github.com>
---
 .../alerting/logs/log_threshold/types.ts      | 108 +++--
 .../http_api/log_alerts/chart_preview_data.ts |   9 +
 .../criterion_preview_chart.tsx               |  13 +-
 .../components/expression_editor/editor.tsx   |  25 +
 .../log_threshold_chart_preview.ts            |  54 ++-
 .../log_threshold_executor.test.ts            | 455 ++++++++----------
 .../log_threshold/log_threshold_executor.ts   | 154 ++++--
 7 files changed, 483 insertions(+), 335 deletions(-)

diff --git a/x-pack/plugins/infra/common/alerting/logs/log_threshold/types.ts b/x-pack/plugins/infra/common/alerting/logs/log_threshold/types.ts
index f1e983fc34df8..6da0bb58e4e85 100644
--- a/x-pack/plugins/infra/common/alerting/logs/log_threshold/types.ts
+++ b/x-pack/plugins/infra/common/alerting/logs/log_threshold/types.ts
@@ -100,7 +100,7 @@ export enum AlertStates {
   ERROR,
 }
 
-const ThresholdRT = rt.type({
+export const ThresholdRT = rt.type({
   comparator: ComparatorRT,
   value: rt.number,
 });
@@ -240,31 +240,43 @@ const chartPreviewHistogramBucket = rt.type({
   doc_count: rt.number,
 });
 
+const ChartPreviewBucketsRT = rt.partial({
+  histogramBuckets: rt.type({
+    buckets: rt.array(chartPreviewHistogramBucket),
+  }),
+});
+
 // ES query responses //
+const hitsRT = rt.type({
+  total: rt.type({
+    value: rt.number,
+  }),
+});
+
+const bucketFieldsRT = rt.type({
+  key: rt.record(rt.string, rt.string),
+  doc_count: rt.number,
+});
+
+const afterKeyRT = rt.partial({
+  after_key: rt.record(rt.string, rt.string),
+});
+
 export const UngroupedSearchQueryResponseRT = rt.intersection([
   commonSearchSuccessResponseFieldsRT,
   rt.intersection([
     rt.type({
-      hits: rt.type({
-        total: rt.type({
-          value: rt.number,
-        }),
-      }),
+      hits: hitsRT,
     }),
-    // Chart preview buckets
     rt.partial({
-      aggregations: rt.type({
-        histogramBuckets: rt.type({
-          buckets: rt.array(chartPreviewHistogramBucket),
-        }),
-      }),
+      aggregations: ChartPreviewBucketsRT,
     }),
   ]),
 ]);
 
 export type UngroupedSearchQueryResponse = rt.TypeOf<typeof UngroupedSearchQueryResponseRT>;
 
-export const GroupedSearchQueryResponseRT = rt.intersection([
+export const UnoptimizedGroupedSearchQueryResponseRT = rt.intersection([
   commonSearchSuccessResponseFieldsRT,
   rt.type({
     aggregations: rt.type({
@@ -272,33 +284,73 @@ export const GroupedSearchQueryResponseRT = rt.intersection([
         rt.type({
           buckets: rt.array(
             rt.type({
-              key: rt.record(rt.string, rt.string),
-              doc_count: rt.number,
+              ...bucketFieldsRT.props,
               filtered_results: rt.intersection([
                 rt.type({
                   doc_count: rt.number,
                 }),
-                // Chart preview buckets
-                rt.partial({
-                  histogramBuckets: rt.type({
-                    buckets: rt.array(chartPreviewHistogramBucket),
-                  }),
-                }),
+                ChartPreviewBucketsRT,
               ]),
             })
           ),
         }),
-        rt.partial({
-          after_key: rt.record(rt.string, rt.string),
-        }),
+        afterKeyRT,
       ]),
     }),
-    hits: rt.type({
-      total: rt.type({
-        value: rt.number,
-      }),
+    hits: hitsRT,
+  }),
+]);
+
+export type UnoptimizedGroupedSearchQueryResponse = rt.TypeOf<
+  typeof UnoptimizedGroupedSearchQueryResponseRT
+>;
+
+export const OptimizedGroupedSearchQueryResponseRT = rt.intersection([
+  commonSearchSuccessResponseFieldsRT,
+  rt.type({
+    aggregations: rt.type({
+      groups: rt.intersection([
+        rt.type({
+          buckets: rt.array(rt.intersection([bucketFieldsRT, ChartPreviewBucketsRT])),
+        }),
+        afterKeyRT,
+      ]),
     }),
+    hits: hitsRT,
   }),
 ]);
 
+export type OptimizedGroupedSearchQueryResponse = rt.TypeOf<
+  typeof OptimizedGroupedSearchQueryResponseRT
+>;
+
+export const GroupedSearchQueryResponseRT = rt.union([
+  UnoptimizedGroupedSearchQueryResponseRT,
+  OptimizedGroupedSearchQueryResponseRT,
+]);
+
 export type GroupedSearchQueryResponse = rt.TypeOf<typeof GroupedSearchQueryResponseRT>;
+
+export const isOptimizedGroupedSearchQueryResponse = (
+  response: GroupedSearchQueryResponse['aggregations']['groups']['buckets']
+): response is OptimizedGroupedSearchQueryResponse['aggregations']['groups']['buckets'] => {
+  const result = response[0];
+  return result && !result.hasOwnProperty('filtered_results');
+};
+
+export const isOptimizableGroupedThreshold = (
+  selectedComparator: AlertParams['count']['comparator'],
+  selectedValue?: AlertParams['count']['value']
+) => {
+  if (selectedComparator === Comparator.GT) {
+    return true;
+  } else if (
+    typeof selectedValue === 'number' &&
+    selectedComparator === Comparator.GT_OR_EQ &&
+    selectedValue > 0
+  ) {
+    return true;
+  } else {
+    return false;
+  }
+};
diff --git a/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts b/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
index e6baca305508e..5f488dd532285 100644
--- a/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
+++ b/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
@@ -7,6 +7,7 @@
 
 import * as rt from 'io-ts';
 import {
+  ThresholdRT,
   countCriteriaRT,
   timeUnitRT,
   timeSizeRT,
@@ -58,6 +59,14 @@ export type GetLogAlertsChartPreviewDataSuccessResponsePayload = rt.TypeOf<
 export const getLogAlertsChartPreviewDataAlertParamsSubsetRT: any = rt.intersection([
   rt.type({
     criteria: countCriteriaRT,
+    count: rt.intersection([
+      rt.type({
+        comparator: ThresholdRT.props.comparator,
+      }),
+      rt.partial({
+        value: ThresholdRT.props.value,
+      }),
+    ]),
     timeUnit: timeUnitRT,
     timeSize: timeSizeRT,
   }),
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
index 4e84cf0f9127c..4fa96ea6828d4 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
@@ -68,6 +68,10 @@ export const CriterionPreview: React.FC<Props> = ({
     const criteria = field && comparator && value ? [{ field, comparator, value }] : [];
     const params = {
       criteria,
+      count: {
+        comparator: alertParams.count.comparator,
+        value: alertParams.count.value,
+      },
       timeSize: alertParams.timeSize,
       timeUnit: alertParams.timeUnit,
       groupBy: alertParams.groupBy,
@@ -78,7 +82,14 @@ export const CriterionPreview: React.FC<Props> = ({
     } catch (error) {
       return null;
     }
-  }, [alertParams.timeSize, alertParams.timeUnit, alertParams.groupBy, chartCriterion]);
+  }, [
+    alertParams.timeSize,
+    alertParams.timeUnit,
+    alertParams.groupBy,
+    alertParams.count.comparator,
+    alertParams.count.value,
+    chartCriterion,
+  ]);
 
   // Check for the existence of properties that are necessary for a meaningful chart.
   if (chartAlertParams === null || chartAlertParams.criteria.length === 0) return null;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
index ef533f63dc175..4eb0f3e8645cf 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
@@ -23,6 +23,7 @@ import {
   PartialRatioAlertParams,
   ThresholdType,
   timeUnitRT,
+  isOptimizableGroupedThreshold,
 } from '../../../../../common/alerting/logs/log_threshold/types';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import { ObjectEntries } from '../../../../../common/utility_types';
@@ -255,6 +256,15 @@ export const Editor: React.FC<
     setHasSetDefaults(true);
   });
 
+  const shouldShowGroupByOptimizationWarning = useMemo(() => {
+    const hasSetGroupBy = alertParams.groupBy && alertParams.groupBy.length > 0;
+    return (
+      hasSetGroupBy &&
+      alertParams.count &&
+      !isOptimizableGroupedThreshold(alertParams.count.comparator, alertParams.count.value)
+    );
+  }, [alertParams]);
+
   // Wait until the alert param defaults have been set
   if (!hasSetDefaults) return null;
 
@@ -299,6 +309,21 @@ export const Editor: React.FC<
 
       {alertParams.criteria && isRatioAlert(alertParams.criteria) && criteriaComponent}
 
+      {shouldShowGroupByOptimizationWarning && (
+        <>
+          <EuiSpacer size="l" />
+          <EuiCallOut color="warning">
+            {i18n.translate('xpack.infra.logs.alertFlyout.groupByOptimizationWarning', {
+              defaultMessage:
+                'When setting a "group by" we highly recommend using the "{comparator}" comparator for your threshold. This can lead to significant performance improvements.',
+              values: {
+                comparator: Comparator.GT,
+              },
+            })}
+          </EuiCallOut>
+        </>
+      )}
+
       <EuiSpacer size="l" />
     </>
   );
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
index 321273c656216..7bf2cb5ea3394 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
@@ -23,6 +23,7 @@ import {
   UngroupedSearchQueryResponse,
   GroupedSearchQueryResponse,
   GroupedSearchQueryResponseRT,
+  isOptimizedGroupedSearchQueryResponse,
 } from '../../../../common/alerting/logs/log_threshold/types';
 import { decodeOrThrow } from '../../../../common/runtime_types';
 import { ResolvedLogSourceConfiguration } from '../../../../common/log_sources';
@@ -97,10 +98,19 @@ const addHistogramAggregationToQuery = (
   };
 
   if (isGrouped) {
-    query.body.aggregations.groups.aggregations.filtered_results = {
-      ...query.body.aggregations.groups.aggregations.filtered_results,
-      aggregations: histogramAggregation,
-    };
+    const isOptimizedQuery = !query.body.aggregations.groups.aggregations?.filtered_results;
+
+    if (isOptimizedQuery) {
+      query.body.aggregations.groups.aggregations = {
+        ...query.body.aggregations.groups.aggregations,
+        ...histogramAggregation,
+      };
+    } else {
+      query.body.aggregations.groups.aggregations.filtered_results = {
+        ...query.body.aggregations.groups.aggregations.filtered_results,
+        aggregations: histogramAggregation,
+      };
+    }
   } else {
     query.body = {
       ...query.body,
@@ -151,18 +161,34 @@ const getGroupedResults = async (
 const processGroupedResults = (
   results: GroupedSearchQueryResponse['aggregations']['groups']['buckets']
 ): Series => {
-  return results.reduce<Series>((series, group) => {
-    if (!group.filtered_results.histogramBuckets) return series;
-    const groupName = Object.values(group.key).join(', ');
-    const points = group.filtered_results.histogramBuckets.buckets.reduce<Point[]>(
-      (pointsAcc, bucket) => {
+  const getGroupName = (
+    key: GroupedSearchQueryResponse['aggregations']['groups']['buckets'][0]['key']
+  ) => Object.values(key).join(', ');
+
+  if (isOptimizedGroupedSearchQueryResponse(results)) {
+    return results.reduce<Series>((series, group) => {
+      if (!group.histogramBuckets) return series;
+      const groupName = getGroupName(group.key);
+      const points = group.histogramBuckets.buckets.reduce<Point[]>((pointsAcc, bucket) => {
         const { key, doc_count: count } = bucket;
         return [...pointsAcc, { timestamp: key, value: count }];
-      },
-      []
-    );
-    return [...series, { id: groupName, points }];
-  }, []);
+      }, []);
+      return [...series, { id: groupName, points }];
+    }, []);
+  } else {
+    return results.reduce<Series>((series, group) => {
+      if (!group.filtered_results.histogramBuckets) return series;
+      const groupName = getGroupName(group.key);
+      const points = group.filtered_results.histogramBuckets.buckets.reduce<Point[]>(
+        (pointsAcc, bucket) => {
+          const { key, doc_count: count } = bucket;
+          return [...pointsAcc, { timestamp: key, value: count }];
+        },
+        []
+      );
+      return [...series, { id: groupName, points }];
+    }, []);
+  }
 };
 
 const processUngroupedResults = (results: UngroupedSearchQueryResponse): Series => {
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
index ffabd7ba65f03..55c66f0aabbfb 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
@@ -58,6 +58,74 @@ const negativeCriteria: Criterion[] = [
   { ...textField, comparator: Comparator.NOT_MATCH_PHRASE },
 ];
 
+const expectedPositiveFilterClauses = [
+  {
+    range: {
+      numericField: {
+        gt: 10,
+      },
+    },
+  },
+  {
+    range: {
+      numericField: {
+        gte: 10,
+      },
+    },
+  },
+  {
+    range: {
+      numericField: {
+        lt: 10,
+      },
+    },
+  },
+  {
+    range: {
+      numericField: {
+        lte: 10,
+      },
+    },
+  },
+  {
+    term: {
+      keywordField: {
+        value: 'error',
+      },
+    },
+  },
+  {
+    match: {
+      textField: 'Something went wrong',
+    },
+  },
+  {
+    match_phrase: {
+      textField: 'Something went wrong',
+    },
+  },
+];
+
+const expectedNegativeFilterClauses = [
+  {
+    term: {
+      keywordField: {
+        value: 'error',
+      },
+    },
+  },
+  {
+    match: {
+      textField: 'Something went wrong',
+    },
+  },
+  {
+    match_phrase: {
+      textField: 'Something went wrong',
+    },
+  },
+];
+
 const baseAlertParams: Pick<AlertParams, 'count' | 'timeSize' | 'timeUnit'> = {
   count: {
     comparator: Comparator.GT,
@@ -102,53 +170,7 @@ describe('Log threshold executor', () => {
         criteria: positiveCriteria,
       };
       const filters = buildFiltersFromCriteria(alertParams, TIMESTAMP_FIELD);
-      expect(filters.mustFilters).toEqual([
-        {
-          range: {
-            numericField: {
-              gt: 10,
-            },
-          },
-        },
-        {
-          range: {
-            numericField: {
-              gte: 10,
-            },
-          },
-        },
-        {
-          range: {
-            numericField: {
-              lt: 10,
-            },
-          },
-        },
-        {
-          range: {
-            numericField: {
-              lte: 10,
-            },
-          },
-        },
-        {
-          term: {
-            keywordField: {
-              value: 'error',
-            },
-          },
-        },
-        {
-          match: {
-            textField: 'Something went wrong',
-          },
-        },
-        {
-          match_phrase: {
-            textField: 'Something went wrong',
-          },
-        },
-      ]);
+      expect(filters.mustFilters).toEqual(expectedPositiveFilterClauses);
     });
 
     test('Handles negative criteria', () => {
@@ -158,25 +180,7 @@ describe('Log threshold executor', () => {
       };
       const filters = buildFiltersFromCriteria(alertParams, TIMESTAMP_FIELD);
 
-      expect(filters.mustNotFilters).toEqual([
-        {
-          term: {
-            keywordField: {
-              value: 'error',
-            },
-          },
-        },
-        {
-          match: {
-            textField: 'Something went wrong',
-          },
-        },
-        {
-          match_phrase: {
-            textField: 'Something went wrong',
-          },
-        },
-      ]);
+      expect(filters.mustNotFilters).toEqual(expectedNegativeFilterClauses);
     });
 
     test('Handles time range', () => {
@@ -194,7 +198,7 @@ describe('Log threshold executor', () => {
 
   describe('ES queries', () => {
     describe('Query generation', () => {
-      test('Correctly generates ungrouped queries', () => {
+      it('Correctly generates ungrouped queries', () => {
         const alertParams: AlertParams = {
           ...baseAlertParams,
           criteria: [...positiveCriteria, ...negativeCriteria],
@@ -223,71 +227,9 @@ describe('Log threshold executor', () => {
                       },
                     },
                   },
-                  {
-                    range: {
-                      numericField: {
-                        gt: 10,
-                      },
-                    },
-                  },
-                  {
-                    range: {
-                      numericField: {
-                        gte: 10,
-                      },
-                    },
-                  },
-                  {
-                    range: {
-                      numericField: {
-                        lt: 10,
-                      },
-                    },
-                  },
-                  {
-                    range: {
-                      numericField: {
-                        lte: 10,
-                      },
-                    },
-                  },
-                  {
-                    term: {
-                      keywordField: {
-                        value: 'error',
-                      },
-                    },
-                  },
-                  {
-                    match: {
-                      textField: 'Something went wrong',
-                    },
-                  },
-                  {
-                    match_phrase: {
-                      textField: 'Something went wrong',
-                    },
-                  },
-                ],
-                must_not: [
-                  {
-                    term: {
-                      keywordField: {
-                        value: 'error',
-                      },
-                    },
-                  },
-                  {
-                    match: {
-                      textField: 'Something went wrong',
-                    },
-                  },
-                  {
-                    match_phrase: {
-                      textField: 'Something went wrong',
-                    },
-                  },
+                  ...expectedPositiveFilterClauses,
                 ],
+                must_not: [...expectedNegativeFilterClauses],
               },
             },
             runtime_mappings: {
@@ -304,148 +246,159 @@ describe('Log threshold executor', () => {
         });
       });
 
-      test('Correctly generates grouped queries', () => {
-        const alertParams: AlertParams = {
-          ...baseAlertParams,
-          groupBy: ['host.name'],
-          criteria: [...positiveCriteria, ...negativeCriteria],
-        };
-        const query = getGroupedESQuery(
-          alertParams,
-          TIMESTAMP_FIELD,
-          FILEBEAT_INDEX,
-          runtimeMappings
-        );
-        expect(query).toEqual({
-          index: 'filebeat-*',
-          allow_no_indices: true,
-          ignore_unavailable: true,
-          body: {
-            query: {
-              bool: {
-                filter: [
-                  {
-                    range: {
-                      '@timestamp': {
-                        gte: expect.any(Number),
-                        lte: expect.any(Number),
-                        format: 'epoch_millis',
+      describe('Correctly generates grouped queries', () => {
+        it('When using an optimizable threshold comparator', () => {
+          const alertParams: AlertParams = {
+            ...baseAlertParams,
+            groupBy: ['host.name'],
+            criteria: [...positiveCriteria, ...negativeCriteria],
+          };
+          const query = getGroupedESQuery(
+            alertParams,
+            TIMESTAMP_FIELD,
+            FILEBEAT_INDEX,
+            runtimeMappings
+          );
+
+          expect(query).toEqual({
+            index: 'filebeat-*',
+            allow_no_indices: true,
+            ignore_unavailable: true,
+            body: {
+              query: {
+                bool: {
+                  filter: [
+                    {
+                      range: {
+                        '@timestamp': {
+                          gte: expect.any(Number),
+                          lte: expect.any(Number),
+                          format: 'epoch_millis',
+                        },
                       },
                     },
+                    ...expectedPositiveFilterClauses,
+                  ],
+                  must_not: [...expectedNegativeFilterClauses],
+                },
+              },
+              aggregations: {
+                groups: {
+                  composite: {
+                    size: 2000,
+                    sources: [
+                      {
+                        'group-0-host.name': {
+                          terms: {
+                            field: 'host.name',
+                          },
+                        },
+                      },
+                    ],
                   },
-                ],
+                },
+              },
+              runtime_mappings: {
+                runtime_field: {
+                  type: 'keyword',
+                  script: {
+                    lang: 'painless',
+                    source: 'emit("a runtime value")',
+                  },
+                },
               },
+              size: 0,
             },
-            aggregations: {
-              groups: {
-                composite: {
-                  size: 40,
-                  sources: [
+          });
+        });
+
+        it('When not using an optimizable threshold comparator', () => {
+          const alertParams: AlertParams = {
+            ...baseAlertParams,
+            count: {
+              ...baseAlertParams.count,
+              comparator: Comparator.LT,
+            },
+            groupBy: ['host.name'],
+            criteria: [...positiveCriteria, ...negativeCriteria],
+          };
+
+          const query = getGroupedESQuery(
+            alertParams,
+            TIMESTAMP_FIELD,
+            FILEBEAT_INDEX,
+            runtimeMappings
+          );
+
+          expect(query).toEqual({
+            index: 'filebeat-*',
+            allow_no_indices: true,
+            ignore_unavailable: true,
+            body: {
+              query: {
+                bool: {
+                  filter: [
                     {
-                      'group-0-host.name': {
-                        terms: {
-                          field: 'host.name',
+                      range: {
+                        '@timestamp': {
+                          gte: expect.any(Number),
+                          lte: expect.any(Number),
+                          format: 'epoch_millis',
                         },
                       },
                     },
                   ],
                 },
-                aggregations: {
-                  filtered_results: {
-                    filter: {
-                      bool: {
-                        filter: [
-                          {
-                            range: {
-                              '@timestamp': {
-                                gte: expect.any(Number),
-                                lte: expect.any(Number),
-                                format: 'epoch_millis',
-                              },
-                            },
-                          },
-                          {
-                            range: {
-                              numericField: {
-                                gt: 10,
-                              },
-                            },
-                          },
-                          {
-                            range: {
-                              numericField: {
-                                gte: 10,
-                              },
-                            },
-                          },
-                          {
-                            range: {
-                              numericField: {
-                                lt: 10,
-                              },
-                            },
-                          },
-                          {
-                            range: {
-                              numericField: {
-                                lte: 10,
-                              },
-                            },
-                          },
-                          {
-                            term: {
-                              keywordField: {
-                                value: 'error',
-                              },
-                            },
-                          },
-                          {
-                            match: {
-                              textField: 'Something went wrong',
-                            },
-                          },
-                          {
-                            match_phrase: {
-                              textField: 'Something went wrong',
-                            },
+              },
+              aggregations: {
+                groups: {
+                  composite: {
+                    size: 2000,
+                    sources: [
+                      {
+                        'group-0-host.name': {
+                          terms: {
+                            field: 'host.name',
                           },
-                        ],
-                        must_not: [
-                          {
-                            term: {
-                              keywordField: {
-                                value: 'error',
+                        },
+                      },
+                    ],
+                  },
+                  aggregations: {
+                    filtered_results: {
+                      filter: {
+                        bool: {
+                          filter: [
+                            {
+                              range: {
+                                '@timestamp': {
+                                  gte: expect.any(Number),
+                                  lte: expect.any(Number),
+                                  format: 'epoch_millis',
+                                },
                               },
                             },
-                          },
-                          {
-                            match: {
-                              textField: 'Something went wrong',
-                            },
-                          },
-                          {
-                            match_phrase: {
-                              textField: 'Something went wrong',
-                            },
-                          },
-                        ],
+                            ...expectedPositiveFilterClauses,
+                          ],
+                          must_not: [...expectedNegativeFilterClauses],
+                        },
                       },
                     },
                   },
                 },
               },
-            },
-            runtime_mappings: {
-              runtime_field: {
-                type: 'keyword',
-                script: {
-                  lang: 'painless',
-                  source: 'emit("a runtime value")',
+              runtime_mappings: {
+                runtime_field: {
+                  type: 'keyword',
+                  script: {
+                    lang: 'painless',
+                    source: 'emit("a runtime value")',
+                  },
                 },
               },
+              size: 0,
             },
-            size: 0,
-          },
+          });
         });
       });
     });
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
index a537801202217..f9d0b5575abfc 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
@@ -36,6 +36,8 @@ import {
   CountCriteria,
   CountAlertParams,
   RatioAlertParams,
+  isOptimizedGroupedSearchQueryResponse,
+  isOptimizableGroupedThreshold,
 } from '../../../../common/alerting/logs/log_threshold/types';
 import { InfraBackendLibs } from '../../infra_types';
 import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
@@ -57,7 +59,7 @@ type LogThresholdAlertExecutorOptions = AlertExecutorOptions<
   LogThresholdActionGroups
 >;
 
-const COMPOSITE_GROUP_SIZE = 40;
+const COMPOSITE_GROUP_SIZE = 2000;
 
 const checkValueAgainstComparatorMap: {
   [key: string]: (a: number, b: number) => boolean;
@@ -68,6 +70,10 @@ const checkValueAgainstComparatorMap: {
   [Comparator.LT_OR_EQ]: (a: number, b: number) => a <= b,
 };
 
+// The executor execution roughly follows a pattern of:
+// ES Query generation -> fetching of results -> processing of results.
+// With forks for group_by vs ungrouped, and ratio vs non-ratio.
+
 export const createLogThresholdExecutor = (libs: InfraBackendLibs) =>
   async function ({ services, params }: LogThresholdAlertExecutorOptions) {
     const { alertInstanceFactory, savedObjectsClient, scopedClusterClient } = services;
@@ -277,11 +283,26 @@ type ReducedGroupByResults = ReducedGroupByResult[];
 const getReducedGroupByResults = (
   results: GroupedSearchQueryResponse['aggregations']['groups']['buckets']
 ): ReducedGroupByResults => {
-  return results.reduce<ReducedGroupByResults>((acc, groupBucket) => {
-    const groupName = Object.values(groupBucket.key).join(', ');
-    const groupResult = { name: groupName, documentCount: groupBucket.filtered_results.doc_count };
-    return [...acc, groupResult];
-  }, []);
+  const getGroupName = (
+    key: GroupedSearchQueryResponse['aggregations']['groups']['buckets'][0]['key']
+  ) => Object.values(key).join(', ');
+
+  if (isOptimizedGroupedSearchQueryResponse(results)) {
+    return results.reduce<ReducedGroupByResults>((acc, groupBucket) => {
+      const groupName = getGroupName(groupBucket.key);
+      const groupResult = { name: groupName, documentCount: groupBucket.doc_count };
+      return [...acc, groupResult];
+    }, []);
+  } else {
+    return results.reduce<ReducedGroupByResults>((acc, groupBucket) => {
+      const groupName = getGroupName(groupBucket.key);
+      const groupResult = {
+        name: groupName,
+        documentCount: groupBucket.filtered_results.doc_count,
+      };
+      return [...acc, groupResult];
+    }, []);
+  }
 };
 
 export const processGroupByResults = (
@@ -430,12 +451,29 @@ export const buildFiltersFromCriteria = (
 };
 
 export const getGroupedESQuery = (
-  params: Pick<AlertParams, 'timeSize' | 'timeUnit' | 'groupBy'> & { criteria: CountCriteria },
+  params: Pick<AlertParams, 'timeSize' | 'timeUnit' | 'groupBy'> & {
+    criteria: CountCriteria;
+    count: {
+      comparator: AlertParams['count']['comparator'];
+      value?: AlertParams['count']['value'];
+    };
+  },
   timestampField: string,
   index: string,
   runtimeMappings: estypes.MappingRuntimeFields
 ): estypes.SearchRequest | undefined => {
-  const { groupBy } = params;
+  // IMPORTANT:
+  // For the group by scenario we need to account for users utilizing "less than" configurations
+  // to attempt to match on "0", e.g. something has stopped reporting. We need to cast a wider net for these
+  // configurations to try and capture more documents, so that the filtering doesn't make the group "disappear".
+  // Due to this there are two forks in the group by code, one where we can optimize the filtering early, and one where
+  // it is an inner aggregation. "Less than" configurations with high cardinality group by fields can cause severe performance
+  // problems.
+
+  const {
+    groupBy,
+    count: { comparator, value },
+  } = params;
 
   if (!groupBy || !groupBy.length) {
     return;
@@ -446,47 +484,81 @@ export const getGroupedESQuery = (
     timestampField
   );
 
-  const aggregations = {
-    groups: {
-      composite: {
-        size: COMPOSITE_GROUP_SIZE,
-        sources: groupBy.map((field, groupIndex) => ({
-          [`group-${groupIndex}-${field}`]: {
-            terms: { field },
-          },
-        })),
+  if (isOptimizableGroupedThreshold(comparator, value)) {
+    const aggregations = {
+      groups: {
+        composite: {
+          size: COMPOSITE_GROUP_SIZE,
+          sources: groupBy.map((field, groupIndex) => ({
+            [`group-${groupIndex}-${field}`]: {
+              terms: { field },
+            },
+          })),
+        },
       },
-      aggregations: {
-        filtered_results: {
-          filter: {
-            bool: {
-              // Scope the inner filtering back to the unpadded range
-              filter: [rangeFilter, ...mustFilters],
-              ...(mustNotFilters.length > 0 && { must_not: mustNotFilters }),
+    };
+
+    const body: estypes.SearchRequest['body'] = {
+      query: {
+        bool: {
+          filter: [rangeFilter, ...mustFilters],
+          ...(mustNotFilters.length > 0 && { must_not: mustNotFilters }),
+        },
+      },
+      aggregations,
+      runtime_mappings: runtimeMappings,
+      size: 0,
+    };
+
+    return {
+      index,
+      allow_no_indices: true,
+      ignore_unavailable: true,
+      body,
+    };
+  } else {
+    const aggregations = {
+      groups: {
+        composite: {
+          size: COMPOSITE_GROUP_SIZE,
+          sources: groupBy.map((field, groupIndex) => ({
+            [`group-${groupIndex}-${field}`]: {
+              terms: { field },
+            },
+          })),
+        },
+        aggregations: {
+          filtered_results: {
+            filter: {
+              bool: {
+                // Scope the inner filtering back to the unpadded range
+                filter: [rangeFilter, ...mustFilters],
+                ...(mustNotFilters.length > 0 && { must_not: mustNotFilters }),
+              },
             },
           },
         },
       },
-    },
-  };
+    };
 
-  const body: estypes.SearchRequest['body'] = {
-    query: {
-      bool: {
-        filter: [groupedRangeFilter],
+    const body: estypes.SearchRequest['body'] = {
+      query: {
+        bool: {
+          filter: [groupedRangeFilter],
+        },
       },
-    },
-    aggregations,
-    runtime_mappings: runtimeMappings,
-    size: 0,
-  };
+      aggregations,
+      runtime_mappings: runtimeMappings,
+      size: 0,
+    };
 
-  return {
-    index,
-    allow_no_indices: true,
-    ignore_unavailable: true,
-    body,
-  };
+    return {
+      index,
+      allow_no_indices: true,
+      ignore_unavailable: true,
+      body,
+    };
+  }
 };
 
 export const getUngroupedESQuery = (

From fb3e8f4498680d1d3bc52990572e6d0f0c00c7c2 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Thu, 24 Jun 2021 12:43:26 -0700
Subject: [PATCH 70/95] [Enterprise Search] Product 404 polish pass (#103198)

* Refactor NotFound component

- shared NotFound becomes NotFoundPrompt - returns only an EuiEmptyPrompt, and individual products/plugins are in charge of their own layout, rather than NotFound doing a bunch of arduous switch handling (also closer to how errorConnecting is a component set per-plugin)

- This is both due to the recent page template refactor and the fact that WS has extra complex logic of needing to switch between its kibana layout and personal dashboard layout

- logos are still hosted in shared/ since they need extra custom CSS to work correctly sizing wise and in dark mode. I renamed its folder from `assets`->`logos` for extra clarity

* [AS] Update current AS routers using NotFound

+ update EngineRouter to use NotFound

* [WS] Update app router

- Handle errorConnecting at the topmost level, instead of in WorkplaceSearchConfigured (to simplify various logic/expectations & match App Search)

- Simplify isOrganization check to use `useRouteMatch` instead of a regex

- Use new NotFound component
- Add NotFound component for the personal dashboard router

* [WS] Improve Source 404 UX

- Add NotFound to SourceRouter + add breadcrumbs for organization views

- When an actual source ID 404s, fix blanket redirect to a dashboard aware redirect - personal dashboard 404s should send the user back to personal sources, not organization sources
+ add a flash message error (similar to how App Search behaves for engine 404s)
+ harden error status checks (gracefully allow for non-http errors to fall back flashAPIErrors

* [WS] Improve Settings 404 UX

- This was the only remaining WS route I found that either did not have a 404 or a fallback to some overview page, so I tweaked the redirect order for a graceful redirect (vs a blank page)

* Fix settings router test

* Move away from custom product logos to OOTB Enterprise Search logo

Keeping it simple, etc. RIP in peace fancy logos

* [PR feedback] toContain over stringContaining
---
 .../components/analytics/analytics_router.tsx |   8 +-
 .../components/engine/engine_router.tsx       |   6 +-
 .../components/not_found/index.ts}            |  16 +--
 .../components/not_found/not_found.test.tsx   |  38 ++++++
 .../components/not_found/not_found.tsx        |  23 ++++
 .../applications/app_search/index.test.tsx    |  17 +--
 .../public/applications/app_search/index.tsx  |  13 +-
 .../not_found/assets/app_search_logo.tsx      |  33 -----
 .../assets/workplace_search_logo.tsx          |  39 ------
 .../applications/shared/not_found/index.ts    |   2 +-
 .../shared/not_found/not_found.test.tsx       |  70 -----------
 .../shared/not_found/not_found.tsx            | 117 ------------------
 .../not_found/not_found_prompt.test.tsx       |  51 ++++++++
 .../shared/not_found/not_found_prompt.tsx     |  65 ++++++++++
 .../workplace_search/index.test.tsx           |  32 ++---
 .../applications/workplace_search/index.tsx   |  38 +++---
 .../content_sources/source_logic.test.ts      |  80 ++++++------
 .../views/content_sources/source_logic.ts     |  12 +-
 .../content_sources/source_router.test.tsx    |   4 +-
 .../views/content_sources/source_router.tsx   |   6 +-
 .../workplace_search/views/not_found/index.ts |   8 ++
 .../views/not_found/not_found.test.tsx        |  52 ++++++++
 .../views/not_found/not_found.tsx             |  33 +++++
 .../views/settings/settings_router.test.tsx   |   4 +-
 .../views/settings/settings_router.tsx        |   5 +-
 25 files changed, 378 insertions(+), 394 deletions(-)
 rename x-pack/plugins/enterprise_search/public/applications/{shared/not_found/assets/logo.scss => app_search/components/not_found/index.ts} (53%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.tsx
index d56fe949431c3..2ed06d68301c9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.tsx
@@ -8,8 +8,6 @@
 import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
 
-import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
-import { NotFound } from '../../../shared/not_found';
 import {
   ENGINE_ANALYTICS_PATH,
   ENGINE_ANALYTICS_TOP_QUERIES_PATH,
@@ -21,6 +19,7 @@ import {
   ENGINE_ANALYTICS_QUERY_DETAIL_PATH,
 } from '../../routes';
 import { generateEnginePath, getEngineBreadcrumbs } from '../engine';
+import { NotFound } from '../not_found';
 
 import { ANALYTICS_TITLE } from './constants';
 import {
@@ -61,10 +60,7 @@ export const AnalyticsRouter: React.FC = () => {
         <Redirect to={generateEnginePath(ENGINE_ANALYTICS_PATH)} />
       </Route>
       <Route>
-        <NotFound
-          breadcrumbs={getEngineBreadcrumbs([ANALYTICS_TITLE])}
-          product={APP_SEARCH_PLUGIN}
-        />
+        <NotFound pageChrome={getEngineBreadcrumbs([ANALYTICS_TITLE])} />
       </Route>
     </Switch>
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
index da8dd8467bb61..2d1bd32a0fff5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -38,6 +38,7 @@ import { CurationsRouter } from '../curations';
 import { DocumentDetail, Documents } from '../documents';
 import { EngineOverview } from '../engine_overview';
 import { AppSearchPageTemplate } from '../layout';
+import { NotFound } from '../not_found';
 import { RelevanceTuning } from '../relevance_tuning';
 import { ResultSettings } from '../result_settings';
 import { SchemaRouter } from '../schema';
@@ -45,7 +46,7 @@ import { SearchUI } from '../search_ui';
 import { SourceEngines } from '../source_engines';
 import { Synonyms } from '../synonyms';
 
-import { EngineLogic } from './';
+import { EngineLogic, getEngineBreadcrumbs } from './';
 
 export const EngineRouter: React.FC = () => {
   const {
@@ -159,6 +160,9 @@ export const EngineRouter: React.FC = () => {
           <ApiLogs />
         </Route>
       )}
+      <Route>
+        <NotFound pageChrome={getEngineBreadcrumbs()} />
+      </Route>
     </Switch>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/index.ts
similarity index 53%
rename from x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/index.ts
index b157f55cbba68..482c1a58faa9c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/index.ts
@@ -5,18 +5,4 @@
  * 2.0.
  */
 
-.logo404 {
-  width: $euiSize * 8;
-  height: $euiSize * 8;
-
-  fill: $euiColorEmptyShade;
-  stroke: $euiColorLightShade;
-
-  &__light {
-    fill: $euiColorLightShade;
-  }
-
-  &__dark {
-    fill: $euiColorMediumShade;
-  }
-}
+export { NotFound } from './not_found';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
new file mode 100644
index 0000000000000..6fed726eb5e0b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
@@ -0,0 +1,38 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { NotFoundPrompt } from '../../../shared/not_found';
+import { SendAppSearchTelemetry } from '../../../shared/telemetry';
+import { AppSearchPageTemplate } from '../layout';
+
+import { NotFound } from './';
+
+describe('NotFound', () => {
+  const wrapper = shallow(<NotFound />);
+
+  it('renders the shared not found prompt', () => {
+    expect(wrapper.find(NotFoundPrompt)).toHaveLength(1);
+  });
+
+  it('renders a telemetry error event', () => {
+    expect(wrapper.find(SendAppSearchTelemetry).prop('action')).toEqual('error');
+  });
+
+  it('passes optional preceding page chrome', () => {
+    wrapper.setProps({ pageChrome: ['Engines', 'some-engine'] });
+
+    expect(wrapper.find(AppSearchPageTemplate).prop('pageChrome')).toEqual([
+      'Engines',
+      'some-engine',
+      '404',
+    ]);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.tsx
new file mode 100644
index 0000000000000..f6165fa192d57
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.tsx
@@ -0,0 +1,23 @@
+/*
+ * 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 React from 'react';
+
+import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
+import { PageTemplateProps } from '../../../shared/layout';
+import { NotFoundPrompt } from '../../../shared/not_found';
+import { SendAppSearchTelemetry } from '../../../shared/telemetry';
+import { AppSearchPageTemplate } from '../layout';
+
+export const NotFound: React.FC<PageTemplateProps> = ({ pageChrome = [] }) => {
+  return (
+    <AppSearchPageTemplate pageChrome={[...pageChrome, '404']} template="centeredContent">
+      <SendAppSearchTelemetry action="error" metric="not_found" />
+      <NotFoundPrompt productSupportUrl={APP_SEARCH_PLUGIN.SUPPORT_URL} />
+    </AppSearchPageTemplate>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 00acea945177a..46596cc5d6765 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -17,7 +17,7 @@ import { Redirect } from 'react-router-dom';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
-import { Layout, SideNav, SideNavLink } from '../shared/layout';
+import { SideNav, SideNavLink } from '../shared/layout';
 
 import { rerender } from '../test_helpers';
 
@@ -83,13 +83,6 @@ describe('AppSearchConfigured', () => {
     wrapper = shallow(<AppSearchConfigured {...DEFAULT_INITIAL_APP_DATA} />);
   });
 
-  it('renders with layout', () => {
-    expect(wrapper.find(Layout)).toHaveLength(1);
-    expect(wrapper.find(Layout).prop('readOnlyMode')).toBeFalsy();
-    expect(wrapper.find(EnginesOverview)).toHaveLength(1);
-    expect(wrapper.find(EngineRouter)).toHaveLength(1);
-  });
-
   it('renders header actions', () => {
     expect(renderHeaderActions).toHaveBeenCalled();
   });
@@ -98,11 +91,9 @@ describe('AppSearchConfigured', () => {
     expect(AppLogic).toHaveBeenCalledWith(DEFAULT_INITIAL_APP_DATA);
   });
 
-  it('passes readOnlyMode state', () => {
-    setMockValues({ myRole: {}, readOnlyMode: true });
-    rerender(wrapper);
-
-    expect(wrapper.find(Layout).first().prop('readOnlyMode')).toEqual(true);
+  it('renders engine routes', () => {
+    expect(wrapper.find(EnginesOverview)).toHaveLength(1);
+    expect(wrapper.find(EngineRouter)).toHaveLength(1);
   });
 
   describe('routes with ability checks', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index d7ddad5683f38..6d049b2015487 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -14,8 +14,7 @@ import { APP_SEARCH_PLUGIN } from '../../../common/constants';
 import { InitialAppData } from '../../../common/types';
 import { HttpLogic } from '../shared/http';
 import { KibanaLogic } from '../shared/kibana';
-import { Layout, SideNav, SideNavLink } from '../shared/layout';
-import { NotFound } from '../shared/not_found';
+import { SideNav, SideNavLink } from '../shared/layout';
 
 import { ROLE_MAPPINGS_TITLE } from '../shared/role_mapping/constants';
 
@@ -28,6 +27,7 @@ import { ErrorConnecting } from './components/error_connecting';
 import { KibanaHeaderActions } from './components/layout';
 import { Library } from './components/library';
 import { MetaEngineCreation } from './components/meta_engine_creation';
+import { NotFound } from './components/not_found';
 import { RoleMappings } from './components/role_mappings';
 import { Settings, SETTINGS_TITLE } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
@@ -85,7 +85,6 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
     },
   } = useValues(AppLogic(props));
   const { renderHeaderActions } = useValues(KibanaLogic);
-  const { readOnlyMode } = useValues(HttpLogic);
 
   useEffect(() => {
     renderHeaderActions(KibanaHeaderActions);
@@ -133,13 +132,7 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
         </Route>
       )}
       <Route>
-        <Layout navigation={<AppSearchNav />} readOnlyMode={readOnlyMode}>
-          <Switch>
-            <Route>
-              <NotFound product={APP_SEARCH_PLUGIN} />
-            </Route>
-          </Switch>
-        </Layout>
+        <NotFound />
       </Route>
     </Switch>
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
deleted file mode 100644
index 8eb2059afd3ed..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
+++ /dev/null
@@ -1,33 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-export const AppSearchLogo: React.FC = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="136"
-    height="136"
-    viewBox="0 0 136 136"
-    className="logo404"
-    aria-hidden="true"
-  >
-    <rect x="1" y="1" width="134" height="134" rx="67" strokeWidth="2" strokeDasharray="8 4" />
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M105.305 43.282l2.934-1.692c3.015 3.693 4.761 8.35 4.761 13.267V82.57a21 21 0 01-10.5 18.186L80 113.747V73.934c0-4.93-1.753-9.588-4.774-13.284l30.079-17.367zM66.5 55.747A21 21 0 0056 73.933v39.817l-22.5-12.993A21.001 21.001 0 0123 82.57V54.86c0-7.503 4.002-14.44 10.5-18.19l1.478-.853.022.014 33 19.05-1.5.867z"
-      className="logo404__light"
-    />
-    <path
-      d="M78.5 22.813a21.007 21.007 0 00-21 0L35 35.83l33 19.05 33.001-19.05-22.5-13.017z"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      className="logo404__dark"
-    />
-  </svg>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
deleted file mode 100644
index df5b1a1118c41..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
+++ /dev/null
@@ -1,39 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-export const WorkplaceSearchLogo: React.FC = () => (
-  <svg
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    width="137"
-    height="137"
-    viewBox="0 0 137 137"
-    className="logo404"
-    aria-hidden="true"
-  >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M136.886 72.486l-1.997-.115a67.11 67.11 0 000-7.742l1.997-.115a69.278 69.278 0 010 7.972zm-.343-11.943l-1.987.23a66.084 66.084 0 00-1.335-7.617l1.947-.46a68.478 68.478 0 011.375 7.847zm-2.404-11.696l-1.916.573a65.939 65.939 0 00-2.645-7.265l1.836-.794a67.996 67.996 0 012.725 7.486zm-4.412-11.096l-1.786.899a66.668 66.668 0 00-3.873-6.694l1.67-1.101a68.365 68.365 0 013.989 6.896zm-6.278-10.158l-1.603 1.195a66.966 66.966 0 00-4.975-5.923l1.454-1.372a68.733 68.733 0 015.124 6.1zm-7.941-8.918l-1.373 1.454a66.818 66.818 0 00-5.924-4.975l1.196-1.603a68.803 68.803 0 016.101 5.124zm-9.363-7.413l-1.101 1.67A66.34 66.34 0 0098.35 9.06l.9-1.786a68.38 68.38 0 016.895 3.99zM95.638 5.586l-.793 1.836a66 66 0 00-7.265-2.645l.573-1.916a67.995 67.995 0 017.485 2.725zM84.304 1.832l-.46 1.947a66.263 66.263 0 00-7.617-1.335l.23-1.987c2.665.309 5.284.77 7.847 1.375zM72.486.114l-.115 1.997a67.582 67.582 0 00-7.742 0L64.514.114a69.582 69.582 0 017.972 0zM60.543.457l.23 1.987c-2.588.3-5.13.747-7.617 1.335l-.46-1.947A68.267 68.267 0 0160.543.457zM48.847 2.861l.573 1.916a65.986 65.986 0 00-7.265 2.645l-.794-1.836a67.995 67.995 0 017.486-2.725zM37.75 7.273l.899 1.786a66.406 66.406 0 00-6.694 3.873l-1.101-1.67a68.42 68.42 0 016.896-3.99zM27.593 13.55l1.195 1.603a66.85 66.85 0 00-5.923 4.975l-1.372-1.454a68.853 68.853 0 016.1-5.124zm-8.918 7.941l1.454 1.373a66.866 66.866 0 00-4.975 5.924l-1.603-1.196a68.855 68.855 0 015.124-6.1zm-7.413 9.363l1.67 1.1A66.423 66.423 0 009.06 38.65l-1.786-.9a68.424 68.424 0 013.99-6.895zM5.586 41.361l1.836.794a66 66 0 00-2.645 7.265l-1.916-.573a67.995 67.995 0 012.725-7.486zM1.832 52.697l1.947.46a66.263 66.263 0 00-1.335 7.617l-1.987-.23c.309-2.665.77-5.284 1.375-7.847zM.114 64.514a69.582 69.582 0 000 7.972l1.997-.115a67.582 67.582 0 010-7.742l-1.997-.115zm.343 11.943l1.987-.23c.3 2.588.747 5.13 1.335 7.617l-1.947.46a68.267 68.267 0 01-1.375-7.847zm2.404 11.696l1.916-.573a66 66 0 002.645 7.266l-1.836.792a67.995 67.995 0 01-2.725-7.485zM7.273 99.25l1.786-.898a66.323 66.323 0 003.873 6.693l-1.67 1.101a68.378 68.378 0 01-3.99-6.895zm6.278 10.158l1.603-1.196a66.801 66.801 0 004.975 5.924l-1.454 1.373a68.803 68.803 0 01-5.124-6.101zm7.941 8.918l1.373-1.454a66.966 66.966 0 005.924 4.975l-1.196 1.603a68.734 68.734 0 01-6.1-5.124zm9.363 7.413l1.1-1.67a66.668 66.668 0 006.695 3.873l-.9 1.786a68.354 68.354 0 01-6.895-3.989zm10.506 5.676l.794-1.836a65.953 65.953 0 007.265 2.645l-.573 1.916a67.996 67.996 0 01-7.486-2.725zm11.335 3.754l.46-1.947a66.084 66.084 0 007.617 1.335l-.23 1.987a68.478 68.478 0 01-7.847-1.375zm11.818 1.718l.115-1.997a67.11 67.11 0 007.742 0l.115 1.997a69.278 69.278 0 01-7.972 0zm11.943-.343l-.23-1.987a66.084 66.084 0 007.617-1.335l.46 1.947a68.478 68.478 0 01-7.847 1.375zm11.696-2.404l-.573-1.916a65.953 65.953 0 007.266-2.645l.792 1.836a67.996 67.996 0 01-7.485 2.725zm11.096-4.412l-.898-1.786a66.584 66.584 0 006.693-3.873l1.101 1.67a68.31 68.31 0 01-6.895 3.989zm10.158-6.278l-1.196-1.603a66.918 66.918 0 005.924-4.975l1.373 1.454a68.682 68.682 0 01-6.101 5.124zm8.918-7.941l-1.454-1.373a66.918 66.918 0 004.975-5.924l1.603 1.196a68.682 68.682 0 01-5.124 6.101zm7.413-9.363l-1.67-1.101a66.584 66.584 0 003.873-6.694l1.786.9a68.31 68.31 0 01-3.989 6.895zm5.676-10.507l-1.836-.793a65.953 65.953 0 002.645-7.265l1.916.573a67.996 67.996 0 01-2.725 7.485zm3.754-11.334l-1.947-.46a66.084 66.084 0 001.335-7.617l1.987.23a68.478 68.478 0 01-1.375 7.847zM72.406 44.047c.372-.442 1-1.12 1.881-2.034 2.332-2.413 7.462-6.825 11.778-6.825h13.56v65.624H86.062c-4.313 0-8.739-3.17-11.775-6.794l-1.671-2.301 6.016-7.606c7.573-9.573 7.575-22.601.002-32.172l-6.228-7.892z"
-      className="logo404__light"
-    />
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M38.375 100.812V35.188h12.71c3.74 0 7.328 1.719 9.596 4.593l12.808 16.232c5.683 7.181 5.683 16.839-.005 24.025L60.677 96.232c-2.269 2.868-5.852 4.58-9.582 4.58h-12.72z"
-      className="logo404__light"
-    />
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M67.653 87.447l-7.075-6.978c-6.274-7.258-6.274-17.981.005-24.767 3.357-3.585 5.711-5.946 7.065-7.083l5.84 7.083c5.77 7.405 5.634 17.471-.135 24.88l-5.703 6.863.002.002z"
-      className="logo404__dark"
-    />
-  </svg>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts
index 482c1a58faa9c..8be374d549952 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { NotFound } from './not_found';
+export { NotFoundPrompt } from './not_found_prompt';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
deleted file mode 100644
index 1561224a26e42..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
+++ /dev/null
@@ -1,70 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { setMockValues } from '../../__mocks__/kea_logic';
-
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { EuiButton as EuiButtonExternal, EuiEmptyPrompt } from '@elastic/eui';
-
-import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../common/constants';
-import { SetAppSearchChrome } from '../kibana_chrome';
-
-import { AppSearchLogo } from './assets/app_search_logo';
-import { WorkplaceSearchLogo } from './assets/workplace_search_logo';
-
-import { NotFound } from './';
-
-describe('NotFound', () => {
-  it('renders an App Search 404 view', () => {
-    const wrapper = shallow(<NotFound product={APP_SEARCH_PLUGIN} />);
-    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
-
-    expect(prompt.find('h2').text()).toEqual('404 error');
-    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual(APP_SEARCH_PLUGIN.SUPPORT_URL);
-
-    const logo = prompt.find(AppSearchLogo).dive().shallow();
-    expect(logo.type()).toEqual('svg');
-  });
-
-  it('renders a Workplace Search 404 view', () => {
-    const wrapper = shallow(<NotFound product={WORKPLACE_SEARCH_PLUGIN} />);
-    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
-
-    expect(prompt.find('h2').text()).toEqual('404 error');
-    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual(
-      WORKPLACE_SEARCH_PLUGIN.SUPPORT_URL
-    );
-
-    const logo = prompt.find(WorkplaceSearchLogo).dive().shallow();
-    expect(logo.type()).toEqual('svg');
-  });
-
-  it('changes the support URL if the user has a gold+ license', () => {
-    setMockValues({ hasGoldLicense: true });
-    const wrapper = shallow(<NotFound product={APP_SEARCH_PLUGIN} />);
-    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
-
-    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual('https://support.elastic.co');
-  });
-
-  it('passes down optional custom breadcrumbs', () => {
-    const wrapper = shallow(
-      <NotFound product={APP_SEARCH_PLUGIN} breadcrumbs={['Hello', 'World']} />
-    );
-
-    expect(wrapper.find(SetAppSearchChrome).prop('trail')).toEqual(['Hello', 'World']);
-  });
-
-  it('does not render anything without a valid product', () => {
-    const wrapper = shallow(<NotFound product={undefined as any} />);
-
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx
deleted file mode 100644
index f288961b72de4..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx
+++ /dev/null
@@ -1,117 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { useValues } from 'kea';
-
-import {
-  EuiPageContent,
-  EuiEmptyPrompt,
-  EuiTitle,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiButton,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import {
-  APP_SEARCH_PLUGIN,
-  WORKPLACE_SEARCH_PLUGIN,
-  LICENSED_SUPPORT_URL,
-} from '../../../../common/constants';
-
-import { SetAppSearchChrome, SetWorkplaceSearchChrome } from '../kibana_chrome';
-import { BreadcrumbTrail } from '../kibana_chrome/generate_breadcrumbs';
-import { LicensingLogic } from '../licensing';
-import { EuiButtonTo } from '../react_router_helpers';
-import { SendAppSearchTelemetry, SendWorkplaceSearchTelemetry } from '../telemetry';
-
-import { AppSearchLogo } from './assets/app_search_logo';
-import { WorkplaceSearchLogo } from './assets/workplace_search_logo';
-import './assets/logo.scss';
-
-interface NotFoundProps {
-  // Expects product plugin constants (@see common/constants.ts)
-  product: {
-    ID: string;
-    SUPPORT_URL: string;
-  };
-  // Optional breadcrumbs
-  breadcrumbs?: BreadcrumbTrail;
-}
-
-export const NotFound: React.FC<NotFoundProps> = ({ product = {}, breadcrumbs }) => {
-  const { hasGoldLicense } = useValues(LicensingLogic);
-  const supportUrl = hasGoldLicense ? LICENSED_SUPPORT_URL : product.SUPPORT_URL;
-
-  let Logo;
-  let SetPageChrome;
-  let SendTelemetry;
-
-  switch (product.ID) {
-    case APP_SEARCH_PLUGIN.ID:
-      Logo = AppSearchLogo;
-      SetPageChrome = SetAppSearchChrome;
-      SendTelemetry = SendAppSearchTelemetry;
-      break;
-    case WORKPLACE_SEARCH_PLUGIN.ID:
-      Logo = WorkplaceSearchLogo;
-      SetPageChrome = SetWorkplaceSearchChrome;
-      SendTelemetry = SendWorkplaceSearchTelemetry;
-      break;
-    default:
-      return null;
-  }
-
-  return (
-    <>
-      <SetPageChrome trail={breadcrumbs} />
-      <SendTelemetry action="error" metric="not_found" />
-
-      <EuiPageContent hasBorder>
-        <EuiEmptyPrompt
-          title={<Logo />}
-          body={
-            <>
-              <EuiTitle>
-                <h2>
-                  {i18n.translate('xpack.enterpriseSearch.notFound.title', {
-                    defaultMessage: '404 error',
-                  })}
-                </h2>
-              </EuiTitle>
-              <p>
-                {i18n.translate('xpack.enterpriseSearch.notFound.description', {
-                  defaultMessage: 'The page you’re looking for was not found.',
-                })}
-              </p>
-            </>
-          }
-          actions={
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiButtonTo to="/" color="primary" fill>
-                  {i18n.translate('xpack.enterpriseSearch.notFound.action1', {
-                    defaultMessage: 'Back to your dashboard',
-                  })}
-                </EuiButtonTo>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiButton href={supportUrl} target="_blank">
-                  {i18n.translate('xpack.enterpriseSearch.notFound.action2', {
-                    defaultMessage: 'Contact support',
-                  })}
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          }
-        />
-      </EuiPageContent>
-    </>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
new file mode 100644
index 0000000000000..c21aeff2780b6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
@@ -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 { setMockValues } from '../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
+
+import { EuiButtonTo } from '../react_router_helpers';
+
+import { NotFoundPrompt } from './';
+
+describe('NotFoundPrompt', () => {
+  const subject = (props?: object) =>
+    shallow(<NotFoundPrompt productSupportUrl="" {...props} />)
+      .find(EuiEmptyPrompt)
+      .dive();
+
+  it('renders', () => {
+    const wrapper = subject({
+      productSupportUrl: 'https://discuss.elastic.co/c/enterprise-search/app-search/',
+    });
+
+    expect(wrapper.find('h1').text()).toEqual('404 error');
+    expect(wrapper.find(EuiButtonTo).prop('to')).toEqual('/');
+    expect(wrapper.find(EuiButton).prop('href')).toContain('https://discuss.elastic.co');
+  });
+
+  it('renders with a custom "Back to dashboard" link if passed', () => {
+    const wrapper = subject({
+      productSupportUrl: 'https://discuss.elastic.co/c/enterprise-search/workplace-search/',
+      backToLink: '/workplace_search/p/sources',
+    });
+
+    expect(wrapper.find(EuiButtonTo).prop('to')).toEqual('/workplace_search/p/sources');
+  });
+
+  it('renders with a link to our licensed support URL for gold+ licenses', () => {
+    setMockValues({ hasGoldLicense: true });
+    const wrapper = subject();
+
+    expect(wrapper.find(EuiButton).prop('href')).toEqual('https://support.elastic.co');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.tsx
new file mode 100644
index 0000000000000..97debd21ec16c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.tsx
@@ -0,0 +1,65 @@
+/*
+ * 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 React from 'react';
+
+import { useValues } from 'kea';
+
+import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { LICENSED_SUPPORT_URL } from '../../../../common/constants';
+import { LicensingLogic } from '../licensing';
+import { EuiButtonTo } from '../react_router_helpers';
+
+interface Props {
+  productSupportUrl: string;
+  backToLink?: string;
+}
+
+export const NotFoundPrompt: React.FC<Props> = ({ productSupportUrl, backToLink = '/' }) => {
+  const { hasGoldLicense } = useValues(LicensingLogic);
+  const supportUrl = hasGoldLicense ? LICENSED_SUPPORT_URL : productSupportUrl;
+
+  return (
+    <EuiEmptyPrompt
+      iconType="logoEnterpriseSearch"
+      title={
+        <h1>
+          {i18n.translate('xpack.enterpriseSearch.notFound.title', {
+            defaultMessage: '404 error',
+          })}
+        </h1>
+      }
+      body={
+        <p>
+          {i18n.translate('xpack.enterpriseSearch.notFound.description', {
+            defaultMessage: 'The page you’re looking for was not found.',
+          })}
+        </p>
+      }
+      actions={
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiButtonTo to={backToLink} fill>
+              {i18n.translate('xpack.enterpriseSearch.notFound.action1', {
+                defaultMessage: 'Back to your dashboard',
+              })}
+            </EuiButtonTo>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiButton href={supportUrl} target="_blank">
+              {i18n.translate('xpack.enterpriseSearch.notFound.action2', {
+                defaultMessage: 'Contact support',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index 28169afd4bdeb..2743dfc794ec6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -5,17 +5,15 @@
  * 2.0.
  */
 
-import '../__mocks__/react_router';
 import '../__mocks__/shallow_useeffect.mock';
 import { setMockValues, setMockActions, mockKibanaValues } from '../__mocks__/kea_logic';
+import { mockUseRouteMatch } from '../__mocks__/react_router';
 
 import React from 'react';
 import { Redirect } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { Layout } from '../shared/layout';
-
 import { WorkplaceSearchHeaderActions } from './components/layout';
 import { SourceAdded } from './views/content_sources/components/source_added';
 import { ErrorState } from './views/error_state';
@@ -38,6 +36,14 @@ describe('WorkplaceSearch', () => {
 
     expect(wrapper.find(WorkplaceSearchConfigured)).toHaveLength(1);
   });
+
+  it('renders ErrorState', () => {
+    setMockValues({ errorConnecting: true });
+
+    const wrapper = shallow(<WorkplaceSearch />);
+
+    expect(wrapper.find(ErrorState)).toHaveLength(1);
+  });
 });
 
 describe('WorkplaceSearchUnconfigured', () => {
@@ -56,12 +62,12 @@ describe('WorkplaceSearchConfigured', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     setMockActions({ initializeAppData, setContext });
+    mockUseRouteMatch.mockReturnValue(false);
   });
 
-  it('renders layout, chrome, and header actions', () => {
+  it('renders chrome and header actions', () => {
     const wrapper = shallow(<WorkplaceSearchConfigured />);
 
-    expect(wrapper.find(Layout).first().prop('readOnlyMode')).toBeFalsy();
     expect(wrapper.find(Overview)).toHaveLength(1);
 
     expect(mockKibanaValues.setChromeIsVisible).toHaveBeenCalledWith(true);
@@ -83,22 +89,6 @@ describe('WorkplaceSearchConfigured', () => {
     expect(mockKibanaValues.renderHeaderActions).not.toHaveBeenCalled();
   });
 
-  it('renders ErrorState', () => {
-    setMockValues({ errorConnecting: true });
-
-    const wrapper = shallow(<WorkplaceSearchConfigured />);
-
-    expect(wrapper.find(ErrorState)).toHaveLength(1);
-  });
-
-  it('passes readOnlyMode state', () => {
-    setMockValues({ readOnlyMode: true });
-
-    const wrapper = shallow(<WorkplaceSearchConfigured />);
-
-    expect(wrapper.find(Layout).first().prop('readOnlyMode')).toEqual(true);
-  });
-
   it('renders SourceAdded', () => {
     const wrapper = shallow(<WorkplaceSearchConfigured />);
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index 05018be2934b4..2daf677962163 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -6,19 +6,16 @@
  */
 
 import React, { useEffect } from 'react';
-import { Route, Redirect, Switch, useLocation } from 'react-router-dom';
+import { Route, Redirect, Switch, useRouteMatch } from 'react-router-dom';
 
 import { useActions, useValues } from 'kea';
 
-import { WORKPLACE_SEARCH_PLUGIN } from '../../../common/constants';
 import { InitialAppData } from '../../../common/types';
 import { HttpLogic } from '../shared/http';
 import { KibanaLogic } from '../shared/kibana';
-import { Layout } from '../shared/layout';
-import { NotFound } from '../shared/not_found';
 
 import { AppLogic } from './app_logic';
-import { WorkplaceSearchNav, WorkplaceSearchHeaderActions } from './components/layout';
+import { WorkplaceSearchHeaderActions } from './components/layout';
 import {
   GROUPS_PATH,
   SETUP_GUIDE_PATH,
@@ -36,6 +33,7 @@ import { SourcesRouter } from './views/content_sources';
 import { SourceAdded } from './views/content_sources/components/source_added';
 import { ErrorState } from './views/error_state';
 import { GroupsRouter } from './views/groups';
+import { NotFound } from './views/not_found';
 import { Overview } from './views/overview';
 import { RoleMappings } from './views/role_mappings';
 import { Security } from './views/security';
@@ -44,30 +42,33 @@ import { SetupGuide } from './views/setup_guide';
 
 export const WorkplaceSearch: React.FC<InitialAppData> = (props) => {
   const { config } = useValues(KibanaLogic);
-  return !config.host ? <WorkplaceSearchUnconfigured /> : <WorkplaceSearchConfigured {...props} />;
+  const { errorConnecting } = useValues(HttpLogic);
+  return !config.host ? (
+    <WorkplaceSearchUnconfigured />
+  ) : errorConnecting ? (
+    <ErrorState />
+  ) : (
+    <WorkplaceSearchConfigured {...props} />
+  );
 };
 
 export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
   const { hasInitialized } = useValues(AppLogic);
   const { initializeAppData, setContext } = useActions(AppLogic);
   const { renderHeaderActions, setChromeIsVisible } = useValues(KibanaLogic);
-  const { errorConnecting, readOnlyMode } = useValues(HttpLogic);
-
-  const { pathname } = useLocation();
 
   /**
    * Personal dashboard urls begin with /p/
    * EX: http://localhost:5601/app/enterprise_search/workplace_search/p/sources
    */
 
-  const personalSourceUrlRegex = /^\/p\//g; // matches '/p/*'
-  const isOrganization = !pathname.match(personalSourceUrlRegex); // TODO: Once auth is figured out, we need to have a check for the equivilent of `isAdmin`.
+  const isOrganization = !useRouteMatch(PERSONAL_PATH); // TODO: Once auth is figured out, we need to have a check for the equivalent of `isAdmin`.
 
   setContext(isOrganization);
 
   useEffect(() => {
     setChromeIsVisible(isOrganization);
-  }, [pathname]);
+  }, [isOrganization]);
 
   useEffect(() => {
     if (!hasInitialized) {
@@ -95,6 +96,9 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
           <Route path={PERSONAL_SETTINGS_PATH}>
             <AccountSettings />
           </Route>
+          <Route>
+            <NotFound isOrganization={false} />
+          </Route>
         </Switch>
       </Route>
       <Route path={SOURCES_PATH}>
@@ -113,15 +117,7 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
         <SettingsRouter />
       </Route>
       <Route>
-        <Layout navigation={<WorkplaceSearchNav />} restrictWidth readOnlyMode={readOnlyMode}>
-          {errorConnecting ? (
-            <ErrorState />
-          ) : (
-            <Route>
-              <NotFound product={WORKPLACE_SEARCH_PLUGIN} />
-            </Route>
-          )}
-        </Layout>
+        <NotFound />
       </Route>
     </Switch>
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
index 03f46830fafc3..2aed64af53f16 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
@@ -22,8 +22,6 @@ jest.mock('../../app_logic', () => ({
 }));
 import { AppLogic } from '../../app_logic';
 
-import { NOT_FOUND_PATH } from '../../routes';
-
 import { SourceLogic } from './source_logic';
 
 describe('SourceLogic', () => {
@@ -176,47 +174,55 @@ describe('SourceLogic', () => {
         expect(initializeFederatedSummarySpy).toHaveBeenCalledWith(contentSource.id);
       });
 
-      it('handles error', async () => {
-        const error = {
-          response: {
-            error: 'this is an error',
-            status: 400,
-          },
-        };
-        const promise = Promise.reject(error);
-        http.get.mockReturnValue(promise);
-        SourceLogic.actions.initializeSource(contentSource.id);
-        await expectedAsyncError(promise);
+      describe('errors', () => {
+        it('handles generic errors', async () => {
+          const mockError = Promise.reject('error');
+          http.get.mockReturnValue(mockError);
 
-        expect(flashAPIErrors).toHaveBeenCalledWith(error);
-      });
+          SourceLogic.actions.initializeSource(contentSource.id);
+          await expectedAsyncError(mockError);
 
-      it('handles not found state', async () => {
-        const error = {
-          response: {
-            error: 'this is an error',
-            status: 404,
-          },
-        };
-        const promise = Promise.reject(error);
-        http.get.mockReturnValue(promise);
-        SourceLogic.actions.initializeSource(contentSource.id);
-        await expectedAsyncError(promise);
+          expect(flashAPIErrors).toHaveBeenCalledWith('error');
+        });
 
-        expect(navigateToUrl).toHaveBeenCalledWith(NOT_FOUND_PATH);
-      });
+        describe('404s', () => {
+          const mock404 = Promise.reject({ response: { status: 404 } });
 
-      it('renders error messages passed in success response from server', async () => {
-        const errors = ['ERROR'];
-        const promise = Promise.resolve({
-          ...contentSource,
-          errors,
+          it('redirects to the organization sources page on organization views', async () => {
+            AppLogic.values.isOrganization = true;
+            http.get.mockReturnValue(mock404);
+
+            SourceLogic.actions.initializeSource('404ing_org_source');
+            await expectedAsyncError(mock404);
+
+            expect(navigateToUrl).toHaveBeenCalledWith('/sources');
+            expect(setErrorMessage).toHaveBeenCalledWith('Source not found.');
+          });
+
+          it('redirects to the personal dashboard sources page on personal views', async () => {
+            AppLogic.values.isOrganization = false;
+            http.get.mockReturnValue(mock404);
+
+            SourceLogic.actions.initializeSource('404ing_personal_source');
+            await expectedAsyncError(mock404);
+
+            expect(navigateToUrl).toHaveBeenCalledWith('/p/sources');
+            expect(setErrorMessage).toHaveBeenCalledWith('Source not found.');
+          });
         });
-        http.get.mockReturnValue(promise);
-        SourceLogic.actions.initializeSource(contentSource.id);
-        await promise;
 
-        expect(setErrorMessage).toHaveBeenCalledWith(errors);
+        it('renders error messages passed in success response from server', async () => {
+          const errors = ['ERROR'];
+          const promise = Promise.resolve({
+            ...contentSource,
+            errors,
+          });
+          http.get.mockReturnValue(promise);
+          SourceLogic.actions.initializeSource(contentSource.id);
+          await promise;
+
+          expect(setErrorMessage).toHaveBeenCalledWith(errors);
+        });
       });
     });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
index 2e6a3c65597ea..0fd44e01ae495 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -20,7 +20,7 @@ import {
 import { HttpLogic } from '../../../shared/http';
 import { KibanaLogic } from '../../../shared/kibana';
 import { AppLogic } from '../../app_logic';
-import { NOT_FOUND_PATH, SOURCES_PATH, getSourcesPath } from '../../routes';
+import { PERSONAL_SOURCES_PATH, SOURCES_PATH, getSourcesPath } from '../../routes';
 import { ContentSourceFullData, Meta, DocumentSummaryItem, SourceContentItem } from '../../types';
 
 export interface SourceActions {
@@ -155,8 +155,14 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
           clearFlashMessages();
         }
       } catch (e) {
-        if (e.response.status === 404) {
-          KibanaLogic.values.navigateToUrl(NOT_FOUND_PATH);
+        if (e?.response?.status === 404) {
+          const redirect = isOrganization ? SOURCES_PATH : PERSONAL_SOURCES_PATH;
+          KibanaLogic.values.navigateToUrl(redirect);
+          setErrorMessage(
+            i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.notFoundErrorMessage', {
+              defaultMessage: 'Source not found.',
+            })
+          );
         } else {
           flashAPIErrors(e);
         }
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
index afe0d1f89faea..fbc8eb159a7a8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
@@ -90,7 +90,7 @@ describe('SourceRouter', () => {
     expect(wrapper.find(Overview)).toHaveLength(1);
     expect(wrapper.find(SourceSettings)).toHaveLength(1);
     expect(wrapper.find(SourceContent)).toHaveLength(1);
-    expect(wrapper.find(Route)).toHaveLength(3);
+    expect(wrapper.find(Route)).toHaveLength(4);
   });
 
   it('renders source routes (custom)', () => {
@@ -100,6 +100,6 @@ describe('SourceRouter', () => {
     expect(wrapper.find(DisplaySettingsRouter)).toHaveLength(1);
     expect(wrapper.find(Schema)).toHaveLength(1);
     expect(wrapper.find(SchemaChangeErrors)).toHaveLength(1);
-    expect(wrapper.find(Route)).toHaveLength(6);
+    expect(wrapper.find(Route)).toHaveLength(7);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
index bf68a60757c0d..9f793fcd34fbe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
@@ -13,7 +13,7 @@ import { useActions, useValues } from 'kea';
 
 import { AppLogic } from '../../app_logic';
 import { WorkplaceSearchPageTemplate, PersonalDashboardLayout } from '../../components/layout';
-import { CUSTOM_SERVICE_TYPE } from '../../constants';
+import { NAV, CUSTOM_SERVICE_TYPE } from '../../constants';
 import {
   REINDEX_JOB_PATH,
   SOURCE_DETAILS_PATH,
@@ -24,6 +24,7 @@ import {
   getContentSourcePath as sourcePath,
   getSourcesPath,
 } from '../../routes';
+import { NotFound } from '../../views/not_found';
 
 import { DisplaySettingsRouter } from './components/display_settings';
 import { Overview } from './components/overview';
@@ -85,6 +86,9 @@ export const SourceRouter: React.FC = () => {
       <Route exact path={sourcePath(SOURCE_SETTINGS_PATH, sourceId, isOrganization)}>
         <SourceSettings />
       </Route>
+      <Route>
+        <NotFound isOrganization={isOrganization} pageChrome={[NAV.SOURCES]} />
+      </Route>
     </Switch>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/index.ts
new file mode 100644
index 0000000000000..482c1a58faa9c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/index.ts
@@ -0,0 +1,8 @@
+/*
+ * 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 { NotFound } from './not_found';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
new file mode 100644
index 0000000000000..0e388a73f0e18
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { NotFoundPrompt } from '../../../shared/not_found';
+import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry';
+import { WorkplaceSearchPageTemplate, PersonalDashboardLayout } from '../../components/layout';
+
+import { NotFound } from './';
+
+describe('NotFound', () => {
+  it('renders the shared not found prompt', () => {
+    const wrapper = shallow(<NotFound />);
+    expect(wrapper.find(NotFoundPrompt)).toHaveLength(1);
+  });
+
+  it('renders a telemetry error event', () => {
+    const wrapper = shallow(<NotFound />);
+    expect(wrapper.find(SendWorkplaceSearchTelemetry).prop('action')).toEqual('error');
+  });
+
+  it('passes optional preceding page chrome', () => {
+    const wrapper = shallow(<NotFound pageChrome={['Sources']} />);
+    expect(wrapper.prop('pageChrome')).toEqual(['Sources', '404']);
+  });
+
+  describe('organization views', () => {
+    it('renders the WorkplaceSearchPageTemplate', () => {
+      const wrapper = shallow(<NotFound isOrganization />);
+      expect(wrapper.type()).toEqual(WorkplaceSearchPageTemplate);
+    });
+  });
+
+  describe('personal views', () => {
+    it('renders the PersonalDashboardLayout', () => {
+      const wrapper = shallow(<NotFound isOrganization={false} />);
+      expect(wrapper.type()).toEqual(PersonalDashboardLayout);
+    });
+
+    it('sets the "Back to dashboard" link to /p/sources', () => {
+      const wrapper = shallow(<NotFound isOrganization={false} />);
+      expect(wrapper.find(NotFoundPrompt).prop('backToLink')).toEqual('/p/sources');
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.tsx
new file mode 100644
index 0000000000000..ef55668775513
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.tsx
@@ -0,0 +1,33 @@
+/*
+ * 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 React from 'react';
+
+import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
+import { PageTemplateProps } from '../../../shared/layout';
+import { NotFoundPrompt } from '../../../shared/not_found';
+import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry';
+import { WorkplaceSearchPageTemplate, PersonalDashboardLayout } from '../../components/layout';
+import { PERSONAL_SOURCES_PATH } from '../../routes';
+
+interface Props {
+  isOrganization?: boolean;
+  pageChrome?: PageTemplateProps['pageChrome'];
+}
+export const NotFound: React.FC<Props> = ({ isOrganization = true, pageChrome = [] }) => {
+  const Layout = isOrganization ? WorkplaceSearchPageTemplate : PersonalDashboardLayout;
+
+  return (
+    <Layout pageChrome={[...pageChrome, '404']} template="centeredContent">
+      <SendWorkplaceSearchTelemetry action="error" metric="not_found" />
+      <NotFoundPrompt
+        backToLink={!isOrganization ? PERSONAL_SOURCES_PATH : '/'}
+        productSupportUrl={WORKPLACE_SEARCH_PLUGIN.SUPPORT_URL}
+      />
+    </Layout>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
index 74092f17eadcf..123167f0ad1d0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
@@ -25,8 +25,8 @@ import { SettingsRouter } from './settings_router';
 describe('SettingsRouter', () => {
   const initializeSettings = jest.fn();
   const NUM_SOURCES = staticSourceData.length;
-  // Should be 3 routes other than the sources listed Connectors, Customize, & OauthApplication
-  const NUM_ROUTES = NUM_SOURCES + 3;
+  // Should be 4 routes other than the sources listed: Connectors, Customize, & OauthApplication, & a redirect
+  const NUM_ROUTES = NUM_SOURCES + 4;
 
   beforeEach(() => {
     setMockActions({ initializeSettings });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx
index f8c8050e20153..d9aeba361d240 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx
@@ -11,7 +11,6 @@ import { Redirect, Route, Switch } from 'react-router-dom';
 import { useActions } from 'kea';
 
 import {
-  ORG_SETTINGS_PATH,
   ORG_SETTINGS_CUSTOMIZE_PATH,
   ORG_SETTINGS_CONNECTORS_PATH,
   ORG_SETTINGS_OAUTH_APPLICATION_PATH,
@@ -33,7 +32,6 @@ export const SettingsRouter: React.FC = () => {
 
   return (
     <Switch>
-      <Redirect exact from={ORG_SETTINGS_PATH} to={ORG_SETTINGS_CUSTOMIZE_PATH} />
       <Route exact path={ORG_SETTINGS_CUSTOMIZE_PATH}>
         <Customize />
       </Route>
@@ -48,6 +46,9 @@ export const SettingsRouter: React.FC = () => {
           <SourceConfig sourceIndex={i} />
         </Route>
       ))}
+      <Route>
+        <Redirect to={ORG_SETTINGS_CUSTOMIZE_PATH} />
+      </Route>
     </Switch>
   );
 };

From 0857e620c7565281290c3de4334a6ae0e04fc8d8 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Thu, 24 Jun 2021 14:59:10 -0500
Subject: [PATCH 71/95] [Workplace Search] Remove `isFederatedAuth` checks to
 expose user features (#103278)

* Remove isFederated from main app and routes

* Expose all overview cards that were hidden for federated auth

* Expose all user features that were hidden for groups

* Remove remaining isFederatedAuth references

* Lint fixes

* Add modified test back for Workplace Search

* Remove extraCell

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Remove brackets

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Update test name

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

Co-authored-by: Constance <constancecchen@users.noreply.github.com>
---
 .../common/__mocks__/initial_app_data.ts      |  1 -
 .../enterprise_search/common/types/index.ts   |  1 -
 .../workplace_search/app_logic.test.ts        |  3 --
 .../workplace_search/app_logic.ts             | 12 +-----
 .../workplace_search/index.test.tsx           |  6 ++-
 .../applications/workplace_search/routes.ts   |  1 -
 .../groups/components/group_overview.tsx      |  7 +--
 .../groups/components/group_row.test.tsx      |  7 ---
 .../views/groups/components/group_row.tsx     | 24 ++++-------
 .../components/group_users_table.test.tsx     | 11 +----
 .../groups/components/group_users_table.tsx   | 11 ++---
 .../groups/components/groups_table.test.tsx   | 10 +----
 .../views/groups/components/groups_table.tsx  |  4 +-
 .../groups/components/table_filters.test.tsx  |  9 +---
 .../views/groups/components/table_filters.tsx | 10 ++---
 .../views/groups/groups.test.tsx              | 20 +--------
 .../workplace_search/views/groups/groups.tsx  | 11 ++---
 .../overview/__mocks__/overview_logic.mock.ts |  2 +-
 .../views/overview/onboarding_steps.test.tsx  | 19 ++++----
 .../views/overview/onboarding_steps.tsx       | 40 ++++++++---------
 .../overview/organization_stats.test.tsx      |  9 ----
 .../views/overview/organization_stats.tsx     | 43 ++++++++-----------
 .../lib/enterprise_search_config_api.test.ts  |  1 -
 .../lib/enterprise_search_config_api.ts       |  1 -
 24 files changed, 76 insertions(+), 187 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts b/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
index 7ea4289b21967..a4e3ada1c06cb 100644
--- a/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
+++ b/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
@@ -8,7 +8,6 @@
 export const DEFAULT_INITIAL_APP_DATA = {
   readOnlyMode: false,
   ilmEnabled: true,
-  isFederatedAuth: false,
   configuredLimits: {
     appSearch: {
       engine: {
diff --git a/x-pack/plugins/enterprise_search/common/types/index.ts b/x-pack/plugins/enterprise_search/common/types/index.ts
index 68904483720f2..f405c86de18f0 100644
--- a/x-pack/plugins/enterprise_search/common/types/index.ts
+++ b/x-pack/plugins/enterprise_search/common/types/index.ts
@@ -17,7 +17,6 @@ import {
 export interface InitialAppData {
   readOnlyMode?: boolean;
   ilmEnabled?: boolean;
-  isFederatedAuth?: boolean;
   configuredLimits?: ConfiguredLimits;
   access?: ProductAccess;
   appSearch?: AppSearchAccount;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
index b2cc835da4ecd..24a156bbd67b8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
@@ -20,7 +20,6 @@ describe('AppLogic', () => {
   const DEFAULT_VALUES = {
     account: {},
     hasInitialized: false,
-    isFederatedAuth: true,
     isOrganization: false,
     organization: {},
   };
@@ -36,7 +35,6 @@ describe('AppLogic', () => {
       viewedOnboardingPage: true,
     },
     hasInitialized: true,
-    isFederatedAuth: false,
     isOrganization: false,
     organization: {
       defaultOrgName: 'My Organization',
@@ -61,7 +59,6 @@ describe('AppLogic', () => {
       expect(AppLogic.values).toEqual({
         ...DEFAULT_VALUES,
         hasInitialized: true,
-        isFederatedAuth: false,
       });
     });
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
index 26e1d7fbb93fd..ee1f6a69fa4b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
@@ -16,7 +16,6 @@ import {
 
 interface AppValues extends WorkplaceSearchInitialData {
   hasInitialized: boolean;
-  isFederatedAuth: boolean;
   isOrganization: boolean;
 }
 interface AppActions {
@@ -32,10 +31,7 @@ const emptyAccount = {} as Account;
 export const AppLogic = kea<MakeLogicType<AppValues, AppActions>>({
   path: ['enterprise_search', 'workplace_search', 'app_logic'],
   actions: {
-    initializeAppData: ({ workplaceSearch, isFederatedAuth }) => ({
-      workplaceSearch,
-      isFederatedAuth,
-    }),
+    initializeAppData: ({ workplaceSearch }) => ({ workplaceSearch }),
     setContext: (isOrganization) => isOrganization,
     setOrgName: (name: string) => name,
     setSourceRestriction: (canCreatePersonalSources: boolean) => canCreatePersonalSources,
@@ -47,12 +43,6 @@ export const AppLogic = kea<MakeLogicType<AppValues, AppActions>>({
         initializeAppData: () => true,
       },
     ],
-    isFederatedAuth: [
-      true,
-      {
-        initializeAppData: (_, { isFederatedAuth }) => !!isFederatedAuth,
-      },
-    ],
     isOrganization: [
       false,
       {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index 2743dfc794ec6..3ddccde6abd33 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -6,6 +6,7 @@
  */
 
 import '../__mocks__/shallow_useeffect.mock';
+import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
 import { setMockValues, setMockActions, mockKibanaValues } from '../__mocks__/kea_logic';
 import { mockUseRouteMatch } from '../__mocks__/react_router';
 
@@ -75,9 +76,10 @@ describe('WorkplaceSearchConfigured', () => {
   });
 
   it('initializes app data with passed props', () => {
-    shallow(<WorkplaceSearchConfigured isFederatedAuth />);
+    const { workplaceSearch } = DEFAULT_INITIAL_APP_DATA;
+    shallow(<WorkplaceSearchConfigured workplaceSearch={workplaceSearch} />);
 
-    expect(initializeAppData).toHaveBeenCalledWith({ isFederatedAuth: true });
+    expect(initializeAppData).toHaveBeenCalledWith({ workplaceSearch });
   });
 
   it('does not re-initialize app data or re-render header actions', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
index b9309ffd94809..3dac5f80700c0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -50,7 +50,6 @@ export const PERSONAL_PATH = '/p';
 
 export const USERS_AND_ROLES_PATH = '/users_and_roles';
 
-export const USERS_PATH = '/users';
 export const SECURITY_PATH = '/security';
 
 export const GROUPS_PATH = '/groups';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
index 6914c5dcfcad1..76658cec75e51 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
@@ -24,7 +24,6 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { TruncatedContent } from '../../../../shared/truncate';
-import { AppLogic } from '../../../app_logic';
 import noSharedSourcesIcon from '../../../assets/share_circle.svg';
 import { WorkplaceSearchPageTemplate } from '../../../components/layout';
 import { ContentSection } from '../../../components/shared/content_section';
@@ -124,8 +123,6 @@ export const GroupOverview: React.FC = () => {
     confirmDeleteModalVisible,
   } = useValues(GroupLogic);
 
-  const { isFederatedAuth } = useValues(AppLogic);
-
   const truncatedName = name && (
     <TruncatedContent tooltipType="title" content={name} length={MAX_NAME_LENGTH} />
   );
@@ -167,7 +164,7 @@ export const GroupOverview: React.FC = () => {
       {MANAGE_SOURCES_BUTTON_TEXT}
     </EuiButton>
   );
-  const manageUsersButton = !isFederatedAuth && (
+  const manageUsersButton = (
     <EuiButton color="primary" onClick={showManageUsersModal}>
       {MANAGE_USERS_BUTTON_TEXT}
     </EuiButton>
@@ -199,7 +196,7 @@ export const GroupOverview: React.FC = () => {
     </>
   );
 
-  const usersSection = !isFederatedAuth && (
+  const usersSection = (
     <ContentSection
       title="Group users"
       description={hasUsers ? GROUP_USERS_DESCRIPTION : EMPTY_USERS_DESCRIPTION}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
index 7915482a45b2a..f98b873aed5bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
@@ -19,10 +18,6 @@ import { GroupRow, NO_USERS_MESSAGE, NO_SOURCES_MESSAGE } from './group_row';
 import { GroupUsers } from './group_users';
 
 describe('GroupRow', () => {
-  beforeEach(() => {
-    setMockValues({ isFederatedAuth: true });
-  });
-
   it('renders', () => {
     const wrapper = shallow(<GroupRow {...groups[0]} />);
 
@@ -30,7 +25,6 @@ describe('GroupRow', () => {
   });
 
   it('renders group users', () => {
-    setMockValues({ isFederatedAuth: false });
     const wrapper = shallow(<GroupRow {...groups[0]} />);
 
     expect(wrapper.find(GroupUsers)).toHaveLength(1);
@@ -51,7 +45,6 @@ describe('GroupRow', () => {
   });
 
   it('renders empty users message when no users present', () => {
-    setMockValues({ isFederatedAuth: false });
     const wrapper = shallow(<GroupRow {...groups[0]} usersCount={0} />);
 
     expect(wrapper.find('.user-group__accounts').text()).toEqual(NO_USERS_MESSAGE);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
index 204d8f5655172..94d44fde57aed 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 
-import { useValues } from 'kea';
 import moment from 'moment';
 
 import { EuiTableRow, EuiTableRowCell, EuiIcon } from '@elastic/eui';
@@ -15,7 +14,6 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiLinkTo } from '../../../../shared/react_router_helpers';
 import { TruncatedContent } from '../../../../shared/truncate';
-import { AppLogic } from '../../../app_logic';
 import { getGroupPath } from '../../../routes';
 import { Group } from '../../../types';
 import { MAX_NAME_LENGTH } from '../group_logic';
@@ -50,8 +48,6 @@ export const GroupRow: React.FC<Group> = ({
   users,
   usersCount,
 }) => {
-  const { isFederatedAuth } = useValues(AppLogic);
-
   const GROUP_UPDATED_TEXT = i18n.translate(
     'xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText',
     {
@@ -80,17 +76,15 @@ export const GroupRow: React.FC<Group> = ({
           )}
         </div>
       </EuiTableRowCell>
-      {!isFederatedAuth && (
-        <EuiTableRowCell>
-          <div className="user-group__accounts">
-            {usersCount > 0 ? (
-              <GroupUsers groupUsers={users} usersCount={usersCount} groupId={id} />
-            ) : (
-              NO_USERS_MESSAGE
-            )}
-          </div>
-        </EuiTableRowCell>
-      )}
+      <EuiTableRowCell>
+        <div className="user-group__accounts">
+          {usersCount > 0 ? (
+            <GroupUsers groupUsers={users} usersCount={usersCount} groupId={id} />
+          ) : (
+            NO_USERS_MESSAGE
+          )}
+        </div>
+      </EuiTableRowCell>
       <EuiTableRowCell align="right">
         <strong>
           <EuiLinkTo to={getGroupPath(id)}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
index 0dde2f5eaf7f7..cc5f9c4effd21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
@@ -23,17 +23,10 @@ const group = groups[0];
 
 describe('GroupUsersTable', () => {
   it('renders', () => {
-    setMockValues({ isFederatedAuth: true, group });
+    setMockValues({ group });
     const wrapper = shallow(<GroupUsersTable />);
 
     expect(wrapper.find(EuiTable)).toHaveLength(1);
-    expect(wrapper.find(TableHeader).prop('headerItems')).toHaveLength(1);
-  });
-
-  it('adds header item for non-federated auth', () => {
-    setMockValues({ isFederatedAuth: false, group });
-    const wrapper = shallow(<GroupUsersTable />);
-
     expect(wrapper.find(TableHeader).prop('headerItems')).toHaveLength(2);
   });
 
@@ -48,7 +41,7 @@ describe('GroupUsersTable', () => {
       });
     });
 
-    setMockValues({ isFederatedAuth: true, group: { users } });
+    setMockValues({ group: { users } });
     const wrapper = shallow(<GroupUsersTable />);
     const pagination = wrapper.find(EuiTablePagination);
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
index 050aaf1dadf89..3e9e40fef44a6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.tsx
@@ -14,7 +14,6 @@ import { Pager } from '@elastic/eui';
 
 import { USERNAME_LABEL, EMAIL_LABEL } from '../../../../shared/constants';
 import { TableHeader } from '../../../../shared/table_header';
-import { AppLogic } from '../../../app_logic';
 import { UserRow } from '../../../components/shared/user_row';
 import { User } from '../../../types';
 import { GroupLogic } from '../group_logic';
@@ -22,14 +21,10 @@ import { GroupLogic } from '../group_logic';
 const USERS_PER_PAGE = 10;
 
 export const GroupUsersTable: React.FC = () => {
-  const { isFederatedAuth } = useValues(AppLogic);
   const {
     group: { users },
   } = useValues(GroupLogic);
-  const headerItems = [USERNAME_LABEL];
-  if (!isFederatedAuth) {
-    headerItems.push(EMAIL_LABEL);
-  }
+  const headerItems = [USERNAME_LABEL, EMAIL_LABEL];
 
   const [firstItem, setFirstItem] = useState(0);
   const [lastItem, setLastItem] = useState(USERS_PER_PAGE - 1);
@@ -58,10 +53,10 @@ export const GroupUsersTable: React.FC = () => {
   return (
     <>
       <EuiTable>
-        <TableHeader extraCell={isFederatedAuth} headerItems={headerItems} />
+        <TableHeader headerItems={headerItems} />
         <EuiTableBody>
           {users.slice(firstItem, lastItem + 1).map((user: User) => (
-            <UserRow key={user.id} showEmail={!isFederatedAuth} user={user} />
+            <UserRow key={user.id} showEmail user={user} />
           ))}
         </EuiTableBody>
       </EuiTable>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
index d11b830a8fc4b..cbb028139623c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiTable, EuiTableHeaderCell } from '@elastic/eui';
+import { EuiTable } from '@elastic/eui';
 
 import { DEFAULT_META } from '../../../../shared/constants';
 import { TablePaginationBar } from '../../../components/shared/table_pagination_bar';
@@ -27,7 +27,6 @@ const mockValues = {
   groupsMeta: DEFAULT_META,
   groups,
   hasFiltersSet: false,
-  isFederatedAuth: true,
 };
 
 describe('GroupsTable', () => {
@@ -43,13 +42,6 @@ describe('GroupsTable', () => {
     expect(wrapper.find(GroupRow)).toHaveLength(1);
   });
 
-  it('renders extra header for non-federated auth', () => {
-    setMockValues({ ...mockValues, isFederatedAuth: false });
-    const wrapper = shallow(<GroupsTable />);
-
-    expect(wrapper.find(EuiTableHeaderCell)).toHaveLength(4);
-  });
-
   it('handles pagination', () => {
     setMockValues({
       ...mockValues,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
index deaf223afa6b3..cfb3ed8044235 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
@@ -18,7 +18,6 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AppLogic } from '../../../app_logic';
 import { TablePaginationBar } from '../../../components/shared/table_pagination_bar';
 import { GroupsLogic } from '../groups_logic';
 
@@ -53,7 +52,6 @@ export const GroupsTable: React.FC<{}> = () => {
     groups,
     hasFiltersSet,
   } = useValues(GroupsLogic);
-  const { isFederatedAuth } = useValues(AppLogic);
 
   const clearFiltersLink = hasFiltersSet ? <ClearFiltersLink /> : undefined;
 
@@ -79,7 +77,7 @@ export const GroupsTable: React.FC<{}> = () => {
         <EuiTableHeader>
           <EuiTableHeaderCell>{GROUP_TABLE_HEADER}</EuiTableHeaderCell>
           <EuiTableHeaderCell>{SOURCES_TABLE_HEADER}</EuiTableHeaderCell>
-          {!isFederatedAuth && <EuiTableHeaderCell>{USERS_TABLE_HEADER}</EuiTableHeaderCell>}
+          <EuiTableHeaderCell>{USERS_TABLE_HEADER}</EuiTableHeaderCell>
           <EuiTableHeaderCell />
         </EuiTableHeader>
         <EuiTableBody>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
index 83a20efe5257e..f0758831e2af6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
@@ -21,7 +21,7 @@ const setFilterValue = jest.fn();
 
 describe('TableFilters', () => {
   beforeEach(() => {
-    setMockValues({ filterValue: '', isFederatedAuth: true });
+    setMockValues({ filterValue: '' });
     setMockActions({ setFilterValue });
   });
   it('renders', () => {
@@ -29,13 +29,6 @@ describe('TableFilters', () => {
 
     expect(wrapper.find(EuiFieldSearch)).toHaveLength(1);
     expect(wrapper.find(TableFilterSourcesDropdown)).toHaveLength(1);
-    expect(wrapper.find(TableFilterUsersDropdown)).toHaveLength(0);
-  });
-
-  it('renders for non-federated Auth', () => {
-    setMockValues({ filterValue: '', isFederatedAuth: false });
-    const wrapper = shallow(<TableFilters />);
-
     expect(wrapper.find(TableFilterUsersDropdown)).toHaveLength(1);
   });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.tsx
index e9ea6a7c6b4aa..0907e0b8b3740 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.tsx
@@ -12,7 +12,6 @@ import { useActions, useValues } from 'kea';
 import { EuiFieldSearch, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AppLogic } from '../../../app_logic';
 import { GroupsLogic } from '../groups_logic';
 
 import { TableFilterSourcesDropdown } from './table_filter_sources_dropdown';
@@ -28,7 +27,6 @@ const FILTER_GROUPS_PLACEHOLDER = i18n.translate(
 export const TableFilters: React.FC = () => {
   const { setFilterValue } = useActions(GroupsLogic);
   const { filterValue } = useValues(GroupsLogic);
-  const { isFederatedAuth } = useValues(AppLogic);
 
   const handleSearchChange = (e: ChangeEvent<HTMLInputElement>) => setFilterValue(e.target.value);
 
@@ -47,11 +45,9 @@ export const TableFilters: React.FC = () => {
           <EuiFlexItem className="user-groups-filters__filter-sources">
             <TableFilterSourcesDropdown />
           </EuiFlexItem>
-          {!isFederatedAuth && (
-            <EuiFlexItem>
-              <TableFilterUsersDropdown />
-            </EuiFlexItem>
-          )}
+          <EuiFlexItem>
+            <TableFilterUsersDropdown />
+          </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
index 5be61da22fda9..dccb1ad114db9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
@@ -50,7 +50,6 @@ const mockValues = {
   filteredSources: [],
   filteredUsers: [],
   filterValue: '',
-  isFederatedAuth: false,
 };
 
 describe('GroupOverview', () => {
@@ -112,12 +111,7 @@ describe('GroupOverview', () => {
     expect(wrapper.find(ClearFiltersLink)).toHaveLength(1);
   });
 
-  it('renders inviteUsersButton when not federated auth', () => {
-    setMockValues({
-      ...mockValues,
-      isFederatedAuth: false,
-    });
-
+  it('renders inviteUsersButton', () => {
     const wrapper = shallow(<Groups />);
     const actions = getPageHeaderActions(wrapper);
 
@@ -125,18 +119,6 @@ describe('GroupOverview', () => {
     expect(actions.find(EuiButtonTo)).toHaveLength(1);
   });
 
-  it('does not render inviteUsersButton when federated auth', () => {
-    setMockValues({
-      ...mockValues,
-      isFederatedAuth: true,
-    });
-
-    const wrapper = shallow(<Groups />);
-    const actions = getPageHeaderActions(wrapper);
-
-    expect(actions.find('[data-test-subj="InviteUsersButton"]')).toHaveLength(0);
-  });
-
   it('renders EuiLoadingSpinner when loading', () => {
     setMockValues({
       ...mockValues,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx
index 60806a53deb5f..1a4c4f51e93ea 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx
@@ -14,10 +14,9 @@ import { i18n } from '@kbn/i18n';
 
 import { FlashMessagesLogic } from '../../../shared/flash_messages';
 import { EuiButtonTo } from '../../../shared/react_router_helpers';
-import { AppLogic } from '../../app_logic';
 import { WorkplaceSearchPageTemplate } from '../../components/layout';
 import { NAV } from '../../constants';
-import { getGroupPath, USERS_PATH } from '../../routes';
+import { getGroupPath, USERS_AND_ROLES_PATH } from '../../routes';
 
 import { AddGroupModal } from './components/add_group_modal';
 import { ClearFiltersLink } from './components/clear_filters_link';
@@ -43,8 +42,6 @@ export const Groups: React.FC = () => {
     filterValue,
   } = useValues(GroupsLogic);
 
-  const { isFederatedAuth } = useValues(AppLogic);
-
   const hasMessages = messages.length > 0;
 
   useEffect(() => {
@@ -68,7 +65,7 @@ export const Groups: React.FC = () => {
 
   const clearFilters = hasFiltersSet && <ClearFiltersLink />;
   const inviteUsersButton = (
-    <EuiButtonTo to={USERS_PATH} data-test-subj="InviteUsersButton">
+    <EuiButtonTo to={USERS_AND_ROLES_PATH} data-test-subj="InviteUsersButton">
       {i18n.translate('xpack.enterpriseSearch.workplaceSearch.groups.inviteUsers.action', {
         defaultMessage: 'Invite users',
       })}
@@ -81,9 +78,7 @@ export const Groups: React.FC = () => {
       })}
     </EuiButton>
   );
-  const headerActions = !isFederatedAuth
-    ? [inviteUsersButton, createGroupButton]
-    : [createGroupButton];
+  const headerActions = [inviteUsersButton, createGroupButton];
 
   const noResults = (
     <EuiFlexGroup justifyContent="spaceAround">
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
index 9aaa6253ea0ab..f6468aefa4fb9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
@@ -27,7 +27,7 @@ export const mockActions = {
   initializeOverview: jest.fn(() => ({})),
 };
 
-const mockValues = { ...mockOverviewValues, ...mockAppValues, isFederatedAuth: true };
+const mockValues = { ...mockOverviewValues, ...mockAppValues };
 
 setMockActions({ ...mockActions });
 setMockKeaValues({ ...mockValues });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
index 01e5245c597eb..fd3e1877fdb3e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
@@ -13,7 +13,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SOURCES_PATH, USERS_PATH } from '../../routes';
+import { SOURCES_PATH, USERS_AND_ROLES_PATH } from '../../routes';
 
 import { OnboardingCard } from './onboarding_card';
 import { OnboardingSteps, OrgNameOnboarding } from './onboarding_steps';
@@ -33,9 +33,9 @@ describe('OnboardingSteps', () => {
       setMockValues({ canCreateContentSources: true });
       const wrapper = shallow(<OnboardingSteps />);
 
-      expect(wrapper.find(OnboardingCard)).toHaveLength(1);
-      expect(wrapper.find(OnboardingCard).prop('actionPath')).toBe(SOURCES_PATH);
-      expect(wrapper.find(OnboardingCard).prop('description')).toBe(
+      expect(wrapper.find(OnboardingCard)).toHaveLength(2);
+      expect(wrapper.find(OnboardingCard).first().prop('actionPath')).toBe(SOURCES_PATH);
+      expect(wrapper.find(OnboardingCard).first().prop('description')).toBe(
         'Add shared sources for your organization to start searching.'
       );
     });
@@ -44,7 +44,7 @@ describe('OnboardingSteps', () => {
       setMockValues({ sourcesCount: 2, hasOrgSources: true });
       const wrapper = shallow(<OnboardingSteps />);
 
-      expect(wrapper.find(OnboardingCard).prop('description')).toEqual(
+      expect(wrapper.find(OnboardingCard).first().prop('description')).toEqual(
         'You have added 2 shared sources. Happy searching.'
       );
     });
@@ -53,14 +53,13 @@ describe('OnboardingSteps', () => {
       setMockValues({ canCreateContentSources: false });
       const wrapper = shallow(<OnboardingSteps />);
 
-      expect(wrapper.find(OnboardingCard).prop('actionPath')).toBe(undefined);
+      expect(wrapper.find(OnboardingCard).first().prop('actionPath')).toBe(undefined);
     });
   });
 
   describe('Users & Invitations', () => {
-    it('renders 0 users when not on federated auth', () => {
+    it('renders 0 users state', () => {
       setMockValues({
-        isFederatedAuth: false,
         account,
         accountsCount: 0,
         hasUsers: false,
@@ -68,7 +67,7 @@ describe('OnboardingSteps', () => {
       const wrapper = shallow(<OnboardingSteps />);
 
       expect(wrapper.find(OnboardingCard)).toHaveLength(2);
-      expect(wrapper.find(OnboardingCard).last().prop('actionPath')).toBe(USERS_PATH);
+      expect(wrapper.find(OnboardingCard).last().prop('actionPath')).toBe(USERS_AND_ROLES_PATH);
       expect(wrapper.find(OnboardingCard).last().prop('description')).toEqual(
         'Invite your colleagues into this organization to search with you.'
       );
@@ -76,7 +75,6 @@ describe('OnboardingSteps', () => {
 
     it('renders completed users state', () => {
       setMockValues({
-        isFederatedAuth: false,
         account,
         accountsCount: 1,
         hasUsers: true,
@@ -90,7 +88,6 @@ describe('OnboardingSteps', () => {
 
     it('disables link when the user cannot create invitations', () => {
       setMockValues({
-        isFederatedAuth: false,
         account: {
           ...account,
           canCreateInvitations: false,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
index a89e3294597e4..44d09ed73ed1f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
@@ -26,7 +26,7 @@ import { TelemetryLogic } from '../../../shared/telemetry';
 import { AppLogic } from '../../app_logic';
 import sharedSourcesIcon from '../../components/shared/assets/source_icons/share_circle.svg';
 import { ContentSection } from '../../components/shared/content_section';
-import { SOURCES_PATH, USERS_PATH, ORG_SETTINGS_PATH } from '../../routes';
+import { SOURCES_PATH, USERS_AND_ROLES_PATH, ORG_SETTINGS_PATH } from '../../routes';
 
 import { OnboardingCard } from './onboarding_card';
 import { OverviewLogic } from './overview_logic';
@@ -58,7 +58,6 @@ const ONBOARDING_USERS_CARD_DESCRIPTION = i18n.translate(
 
 export const OnboardingSteps: React.FC = () => {
   const {
-    isFederatedAuth,
     organization: { name, defaultOrgName },
     account: { isCurated, canCreateInvitations },
   } = useValues(AppLogic);
@@ -71,8 +70,7 @@ export const OnboardingSteps: React.FC = () => {
     sourcesCount,
   } = useValues(OverviewLogic);
 
-  const accountsPath =
-    !isFederatedAuth && (canCreateInvitations || isCurated) ? USERS_PATH : undefined;
+  const accountsPath = canCreateInvitations || isCurated ? USERS_AND_ROLES_PATH : undefined;
   const sourcesPath = canCreateContentSources || isCurated ? SOURCES_PATH : undefined;
 
   const SOURCES_CARD_DESCRIPTION = i18n.translate(
@@ -86,7 +84,7 @@ export const OnboardingSteps: React.FC = () => {
 
   return (
     <ContentSection>
-      <EuiFlexGrid columns={isFederatedAuth ? 1 : 2}>
+      <EuiFlexGrid columns={2}>
         <OnboardingCard
           title={SOURCES_TITLE}
           testSubj="sharedSourcesButton"
@@ -104,23 +102,21 @@ export const OnboardingSteps: React.FC = () => {
           actionPath={sourcesPath}
           complete={hasOrgSources}
         />
-        {!isFederatedAuth && (
-          <OnboardingCard
-            title={USERS_TITLE}
-            testSubj="usersButton"
-            icon="user"
-            description={hasUsers ? USERS_CARD_DESCRIPTION : ONBOARDING_USERS_CARD_DESCRIPTION}
-            actionTitle={i18n.translate(
-              'xpack.enterpriseSearch.workplaceSearch.usersOnboardingCard.buttonLabel',
-              {
-                defaultMessage: 'Invite {label} users',
-                values: { label: accountsCount > 0 ? 'more' : '' },
-              }
-            )}
-            actionPath={accountsPath}
-            complete={hasUsers}
-          />
-        )}
+        <OnboardingCard
+          title={USERS_TITLE}
+          testSubj="usersButton"
+          icon="user"
+          description={hasUsers ? USERS_CARD_DESCRIPTION : ONBOARDING_USERS_CARD_DESCRIPTION}
+          actionTitle={i18n.translate(
+            'xpack.enterpriseSearch.workplaceSearch.usersOnboardingCard.buttonLabel',
+            {
+              defaultMessage: 'Invite {label} users',
+              values: { label: accountsCount > 0 ? 'more' : '' },
+            }
+          )}
+          actionPath={accountsPath}
+          complete={hasUsers}
+        />
       </EuiFlexGrid>
       {name === defaultOrgName && (
         <>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx
index 110557ac4087a..0d690e500f9e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { setMockValues } from './__mocks__';
 import './__mocks__/overview_logic.mock';
 
 import React from 'react';
@@ -21,14 +20,6 @@ describe('OrganizationStats', () => {
   it('renders', () => {
     const wrapper = shallow(<OrganizationStats />);
 
-    expect(wrapper.find(StatisticCard)).toHaveLength(2);
-    expect(wrapper.find(EuiFlexGrid).prop('columns')).toEqual(2);
-  });
-
-  it('renders additional cards for federated auth', () => {
-    setMockValues({ isFederatedAuth: false });
-    const wrapper = shallow(<OrganizationStats />);
-
     expect(wrapper.find(StatisticCard)).toHaveLength(4);
     expect(wrapper.find(EuiFlexGrid).prop('columns')).toEqual(4);
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
index d1f0f6a030421..5608032f8bdd9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
@@ -13,16 +13,13 @@ import { EuiFlexGrid, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { AppLogic } from '../../app_logic';
 import { ContentSection } from '../../components/shared/content_section';
-import { SOURCES_PATH, USERS_PATH } from '../../routes';
+import { SOURCES_PATH, USERS_AND_ROLES_PATH } from '../../routes';
 
 import { OverviewLogic } from './overview_logic';
 import { StatisticCard } from './statistic_card';
 
 export const OrganizationStats: React.FC = () => {
-  const { isFederatedAuth } = useValues(AppLogic);
-
   const { sourcesCount, pendingInvitationsCount, accountsCount, personalSourcesCount } = useValues(
     OverviewLogic
   );
@@ -37,7 +34,7 @@ export const OrganizationStats: React.FC = () => {
       }
     >
       <EuiPanel color="subdued" hasShadow={false}>
-        <EuiFlexGrid columns={isFederatedAuth ? 2 : 4}>
+        <EuiFlexGrid columns={4}>
           <StatisticCard
             title={i18n.translate(
               'xpack.enterpriseSearch.workplaceSearch.organizationStats.sharedSources',
@@ -46,26 +43,22 @@ export const OrganizationStats: React.FC = () => {
             count={sourcesCount}
             actionPath={SOURCES_PATH}
           />
-          {!isFederatedAuth && (
-            <>
-              <StatisticCard
-                title={i18n.translate(
-                  'xpack.enterpriseSearch.workplaceSearch.organizationStats.invitations',
-                  { defaultMessage: 'Invitations' }
-                )}
-                count={pendingInvitationsCount}
-                actionPath={USERS_PATH}
-              />
-              <StatisticCard
-                title={i18n.translate(
-                  'xpack.enterpriseSearch.workplaceSearch.organizationStats.activeUsers',
-                  { defaultMessage: 'Active users' }
-                )}
-                count={accountsCount}
-                actionPath={USERS_PATH}
-              />
-            </>
-          )}
+          <StatisticCard
+            title={i18n.translate(
+              'xpack.enterpriseSearch.workplaceSearch.organizationStats.invitations',
+              { defaultMessage: 'Invitations' }
+            )}
+            count={pendingInvitationsCount}
+            actionPath={USERS_AND_ROLES_PATH}
+          />
+          <StatisticCard
+            title={i18n.translate(
+              'xpack.enterpriseSearch.workplaceSearch.organizationStats.activeUsers',
+              { defaultMessage: 'Active users' }
+            )}
+            count={accountsCount}
+            actionPath={USERS_AND_ROLES_PATH}
+          />
           <StatisticCard
             title={i18n.translate(
               'xpack.enterpriseSearch.workplaceSearch.organizationStats.privateSources',
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
index 50bac793ee696..d3b04be36978d 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
@@ -136,7 +136,6 @@ describe('callEnterpriseSearchConfigAPI', () => {
       publicUrl: undefined,
       readOnlyMode: false,
       ilmEnabled: false,
-      isFederatedAuth: false,
       configuredLimits: {
         appSearch: {
           engine: {
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
index 8cce01d1932ee..833419e34ef5f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
@@ -75,7 +75,6 @@ export const callEnterpriseSearchConfigAPI = async ({
       publicUrl: stripTrailingSlash(data?.settings?.external_url),
       readOnlyMode: !!data?.settings?.read_only_mode,
       ilmEnabled: !!data?.settings?.ilm_enabled,
-      isFederatedAuth: !!data?.settings?.is_federated_auth, // i.e., not standard auth
       configuredLimits: {
         appSearch: {
           engine: {

From cebf16fb538895e8bd4fbbc787d964392bfe9430 Mon Sep 17 00:00:00 2001
From: Candace Park <56409205+parkiino@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:11:16 -0400
Subject: [PATCH 72/95] [Security Solution][Endpoint][Host Isolation] Remove
 agent status for non endpoint alerts (#102976)

---
 .../event_details/alert_summary_view.tsx      | 11 +++++--
 .../common/utils/endpoint_alert_check.test.ts | 31 +++++++++++++++++++
 .../common/utils/endpoint_alert_check.ts      | 14 +++++++++
 .../side_panel/event_details/index.tsx        |  4 +--
 .../timeline/body/renderers/constants.tsx     |  2 +-
 .../body/renderers/formatted_field.tsx        |  4 +--
 6 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
 create mode 100644 x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts

diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
index e229c0c6fae49..9cc0b43f52123 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
@@ -37,6 +37,7 @@ import { SummaryView } from './summary_view';
 import { AlertSummaryRow, getSummaryColumns, SummaryRow } from './helpers';
 import { useRuleAsync } from '../../../detections/containers/detection_engine/rules/use_rule_async';
 import { LineClamp } from '../line_clamp';
+import { endpointAlertCheck } from '../../utils/endpoint_alert_check';
 
 const StyledEuiDescriptionList = styled(EuiDescriptionList)`
   padding: 24px 4px 4px;
@@ -53,7 +54,7 @@ const fields = [
   { id: 'signal.rule.severity', label: ALERTS_HEADERS_SEVERITY },
   { id: 'signal.rule.risk_score', label: ALERTS_HEADERS_RISK_SCORE },
   { id: 'host.name' },
-  { id: 'host.status' },
+  { id: 'agent.status' },
   { id: 'user.name' },
   { id: SOURCE_IP_FIELD_NAME, fieldType: IP_FIELD_TYPE },
   { id: DESTINATION_IP_FIELD_NAME, fieldType: IP_FIELD_TYPE },
@@ -178,6 +179,10 @@ const AlertSummaryViewComponent: React.FC<{
     timelineId,
   ]);
 
+  const isEndpointAlert = useMemo(() => {
+    return endpointAlertCheck({ data });
+  }, [data]);
+
   const agentId = useMemo(() => {
     const findAgentId = find({ category: 'agent', field: 'agent.id' }, data)?.values;
     return findAgentId ? findAgentId[0] : '';
@@ -188,7 +193,7 @@ const AlertSummaryViewComponent: React.FC<{
     description: {
       contextId: timelineId,
       eventId,
-      fieldName: 'host.status',
+      fieldName: 'agent.status',
       value: agentId,
       linkValue: undefined,
     },
@@ -209,7 +214,7 @@ const AlertSummaryViewComponent: React.FC<{
       <EuiSpacer size="l" />
       <SummaryView
         summaryColumns={summaryColumns}
-        summaryRows={summaryRowsWithAgentStatus}
+        summaryRows={isEndpointAlert ? summaryRowsWithAgentStatus : summaryRows}
         title={title}
       />
       {maybeRule?.note && (
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
new file mode 100644
index 0000000000000..b085fe67d3814
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 _ from 'lodash';
+import { mockDetailItemData } from '../mock';
+import { endpointAlertCheck } from './endpoint_alert_check';
+
+describe('utils', () => {
+  describe('endpointAlertCheck', () => {
+    it('should return false if detections data does not come from endpoint rule', () => {
+      expect(endpointAlertCheck({ data: mockDetailItemData })).toBeFalsy();
+    });
+    it('should return true if detections data comes from an endpoint rule', () => {
+      _.remove(mockDetailItemData, function (o) {
+        return o.field === 'agent.type';
+      });
+      const mockEndpointDetailItemData = _.concat(mockDetailItemData, {
+        field: 'agent.type',
+        originalValue: 'endpoint',
+        values: ['endpoint'],
+        isObjectArray: false,
+      });
+
+      expect(endpointAlertCheck({ data: mockEndpointDetailItemData })).toBeTruthy();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
new file mode 100644
index 0000000000000..e399cec0f3bbe
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
@@ -0,0 +1,14 @@
+/*
+ * 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 { find } from 'lodash/fp';
+import { TimelineEventsDetailsItem } from '../../../common/search_strategy';
+
+export const endpointAlertCheck = ({ data }: { data: TimelineEventsDetailsItem[] | null }) => {
+  const findEndpointAlert = find({ field: 'agent.type' }, data)?.values;
+  return findEndpointAlert ? findEndpointAlert[0] === 'endpoint' : false;
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
index 76341055f28ef..395538610f567 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
@@ -32,6 +32,7 @@ import {
 } from '../../../../detections/components/host_isolation/translations';
 import { ALERT_DETAILS } from './translations';
 import { useIsolationPrivileges } from '../../../../common/hooks/endpoint/use_isolate_privileges';
+import { endpointAlertCheck } from '../../../../common/utils/endpoint_alert_check';
 
 const StyledEuiFlyoutBody = styled(EuiFlyoutBody)`
   .euiFlyoutBody__overflow {
@@ -92,8 +93,7 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
   const isAlert = some({ category: 'signal', field: 'signal.rule.id' }, detailsData);
 
   const isEndpointAlert = useMemo(() => {
-    const findEndpointAlert = find({ category: 'agent', field: 'agent.type' }, detailsData)?.values;
-    return findEndpointAlert ? findEndpointAlert[0] === 'endpoint' : false;
+    return endpointAlertCheck({ data: detailsData });
   }, [detailsData]);
 
   const agentId = useMemo(() => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/constants.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/constants.tsx
index 761d82b482af2..aeb40bed26c8e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/constants.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/constants.tsx
@@ -16,4 +16,4 @@ export const REFERENCE_URL_FIELD_NAME = 'reference.url';
 export const EVENT_URL_FIELD_NAME = 'event.url';
 export const SIGNAL_RULE_NAME_FIELD_NAME = 'signal.rule.name';
 export const SIGNAL_STATUS_FIELD_NAME = 'signal.status';
-export const HOST_STATUS_FIELD_NAME = 'host.status';
+export const AGENT_STATUS_FIELD_NAME = 'agent.status';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index efb51916e3765..3d5d410abb87e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -32,7 +32,7 @@ import {
   REFERENCE_URL_FIELD_NAME,
   EVENT_URL_FIELD_NAME,
   SIGNAL_STATUS_FIELD_NAME,
-  HOST_STATUS_FIELD_NAME,
+  AGENT_STATUS_FIELD_NAME,
   GEO_FIELD_TYPE,
 } from './constants';
 import { RenderRuleName, renderEventModule, renderUrl } from './formatted_field_helpers';
@@ -120,7 +120,7 @@ const FormattedFieldValueComponent: React.FC<{
     return (
       <RuleStatus contextId={contextId} eventId={eventId} fieldName={fieldName} value={value} />
     );
-  } else if (fieldName === HOST_STATUS_FIELD_NAME) {
+  } else if (fieldName === AGENT_STATUS_FIELD_NAME) {
     return (
       <AgentStatuses
         contextId={contextId}

From c0122f70d6576ab7ec7ec4fce698f8fddb92982a Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Thu, 24 Jun 2021 14:17:09 -0600
Subject: [PATCH 73/95] [Maps] Disable draw mode on layer remove (#103188)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/maps/public/actions/layer_actions.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index 8bd79474e7f71..1d239a75d1499 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -11,6 +11,7 @@ import { Query } from 'src/plugins/data/public';
 import { MapStoreState } from '../reducers/store';
 import {
   createLayerInstance,
+  getEditState,
   getLayerById,
   getLayerList,
   getLayerListRaw,
@@ -481,6 +482,11 @@ function removeLayerFromLayerList(layerId: string) {
       type: REMOVE_LAYER,
       id: layerId,
     });
+    // Clean up draw state if needed
+    const editState = getEditState(getState());
+    if (layerId === editState?.layerId) {
+      dispatch(setDrawMode(DRAW_MODE.NONE));
+    }
   };
 }
 

From e1ef2ea5cd2d13ee7ff09bfc015dc43ef4120002 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Thu, 24 Jun 2021 14:18:44 -0600
Subject: [PATCH 74/95] [Maps] Disable edit features if editing already enabled
 for layer (#103300)

---
 .../__snapshots__/toc_entry.test.tsx.snap     |   5 +
 .../layer_toc/toc_entry/toc_entry.tsx         |   1 +
 .../toc_entry_actions_popover.test.tsx.snap   | 115 ++++++++++++++++++
 .../toc_entry_actions_popover.test.tsx        |  14 +++
 .../toc_entry_actions_popover.tsx             |   3 +-
 5 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
index 6310b5507dca5..42618d099ffcf 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`TOCEntry is rendered 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -85,6 +86,7 @@ exports[`TOCEntry props Should shade background when not selected layer 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -159,6 +161,7 @@ exports[`TOCEntry props Should shade background when selected layer 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -233,6 +236,7 @@ exports[`TOCEntry props isReadOnly 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -292,6 +296,7 @@ exports[`TOCEntry props should display layer details when isLegendDetailsOpen is
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
index 712da6251fb96..329e7751f67c5 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
@@ -281,6 +281,7 @@ export class TOCEntry extends Component<Props, State> {
           openLayerSettings={this._openLayerPanelWithCheck}
           isEditButtonDisabled={this.props.isEditButtonDisabled}
           supportsFitToBounds={this.state.supportsFitToBounds}
+          editModeActiveForLayer={this.props.editModeActiveForLayer}
         />
 
         {this._renderQuickActions()}
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
index 5068a5dc1ad71..5d1fc8e28f993 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
@@ -115,6 +115,121 @@ exports[`TOCEntryActionsPopover is rendered 1`] = `
 </EuiPopover>
 `;
 
+exports[`TOCEntryActionsPopover should disable Edit features when edit mode active for layer 1`] = `
+<EuiPopover
+  anchorClassName="mapLayTocActions__popoverAnchor"
+  anchorPosition="leftUp"
+  button={
+    <Memo(Connect(TOCEntryButton))
+      displayName="layer 1"
+      escapedDisplayName="layer1"
+      layer={
+        LayerMock {
+          "_dataRequests": Array [],
+          "_descriptor": Object {
+            "__dataRequests": Array [],
+            "alpha": 0.75,
+            "id": "testLayer",
+            "includeInFitToBounds": true,
+            "label": null,
+            "maxZoom": 24,
+            "minZoom": 0,
+            "sourceDescriptor": Object {
+              "type": "mySourceType",
+            },
+            "style": null,
+            "visible": true,
+          },
+          "_source": MockSource {
+            "_descriptor": Object {
+              "type": "mySourceType",
+            },
+            "_inspectorAdapters": undefined,
+          },
+        }
+      }
+      onClick={[Function]}
+    />
+  }
+  className="mapLayTocActions"
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="testLayer"
+  isOpen={false}
+  ownFocus={true}
+  panelPaddingSize="none"
+>
+  <EuiContextMenu
+    data-test-subj="layerTocActionsPanellayer1"
+    initialPanelId={0}
+    panels={
+      Array [
+        Object {
+          "id": 0,
+          "items": Array [
+            Object {
+              "data-test-subj": "fitToBoundsButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="expand"
+              />,
+              "name": "Fit to data",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "layerVisibilityToggleButton",
+              "icon": <EuiIcon
+                size="m"
+                type="eyeClosed"
+              />,
+              "name": "Hide layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "layerSettingsButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="pencil"
+              />,
+              "name": "Edit layer settings",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "cloneLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="copy"
+              />,
+              "name": "Clone layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "removeLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="trash"
+              />,
+              "name": "Remove layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+          ],
+          "title": "Layer actions",
+        },
+      ]
+    }
+    size="m"
+  />
+</EuiPopover>
+`;
+
 exports[`TOCEntryActionsPopover should disable fit to data when supportsFitToBounds is false 1`] = `
 <EuiPopover
   anchorClassName="mapLayTocActions__popoverAnchor"
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
index 1187bae19e178..1610954399ae7 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -48,6 +48,7 @@ const defaultProps = {
   enableShapeEditing: () => {},
   enablePointEditing: () => {},
   openLayerSettings: () => {},
+  editModeActiveForLayer: false,
 };
 
 describe('TOCEntryActionsPopover', () => {
@@ -100,4 +101,17 @@ describe('TOCEntryActionsPopover', () => {
 
     expect(component).toMatchSnapshot();
   });
+
+  test('should disable Edit features when edit mode active for layer', async () => {
+    const component = shallow(
+      <TOCEntryActionsPopover {...defaultProps} editModeActiveForLayer={true} />
+    );
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
index ab7a54be37404..83b4d2c2a756b 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -36,6 +36,7 @@ export interface Props {
   removeLayer: (layerId: string) => void;
   supportsFitToBounds: boolean;
   toggleVisible: (layerId: string) => void;
+  editModeActiveForLayer: boolean;
 }
 
 interface State {
@@ -170,7 +171,7 @@ export class TOCEntryActionsPopover extends Component<Props, State> {
                 defaultMessage:
                   'Edit features only supported for document layers without clustering, joins, or time filtering',
               }),
-          disabled: !this.state.isFeatureEditingEnabled,
+          disabled: !this.state.isFeatureEditingEnabled || this.props.editModeActiveForLayer,
           onClick: async () => {
             this._closePopover();
             const supportedShapeTypes = await (this.props.layer.getSource() as ESSearchSource).getSupportedShapeTypes();

From 60086a9aac1fe2fbaa4211210bcb9b3446c1f83a Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Thu, 24 Jun 2021 13:30:02 -0700
Subject: [PATCH 75/95] Fix Engine Overview not properly stretching to full
 page height (#103337)

- Caused by the wrapping <div> around the child views - removing that div and moving the `data-test-subj` hooks to the individual views fixes the issue
---
 .../components/engine_overview/engine_overview.test.tsx     | 5 -----
 .../components/engine_overview/engine_overview.tsx          | 6 +-----
 .../components/engine_overview/engine_overview_empty.tsx    | 1 +
 .../components/engine_overview/engine_overview_metrics.tsx  | 1 +
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
index a2e0ba4fcd44d..01472987e4d48 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
@@ -29,11 +29,6 @@ describe('EngineOverview', () => {
     setMockValues(values);
   });
 
-  it('renders', () => {
-    const wrapper = shallow(<EngineOverview />);
-    expect(wrapper.find('[data-test-subj="EngineOverview"]')).toHaveLength(1);
-  });
-
   describe('EmptyEngineOverview', () => {
     it('renders when the engine has no documents & the user can add documents', () => {
       const myRole = { canManageEngineDocuments: true, canViewEngineCredentials: true };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
index a3f98d8c13e8e..e966709dc1084 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
@@ -25,9 +25,5 @@ export const EngineOverview: React.FC = () => {
   const canAddDocuments = canManageEngineDocuments && canViewEngineCredentials;
   const showEngineOverview = !isEngineEmpty || !canAddDocuments || isMetaEngine;
 
-  return (
-    <div data-test-subj="EngineOverview">
-      {showEngineOverview ? <EngineOverviewMetrics /> : <EmptyEngineOverview />}
-    </div>
-  );
+  return showEngineOverview ? <EngineOverviewMetrics /> : <EmptyEngineOverview />;
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_empty.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_empty.tsx
index 27d9c3723f126..6f8332e1e332e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_empty.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_empty.tsx
@@ -34,6 +34,7 @@ export const EmptyEngineOverview: React.FC = () => {
           </EuiButton>,
         ],
       }}
+      data-test-subj="EngineOverview"
     >
       <DocumentCreationButtons />
       <DocumentCreationFlyout />
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
index 3cc7138623735..9c3a900dfe115 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
@@ -36,6 +36,7 @@ export const EngineOverviewMetrics: React.FC = () => {
         }),
       }}
       isLoading={dataLoading}
+      data-test-subj="EngineOverview"
     >
       <EuiFlexGroup>
         <EuiFlexItem grow={1}>

From d5f68eef4f391a2cf9efcf57e258bbf594cf5f0a Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Thu, 24 Jun 2021 16:46:50 -0400
Subject: [PATCH 76/95] [Lens] Fix formula formatting in Metric visualization
 type (#103167)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../metric_visualization/expression.test.tsx  | 98 +++++++++++++++----
 .../metric_visualization/expression.tsx       |  2 +-
 2 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx b/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx
index 2e189e094ef01..b31125a1912ef 100644
--- a/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx
@@ -20,17 +20,22 @@ function sampleArgs() {
       l1: {
         type: 'datatable',
         columns: [
-          { id: 'a', name: 'a', meta: { type: 'string' } },
+          // Simulating a calculated column like a formula
+          { id: 'a', name: 'a', meta: { type: 'string', params: { id: 'string' } } },
           { id: 'b', name: 'b', meta: { type: 'string' } },
-          { id: 'c', name: 'c', meta: { type: 'number' } },
+          {
+            id: 'c',
+            name: 'c',
+            meta: { type: 'number', params: { id: 'percent', params: { format: '0.000%' } } },
+          },
         ],
-        rows: [{ a: 10110, b: 2, c: 3 }],
+        rows: [{ a: 'last', b: 'last', c: 3 }],
       },
     },
   };
 
   const args: MetricConfig = {
-    accessor: 'a',
+    accessor: 'c',
     layerId: 'l1',
     title: 'My fanci metric chart',
     description: 'Fancy chart description',
@@ -39,7 +44,7 @@ function sampleArgs() {
   };
 
   const noAttributesArgs: MetricConfig = {
-    accessor: 'a',
+    accessor: 'c',
     layerId: 'l1',
     title: '',
     description: '',
@@ -65,11 +70,17 @@ describe('metric_expression', () => {
   });
 
   describe('MetricChart component', () => {
-    test('it renders the all attributes when passed (title, description, metricTitle, value)', () => {
+    test('it renders all attributes when passed (title, description, metricTitle, value)', () => {
       const { data, args } = sampleArgs();
 
       expect(
-        shallow(<MetricChart data={data} args={args} formatFactory={(x) => x as IFieldFormat} />)
+        shallow(
+          <MetricChart
+            data={data}
+            args={args}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
+          />
+        )
       ).toMatchInlineSnapshot(`
         <VisualizationContainer
           className="lnsMetricExpression__container"
@@ -86,7 +97,52 @@ describe('metric_expression', () => {
                 }
               }
             >
-              10110
+              3
+            </div>
+            <div
+              data-test-subj="lns_metric_title"
+              style={
+                Object {
+                  "fontSize": "24pt",
+                }
+              }
+            >
+              My fanci metric chart
+            </div>
+          </AutoScale>
+        </VisualizationContainer>
+      `);
+    });
+
+    test('it renders strings', () => {
+      const { data, args } = sampleArgs();
+      args.accessor = 'a';
+
+      expect(
+        shallow(
+          <MetricChart
+            data={data}
+            args={args}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
+          />
+        )
+      ).toMatchInlineSnapshot(`
+        <VisualizationContainer
+          className="lnsMetricExpression__container"
+          reportDescription="Fancy chart description"
+          reportTitle="My fanci metric chart"
+        >
+          <AutoScale>
+            <div
+              data-test-subj="lns_metric_value"
+              style={
+                Object {
+                  "fontSize": "60pt",
+                  "fontWeight": 600,
+                }
+              }
+            >
+              last
             </div>
             <div
               data-test-subj="lns_metric_title"
@@ -111,7 +167,7 @@ describe('metric_expression', () => {
           <MetricChart
             data={data}
             args={noAttributesArgs}
-            formatFactory={(x) => x as IFieldFormat}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
           />
         )
       ).toMatchInlineSnapshot(`
@@ -130,7 +186,7 @@ describe('metric_expression', () => {
                 }
               }
             >
-              10110
+              3
             </div>
             <div
               data-test-subj="lns_metric_title"
@@ -155,7 +211,7 @@ describe('metric_expression', () => {
           <MetricChart
             data={data}
             args={{ ...noAttributesArgs, mode: 'reduced' }}
-            formatFactory={(x) => x as IFieldFormat}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
           />
         )
       ).toMatchInlineSnapshot(`
@@ -174,7 +230,7 @@ describe('metric_expression', () => {
                 }
               }
             >
-              10110
+              3
             </div>
           </AutoScale>
         </VisualizationContainer>
@@ -189,7 +245,7 @@ describe('metric_expression', () => {
           <MetricChart
             data={{ ...data, tables: {} }}
             args={noAttributesArgs}
-            formatFactory={(x) => x as IFieldFormat}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
           />
         )
       ).toMatchInlineSnapshot(`
@@ -202,14 +258,14 @@ describe('metric_expression', () => {
     test('it renders an EmptyPlaceholder when null value is passed as data', () => {
       const { data, noAttributesArgs } = sampleArgs();
 
-      data.tables.l1.rows[0].a = null;
+      data.tables.l1.rows[0].c = null;
 
       expect(
         shallow(
           <MetricChart
             data={data}
             args={noAttributesArgs}
-            formatFactory={(x) => x as IFieldFormat}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
           />
         )
       ).toMatchInlineSnapshot(`
@@ -222,14 +278,14 @@ describe('metric_expression', () => {
     test('it renders 0 value', () => {
       const { data, noAttributesArgs } = sampleArgs();
 
-      data.tables.l1.rows[0].a = 0;
+      data.tables.l1.rows[0].c = 0;
 
       expect(
         shallow(
           <MetricChart
             data={data}
             args={noAttributesArgs}
-            formatFactory={(x) => x as IFieldFormat}
+            formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
           />
         )
       ).toMatchInlineSnapshot(`
@@ -264,5 +320,13 @@ describe('metric_expression', () => {
         </VisualizationContainer>
       `);
     });
+
+    test('it finds the right column to format', () => {
+      const { data, args } = sampleArgs();
+      const factory = jest.fn(() => ({ convert: (x) => x } as IFieldFormat));
+
+      shallow(<MetricChart data={data} args={args} formatFactory={factory} />);
+      expect(factory).toHaveBeenCalledWith({ id: 'percent', params: { format: '0.000%' } });
+    });
   });
 });
diff --git a/x-pack/plugins/lens/public/metric_visualization/expression.tsx b/x-pack/plugins/lens/public/metric_visualization/expression.tsx
index 70b2cb17c7fe1..60d9d66bce995 100644
--- a/x-pack/plugins/lens/public/metric_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/expression.tsx
@@ -127,7 +127,7 @@ export function MetricChart({
     return <EmptyPlaceholder icon={LensIconChartMetric} />;
   }
 
-  const column = firstTable.columns[0];
+  const column = firstTable.columns.find(({ id }) => id === accessor)!;
   const row = firstTable.rows[0];
 
   // NOTE: Cardinality and Sum never receives "null" as value, but always 0, even for empty dataset.

From b12095b079d7836e554ab0b15702574398fe4149 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Thu, 24 Jun 2021 14:13:15 -0700
Subject: [PATCH 77/95] [Metrics UI] Prevent saved views from trampling URL
 state (#103146)

* [Metrics UI] Prevent saved views from trampling URL state

* Adding space back in
---
 .../public/containers/saved_view/saved_view.tsx     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
index 56a2a13e31ff7..c54a2a69a994c 100644
--- a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
+++ b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
@@ -255,12 +255,21 @@ export const useSavedView = (props: Props) => {
   }, [urlState, setUrlState, currentView, defaultViewId, data]);
 
   useEffect(() => {
-    if (!currentView && !loading && data) {
+    if (!currentView && !loading && data && shouldLoadDefault) {
       const viewToSet = views.find((v) => v.id === urlState.viewId);
       if (viewToSet) setCurrentView(viewToSet);
       else loadDefaultViewIfSet();
     }
-  }, [loading, currentView, data, views, setCurrentView, loadDefaultViewIfSet, urlState.viewId]);
+  }, [
+    loading,
+    currentView,
+    data,
+    views,
+    setCurrentView,
+    loadDefaultViewIfSet,
+    urlState.viewId,
+    shouldLoadDefault,
+  ]);
 
   return {
     views,

From 45b660172ae868c4e6ddce6e3f88c9ba7e374f87 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Thu, 24 Jun 2021 16:19:01 -0500
Subject: [PATCH 78/95] skip suite failing es promotion.  #103364

---
 .../apis/management/index_lifecycle_management/policies.js     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
index 756fda7566843..d59d364c38827 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
@@ -32,7 +32,8 @@ export default function ({ getService }) {
 
   const { addPolicyToIndex } = registerIndexHelpers({ supertest });
 
-  describe('policies', () => {
+  // failing ES promotion https://github.com/elastic/kibana/issues/103364
+  describe.skip('policies', () => {
     after(() => Promise.all([cleanUpEsResources(), cleanUpPolicies()]));
 
     describe('list', () => {

From c1ced880bc3b6d3cf819576e0001d46380fb7495 Mon Sep 17 00:00:00 2001
From: Ross Wolf <31489089+rw-access@users.noreply.github.com>
Date: Thu, 24 Jun 2021 15:31:25 -0600
Subject: [PATCH 79/95] [Detections] Adds automatic updating for Prebuilt
 Security Detection Rules package (#101846)

* Automatically install and update the security_detection_engine package
* Remove security_detection_engine from required Fleet packages
* Update fleet package-registry image
* Add sha256: to the distribution package
* Use distribution from https://beats-ci.elastic.co/job/Ingest-manager/job/release-distribution/152
* Change fleet required packag
* Fix bad merge
* Update rules to 0.13.1 package
* Fix NOTICE.txt
---
 NOTICE.txt                                    | 18 ++--
 .../public/app/home/index.tsx                 |  4 +-
 ...de.ts => use_upgrade_security_packages.ts} | 20 ++---
 .../apm_403_response_to_a_post.json           |  2 +-
 .../apm_405_response_method_not_allowed.json  |  2 +-
 .../apm_null_user_agent.json                  |  2 +-
 .../apm_sqlmap_user_agent.json                |  2 +-
 ...tion_added_to_google_workspace_domain.json |  2 +-
 ...tempt_to_deactivate_okta_network_zone.json |  2 +-
 .../attempt_to_delete_okta_network_zone.json  |  2 +-
 ...collection_cloudtrail_logging_created.json |  2 +-
 ...ion_gcp_pub_sub_subscription_creation.json |  2 +-
 ...collection_gcp_pub_sub_topic_creation.json |  2 +-
 ...llection_microsoft_365_new_inbox_rule.json |  2 +-
 ...collection_update_event_hub_auth_rule.json |  2 +-
 ...d_control_certutil_network_connection.json |  7 +-
 ...mand_and_control_cobalt_strike_beacon.json |  2 +-
 ...cobalt_strike_default_teamserver_cert.json |  2 +-
 ..._control_dns_directly_to_the_internet.json |  7 +-
 ...nd_and_control_dns_tunneling_nslookup.json |  2 +-
 ...download_rar_powershell_from_internet.json |  7 +-
 .../command_and_control_fin7_c2_behavior.json |  2 +-
 .../command_and_control_halfbaked_beacon.json |  2 +-
 ...d_control_nat_traversal_port_activity.json |  2 +-
 .../command_and_control_port_26_activity.json |  2 +-
 ...te_desktop_protocol_from_the_internet.json |  7 +-
 ...mand_and_control_telnet_port_activity.json |  2 +-
 ...l_network_computing_from_the_internet.json |  7 +-
 ...ual_network_computing_to_the_internet.json |  7 +-
 ...l_access_attempted_bypass_of_okta_mfa.json |  2 +-
 ...mpts_to_brute_force_okta_user_account.json | 10 ++-
 ...ccess_aws_iam_assume_role_brute_force.json |  2 +-
 ...ial_access_collection_sensitive_files.json |  2 +-
 ...dential_access_dumping_hashes_bi_cmds.json |  2 +-
 ...ial_access_iam_user_addition_to_group.json |  2 +-
 .../credential_access_kerberosdump_kcc.json   |  2 +-
 .../credential_access_key_vault_modified.json |  2 +-
 ..._365_brute_force_user_account_attempt.json |  4 +-
 ...65_potential_password_spraying_attack.json |  2 +-
 ...ential_access_mitm_localhost_webproxy.json |  2 +-
 ...okta_brute_force_or_password_spraying.json |  2 +-
 ...ntial_access_potential_ssh_bruteforce.json |  2 +-
 ...cess_root_console_failure_brute_force.json |  2 +-
 ..._access_secretsmanager_getsecretvalue.json |  2 +-
 ...ccess_storage_account_key_regenerated.json |  2 +-
 .../credential_access_systemkey_dumping.json  |  2 +-
 .../defense_evasion_amsienable_key_mod.json   | 57 ++++++++++++
 ...vasion_apple_softupdates_modification.json |  2 +-
 ...evasion_attempt_to_disable_gatekeeper.json |  2 +-
 ...tempt_to_disable_iptables_or_firewall.json |  2 +-
 ...ion_attempt_to_disable_syslog_service.json |  2 +-
 ...e_application_credential_modification.json |  2 +-
 ...on_azure_diagnostic_settings_deletion.json |  2 +-
 ...sion_azure_service_principal_addition.json |  2 +-
 ..._base32_encoding_or_decoding_activity.json |  2 +-
 ...vasion_clearing_windows_security_logs.json |  2 +-
 ...se_evasion_cloudtrail_logging_deleted.json |  2 +-
 ..._evasion_cloudtrail_logging_suspended.json |  2 +-
 ...nse_evasion_cloudwatch_alarm_deletion.json |  2 +-
 ..._evasion_config_service_rule_deletion.json |  2 +-
 ...vasion_configuration_recorder_stopped.json |  2 +-
 .../defense_evasion_cve_2020_0601.json        |  2 +-
 ...fense_evasion_disable_selinux_attempt.json |  2 +-
 ...defense_evasion_ec2_flow_log_deletion.json |  2 +-
 ...ense_evasion_ec2_network_acl_deletion.json |  2 +-
 .../defense_evasion_event_hub_deletion.json   |  2 +-
 ...fense_evasion_file_deletion_via_shred.json |  2 +-
 ...defense_evasion_file_mod_writable_dir.json |  2 +-
 ...ense_evasion_firewall_policy_deletion.json |  2 +-
 ...nse_evasion_gcp_firewall_rule_created.json |  2 +-
 ...nse_evasion_gcp_firewall_rule_deleted.json |  2 +-
 ...se_evasion_gcp_firewall_rule_modified.json |  2 +-
 ...e_evasion_gcp_logging_bucket_deletion.json |  2 +-
 ...nse_evasion_gcp_logging_sink_deletion.json |  2 +-
 ...ion_gcp_pub_sub_subscription_deletion.json |  2 +-
 ...se_evasion_gcp_pub_sub_topic_deletion.json |  2 +-
 ...storage_bucket_configuration_modified.json |  2 +-
 ...p_storage_bucket_permissions_modified.json |  2 +-
 ...e_evasion_guardduty_detector_deletion.json |  2 +-
 .../defense_evasion_hidden_file_dir_tmp.json  |  2 +-
 .../defense_evasion_injection_msbuild.json    |  2 +-
 ...ense_evasion_install_root_certificate.json |  2 +-
 ...defense_evasion_kernel_module_removal.json |  2 +-
 ...osoft_365_exchange_dlp_policy_removed.json |  2 +-
 ...change_malware_filter_policy_deletion.json |  2 +-
 ..._365_exchange_malware_filter_rule_mod.json |  2 +-
 ...65_exchange_safe_attach_rule_disabled.json |  2 +-
 ...isc_lolbin_connecting_to_the_internet.json |  7 +-
 ..._evasion_modify_environment_launchctl.json |  2 +-
 .../defense_evasion_msxsl_network.json        |  7 +-
 ...ense_evasion_network_watcher_deletion.json |  2 +-
 ...sion_s3_bucket_configuration_deletion.json |  2 +-
 .../defense_evasion_safari_config_change.json |  2 +-
 ...dboxed_office_app_suspicious_zip_file.json |  2 +-
 ...vasion_stop_process_service_threshold.json |  2 +-
 ...picious_execution_from_mounted_device.json | 89 +++++++++++++++++++
 ...ser_password_reset_or_unlock_attempts.json | 12 +--
 ...vasion_tcc_bypass_mounted_apfs_access.json |  2 +-
 ..._evasion_unload_endpointsecurity_kext.json |  2 +-
 ...nusual_network_connection_via_dllhost.json | 51 +++++++++++
 ...usual_network_connection_via_rundll32.json |  7 +-
 .../defense_evasion_waf_acl_deletion.json     |  2 +-
 ...asion_waf_rule_or_rule_group_deletion.json |  2 +-
 .../discovery_blob_container_access_mod.json  |  2 +-
 .../discovery_kernel_module_enumeration.json  |  2 +-
 ...covery_virtual_machine_fingerprinting.json |  2 +-
 ...d_to_google_workspace_trusted_domains.json |  2 +-
 .../elastic_endpoint_security.json            |  2 +-
 .../endgame_adversary_behavior_detected.json  |  2 +-
 .../endgame_cred_dumping_detected.json        |  2 +-
 .../endgame_cred_dumping_prevented.json       |  2 +-
 .../endgame_cred_manipulation_detected.json   |  2 +-
 .../endgame_cred_manipulation_prevented.json  |  2 +-
 .../endgame_exploit_detected.json             |  2 +-
 .../endgame_exploit_prevented.json            |  2 +-
 .../endgame_malware_detected.json             |  2 +-
 .../endgame_malware_prevented.json            |  2 +-
 .../endgame_permission_theft_detected.json    |  2 +-
 .../endgame_permission_theft_prevented.json   |  2 +-
 .../endgame_process_injection_detected.json   |  2 +-
 .../endgame_process_injection_prevented.json  |  2 +-
 .../endgame_ransomware_detected.json          |  2 +-
 .../endgame_ransomware_prevented.json         |  2 +-
 ...and_prompt_connecting_to_the_internet.json |  7 +-
 .../execution_command_virtual_machine.json    |  2 +-
 ...vasion_electron_app_childproc_node_js.json |  2 +-
 ...le_program_connecting_to_the_internet.json |  7 +-
 ...ution_installer_spawned_network_event.json |  7 +-
 ...on_pentest_eggshell_remote_admin_tool.json |  2 +-
 .../execution_perl_tty_shell.json             |  2 +-
 .../execution_python_tty_shell.json           |  2 +-
 ...er_program_connecting_to_the_internet.json |  7 +-
 ...ing_osascript_exec_followed_by_netcon.json |  7 +-
 ...ltration_ec2_snapshot_change_activity.json |  2 +-
 .../exfiltration_ec2_vm_export_failure.json   | 70 +++++++++++++++
 ...tration_gcp_logging_sink_modification.json |  2 +-
 ..._365_exchange_transport_rule_creation.json |  2 +-
 ...osoft_365_exchange_transport_rule_mod.json |  2 +-
 .../prepackaged_rules/external_alerts.json    |  2 +-
 .../google_workspace_admin_role_deletion.json |  2 +-
 ...le_workspace_mfa_enforcement_disabled.json |  2 +-
 .../google_workspace_policy_modified.json     |  2 +-
 ...pact_attempt_to_revoke_okta_api_token.json |  2 +-
 ...pact_azure_automation_runbook_deleted.json |  2 +-
 .../impact_cloudtrail_logging_updated.json    |  2 +-
 .../impact_cloudwatch_log_group_deletion.json |  2 +-
 ...impact_cloudwatch_log_stream_deletion.json |  2 +-
 .../impact_ec2_disable_ebs_encryption.json    |  2 +-
 .../impact_gcp_iam_role_deletion.json         |  2 +-
 .../impact_gcp_service_account_deleted.json   |  2 +-
 .../impact_gcp_service_account_disabled.json  |  2 +-
 .../impact_gcp_storage_bucket_deleted.json    |  2 +-
 ...virtual_private_cloud_network_deleted.json |  2 +-
 ...p_virtual_private_cloud_route_created.json |  2 +-
 ...p_virtual_private_cloud_route_deleted.json |  2 +-
 .../impact_iam_deactivate_mfa_device.json     |  2 +-
 .../impact_iam_group_deletion.json            |  2 +-
 .../impact_possible_okta_dos_attack.json      |  2 +-
 .../impact_rds_cluster_deletion.json          |  2 +-
 .../impact_rds_instance_cluster_stoppage.json |  2 +-
 .../impact_resource_group_deletion.json       |  2 +-
 .../rules/prepackaged_rules/index.ts          | 10 ++-
 ...ure_active_directory_high_risk_signin.json |  2 +-
 ...re_active_directory_powershell_signin.json |  2 +-
 ...tack_via_azure_registered_application.json |  2 +-
 .../initial_access_console_login_root.json    |  2 +-
 ...ial_access_external_guest_user_invite.json |  2 +-
 ...l_access_gcp_iam_custom_role_creation.json |  2 +-
 .../initial_access_login_failures.json        |  2 +-
 .../initial_access_login_location.json        |  2 +-
 .../initial_access_login_sessions.json        |  2 +-
 .../initial_access_login_time.json            |  2 +-
 ...5_exchange_anti_phish_policy_deletion.json |  2 +-
 ...soft_365_exchange_anti_phish_rule_mod.json |  2 +-
 ...osoft_365_exchange_safelinks_disabled.json |  2 +-
 .../initial_access_password_recovery.json     |  2 +-
 ...mote_procedure_call_from_the_internet.json |  7 +-
 ...remote_procedure_call_to_the_internet.json |  7 +-
 ...file_sharing_activity_to_the_internet.json |  2 +-
 ...icious_activity_reported_by_okta_user.json |  2 +-
 ...al_access_unsecure_elasticsearch_node.json |  2 +-
 .../initial_access_via_system_manager.json    |  2 +-
 ..._access_zoom_meeting_with_no_passcode.json |  2 +-
 ...ential_access_kerberos_bifrostconsole.json |  2 +-
 .../lateral_movement_dns_server_overflow.json |  2 +-
 ...ral_movement_remote_ssh_login_enabled.json |  2 +-
 ...ment_telnet_network_activity_external.json |  7 +-
 ...ment_telnet_network_activity_internal.json |  7 +-
 .../linux_hping_activity.json                 |  2 +-
 .../linux_iodine_activity.json                |  2 +-
 .../linux_nping_activity.json                 |  2 +-
 ...nux_process_started_in_temp_directory.json |  2 +-
 .../linux_strace_activity.json                |  2 +-
 ...led_for_google_workspace_organization.json |  2 +-
 ...exchange_dkim_signing_config_disabled.json |  2 +-
 ..._teams_custom_app_interaction_allowed.json |  2 +-
 .../ml_high_count_network_denies.json         |  6 +-
 .../ml_high_count_network_events.json         |  6 +-
 .../ml_linux_anomalous_metadata_process.json  |  7 +-
 .../ml_linux_anomalous_metadata_user.json     |  7 +-
 ...linux_anomalous_network_port_activity.json |  7 +-
 .../ml_linux_anomalous_process_all_hosts.json |  7 +-
 .../ml_linux_anomalous_user_name.json         |  7 +-
 .../ml_rare_destination_country.json          |  6 +-
 .../ml_rare_process_by_host_linux.json        |  7 +-
 .../ml_rare_process_by_host_windows.json      |  7 +-
 .../ml_spike_in_traffic_to_a_country.json     |  6 +-
 ...ml_windows_anomalous_metadata_process.json |  7 +-
 .../ml_windows_anomalous_metadata_user.json   |  7 +-
 ...ml_windows_anomalous_network_activity.json |  7 +-
 .../ml_windows_anomalous_path_activity.json   |  7 +-
 ...l_windows_anomalous_process_all_hosts.json |  7 +-
 ...ml_windows_anomalous_process_creation.json |  7 +-
 .../ml_windows_anomalous_user_name.json       |  7 +-
 .../rules/prepackaged_rules/notice.ts         | 18 ++--
 ...ttempt_to_deactivate_okta_application.json |  2 +-
 ...kta_attempt_to_deactivate_okta_policy.json |  2 +-
 ...ttempt_to_deactivate_okta_policy_rule.json |  2 +-
 ...ta_attempt_to_delete_okta_application.json |  2 +-
 .../okta_attempt_to_delete_okta_policy.json   |  2 +-
 ...ta_attempt_to_delete_okta_policy_rule.json |  2 +-
 ...ta_attempt_to_modify_okta_application.json |  2 +-
 ...a_attempt_to_modify_okta_network_zone.json |  2 +-
 .../okta_attempt_to_modify_okta_policy.json   |  2 +-
 ...ta_attempt_to_modify_okta_policy_rule.json |  2 +-
 ..._or_delete_application_sign_on_policy.json |  2 +-
 ...threat_detected_by_okta_threatinsight.json |  2 +-
 ...stence_account_creation_hide_at_logon.json |  2 +-
 ...tor_privileges_assigned_to_okta_group.json |  2 +-
 ...inistrator_role_assigned_to_okta_user.json |  2 +-
 ...ence_attempt_to_create_okta_api_token.json |  2 +-
 ..._deactivate_mfa_for_okta_user_account.json |  2 +-
 ...set_mfa_factors_for_okta_user_account.json |  2 +-
 ...ence_azure_automation_account_created.json |  2 +-
 ...utomation_runbook_created_or_modified.json |  2 +-
 ...ence_azure_automation_webhook_created.json |  2 +-
 ...re_conditional_access_policy_modified.json |  2 +-
 ...nce_azure_pim_user_added_global_admin.json |  2 +-
 ...ged_identity_management_role_modified.json |  2 +-
 ..._access_authorization_plugin_creation.json |  2 +-
 ...l_access_modify_auth_module_or_config.json |  2 +-
 ...credential_access_modify_ssh_binaries.json |  2 +-
 ...launch_agent_deamon_logonitem_process.json |  2 +-
 ...rectory_services_plugins_modification.json |  2 +-
 ...e_docker_shortcuts_plist_modification.json |  2 +-
 .../persistence_ec2_network_acl_creation.json |  2 +-
 .../persistence_enable_root_account.json      |  2 +-
 ..._gcp_iam_service_account_key_deletion.json |  2 +-
 ...e_gcp_key_created_for_service_account.json |  2 +-
 ...rsistence_gcp_service_account_created.json |  2 +-
 ...workspace_admin_role_assigned_to_user.json |  2 +-
 ...a_domain_wide_delegation_of_authority.json |  2 +-
 ...e_workspace_custom_admin_role_created.json |  2 +-
 ...stence_google_workspace_role_modified.json |  2 +-
 .../persistence_iam_group_creation.json       |  2 +-
 ...stence_loginwindow_plist_modification.json |  2 +-
 ...rsistence_mfa_disabled_for_azure_user.json |  2 +-
 ...5_exchange_management_role_assignment.json |  2 +-
 ...oft_365_teams_external_access_enabled.json |  2 +-
 ...rosoft_365_teams_guest_access_enabled.json |  2 +-
 ...ersistence_periodic_tasks_file_mdofiy.json |  2 +-
 .../persistence_rds_cluster_creation.json     |  2 +-
 ...sistence_shell_activity_by_web_server.json |  2 +-
 ...ersistence_shell_profile_modification.json |  2 +-
 ...ence_ssh_authorized_keys_modification.json |  2 +-
 ...ence_suspicious_calendar_modification.json |  2 +-
 ...stence_suspicious_com_hijack_registry.json |  4 +-
 ..._added_as_owner_for_azure_application.json |  2 +-
 ..._as_owner_for_azure_service_principal.json |  2 +-
 ...tence_via_atom_init_file_modification.json |  2 +-
 ...lege_escalation_echo_nopasswd_sudoers.json |  2 +-
 ...calation_explicit_creds_via_scripting.json |  2 +-
 ...alation_exploit_adobe_acrobat_updater.json |  2 +-
 ...lation_ld_preload_shared_object_modif.json |  2 +-
 ..._escalation_local_user_added_to_admin.json |  2 +-
 ...ge_escalation_persistence_phantom_dll.json |  4 +-
 ...ilege_escalation_root_crontab_filemod.json |  2 +-
 ...ege_escalation_root_login_without_mfa.json |  2 +-
 ...ation_setuid_setgid_bit_set_via_chmod.json |  2 +-
 ...ilege_escalation_sudo_buffer_overflow.json |  2 +-
 ...privilege_escalation_sudoers_file_mod.json |  2 +-
 ...ege_escalation_updateassumerolepolicy.json |  2 +-
 .../threat_intel_module_match.json            |  2 +-
 .../fleet_api_integration/apis/epm/delete.ts  |  2 +-
 x-pack/test/fleet_api_integration/config.ts   |  3 +-
 285 files changed, 728 insertions(+), 362 deletions(-)
 rename x-pack/plugins/security_solution/public/common/hooks/{endpoint/upgrade.ts => use_upgrade_security_packages.ts} (80%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_amsienable_key_mod.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_execution_from_mounted_device.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_dllhost.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_vm_export_failure.json

diff --git a/NOTICE.txt b/NOTICE.txt
index b0f7e65f46fa9..4ede43610ca7b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -149,17 +149,17 @@ SOFTWARE.
 
 ---
 Detection Rules
-Copyright 2020 Elasticsearch B.V.
+Copyright 2021 Elasticsearch B.V.
 
 ---
 This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
-which is available under a "MIT" license. The files based on this license are:
+which is available under a "MIT" license. The rules based on this license are:
 
-- defense_evasion_via_filter_manager
-- discovery_process_discovery_via_tasklist_command
-- persistence_priv_escalation_via_accessibility_features
-- persistence_via_application_shimming
-- defense_evasion_execution_via_trusted_developer_utilities
+- "Potential Evasion via Filter Manager" (06dceabf-adca-48af-ac79-ffdf4c3b1e9a)
+- "Process Discovery via Tasklist" (cc16f774-59f9-462d-8b98-d27ccd4519ec)
+- "Potential Modification of Accessibility Binaries" (7405ddf1-6c8e-41ce-818f-48bea6bcaed8)
+- "Potential Application Shimming via Sdbinst" (fd4a992d-6130-4802-9ff8-829b89ae801f)
+- "Trusted Developer Application Usage" (9d110cb3-5f4b-4c9a-b9f5-53f0a1707ae1)
 
 MIT License
 
@@ -185,9 +185,9 @@ SOFTWARE.
 
 ---
 This product bundles rules based on https://github.com/FSecureLABS/leonidas
-which is available under a "MIT" license. The files based on this license are:
+which is available under a "MIT" license. The rules based on this license are:
 
-- credential_access_secretsmanager_getsecretvalue.toml
+- "AWS Access Secret in Secrets Manager" (a00681e3-9ed6-447c-ab2c-be648821c622)
 
 MIT License
 
diff --git a/x-pack/plugins/security_solution/public/app/home/index.tsx b/x-pack/plugins/security_solution/public/app/home/index.tsx
index 9a57ab3fc3a73..17a6fab103d6f 100644
--- a/x-pack/plugins/security_solution/public/app/home/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/index.tsx
@@ -17,7 +17,7 @@ import { useInitSourcerer, useSourcererScope } from '../../common/containers/sou
 import { useKibana } from '../../common/lib/kibana';
 import { DETECTIONS_SUB_PLUGIN_ID } from '../../../common/constants';
 import { SourcererScopeName } from '../../common/store/sourcerer/model';
-import { useUpgradeEndpointPackage } from '../../common/hooks/endpoint/upgrade';
+import { useUpgradeSecurityPackages } from '../../common/hooks/use_upgrade_security_packages';
 import { GlobalHeader } from './global_header';
 import { SecuritySolutionTemplateWrapper } from './template_wrapper';
 
@@ -56,7 +56,7 @@ const HomePageComponent: React.FC<HomePageProps> = ({
   // tabs in the app. This is useful for keeping the endpoint package as up to date as possible until
   // a background task solution can be built on the server side. Once a background task solution is available we
   // can remove this.
-  useUpgradeEndpointPackage();
+  useUpgradeSecurityPackages();
 
   return (
     <SecuritySolutionAppWrapper className="kbnAppWrapper">
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/upgrade.ts b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
similarity index 80%
rename from x-pack/plugins/security_solution/public/common/hooks/endpoint/upgrade.ts
rename to x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
index 8e083b3c6b5f2..6a3afccd8794d 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/upgrade.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
@@ -6,31 +6,31 @@
  */
 
 import { useEffect } from 'react';
-import { HttpFetchOptions, HttpStart } from 'src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import {
   epmRouteService,
   appRoutesService,
   CheckPermissionsResponse,
   BulkInstallPackagesResponse,
-} from '../../../../../fleet/common';
-import { StartServices } from '../../../types';
-import { useIngestEnabledCheck } from './ingest_enabled';
+} from '../../../../fleet/common';
+import { StartServices } from '../../types';
+import { useIngestEnabledCheck } from './endpoint/ingest_enabled';
 
 /**
- * Requests that the endpoint package be upgraded to the latest version
+ * Requests that the endpoint and security_detection_engine package be upgraded to the latest version
  *
  * @param http an http client for sending the request
  * @param options an object containing options for the request
  */
-const sendUpgradeEndpointPackage = async (
+const sendUpgradeSecurityPackages = async (
   http: HttpStart,
   options: HttpFetchOptions = {}
 ): Promise<BulkInstallPackagesResponse> => {
   return http.post<BulkInstallPackagesResponse>(epmRouteService.getBulkInstallPath(), {
     ...options,
     body: JSON.stringify({
-      packages: ['endpoint'],
+      packages: ['endpoint', 'security_detection_engine'],
     }),
   });
 };
@@ -51,7 +51,7 @@ const sendCheckPermissions = async (
   });
 };
 
-export const useUpgradeEndpointPackage = () => {
+export const useUpgradeSecurityPackages = () => {
   const context = useKibana<StartServices>();
   const { allEnabled: ingestEnabled } = useIngestEnabledCheck();
 
@@ -79,7 +79,7 @@ export const useUpgradeEndpointPackage = () => {
           }
 
           // ignore the response for now since we aren't notifying the user
-          await sendUpgradeEndpointPackage(context.services.http, { signal });
+          await sendUpgradeSecurityPackages(context.services.http, { signal });
         } catch (error) {
           // Ignore Errors, since this should not hinder the user's ability to use the UI
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_403_response_to_a_post.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_403_response_to_a_post.json
index 4c40216391c8b..76ba58be0a428 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_403_response_to_a_post.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_403_response_to_a_post.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Web Application Suspicious Activity: POST Request Declined",
-  "query": "http.response.status_code:403 and http.request.method:post",
+  "query": "http.response.status_code:403 and http.request.method:post\n",
   "references": [
     "https://en.wikipedia.org/wiki/HTTP_403"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_405_response_method_not_allowed.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_405_response_method_not_allowed.json
index 40138f470c631..0633004273952 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_405_response_method_not_allowed.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_405_response_method_not_allowed.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Web Application Suspicious Activity: Unauthorized Method",
-  "query": "http.response.status_code:405",
+  "query": "http.response.status_code:405\n",
   "references": [
     "https://en.wikipedia.org/wiki/HTTP_405"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_null_user_agent.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_null_user_agent.json
index a2e9b130f0840..87bbfd727cdf3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_null_user_agent.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_null_user_agent.json
@@ -30,7 +30,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Web Application Suspicious Activity: No User Agent",
-  "query": "url.path:*",
+  "query": "url.path:*\n",
   "references": [
     "https://en.wikipedia.org/wiki/User_agent"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_sqlmap_user_agent.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_sqlmap_user_agent.json
index ec65f7cb57661..334cf78b4338c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_sqlmap_user_agent.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/apm_sqlmap_user_agent.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Web Application Suspicious Activity: sqlmap User Agent",
-  "query": "user_agent.original:\"sqlmap/1.3.11#stable (http://sqlmap.org)\"",
+  "query": "user_agent.original:\"sqlmap/1.3.11#stable (http://sqlmap.org)\"\n",
   "references": [
     "http://sqlmap.org/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
index b447e59e71435..c45d377645b05 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Application Added to Google Workspace Domain",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ADD_APPLICATION",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ADD_APPLICATION\n",
   "references": [
     "https://support.google.com/a/answer/6328701?hl=en#"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_deactivate_okta_network_zone.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_deactivate_okta_network_zone.json
index fbdf3d58f2b81..8c8353f1d5f9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_deactivate_okta_network_zone.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_deactivate_okta_network_zone.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Deactivate an Okta Network Zone",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:zone.deactivate",
+  "query": "event.dataset:okta.system and event.action:zone.deactivate\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/network/network-zones.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_delete_okta_network_zone.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_delete_okta_network_zone.json
index b0bd850c1d63c..903475b441d01 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_delete_okta_network_zone.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/attempt_to_delete_okta_network_zone.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Delete an Okta Network Zone",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:zone.delete",
+  "query": "event.dataset:okta.system and event.action:zone.delete\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/network/network-zones.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_cloudtrail_logging_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_cloudtrail_logging_created.json
index 3e2479369ebb2..7debf76f371c5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_cloudtrail_logging_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_cloudtrail_logging_created.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudTrail Log Created",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:CreateTrail and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:CreateTrail and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_CreateTrail.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/cloudtrail/create-trail.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_subscription_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_subscription_creation.json
index d50013c90b122..a24c533e2c272 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_subscription_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_subscription_creation.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Pub/Sub Subscription Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Subscriber.CreateSubscription and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Subscriber.CreateSubscription and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/pubsub/docs/overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_topic_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_topic_creation.json
index 5438b8fb2a8c9..af20bdf46e42a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_topic_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_gcp_pub_sub_topic_creation.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Pub/Sub Topic Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Publisher.CreateTopic and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Publisher.CreateTopic and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/pubsub/docs/admin"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_microsoft_365_new_inbox_rule.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_microsoft_365_new_inbox_rule.json
index 5fcfbd797e9d3..1a9ccc9c70696 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_microsoft_365_new_inbox_rule.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_microsoft_365_new_inbox_rule.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 New Inbox Rule Created",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-InboxRule\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-InboxRule\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/responding-to-a-compromised-email-account?view=o365-worldwide",
     "https://docs.microsoft.com/en-us/powershell/module/exchange/new-inboxrule?view=exchange-ps",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_update_event_hub_auth_rule.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_update_event_hub_auth_rule.json
index a9fd96efcb383..7e8ab8d94d8f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_update_event_hub_auth_rule.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_update_event_hub_auth_rule.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Event Hub Authorization Rule Created or Updated",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.EVENTHUB/NAMESPACES/AUTHORIZATIONRULES/WRITE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.EVENTHUB/NAMESPACES/AUTHORIZATIONRULES/WRITE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/event-hubs/authorize-access-shared-access-signature"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
index c6622deed9502..2f265710feb0a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
@@ -12,7 +12,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Network Connection via Certutil",
-  "query": "sequence by process.entity_id\n  [process where process.name : \"certutil.exe\" and event.type == \"start\"]\n  [network where process.name : \"certutil.exe\" and\n    not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name : \"certutil.exe\" and event.type == \"start\"]\n  [network where process.name : \"certutil.exe\" and\n    not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n                                  \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\",\n                                  \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\",\n                                  \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n                                  \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n                                  \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "3838e0e3-1850-4850-a411-2e8c5ba40ba8",
   "severity": "low",
@@ -41,5 +44,5 @@
     }
   ],
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_beacon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_beacon.json
index eba26c7be6e94..4e1780af8df82 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_beacon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_beacon.json
@@ -13,7 +13,7 @@
   "license": "Elastic License v2",
   "name": "Cobalt Strike Command and Control Beacon",
   "note": "## Threat intel\n\nThis activity has been observed in FIN7 campaigns.",
-  "query": "event.category:(network OR network_traffic) AND type:(tls OR http) AND network.transport:tcp AND destination.domain:/[a-z]{3}.stage.[0-9]{8}\\..*/",
+  "query": "event.category:(network OR network_traffic) AND type:(tls OR http) AND network.transport:tcp AND destination.domain:/[a-z]{3}.stage.[0-9]{8}\\..*/\n",
   "references": [
     "https://blog.morphisec.com/fin7-attacks-restaurant-industry",
     "https://www.fireeye.com/blog/threat-research/2017/04/fin7-phishing-lnk.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_default_teamserver_cert.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_default_teamserver_cert.json
index 6fffa5c4634a0..1d57f302554b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_default_teamserver_cert.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_cobalt_strike_default_teamserver_cert.json
@@ -11,7 +11,7 @@
   "license": "Elastic License v2",
   "name": "Default Cobalt Strike Team Server Certificate",
   "note": "## Threat intel\n\nWhile Cobalt Strike is intended to be used for penetration tests and IR training, it is frequently used by actual threat actors (TA) such as APT19, APT29, APT32, APT41, FIN6, DarkHydrus, CopyKittens, Cobalt Group, Leviathan, and many other unnamed criminal TAs. This rule uses high-confidence atomic indicators, alerts should be investigated rapidly.",
-  "query": "event.category:(network or network_traffic) and (tls.server.hash.md5:950098276A495286EB2A2556FBAB6D83 or tls.server.hash.sha1:6ECE5ECE4192683D2D84E25B0BA7E04F9CB7EB7C or tls.server.hash.sha256:87F2085C32B6A2CC709B365F55873E207A9CAA10BFFECF2FD16D3CF9D94D390C)",
+  "query": "event.category:(network or network_traffic) and (tls.server.hash.md5:950098276A495286EB2A2556FBAB6D83 or\n  tls.server.hash.sha1:6ECE5ECE4192683D2D84E25B0BA7E04F9CB7EB7C or\n  tls.server.hash.sha256:87F2085C32B6A2CC709B365F55873E207A9CAA10BFFECF2FD16D3CF9D94D390C)\n",
   "references": [
     "https://attack.mitre.org/software/S0154/",
     "https://www.cobaltstrike.com/help-setup-collaboration",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
index d283b489c278d..ec05c1645c699 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
@@ -13,10 +13,11 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "DNS Activity to the Internet",
-  "query": "event.category:(network or network_traffic) and (event.type:connection or type:dns) and (destination.port:53 or event.dataset:zeek.dns) and source.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 ) and not destination.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or 255.255.255.255 or \"::1\" or \"FE80::/10\" or \"FF00::/8\")",
+  "query": "event.category:(network or network_traffic) and (event.type:connection or type:dns) and (destination.port:53 or event.dataset:zeek.dns)\n  and source.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  ) and\n  not destination.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  )\n",
   "references": [
     "https://www.us-cert.gov/ncas/alerts/TA15-240A",
-    "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-81-2.pdf"
+    "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-81-2.pdf",
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
   ],
   "risk_score": 47,
   "rule_id": "6ea71ff0-9e95-475b-9506-2580d1ce6154",
@@ -40,5 +41,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
index 62654dfb2a9dd..0920f336bab44 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential DNS Tunneling via NsLookup",
-  "query": "event.category:process and event.type:start and process.name:nslookup.exe and process.args:(-querytype=* or -qt=* or -q=* or -type=*)",
+  "query": "event.category:process and event.type:start and process.name:nslookup.exe and process.args:(-querytype=* or -qt=* or -q=* or -type=*)\n",
   "references": [
     "https://unit42.paloaltonetworks.com/dns-tunneling-in-the-wild-overview-of-oilrigs-dns-tunneling/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
index 7cfba90cf67c8..50010d809f6fd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
@@ -13,10 +13,11 @@
   "license": "Elastic License v2",
   "name": "Roshal Archive (RAR) or PowerShell File Downloaded from the Internet",
   "note": "## Threat intel\n\nThis activity has been observed in FIN7 campaigns.",
-  "query": "event.category:(network OR network_traffic) AND network.protocol:http AND url.path:/.*(rar|ps1)/ AND source.ip:(10.0.0.0\\/8 OR 172.16.0.0\\/12 OR 192.168.0.0\\/16)",
+  "query": "event.category:(network or network_traffic) and network.protocol:http and\n  (url.extension:(ps1 or rar) or url.path:(*.ps1 or *.rar)) and\n    not destination.ip:(\n      10.0.0.0/8 or\n      127.0.0.0/8 or\n      169.254.0.0/16 or\n      172.16.0.0/12 or\n      192.0.0.0/24 or\n      192.0.0.0/29 or\n      192.0.0.8/32 or\n      192.0.0.9/32 or\n      192.0.0.10/32 or\n      192.0.0.170/32 or\n      192.0.0.171/32 or\n      192.0.2.0/24 or\n      192.31.196.0/24 or\n      192.52.193.0/24 or\n      192.168.0.0/16 or\n      192.88.99.0/24 or\n      224.0.0.0/4 or\n      100.64.0.0/10 or\n      192.175.48.0/24 or\n      198.18.0.0/15 or\n      198.51.100.0/24 or\n      203.0.113.0/24 or\n      240.0.0.0/4 or\n      \"::1\" or\n      \"FE80::/10\" or\n      \"FF00::/8\"\n    ) and\n    source.ip:(\n      10.0.0.0/8 or\n      172.16.0.0/12 or\n      192.168.0.0/16\n    )\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2017/04/fin7-phishing-lnk.html",
-    "https://www.justice.gov/opa/press-release/file/1084361/download"
+    "https://www.justice.gov/opa/press-release/file/1084361/download",
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
   ],
   "risk_score": 47,
   "rule_id": "ff013cb4-274d-434a-96bb-fe15ddd3ae92",
@@ -46,5 +47,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_fin7_c2_behavior.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_fin7_c2_behavior.json
index 305612da0f47e..80087935eae0f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_fin7_c2_behavior.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_fin7_c2_behavior.json
@@ -13,7 +13,7 @@
   "license": "Elastic License v2",
   "name": "Possible FIN7 DGA Command and Control Behavior",
   "note": "## Triage and analysis\n\nIn the event this rule identifies benign domains in your environment, the `destination.domain` field in the rule can be modified to include those domains. Example: `...AND NOT destination.domain:(zoom.us OR benign.domain1 OR benign.domain2)`.",
-  "query": "event.category:(network OR network_traffic) AND type:(tls OR http) AND network.transport:tcp AND destination.domain:/[a-zA-Z]{4,5}\\.(pw|us|club|info|site|top)/ AND NOT destination.domain:zoom.us",
+  "query": "event.category:(network OR network_traffic) AND type:(tls OR http) AND network.transport:tcp\nAND destination.domain:/[a-zA-Z]{4,5}\\.(pw|us|club|info|site|top)/ AND NOT destination.domain:zoom.us\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2018/08/fin7-pursuing-an-enigmatic-and-evasive-global-criminal-operation.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_halfbaked_beacon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_halfbaked_beacon.json
index ed6fb726896ac..f7a770b4cfcc9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_halfbaked_beacon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_halfbaked_beacon.json
@@ -13,7 +13,7 @@
   "license": "Elastic License v2",
   "name": "Halfbaked Command and Control Beacon",
   "note": "## Threat intel\n\nThis activity has been observed in FIN7 campaigns.",
-  "query": "event.category:(network OR network_traffic) AND network.protocol:http AND network.transport:tcp AND url.full:/http:\\/\\/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}\\/cd/ AND destination.port:(53 OR 80 OR 8080 OR 443)",
+  "query": "event.category:(network OR network_traffic) AND network.protocol:http AND\n  network.transport:tcp AND url.full:/http:\\/\\/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}\\/cd/ AND\n  destination.port:(53 OR 80 OR 8080 OR 443)\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2017/04/fin7-phishing-lnk.html",
     "https://attack.mitre.org/software/S0151/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_nat_traversal_port_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_nat_traversal_port_activity.json
index 33b7cb020a69f..7cd0a865c4b3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_nat_traversal_port_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_nat_traversal_port_activity.json
@@ -15,7 +15,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "IPSEC NAT Traversal Port Activity",
-  "query": "event.category:(network or network_traffic) and network.transport:udp and destination.port:4500",
+  "query": "event.category:(network or network_traffic) and network.transport:udp and destination.port:4500\n",
   "risk_score": 21,
   "rule_id": "a9cb3641-ff4b-4cdc-a063-b4b8d02a67c7",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_26_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_26_activity.json
index 48a7fae4b259e..1ea0da645d785 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_26_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_26_activity.json
@@ -15,7 +15,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "SMTP on Port 26/TCP",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:26 or (event.dataset:zeek.smtp and destination.port:26))",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:26 or (event.dataset:zeek.smtp and destination.port:26))\n",
   "references": [
     "https://unit42.paloaltonetworks.com/unit42-badpatch/",
     "https://isc.sans.edu/forums/diary/Next+up+whats+up+with+TCP+port+26/25564/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_remote_desktop_protocol_from_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_remote_desktop_protocol_from_the_internet.json
index 1ecfdc45352aa..625b1e470192f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_remote_desktop_protocol_from_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_remote_desktop_protocol_from_the_internet.json
@@ -15,7 +15,10 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "RDP (Remote Desktop Protocol) from the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:3389 or event.dataset:zeek.rdp) and not source.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" ) and destination.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:3389 or event.dataset:zeek.rdp) and\n  not source.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  ) and\n  destination.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  )\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 47,
   "rule_id": "8c1bdde8-4204-45c0-9e0c-c85ca3902488",
   "severity": "medium",
@@ -69,5 +72,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_telnet_port_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_telnet_port_activity.json
index f66e2ce891198..34adaa49df9c4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_telnet_port_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_telnet_port_activity.json
@@ -15,7 +15,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Telnet Port Activity",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port:23",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port:23\n",
   "risk_score": 47,
   "rule_id": "34fde489-94b0-4500-a76f-b8a157cf9269",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_from_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_from_the_internet.json
index e593a2fed8ba0..7a3da39baad33 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_from_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_from_the_internet.json
@@ -15,7 +15,10 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "VNC (Virtual Network Computing) from the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port >= 5800 and destination.port <= 5810 and not source.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" ) and destination.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port >= 5800 and destination.port <= 5810 and\n  not source.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  ) and\n  destination.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  )\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 73,
   "rule_id": "5700cb81-df44-46aa-a5d7-337798f53eb8",
   "severity": "high",
@@ -60,5 +63,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_to_the_internet.json
index 2e43ad410daec..4b30de0ee0211 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_vnc_virtual_network_computing_to_the_internet.json
@@ -15,7 +15,10 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "VNC (Virtual Network Computing) to the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port >= 5800 and destination.port <= 5810 and source.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 ) and not destination.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and destination.port >= 5800 and destination.port <= 5810 and\n  source.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  ) and\n  not destination.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  )\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 47,
   "rule_id": "3ad49c61-7adc-42c1-b788-732eda2f5abf",
   "severity": "medium",
@@ -45,5 +48,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempted_bypass_of_okta_mfa.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempted_bypass_of_okta_mfa.json
index c3614e0e69e9a..fc3c3f5ca90d9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempted_bypass_of_okta_mfa.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempted_bypass_of_okta_mfa.json
@@ -11,7 +11,7 @@
   "license": "Elastic License v2",
   "name": "Attempted Bypass of Okta MFA",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.mfa.attempt_bypass",
+  "query": "event.dataset:okta.system and event.action:user.mfa.attempt_bypass\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempts_to_brute_force_okta_user_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempts_to_brute_force_okta_user_account.json
index 5556f3787fbdd..ea2b05b485585 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempts_to_brute_force_okta_user_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_attempts_to_brute_force_okta_user_account.json
@@ -1,6 +1,8 @@
 {
   "author": [
-    "Elastic"
+    "Elastic",
+    "@BenB196",
+    "Austin Songer"
   ],
   "description": "Identifies when an Okta user account is locked out 3 times within a 3 hour window. An adversary may attempt a brute force or password spraying attack to obtain unauthorized access to user accounts. The default Okta authentication policy ensures that a user account is locked out after 10 failed authentication attempts.",
   "from": "now-180m",
@@ -12,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempts to Brute Force an Okta User Account",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.account.lock",
+  "query": "event.dataset:okta.system and event.action:user.account.lock\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
@@ -47,10 +49,10 @@
   ],
   "threshold": {
     "field": [
-      "okta.actor.id"
+      "okta.actor.alternate_id"
     ],
     "value": 3
   },
   "type": "threshold",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_aws_iam_assume_role_brute_force.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_aws_iam_assume_role_brute_force.json
index 3ea689aaa3570..6ef3e3d255779 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_aws_iam_assume_role_brute_force.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_aws_iam_assume_role_brute_force.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Brute Force of Assume Role Policy",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:UpdateAssumeRolePolicy and aws.cloudtrail.error_code:MalformedPolicyDocumentException and event.outcome:failure",
+  "query": "event.dataset:aws.cloudtrail and\n  event.provider:iam.amazonaws.com and event.action:UpdateAssumeRolePolicy and\n  aws.cloudtrail.error_code:MalformedPolicyDocumentException and event.outcome:failure\n",
   "references": [
     "https://www.praetorian.com/blog/aws-iam-assume-role-vulnerabilities",
     "https://rhinosecuritylabs.com/aws/assume-worst-aws-assume-role-enumeration/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_collection_sensitive_files.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_collection_sensitive_files.json
index b8a608dc47ab1..bd155ce8e914d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_collection_sensitive_files.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_collection_sensitive_files.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Sensitive Files Compression",
-  "query": "event.category:process and event.type:start and process.name:(zip or tar or gzip or hdiutil or 7z) and process.args: ( /root/.ssh/id_rsa or /root/.ssh/id_rsa.pub or /root/.ssh/id_ed25519 or /root/.ssh/id_ed25519.pub or /root/.ssh/authorized_keys or /root/.ssh/authorized_keys2 or /root/.ssh/known_hosts or /root/.bash_history or /etc/hosts or /home/*/.ssh/id_rsa or /home/*/.ssh/id_rsa.pub or /home/*/.ssh/id_ed25519 or /home/*/.ssh/id_ed25519.pub or /home/*/.ssh/authorized_keys or /home/*/.ssh/authorized_keys2 or /home/*/.ssh/known_hosts or /home/*/.bash_history or /root/.aws/credentials or /root/.aws/config or /home/*/.aws/credentials or /home/*/.aws/config or /root/.docker/config.json or /home/*/.docker/config.json or /etc/group or /etc/passwd or /etc/shadow or /etc/gshadow )",
+  "query": "event.category:process and event.type:start and\n  process.name:(zip or tar or gzip or hdiutil or 7z) and\n  process.args:\n    (\n      /root/.ssh/id_rsa or\n      /root/.ssh/id_rsa.pub or\n      /root/.ssh/id_ed25519 or\n      /root/.ssh/id_ed25519.pub or\n      /root/.ssh/authorized_keys or\n      /root/.ssh/authorized_keys2 or\n      /root/.ssh/known_hosts or\n      /root/.bash_history or\n      /etc/hosts or\n      /home/*/.ssh/id_rsa or\n      /home/*/.ssh/id_rsa.pub or\n      /home/*/.ssh/id_ed25519 or\n      /home/*/.ssh/id_ed25519.pub or\n      /home/*/.ssh/authorized_keys or\n      /home/*/.ssh/authorized_keys2 or\n      /home/*/.ssh/known_hosts or\n      /home/*/.bash_history or\n      /root/.aws/credentials or\n      /root/.aws/config or\n      /home/*/.aws/credentials or\n      /home/*/.aws/config or\n      /root/.docker/config.json or\n      /home/*/.docker/config.json or\n      /etc/group or\n      /etc/passwd or\n      /etc/shadow or\n      /etc/gshadow\n    )\n",
   "references": [
     "https://www.trendmicro.com/en_ca/research/20/l/teamtnt-now-deploying-ddos-capable-irc-bot-tntbotinger.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dumping_hashes_bi_cmds.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dumping_hashes_bi_cmds.json
index c9070cc09dd65..bb513cbebdc3f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dumping_hashes_bi_cmds.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dumping_hashes_bi_cmds.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Dumping Account Hashes via Built-In Commands",
-  "query": "event.category:process and event.type:start and process.name:(defaults or mkpassdb) and process.args:(ShadowHashData or \"-dump\")",
+  "query": "event.category:process and event.type:start and\n process.name:(defaults or mkpassdb) and process.args:(ShadowHashData or \"-dump\")\n",
   "references": [
     "https://apple.stackexchange.com/questions/186893/os-x-10-9-where-are-password-hashes-stored",
     "https://www.unix.com/man-page/osx/8/mkpassdb/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_iam_user_addition_to_group.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_iam_user_addition_to_group.json
index 0d94ac36944a9..b66008c6931a4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_iam_user_addition_to_group.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_iam_user_addition_to_group.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM User Addition to Group",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:AddUserToGroup and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:AddUserToGroup and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/IAM/latest/APIReference/API_AddUserToGroup.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
index 9429e3414e615..de5a9d80ed3df 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Kerberos Cached Credentials Dumping",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:kcc and process.args:copy_cred_cache",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.name:kcc and\n  process.args:copy_cred_cache\n",
   "references": [
     "https://github.com/EmpireProject/EmPyre/blob/master/lib/modules/collection/osx/kerberosdump.py",
     "https://opensource.apple.com/source/Heimdal/Heimdal-323.12/kuser/kcc-commands.in.auto.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_key_vault_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_key_vault_modified.json
index 27f76a13d657d..8efd74d4e7f1c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_key_vault_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_key_vault_modified.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Key Vault Modified",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.KEYVAULT/VAULTS/WRITE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.KEYVAULT/VAULTS/WRITE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/key-vault/general/basic-concepts",
     "https://docs.microsoft.com/en-us/azure/key-vault/general/secure-your-key-vault"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_brute_force_user_account_attempt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_brute_force_user_account_attempt.json
index 8e9c142929a05..532b9bf3b17b3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_brute_force_user_account_attempt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_brute_force_user_account_attempt.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Attempts to Brute Force a Microsoft 365 User Account",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:AzureActiveDirectory and event.category:authentication and event.action:UserLoginFailed and event.outcome:failure",
+  "query": "event.dataset:o365.audit and event.provider:(Exchange or AzureActiveDirectory) and event.category:authentication and \nevent.action:(\"UserLoginFailed\" or \"PasswordLogonInitialAuthUsingPassword\") and event.outcome:failure\n",
   "risk_score": 73,
   "rule_id": "26f68dba-ce29-497b-8e13-b4fde1db5a2d",
   "severity": "high",
@@ -51,5 +51,5 @@
     "value": 10
   },
   "type": "threshold",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_potential_password_spraying_attack.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_potential_password_spraying_attack.json
index 14314feebb712..536f893236dee 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_potential_password_spraying_attack.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_microsoft_365_potential_password_spraying_attack.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Potential Password Spraying of Microsoft 365 User Accounts",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:AzureActiveDirectory and event.category:authentication and event.action:UserLoginFailed and event.outcome:failure",
+  "query": "event.dataset:o365.audit and event.provider:AzureActiveDirectory and event.category:authentication and event.action:UserLoginFailed and event.outcome:failure\n",
   "risk_score": 73,
   "rule_id": "3efee4f0-182a-40a8-a835-102c68a4175d",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mitm_localhost_webproxy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mitm_localhost_webproxy.json
index e226df7a23da9..9c0f2d0c07dc9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mitm_localhost_webproxy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mitm_localhost_webproxy.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "WebProxy Settings Modification",
-  "query": "event.category : process and event.type : start and process.name : networksetup and process.args : ((\"-setwebproxy\" or \"-setsecurewebproxy\" or \"-setautoproxyurl\") and not (Bluetooth or off)) and not process.parent.executable : (\"/Library/PrivilegedHelperTools/com.80pct.FreedomHelper\" or \"/Applications/Fiddler Everywhere.app/Contents/Resources/app/out/WebServer/Fiddler.WebUi\" or \"/usr/libexec/xpcproxy\")",
+  "query": "event.category : process and event.type : start and\n process.name : networksetup and process.args : ((\"-setwebproxy\" or \"-setsecurewebproxy\" or \"-setautoproxyurl\") and not (Bluetooth or off)) and\n not process.parent.executable : (\"/Library/PrivilegedHelperTools/com.80pct.FreedomHelper\" or\n                                  \"/Applications/Fiddler Everywhere.app/Contents/Resources/app/out/WebServer/Fiddler.WebUi\" or\n                                  \"/usr/libexec/xpcproxy\")\n",
   "references": [
     "https://unit42.paloaltonetworks.com/mac-malware-steals-cryptocurrency-exchanges-cookies/",
     "https://objectivebythesea.com/v2/talks/OBTS_v2_Zohar.pdf"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_okta_brute_force_or_password_spraying.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_okta_brute_force_or_password_spraying.json
index 16c2816e30690..f5449e4e30a1c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_okta_brute_force_or_password_spraying.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_okta_brute_force_or_password_spraying.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Okta Brute Force or Password Spraying Attack",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.category:authentication and event.outcome:failure",
+  "query": "event.dataset:okta.system and event.category:authentication and event.outcome:failure\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_ssh_bruteforce.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_ssh_bruteforce.json
index 410db35bf77d3..4f945e22abdb3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_ssh_bruteforce.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_ssh_bruteforce.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential SSH Brute Force Detected",
-  "query": "event.category:process and event.type:start and process.name:\"sshd-keygen-wrapper\" and process.parent.name:launchd",
+  "query": "event.category:process and event.type:start and process.name:\"sshd-keygen-wrapper\" and process.parent.name:launchd\n",
   "references": [
     "https://themittenmac.com/detecting-ssh-activity-via-process-monitoring/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_root_console_failure_brute_force.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_root_console_failure_brute_force.json
index fb296d82b992b..b20ef22a9d152 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_root_console_failure_brute_force.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_root_console_failure_brute_force.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "AWS Management Console Brute Force of Root User Identity",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and aws.cloudtrail.user_identity.type:Root and event.outcome:failure",
+  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and aws.cloudtrail.user_identity.type:Root and event.outcome:failure\n",
   "references": [
     "https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_secretsmanager_getsecretvalue.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_secretsmanager_getsecretvalue.json
index 8eebcc5c45096..6d0d4c8d112a4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_secretsmanager_getsecretvalue.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_secretsmanager_getsecretvalue.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "AWS Access Secret in Secrets Manager",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:secretsmanager.amazonaws.com and event.action:GetSecretValue",
+  "query": "event.dataset:aws.cloudtrail and event.provider:secretsmanager.amazonaws.com and event.action:GetSecretValue\n",
   "references": [
     "https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_GetSecretValue.html",
     "http://detectioninthe.cloud/credential_access/access_secret_in_secrets_manager/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_storage_account_key_regenerated.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_storage_account_key_regenerated.json
index d6f5a05c86e1a..3f286081c49f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_storage_account_key_regenerated.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_storage_account_key_regenerated.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Storage Account Key Regenerated",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.STORAGE/STORAGEACCOUNTS/REGENERATEKEY/ACTION\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.STORAGE/STORAGEACCOUNTS/REGENERATEKEY/ACTION\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage?tabs=azure-portal"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_systemkey_dumping.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_systemkey_dumping.json
index 9094124c480bd..9eaa51279bf4b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_systemkey_dumping.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_systemkey_dumping.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "SystemKey Access via Command Line",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:\"/private/var/db/SystemKey\"",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.args:\"/private/var/db/SystemKey\"\n",
   "references": [
     "https://github.com/AlessandroZ/LaZagne/blob/master/Mac/lazagne/softwares/system/chainbreaker.py"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_amsienable_key_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_amsienable_key_mod.json
new file mode 100644
index 0000000000000..6f30b53d24bdb
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_amsienable_key_mod.json
@@ -0,0 +1,57 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Jscript tries to query the AmsiEnable registry key from the HKEY_USERS registry hive before initializing Antimalware Scan Interface (AMSI). If this key is set to 0, AMSI is not enabled for the Jscript process. An adversary can modify this key to disable AMSI protections.",
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-endpoint.events.*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Modification of AmsiEnable Registry Key",
+  "query": "registry where event.type in (\"creation\", \"change\") and\n  registry.path: \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows Script\\\\Settings\\\\AmsiEnable\" and\n  registry.data.strings: \"0\"\n",
+  "references": [
+    "https://hackinparis.com/data/slides/2019/talks/HIP2019-Dominic_Chell-Cracking_The_Perimeter_With_Sharpshooter.pdf",
+    "https://docs.microsoft.com/en-us/windows/win32/amsi/antimalware-scan-interface-portal"
+  ],
+  "risk_score": 73,
+  "rule_id": "f874315d-5188-4b4a-8521-d1c73093a7e4",
+  "severity": "high",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Defense Evasion"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.001",
+              "name": "Disable or Modify Tools",
+              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_apple_softupdates_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_apple_softupdates_modification.json
index 9340425c518a7..f354f521d168e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_apple_softupdates_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_apple_softupdates_modification.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "SoftwareUpdate Preferences Modification",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:defaults and process.args:(write and \"-bool\" and (com.apple.SoftwareUpdate or /Library/Preferences/com.apple.SoftwareUpdate.plist) and not (TRUE or true))",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:defaults and \n process.args:(write and \"-bool\" and (com.apple.SoftwareUpdate or /Library/Preferences/com.apple.SoftwareUpdate.plist) and not (TRUE or true))\n",
   "references": [
     "https://blog.checkpoint.com/2017/07/13/osxdok-refuses-go-away-money/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_gatekeeper.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_gatekeeper.json
index ab423dc0ebe14..9bb48361ccf89 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_gatekeeper.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_gatekeeper.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Disable Gatekeeper",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:(spctl and \"--master-disable\")",
+  "query": "event.category:process and event.type:(start or process_started) and \n  process.args:(spctl and \"--master-disable\")\n",
   "references": [
     "https://support.apple.com/en-us/HT202491",
     "https://www.carbonblack.com/blog/tau-threat-intelligence-notification-new-macos-malware-variant-of-shlayer-osx-discovered/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
index 8913c63f811dd..3eb5f25298c72 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Disable IPTables or Firewall",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:ufw and process.args:(allow or disable or reset) or  (((process.name:service and process.args:stop) or (process.name:chkconfig and process.args:off) or (process.name:systemctl and process.args:(disable or stop or kill))) and process.args:(firewalld or ip6tables or iptables))",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.name:ufw and process.args:(allow or disable or reset) or\n\n  (((process.name:service and process.args:stop) or\n     (process.name:chkconfig and process.args:off) or\n     (process.name:systemctl and process.args:(disable or stop or kill))) and\n   process.args:(firewalld or ip6tables or iptables))\n",
   "risk_score": 47,
   "rule_id": "125417b8-d3df-479f-8418-12d7e034fee3",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
index b465340a83223..610648df94d37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Disable Syslog Service",
-  "query": "event.category:process and event.type:(start or process_started) and ((process.name:service and process.args:stop) or (process.name:chkconfig and process.args:off) or (process.name:systemctl and process.args:(disable or stop or kill))) and process.args:(syslog or rsyslog or \"syslog-ng\")",
+  "query": "event.category:process and event.type:(start or process_started) and\n  ((process.name:service and process.args:stop) or\n     (process.name:chkconfig and process.args:off) or\n     (process.name:systemctl and process.args:(disable or stop or kill)))\n  and process.args:(syslog or rsyslog or \"syslog-ng\")\n",
   "risk_score": 47,
   "rule_id": "2f8a1226-5720-437d-9c20-e0029deb6194",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_application_credential_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_application_credential_modification.json
index d695695e2c23b..5f96b81247942 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_application_credential_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_application_credential_modification.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Application Credential Modification",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Update application - Certificates and secrets management\" and event.outcome:(success or Success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Update application - Certificates and secrets management\" and event.outcome:(success or Success)\n",
   "references": [
     "https://msrc-blog.microsoft.com/2020/12/13/customer-guidance-on-recent-nation-state-cyber-attacks/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_diagnostic_settings_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_diagnostic_settings_deletion.json
index 31eec6ee4d1c2..d9f70f88a23b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_diagnostic_settings_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_diagnostic_settings_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Diagnostic Settings Deletion",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.INSIGHTS/DIAGNOSTICSETTINGS/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.INSIGHTS/DIAGNOSTICSETTINGS/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/azure-monitor/platform/diagnostic-settings"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_service_principal_addition.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_service_principal_addition.json
index 43557bfeb31ba..c715ea42e4b7e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_service_principal_addition.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_azure_service_principal_addition.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Service Principal Addition",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add service principal\" and event.outcome:(success or Success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add service principal\" and event.outcome:(success or Success)\n",
   "references": [
     "https://msrc-blog.microsoft.com/2020/12/13/customer-guidance-on-recent-nation-state-cyber-attacks/",
     "https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
index bedb41cb726a6..1cc353f1add3a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Base16 or Base32 Encoding/Decoding Activity",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(base16 or base32 or base32plain or base32hex)",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.name:(base16 or base32 or base32plain or base32hex)\n",
   "risk_score": 21,
   "rule_id": "debff20a-46bc-4a4d-bae5-5cdd14222795",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
index ca7485a29f4fc..d04c2b2a38915 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Windows Event Logs Cleared",
-  "query": "event.action:(\"audit-log-cleared\" or \"Log clear\")",
+  "query": "event.action:(\"audit-log-cleared\" or \"Log clear\")\n",
   "risk_score": 21,
   "rule_id": "45ac4800-840f-414c-b221-53dd36a5aaf7",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_deleted.json
index 8daf17dc8c386..744543ab8a1f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_deleted.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudTrail Log Deleted",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:DeleteTrail and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:DeleteTrail and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_DeleteTrail.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/cloudtrail/delete-trail.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_suspended.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_suspended.json
index c140a1f9b9734..27990a74ac5b2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_suspended.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudtrail_logging_suspended.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudTrail Log Suspended",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:StopLogging and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:StopLogging and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_StopLogging.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/cloudtrail/stop-logging.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudwatch_alarm_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudwatch_alarm_deletion.json
index b5984d5d624c3..61806b640fae2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudwatch_alarm_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cloudwatch_alarm_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudWatch Alarm Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:monitoring.amazonaws.com and event.action:DeleteAlarms and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:monitoring.amazonaws.com and event.action:DeleteAlarms and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/cloudwatch/delete-alarms.html",
     "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DeleteAlarms.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_config_service_rule_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_config_service_rule_deletion.json
index a512cd8c842ee..f58164d1a483f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_config_service_rule_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_config_service_rule_deletion.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "AWS Config Service Tampering",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:config.amazonaws.com and event.action:(DeleteConfigRule or DeleteOrganizationConfigRule or DeleteConfigurationAggregator or DeleteConfigurationRecorder or DeleteConformancePack or DeleteOrganizationConformancePack or DeleteDeliveryChannel or DeleteRemediationConfiguration or DeleteRetentionConfiguration)",
+  "query": "event.dataset:aws.cloudtrail and event.provider:config.amazonaws.com and\n    event.action:(DeleteConfigRule or DeleteOrganizationConfigRule or DeleteConfigurationAggregator or\n    DeleteConfigurationRecorder or DeleteConformancePack or DeleteOrganizationConformancePack or\n    DeleteDeliveryChannel or DeleteRemediationConfiguration or DeleteRetentionConfiguration)\n",
   "references": [
     "https://docs.aws.amazon.com/config/latest/developerguide/how-does-config-work.html",
     "https://docs.aws.amazon.com/config/latest/APIReference/API_Operations.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_configuration_recorder_stopped.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_configuration_recorder_stopped.json
index abadb416deec8..c222b25721292 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_configuration_recorder_stopped.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_configuration_recorder_stopped.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS Configuration Recorder Stopped",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:config.amazonaws.com and event.action:StopConfigurationRecorder and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:config.amazonaws.com and event.action:StopConfigurationRecorder and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/configservice/stop-configuration-recorder.html",
     "https://docs.aws.amazon.com/config/latest/APIReference/API_StopConfigurationRecorder.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cve_2020_0601.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cve_2020_0601.json
index c7ac34a39563e..fba792e80d490 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cve_2020_0601.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_cve_2020_0601.json
@@ -10,7 +10,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Windows CryptoAPI Spoofing Vulnerability (CVE-2020-0601 - CurveBall)",
-  "query": "event.provider:\"Microsoft-Windows-Audit-CVE\" and message:\"[CVE-2020-0601]\"",
+  "query": "event.provider:\"Microsoft-Windows-Audit-CVE\" and message:\"[CVE-2020-0601]\"\n",
   "risk_score": 21,
   "rule_id": "56557cde-d923-4b88-adee-c61b3f3b5dc3",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
index 0a51b0ccc87f5..cc84001428ff0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Disabling of SELinux",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:setenforce and process.args:0",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:setenforce and process.args:0\n",
   "risk_score": 47,
   "rule_id": "eb9eb8ba-a983-41d9-9c93-a1c05112ca5e",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_flow_log_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_flow_log_deletion.json
index f88b8b3589d93..8c74783642395 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_flow_log_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_flow_log_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS EC2 Flow Log Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:DeleteFlowLogs and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:DeleteFlowLogs and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/delete-flow-logs.html",
     "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeleteFlowLogs.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_network_acl_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_network_acl_deletion.json
index 06fc3a3f094a5..b64f7eed4be8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_network_acl_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_ec2_network_acl_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS EC2 Network Access Control List Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(DeleteNetworkAcl or DeleteNetworkAclEntry) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(DeleteNetworkAcl or DeleteNetworkAclEntry) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/delete-network-acl.html",
     "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeleteNetworkAcl.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_event_hub_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_event_hub_deletion.json
index 0ea25e05915c6..a8a2f945c76e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_event_hub_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_event_hub_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Event Hub Deletion",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.EVENTHUB/NAMESPACES/EVENTHUBS/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.EVENTHUB/NAMESPACES/EVENTHUBS/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-about",
     "https://azure.microsoft.com/en-in/services/event-hubs/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
index 0b934676ac1eb..6d86f27cd52b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "File Deletion via Shred",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:shred and process.args:(\"-u\" or \"--remove\" or \"-z\" or \"--zero\")",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:shred and\n  process.args:(\"-u\" or \"--remove\" or \"-z\" or \"--zero\")\n",
   "risk_score": 21,
   "rule_id": "a1329140-8de3-4445-9f87-908fb6d824f4",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
index cd83733d81830..be7e8b71694ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "File Permission Modification in Writable Directory",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(chmod or chown or chattr or chgrp) and process.working_directory:(/tmp or /var/tmp or /dev/shm) and not user.name:root",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.name:(chmod or chown or chattr or chgrp) and\n  process.working_directory:(/tmp or /var/tmp or /dev/shm) and\n  not user.name:root\n",
   "risk_score": 21,
   "rule_id": "9f9a2a82-93a8-4b1a-8778-1780895626d4",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_firewall_policy_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_firewall_policy_deletion.json
index f8961a832ac1e..98ee5f6eb8cbf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_firewall_policy_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_firewall_policy_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Firewall Policy Deletion",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.NETWORK/FIREWALLPOLICIES/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.NETWORK/FIREWALLPOLICIES/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/firewall-manager/policy-overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_created.json
index 7fbe044738386..ff2a20f85d3e3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_created.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Firewall Rule Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.insert",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.insert\n",
   "references": [
     "https://cloud.google.com/vpc/docs/firewalls"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_deleted.json
index 4cc8fde077c3e..3fc9b6bc49d3d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_deleted.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Firewall Rule Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.delete",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.delete\n",
   "references": [
     "https://cloud.google.com/vpc/docs/firewalls"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_modified.json
index 614da7f79a46b..e6ad1fc554183 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_firewall_rule_modified.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Firewall Rule Modification",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.patch",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.firewalls.patch\n",
   "references": [
     "https://cloud.google.com/vpc/docs/firewalls"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_bucket_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_bucket_deletion.json
index 805f21f875f02..d2fd746f8971e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_bucket_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_bucket_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Logging Bucket Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.DeleteBucket and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.DeleteBucket and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/logging/docs/buckets",
     "https://cloud.google.com/logging/docs/storage"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_sink_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_sink_deletion.json
index 6fa62fe3a6313..3e103413967fe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_sink_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_logging_sink_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Logging Sink Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.DeleteSink and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.DeleteSink and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/logging/docs/export"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_subscription_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_subscription_deletion.json
index 4907e0f13e550..78435128865f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_subscription_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_subscription_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Pub/Sub Subscription Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Subscriber.DeleteSubscription and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Subscriber.DeleteSubscription and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/pubsub/docs/overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_topic_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_topic_deletion.json
index 7632a73ddfa90..eb6945e88e3fa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_topic_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_pub_sub_topic_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Pub/Sub Topic Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Publisher.DeleteTopic and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.pubsub.v*.Publisher.DeleteTopic and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/pubsub/docs/overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_configuration_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_configuration_modified.json
index abb6912f0828d..063e844c990be 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_configuration_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_configuration_modified.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Storage Bucket Configuration Modification",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.buckets.update\" and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.buckets.update\" and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/storage/docs/key-terms#buckets"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_permissions_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_permissions_modified.json
index 8eb238c9dc796..c0a3c90853d79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_permissions_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_gcp_storage_bucket_permissions_modified.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Storage Bucket Permissions Modification",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.setIamPermissions\" and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.setIamPermissions\" and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/storage/docs/access-control/iam-permissions"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_guardduty_detector_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_guardduty_detector_deletion.json
index 8ededad39f415..7132fed195ccf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_guardduty_detector_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_guardduty_detector_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS GuardDuty Detector Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:guardduty.amazonaws.com and event.action:DeleteDetector and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:guardduty.amazonaws.com and event.action:DeleteDetector and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/guardduty/delete-detector.html",
     "https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DeleteDetector.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
index a14258e533275..fe8014936316c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "max_signals": 33,
   "name": "Creation of Hidden Files and Directories",
-  "query": "event.category:process AND event.type:(start or process_started) AND process.working_directory:(\"/tmp\" or \"/var/tmp\" or \"/dev/shm\") AND process.args:/\\.[a-zA-Z0-9_\\-][a-zA-Z0-9_\\-\\.]{1,254}/ AND NOT process.name:(ls or find)",
+  "query": "event.category:process AND event.type:(start or process_started) AND\n  process.working_directory:(\"/tmp\" or \"/var/tmp\" or \"/dev/shm\") AND\n  process.args:/\\.[a-zA-Z0-9_\\-][a-zA-Z0-9_\\-\\.]{1,254}/ AND\n  NOT process.name:(ls or find)\n",
   "risk_score": 47,
   "rule_id": "b9666521-4742-49ce-9ddc-b8e84c35acae",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_injection_msbuild.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_injection_msbuild.json
index 2ddcd0c640415..43d662df271ee 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_injection_msbuild.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_injection_msbuild.json
@@ -13,7 +13,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Process Injection by the Microsoft Build Engine",
-  "query": "process.name:MSBuild.exe and event.action:\"CreateRemoteThread detected (rule: CreateRemoteThread)\"",
+  "query": "process.name:MSBuild.exe and event.action:\"CreateRemoteThread detected (rule: CreateRemoteThread)\"\n",
   "risk_score": 21,
   "rule_id": "9d110cb3-5f4b-4c9a-b9f5-53f0a1707ae9",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_install_root_certificate.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_install_root_certificate.json
index 6585c1b8c8ffb..3397db22f51f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_install_root_certificate.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_install_root_certificate.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Install Root Certificate",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:security and process.args:\"add-trusted-cert\"",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.name:security and process.args:\"add-trusted-cert\"\n",
   "references": [
     "https://ss64.com/osx/security-cert.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
index 691c30d6f42a5..35c0cb2fb2645 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Kernel Module Removal",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:((rmmod and sudo) or (modprobe and sudo and (\"--remove\" or \"-r\")))",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.args:((rmmod and sudo) or (modprobe and sudo and (\"--remove\" or \"-r\")))\n",
   "references": [
     "http://man7.org/linux/man-pages/man8/modprobe.8.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_dlp_policy_removed.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_dlp_policy_removed.json
index b39aee071a874..f4c3e3476c0b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_dlp_policy_removed.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_dlp_policy_removed.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange DLP Policy Removed",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-DlpPolicy\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-DlpPolicy\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-dlppolicy?view=exchange-ps",
     "https://docs.microsoft.com/en-us/microsoft-365/compliance/data-loss-prevention-policies?view=o365-worldwide"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_policy_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_policy_deletion.json
index c4de503b66540..ab3399bddbe7a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_policy_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_policy_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Malware Filter Policy Deletion",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-MalwareFilterPolicy\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-MalwareFilterPolicy\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-malwarefilterpolicy?view=exchange-ps"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_rule_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_rule_mod.json
index c0dcec7e1b0d7..06728dee5b150 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_rule_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_malware_filter_rule_mod.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Malware Filter Rule Modification",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-MalwareFilterRule\" or \"Disable-MalwareFilterRule\") and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-MalwareFilterRule\" or \"Disable-MalwareFilterRule\") and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-malwarefilterrule?view=exchange-ps",
     "https://docs.microsoft.com/en-us/powershell/module/exchange/disable-malwarefilterrule?view=exchange-ps"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_safe_attach_rule_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_safe_attach_rule_disabled.json
index 5273115ead302..50af384100139 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_safe_attach_rule_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_microsoft_365_exchange_safe_attach_rule_disabled.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Safe Attachment Rule Disabled",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Disable-SafeAttachmentRule\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Disable-SafeAttachmentRule\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/disable-safeattachmentrule?view=exchange-ps"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
index b61a45e1287b7..5f45aa836ddf5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
@@ -12,7 +12,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Network Connection via Signed Binary",
-  "query": "sequence by process.entity_id\n  [process where (process.name : \"expand.exe\" or process.name : \"extrac.exe\" or\n                 process.name : \"ieexec.exe\" or process.name : \"makecab.exe\") and\n     event.type == \"start\"]\n  [network where (process.name : \"expand.exe\" or process.name : \"extrac.exe\" or\n                 process.name : \"ieexec.exe\" or process.name : \"makecab.exe\") and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\")]\n",
+  "query": "sequence by process.entity_id\n  [process where (process.name : \"expand.exe\" or process.name : \"extrac.exe\" or\n                 process.name : \"ieexec.exe\" or process.name : \"makecab.exe\") and\n                 event.type == \"start\"]\n  [network where (process.name : \"expand.exe\" or process.name : \"extrac.exe\" or\n                 process.name : \"ieexec.exe\" or process.name : \"makecab.exe\") and\n    not cidrmatch(destination.ip,\n      \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\", \"192.0.0.0/29\", \"192.0.0.8/32\",\n      \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\",\n      \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n      \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\", \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "63e65ec3-43b1-45b0-8f2d-45b34291dc44",
   "severity": "low",
@@ -50,5 +53,5 @@
     }
   ],
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modify_environment_launchctl.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modify_environment_launchctl.json
index d41804247945b..aa0efa290c4f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modify_environment_launchctl.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modify_environment_launchctl.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Modification of Environment Variable via Launchctl",
-  "query": "event.category:process and event.type:start and process.name:launchctl and process.args:(setenv and not (JAVA*_HOME or RUNTIME_JAVA_HOME or DBUS_LAUNCHD_SESSION_BUS_SOCKET or ANT_HOME or LG_WEBOS_TV_SDK_HOME or WEBOS_CLI_TV or EDEN_ENV) ) and not process.parent.executable:(\"/Applications/NoMachine.app/Contents/Frameworks/bin/nxserver.bin\" or \"/usr/local/bin/kr\" or \"/Applications/NoMachine.app/Contents/Frameworks/bin/nxserver.bin\" or \"/Applications/IntelliJ IDEA CE.app/Contents/jbr/Contents/Home/lib/jspawnhelper\")",
+  "query": "event.category:process and event.type:start and\n  process.name:launchctl and\n  process.args:(setenv and not (JAVA*_HOME or\n                                RUNTIME_JAVA_HOME or\n                                DBUS_LAUNCHD_SESSION_BUS_SOCKET or\n                                ANT_HOME or\n                                LG_WEBOS_TV_SDK_HOME or\n                                WEBOS_CLI_TV or\n                                EDEN_ENV)\n                ) and\n  not process.parent.executable:(\"/Applications/NoMachine.app/Contents/Frameworks/bin/nxserver.bin\" or\n                                 \"/usr/local/bin/kr\" or\n                                 \"/Applications/NoMachine.app/Contents/Frameworks/bin/nxserver.bin\" or\n                                 \"/Applications/IntelliJ IDEA CE.app/Contents/jbr/Contents/Home/lib/jspawnhelper\")\n",
   "references": [
     "https://github.com/rapid7/metasploit-framework/blob/master//modules/post/osx/escalate/tccbypass.rb"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msxsl_network.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msxsl_network.json
index 6d6541269030d..8f8871b75022e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msxsl_network.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msxsl_network.json
@@ -12,7 +12,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Network Connection via MsXsl",
-  "query": "sequence by process.entity_id\n  [process where process.name : \"msxsl.exe\" and event.type == \"start\"]\n  [network where process.name : \"msxsl.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name : \"msxsl.exe\" and event.type == \"start\"]\n  [network where process.name : \"msxsl.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n       \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\",\n       \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\",\n       \"100.64.0.0/10\", \"192.175.48.0/24\",\"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n       \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "b86afe07-0d98-4738-b15d-8d7465f95ff5",
   "severity": "low",
@@ -41,5 +44,5 @@
     }
   ],
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_network_watcher_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_network_watcher_deletion.json
index 27a590f49cb31..030e72dd4a411 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_network_watcher_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_network_watcher_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Network Watcher Deletion",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.NETWORK/NETWORKWATCHERS/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.NETWORK/NETWORKWATCHERS/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/network-watcher/network-watcher-monitoring-overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_s3_bucket_configuration_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_s3_bucket_configuration_deletion.json
index 4eb3bb47beff5..d673b7ef324f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_s3_bucket_configuration_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_s3_bucket_configuration_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS S3 Bucket Configuration Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:s3.amazonaws.com and event.action:(DeleteBucketPolicy or DeleteBucketReplication or DeleteBucketCors or DeleteBucketEncryption or DeleteBucketLifecycle) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:s3.amazonaws.com and\n  event.action:(DeleteBucketPolicy or DeleteBucketReplication or DeleteBucketCors or\n                DeleteBucketEncryption or DeleteBucketLifecycle)\n  and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketPolicy.html",
     "https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketReplication.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_safari_config_change.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_safari_config_change.json
index 8021a21c8010d..a56b2cf6e6ded 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_safari_config_change.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_safari_config_change.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Modification of Safari Settings via Defaults Command",
-  "query": "event.category:process and event.type:start and process.name:defaults and process.args: (com.apple.Safari and write and not ( UniversalSearchEnabled or SuppressSearchSuggestions or WebKitTabToLinksPreferenceKey or ShowFullURLInSmartSearchField or com.apple.Safari.ContentPageGroupIdentifier.WebKit2TabsToLinks ) )",
+  "query": "event.category:process and event.type:start and\n  process.name:defaults and process.args:\n    (com.apple.Safari and write and not\n      (\n      UniversalSearchEnabled or\n      SuppressSearchSuggestions or\n      WebKitTabToLinksPreferenceKey or\n      ShowFullURLInSmartSearchField or\n      com.apple.Safari.ContentPageGroupIdentifier.WebKit2TabsToLinks\n      )\n    )\n",
   "references": [
     "https://objectivebythesea.com/v2/talks/OBTS_v2_Zohar.pdf"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_sandboxed_office_app_suspicious_zip_file.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_sandboxed_office_app_suspicious_zip_file.json
index 338010e1fe0e3..385f89910ab7d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_sandboxed_office_app_suspicious_zip_file.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_sandboxed_office_app_suspicious_zip_file.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Microsoft Office Sandbox Evasion",
-  "query": "event.category:file and not event.type:deletion and file.name:~$*.zip",
+  "query": "event.category:file and not event.type:deletion and file.name:~$*.zip\n",
   "references": [
     "https://i.blackhat.com/USA-20/Wednesday/us-20-Wardle-Office-Drama-On-macOS.pdf",
     "https://www.mdsec.co.uk/2018/08/escaping-the-sandbox-microsoft-office-on-macos/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json
index 8339c75c59c52..86903058b62fe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "High Number of Process and/or Service Terminations",
-  "query": "event.category:process and event.type:start and process.name:(net.exe or sc.exe or taskkill.exe) and process.args:(stop or pause or delete or \"/PID\" or \"/IM\" or \"/T\" or \"/F\" or \"/t\" or \"/f\" or \"/im\" or \"/pid\")",
+  "query": "event.category:process and event.type:start and process.name:(net.exe or sc.exe or taskkill.exe) and\n process.args:(stop or pause or delete or \"/PID\" or \"/IM\" or \"/T\" or \"/F\" or \"/t\" or \"/f\" or \"/im\" or \"/pid\")\n",
   "risk_score": 47,
   "rule_id": "035889c4-2686-4583-a7df-67f89c292f2c",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_execution_from_mounted_device.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_execution_from_mounted_device.json
new file mode 100644
index 0000000000000..b05402f419f5a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_execution_from_mounted_device.json
@@ -0,0 +1,89 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies when a script interpreter or signed binary is launched via a non-standard working directory. An attacker may use this technique to evade defenses.",
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-endpoint.events.*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Suspicious Execution from a Mounted Device",
+  "query": "process where event.type == \"start\" and process.executable : \"C:\\\\*\" and\n  (process.working_directory : \"?:\\\\\" and not process.working_directory: \"C:\\\\\") and\n  process.parent.name : \"explorer.exe\" and\n  process.name : (\"rundll32.exe\", \"mshta.exe\", \"powershell.exe\", \"pwsh.exe\", \"cmd.exe\", \"regsvr32.exe\",\n                  \"cscript.exe\", \"wscript.exe\")\n",
+  "references": [
+    "https://www.microsoft.com/security/blog/2021/05/27/new-sophisticated-email-based-attack-from-nobelium/",
+    "https://www.volexity.com/blog/2021/05/27/suspected-apt29-operation-launches-election-fraud-themed-phishing-campaigns/"
+  ],
+  "risk_score": 47,
+  "rule_id": "8a1d4831-3ce6-4859-9891-28931fa6101d",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Defense Evasion"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1218",
+          "name": "Signed Binary Proxy Execution",
+          "reference": "https://attack.mitre.org/techniques/T1218/",
+          "subtechnique": [
+            {
+              "id": "T1218.011",
+              "name": "Rundll32",
+              "reference": "https://attack.mitre.org/techniques/T1218/011/"
+            },
+            {
+              "id": "T1218.005",
+              "name": "Mshta",
+              "reference": "https://attack.mitre.org/techniques/T1218/005/"
+            },
+            {
+              "id": "T1218.010",
+              "name": "Regsvr32",
+              "reference": "https://attack.mitre.org/techniques/T1218/010/"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0002",
+        "name": "Execution",
+        "reference": "https://attack.mitre.org/tactics/TA0002/"
+      },
+      "technique": [
+        {
+          "id": "T1059",
+          "name": "Command and Scripting Interpreter",
+          "reference": "https://attack.mitre.org/techniques/T1059/",
+          "subtechnique": [
+            {
+              "id": "T1059.001",
+              "name": "PowerShell",
+              "reference": "https://attack.mitre.org/techniques/T1059/001/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_okta_user_password_reset_or_unlock_attempts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_okta_user_password_reset_or_unlock_attempts.json
index b1ab19a25d840..d33620cbbf63b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_okta_user_password_reset_or_unlock_attempts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_okta_user_password_reset_or_unlock_attempts.json
@@ -1,8 +1,10 @@
 {
   "author": [
-    "Elastic"
+    "Elastic",
+    "@BenB196",
+    "Austin Songer"
   ],
-  "description": "Identifies a high number of Okta user password reset or account unlock attempts. An adversary may attempt to obtain unauthorized access to an Okta user account using these methods and attempt to blend in with normal activity in their target's environment and evade detection.",
+  "description": "Identifies a high number of Okta user password reset or account unlock attempts. An adversary may attempt to obtain unauthorized access to Okta user accounts using these methods and attempt to blend in with normal activity in their target's environment and evade detection.",
   "false_positives": [
     "The number of Okta user password reset or account unlock attempts will likely vary between organizations. To fit this rule to their organization, users can duplicate this rule and edit the schedule and threshold values in the new rule."
   ],
@@ -15,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "High Number of Okta User Password Reset or Unlock Attempts",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:(system.email.account_unlock.sent_message or system.email.password_reset.sent_message or system.sms.send_account_unlock_message or system.sms.send_password_reset_message or system.voice.send_account_unlock_call or system.voice.send_password_reset_call or user.account.unlock_token)",
+  "query": "event.dataset:okta.system and\n  event.action:(system.email.account_unlock.sent_message or system.email.password_reset.sent_message or\n                system.sms.send_account_unlock_message or system.sms.send_password_reset_message or\n                system.voice.send_account_unlock_call or system.voice.send_password_reset_call or\n                user.account.unlock_token)\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
@@ -80,10 +82,10 @@
   ],
   "threshold": {
     "field": [
-      "okta.actor.id"
+      "okta.actor.alternate_id"
     ],
     "value": 5
   },
   "type": "threshold",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_tcc_bypass_mounted_apfs_access.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_tcc_bypass_mounted_apfs_access.json
index 963eb444305c7..4b1f13a10414d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_tcc_bypass_mounted_apfs_access.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_tcc_bypass_mounted_apfs_access.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "TCC Bypass via Mounted APFS Snapshot Access",
-  "query": "event.category : process and event.type : (start or process_started) and process.name : mount_apfs and process.args : (/System/Volumes/Data and noowners)",
+  "query": "event.category : process and event.type : (start or process_started) and process.name : mount_apfs and\n  process.args : (/System/Volumes/Data and noowners)\n",
   "references": [
     "https://theevilbit.github.io/posts/cve_2020_9771/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unload_endpointsecurity_kext.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unload_endpointsecurity_kext.json
index dc854dee776c4..aadcaadaba980 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unload_endpointsecurity_kext.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unload_endpointsecurity_kext.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Unload Elastic Endpoint Security Kernel Extension",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:kextunload and process.args:(\"/System/Library/Extensions/EndpointSecurity.kext\" or \"EndpointSecurity.kext\")",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:kextunload and process.args:(\"/System/Library/Extensions/EndpointSecurity.kext\" or \"EndpointSecurity.kext\")\n",
   "risk_score": 73,
   "rule_id": "70fa1af4-27fd-4f26-bd03-50b6af6b9e24",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_dllhost.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_dllhost.json
new file mode 100644
index 0000000000000..a030c88941a41
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_dllhost.json
@@ -0,0 +1,51 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies unusual instances of dllhost.exe making outbound network connections. This may indicate adversarial Command and Control activity.",
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-endpoint.events.*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Unusual Network Connection via DllHost",
+  "query": "sequence by host.id, process.entity_id with maxspan=1m\n  [process where event.type in (\"start\", \"process_started\") and process.name : \"dllhost.exe\" and process.args_count == 1]\n  [network where process.name : \"dllhost.exe\" and\n   not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n    \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\", \"192.0.2.0/24\",\n    \"192.31.196.0/24\", \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\",\n    \"192.175.48.0/24\", \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\", \"FE80::/10\",\n    \"FF00::/8\")]\n",
+  "references": [
+    "https://www.microsoft.com/security/blog/2021/05/27/new-sophisticated-email-based-attack-from-nobelium/",
+    "https://www.volexity.com/blog/2021/05/27/suspected-apt29-operation-launches-election-fraud-themed-phishing-campaigns/",
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
+  "risk_score": 47,
+  "rule_id": "c7894234-7814-44c2-92a9-f7d851ea246a",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Defense Evasion"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1218",
+          "name": "Signed Binary Proxy Execution",
+          "reference": "https://attack.mitre.org/techniques/T1218/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_rundll32.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_rundll32.json
index d920c4f853dfd..f37b6a21c7e58 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_rundll32.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_network_connection_via_rundll32.json
@@ -12,7 +12,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Unusual Network Connection via RunDLL32",
-  "query": "sequence by host.id, process.entity_id with maxspan=1m\n  [process where event.type in (\"start\", \"process_started\") and process.name : \"rundll32.exe\" and process.args_count == 1]\n  [network where process.name : \"rundll32.exe\" and\n   not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\", \"127.0.0.0/8\", \"FE80::/10\", \"::1/128\")]\n",
+  "query": "sequence by host.id, process.entity_id with maxspan=1m\n  [process where event.type in (\"start\", \"process_started\") and process.name : \"rundll32.exe\" and process.args_count == 1]\n  [network where process.name : \"rundll32.exe\" and\n   not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n       \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\",\n       \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\",\n       \"100.64.0.0/10\", \"192.175.48.0/24\",\"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n       \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 47,
   "rule_id": "52aaab7b-b51c-441a-89ce-4387b3aea886",
   "severity": "medium",
@@ -48,5 +51,5 @@
     }
   ],
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_acl_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_acl_deletion.json
index cc2d47812b48c..9a7c7c9f668cc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_acl_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_acl_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS WAF Access Control List Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.action:DeleteWebACL and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.action:DeleteWebACL and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/waf-regional/delete-web-acl.html",
     "https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_DeleteWebACL.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_rule_or_rule_group_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_rule_or_rule_group_deletion.json
index ee21d03f8464b..6f42caa63cf49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_rule_or_rule_group_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_waf_rule_or_rule_group_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS WAF Rule or Rule Group Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.action:(DeleteRule or DeleteRuleGroup) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.action:(DeleteRule or DeleteRuleGroup) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/waf/delete-rule-group.html",
     "https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_DeleteRuleGroup.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_blob_container_access_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_blob_container_access_mod.json
index 16eabb82de0f7..ed50b58a91e13 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_blob_container_access_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_blob_container_access_mod.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Blob Container Access Level Modification",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.STORAGE/STORAGEACCOUNTS/BLOBSERVICES/CONTAINERS/WRITE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.STORAGE/STORAGEACCOUNTS/BLOBSERVICES/CONTAINERS/WRITE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/storage/blobs/anonymous-read-access-prevent"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
index 01d07b03c079a..96860eb7e6f79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Enumeration of Kernel Modules",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:(kmod and list and sudo or sudo and (depmod or lsmod or modinfo))",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.args:(kmod and list and sudo or sudo and (depmod or lsmod or modinfo))\n",
   "risk_score": 47,
   "rule_id": "2d8043ed-5bda-4caf-801c-c1feb7410504",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
index 7defca7b649de..09adcdc65b02a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Virtual Machine Fingerprinting",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:(\"/sys/class/dmi/id/bios_version\" or \"/sys/class/dmi/id/product_name\" or \"/sys/class/dmi/id/chassis_vendor\" or \"/proc/scsi/scsi\" or \"/proc/ide/hd0/model\") and not user.name:root",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.args:(\"/sys/class/dmi/id/bios_version\" or\n                \"/sys/class/dmi/id/product_name\" or\n                \"/sys/class/dmi/id/chassis_vendor\" or\n                \"/proc/scsi/scsi\" or\n                \"/proc/ide/hd0/model\") and\n  not user.name:root\n",
   "risk_score": 73,
   "rule_id": "5b03c9fb-9945-4d2f-9568-fd690fee3fba",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
index 96f246f9403bf..300840771081d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Domain Added to Google Workspace Trusted Domains",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ADD_TRUSTED_DOMAINS",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ADD_TRUSTED_DOMAINS\n",
   "references": [
     "https://support.google.com/a/answer/6160020?hl=en"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint_security.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint_security.json
index c3fb6d83f194f..63bf6fea698ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint_security.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint_security.json
@@ -20,7 +20,7 @@
   "license": "Elastic License v2",
   "max_signals": 10000,
   "name": "Endpoint Security",
-  "query": "event.kind:alert and event.module:(endpoint and not endgame)",
+  "query": "event.kind:alert and event.module:(endpoint and not endgame)\n",
   "risk_score": 47,
   "risk_score_mapping": [
     {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_adversary_behavior_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_adversary_behavior_detected.json
index bf53625cef750..ff690710b5ba3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_adversary_behavior_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_adversary_behavior_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Adversary Behavior - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and (event.action:rules_engine_event or endgame.event_subtype_full:rules_engine_event)",
+  "query": "event.kind:alert and event.module:endgame and (event.action:rules_engine_event or endgame.event_subtype_full:rules_engine_event)\n",
   "risk_score": 47,
   "rule_id": "77a3c3df-8ec4-4da4-b758-878f551dee69",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_detected.json
index 43cb19f50d675..4aaf9938c29da 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Credential Dumping - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:cred_theft_event or endgame.event_subtype_full:cred_theft_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:cred_theft_event or endgame.event_subtype_full:cred_theft_event)\n",
   "risk_score": 73,
   "rule_id": "571afc56-5ed9-465d-a2a9-045f099f6e7e",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_prevented.json
index 29b5bc3f39cf1..11e8dece47fb5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_dumping_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Credential Dumping - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:cred_theft_event or endgame.event_subtype_full:cred_theft_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:cred_theft_event or endgame.event_subtype_full:cred_theft_event)\n",
   "risk_score": 47,
   "rule_id": "db8c33a8-03cd-4988-9e2c-d0a4863adb13",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_detected.json
index 393591a241114..b6753cbbf784e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Credential Manipulation - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:token_manipulation_event or endgame.event_subtype_full:token_manipulation_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:token_manipulation_event or endgame.event_subtype_full:token_manipulation_event)\n",
   "risk_score": 73,
   "rule_id": "c0be5f31-e180-48ed-aa08-96b36899d48f",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_prevented.json
index e9ca199c4a791..9f409b00d6421 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_cred_manipulation_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Credential Manipulation - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:token_manipulation_event or endgame.event_subtype_full:token_manipulation_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:token_manipulation_event or endgame.event_subtype_full:token_manipulation_event)\n",
   "risk_score": 47,
   "rule_id": "c9e38e64-3f4c-4bf3-ad48-0e61a60ea1fa",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_detected.json
index a169582c2da92..0cc778cc12714 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Exploit - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:exploit_event or endgame.event_subtype_full:exploit_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:exploit_event or endgame.event_subtype_full:exploit_event)\n",
   "risk_score": 73,
   "rule_id": "2003cdc8-8d83-4aa5-b132-1f9a8eb48514",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_prevented.json
index b781a1fae1847..fe7218fe878ee 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_exploit_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Exploit - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:exploit_event or endgame.event_subtype_full:exploit_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:exploit_event or endgame.event_subtype_full:exploit_event)\n",
   "risk_score": 47,
   "rule_id": "2863ffeb-bf77-44dd-b7a5-93ef94b72036",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_detected.json
index f7a064961f039..92795c3811345 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Malware - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:file_classification_event or endgame.event_subtype_full:file_classification_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:file_classification_event or endgame.event_subtype_full:file_classification_event)\n",
   "risk_score": 99,
   "rule_id": "0a97b20f-4144-49ea-be32-b540ecc445de",
   "severity": "critical",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_prevented.json
index 59cbd98e2d42b..f712f3f1b221d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_malware_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Malware - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:file_classification_event or endgame.event_subtype_full:file_classification_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:file_classification_event or endgame.event_subtype_full:file_classification_event)\n",
   "risk_score": 73,
   "rule_id": "3b382770-efbb-44f4-beed-f5e0a051b895",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_detected.json
index b3db96d6d121b..96b64c026ad0d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Permission Theft - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:token_protection_event or endgame.event_subtype_full:token_protection_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:token_protection_event or endgame.event_subtype_full:token_protection_event)\n",
   "risk_score": 73,
   "rule_id": "c3167e1b-f73c-41be-b60b-87f4df707fe3",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_prevented.json
index 18b316a293da8..fcb453d16100f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_permission_theft_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Permission Theft - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:token_protection_event or endgame.event_subtype_full:token_protection_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:token_protection_event or endgame.event_subtype_full:token_protection_event)\n",
   "risk_score": 47,
   "rule_id": "453f659e-0429-40b1-bfdb-b6957286e04b",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_detected.json
index 861daa2d004c7..83a8ff2f83c8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Process Injection - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:kernel_shellcode_event or endgame.event_subtype_full:kernel_shellcode_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:kernel_shellcode_event or endgame.event_subtype_full:kernel_shellcode_event)\n",
   "risk_score": 73,
   "rule_id": "80c52164-c82a-402c-9964-852533d58be1",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_prevented.json
index 5f78a3517e931..e171fbcf6bb83 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_process_injection_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Process Injection - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:kernel_shellcode_event or endgame.event_subtype_full:kernel_shellcode_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:kernel_shellcode_event or endgame.event_subtype_full:kernel_shellcode_event)\n",
   "risk_score": 47,
   "rule_id": "990838aa-a953-4f3e-b3cb-6ddf7584de9e",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_detected.json
index 4c060bb52f32f..b12352ee144d9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_detected.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Ransomware - Detected - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:ransomware_event or endgame.event_subtype_full:ransomware_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:detection and (event.action:ransomware_event or endgame.event_subtype_full:ransomware_event)\n",
   "risk_score": 99,
   "rule_id": "8cb4f625-7743-4dfb-ae1b-ad92be9df7bd",
   "severity": "critical",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_prevented.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_prevented.json
index 78845ffc4c845..22150cd72a4c9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_prevented.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/endgame_ransomware_prevented.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Ransomware - Prevented - Elastic Endgame",
-  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:ransomware_event or endgame.event_subtype_full:ransomware_event)",
+  "query": "event.kind:alert and event.module:endgame and endgame.metadata.type:prevention and (event.action:ransomware_event or endgame.event_subtype_full:ransomware_event)\n",
   "risk_score": 73,
   "rule_id": "e3c5d5cb-41d5-4206-805c-f30561eae3ac",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
index 32673c7800f0b..e5bef64a4c747 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
@@ -15,7 +15,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Command Prompt Network Connection",
-  "query": "sequence by process.entity_id\n  [process where process.name : \"cmd.exe\" and event.type == \"start\"]\n  [network where process.name : \"cmd.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name : \"cmd.exe\" and event.type == \"start\"]\n  [network where process.name : \"cmd.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n                                  \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\",\n                                  \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\",\n                                  \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n                                  \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n                                  \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "89f9a4b0-9f8f-4ee0-8823-c4751a6d6696",
   "severity": "low",
@@ -59,5 +62,5 @@
     }
   ],
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_virtual_machine.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_virtual_machine.json
index 8254e9e1c75e0..1292596404eff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_virtual_machine.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_virtual_machine.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Command Execution on Virtual Machine",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.COMPUTE/VIRTUALMACHINES/RUNCOMMAND/ACTION\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.COMPUTE/VIRTUALMACHINES/RUNCOMMAND/ACTION\" and event.outcome:(Success or success)\n",
   "references": [
     "https://adsecurity.org/?p=4277",
     "https://posts.specterops.io/attacking-azure-azure-ad-and-introducing-powerzure-ca70b330511a",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_defense_evasion_electron_app_childproc_node_js.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_defense_evasion_electron_app_childproc_node_js.json
index cb3c3b3d040f3..4bf6c272e59ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_defense_evasion_electron_app_childproc_node_js.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_defense_evasion_electron_app_childproc_node_js.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Execution via Electron Child Process Node.js Module",
-  "query": "event.category:process and event.type:(start or process_started) and process.args:(\"-e\" and const*require*child_process*)",
+  "query": "event.category:process and event.type:(start or process_started) and process.args:(\"-e\" and const*require*child_process*)\n",
   "references": [
     "https://www.matthewslipper.com/2019/09/22/everything-you-wanted-electron-child-process.html",
     "https://www.trustedsec.com/blog/macos-injection-via-third-party-frameworks/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
index 31a81001d9e04..abc41d9f6d5c3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
@@ -12,7 +12,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Network Connection via Compiled HTML File",
-  "query": "sequence by process.entity_id\n  [process where process.name : \"hh.exe\" and event.type == \"start\"]\n  [network where process.name : \"hh.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name : \"hh.exe\" and event.type == \"start\"]\n  [network where process.name : \"hh.exe\" and\n     not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n       \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\",\n       \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\",\n       \"100.64.0.0/10\", \"192.175.48.0/24\",\"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n       \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "b29ee2be-bf99-446c-ab1a-2dc0183394b8",
   "severity": "low",
@@ -57,5 +60,5 @@
     }
   ],
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_installer_spawned_network_event.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_installer_spawned_network_event.json
index 6fce74fb44b12..5781c25789b94 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_installer_spawned_network_event.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_installer_spawned_network_event.json
@@ -13,9 +13,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "macOS Installer Spawns Network Event",
-  "query": "sequence by process.entity_id with maxspan=1m\n  [ process where event.type == \"start\" and host.os.family == \"macos\" and \n      process.parent.executable in (\"/usr/sbin/installer\", \"/System/Library/CoreServices/Installer.app/Contents/MacOS/Installer\") ]\n  [ network where not cidrmatch(destination.ip,\n      \"192.168.0.0/16\",\n      \"10.0.0.0/8\",\n      \"172.16.0.0/12\",\n      \"224.0.0.0/8\",\n      \"127.0.0.0/8\",\n      \"169.254.0.0/16\",\n      \"::1\",\n      \"FE80::/10\",\n      \"FF00::/8\") ]\n",
+  "query": "sequence by process.entity_id with maxspan=1m\n  [process where event.type == \"start\" and host.os.family == \"macos\" and\n    process.parent.executable in (\"/usr/sbin/installer\", \"/System/Library/CoreServices/Installer.app/Contents/MacOS/Installer\") ]\n  [network where not cidrmatch(destination.ip,\n    \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\", \"192.0.0.0/29\", \"192.0.0.8/32\",\n    \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\",\n    \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n    \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\", \"FE80::/10\", \"FF00::/8\")]\n",
   "references": [
-    "https://redcanary.com/blog/clipping-silver-sparrows-wings"
+    "https://redcanary.com/blog/clipping-silver-sparrows-wings",
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
   ],
   "risk_score": 47,
   "rule_id": "99239e7d-b0d4-46e3-8609-acafcf99f68c",
@@ -75,5 +76,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_pentest_eggshell_remote_admin_tool.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_pentest_eggshell_remote_admin_tool.json
index eb453205441a7..77537be3f1cbb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_pentest_eggshell_remote_admin_tool.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_pentest_eggshell_remote_admin_tool.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "EggShell Backdoor Execution",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:espl and process.args:eyJkZWJ1ZyI6*",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:espl and process.args:eyJkZWJ1ZyI6*\n",
   "references": [
     "https://github.com/neoneggplant/EggShell"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
index b2d71b355e3a1..0f1e857232e40 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Interactive Terminal Spawned via Perl",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:perl and process.args:(\"exec \\\"/bin/sh\\\";\" or \"exec \\\"/bin/dash\\\";\" or \"exec \\\"/bin/bash\\\";\")",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:perl and\n  process.args:(\"exec \\\"/bin/sh\\\";\" or \"exec \\\"/bin/dash\\\";\" or \"exec \\\"/bin/bash\\\";\")\n",
   "risk_score": 73,
   "rule_id": "05e5a668-7b51-4a67-93ab-e9af405c9ef3",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
index 402f5b0ab33ff..2c40ff28bfa11 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Interactive Terminal Spawned via Python",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:python and process.args:(\"import pty; pty.spawn(\\\"/bin/sh\\\")\" or \"import pty; pty.spawn(\\\"/bin/dash\\\")\" or \"import pty; pty.spawn(\\\"/bin/bash\\\")\")",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:python and\n  process.args:(\"import pty; pty.spawn(\\\"/bin/sh\\\")\" or\n                \"import pty; pty.spawn(\\\"/bin/dash\\\")\" or\n                \"import pty; pty.spawn(\\\"/bin/bash\\\")\")\n",
   "risk_score": 73,
   "rule_id": "d76b02ef-fc95-4001-9297-01cb7412232f",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
index ca919d06e34a4..2ccc730c3fa01 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
@@ -15,7 +15,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Network Connection via Registration Utility",
-  "query": "sequence by process.entity_id\n  [process where event.type == \"start\" and\n   process.name : (\"regsvr32.exe\", \"RegAsm.exe\", \"RegSvcs.exe\") and\n   not (\n         user.id == \"S-1-5-18\" and\n         (process.parent.name : \"msiexec.exe\" or process.parent.executable : (\"C:\\\\Program Files (x86)\\\\*.exe\", \"C:\\\\Program Files\\\\*.exe\"))\n       )\n   ]\n  [network where process.name : (\"regsvr32.exe\", \"RegAsm.exe\", \"RegSvcs.exe\")  and\n   not cidrmatch(destination.ip, \"10.0.0.0/8\", \"169.254.169.254\", \"172.16.0.0/12\", \"192.168.0.0/16\") and network.protocol != \"dns\"]\n",
+  "query": "sequence by process.entity_id\n  [process where event.type == \"start\" and\n   process.name : (\"regsvr32.exe\", \"RegAsm.exe\", \"RegSvcs.exe\") and\n   not (\n         user.id == \"S-1-5-18\" and\n         (process.parent.name : \"msiexec.exe\" or process.parent.executable : (\"C:\\\\Program Files (x86)\\\\*.exe\", \"C:\\\\Program Files\\\\*.exe\"))\n       )\n   ]\n  [network where process.name : (\"regsvr32.exe\", \"RegAsm.exe\", \"RegSvcs.exe\")  and\n   not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n       \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\",\n       \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\",\n       \"100.64.0.0/10\", \"192.175.48.0/24\",\"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n       \"FE80::/10\", \"FF00::/8\") and network.protocol != \"dns\"]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 21,
   "rule_id": "fb02b8d3-71ee-4af1-bacd-215d23f17efa",
   "severity": "low",
@@ -60,5 +63,5 @@
     }
   ],
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scripting_osascript_exec_followed_by_netcon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scripting_osascript_exec_followed_by_netcon.json
index 1d6fa8507ac43..74a70eb7ebd93 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scripting_osascript_exec_followed_by_netcon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scripting_osascript_exec_followed_by_netcon.json
@@ -11,9 +11,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Apple Script Execution followed by Network Connection",
-  "query": "sequence by host.id, process.entity_id with maxspan=30s\n [process where event.type == \"start\" and process.name == \"osascript\"]\n [network where event.type != \"end\" and process.name == \"osascript\" and destination.ip != \"::1\" and\n  not cidrmatch(destination.ip, \"10.0.0.0/8\",  \n                                \"172.16.0.0/12\", \n                                \"192.168.0.0/16\", \n                                \"127.0.0.0/8\", \n                                \"169.254.0.0/16\", \n                                \"224.0.0.0/4\", \n                                \"FE80::/10\", \n                                \"FF00::/8\")\n ]\n",
+  "query": "sequence by host.id, process.entity_id with maxspan=30s\n [process where event.type == \"start\" and process.name == \"osascript\"]\n [network where event.type != \"end\" and process.name == \"osascript\" and destination.ip != \"::1\" and\n  not cidrmatch(destination.ip,\n    \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\", \"192.0.0.0/29\", \"192.0.0.8/32\",\n    \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\", \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\",\n    \"192.52.193.0/24\", \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n    \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\", \"FE80::/10\", \"FF00::/8\")]\n",
   "references": [
-    "https://developer.apple.com/library/archive/documentation/LanguagesUtilities/Conceptual/MacAutomationScriptingGuide/index.html"
+    "https://developer.apple.com/library/archive/documentation/LanguagesUtilities/Conceptual/MacAutomationScriptingGuide/index.html",
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
   ],
   "risk_score": 47,
   "rule_id": "47f76567-d58a-4fed-b32b-21f571e28910",
@@ -59,5 +60,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_snapshot_change_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_snapshot_change_activity.json
index 7c67a3f037538..f4d0877ca70b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_snapshot_change_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_snapshot_change_activity.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS EC2 Snapshot Activity",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:ModifySnapshotAttribute",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:ModifySnapshotAttribute\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/modify-snapshot-attribute.html",
     "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifySnapshotAttribute.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_vm_export_failure.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_vm_export_failure.json
new file mode 100644
index 0000000000000..2bf25435b84de
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_ec2_vm_export_failure.json
@@ -0,0 +1,70 @@
+{
+  "author": [
+    "Elastic",
+    "Austin Songer"
+  ],
+  "description": "Identifies an attempt to export an AWS EC2 instance. A virtual machine (VM) export may indicate an attempt to extract or exfiltrate information.",
+  "false_positives": [
+    "VM exports may be done by a system or network administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. VM exports from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+  ],
+  "from": "now-60m",
+  "index": [
+    "filebeat-*",
+    "logs-aws*"
+  ],
+  "interval": "10m",
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "AWS EC2 VM Export Failure",
+  "note": "## Config\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:CreateInstanceExportTask and event.outcome:failure\n",
+  "references": [
+    "https://docs.aws.amazon.com/vm-import/latest/userguide/vmexport.html#export-instance"
+  ],
+  "risk_score": 21,
+  "rule_id": "e919611d-6b6f-493b-8314-7ed6ac2e413b",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "AWS",
+    "Continuous Monitoring",
+    "SecOps",
+    "Asset Visibility"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0010",
+        "name": "Exfiltration",
+        "reference": "https://attack.mitre.org/tactics/TA0010/"
+      },
+      "technique": [
+        {
+          "id": "T1537",
+          "name": "Transfer Data to Cloud Account",
+          "reference": "https://attack.mitre.org/techniques/T1537/"
+        }
+      ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0009",
+        "name": "Collection",
+        "reference": "https://attack.mitre.org/tactics/TA0009/"
+      },
+      "technique": [
+        {
+          "id": "T1005",
+          "name": "Data from Local System",
+          "reference": "https://attack.mitre.org/techniques/T1005/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_gcp_logging_sink_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_gcp_logging_sink_modification.json
index ddff312a362ee..ac016370fe1c0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_gcp_logging_sink_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_gcp_logging_sink_modification.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Logging Sink Modification",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.UpdateSink and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.logging.v*.ConfigServiceV*.UpdateSink and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/logging/docs/export#how_sinks_work"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_creation.json
index ec9373352254b..a6a9e24ccb63a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_creation.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Transport Rule Creation",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-TransportRule\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-TransportRule\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/new-transportrule?view=exchange-ps",
     "https://docs.microsoft.com/en-us/exchange/security-and-compliance/mail-flow-rules/mail-flow-rules"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_mod.json
index 2503f679464f1..836ade6c0b80f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_microsoft_365_exchange_transport_rule_mod.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Transport Rule Modification",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-TransportRule\" or \"Disable-TransportRule\") and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-TransportRule\" or \"Disable-TransportRule\") and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-transportrule?view=exchange-ps",
     "https://docs.microsoft.com/en-us/powershell/module/exchange/disable-transportrule?view=exchange-ps",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/external_alerts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/external_alerts.json
index b97e868b21f55..fbcc6e757c66b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/external_alerts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/external_alerts.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "max_signals": 10000,
   "name": "External Alerts",
-  "query": "event.kind:alert and not event.module:(endgame or endpoint)",
+  "query": "event.kind:alert and not event.module:(endgame or endpoint)\n",
   "risk_score": 47,
   "risk_score_mapping": [
     {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
index ba84d38d7e4ee..e0a333d92c5aa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace Admin Role Deletion",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:DELETE_ROLE",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:DELETE_ROLE\n",
   "references": [
     "https://support.google.com/a/answer/2406043?hl=en"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
index 551133ed2a58d..b05edc0566614 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace MFA Enforcement Disabled",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ENFORCE_STRONG_AUTHENTICATION and gsuite.admin.new_value:false",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ENFORCE_STRONG_AUTHENTICATION and gsuite.admin.new_value:false\n",
   "references": [
     "https://support.google.com/a/answer/9176657?hl=en#"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
index 5893782912b35..58a409570f0db 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace Password Policy Modified",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:(CHANGE_APPLICATION_SETTING or CREATE_APPLICATION_SETTING) and gsuite.admin.setting.name:( \"Password Management - Enforce strong password\" or \"Password Management - Password reset frequency\" or \"Password Management - Enable password reuse\" or \"Password Management - Enforce password policy at next login\" or \"Password Management - Minimum password length\" or \"Password Management - Maximum password length\" )",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and\n  event.provider:admin and event.category:iam and\n  event.action:(CHANGE_APPLICATION_SETTING or CREATE_APPLICATION_SETTING) and\n  gsuite.admin.setting.name:(\n    \"Password Management - Enforce strong password\" or\n    \"Password Management - Password reset frequency\" or\n    \"Password Management - Enable password reuse\" or\n    \"Password Management - Enforce password policy at next login\" or\n    \"Password Management - Minimum password length\" or\n    \"Password Management - Maximum password length\"\n  )\n",
   "risk_score": 47,
   "rule_id": "a99f82f5-8e77-4f8b-b3ce-10c0f6afbc73",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_attempt_to_revoke_okta_api_token.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_attempt_to_revoke_okta_api_token.json
index aebda3bb268d1..ba55b3fc7a9bb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_attempt_to_revoke_okta_api_token.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_attempt_to_revoke_okta_api_token.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Revoke Okta API Token",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:system.api_token.revoke",
+  "query": "event.dataset:okta.system and event.action:system.api_token.revoke\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_azure_automation_runbook_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_azure_automation_runbook_deleted.json
index fb468ff8f6d7d..83fd544c51f13 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_azure_automation_runbook_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_azure_automation_runbook_deleted.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Automation Runbook Deleted",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://powerzure.readthedocs.io/en/latest/Functions/operational.html#create-backdoor",
     "https://github.com/hausec/PowerZure",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudtrail_logging_updated.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudtrail_logging_updated.json
index 9d1c0d3758a9d..196f54bfc174d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudtrail_logging_updated.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudtrail_logging_updated.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudTrail Log Updated",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:UpdateTrail and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:UpdateTrail and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_UpdateTrail.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/cloudtrail/update-trail.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_group_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_group_deletion.json
index 14f0419cb4073..f92d6ec44d655 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_group_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_group_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudWatch Log Group Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:logs.amazonaws.com and event.action:DeleteLogGroup and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:logs.amazonaws.com and event.action:DeleteLogGroup and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/logs/delete-log-group.html",
     "https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeleteLogGroup.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_stream_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_stream_deletion.json
index 6d37a106aa9ab..46ac2d19889f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_stream_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_cloudwatch_log_stream_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS CloudWatch Log Stream Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:logs.amazonaws.com and event.action:DeleteLogStream and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:logs.amazonaws.com and event.action:DeleteLogStream and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/logs/delete-log-stream.html",
     "https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeleteLogStream.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_ec2_disable_ebs_encryption.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_ec2_disable_ebs_encryption.json
index 94b1839dfc5dd..04f1adaee3edb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_ec2_disable_ebs_encryption.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_ec2_disable_ebs_encryption.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS EC2 Encryption Disabled",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:DisableEbsEncryptionByDefault and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:DisableEbsEncryptionByDefault and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/disable-ebs-encryption-by-default.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_iam_role_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_iam_role_deletion.json
index 5ed1aa4386de4..76901da74ce96 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_iam_role_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_iam_role_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP IAM Role Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteRole and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteRole and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/understanding-roles"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_deleted.json
index 134278f30abb6..e928a60c132f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_deleted.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Service Account Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteServiceAccount and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteServiceAccount and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/service-accounts"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_disabled.json
index a7750fc586729..6c205987eaf17 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_service_account_disabled.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Service Account Disabled",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DisableServiceAccount and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DisableServiceAccount and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/service-accounts"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_storage_bucket_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_storage_bucket_deleted.json
index c534dae963970..c3aa1523e4d1e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_storage_bucket_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_storage_bucket_deleted.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Storage Bucket Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.buckets.delete\"",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:\"storage.buckets.delete\"\n",
   "references": [
     "https://cloud.google.com/storage/docs/key-terms#buckets"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_network_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_network_deleted.json
index caad64c558863..2748a1f573e9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_network_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_network_deleted.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Virtual Private Cloud Network Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.networks.delete and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.networks.delete and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/vpc/docs/vpc"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_created.json
index 7e2090de29c62..ef4ee82058d32 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_created.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Virtual Private Cloud Route Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:(v*.compute.routes.insert or \"beta.compute.routes.insert\")",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:(v*.compute.routes.insert or \"beta.compute.routes.insert\")\n",
   "references": [
     "https://cloud.google.com/vpc/docs/routes",
     "https://cloud.google.com/vpc/docs/using-routes"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_deleted.json
index a8b8b12b60960..0d4f5591c9688 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_deleted.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_gcp_virtual_private_cloud_route_deleted.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Virtual Private Cloud Route Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.routes.delete and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:v*.compute.routes.delete and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/vpc/docs/routes",
     "https://cloud.google.com/vpc/docs/using-routes"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_deactivate_mfa_device.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_deactivate_mfa_device.json
index 7b77a414dd1e0..cb4f1a15cd337 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_deactivate_mfa_device.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_deactivate_mfa_device.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Deactivation of MFA Device",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:(DeactivateMFADevice or DeleteVirtualMFADevice) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:(DeactivateMFADevice or DeleteVirtualMFADevice) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/iam/deactivate-mfa-device.html",
     "https://docs.aws.amazon.com/IAM/latest/APIReference/API_DeactivateMFADevice.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_group_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_group_deletion.json
index 2c43b0560e660..e1f5fcbf4836e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_group_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_iam_group_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Group Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:DeleteGroup and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:DeleteGroup and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/iam/delete-group.html",
     "https://docs.aws.amazon.com/IAM/latest/APIReference/API_DeleteGroup.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_possible_okta_dos_attack.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_possible_okta_dos_attack.json
index 649c859de8184..7372eb0e0286b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_possible_okta_dos_attack.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_possible_okta_dos_attack.json
@@ -11,7 +11,7 @@
   "license": "Elastic License v2",
   "name": "Possible Okta DoS Attack",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:(application.integration.rate_limit_exceeded or system.org.rate_limit.warning or system.org.rate_limit.violation or core.concurrency.org.limit.violation)",
+  "query": "event.dataset:okta.system and event.action:(application.integration.rate_limit_exceeded or system.org.rate_limit.warning or system.org.rate_limit.violation or core.concurrency.org.limit.violation)\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
index 94837f665af75..08ae6ce11bbb5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS RDS Cluster Deletion",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-db-cluster.html",
     "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBCluster.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_stoppage.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_stoppage.json
index 065c39f8f676b..e35a0c145ac59 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_stoppage.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_stoppage.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS RDS Instance/Cluster Stoppage",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(StopDBCluster or StopDBInstance) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(StopDBCluster or StopDBInstance) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/stop-db-cluster.html",
     "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_StopDBCluster.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_resource_group_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_resource_group_deletion.json
index 221f1b1e46eb2..16153a832dcb9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_resource_group_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_resource_group_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Resource Group Deletion",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.RESOURCES/SUBSCRIPTIONS/RESOURCEGROUPS/DELETE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.RESOURCES/SUBSCRIPTIONS/RESOURCEGROUPS/DELETE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
index e910b1a10f586..dc3ca4ceed4c8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
@@ -544,7 +544,11 @@ import rule531 from './ml_spike_in_traffic_to_a_country.json';
 import rule532 from './command_and_control_tunneling_via_earthworm.json';
 import rule533 from './lateral_movement_evasion_rdp_shadowing.json';
 import rule534 from './threat_intel_module_match.json';
-import rule535 from './persistence_via_bits_job_notify_command.json';
+import rule535 from './exfiltration_ec2_vm_export_failure.json';
+import rule536 from './defense_evasion_suspicious_execution_from_mounted_device.json';
+import rule537 from './defense_evasion_unusual_network_connection_via_dllhost.json';
+import rule538 from './defense_evasion_amsienable_key_mod.json';
+import rule539 from './persistence_via_bits_job_notify_command.json';
 
 export const rawRules = [
   rule1,
@@ -1082,4 +1086,8 @@ export const rawRules = [
   rule533,
   rule534,
   rule535,
+  rule536,
+  rule537,
+  rule538,
+  rule539,
 ];
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_high_risk_signin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_high_risk_signin.json
index b18ab4090b1f8..008f6ac7b874c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_high_risk_signin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_high_risk_signin.json
@@ -13,7 +13,7 @@
   "license": "Elastic License v2",
   "name": "Azure Active Directory High Risk Sign-in",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.signinlogs and azure.signinlogs.properties.risk_level_during_signin:high and event.outcome:(success or Success)",
+  "query": "event.dataset:azure.signinlogs and\n  azure.signinlogs.properties.risk_level_during_signin:high and\n  event.outcome:(success or Success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/active-directory/conditional-access/howto-conditional-access-policy-risk",
     "https://docs.microsoft.com/en-us/azure/active-directory/identity-protection/overview-identity-protection",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_powershell_signin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_powershell_signin.json
index 7e77d851eac00..207d5534efd79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_powershell_signin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_azure_active_directory_powershell_signin.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure Active Directory PowerShell Sign-in",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.signinlogs and azure.signinlogs.properties.app_display_name:\"Azure Active Directory PowerShell\" and azure.signinlogs.properties.token_issuer_type:AzureAD and event.outcome:(success or Success)",
+  "query": "event.dataset:azure.signinlogs and\n  azure.signinlogs.properties.app_display_name:\"Azure Active Directory PowerShell\" and\n  azure.signinlogs.properties.token_issuer_type:AzureAD and event.outcome:(success or Success)\n",
   "references": [
     "https://msrc-blog.microsoft.com/2020/12/13/customer-guidance-on-recent-nation-state-cyber-attacks/",
     "https://docs.microsoft.com/en-us/microsoft-365/enterprise/connect-to-microsoft-365-powershell?view=o365-worldwide"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_consent_grant_attack_via_azure_registered_application.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_consent_grant_attack_via_azure_registered_application.json
index f73c30f55eb3a..45acc46fcd49d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_consent_grant_attack_via_azure_registered_application.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_consent_grant_attack_via_azure_registered_application.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Possible Consent Grant Attack via Azure-Registered Application",
   "note": "## Triage and analysis\n\n- In a consent grant attack, an attacker tricks an end user into granting a malicious application consent to access their data, usually via a phishing attack. After the malicious application has been granted consent, it has account-level access to data without the need for an organizational account.\n- Normal remediation steps, like resetting passwords for breached accounts or requiring Multi-Factor Authentication (MFA) on accounts, are not effective against this type of attack, since these are third-party applications and are external to the organization.\n- Security analysts should review the list of trusted applications for any suspicious items.\n\n\n## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(azure.activitylogs or azure.auditlogs or o365.audit) and ( azure.activitylogs.operation_name:\"Consent to application\" or azure.auditlogs.operation_name:\"Consent to application\" or o365.audit.Operation:\"Consent to application.\" ) and event.outcome:(Success or success)",
+  "query": "event.dataset:(azure.activitylogs or azure.auditlogs or o365.audit) and \n  (\n    azure.activitylogs.operation_name:\"Consent to application\" or\n    azure.auditlogs.operation_name:\"Consent to application\" or\n    o365.audit.Operation:\"Consent to application.\"\n  ) and\n  event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/detect-and-remediate-illicit-consent-grants?view=o365-worldwide"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_console_login_root.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_console_login_root.json
index 7d199f72a22bd..346f679b6c570 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_console_login_root.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_console_login_root.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS Management Console Root Login",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and aws.cloudtrail.user_identity.type:Root and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and aws.cloudtrail.user_identity.type:Root and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_external_guest_user_invite.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_external_guest_user_invite.json
index fa04b1f724ef7..70c3ea5de73f9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_external_guest_user_invite.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_external_guest_user_invite.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Azure External Guest User Invitation",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Invite external user\" and azure.auditlogs.properties.target_resources.*.display_name:guest and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Invite external user\" and azure.auditlogs.properties.target_resources.*.display_name:guest and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/governance/policy/samples/cis-azure-1-1-0"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_gcp_iam_custom_role_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_gcp_iam_custom_role_creation.json
index a823f162d405a..7cd94103c6395 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_gcp_iam_custom_role_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_gcp_iam_custom_role_creation.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP IAM Custom Role Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateRole and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateRole and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/understanding-custom-roles"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_failures.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_failures.json
index 92b9bf7dc8090..18a201e7638ef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_failures.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_failures.json
@@ -9,7 +9,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Auditd Max Failed Login Attempts",
-  "query": "event.module:auditd and event.action:\"failed-log-in-too-many-times-to\"",
+  "query": "event.module:auditd and event.action:\"failed-log-in-too-many-times-to\"\n",
   "references": [
     "https://github.com/linux-pam/linux-pam/blob/0adbaeb273da1d45213134aa271e95987103281c/modules/pam_faillock/pam_faillock.c#L574"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_location.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_location.json
index f762779103ee1..3224836eb927a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_location.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_location.json
@@ -9,7 +9,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Auditd Login from Forbidden Location",
-  "query": "event.module:auditd and event.action:\"attempted-log-in-from-unusual-place-to\"",
+  "query": "event.module:auditd and event.action:\"attempted-log-in-from-unusual-place-to\"\n",
   "references": [
     "https://github.com/linux-pam/linux-pam/blob/aac5a8fdc4aa3f7e56335a6343774cc1b63b408d/modules/pam_access/pam_access.c#L412"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_sessions.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_sessions.json
index 09c389033ca07..b7a51feb122a1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_sessions.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_sessions.json
@@ -9,7 +9,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Auditd Max Login Sessions",
-  "query": "event.module:auditd and event.action:\"opened-too-many-sessions-to\"",
+  "query": "event.module:auditd and event.action:\"opened-too-many-sessions-to\"\n",
   "references": [
     "https://github.com/linux-pam/linux-pam/blob/70c32cc6fca51338f92afa58eb75b1107a5c2430/modules/pam_limits/pam_limits.c#L1007"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_time.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_time.json
index 9eacbca79708a..f5ab15fb442f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_time.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_login_time.json
@@ -9,7 +9,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Auditd Login Attempt at Forbidden Time",
-  "query": "event.module:auditd and event.action:\"attempted-log-in-during-unusual-hour-to\"",
+  "query": "event.module:auditd and event.action:\"attempted-log-in-during-unusual-hour-to\"\n",
   "references": [
     "https://github.com/linux-pam/linux-pam/blob/aac5a8fdc4aa3f7e56335a6343774cc1b63b408d/modules/pam_time/pam_time.c#L666"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_policy_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_policy_deletion.json
index 46c771e5b5ede..d98c6d1fb2260 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_policy_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_policy_deletion.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Anti-Phish Policy Deletion",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-AntiPhishPolicy\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Remove-AntiPhishPolicy\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-antiphishpolicy?view=exchange-ps",
     "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/set-up-anti-phishing-policies?view=o365-worldwide"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_rule_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_rule_mod.json
index 471a010338085..554f5f80be246 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_rule_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_anti_phish_rule_mod.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Anti-Phish Rule Modification",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-AntiPhishRule\" or \"Disable-AntiPhishRule\") and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Remove-AntiPhishRule\" or \"Disable-AntiPhishRule\") and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-antiphishrule?view=exchange-ps",
     "https://docs.microsoft.com/en-us/powershell/module/exchange/disable-antiphishrule?view=exchange-ps"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_safelinks_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_safelinks_disabled.json
index d348d790f0c4e..0f936a91023f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_safelinks_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_exchange_safelinks_disabled.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Safe Link Policy Disabled",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Disable-SafeLinksRule\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Disable-SafeLinksRule\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/disable-safelinksrule?view=exchange-ps",
     "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/atp-safe-links?view=o365-worldwide"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_password_recovery.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_password_recovery.json
index fcbbcec5f06ac..9d0315ea692fb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_password_recovery.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_password_recovery.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Password Recovery Requested",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:PasswordRecoveryRequested and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:PasswordRecoveryRequested and event.outcome:success\n",
   "references": [
     "https://www.cadosecurity.com/2020/06/11/an-ongoing-aws-phishing-campaign/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_from_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_from_the_internet.json
index 81c011cda898a..8e7f8ea6a842b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_from_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_from_the_internet.json
@@ -12,7 +12,10 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "RPC (Remote Procedure Call) from the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:135 or event.dataset:zeek.dce_rpc) and not source.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" ) and destination.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:135 or event.dataset:zeek.dce_rpc) and\n  not source.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  ) and\n  destination.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  )\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 73,
   "rule_id": "143cb236-0956-4f42-a706-814bcaa0cf5a",
   "severity": "high",
@@ -42,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_to_the_internet.json
index 7d1a59886164a..5892bca71d5c9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_rpc_remote_procedure_call_to_the_internet.json
@@ -12,7 +12,10 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "RPC (Remote Procedure Call) to the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:135 or event.dataset:zeek.dce_rpc) and source.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 ) and not destination.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:135 or event.dataset:zeek.dce_rpc) and\n  source.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  ) and\n  not destination.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.0.0.0/24 or\n    192.0.0.0/29 or\n    192.0.0.8/32 or\n    192.0.0.9/32 or\n    192.0.0.10/32 or\n    192.0.0.170/32 or\n    192.0.0.171/32 or\n    192.0.2.0/24 or\n    192.31.196.0/24 or\n    192.52.193.0/24 or\n    192.168.0.0/16 or\n    192.88.99.0/24 or\n    224.0.0.0/4 or\n    100.64.0.0/10 or\n    192.175.48.0/24 or\n    198.18.0.0/15 or\n    198.51.100.0/24 or\n    203.0.113.0/24 or\n    240.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  )\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 73,
   "rule_id": "32923416-763a-4531-bb35-f33b9232ecdb",
   "severity": "high",
@@ -42,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_smb_windows_file_sharing_activity_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_smb_windows_file_sharing_activity_to_the_internet.json
index 60f488fe9d05f..b119dc0a4f211 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_smb_windows_file_sharing_activity_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_smb_windows_file_sharing_activity_to_the_internet.json
@@ -12,7 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "SMB (Windows File Sharing) Activity to the Internet",
-  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:(139 or 445) or event.dataset:zeek.smb) and source.ip:( 10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16 ) and not destination.ip:( 10.0.0.0/8 or 127.0.0.0/8 or 169.254.0.0/16 or 172.16.0.0/12 or 192.168.0.0/16 or 224.0.0.0/4 or \"::1\" or \"FE80::/10\" or \"FF00::/8\" )",
+  "query": "event.category:(network or network_traffic) and network.transport:tcp and (destination.port:(139 or 445) or event.dataset:zeek.smb) and\n  source.ip:(\n    10.0.0.0/8 or\n    172.16.0.0/12 or\n    192.168.0.0/16\n  ) and\n  not destination.ip:(\n    10.0.0.0/8 or\n    127.0.0.0/8 or\n    169.254.0.0/16 or\n    172.16.0.0/12 or\n    192.168.0.0/16 or\n    224.0.0.0/4 or\n    \"::1\" or\n    \"FE80::/10\" or\n    \"FF00::/8\"\n  )\n",
   "risk_score": 73,
   "rule_id": "c82b2bd8-d701-420c-ba43-f11a155b681a",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_activity_reported_by_okta_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_activity_reported_by_okta_user.json
index 03fb7e44b200d..abcc8d06444e0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_activity_reported_by_okta_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_activity_reported_by_okta_user.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Suspicious Activity Reported by Okta User",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.account.report_suspicious_activity_by_enduser",
+  "query": "event.dataset:okta.system and event.action:user.account.report_suspicious_activity_by_enduser\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_unsecure_elasticsearch_node.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_unsecure_elasticsearch_node.json
index 41ab4386c6817..965d4a7f62369 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_unsecure_elasticsearch_node.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_unsecure_elasticsearch_node.json
@@ -13,7 +13,7 @@
   "license": "Elastic License v2",
   "name": "Inbound Connection to an Unsecure Elasticsearch Node",
   "note": "## Config\n\nThis rule requires the addition of port `9200` and `send_all_headers` to the `HTTP` protocol configuration in `packetbeat.yml`. See the References section for additional configuration documentation.",
-  "query": "event.category:network_traffic AND network.protocol:http AND status:OK AND destination.port:9200 AND network.direction:inbound AND NOT http.response.headers.content-type:\"image/x-icon\" AND NOT _exists_:http.request.headers.authorization",
+  "query": "event.category:network_traffic AND network.protocol:http AND status:OK AND destination.port:9200 AND network.direction:inbound AND NOT http.response.headers.content-type:\"image/x-icon\" AND NOT _exists_:http.request.headers.authorization\n",
   "references": [
     "https://www.elastic.co/guide/en/elasticsearch/reference/current/configuring-security.html",
     "https://www.elastic.co/guide/en/beats/packetbeat/current/packetbeat-http-options.html#_send_all_headers"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_via_system_manager.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_via_system_manager.json
index 73370f48253a6..70fadcc29f648 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_via_system_manager.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_via_system_manager.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS Execution via System Manager",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ssm.amazonaws.com and event.action:SendCommand and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ssm.amazonaws.com and event.action:SendCommand and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-plugins.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_zoom_meeting_with_no_passcode.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_zoom_meeting_with_no_passcode.json
index 9ceb2d7143713..8c3ae88116a79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_zoom_meeting_with_no_passcode.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_zoom_meeting_with_no_passcode.json
@@ -10,7 +10,7 @@
   "license": "Elastic License v2",
   "name": "Zoom Meeting with no Passcode",
   "note": "## Config\n\nThe Zoom Filebeat module or similarly structured data is required to be compatible with this rule.",
-  "query": "event.type:creation and event.module:zoom and event.dataset:zoom.webhook and event.action:meeting.created and not zoom.meeting.password:*",
+  "query": "event.type:creation and event.module:zoom and event.dataset:zoom.webhook and\n  event.action:meeting.created and not zoom.meeting.password:*\n",
   "references": [
     "https://blog.zoom.us/a-message-to-our-users/",
     "https://www.fbi.gov/contact-us/field-offices/boston/news/press-releases/fbi-warns-of-teleconferencing-and-online-classroom-hijacking-during-covid-19-pandemic"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
index e8f28ffd5e4c6..82fa9d8d72a92 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Kerberos Attack via Bifrost",
-  "query": "event.category:process and event.type:start and process.args:(\"-action\" and (\"-kerberoast\" or askhash or asktgs or asktgt or s4u or (\"-ticket\" and ptt) or (dump and (tickets or keytab))))",
+  "query": "event.category:process and event.type:start and \n process.args:(\"-action\" and (\"-kerberoast\" or askhash or asktgs or asktgt or s4u or (\"-ticket\" and ptt) or (dump and (tickets or keytab))))\n",
   "references": [
     "https://github.com/its-a-feature/bifrost"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
index 51bf90ff1eaf0..b34badc7c8611 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Abnormally Large DNS Response",
   "note": "## Triage and analysis\n\n### Investigating Large DNS Responses\nDetection alerts from this rule indicate an attempt was made to exploit CVE-2020-1350 (SigRed) through the use of large DNS responses on a Windows DNS server. Here are some possible avenues of investigation:\n- Investigate any corresponding Intrusion Detection Signatures (IDS) alerts that can validate this detection alert.\n- Examine the `dns.question_type` network fieldset with a protocol analyzer, such as Zeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data.\n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale Internet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.",
-  "query": "event.category:(network or network_traffic) and destination.port:53 and (event.dataset:zeek.dns or type:dns or event.type:connection) and network.bytes > 60000",
+  "query": "event.category:(network or network_traffic) and destination.port:53 and\n  (event.dataset:zeek.dns or type:dns or event.type:connection) and network.bytes > 60000\n",
   "references": [
     "https://research.checkpoint.com/2020/resolving-your-way-into-domain-admin-exploiting-a-17-year-old-bug-in-windows-dns-servers/",
     "https://msrc-blog.microsoft.com/2020/07/14/july-2020-security-update-cve-2020-1350-vulnerability-in-windows-domain-name-system-dns-server/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_ssh_login_enabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_ssh_login_enabled.json
index 37fe1a6a99791..dc4d84d497097 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_ssh_login_enabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_ssh_login_enabled.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Remote SSH Login Enabled via systemsetup Command",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:systemsetup and process.args:(\"-setremotelogin\" and on)",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:systemsetup and\n process.args:(\"-setremotelogin\" and on)\n",
   "references": [
     "https://documents.trendmicro.com/assets/pdf/XCSSET_Technical_Brief.pdf",
     "https://ss64.com/osx/systemsetup.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
index 1c31fa440238a..73dca7c566421 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
@@ -14,7 +14,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Connection to External Network via Telnet",
-  "query": "sequence by process.entity_id\n  [process where process.name == \"telnet\" and event.type == \"start\"]\n  [network where process.name == \"telnet\" and\n    not cidrmatch(destination.ip, \"127.0.0.0/8\", \"10.0.0.0/8\", \"172.16.0.0/12\",\n                                  \"192.168.0.0/16\", \"FE80::/10\", \"::1/128\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name == \"telnet\" and event.type == \"start\"]\n  [network where process.name == \"telnet\" and\n    not cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n                                  \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\",\n                                  \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\",\n                                  \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n                                  \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n                                  \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 47,
   "rule_id": "e19e64ee-130e-4c07-961f-8a339f0b8362",
   "severity": "medium",
@@ -43,5 +46,5 @@
     }
   ],
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
index 9b4a031aa1609..31ca15c44a8bb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
@@ -14,7 +14,10 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Connection to Internal Network via Telnet",
-  "query": "sequence by process.entity_id\n  [process where process.name == \"telnet\" and event.type == \"start\"]\n  [network where process.name == \"telnet\" and\n    cidrmatch(destination.ip, \"10.0.0.0/8\", \"172.16.0.0/12\", \"192.168.0.0/16\", \"FE80::/10\") and\n    not cidrmatch(destination.ip, \"127.0.0.0/8\", \"::1/128\")]\n",
+  "query": "sequence by process.entity_id\n  [process where process.name == \"telnet\" and event.type == \"start\"]\n  [network where process.name == \"telnet\" and\n    cidrmatch(destination.ip, \"10.0.0.0/8\", \"127.0.0.0/8\", \"169.254.0.0/16\", \"172.16.0.0/12\", \"192.0.0.0/24\",\n                              \"192.0.0.0/29\", \"192.0.0.8/32\", \"192.0.0.9/32\", \"192.0.0.10/32\", \"192.0.0.170/32\",\n                              \"192.0.0.171/32\", \"192.0.2.0/24\", \"192.31.196.0/24\", \"192.52.193.0/24\",\n                              \"192.168.0.0/16\", \"192.88.99.0/24\", \"224.0.0.0/4\", \"100.64.0.0/10\", \"192.175.48.0/24\",\n                              \"198.18.0.0/15\", \"198.51.100.0/24\", \"203.0.113.0/24\", \"240.0.0.0/4\", \"::1\",\n                              \"FE80::/10\", \"FF00::/8\")]\n",
+  "references": [
+    "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+  ],
   "risk_score": 47,
   "rule_id": "1b21abcc-4d9f-4b08-a7f5-316f5f94b973",
   "severity": "medium",
@@ -43,5 +46,5 @@
     }
   ],
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
index a706d2a117e7b..3a91b205e9da3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Hping Process Activity",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(hping or hping2 or hping3)",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:(hping or hping2 or hping3)\n",
   "references": [
     "https://en.wikipedia.org/wiki/Hping"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
index cbd8c14052fee..d092c64098648 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential DNS Tunneling via Iodine",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(iodine or iodined)",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:(iodine or iodined)\n",
   "references": [
     "https://code.kryo.se/iodine/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
index 94c37610abf2e..c9898b7414c09 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Nping Process Activity",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:nping",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:nping\n",
   "references": [
     "https://en.wikipedia.org/wiki/Nmap"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
index 7b3c8af056f18..8b71c053fc6d6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Unusual Process Execution - Temp",
-  "query": "event.category:process and event.type:(start or process_started) and process.working_directory:/tmp",
+  "query": "event.category:process and event.type:(start or process_started) and process.working_directory:/tmp\n",
   "risk_score": 47,
   "rule_id": "df959768-b0c9-4d45-988c-5606a2be8e5a",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
index d14db4869a8f7..210a71ced9222 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Strace Process Activity",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:strace",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:strace\n",
   "references": [
     "https://en.wikipedia.org/wiki/Strace"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
index b393fa13db8c7..db8ea7369d456 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "MFA Disabled for Google Workspace Organization",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:(ENFORCE_STRONG_AUTHENTICATION or ALLOW_STRONG_AUTHENTICATION) and gsuite.admin.new_value:false",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:(ENFORCE_STRONG_AUTHENTICATION or ALLOW_STRONG_AUTHENTICATION) and gsuite.admin.new_value:false\n",
   "risk_score": 47,
   "rule_id": "e555105c-ba6d-481f-82bb-9b633e7b4827",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_exchange_dkim_signing_config_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_exchange_dkim_signing_config_disabled.json
index 280d40537e448..6933a81a22944 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_exchange_dkim_signing_config_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_exchange_dkim_signing_config_disabled.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange DKIM Signing Configuration Disabled",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Set-DkimSigningConfig\" and o365.audit.Parameters.Enabled:False and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"Set-DkimSigningConfig\" and o365.audit.Parameters.Enabled:False and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/set-dkimsigningconfig?view=exchange-ps"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_teams_custom_app_interaction_allowed.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_teams_custom_app_interaction_allowed.json
index cb87e9f7cb257..add3495d03271 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_teams_custom_app_interaction_allowed.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/microsoft_365_teams_custom_app_interaction_allowed.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Teams Custom Application Interaction Allowed",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:MicrosoftTeams and event.category:web and event.action:TeamsTenantSettingChanged and o365.audit.Name:\"Allow sideloading and interaction of custom apps\" and o365.audit.NewValue:True and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:MicrosoftTeams and\nevent.category:web and event.action:TeamsTenantSettingChanged and\no365.audit.Name:\"Allow sideloading and interaction of custom apps\" and\no365.audit.NewValue:True and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/deploy-and-publish/apps-upload"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_denies.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_denies.json
index 7856d13b8d66f..f0d999476bb42 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_denies.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_denies.json
@@ -9,8 +9,8 @@
   ],
   "from": "now-30m",
   "interval": "15m",
-  "license": "Elastic License",
-  "machine_learning_job_id": "high-count-network-denies",
+  "license": "Elastic License v2",
+  "machine_learning_job_id": "high_count_network_denies",
   "name": "Spike in Firewall Denies",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_events.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_events.json
index 14aec268cc13b..39ded30776bad 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_events.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_high_count_network_events.json
@@ -9,8 +9,8 @@
   ],
   "from": "now-30m",
   "interval": "15m",
-  "license": "Elastic License",
-  "machine_learning_job_id": "high-count-network-events",
+  "license": "Elastic License v2",
+  "machine_learning_job_id": "high_count_network_events",
   "name": "Spike in Network Traffic",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_process.json
index 1c886d0457afc..a2638f60d7495 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_process.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "linux_rare_metadata_process",
+  "machine_learning_job_id": [
+    "linux_rare_metadata_process",
+    "v2_linux_rare_metadata_process"
+  ],
   "name": "Unusual Linux Process Calling the Metadata Service",
   "risk_score": 21,
   "rule_id": "9d302377-d226-4e12-b54c-1906b5aec4f6",
@@ -23,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_user.json
index 984060951b3c5..c176bf0d7ad68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_metadata_user.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "linux_rare_metadata_user",
+  "machine_learning_job_id": [
+    "linux_rare_metadata_user",
+    "v2_linux_rare_metadata_user"
+  ],
   "name": "Unusual Linux User Calling the Metadata Service",
   "risk_score": 21,
   "rule_id": "1faec04b-d902-4f89-8aff-92cd9043c16f",
@@ -23,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_network_port_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_network_port_activity.json
index c56235774c077..eb6a960702ac7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_network_port_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_network_port_activity.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "linux_anomalous_network_port_activity_ecs",
+  "machine_learning_job_id": [
+    "linux_anomalous_network_port_activity_ecs",
+    "v2_linux_anomalous_network_port_activity_ecs"
+  ],
   "name": "Unusual Linux Network Port Activity",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -26,5 +29,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_process_all_hosts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_process_all_hosts.json
index 9243389de0d97..bab02f0a6aa24 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_process_all_hosts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_process_all_hosts.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "linux_anomalous_process_all_hosts_ecs",
+  "machine_learning_job_id": [
+    "linux_anomalous_process_all_hosts_ecs",
+    "v2_linux_anomalous_process_all_hosts_ecs"
+  ],
   "name": "Anomalous Process For a Linux Population",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Linux Process\nDetection alerts from this rule indicate the presence of a Linux process that is rare and unusual for all of the monitored Linux hosts for which Auditbeat data is available. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process manifested only very recently, it might be part of a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process arguments, title and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_user_name.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_user_name.json
index e77247dc0e931..4eb10707e0eb2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_user_name.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_linux_anomalous_user_name.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "linux_anomalous_user_name_ecs",
+  "machine_learning_job_id": [
+    "linux_anomalous_user_name_ecs",
+    "v2_linux_anomalous_user_name_ecs"
+  ],
   "name": "Unusual Linux Username",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Linux User\nDetection alerts from this rule indicate activity for a Linux user name that is rare and unusual. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host? Could this be related to troubleshooting or debugging activity by a developer or site reliability engineer?\n- Examine the history of user activity. If this user manifested only very recently, it might be a service account for a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process arguments, title and working directory. These may provide indications as to the source of the program or the nature of the tasks that the user is performing.",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_destination_country.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_destination_country.json
index 571c7e0d0d32c..8c8b7ffbd12ff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_destination_country.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_destination_country.json
@@ -9,8 +9,8 @@
   ],
   "from": "now-30m",
   "interval": "15m",
-  "license": "Elastic License",
-  "machine_learning_job_id": "rare-destination-country",
+  "license": "Elastic License v2",
+  "machine_learning_job_id": "rare_destination_country",
   "name": "Network Traffic to Rare Destination Country",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_linux.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_linux.json
index 11f6c2605f6ad..934a5e598629b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_linux.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_linux.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "rare_process_by_host_linux_ecs",
+  "machine_learning_job_id": [
+    "rare_process_by_host_linux_ecs",
+    "v2_rare_process_by_host_linux_ecs"
+  ],
   "name": "Unusual Process For a Linux Host",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Linux Process\nDetection alerts from this rule indicate the presence of a Linux process that is rare and unusual for the host it ran on. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process manifested only very recently, it might be part of a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process arguments, title and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
index 72db8ff93d4d4..3373f51b69db0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "rare_process_by_host_windows_ecs",
+  "machine_learning_job_id": [
+    "rare_process_by_host_windows_ecs",
+    "v2_rare_process_by_host_windows_ecs"
+  ],
   "name": "Unusual Process For a Windows Host",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Windows Process\nDetection alerts from this rule indicate the presence of a Windows process that is rare and unusual for the host it ran on. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process manifested only very recently, it might be part of a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process metadata like the values of the Company, Description and Product fields which may indicate whether the program is associated with an expected software vendor or package.\n- Examine arguments and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.\n- If you have file hash values in the event data, and you suspect malware, you can optionally run a search for the file hash to see if the file is identified as malware by anti-malware tools. ",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_spike_in_traffic_to_a_country.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_spike_in_traffic_to_a_country.json
index e1e571bbd1c99..1b6c71ed0b0bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_spike_in_traffic_to_a_country.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_spike_in_traffic_to_a_country.json
@@ -9,8 +9,8 @@
   ],
   "from": "now-30m",
   "interval": "15m",
-  "license": "Elastic License",
-  "machine_learning_job_id": "high-count-by-destination-country",
+  "license": "Elastic License v2",
+  "machine_learning_job_id": "high_count_by_destination_country",
   "name": "Spike in Network Traffic To a Country",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_process.json
index d19897057497c..deaf07a77c7be 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_process.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_rare_metadata_process",
+  "machine_learning_job_id": [
+    "windows_rare_metadata_process",
+    "v2_windows_rare_metadata_process"
+  ],
   "name": "Unusual Windows Process Calling the Metadata Service",
   "risk_score": 21,
   "rule_id": "abae61a8-c560-4dbd-acca-1e1438bff36b",
@@ -23,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_user.json
index 27f100c4e65b8..31e078b795256 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_metadata_user.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_rare_metadata_user",
+  "machine_learning_job_id": [
+    "windows_rare_metadata_user",
+    "v2_windows_rare_metadata_user"
+  ],
   "name": "Unusual Windows User Calling the Metadata Service",
   "risk_score": 21,
   "rule_id": "df197323-72a8-46a9-a08e-3f5b04a4a97a",
@@ -23,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_network_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_network_activity.json
index 5e3d5757b160d..dbee5dd256873 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_network_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_network_activity.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_anomalous_network_activity_ecs",
+  "machine_learning_job_id": [
+    "windows_anomalous_network_activity_ecs",
+    "v2_windows_anomalous_network_activity_ecs"
+  ],
   "name": "Unusual Windows Network Activity",
   "note": "## Triage and analysis\n\n### Investigating Unusual Network Activity\nDetection alerts from this rule indicate the presence of network activity from a Windows process for which network activity is very unusual.  Here are some possible avenues of investigation:\n- Consider the IP addresses, protocol and ports. Are these used by normal but infrequent network workflows? Are they expected or unexpected?\n- If the destination IP address is remote or external, does it associate with an expected domain, organization or geography? Note: avoid interacting directly with suspected malicious IP addresses.\n- Consider the user as identified by the username field. Is this network activity part of an expected workflow for the user who ran the program?\n- Examine the history of execution. If this process manifested only very recently, it might be part of a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process arguments, title and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.\n- If you have file hash values in the event data, and you suspect malware, you can optionally run a search for the file hash to see if the file is identified as malware by anti-malware tools.",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_path_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_path_activity.json
index 93a33e41e6ce9..782a80c53f9b3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_path_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_path_activity.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_anomalous_path_activity_ecs",
+  "machine_learning_job_id": [
+    "windows_anomalous_path_activity_ecs",
+    "v2_windows_anomalous_path_activity_ecs"
+  ],
   "name": "Unusual Windows Path Activity",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -26,5 +29,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_all_hosts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_all_hosts.json
index b73637c1a7cdf..09acb2121fd5c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_all_hosts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_all_hosts.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_anomalous_process_all_hosts_ecs",
+  "machine_learning_job_id": [
+    "windows_anomalous_process_all_hosts_ecs",
+    "v2_windows_anomalous_process_all_hosts_ecs"
+  ],
   "name": "Anomalous Process For a Windows Population",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Windows Process\nDetection alerts from this rule indicate the presence of a Windows process that is rare and unusual for all of the Windows hosts for which Winlogbeat data is available. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process manifested only very recently, it might be part of a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process metadata like the values of the Company, Description and Product fields which may indicate whether the program is associated with an expected software vendor or package.\n- Examine arguments and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.\n- If you have file hash values in the event data, and you suspect malware, you can optionally run a search for the file hash to see if the file is identified as malware by anti-malware tools. ",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_creation.json
index 7b3a028f1b371..cfe9e7ff1eaa3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_process_creation.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_anomalous_process_creation",
+  "machine_learning_job_id": [
+    "windows_anomalous_process_creation",
+    "v2_windows_anomalous_process_creation"
+  ],
   "name": "Anomalous Windows Process Creation",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
@@ -26,5 +29,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_user_name.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_user_name.json
index d3cbc34bd1a3d..b2183c8ff66c3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_user_name.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_windows_anomalous_user_name.json
@@ -10,7 +10,10 @@
   "from": "now-45m",
   "interval": "15m",
   "license": "Elastic License v2",
-  "machine_learning_job_id": "windows_anomalous_user_name_ecs",
+  "machine_learning_job_id": [
+    "windows_anomalous_user_name_ecs",
+    "v2_windows_anomalous_user_name_ecs"
+  ],
   "name": "Unusual Windows Username",
   "note": "## Triage and analysis\n\n### Investigating an Unusual Windows User\nDetection alerts from this rule indicate activity for a Windows user name that is rare and unusual. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host? Could this be related to occasional troubleshooting or support activity?\n- Examine the history of user activity. If this user manifested only very recently, it might be a service account for a new software package. If it has a consistent cadence - for example if it runs monthly or quarterly - it might be part of a monthly or quarterly business process.\n- Examine the process arguments, title and working directory. These may provide indications as to the source of the program or the nature of the tasks that the user is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.",
   "references": [
@@ -27,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/notice.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/notice.ts
index cad41391e2b42..86d95c1e021b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/notice.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/notice.ts
@@ -2,17 +2,17 @@
 
 /* @notice
  * Detection Rules
- * Copyright 2020 Elasticsearch B.V.
+ * Copyright 2021 Elasticsearch B.V.
  *
  * ---
  * This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
- * which is available under a "MIT" license. The files based on this license are:
+ * which is available under a "MIT" license. The rules based on this license are:
  *
- * - defense_evasion_via_filter_manager
- * - discovery_process_discovery_via_tasklist_command
- * - persistence_priv_escalation_via_accessibility_features
- * - persistence_via_application_shimming
- * - defense_evasion_execution_via_trusted_developer_utilities
+ * - "Potential Evasion via Filter Manager" (06dceabf-adca-48af-ac79-ffdf4c3b1e9a)
+ * - "Process Discovery via Tasklist" (cc16f774-59f9-462d-8b98-d27ccd4519ec)
+ * - "Potential Modification of Accessibility Binaries" (7405ddf1-6c8e-41ce-818f-48bea6bcaed8)
+ * - "Potential Application Shimming via Sdbinst" (fd4a992d-6130-4802-9ff8-829b89ae801f)
+ * - "Trusted Developer Application Usage" (9d110cb3-5f4b-4c9a-b9f5-53f0a1707ae1)
  *
  * MIT License
  *
@@ -38,9 +38,9 @@
  *
  * ---
  * This product bundles rules based on https://github.com/FSecureLABS/leonidas
- * which is available under a "MIT" license. The files based on this license are:
+ * which is available under a "MIT" license. The rules based on this license are:
  *
- * - credential_access_secretsmanager_getsecretvalue.toml
+ * - "AWS Access Secret in Secrets Manager" (a00681e3-9ed6-447c-ab2c-be648821c622)
  *
  * MIT License
  *
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_application.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_application.json
index bb4cdc6ded201..2c3512fb2ad77 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_application.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_application.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Deactivate an Okta Application",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:application.lifecycle.deactivate",
+  "query": "event.dataset:okta.system and event.action:application.lifecycle.deactivate\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Apps/Apps_Apps.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy.json
index 54dd1f0741488..45605a297987b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Deactivate an Okta Policy",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.lifecycle.deactivate",
+  "query": "event.dataset:okta.system and event.action:policy.lifecycle.deactivate\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/Security_Policies.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy_rule.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy_rule.json
index 495404ac9e108..ba25dde279426 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy_rule.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_deactivate_okta_policy_rule.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Deactivate an Okta Policy Rule",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.rule.deactivate",
+  "query": "event.dataset:okta.system and event.action:policy.rule.deactivate\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/Security_Policies.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_application.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_application.json
index 950964c81458a..4f18d2496e874 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_application.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_application.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Delete an Okta Application",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:application.lifecycle.delete",
+  "query": "event.dataset:okta.system and event.action:application.lifecycle.delete\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy.json
index 43b146b1377b7..47660e2d5d73e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Delete an Okta Policy",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.lifecycle.delete",
+  "query": "event.dataset:okta.system and event.action:policy.lifecycle.delete\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/Security_Policies.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy_rule.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy_rule.json
index 3e32480d958ea..d865bda9c3a6f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy_rule.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_delete_okta_policy_rule.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Delete an Okta Policy Rule",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.rule.delete",
+  "query": "event.dataset:okta.system and event.action:policy.rule.delete\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/Security_Policies.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_application.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_application.json
index 47c0c836348d6..3c0524749eed9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_application.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_application.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Modify an Okta Application",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:application.lifecycle.update",
+  "query": "event.dataset:okta.system and event.action:application.lifecycle.update\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Apps/Apps_Apps.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_network_zone.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_network_zone.json
index 05e48c9175daf..de94a52a4caa4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_network_zone.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_network_zone.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Modify an Okta Network Zone",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:(zone.update or network_zone.rule.disabled or zone.remove_blacklist)",
+  "query": "event.dataset:okta.system and event.action:(zone.update or network_zone.rule.disabled or zone.remove_blacklist)\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/network/network-zones.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy.json
index 78451913b110a..768d69341e71a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Modify an Okta Policy",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.lifecycle.update",
+  "query": "event.dataset:okta.system and event.action:policy.lifecycle.update\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy_rule.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy_rule.json
index 3d89183e4a921..cae49f5789b29 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy_rule.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_okta_policy_rule.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Modify an Okta Policy Rule",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:policy.rule.update",
+  "query": "event.dataset:okta.system and event.action:policy.rule.update\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/Security_Policies.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_or_delete_application_sign_on_policy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_or_delete_application_sign_on_policy.json
index ce68423ffa4a4..20e52ad1aca7b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_or_delete_application_sign_on_policy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_attempt_to_modify_or_delete_application_sign_on_policy.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Modification or Removal of an Okta Application Sign-On Policy",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:(application.policy.sign_on.update or application.policy.sign_on.rule.delete)",
+  "query": "event.dataset:okta.system and event.action:(application.policy.sign_on.update or application.policy.sign_on.rule.delete)\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/App_Based_Signon.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_threat_detected_by_okta_threatinsight.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_threat_detected_by_okta_threatinsight.json
index 51be6cc2aba45..c2225b53e30b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_threat_detected_by_okta_threatinsight.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/okta_threat_detected_by_okta_threatinsight.json
@@ -11,7 +11,7 @@
   "license": "Elastic License v2",
   "name": "Threat Detected by Okta ThreatInsight",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:security.threat.detected",
+  "query": "event.dataset:okta.system and event.action:security.threat.detected\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_account_creation_hide_at_logon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_account_creation_hide_at_logon.json
index faf309fac1365..dc8a5ba10fa00 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_account_creation_hide_at_logon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_account_creation_hide_at_logon.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Hidden Local User Account Creation",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:dscl and process.args:(IsHidden and create and (true or 1 or yes))",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:dscl and process.args:(IsHidden and create and (true or 1 or yes))\n",
   "references": [
     "https://support.apple.com/en-us/HT203998"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_privileges_assigned_to_okta_group.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_privileges_assigned_to_okta_group.json
index 2284e08ba0caa..071fb643083a1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_privileges_assigned_to_okta_group.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_privileges_assigned_to_okta_group.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Administrator Privileges Assigned to an Okta Group",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:group.privilege.grant",
+  "query": "event.dataset:okta.system and event.action:group.privilege.grant\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/administrators-admin-comparison.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_role_assigned_to_okta_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_role_assigned_to_okta_user.json
index 8aa425e4faac6..eccd892913023 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_role_assigned_to_okta_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_administrator_role_assigned_to_okta_user.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Administrator Role Assigned to an Okta User",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.account.privilege.grant",
+  "query": "event.dataset:okta.system and event.action:user.account.privilege.grant\n",
   "references": [
     "https://help.okta.com/en/prod/Content/Topics/Security/administrators-admin-comparison.htm",
     "https://developer.okta.com/docs/reference/api/system-log/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_create_okta_api_token.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_create_okta_api_token.json
index df234db46fed2..02cc638a7ce0d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_create_okta_api_token.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_create_okta_api_token.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Create Okta API Token",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:system.api_token.create",
+  "query": "event.dataset:okta.system and event.action:system.api_token.create\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_deactivate_mfa_for_okta_user_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_deactivate_mfa_for_okta_user_account.json
index df70b91b8c8a0..29d604a2953ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_deactivate_mfa_for_okta_user_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_deactivate_mfa_for_okta_user_account.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Deactivate MFA for an Okta User Account",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.mfa.factor.deactivate",
+  "query": "event.dataset:okta.system and event.action:user.mfa.factor.deactivate\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_reset_mfa_factors_for_okta_user_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_reset_mfa_factors_for_okta_user_account.json
index a9bbbca91e2b7..2a2f5acfcc114 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_reset_mfa_factors_for_okta_user_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_attempt_to_reset_mfa_factors_for_okta_user_account.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Attempt to Reset MFA Factors for an Okta User Account",
   "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:okta.system and event.action:user.mfa.factor.reset_all",
+  "query": "event.dataset:okta.system and event.action:user.mfa.factor.reset_all\n",
   "references": [
     "https://developer.okta.com/docs/reference/api/system-log/",
     "https://developer.okta.com/docs/reference/api/event-types/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_account_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_account_created.json
index 5ec70f2970d28..bdae2f42bd04e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_account_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_account_created.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Automation Account Created",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WRITE\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WRITE\" and event.outcome:(Success or success)\n",
   "references": [
     "https://powerzure.readthedocs.io/en/latest/Functions/operational.html#create-backdoor",
     "https://github.com/hausec/PowerZure",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_runbook_created_or_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_runbook_created_or_modified.json
index f7ef529895222..0c6a82d37701b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_runbook_created_or_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_runbook_created_or_modified.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Automation Runbook Created or Modified",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name: ( \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/DRAFT/WRITE\" or \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/WRITE\" or \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/PUBLISH/ACTION\" ) and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and\n  azure.activitylogs.operation_name:\n  (\n    \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/DRAFT/WRITE\" or\n    \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/WRITE\" or\n    \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/RUNBOOKS/PUBLISH/ACTION\"\n  ) and\n  event.outcome:(Success or success)\n",
   "references": [
     "https://powerzure.readthedocs.io/en/latest/Functions/operational.html#create-backdoor",
     "https://github.com/hausec/PowerZure",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_webhook_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_webhook_created.json
index e77d1f91747e7..2b8110b8e7d54 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_webhook_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_automation_webhook_created.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Automation Webhook Created",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name: ( \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WEBHOOKS/ACTION\" or \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WEBHOOKS/WRITE\" ) and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.activitylogs and\n  azure.activitylogs.operation_name:\n    (\n      \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WEBHOOKS/ACTION\" or\n      \"MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/WEBHOOKS/WRITE\"\n    ) and\n  event.outcome:(Success or success)\n",
   "references": [
     "https://powerzure.readthedocs.io/en/latest/Functions/operational.html#create-backdoor",
     "https://github.com/hausec/PowerZure",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_conditional_access_policy_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_conditional_access_policy_modified.json
index 00826c3d6162e..700ae78685257 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_conditional_access_policy_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_conditional_access_policy_modified.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Conditional Access Policy Modified",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(azure.activitylogs or azure.auditlogs) and ( azure.activitylogs.operation_name:\"Update policy\" or azure.auditlogs.operation_name:\"Update policy\" ) and event.outcome:(Success or success)",
+  "query": "event.dataset:(azure.activitylogs or azure.auditlogs) and\n  (\n    azure.activitylogs.operation_name:\"Update policy\" or\n    azure.auditlogs.operation_name:\"Update policy\"\n  ) and\n  event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/active-directory/conditional-access/overview"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_pim_user_added_global_admin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_pim_user_added_global_admin.json
index 1d5332beed4f6..4ee9f8074985b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_pim_user_added_global_admin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_pim_user_added_global_admin.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "Azure Global Administrator Role Addition to PIM User",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.properties.category:RoleManagement and azure.auditlogs.operation_name:(\"Add eligible member to role in PIM completed (permanent)\" or \"Add member to role in PIM completed (timebound)\") and azure.auditlogs.properties.target_resources.*.display_name:\"Global Administrator\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.properties.category:RoleManagement and\n    azure.auditlogs.operation_name:(\"Add eligible member to role in PIM completed (permanent)\" or\n                                    \"Add member to role in PIM completed (timebound)\") and\n    azure.auditlogs.properties.target_resources.*.display_name:\"Global Administrator\" and\n    event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/active-directory/users-groups-roles/directory-assign-admin-roles"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_privileged_identity_management_role_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_privileged_identity_management_role_modified.json
index 0a75c0feaa516..214100ffced5c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_privileged_identity_management_role_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_azure_privileged_identity_management_role_modified.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Azure Privilege Identity Management Role Modified",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Update role setting in PIM\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Update role setting in PIM\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/active-directory/privileged-identity-management/pim-resource-roles-assign-roles",
     "https://docs.microsoft.com/en-us/azure/active-directory/privileged-identity-management/pim-configure"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_authorization_plugin_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_authorization_plugin_creation.json
index 3df0e48eb5ee3..d66066bca644e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_authorization_plugin_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_authorization_plugin_creation.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Authorization Plugin Modification",
-  "query": "event.category:file and not event.type:deletion and file.path:(/Library/Security/SecurityAgentPlugins/* and not /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle/Contents/*)",
+  "query": "event.category:file and not event.type:deletion and\n  file.path:(/Library/Security/SecurityAgentPlugins/* and\n  not /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle/Contents/*)\n",
   "references": [
     "https://developer.apple.com/documentation/security/authorization_plug-ins",
     "https://www.xorrior.com/persistent-credential-theft/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_auth_module_or_config.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_auth_module_or_config.json
index e1d8c05438b81..31e52590e22e0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_auth_module_or_config.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_auth_module_or_config.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Modification of Standard Authentication Module or Configuration",
-  "query": "event.category:file and event.type:change and (file.name:pam_*.so or file.path:(/etc/pam.d/* or /private/etc/pam.d/*)) and process.executable: (* and not ( /bin/yum or \"/usr/sbin/pam-auth-update\" or /usr/libexec/packagekitd or /usr/bin/dpkg or /usr/bin/vim or /usr/libexec/xpcproxy or /usr/bin/bsdtar or /usr/local/bin/brew or /usr/bin/rsync or /usr/bin/yum or /var/lib/docker/*/bin/yum or /var/lib/docker/*/bin/dpkg or ./merged/var/lib/docker/*/bin/dpkg or \"/System/Library/PrivateFrameworks/PackageKit.framework/Versions/A/XPCServices/package_script_service.xpc/Contents/MacOS/package_script_service\" ) ) and not file.path: ( /tmp/snap.rootfs_*/pam_*.so or /tmp/newroot/lib/*/pam_*.so or /private/var/folders/*/T/com.apple.fileprovider.ArchiveService/TemporaryItems/*/lib/security/pam_*.so or /tmp/newroot/usr/lib64/security/pam_*.so )",
+  "query": "event.category:file and event.type:change and \n  (file.name:pam_*.so or file.path:(/etc/pam.d/* or /private/etc/pam.d/*)) and \n  process.executable:\n    (* and \n      not \n      (\n        /bin/yum or \n        \"/usr/sbin/pam-auth-update\" or \n        /usr/libexec/packagekitd or \n        /usr/bin/dpkg or \n        /usr/bin/vim or \n        /usr/libexec/xpcproxy or \n        /usr/bin/bsdtar or \n        /usr/local/bin/brew or\n        /usr/bin/rsync or\n        /usr/bin/yum or\n        /var/lib/docker/*/bin/yum or\n        /var/lib/docker/*/bin/dpkg or\n        ./merged/var/lib/docker/*/bin/dpkg or\n        \"/System/Library/PrivateFrameworks/PackageKit.framework/Versions/A/XPCServices/package_script_service.xpc/Contents/MacOS/package_script_service\"\n      )\n    ) and\n  not file.path:\n         (\n           /tmp/snap.rootfs_*/pam_*.so or\n           /tmp/newroot/lib/*/pam_*.so or\n           /private/var/folders/*/T/com.apple.fileprovider.ArchiveService/TemporaryItems/*/lib/security/pam_*.so or\n           /tmp/newroot/usr/lib64/security/pam_*.so\n         )\n",
   "references": [
     "https://github.com/zephrax/linux-pam-backdoor",
     "https://github.com/eurialo/pambd",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_ssh_binaries.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_ssh_binaries.json
index e9f4aeea01129..46414c400ab8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_ssh_binaries.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_credential_access_modify_ssh_binaries.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Modification of OpenSSH Binaries",
-  "query": "event.category:file and event.type:change and process.name:* and (file.path:(/usr/sbin/sshd or /usr/bin/ssh or /usr/bin/sftp or /usr/bin/scp) or file.name:libkeyutils.so) and not process.executable:/usr/bin/dpkg",
+  "query": "event.category:file and event.type:change and \n process.name:* and\n (file.path:(/usr/sbin/sshd or /usr/bin/ssh or /usr/bin/sftp or /usr/bin/scp) or file.name:libkeyutils.so) and\n not process.executable:/usr/bin/dpkg\n",
   "references": [
     "https://blog.angelalonso.es/2016/09/anatomy-of-real-linux-intrusion-part-ii.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_defense_evasion_hidden_launch_agent_deamon_logonitem_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_defense_evasion_hidden_launch_agent_deamon_logonitem_process.json
index 9778691f1d2f3..7ff8f12e60011 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_defense_evasion_hidden_launch_agent_deamon_logonitem_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_defense_evasion_hidden_launch_agent_deamon_logonitem_process.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Suspicious Hidden Child Process of Launchd",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:.* and process.parent.executable:/sbin/launchd",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:.* and process.parent.executable:/sbin/launchd\n",
   "references": [
     "https://objective-see.com/blog/blog_0x61.html",
     "https://www.intezer.com/blog/research/operation-electrorat-attacker-creates-fake-companies-to-drain-your-crypto-wallets/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_directory_services_plugins_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_directory_services_plugins_modification.json
index 18595dfe18048..0fce2b7647df4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_directory_services_plugins_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_directory_services_plugins_modification.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Persistence via DirectoryService Plugin Modification",
-  "query": "event.category:file and not event.type:deletion and file.path:/Library/DirectoryServices/PlugIns/*.dsplug",
+  "query": "event.category:file and not event.type:deletion and\n  file.path:/Library/DirectoryServices/PlugIns/*.dsplug\n",
   "references": [
     "https://blog.chichou.me/2019/11/21/two-macos-persistence-tricks-abusing-plugins/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_docker_shortcuts_plist_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_docker_shortcuts_plist_modification.json
index 6ccc3dbe509f2..941fe5cbf5484 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_docker_shortcuts_plist_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_docker_shortcuts_plist_modification.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Persistence via Docker Shortcut Modification",
-  "query": "event.category : file and event.action : modification and file.path : /Users/*/Library/Preferences/com.apple.dock.plist and not process.name : (xpcproxy or cfprefsd or plutil or jamf or PlistBuddy or InstallerRemotePluginService)",
+  "query": "event.category : file and event.action : modification and \n file.path : /Users/*/Library/Preferences/com.apple.dock.plist and \n not process.name : (xpcproxy or cfprefsd or plutil or jamf or PlistBuddy or InstallerRemotePluginService)\n",
   "references": [
     "https://github.com/specterops/presentations/raw/master/Leo Pitt/Hey_Im_Still_in_Here_Modern_macOS_Persistence_SO-CON2020.pdf"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_network_acl_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_network_acl_creation.json
index 79ff9080c8f23..a545ae77d03ea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_network_acl_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_network_acl_creation.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS EC2 Network Access Control List Creation",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(CreateNetworkAcl or CreateNetworkAclEntry) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(CreateNetworkAcl or CreateNetworkAclEntry) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/create-network-acl.html",
     "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateNetworkAcl.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_enable_root_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_enable_root_account.json
index 5d608649abe21..b81496a79f960 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_enable_root_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_enable_root_account.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Attempt to Enable the Root Account",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:dsenableroot and not process.args:\"-d\"",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:dsenableroot and not process.args:\"-d\"\n",
   "references": [
     "https://ss64.com/osx/dsenableroot.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_iam_service_account_key_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_iam_service_account_key_deletion.json
index 34efe6e0b3d0e..07372389f48c3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_iam_service_account_key_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_iam_service_account_key_deletion.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP IAM Service Account Key Deletion",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteServiceAccountKey and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.DeleteServiceAccountKey and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/service-accounts",
     "https://cloud.google.com/iam/docs/creating-managing-service-account-keys"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_key_created_for_service_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_key_created_for_service_account.json
index 2c84a68b7603c..88249ad30adb9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_key_created_for_service_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_key_created_for_service_account.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Service Account Key Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateServiceAccountKey and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateServiceAccountKey and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/service-accounts",
     "https://cloud.google.com/iam/docs/creating-managing-service-account-keys"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_service_account_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_service_account_created.json
index 54d4c01c66ea4..d37cc80d562cd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_service_account_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gcp_service_account_created.json
@@ -14,7 +14,7 @@
   "license": "Elastic License v2",
   "name": "GCP Service Account Creation",
   "note": "## Config\n\nThe GCP Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateServiceAccount and event.outcome:success",
+  "query": "event.dataset:(googlecloud.audit or gcp.audit) and event.action:google.iam.admin.v*.CreateServiceAccount and event.outcome:success\n",
   "references": [
     "https://cloud.google.com/iam/docs/service-accounts"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
index 681d9f4f7d4c8..1ad3e0afeed52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace Admin Role Assigned to a User",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ASSIGN_ROLE",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:ASSIGN_ROLE\n",
   "references": [
     "https://support.google.com/a/answer/172176?hl=en"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
index 819c047a2c64f..19dd54c6ccb35 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace API Access Granted via Domain-Wide Delegation of Authority",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:AUTHORIZE_API_CLIENT_ACCESS",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:AUTHORIZE_API_CLIENT_ACCESS\n",
   "references": [
     "https://developers.google.com/admin-sdk/directory/v1/guides/delegation"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
index 2a68fc2604f8b..ae03288800adc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace Custom Admin Role Created",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:CREATE_ROLE",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:CREATE_ROLE\n",
   "references": [
     "https://support.google.com/a/answer/2406043?hl=en"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
index daf5b9b97a522..75bd229efa31c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "Google Workspace Role Modified",
   "note": "## Config\n\nThe Google Workspace Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n### Important Information Regarding Google Workspace Event Lag Times\n- As per Google's documentation, Google Workspace administrators may observe lag times ranging from minutes up to 3 days between the time of an event's occurrence and the event being visible in the Google Workspace admin/audit logs.\n- This rule is configured to run every 10 minutes with a lookback time of 130 minutes.\n- To reduce the risk of false negatives, consider reducing the interval that the Google Workspace (formerly G Suite) Filebeat module polls Google's reporting API for new events.\n- By default, `var.interval` is set to 2 hours (2h). Consider changing this interval to a lower value, such as 10 minutes (10m).\n- See the following references for further information.\n  - https://support.google.com/a/answer/7061566\n  - https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html",
-  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:(ADD_PRIVILEGE or UPDATE_ROLE)",
+  "query": "event.dataset:(gsuite.admin or google_workspace.admin) and event.provider:admin and event.category:iam and event.action:(ADD_PRIVILEGE or UPDATE_ROLE)\n",
   "references": [
     "https://support.google.com/a/answer/2406043?hl=en"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_iam_group_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_iam_group_creation.json
index 0930201f0422e..084ccb4da74f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_iam_group_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_iam_group_creation.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Group Creation",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:CreateGroup and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:CreateGroup and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/iam/create-group.html",
     "https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateGroup.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_loginwindow_plist_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_loginwindow_plist_modification.json
index d6ffaa532a530..0ec8607f4d71d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_loginwindow_plist_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_loginwindow_plist_modification.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Potential Persistence via Login Hook",
   "note": "## Triage and analysis\n\nStarting in Mac OS X 10.7 (Lion), users can specify certain applications to be re-opened when a user reboots their machine. This can be abused to establish or maintain persistence on a compromised system.",
-  "query": "event.category:\"file\" and not event.type:\"deletion\" and file.name:\"com.apple.loginwindow.plist\" and process.name:(* and not (systemmigrationd or DesktopServicesHelper or diskmanagementd or rsync or launchd or cfprefsd or xpcproxy or ManagedClient or MCXCompositor))",
+  "query": "event.category:\"file\" and not event.type:\"deletion\" and\n file.name:\"com.apple.loginwindow.plist\" and\n process.name:(* and not (systemmigrationd or DesktopServicesHelper or diskmanagementd or rsync or launchd or cfprefsd or xpcproxy or ManagedClient or MCXCompositor))\n",
   "references": [
     "https://github.com/D00MFist/PersistentJXA/blob/master/LoginScript.js"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_mfa_disabled_for_azure_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_mfa_disabled_for_azure_user.json
index e13975684a722..2514b5790d023 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_mfa_disabled_for_azure_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_mfa_disabled_for_azure_user.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "Multi-Factor Authentication Disabled for an Azure User",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Disable Strong Authentication\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Disable Strong Authentication\" and event.outcome:(Success or success)\n",
   "risk_score": 47,
   "rule_id": "dafa3235-76dc-40e2-9f71-1773b96d24cf",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_exchange_management_role_assignment.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_exchange_management_role_assignment.json
index a0e51fa3b8eed..b145642a01968 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_exchange_management_role_assignment.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_exchange_management_role_assignment.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Exchange Management Group Role Assignment",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-ManagementRoleAssignment\" and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:\"New-ManagementRoleAssignment\" and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/exchange/new-managementroleassignment?view=exchange-ps",
     "https://docs.microsoft.com/en-us/microsoft-365/admin/add-users/about-admin-roles?view=o365-worldwide"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_external_access_enabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_external_access_enabled.json
index 570ac0323dfd1..f3ad4d22cf14c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_external_access_enabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_external_access_enabled.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Teams External Access Enabled",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:(SkypeForBusiness or MicrosoftTeams) and event.category:web and event.action:\"Set-CsTenantFederationConfiguration\" and o365.audit.Parameters.AllowFederatedUsers:True and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:(SkypeForBusiness or MicrosoftTeams) and\nevent.category:web and event.action:\"Set-CsTenantFederationConfiguration\" and\no365.audit.Parameters.AllowFederatedUsers:True and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/microsoftteams/manage-external-access"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_guest_access_enabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_guest_access_enabled.json
index 492c3dcd5bc9d..93f72b401d51e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_guest_access_enabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_microsoft_365_teams_guest_access_enabled.json
@@ -15,7 +15,7 @@
   "license": "Elastic License v2",
   "name": "Microsoft 365 Teams Guest Access Enabled",
   "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:o365.audit and event.provider:(SkypeForBusiness or MicrosoftTeams) and event.category:web and event.action:\"Set-CsTeamsClientConfiguration\" and o365.audit.Parameters.AllowGuestUser:True and event.outcome:success",
+  "query": "event.dataset:o365.audit and event.provider:(SkypeForBusiness or MicrosoftTeams) and\nevent.category:web and event.action:\"Set-CsTeamsClientConfiguration\" and\no365.audit.Parameters.AllowGuestUser:True and event.outcome:success\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/module/skype/get-csteamsclientconfiguration?view=skype-ps"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_periodic_tasks_file_mdofiy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_periodic_tasks_file_mdofiy.json
index f48ea64022ecb..2df59206645b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_periodic_tasks_file_mdofiy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_periodic_tasks_file_mdofiy.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Persistence via Periodic Tasks",
-  "query": "event.category:\"file\" and not event.type:\"deletion\" and file.path:(/private/etc/periodic/* or /private/etc/defaults/periodic.conf or /private/etc/periodic.conf)",
+  "query": "event.category:\"file\" and not event.type:\"deletion\" and\n file.path:(/private/etc/periodic/* or /private/etc/defaults/periodic.conf or /private/etc/periodic.conf)\n",
   "references": [
     "https://opensource.apple.com/source/crontabs/crontabs-13/private/etc/defaults/periodic.conf.auto.html",
     "https://www.oreilly.com/library/view/mac-os-x/0596003706/re328.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_cluster_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_cluster_creation.json
index 3a13c02a368ad..4f28f277d21e1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_cluster_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_cluster_creation.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS RDS Cluster Creation",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(CreateDBCluster or CreateGlobalCluster) and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(CreateDBCluster or CreateGlobalCluster) and event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-cluster.html",
     "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBCluster.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
index 545787d7ec999..eec7157c74148 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Shell via Web Server",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(bash or dash) and user.name:(apache or nginx or www or \"www-data\")",
+  "query": "event.category:process and event.type:(start or process_started) and process.name:(bash or dash) and\n  user.name:(apache or nginx or www or \"www-data\")\n",
   "references": [
     "https://pentestlab.blog/tag/web-shell/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_profile_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_profile_modification.json
index fa56d07b190cd..41ca64fb6c162 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_profile_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_profile_modification.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Bash Shell Profile Modification",
-  "query": "event.category:file and event.type:change and process.name:(* and not (sudo or vim or zsh or env or nano or bash or Terminal or xpcproxy or login or cat or cp or launchctl or java)) and not process.executable:(/Applications/* or /private/var/folders/* or /usr/local/*) and file.path:(/private/etc/rc.local or /etc/rc.local or /home/*/.profile or /home/*/.profile1 or /home/*/.bash_profile or /home/*/.bash_profile1 or /home/*/.bashrc or /Users/*/.bash_profile or /Users/*/.zshenv)",
+  "query": "event.category:file and event.type:change and\n  process.name:(* and not (sudo or\n                           vim or\n                           zsh or\n                           env or\n                           nano or\n                           bash or\n                           Terminal or\n                           xpcproxy or\n                           login or\n                           cat or\n                           cp or\n                           launchctl or\n                           java)) and\n  not process.executable:(/Applications/* or /private/var/folders/* or /usr/local/*) and\n  file.path:(/private/etc/rc.local or\n             /etc/rc.local or\n             /home/*/.profile or\n             /home/*/.profile1 or\n             /home/*/.bash_profile or\n             /home/*/.bash_profile1 or\n             /home/*/.bashrc or\n             /Users/*/.bash_profile or\n             /Users/*/.zshenv)\n",
   "references": [
     "https://www.anomali.com/blog/pulling-linux-rabbit-rabbot-malware-out-of-a-hat"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ssh_authorized_keys_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ssh_authorized_keys_modification.json
index 46358ec7f47fe..23d16f121921b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ssh_authorized_keys_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ssh_authorized_keys_modification.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "SSH Authorized Keys File Modification",
-  "query": "event.category:file and event.type:(change or creation) and file.name:(\"authorized_keys\" or \"authorized_keys2\") and not process.executable: (/Library/Developer/CommandLineTools/usr/bin/git or /usr/local/Cellar/maven/*/libexec/bin/mvn or /Library/Java/JavaVirtualMachines/jdk*.jdk/Contents/Home/bin/java or /usr/bin/vim or /usr/local/Cellar/coreutils/*/bin/gcat or /usr/bin/bsdtar or /usr/bin/nautilus or /usr/bin/scp or /usr/bin/touch or /var/lib/docker/*)",
+  "query": "event.category:file and event.type:(change or creation) and \n file.name:(\"authorized_keys\" or \"authorized_keys2\") and \n not process.executable:\n             (/Library/Developer/CommandLineTools/usr/bin/git or \n              /usr/local/Cellar/maven/*/libexec/bin/mvn or \n              /Library/Java/JavaVirtualMachines/jdk*.jdk/Contents/Home/bin/java or \n              /usr/bin/vim or \n              /usr/local/Cellar/coreutils/*/bin/gcat or \n              /usr/bin/bsdtar or\n              /usr/bin/nautilus or \n              /usr/bin/scp or\n              /usr/bin/touch or \n              /var/lib/docker/*)\n",
   "risk_score": 47,
   "rule_id": "2215b8bd-1759-4ffa-8ab8-55c8e6b32e7f",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_calendar_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_calendar_modification.json
index 1f0186c39ad26..97a3de8f4060d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_calendar_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_calendar_modification.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Suspicious Calendar File Modification",
-  "query": "event.category:file and event.action:modification and file.path:/Users/*/Library/Calendars/*.calendar/Events/*.ics and process.executable: (* and not ( /System/Library/* or /System/Applications/Calendar.app/Contents/MacOS/* or /usr/libexec/xpcproxy or /sbin/launchd or /Applications/* ) )",
+  "query": "event.category:file and event.action:modification and\n  file.path:/Users/*/Library/Calendars/*.calendar/Events/*.ics and\n  process.executable:\n  (* and not \n    (\n      /System/Library/* or \n      /System/Applications/Calendar.app/Contents/MacOS/* or \n      /usr/libexec/xpcproxy or \n      /sbin/launchd or \n      /Applications/*\n    )\n  )\n",
   "references": [
     "https://labs.f-secure.com/blog/operationalising-calendar-alerts-persistence-on-macos",
     "https://github.com/FSecureLABS/CalendarPersist",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_com_hijack_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_com_hijack_registry.json
index f20b00d057f1a..b0f573730b73f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_com_hijack_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_com_hijack_registry.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Component Object Model Hijacking",
-  "query": "registry where\n /* uncomment once length is stable length(bytes_written_string) > 0 and */\n (registry.path : \"HK*}\\\\InprocServer32\\\\\" and registry.data.strings: (\"scrobj.dll\", \"C:\\\\*\\\\scrobj.dll\") and\n not registry.path : \"*\\\\{06290BD*-48AA-11D2-8432-006008C3FBFC}\\\\*\") \n or\n /* in general COM Registry changes on Users Hive is less noisy and worth alerting */\n (registry.path : (\"HKEY_USERS\\\\*Classes\\\\*\\\\InprocXServer32\\\\\",  \n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\LocalServer32\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\DelegateExecute\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\TreatAs\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\CLSID\\\\*\\\\ScriptletURL\\\\\") and\n /* not necessary but good for filtering privileged installations */\n user.domain != \"NT AUTHORITY\")\n",
+  "query": "registry where\n /* uncomment once length is stable length(bytes_written_string) > 0 and */\n (registry.path : \"HK*}\\\\InprocServer32\\\\\" and registry.data.strings: (\"scrobj.dll\", \"C:\\\\*\\\\scrobj.dll\") and\n not registry.path : \"*\\\\{06290BD*-48AA-11D2-8432-006008C3FBFC}\\\\*\") \n or\n /* in general COM Registry changes on Users Hive is less noisy and worth alerting */\n (registry.path : (\"HKEY_USERS\\\\*Classes\\\\*\\\\InprocServer32\\\\\",\n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\LocalServer32\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\DelegateExecute\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\*\\\\TreatAs\\\\\", \n                   \"HKEY_USERS\\\\*Classes\\\\CLSID\\\\*\\\\ScriptletURL\\\\\") and\n /* not necessary but good for filtering privileged installations */\n user.domain != \"NT AUTHORITY\")\n",
   "references": [
     "https://bohops.com/2018/08/18/abusing-the-com-registry-structure-part-2-loading-techniques-for-evasion-and-persistence/"
   ],
@@ -52,5 +52,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_application.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_application.json
index ee2fdb5b75eac..1d0990e951925 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_application.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_application.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "User Added as Owner for Azure Application",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add owner to application\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add owner to application\" and event.outcome:(Success or success)\n",
   "risk_score": 21,
   "rule_id": "774f5e28-7b75-4a58-b94e-41bf060fdd86",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_service_principal.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_service_principal.json
index aacc17bb6be53..b68b4826bc4cf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_service_principal.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_added_as_owner_for_azure_service_principal.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "name": "User Added as Owner for Azure Service Principal",
   "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add owner to service principal\" and event.outcome:(Success or success)",
+  "query": "event.dataset:azure.auditlogs and azure.auditlogs.operation_name:\"Add owner to service principal\" and event.outcome:(Success or success)\n",
   "references": [
     "https://docs.microsoft.com/en-us/azure/active-directory/develop/app-objects-and-service-principals"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_atom_init_file_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_atom_init_file_modification.json
index 30c2d3a9b4ab7..0977d8310cf6b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_atom_init_file_modification.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_atom_init_file_modification.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Persistence via Atom Init Script Modification",
-  "query": "event.category:\"file\" and not event.type:\"deletion\" and file.path:/Users/*/.atom/init.coffee and not process.name:(Atom or xpcproxy) and not user.name:root",
+  "query": "event.category:\"file\" and not event.type:\"deletion\" and\n file.path:/Users/*/.atom/init.coffee and not process.name:(Atom or xpcproxy) and not user.name:root\n",
   "references": [
     "https://github.com/D00MFist/PersistentJXA/blob/master/AtomPersist.js",
     "https://flight-manual.atom.io/hacking-atom/sections/the-init-file/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_echo_nopasswd_sudoers.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_echo_nopasswd_sudoers.json
index e6bd7784006ee..6023854cd6641 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_echo_nopasswd_sudoers.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_echo_nopasswd_sudoers.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Privilege Escalation via Sudoers File Modification",
-  "query": "event.category:process and event.type:start and process.args:(echo and *NOPASSWD*ALL*)",
+  "query": "event.category:process and event.type:start and process.args:(echo and *NOPASSWD*ALL*)\n",
   "risk_score": 73,
   "rule_id": "76152ca1-71d0-4003-9e37-0983e12832da",
   "severity": "high",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_explicit_creds_via_scripting.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_explicit_creds_via_scripting.json
index c8ec829d3ae8a..32c47afd93019 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_explicit_creds_via_scripting.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_explicit_creds_via_scripting.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Execution with Explicit Credentials via Scripting",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:\"security_authtrampoline\" and process.parent.name:(osascript or com.apple.automator.runner or sh or bash or dash or zsh or python* or perl* or php* or ruby or pwsh)",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:\"security_authtrampoline\" and\n process.parent.name:(osascript or com.apple.automator.runner or sh or bash or dash or zsh or python* or perl* or php* or ruby or pwsh)\n",
   "references": [
     "https://objectivebythesea.com/v2/talks/OBTS_v2_Thomas.pdf",
     "https://www.manpagez.com/man/8/security_authtrampoline/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_exploit_adobe_acrobat_updater.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_exploit_adobe_acrobat_updater.json
index 0fb4285ea2a98..0c30cbb23b56b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_exploit_adobe_acrobat_updater.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_exploit_adobe_acrobat_updater.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Suspicious Child Process of Adobe Acrobat Reader Update Service",
-  "query": "event.category:process and event.type:(start or process_started) and process.parent.name:com.adobe.ARMDC.SMJobBlessHelper and user.name:root and not process.executable: (/Library/PrivilegedHelperTools/com.adobe.ARMDC.SMJobBlessHelper or /usr/bin/codesign or /private/var/folders/zz/*/T/download/ARMDCHammer or /usr/sbin/pkgutil or /usr/bin/shasum or /usr/bin/perl* or /usr/sbin/spctl or /usr/sbin/installer)",
+  "query": "event.category:process and event.type:(start or process_started) and\n  process.parent.name:com.adobe.ARMDC.SMJobBlessHelper and\n  user.name:root and\n  not process.executable: (/Library/PrivilegedHelperTools/com.adobe.ARMDC.SMJobBlessHelper or\n                           /usr/bin/codesign or\n                           /private/var/folders/zz/*/T/download/ARMDCHammer or\n                           /usr/sbin/pkgutil or\n                           /usr/bin/shasum or\n                           /usr/bin/perl* or\n                           /usr/sbin/spctl or\n                           /usr/sbin/installer)\n",
   "references": [
     "https://rekken.github.io/2020/05/14/Security-Flaws-in-Adobe-Acrobat-Reader-Allow-Malicious-Program-to-Gain-Root-on-macOS-Silently/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_ld_preload_shared_object_modif.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_ld_preload_shared_object_modif.json
index 7000e119f8881..4b1b367a5ea35 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_ld_preload_shared_object_modif.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_ld_preload_shared_object_modif.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Modification of Dynamic Linker Preload Shared Object",
-  "query": "event.category:file and not event.type:deletion and file.path:/etc/ld.so.preload",
+  "query": "event.category:file and not event.type:deletion and file.path:/etc/ld.so.preload\n",
   "references": [
     "https://www.anomali.com/blog/rocke-evolves-its-arsenal-with-a-new-malware-family-written-in-golang"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_local_user_added_to_admin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_local_user_added_to_admin.json
index 58c151d6de0c4..72c3bfc9a520c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_local_user_added_to_admin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_local_user_added_to_admin.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Potential Admin Group Account Addition",
-  "query": "event.category:process and event.type:(start or process_started) and process.name:(dscl or dseditgroup) and process.args:((\"/Groups/admin\" or admin) and (\"-a\" or \"-append\"))",
+  "query": "event.category:process and event.type:(start or process_started) and\n process.name:(dscl or dseditgroup) and process.args:((\"/Groups/admin\" or admin) and (\"-a\" or \"-append\"))\n",
   "references": [
     "https://managingosx.wordpress.com/2010/01/14/add-a-user-to-the-admin-group-via-command-line-3-0/"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_persistence_phantom_dll.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_persistence_phantom_dll.json
index a85558df6f388..e454a387b3883 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_persistence_phantom_dll.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_persistence_phantom_dll.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Suspicious DLL Loaded for Persistence or Privilege Escalation",
-  "query": "library where dll.name :\n  (\n  \"wlbsctrl.dll\",\n  \"wbemcomn.dll\",\n  \"WptsExtensions.dll\",\n  \"Tsmsisrv.dll\",\n  \"TSVIPSrv.dll\",\n  \"Msfte.dll\",\n  \"wow64log.dll\",\n  \"WindowsCoreDeviceInfo.dll\",\n  \"Ualapi.dll\",\n  \"wlanhlp.dll\",\n  \"phoneinfo.dll\",\n  \"EdgeGdi.dll\",\n  \"cdpsgshims.dll\",\n  \"windowsperformancerecordercontrol.dll\",\n  \"diagtrack_win.dll\"\n  ) and \nnot (dll.code_signature.subject_name : \"Microsoft Windows\" and dll.code_signature.status : \"trusted\")\n",
+  "query": "library where dll.name :\n  (\n  \"wlbsctrl.dll\",\n  \"wbemcomn.dll\",\n  \"WptsExtensions.dll\",\n  \"Tsmsisrv.dll\",\n  \"TSVIPSrv.dll\",\n  \"Msfte.dll\",\n  \"wow64log.dll\",\n  \"WindowsCoreDeviceInfo.dll\",\n  \"Ualapi.dll\",\n  \"wlanhlp.dll\",\n  \"phoneinfo.dll\",\n  \"EdgeGdi.dll\",\n  \"cdpsgshims.dll\",\n  \"windowsperformancerecordercontrol.dll\",\n  \"diagtrack_win.dll\"\n  ) and \nnot (dll.code_signature.subject_name : (\"Microsoft Windows\", \"Microsoft Corporation\") and dll.code_signature.status : \"trusted\")\n",
   "references": [
     "https://itm4n.github.io/windows-dll-hijacking-clarified/",
     "http://remoteawesomethoughts.blogspot.com/2019/05/windows-10-task-schedulerservice.html",
@@ -80,5 +80,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_crontab_filemod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_crontab_filemod.json
index f782e429dd29e..57f893168ba57 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_crontab_filemod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_crontab_filemod.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Privilege Escalation via Root Crontab File Modification",
-  "query": "event.category:file and not event.type:deletion and file.path:/private/var/at/tabs/root and not process.executable:/usr/bin/crontab",
+  "query": "event.category:file and not event.type:deletion and\n file.path:/private/var/at/tabs/root and not process.executable:/usr/bin/crontab\n",
   "references": [
     "https://phoenhex.re/2017-06-09/pwn2own-diskarbitrationd-privesc",
     "https://www.exploit-db.com/exploits/42146"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_login_without_mfa.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_login_without_mfa.json
index 5ab6b41582030..33b5cd400fd33 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_login_without_mfa.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_root_login_without_mfa.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS Root Login Without MFA",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and aws.cloudtrail.user_identity.type:Root and aws.cloudtrail.console_login.additional_eventdata.mfa_used:false and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:signin.amazonaws.com and event.action:ConsoleLogin and\n  aws.cloudtrail.user_identity.type:Root and\n  aws.cloudtrail.console_login.additional_eventdata.mfa_used:false and\n  event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_setgid_bit_set_via_chmod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_setgid_bit_set_via_chmod.json
index 67633985221e3..29113d078ae5f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_setgid_bit_set_via_chmod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_setgid_bit_set_via_chmod.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "max_signals": 33,
   "name": "Setuid / Setgid Bit Set via chmod",
-  "query": "event.category:process AND event.type:(start OR process_started) AND process.name:chmod AND process.args:(\"+s\" OR \"u+s\" OR /4[0-9]{3}/ OR g+s OR /2[0-9]{3}/) AND NOT process.args: ( /.*\\/Applications\\/VirtualBox.app\\/.+/ OR /\\/usr\\/local\\/lib\\/python.+/ OR /\\/var\\/folders\\/.+\\/FP.*nstallHelper/ OR /\\/Library\\/Filesystems\\/.+/ OR /\\/usr\\/lib\\/virtualbox\\/.+/ OR /\\/Library\\/Application.*/ OR \"/run/postgresql\" OR \"/var/crash\" OR \"/var/run/postgresql\" OR /\\/usr\\/bin\\/.+/ OR /\\/usr\\/local\\/share\\/.+/ OR /\\/Applications\\/.+/ OR /\\/usr\\/libexec\\/.+/ OR \"/var/metrics\" OR /\\/var\\/lib\\/dpkg\\/.+/ OR /\\/run\\/log\\/journal\\/.*/ OR \\/Users\\/*\\/.minikube\\/bin\\/docker-machine-driver-hyperkit ) AND NOT process.parent.executable: ( /\\/var\\/lib\\/docker\\/.+/ OR \"/System/Library/PrivateFrameworks/PackageKit.framework/Versions/A/XPCServices/package_script_service.xpc/Contents/MacOS/package_script_service\" OR \"/var/lib/dpkg/info/whoopsie.postinst\" )",
+  "query": "event.category:process AND event.type:(start OR process_started) AND\n process.name:chmod AND process.args:(\"+s\" OR \"u+s\" OR /4[0-9]{3}/ OR g+s OR /2[0-9]{3}/) AND\n NOT process.args:\n           (\n             /.*\\/Applications\\/VirtualBox.app\\/.+/ OR\n             /\\/usr\\/local\\/lib\\/python.+/ OR\n             /\\/var\\/folders\\/.+\\/FP.*nstallHelper/ OR\n             /\\/Library\\/Filesystems\\/.+/ OR\n             /\\/usr\\/lib\\/virtualbox\\/.+/ OR\n             /\\/Library\\/Application.*/ OR\n             \"/run/postgresql\" OR\n             \"/var/crash\" OR\n             \"/var/run/postgresql\" OR\n             /\\/usr\\/bin\\/.+/ OR /\\/usr\\/local\\/share\\/.+/ OR\n             /\\/Applications\\/.+/ OR /\\/usr\\/libexec\\/.+/ OR\n             \"/var/metrics\" OR /\\/var\\/lib\\/dpkg\\/.+/ OR\n             /\\/run\\/log\\/journal\\/.*/ OR\n             \\/Users\\/*\\/.minikube\\/bin\\/docker-machine-driver-hyperkit\n           ) AND\n NOT process.parent.executable:\n           (\n             /\\/var\\/lib\\/docker\\/.+/ OR\n             \"/System/Library/PrivateFrameworks/PackageKit.framework/Versions/A/XPCServices/package_script_service.xpc/Contents/MacOS/package_script_service\" OR\n             \"/var/lib/dpkg/info/whoopsie.postinst\"\n           )\n",
   "risk_score": 21,
   "rule_id": "8a1b0278-0f9a-487d-96bd-d4833298e87a",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudo_buffer_overflow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudo_buffer_overflow.json
index 144cea40e6a4b..1c7a064131171 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudo_buffer_overflow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudo_buffer_overflow.json
@@ -14,7 +14,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Sudo Heap-Based Buffer Overflow Attempt",
-  "query": "event.category:process and event.type:start and process.name:(sudo or sudoedit) and process.args:(*\\\\ and (\"-i\" or \"-s\"))",
+  "query": "event.category:process and event.type:start and\n  process.name:(sudo or sudoedit) and\n  process.args:(*\\\\ and (\"-i\" or \"-s\"))\n",
   "references": [
     "https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-3156",
     "https://blog.qualys.com/vulnerabilities-research/2021/01/26/cve-2021-3156-heap-based-buffer-overflow-in-sudo-baron-samedit",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
index 1b480e3d19650..963c16ae4dd61 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Sudoers File Modification",
-  "query": "event.category:file and event.type:change and file.path:(/etc/sudoers* or /private/etc/sudoers*)",
+  "query": "event.category:file and event.type:change and file.path:(/etc/sudoers* or /private/etc/sudoers*)\n",
   "risk_score": 47,
   "rule_id": "931e25a5-0f5e-4ae0-ba0d-9e94eff7e3a4",
   "severity": "medium",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_updateassumerolepolicy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_updateassumerolepolicy.json
index 8f01db818dfb9..e46e59feea6f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_updateassumerolepolicy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_updateassumerolepolicy.json
@@ -16,7 +16,7 @@
   "license": "Elastic License v2",
   "name": "AWS IAM Assume Role Policy Update",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:UpdateAssumeRolePolicy and event.outcome:success",
+  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:UpdateAssumeRolePolicy and event.outcome:success\n",
   "references": [
     "https://labs.bishopfox.com/tech-blog/5-privesc-attack-vectors-in-aws"
   ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
index 9a058b50683b6..f582eba053d64 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "Threat Intel Filebeat Module Indicator Match",
   "note": "## Triage and Analysis\n\nIf an indicator matches a local observation, the following enriched fields will be generated to identify the indicator, field, and type matched.\n\n- `threatintel.indicator.matched.atomic` - this identifies the atomic indicator that matched the local observation\n- `threatintel.indicator.matched.field` - this identifies the indicator field that matched the local observation\n- `threatintel.indicator.matched.type` - this identifies the indicator type that matched the local observation\n",
-  "query": "file.hash.*:* or file.pe.imphash:* or source.ip:* or destination.ip:* or url.full:* or registry.path:*",
+  "query": "file.hash.*:* or file.pe.imphash:* or source.ip:* or destination.ip:* or url.full:* or registry.path:*\n",
   "references": [
     "https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-threatintel.html"
   ],
diff --git a/x-pack/test/fleet_api_integration/apis/epm/delete.ts b/x-pack/test/fleet_api_integration/apis/epm/delete.ts
index c79a29a858b46..5f90805e5879f 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/delete.ts
@@ -11,7 +11,7 @@ import { skipIfNoDockerRegistry } from '../../helpers';
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
-  const requiredPackage = 'system-0.12.6';
+  const requiredPackage = 'system-0.13.3';
 
   const installPackage = async (pkgkey: string) => {
     await supertest
diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts
index d18ba9c55ca96..d1c6c3c3f6b1e 100644
--- a/x-pack/test/fleet_api_integration/config.ts
+++ b/x-pack/test/fleet_api_integration/config.ts
@@ -15,8 +15,7 @@ import { defineDockerServersConfig } from '@kbn/test';
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||
-  'docker.elastic.co/package-registry/distribution:fc104ac437370d80518e24da6d0b84370edf0c0c';
+  'docker.elastic.co/package-registry/distribution@sha256:35cedaaa6adac547947321fa0c3b60a63eba153ba09524b9c1a21f1247a09bd2';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

From bd2215f587de0da0613bf1c5a71c71b8efbd868f Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Thu, 24 Jun 2021 16:46:19 -0600
Subject: [PATCH 80/95] [docs][migrations v2] Update SO migration docs to
 include removal of index write block when handling corrupt SOs. (#103014)

---
 .../setup/upgrade/upgrade-migrations.asciidoc | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index fdcd71791ad3a..947043b21ef50 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -55,22 +55,55 @@ This section highlights common causes of {kib} upgrade failures and how to preve
 There is a known issue in v7.12.0 for users who tried the fleet beta. Upgrade migrations fail because of a large number of documents in the `.kibana` index.
 
 This can cause Kibana to log errors like:
-> Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [receive_timeout_transport_exception]: [instance-0000000002][10.32.1.112:19541][cluster:monitor/task/get] request_id [2648] timed out after [59940ms]
-> Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [timeout_exception]: Timed out waiting for completion of [org.elasticsearch.index.reindex.BulkByScrollTask@6a74c54]
+
+[source,sh]
+--------------------------------------------
+Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [receive_timeout_transport_exception]: [instance-0000000002][10.32.1.112:19541][cluster:monitor/task/get] request_id [2648] timed out after [59940ms]
+
+Error: Unable to complete saved object migrations for the [.kibana] index. Please check the health of your Elasticsearch cluster and try again. Error: [timeout_exception]: Timed out waiting for completion of [org.elasticsearch.index.reindex.BulkByScrollTask@6a74c54]
+--------------------------------------------
 
 See https://github.com/elastic/kibana/issues/95321 for instructions to work around this issue.
  
 [float]
 ===== Corrupt saved objects
-We highly recommend testing your {kib} upgrade in a development cluster to discover and remedy problems caused by corrupt documents, especially when there are custom integrations creating saved objects in your environment. Saved objects that were corrupted through manual editing or integrations will cause migration failures with a log message like `Failed to transform document. Transform: index-pattern:7.0.0\n Doc: {...}` or `Unable to migrate the corrupt Saved Object document ...`. Corrupt documents will have to be fixed or deleted before an upgrade migration can succeed.
+We highly recommend testing your {kib} upgrade in a development cluster to discover and remedy problems caused by corrupt documents, especially when there are custom integrations creating saved objects in your environment.
+
+Saved objects that were corrupted through manual editing or integrations will cause migration failures with a log message like `Failed to transform document. Transform: index-pattern:7.0.0\n Doc: {...}` or `Unable to migrate the corrupt Saved Object document ...`. Corrupt documents will have to be fixed or deleted before an upgrade migration can succeed.
 
 For example, given the following error message:
-> Unable to migrate the corrupt saved object document with _id: 'marketing_space:dashboard:e3c5fc71-ac71-4805-bcab-2bcc9cc93275'. To allow migrations to proceed, please delete this document from the [.kibana_7.12.0_001] index.
 
-The following steps must be followed to allow the upgrade migration to succeed.
-Please be aware the Dashboard having ID `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` belonging to the space `marketing_space` will no more be available:
-1. Delete the corrupt document with `DELETE .kibana_7.12.0_001/_doc/marketing_space:dashboard:e3c5fc71-ac71-4805-bcab-2bcc9cc93275`
-2. Restart {kib}
+[source,sh]
+--------------------------------------------
+Unable to migrate the corrupt saved object document with _id: 'marketing_space:dashboard:e3c5fc71-ac71-4805-bcab-2bcc9cc93275'. To allow migrations to proceed, please delete this document from the [.kibana_7.12.0_001] index.
+--------------------------------------------
+
+The following steps must be followed to delete the document that is causing the migration to fail:
+
+. Remove the write block which the migration system has placed on the previous index:
++
+[source,sh]
+--------------------------------------------
+PUT .kibana_7.12.1_001/_settings
+{
+  "index": {
+    "blocks.write": false
+  }
+}
+--------------------------------------------
+
+. Delete the corrupt document:
++
+[source,sh]
+--------------------------------------------
+DELETE .kibana_7.12.0_001/_doc/marketing_space:dashboard:e3c5fc71-ac71-4805-bcab-2bcc9cc93275
+--------------------------------------------
+
+. Restart {kib}.
+
+In this example, the Dashboard with ID `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` that belongs to the space `marketing_space` **will no longer be available**.
+
+Be sure you have a snapshot before you delete the corrupt document. If restoring from a snapshot is not an option, it is recommended to also delete the `temp` and `target` indices the migration created before restarting {kib} and retrying.
 
 [float]
 ===== User defined index templates that causes new `.kibana*` indices to have incompatible settings or mappings

From 803d0fa57ba0cb955b846b52c2d8489cb101312c Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:02:48 -0700
Subject: [PATCH 81/95] [Enterprise Search] Final KibanaPageTemplate cleanup
 (#103355)

* [AS] Delete AppSearchNav and EngineNav

* [WS] Delete WorkplaceSearchNav

* [Shared] Delete custom Layout & SideNav components
---
 .../components/engine/engine_nav.test.tsx     | 184 +-------------
 .../components/engine/engine_nav.tsx          | 235 +-----------------
 .../app_search/components/engine/index.ts     |   1 -
 .../applications/app_search/index.test.tsx    |  55 +---
 .../public/applications/app_search/index.tsx  |  39 +--
 .../applications/shared/layout/index.ts       |   4 -
 .../applications/shared/layout/layout.scss    |  96 -------
 .../shared/layout/layout.test.tsx             |  77 ------
 .../applications/shared/layout/layout.tsx     |  82 ------
 .../applications/shared/layout/side_nav.scss  |  87 -------
 .../shared/layout/side_nav.test.tsx           | 166 -------------
 .../applications/shared/layout/side_nav.tsx   | 130 ----------
 .../shared/layout/side_nav_bg.svg             |  25 --
 .../components/layout/index.ts                |   2 +-
 .../components/layout/nav.test.tsx            |  21 +-
 .../components/layout/nav.tsx                 |  41 +--
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 18 files changed, 18 insertions(+), 1233 deletions(-)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.scss
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.scss
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav_bg.svg

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
index 015fb997c29ed..e088678a13562 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
@@ -10,7 +10,6 @@ import { mockUseRouteMatch } from '../../../__mocks__/react_router';
 import { mockEngineValues } from '../../__mocks__';
 
 jest.mock('../../../shared/layout', () => ({
-  ...jest.requireActual('../../../shared/layout'), // TODO: Remove once side nav components are gone
   generateNavLink: jest.fn(({ to }) => ({ href: to })),
 }));
 
@@ -20,9 +19,7 @@ import { shallow } from 'enzyme';
 
 import { EuiBadge, EuiIcon } from '@elastic/eui';
 
-import { rerender } from '../../../test_helpers';
-
-import { useEngineNav, EngineNav } from './engine_nav';
+import { useEngineNav } from './engine_nav';
 
 describe('useEngineNav', () => {
   const values = { ...mockEngineValues, myRole: {}, dataLoading: false };
@@ -321,182 +318,3 @@ describe('useEngineNav', () => {
     });
   });
 });
-
-describe('EngineNav', () => {
-  const values = { ...mockEngineValues, myRole: {}, dataLoading: false };
-
-  beforeEach(() => {
-    setMockValues(values);
-  });
-
-  it('does not render if async data is still loading', () => {
-    setMockValues({ ...values, dataLoading: true });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-
-  it('does not render without an engine name', () => {
-    setMockValues({ ...values, engineName: '' });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-
-  it('renders an engine label and badges', () => {
-    setMockValues({ ...values, isSampleEngine: false, isMetaEngine: false });
-    const wrapper = shallow(<EngineNav />);
-    const label = wrapper.find('[data-test-subj="EngineLabel"]').find('.eui-textTruncate');
-
-    expect(label.text()).toEqual('SOME-ENGINE');
-    expect(wrapper.find(EuiBadge)).toHaveLength(0);
-
-    setMockValues({ ...values, isSampleEngine: true });
-    rerender(wrapper);
-    expect(wrapper.find(EuiBadge).prop('children')).toEqual('SAMPLE ENGINE');
-
-    setMockValues({ ...values, isMetaEngine: true });
-    rerender(wrapper);
-    expect(wrapper.find(EuiBadge).prop('children')).toEqual('META ENGINE');
-  });
-
-  it('renders a default engine overview link', () => {
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineOverviewLink"]')).toHaveLength(1);
-  });
-
-  it('renders an analytics link', () => {
-    setMockValues({ ...values, myRole: { canViewEngineAnalytics: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineAnalyticsLink"]')).toHaveLength(1);
-  });
-
-  it('renders a documents link', () => {
-    setMockValues({ ...values, myRole: { canViewEngineDocuments: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineDocumentsLink"]')).toHaveLength(1);
-  });
-
-  it('renders a schema link', () => {
-    setMockValues({ ...values, myRole: { canViewEngineSchema: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineSchemaLink"]')).toHaveLength(1);
-  });
-
-  describe('schema nav icons', () => {
-    const myRole = { canViewEngineSchema: true };
-
-    it('renders schema errors alert icon', () => {
-      setMockValues({ ...values, myRole, hasSchemaErrors: true });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineNavSchemaErrors"]')).toHaveLength(1);
-    });
-
-    it('renders unconfirmed schema fields info icon', () => {
-      setMockValues({ ...values, myRole, hasUnconfirmedSchemaFields: true });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineNavSchemaUnconfirmedFields"]')).toHaveLength(1);
-    });
-
-    it('renders schema conflicts alert icon', () => {
-      setMockValues({ ...values, myRole, hasSchemaConflicts: true });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineNavSchemaConflicts"]')).toHaveLength(1);
-    });
-  });
-
-  describe('crawler link', () => {
-    const myRole = { canViewEngineCrawler: true };
-
-    it('renders', () => {
-      setMockValues({ ...values, myRole });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineCrawlerLink"]')).toHaveLength(1);
-    });
-
-    it('does not render for meta engines', () => {
-      setMockValues({ ...values, myRole, isMetaEngine: true });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineCrawlerLink"]')).toHaveLength(0);
-    });
-  });
-
-  describe('meta engine source engines link', () => {
-    const myRole = { canViewMetaEngineSourceEngines: true };
-
-    it('renders', () => {
-      setMockValues({ ...values, myRole, isMetaEngine: true });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="MetaEngineEnginesLink"]')).toHaveLength(1);
-    });
-
-    it('does not render for non meta engines', () => {
-      setMockValues({ ...values, myRole, isMetaEngine: false });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="MetaEngineEnginesLink"]')).toHaveLength(0);
-    });
-  });
-
-  it('renders a relevance tuning link', () => {
-    setMockValues({ ...values, myRole: { canManageEngineRelevanceTuning: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineRelevanceTuningLink"]')).toHaveLength(1);
-  });
-
-  describe('relevance tuning nav icons', () => {
-    const myRole = { canManageEngineRelevanceTuning: true };
-
-    it('renders unconfirmed schema fields info icon', () => {
-      const engine = { unsearchedUnconfirmedFields: true };
-      setMockValues({ ...values, myRole, engine });
-      const wrapper = shallow(<EngineNav />);
-      expect(
-        wrapper.find('[data-test-subj="EngineNavRelevanceTuningUnsearchedFields"]')
-      ).toHaveLength(1);
-    });
-
-    it('renders schema conflicts alert icon', () => {
-      const engine = { invalidBoosts: true };
-      setMockValues({ ...values, myRole, engine });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find('[data-test-subj="EngineNavRelevanceTuningInvalidBoosts"]')).toHaveLength(
-        1
-      );
-    });
-
-    it('can render multiple icons', () => {
-      const engine = { invalidBoosts: true, unsearchedUnconfirmedFields: true };
-      setMockValues({ ...values, myRole, engine });
-      const wrapper = shallow(<EngineNav />);
-      expect(wrapper.find(EuiIcon)).toHaveLength(2);
-    });
-  });
-
-  it('renders a synonyms link', () => {
-    setMockValues({ ...values, myRole: { canManageEngineSynonyms: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineSynonymsLink"]')).toHaveLength(1);
-  });
-
-  it('renders a curations link', () => {
-    setMockValues({ ...values, myRole: { canManageEngineCurations: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineCurationsLink"]')).toHaveLength(1);
-  });
-
-  it('renders a results settings link', () => {
-    setMockValues({ ...values, myRole: { canManageEngineResultSettings: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineResultSettingsLink"]')).toHaveLength(1);
-  });
-
-  it('renders a Search UI link', () => {
-    setMockValues({ ...values, myRole: { canManageEngineSearchUi: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineSearchUILink"]')).toHaveLength(1);
-  });
-
-  it('renders an API logs link', () => {
-    setMockValues({ ...values, myRole: { canViewEngineApiLogs: true } });
-    const wrapper = shallow(<EngineNav />);
-    expect(wrapper.find('[data-test-subj="EngineAPILogsLink"]')).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
index 76e751cf4da5f..70f2d04a5123d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
@@ -10,17 +10,10 @@ import { useRouteMatch } from 'react-router-dom';
 
 import { useValues } from 'kea';
 
-import {
-  EuiSideNavItemType,
-  EuiText,
-  EuiBadge,
-  EuiIcon,
-  EuiFlexGroup,
-  EuiFlexItem,
-} from '@elastic/eui';
+import { EuiSideNavItemType, EuiText, EuiBadge, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { generateNavLink, SideNavLink, SideNavItem } from '../../../shared/layout';
+import { generateNavLink } from '../../../shared/layout';
 import { AppLogic } from '../../app_logic';
 import {
   ENGINE_PATH,
@@ -49,8 +42,6 @@ import { SCHEMA_TITLE } from '../schema';
 import { SEARCH_UI_TITLE } from '../search_ui';
 import { SYNONYMS_TITLE } from '../synonyms';
 
-import { EngineDetails } from './types';
-
 import { EngineLogic, generateEnginePath } from './';
 
 import './engine_nav.scss';
@@ -198,7 +189,10 @@ export const useEngineNav = () => {
     navItems.push({
       id: 'crawler',
       name: CRAWLER_TITLE,
-      ...generateNavLink({ to: generateEnginePath(ENGINE_CRAWLER_PATH) }),
+      ...generateNavLink({
+        to: generateEnginePath(ENGINE_CRAWLER_PATH),
+        shouldShowActiveForSubroutes: true,
+      }),
       'data-test-subj': 'EngineCrawlerLink',
     });
   }
@@ -301,220 +295,3 @@ export const useEngineNav = () => {
 
   return navItems;
 };
-
-// TODO: Delete the below once page template migration is complete
-
-export const EngineNav: React.FC = () => {
-  const {
-    myRole: {
-      canViewEngineAnalytics,
-      canViewEngineDocuments,
-      canViewEngineSchema,
-      canViewEngineCrawler,
-      canViewMetaEngineSourceEngines,
-      canManageEngineSynonyms,
-      canManageEngineCurations,
-      canManageEngineRelevanceTuning,
-      canManageEngineResultSettings,
-      canManageEngineSearchUi,
-      canViewEngineApiLogs,
-    },
-  } = useValues(AppLogic);
-
-  const {
-    engineName,
-    dataLoading,
-    isSampleEngine,
-    isMetaEngine,
-    hasSchemaErrors,
-    hasSchemaConflicts,
-    hasUnconfirmedSchemaFields,
-    engine,
-  } = useValues(EngineLogic);
-
-  if (dataLoading) return null;
-  if (!engineName) return null;
-
-  const { invalidBoosts, unsearchedUnconfirmedFields } = engine as Required<EngineDetails>;
-
-  return (
-    <>
-      <SideNavItem className="appSearchNavEngineLabel" data-test-subj="EngineLabel">
-        <EuiText color="subdued" size="s">
-          <div className="eui-textTruncate">{engineName.toUpperCase()}</div>
-          {isSampleEngine && (
-            <EuiBadge>
-              {i18n.translate('xpack.enterpriseSearch.appSearch.engine.sampleEngineBadge', {
-                defaultMessage: 'SAMPLE ENGINE',
-              })}
-            </EuiBadge>
-          )}
-          {isMetaEngine && (
-            <EuiBadge>
-              {i18n.translate('xpack.enterpriseSearch.appSearch.engine.metaEngineBadge', {
-                defaultMessage: 'META ENGINE',
-              })}
-            </EuiBadge>
-          )}
-        </EuiText>
-      </SideNavItem>
-      <SideNavLink to={generateEnginePath(ENGINE_PATH)} data-test-subj="EngineOverviewLink">
-        {OVERVIEW_TITLE}
-      </SideNavLink>
-      {canViewEngineAnalytics && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_ANALYTICS_PATH)}
-          shouldShowActiveForSubroutes
-          data-test-subj="EngineAnalyticsLink"
-        >
-          {ANALYTICS_TITLE}
-        </SideNavLink>
-      )}
-      {canViewEngineDocuments && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_DOCUMENTS_PATH)}
-          shouldShowActiveForSubroutes
-          data-test-subj="EngineDocumentsLink"
-        >
-          {DOCUMENTS_TITLE}
-        </SideNavLink>
-      )}
-      {canViewEngineSchema && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_SCHEMA_PATH)}
-          shouldShowActiveForSubroutes
-          data-test-subj="EngineSchemaLink"
-        >
-          <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" responsive={false}>
-            <EuiFlexItem>{SCHEMA_TITLE}</EuiFlexItem>
-            <EuiFlexItem className="appSearchNavIcons">
-              {hasSchemaErrors && (
-                <EuiIcon
-                  type="alert"
-                  color="danger"
-                  title={i18n.translate('xpack.enterpriseSearch.appSearch.engine.schema.errors', {
-                    defaultMessage: 'Schema change errors',
-                  })}
-                  data-test-subj="EngineNavSchemaErrors"
-                />
-              )}
-              {hasUnconfirmedSchemaFields && (
-                <EuiIcon
-                  type="iInCircle"
-                  color="primary"
-                  title={i18n.translate(
-                    'xpack.enterpriseSearch.appSearch.engine.schema.unconfirmedFields',
-                    { defaultMessage: 'New unconfirmed fields' }
-                  )}
-                  data-test-subj="EngineNavSchemaUnconfirmedFields"
-                />
-              )}
-              {hasSchemaConflicts && (
-                <EuiIcon
-                  type="alert"
-                  color="warning"
-                  title={i18n.translate(
-                    'xpack.enterpriseSearch.appSearch.engine.schema.conflicts',
-                    { defaultMessage: 'Schema conflicts' }
-                  )}
-                  data-test-subj="EngineNavSchemaConflicts"
-                />
-              )}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </SideNavLink>
-      )}
-      {canViewEngineCrawler && !isMetaEngine && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_CRAWLER_PATH)}
-          data-test-subj="EngineCrawlerLink"
-        >
-          {CRAWLER_TITLE}
-        </SideNavLink>
-      )}
-      {canViewMetaEngineSourceEngines && isMetaEngine && (
-        <SideNavLink
-          to={generateEnginePath(META_ENGINE_SOURCE_ENGINES_PATH)}
-          data-test-subj="MetaEngineEnginesLink"
-        >
-          {ENGINES_TITLE}
-        </SideNavLink>
-      )}
-      {canManageEngineRelevanceTuning && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_RELEVANCE_TUNING_PATH)}
-          data-test-subj="EngineRelevanceTuningLink"
-        >
-          <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" responsive={false}>
-            <EuiFlexItem>{RELEVANCE_TUNING_TITLE}</EuiFlexItem>
-            <EuiFlexItem className="appSearchNavIcons">
-              {invalidBoosts && (
-                <EuiIcon
-                  type="alert"
-                  color="warning"
-                  title={i18n.translate(
-                    'xpack.enterpriseSearch.appSearch.engine.relevanceTuning.invalidBoosts',
-                    { defaultMessage: 'Invalid boosts' }
-                  )}
-                  data-test-subj="EngineNavRelevanceTuningInvalidBoosts"
-                />
-              )}
-              {unsearchedUnconfirmedFields && (
-                <EuiIcon
-                  type="alert"
-                  color="warning"
-                  title={i18n.translate(
-                    'xpack.enterpriseSearch.appSearch.engine.relevanceTuning.unsearchedFields',
-                    { defaultMessage: 'Unsearched fields' }
-                  )}
-                  data-test-subj="EngineNavRelevanceTuningUnsearchedFields"
-                />
-              )}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </SideNavLink>
-      )}
-      {canManageEngineSynonyms && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_SYNONYMS_PATH)}
-          data-test-subj="EngineSynonymsLink"
-        >
-          {SYNONYMS_TITLE}
-        </SideNavLink>
-      )}
-      {canManageEngineCurations && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_CURATIONS_PATH)}
-          shouldShowActiveForSubroutes
-          data-test-subj="EngineCurationsLink"
-        >
-          {CURATIONS_TITLE}
-        </SideNavLink>
-      )}
-      {canManageEngineResultSettings && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_RESULT_SETTINGS_PATH)}
-          data-test-subj="EngineResultSettingsLink"
-        >
-          {RESULT_SETTINGS_TITLE}
-        </SideNavLink>
-      )}
-      {canManageEngineSearchUi && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_SEARCH_UI_PATH)}
-          data-test-subj="EngineSearchUILink"
-        >
-          {SEARCH_UI_TITLE}
-        </SideNavLink>
-      )}
-      {canViewEngineApiLogs && (
-        <SideNavLink
-          to={generateEnginePath(ENGINE_API_LOGS_PATH)}
-          data-test-subj="EngineAPILogsLink"
-        >
-          {API_LOGS_TITLE}
-        </SideNavLink>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/index.ts
index 2a5b3351f41f7..86b4ff21e62d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/index.ts
@@ -6,6 +6,5 @@
  */
 
 export { EngineRouter } from './engine_router';
-export { EngineNav } from './engine_nav';
 export { EngineLogic } from './engine_logic';
 export { generateEnginePath, getEngineBreadcrumbs } from './utils';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 46596cc5d6765..6647b4032e4bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -7,7 +7,6 @@
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
 import { setMockValues } from '../__mocks__/kea_logic';
-import { mockUseRouteMatch } from '../__mocks__/react_router';
 import '../__mocks__/shallow_useeffect.mock';
 import '../__mocks__/enterprise_search_url.mock';
 
@@ -17,15 +16,13 @@ import { Redirect } from 'react-router-dom';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
-import { SideNav, SideNavLink } from '../shared/layout';
-
 import { rerender } from '../test_helpers';
 
 jest.mock('./app_logic', () => ({ AppLogic: jest.fn() }));
 import { AppLogic } from './app_logic';
 
 import { Credentials } from './components/credentials';
-import { EngineRouter, EngineNav } from './components/engine';
+import { EngineRouter } from './components/engine';
 import { EngineCreation } from './components/engine_creation';
 import { EnginesOverview } from './components/engines';
 import { ErrorConnecting } from './components/error_connecting';
@@ -35,7 +32,7 @@ import { RoleMappings } from './components/role_mappings';
 import { Settings } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
 
-import { AppSearch, AppSearchUnconfigured, AppSearchConfigured, AppSearchNav } from './';
+import { AppSearch, AppSearchUnconfigured, AppSearchConfigured } from './';
 
 describe('AppSearch', () => {
   it('always renders the Setup Guide', () => {
@@ -142,51 +139,3 @@ describe('AppSearchConfigured', () => {
     });
   });
 });
-
-describe('AppSearchNav', () => {
-  it('renders with the Engines link', () => {
-    const wrapper = shallow(<AppSearchNav />);
-
-    expect(wrapper.find(SideNav)).toHaveLength(1);
-    expect(wrapper.find(SideNavLink).prop('to')).toEqual('/engines');
-  });
-
-  describe('engine subnavigation', () => {
-    const getEnginesLink = (wrapper: ShallowWrapper) => wrapper.find(SideNavLink).dive();
-
-    it('does not render the engine subnav on top-level routes', () => {
-      mockUseRouteMatch.mockReturnValueOnce(false);
-      const wrapper = shallow(<AppSearchNav />);
-
-      expect(getEnginesLink(wrapper).find(EngineNav)).toHaveLength(0);
-    });
-
-    it('renders the engine subnav if currently on an engine route', () => {
-      mockUseRouteMatch.mockReturnValueOnce(true);
-      const wrapper = shallow(<AppSearchNav />);
-
-      expect(getEnginesLink(wrapper).find(EngineNav)).toHaveLength(1);
-    });
-  });
-
-  it('renders the Settings link', () => {
-    setMockValues({ myRole: { canViewSettings: true } });
-    const wrapper = shallow(<AppSearchNav />);
-
-    expect(wrapper.find(SideNavLink).last().prop('to')).toEqual('/settings');
-  });
-
-  it('renders the Credentials link', () => {
-    setMockValues({ myRole: { canViewAccountCredentials: true } });
-    const wrapper = shallow(<AppSearchNav />);
-
-    expect(wrapper.find(SideNavLink).last().prop('to')).toEqual('/credentials');
-  });
-
-  it('renders the Role Mappings link', () => {
-    setMockValues({ myRole: { canViewRoleMappings: true } });
-    const wrapper = shallow(<AppSearchNav />);
-
-    expect(wrapper.find(SideNavLink).last().prop('to')).toEqual('/users_and_roles');
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 6d049b2015487..11f706bff028f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -6,30 +6,26 @@
  */
 
 import React, { useEffect } from 'react';
-import { Route, Redirect, Switch, useRouteMatch } from 'react-router-dom';
+import { Route, Redirect, Switch } from 'react-router-dom';
 
 import { useValues } from 'kea';
 
-import { APP_SEARCH_PLUGIN } from '../../../common/constants';
 import { InitialAppData } from '../../../common/types';
 import { HttpLogic } from '../shared/http';
 import { KibanaLogic } from '../shared/kibana';
-import { SideNav, SideNavLink } from '../shared/layout';
-
-import { ROLE_MAPPINGS_TITLE } from '../shared/role_mapping/constants';
 
 import { AppLogic } from './app_logic';
-import { Credentials, CREDENTIALS_TITLE } from './components/credentials';
-import { EngineNav, EngineRouter } from './components/engine';
+import { Credentials } from './components/credentials';
+import { EngineRouter } from './components/engine';
 import { EngineCreation } from './components/engine_creation';
-import { EnginesOverview, ENGINES_TITLE } from './components/engines';
+import { EnginesOverview } from './components/engines';
 import { ErrorConnecting } from './components/error_connecting';
 import { KibanaHeaderActions } from './components/layout';
 import { Library } from './components/library';
 import { MetaEngineCreation } from './components/meta_engine_creation';
 import { NotFound } from './components/not_found';
 import { RoleMappings } from './components/role_mappings';
-import { Settings, SETTINGS_TITLE } from './components/settings';
+import { Settings } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
 import {
   ENGINE_CREATION_PATH,
@@ -137,28 +133,3 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
     </Switch>
   );
 };
-
-export const AppSearchNav: React.FC = () => {
-  const {
-    myRole: { canViewSettings, canViewAccountCredentials, canViewRoleMappings },
-  } = useValues(AppLogic);
-
-  const isEngineRoute = !!useRouteMatch(ENGINE_PATH);
-
-  return (
-    <SideNav product={APP_SEARCH_PLUGIN}>
-      <SideNavLink to={ENGINES_PATH} subNav={isEngineRoute ? <EngineNav /> : null} isRoot>
-        {ENGINES_TITLE}
-      </SideNavLink>
-      {canViewSettings && <SideNavLink to={SETTINGS_PATH}>{SETTINGS_TITLE}</SideNavLink>}
-      {canViewAccountCredentials && (
-        <SideNavLink to={CREDENTIALS_PATH}>{CREDENTIALS_TITLE}</SideNavLink>
-      )}
-      {canViewRoleMappings && (
-        <SideNavLink shouldShowActiveForSubroutes to={USERS_AND_ROLES_PATH}>
-          {ROLE_MAPPINGS_TITLE}
-        </SideNavLink>
-      )}
-    </SideNav>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
index 856d483e174a6..41f8869ad5f61 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
@@ -7,7 +7,3 @@
 
 export { EnterpriseSearchPageTemplate, PageTemplateProps } from './page_template';
 export { generateNavLink } from './nav_link_helpers';
-
-// TODO: Delete these once KibanaPageTemplate migration is done
-export { Layout } from './layout';
-export { SideNav, SideNavLink, SideNavItem } from './side_nav';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.scss b/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.scss
deleted file mode 100644
index 88799406070cd..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.scss
+++ /dev/null
@@ -1,96 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-.enterpriseSearchLayout {
-  $sideBarWidth: $euiSize * 15;
-  $sideBarMobileHeight: $euiSize * 4.75;
-  $consoleHeaderHeight: 98px; // NOTE: Keep an eye on this for changes
-  $pageHeight: calc(100vh - #{$consoleHeaderHeight});
-
-  display: block;
-  background-color: $euiColorEmptyShade;
-  min-height: $pageHeight;
-  position: relative;
-  left: $sideBarWidth;
-  width: calc(100% - #{$sideBarWidth});
-  padding: 0;
-
-  @include euiBreakpoint('xs', 's', 'm') {
-    left: auto;
-    width: 100%;
-  }
-
-  &__sideBarToggle {
-    display: none;
-
-    @include euiBreakpoint('xs', 's', 'm') {
-      display: block;
-
-      position: absolute;
-      right: $euiSize;
-      top: $sideBarMobileHeight / 2;
-      transform: translateY(-50%) scale(.9);
-
-      .euiButton {
-        min-width: 0;
-      }
-    }
-  }
-
-  &__sideBar {
-    z-index: $euiZNavigation;
-    position: fixed;
-    margin-left: -1 * $sideBarWidth;
-    margin-right: 0;
-    overflow-y: auto;
-    overflow-x: hidden;
-
-    height: $pageHeight;
-    width: $sideBarWidth;
-
-    background-color: $euiColorLightestShade;
-    box-shadow: inset (-1 * $euiSizeXS) 0 $euiSizeS (-1 * $euiSizeXS) rgba($euiShadowColor, .25);
-
-    @include euiBreakpoint('xs', 's', 'm') {
-      position: relative;
-      width: 100%;
-      height: $sideBarMobileHeight;
-      margin-left: 0;
-      overflow-y: hidden;
-
-      border-bottom: $euiBorderThin;
-      box-shadow: none;
-
-      &--isOpen {
-        height: auto;
-        overflow-y: auto;
-      }
-    }
-  }
-
-  &__body {
-    padding: $euiSizeXXL;
-
-    @include euiBreakpoint('m') {
-      padding: $euiSizeL;
-    }
-    @include euiBreakpoint('xs', 's') {
-      padding: $euiSize;
-    }
-  }
-
-  &__readOnlyMode {
-    margin: -$euiSizeM 0 $euiSizeL;
-
-    @include euiBreakpoint('m') {
-      margin: 0 0 $euiSizeL;
-    }
-    @include euiBreakpoint('xs', 's') {
-      margin: 0;
-    }
-  }
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx
deleted file mode 100644
index 28092f75cdede..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx
+++ /dev/null
@@ -1,77 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { EuiPageSideBar, EuiButton, EuiPageBody, EuiCallOut } from '@elastic/eui';
-
-import { Layout, INavContext } from './layout';
-
-describe('Layout', () => {
-  it('renders', () => {
-    const wrapper = shallow(<Layout navigation={null} />);
-
-    expect(wrapper.find('.enterpriseSearchLayout')).toHaveLength(1);
-    expect(wrapper.find(EuiPageBody).prop('restrictWidth')).toBeFalsy();
-  });
-
-  it('passes the restrictWidth prop', () => {
-    const wrapper = shallow(<Layout navigation={null} restrictWidth />);
-
-    expect(wrapper.find(EuiPageBody).prop('restrictWidth')).toEqual(true);
-  });
-
-  it('renders navigation', () => {
-    const wrapper = shallow(<Layout navigation={<nav className="nav-test">Hello World</nav>} />);
-
-    expect(wrapper.find('.enterpriseSearchLayout__sideBar')).toHaveLength(1);
-    expect(wrapper.find('.nav-test')).toHaveLength(1);
-  });
-
-  it('renders navigation toggle state', () => {
-    const wrapper = shallow(<Layout navigation={<nav className="nav-test">Hello World</nav>} />);
-    expect(wrapper.find(EuiPageSideBar).prop('className')).not.toContain('--isOpen');
-    expect(wrapper.find(EuiButton).prop('iconType')).toEqual('arrowRight');
-
-    const toggle = wrapper.find('[data-test-subj="enterpriseSearchNavToggle"]');
-    toggle.simulate('click');
-
-    expect(wrapper.find(EuiPageSideBar).prop('className')).toContain('--isOpen');
-    expect(wrapper.find(EuiButton).prop('iconType')).toEqual('arrowDown');
-  });
-
-  it('passes down NavContext to navigation links', () => {
-    const wrapper = shallow(<Layout navigation={<nav />} />);
-
-    const toggle = wrapper.find('[data-test-subj="enterpriseSearchNavToggle"]');
-    toggle.simulate('click');
-    expect(wrapper.find(EuiPageSideBar).prop('className')).toContain('--isOpen');
-
-    const context = (wrapper.find('ContextProvider').prop('value') as unknown) as INavContext;
-    context.closeNavigation();
-    expect(wrapper.find(EuiPageSideBar).prop('className')).not.toContain('--isOpen');
-  });
-
-  it('renders a read-only mode callout', () => {
-    const wrapper = shallow(<Layout navigation={null} readOnlyMode />);
-
-    expect(wrapper.find(EuiCallOut)).toHaveLength(1);
-  });
-
-  it('renders children', () => {
-    const wrapper = shallow(
-      <Layout navigation={null}>
-        <div className="testing">Test</div>
-      </Layout>
-    );
-
-    expect(wrapper.find('.enterpriseSearchLayout__body')).toHaveLength(1);
-    expect(wrapper.find('.testing')).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.tsx
deleted file mode 100644
index 9cf5fccddbd5b..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.tsx
+++ /dev/null
@@ -1,82 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-
-import classNames from 'classnames';
-
-import { EuiPage, EuiPageSideBar, EuiPageBody, EuiButton, EuiCallOut } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import './layout.scss';
-
-interface LayoutProps {
-  navigation: React.ReactNode;
-  restrictWidth?: boolean;
-  readOnlyMode?: boolean;
-}
-
-export interface INavContext {
-  closeNavigation(): void;
-}
-export const NavContext = React.createContext({});
-
-export const Layout: React.FC<LayoutProps> = ({
-  children,
-  navigation,
-  restrictWidth,
-  readOnlyMode,
-}) => {
-  const [isNavOpen, setIsNavOpen] = useState(false);
-  const toggleNavigation = () => setIsNavOpen(!isNavOpen);
-  const closeNavigation = () => setIsNavOpen(false);
-
-  const navClasses = classNames('enterpriseSearchLayout__sideBar', {
-    'enterpriseSearchLayout__sideBar--isOpen': isNavOpen, // eslint-disable-line @typescript-eslint/naming-convention
-  });
-
-  return (
-    <EuiPage className="enterpriseSearchLayout">
-      <EuiPageSideBar className={navClasses}>
-        <div className="enterpriseSearchLayout__sideBarToggle">
-          <EuiButton
-            size="s"
-            iconType={isNavOpen ? 'arrowDown' : 'arrowRight'}
-            iconSide="right"
-            aria-label={i18n.translate('xpack.enterpriseSearch.nav.toggleMenu', {
-              defaultMessage: 'Toggle secondary navigation',
-            })}
-            aria-expanded={isNavOpen}
-            aria-pressed={isNavOpen}
-            aria-controls="enterpriseSearchNav"
-            onClick={toggleNavigation}
-            data-test-subj="enterpriseSearchNavToggle"
-          >
-            {i18n.translate('xpack.enterpriseSearch.nav.menu', {
-              defaultMessage: 'Menu',
-            })}
-          </EuiButton>
-        </div>
-        <NavContext.Provider value={{ closeNavigation }}>{navigation}</NavContext.Provider>
-      </EuiPageSideBar>
-      <EuiPageBody className="enterpriseSearchLayout__body" restrictWidth={restrictWidth}>
-        {readOnlyMode && (
-          <EuiCallOut
-            className="enterpriseSearchLayout__readOnlyMode"
-            color="warning"
-            iconType="lock"
-            title={i18n.translate('xpack.enterpriseSearch.readOnlyMode.warning', {
-              defaultMessage:
-                'Enterprise Search is in read-only mode. You will be unable to make changes such as creating, editing, or deleting.',
-            })}
-          />
-        )}
-        {children}
-      </EuiPageBody>
-    </EuiPage>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.scss b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.scss
deleted file mode 100644
index f6a1ebed7ba93..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.scss
+++ /dev/null
@@ -1,87 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-$euiSizeML: $euiSize * 1.25; // 20px - between medium and large ¯\_(ツ)_/¯
-
-.enterpriseSearchProduct {
-  display: flex;
-  align-items: center;
-  padding: $euiSizeML;
-
-  background-image: url('./side_nav_bg.svg');
-  background-repeat: no-repeat;
-
-  @include euiBreakpoint('xs', 's', 'm') {
-    padding: $euiSize $euiSizeML;
-  }
-
-  &__icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    width: $euiSizeXXL;
-    height: $euiSizeXXL;
-    margin-right: $euiSizeS;
-
-    background-color: $euiColorEmptyShade;
-    border-radius: 50%;
-    @include euiSlightShadow();
-
-    .euiIcon {
-      width: $euiSizeML;
-      height: $euiSizeML;
-    }
-  }
-
-  &__title {
-    .euiText {
-      font-weight: $euiFontWeightMedium;
-    }
-  }
-}
-
-.enterpriseSearchNavLinks {
-  &__item {
-    display: block;
-    padding: $euiSizeM $euiSizeML;
-    font-size: $euiFontSizeS;
-    font-weight: $euiFontWeightMedium;
-    line-height: $euiFontSizeM;
-
-    $activeBgColor: rgba($euiColorFullShade, .05);
-
-    &--isActive {
-      background-color: $activeBgColor;
-    }
-
-    &.euiLink {
-      color: $euiTextColor;
-      font-weight: $euiFontWeightMedium;
-
-      &:hover {
-        color: $euiTextColor;
-      }
-
-      &:focus {
-        outline: solid 0 $activeBgColor;
-        background-color: $activeBgColor;
-      }
-    }
-  }
-
-  &__subNav {
-    padding-left: $euiSizeML;
-
-    // Extends the click area of links more to the left, so that second tiers
-    // of subnavigation links still have the same hitbox as first tier links
-    .enterpriseSearchNavLinks__item {
-      margin-left: -$euiSizeML;
-      padding-left: $euiSizeXXL;
-    }
-  }
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
deleted file mode 100644
index 244037d6e1382..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
+++ /dev/null
@@ -1,166 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { mockLocation } from '../../__mocks__/react_router';
-
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { EuiLink } from '@elastic/eui';
-
-import { ENTERPRISE_SEARCH_PLUGIN, APP_SEARCH_PLUGIN } from '../../../../common/constants';
-import { EuiLinkTo } from '../react_router_helpers';
-
-import { SideNav, SideNavLink, SideNavItem } from './';
-
-describe('SideNav', () => {
-  it('renders link children', () => {
-    const wrapper = shallow(
-      <SideNav product={ENTERPRISE_SEARCH_PLUGIN}>
-        <div className="testing">Hello World</div>
-      </SideNav>
-    );
-
-    expect(wrapper.type()).toEqual('nav');
-    expect(wrapper.find('.enterpriseSearchNavLinks')).toHaveLength(1);
-    expect(wrapper.find('.testing')).toHaveLength(1);
-  });
-
-  it('renders a custom product', () => {
-    const wrapper = shallow(<SideNav product={APP_SEARCH_PLUGIN} />);
-
-    expect(wrapper.find('h3').text()).toEqual('App Search');
-    expect(wrapper.find('.enterpriseSearchProduct--appSearch')).toHaveLength(1);
-  });
-});
-
-describe('SideNavLink', () => {
-  it('renders', () => {
-    const wrapper = shallow(<SideNavLink to="/">Link</SideNavLink>);
-
-    expect(wrapper.type()).toEqual('li');
-    expect(wrapper.find(EuiLinkTo)).toHaveLength(1);
-    expect(wrapper.find('.enterpriseSearchNavLinks__item')).toHaveLength(1);
-  });
-
-  it('renders an external link if isExternal is true', () => {
-    const wrapper = shallow(
-      <SideNavLink to="http://website.com" isExternal>
-        Link
-      </SideNavLink>
-    );
-    const externalLink = wrapper.find(EuiLink);
-
-    expect(externalLink).toHaveLength(1);
-    expect(externalLink.prop('href')).toEqual('http://website.com');
-    expect(externalLink.prop('target')).toEqual('_blank');
-  });
-
-  it('sets an active class if the current path matches the nav link', () => {
-    mockLocation.pathname = '/test/';
-
-    const wrapper = shallow(<SideNavLink to="/test">Link</SideNavLink>);
-
-    expect(wrapper.find('.enterpriseSearchNavLinks__item--isActive')).toHaveLength(1);
-  });
-
-  it('sets an active class if the current path is / and the link isRoot', () => {
-    mockLocation.pathname = '/';
-
-    const wrapper = shallow(
-      <SideNavLink to="/test" isRoot>
-        Link
-      </SideNavLink>
-    );
-
-    expect(wrapper.find('.enterpriseSearchNavLinks__item--isActive')).toHaveLength(1);
-  });
-
-  it('passes down custom classes and props', () => {
-    const wrapper = shallow(
-      <SideNavLink to="/" className="testing" data-test-subj="testing">
-        Link
-      </SideNavLink>
-    );
-
-    expect(wrapper.find('.testing')).toHaveLength(1);
-    expect(wrapper.find('[data-test-subj="testing"]')).toHaveLength(1);
-  });
-
-  it('renders nested subnavigation', () => {
-    const subNav = (
-      <SideNavLink to="/elsewhere" data-test-subj="subNav">
-        Another link!
-      </SideNavLink>
-    );
-    const wrapper = shallow(
-      <SideNavLink to="/" subNav={subNav}>
-        Link
-      </SideNavLink>
-    );
-
-    expect(wrapper.find('.enterpriseSearchNavLinks__subNav')).toHaveLength(1);
-    expect(wrapper.find('[data-test-subj="subNav"]')).toHaveLength(1);
-  });
-
-  describe('shouldShowActiveForSubroutes', () => {
-    it("won't set an active class when route is a subroute of 'to'", () => {
-      mockLocation.pathname = '/documents/1234';
-
-      const wrapper = shallow(
-        <SideNavLink to="/documents" isRoot>
-          Link
-        </SideNavLink>
-      );
-
-      expect(wrapper.find('.enterpriseSearchNavLinks__item--isActive')).toHaveLength(0);
-    });
-
-    it('sets an active class if the current path is a subRoute of "to", and shouldShowActiveForSubroutes is true', () => {
-      mockLocation.pathname = '/documents/1234';
-
-      const wrapper = shallow(
-        <SideNavLink to="/documents" isRoot shouldShowActiveForSubroutes>
-          Link
-        </SideNavLink>
-      );
-
-      expect(wrapper.find('.enterpriseSearchNavLinks__item--isActive')).toHaveLength(1);
-    });
-  });
-});
-
-describe('SideNavItem', () => {
-  it('renders', () => {
-    const wrapper = shallow(<SideNavItem>Test</SideNavItem>);
-
-    expect(wrapper.type()).toEqual('li');
-    expect(wrapper.find('.enterpriseSearchNavLinks__item')).toHaveLength(1);
-  });
-
-  it('renders children', () => {
-    const wrapper = shallow(
-      <SideNavItem>
-        <span data-test-subj="hello">World</span>
-      </SideNavItem>
-    );
-
-    expect(wrapper.find('[data-test-subj="hello"]').text()).toEqual('World');
-  });
-
-  it('passes down custom classes and props', () => {
-    const wrapper = shallow(
-      <SideNavItem className="testing" data-test-subj="testing">
-        Test
-      </SideNavItem>
-    );
-
-    expect(wrapper.find('.testing')).toHaveLength(1);
-    expect(wrapper.find('[data-test-subj="testing"]')).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.tsx
deleted file mode 100644
index 58a5c7bbb229f..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.tsx
+++ /dev/null
@@ -1,130 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useContext } from 'react';
-import { useLocation } from 'react-router-dom';
-
-import classNames from 'classnames';
-
-import { EuiIcon, EuiTitle, EuiText, EuiLink } from '@elastic/eui'; // TODO: Remove EuiLink after full Kibana transition
-import { i18n } from '@kbn/i18n';
-
-import { ENTERPRISE_SEARCH_PLUGIN } from '../../../../common/constants';
-import { stripTrailingSlash } from '../../../../common/strip_slashes';
-import { EuiLinkTo } from '../react_router_helpers';
-
-import { NavContext, INavContext } from './layout';
-
-import './side_nav.scss';
-
-/**
- * Side navigation - product & icon + links wrapper
- */
-
-interface SideNavProps {
-  // Expects product plugin constants (@see common/constants.ts)
-  product: {
-    NAME: string;
-    ID: string;
-  };
-}
-
-export const SideNav: React.FC<SideNavProps> = ({ product, children }) => {
-  return (
-    <nav
-      id="enterpriseSearchNav"
-      aria-label={i18n.translate('xpack.enterpriseSearch.nav.hierarchy', {
-        defaultMessage: 'Secondary', // The main Kibana nav is primary
-      })}
-    >
-      <div className={`enterpriseSearchProduct enterpriseSearchProduct--${product.ID}`}>
-        <div className="enterpriseSearchProduct__icon">
-          <EuiIcon type="logoEnterpriseSearch" />
-        </div>
-        <div className="enterpriseSearchProduct__title">
-          <EuiText size="xs" color="subdued">
-            {ENTERPRISE_SEARCH_PLUGIN.NAME}
-          </EuiText>
-          <EuiTitle size="xs">
-            <h3>{product.NAME}</h3>
-          </EuiTitle>
-        </div>
-      </div>
-      <ul className="enterpriseSearchNavLinks">{children}</ul>
-    </nav>
-  );
-};
-
-/**
- * Side navigation link item
- */
-
-interface SideNavLinkProps {
-  to: string;
-  shouldShowActiveForSubroutes?: boolean;
-  isExternal?: boolean;
-  className?: string;
-  isRoot?: boolean;
-  subNav?: React.ReactNode;
-}
-
-export const SideNavLink: React.FC<SideNavLinkProps> = ({
-  to,
-  shouldShowActiveForSubroutes = false,
-  isExternal,
-  children,
-  className,
-  isRoot,
-  subNav,
-  ...rest
-}) => {
-  const { closeNavigation } = useContext(NavContext) as INavContext;
-
-  const { pathname } = useLocation();
-  const currentPath = stripTrailingSlash(pathname);
-  const isActive =
-    currentPath === to ||
-    (shouldShowActiveForSubroutes && currentPath.startsWith(to)) ||
-    (isRoot && currentPath === '');
-
-  const classes = classNames('enterpriseSearchNavLinks__item', className, {
-    'enterpriseSearchNavLinks__item--isActive': !isExternal && isActive, // eslint-disable-line @typescript-eslint/naming-convention
-  });
-
-  return (
-    <li>
-      {isExternal ? (
-        // eslint-disable-next-line @elastic/eui/href-or-on-click
-        <EuiLink {...rest} className={classes} href={to} target="_blank" onClick={closeNavigation}>
-          {children}
-        </EuiLink>
-      ) : (
-        <EuiLinkTo {...rest} className={classes} to={to} onClick={closeNavigation}>
-          {children}
-        </EuiLinkTo>
-      )}
-      {subNav && <ul className="enterpriseSearchNavLinks__subNav">{subNav}</ul>}
-    </li>
-  );
-};
-
-/**
- * Side navigation non-link item
- */
-
-interface SideNavItemProps {
-  className?: string;
-}
-
-export const SideNavItem: React.FC<SideNavItemProps> = ({ children, className, ...rest }) => {
-  const classes = classNames('enterpriseSearchNavLinks__item', className);
-  return (
-    <li {...rest} className={classes}>
-      {children}
-    </li>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav_bg.svg b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav_bg.svg
deleted file mode 100644
index a19227ab7b7eb..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav_bg.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<svg width="240" height="185" viewBox="0 0 240 185" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="240" height="185">
-    <rect width="240" height="185" fill="#F7F8F9"/>
-  </mask>
-  <g mask="url(#mask0)">
-    <circle opacity="0.06" cx="-8" cy="3" r="149" fill="url(#paint0_linear)"/>
-    <path d="M57 3C57 38.3462 27.8985 67 -8 67C-43.8985 67 -73 38.3462 -73 3C-73 -32.3462 -43.8985 -61 -8 -61C27.8985 -61 57 -32.3462 57 3Z" fill="url(#paint1_linear)"/>
-    <circle opacity="0.33" cx="-8" cy="3" r="32" fill="black"/>
-    <circle cx="-8" cy="3" r="24" fill="url(#paint2_linear)"/>
-  </g>
-  <defs>
-    <linearGradient id="paint0_linear" x1="45.5" y1="-59.5" x2="104.5" y2="75" gradientUnits="userSpaceOnUse">
-      <stop/>
-      <stop offset="1" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient id="paint1_linear" x1="22" y1="-6" x2="-8" y2="67" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#009187"/>
-      <stop offset="1" stop-color="#01BEB2"/>
-    </linearGradient>
-    <linearGradient id="paint2_linear" x1="-8" y1="5.5" x2="-8" y2="27" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#D5A100"/>
-      <stop offset="1" stop-color="#FEC514"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts
index 8cdc133681762..0cc39f66e3d20 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts
@@ -6,7 +6,7 @@
  */
 
 export { WorkplaceSearchPageTemplate } from './page_template';
-export { useWorkplaceSearchNav, WorkplaceSearchNav } from './nav';
+export { useWorkplaceSearchNav } from './nav';
 export { WorkplaceSearchHeaderActions } from './kibana_header_actions';
 export { AccountHeader } from './account_header';
 export { PersonalDashboardLayout } from './personal_dashboard_layout';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
index 04576e981e104..65a6a798b032a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
@@ -6,7 +6,6 @@
  */
 
 jest.mock('../../../shared/layout', () => ({
-  ...jest.requireActual('../../../shared/layout'),
   generateNavLink: jest.fn(({ to, items }) => ({ href: to, items })),
 }));
 jest.mock('../../views/content_sources/components/source_sub_nav', () => ({
@@ -19,13 +18,7 @@ jest.mock('../../views/settings/components/settings_sub_nav', () => ({
   useSettingsSubNav: () => [],
 }));
 
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { SideNav, SideNavLink } from '../../../shared/layout';
-
-import { useWorkplaceSearchNav, WorkplaceSearchNav } from './';
+import { useWorkplaceSearchNav } from './';
 
 describe('useWorkplaceSearchNav', () => {
   it('returns an array of top-level Workplace Search nav items', () => {
@@ -72,15 +65,3 @@ describe('useWorkplaceSearchNav', () => {
     ]);
   });
 });
-
-// TODO: Delete below once fully migrated to KibanaPageTemplate
-
-describe('WorkplaceSearchNav', () => {
-  it('renders', () => {
-    const wrapper = shallow(<WorkplaceSearchNav />);
-
-    expect(wrapper.find(SideNav)).toHaveLength(1);
-    expect(wrapper.find(SideNavLink).first().prop('to')).toEqual('/');
-    expect(wrapper.find(SideNavLink)).toHaveLength(6);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
index c8d821dcdae2e..7dc005a56bf10 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-import React from 'react';
+import { EuiSideNavItemType } from '@elastic/eui';
 
-import { EuiSideNavItemType, EuiSpacer } from '@elastic/eui';
-
-import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
-import { generateNavLink, SideNav, SideNavLink } from '../../../shared/layout';
+import { generateNavLink } from '../../../shared/layout';
 import { NAV } from '../../constants';
 import {
   SOURCES_PATH,
@@ -68,37 +65,3 @@ export const useWorkplaceSearchNav = () => {
   // to cause all our navItems to properly render as nav links.
   return [{ id: '', name: '', items: navItems }];
 };
-
-// TODO: Delete below once fully migrated to KibanaPageTemplate
-
-interface Props {
-  sourcesSubNav?: React.ReactNode;
-  groupsSubNav?: React.ReactNode;
-  settingsSubNav?: React.ReactNode;
-}
-
-export const WorkplaceSearchNav: React.FC<Props> = ({
-  sourcesSubNav,
-  groupsSubNav,
-  settingsSubNav,
-}) => (
-  <SideNav product={WORKPLACE_SEARCH_PLUGIN}>
-    <SideNavLink to="/" isRoot>
-      {NAV.OVERVIEW}
-    </SideNavLink>
-    <SideNavLink to={SOURCES_PATH} subNav={sourcesSubNav}>
-      {NAV.SOURCES}
-    </SideNavLink>
-    <SideNavLink to={GROUPS_PATH} subNav={groupsSubNav}>
-      {NAV.GROUPS}
-    </SideNavLink>
-    <SideNavLink shouldShowActiveForSubroutes to={USERS_AND_ROLES_PATH}>
-      {NAV.ROLE_MAPPINGS}
-    </SideNavLink>
-    <SideNavLink to={SECURITY_PATH}>{NAV.SECURITY}</SideNavLink>
-    <SideNavLink subNav={settingsSubNav} to={ORG_SETTINGS_PATH}>
-      {NAV.SETTINGS}
-    </SideNavLink>
-    <EuiSpacer />
-  </SideNav>
-);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5f86e020a0407..aab80fe308861 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7884,9 +7884,6 @@
     "xpack.enterpriseSearch.featureCatalogueDescription2": "ユーザーを関連するデータにつなげます。",
     "xpack.enterpriseSearch.featureCatalogueDescription3": "チームの内容を統合します。",
     "xpack.enterpriseSearch.hiddenText": "非表示のテキスト",
-    "xpack.enterpriseSearch.nav.hierarchy": "セカンダリ",
-    "xpack.enterpriseSearch.nav.menu": "メニュー",
-    "xpack.enterpriseSearch.nav.toggleMenu": "セカンダリナビゲーションを切り替える",
     "xpack.enterpriseSearch.navTitle": "概要",
     "xpack.enterpriseSearch.notFound.action1": "ダッシュボードに戻す",
     "xpack.enterpriseSearch.notFound.action2": "サポートに問い合わせる",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index acad67a0b1c7a..d4f263b58b8ab 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7952,9 +7952,6 @@
     "xpack.enterpriseSearch.featureCatalogueDescription2": "将您的用户连接到相关数据。",
     "xpack.enterpriseSearch.featureCatalogueDescription3": "统一您的团队内容。",
     "xpack.enterpriseSearch.hiddenText": "隐藏文本",
-    "xpack.enterpriseSearch.nav.hierarchy": "次级",
-    "xpack.enterpriseSearch.nav.menu": "菜单",
-    "xpack.enterpriseSearch.nav.toggleMenu": "切换次级导航",
     "xpack.enterpriseSearch.navTitle": "概览",
     "xpack.enterpriseSearch.notFound.action1": "返回到您的仪表板",
     "xpack.enterpriseSearch.notFound.action2": "联系支持人员",

From 205684540857cee84be923404c7e7b82939e002e Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Thu, 24 Jun 2021 18:05:11 -0500
Subject: [PATCH 82/95] [canvas] Reduce bundle size by combining SCSS imports
 (#102822)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../canvas/public/components/var_config/delete_var.tsx     | 2 --
 .../canvas/public/components/var_config/edit_var.tsx       | 3 ---
 .../canvas/public/components/var_config/var_config.tsx     | 2 --
 x-pack/plugins/canvas/public/style/index.scss              | 7 +++++++
 x-pack/plugins/canvas/public/transitions/fade/index.ts     | 2 --
 x-pack/plugins/canvas/public/transitions/rotate/index.ts   | 2 --
 x-pack/plugins/canvas/public/transitions/slide/index.ts    | 2 --
 x-pack/plugins/canvas/public/transitions/zoom/index.ts     | 2 --
 8 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx b/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
index f6ba2d7e28825..1aea08a96784d 100644
--- a/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/delete_var.tsx
@@ -39,8 +39,6 @@ const strings = {
     }),
 };
 
-import './var_panel.scss';
-
 interface Props {
   selectedVar: CanvasVariable;
   onDelete: (v: CanvasVariable) => void;
diff --git a/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx b/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
index 35f9e67745aec..5501aa9aab637 100644
--- a/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/edit_var.tsx
@@ -76,9 +76,6 @@ const strings = {
     }),
 };
 
-import './edit_var.scss';
-import './var_panel.scss';
-
 interface Props {
   selectedVar: CanvasVariable | null;
   variables: CanvasVariable[];
diff --git a/x-pack/plugins/canvas/public/components/var_config/var_config.tsx b/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
index dc8898e2132e7..25c77ab7704bf 100644
--- a/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
+++ b/x-pack/plugins/canvas/public/components/var_config/var_config.tsx
@@ -25,8 +25,6 @@ import { CanvasVariable } from '../../../types';
 import { EditVar } from './edit_var';
 import { DeleteVar } from './delete_var';
 
-import './var_config.scss';
-
 enum PanelMode {
   List,
   Edit,
diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss
index d9592d5c0be5f..e866eada1f85f 100644
--- a/x-pack/plugins/canvas/public/style/index.scss
+++ b/x-pack/plugins/canvas/public/style/index.scss
@@ -43,6 +43,13 @@
 @import '../components/workpad_page/workpad_page';
 @import '../components/workpad_page/workpad_interactive_page/workpad_interactive_page';
 @import '../components/workpad_page/workpad_static_page/workpad_static_page';
+@import '../components/var_config/edit_var';
+@import '../components/var_config/var_config';
+
+@import '../transitions/fade/fade';
+@import '../transitions/rotate/rotate';
+@import '../transitions/slide/slide';
+@import '../transitions/zoom/zoom';
 
 @import '../../canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.scss';
 @import '../../canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.scss';
diff --git a/x-pack/plugins/canvas/public/transitions/fade/index.ts b/x-pack/plugins/canvas/public/transitions/fade/index.ts
index c8fcc574b1872..7ce717a83eeb0 100644
--- a/x-pack/plugins/canvas/public/transitions/fade/index.ts
+++ b/x-pack/plugins/canvas/public/transitions/fade/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import './fade.scss';
-
 import { TransitionStrings } from '../../../i18n';
 
 const { fade: strings } = TransitionStrings;
diff --git a/x-pack/plugins/canvas/public/transitions/rotate/index.ts b/x-pack/plugins/canvas/public/transitions/rotate/index.ts
index 217fd26680959..959e1ae248f2a 100644
--- a/x-pack/plugins/canvas/public/transitions/rotate/index.ts
+++ b/x-pack/plugins/canvas/public/transitions/rotate/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import './rotate.scss';
-
 import { TransitionStrings } from '../../../i18n';
 
 const { rotate: strings } = TransitionStrings;
diff --git a/x-pack/plugins/canvas/public/transitions/slide/index.ts b/x-pack/plugins/canvas/public/transitions/slide/index.ts
index 0c3f82a09dd02..1cf87acca2963 100644
--- a/x-pack/plugins/canvas/public/transitions/slide/index.ts
+++ b/x-pack/plugins/canvas/public/transitions/slide/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import './slide.scss';
-
 import { TransitionStrings } from '../../../i18n';
 
 const { slide: strings } = TransitionStrings;
diff --git a/x-pack/plugins/canvas/public/transitions/zoom/index.ts b/x-pack/plugins/canvas/public/transitions/zoom/index.ts
index c7c1db25bd0d7..c102935b4118b 100644
--- a/x-pack/plugins/canvas/public/transitions/zoom/index.ts
+++ b/x-pack/plugins/canvas/public/transitions/zoom/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import './zoom.scss';
-
 import { TransitionStrings } from '../../../i18n';
 
 const { zoom: strings } = TransitionStrings;

From 3838bfd34a68c6e3ef5757441786b0e19c96773d Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Thu, 24 Jun 2021 18:53:03 -0500
Subject: [PATCH 83/95] [Enterprise Search] Add notices for deactivated users
 and SMTP callout (#103285)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Port #3904 to Kibana

https://github.com/elastic/ent-search/pull/3904

* DRY out logic interfaces

Should have done this long ago

* Port #3920 to Kibana

https://github.com/elastic/ent-search/pull/3920

* Lint fixes

* Remove error state from form

We already did this for the users flyout. Basically changes the dirty state of the form from an error state to just showing “Required”. i18n had not been translated yet for `ATTRIBUTE_VALUE_ERROR`

* Add loading states

* Remove manual disabling of button

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Remove manual disabling of other button

* Lint fixes

Co-authored-by: Constance <constancecchen@users.noreply.github.com>
---
 .../components/role_mappings/role_mapping.tsx |  2 +
 .../role_mappings/role_mappings_logic.test.ts |  3 +
 .../role_mappings/role_mappings_logic.ts      | 86 ++++++-------------
 .../components/role_mappings/user.test.tsx    | 24 +++++-
 .../components/role_mappings/user.tsx         | 11 +++
 .../__mocks__/elasticsearch_users.ts          |  1 +
 .../role_mapping/attribute_selector.test.tsx  | 11 ++-
 .../role_mapping/attribute_selector.tsx       |  5 +-
 .../shared/role_mapping/constants.ts          | 40 +++++++--
 .../deactivated_user_callout.test.tsx         | 75 ++++++++++++++++
 .../role_mapping/deactivated_user_callout.tsx | 28 ++++++
 .../applications/shared/role_mapping/index.ts |  2 +
 .../role_mapping/role_mapping_flyout.test.tsx |  1 +
 .../role_mapping/role_mapping_flyout.tsx      |  3 +
 .../applications/shared/role_mapping/types.ts | 66 ++++++++++++++
 .../shared/role_mapping/user_flyout.test.tsx  |  1 +
 .../shared/role_mapping/user_flyout.tsx       |  4 +-
 .../role_mapping/user_selector.test.tsx       |  3 +-
 .../shared/role_mapping/user_selector.tsx     | 18 +++-
 .../shared/role_mapping/users_table.test.tsx  | 20 ++++-
 .../shared/role_mapping/users_table.tsx       | 10 ++-
 .../public/applications/shared/types.ts       |  3 +-
 .../views/role_mappings/role_mapping.tsx      |  2 +
 .../role_mappings/role_mappings_logic.test.ts |  3 +
 .../role_mappings/role_mappings_logic.ts      | 84 ++++++------------
 .../views/role_mappings/user.test.tsx         | 24 +++++-
 .../views/role_mappings/user.tsx              | 11 +++
 27 files changed, 406 insertions(+), 135 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
index dbebd8e46a219..02ff4c0ba1c3d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
@@ -45,6 +45,7 @@ export const RoleMapping: React.FC = () => {
     selectedEngines,
     selectedAuthProviders,
     roleMappingErrors,
+    formLoading,
   } = useValues(RoleMappingsLogic);
 
   const isNew = !roleMapping;
@@ -67,6 +68,7 @@ export const RoleMapping: React.FC = () => {
   return (
     <RoleMappingFlyout
       disabled={attributeValueInvalid || !hasEngineAssignment}
+      formLoading={formLoading}
       isNew={isNew}
       closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
       handleSaveMapping={handleSaveMapping}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
index 16b44e9ec1f11..9f3ef90c2feac 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
@@ -58,6 +58,8 @@ describe('RoleMappingsLogic', () => {
     userCreated: false,
     userFormIsNewUser: true,
     userFormUserIsExisting: true,
+    smtpSettingsPresent: false,
+    formLoading: false,
   };
 
   const mappingsServerProps = {
@@ -70,6 +72,7 @@ describe('RoleMappingsLogic', () => {
     hasAdvancedRoles: false,
     singleUserRoleMappings: [asSingleUserRoleMapping],
     elasticsearchUsers,
+    smtpSettingsPresent: false,
   };
 
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
index 0b57e1d08a294..fb574a3588989 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
@@ -7,14 +7,17 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { EuiComboBoxOptionOption } from '@elastic/eui';
-
 import {
   clearFlashMessages,
   flashAPIErrors,
   setSuccessMessage,
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
+import {
+  RoleMappingsBaseServerDetails,
+  RoleMappingsBaseActions,
+  RoleMappingsBaseValues,
+} from '../../../shared/role_mapping';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
 import { AttributeName, SingleUserRoleMapping, ElasticsearchUser } from '../../../shared/types';
 import { ASRoleMapping, RoleTypes } from '../../types';
@@ -29,16 +32,11 @@ import {
 
 type UserMapping = SingleUserRoleMapping<ASRoleMapping>;
 
-interface RoleMappingsServerDetails {
+interface RoleMappingsServerDetails extends RoleMappingsBaseServerDetails {
   roleMappings: ASRoleMapping[];
-  attributes: string[];
-  authProviders: string[];
   availableEngines: Engine[];
-  elasticsearchRoles: string[];
-  elasticsearchUsers: ElasticsearchUser[];
-  hasAdvancedRoles: boolean;
-  multipleAuthProvidersConfig: boolean;
   singleUserRoleMappings: UserMapping[];
+  hasAdvancedRoles: boolean;
 }
 
 const getFirstAttributeName = (roleMapping: ASRoleMapping) =>
@@ -47,24 +45,7 @@ const getFirstAttributeValue = (roleMapping: ASRoleMapping) =>
   Object.entries(roleMapping.rules)[0][1] as AttributeName;
 const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 
-interface RoleMappingsActions {
-  handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
-  handleAuthProviderChange(value: string[]): { value: string[] };
-  handleAttributeSelectorChange(
-    value: AttributeName,
-    firstElasticsearchRole: string
-  ): { value: AttributeName; firstElasticsearchRole: string };
-  handleAttributeValueChange(value: string): { value: string };
-  handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
-  handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
-  handleRoleChange(roleType: RoleTypes): { roleType: RoleTypes };
-  handleUsernameSelectChange(username: string): { username: string };
-  handleSaveMapping(): void;
-  handleSaveUser(): void;
-  initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
-  initializeSingleUserRoleMapping(roleMappingId?: string): { roleMappingId?: string };
-  initializeRoleMappings(): void;
-  resetState(): void;
+interface RoleMappingsActions extends RoleMappingsBaseActions {
   setRoleMapping(roleMapping: ASRoleMapping): { roleMapping: ASRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
   setRoleMappings({
@@ -73,34 +54,14 @@ interface RoleMappingsActions {
     roleMappings: ASRoleMapping[];
   }): { roleMappings: ASRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
-  setElasticsearchUser(
-    elasticsearchUser?: ElasticsearchUser
-  ): { elasticsearchUser: ElasticsearchUser };
-  openRoleMappingFlyout(): void;
-  openSingleUserRoleMappingFlyout(): void;
-  closeUsersAndRolesFlyout(): void;
-  setRoleMappingErrors(errors: string[]): { errors: string[] };
-  enableRoleBasedAccess(): void;
-  setUserExistingRadioValue(userFormUserIsExisting: boolean): { userFormUserIsExisting: boolean };
-  setElasticsearchUsernameValue(username: string): { username: string };
-  setElasticsearchEmailValue(email: string): { email: string };
-  setUserCreated(): void;
-  setUserFormIsNewUser(userFormIsNewUser: boolean): { userFormIsNewUser: boolean };
+  handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
+  handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
+  handleRoleChange(roleType: RoleTypes): { roleType: RoleTypes };
 }
 
-interface RoleMappingsValues {
+interface RoleMappingsValues extends RoleMappingsBaseValues {
   accessAllEngines: boolean;
-  attributeName: AttributeName;
-  attributeValue: string;
-  attributes: string[];
-  availableAuthProviders: string[];
   availableEngines: Engine[];
-  dataLoading: boolean;
-  elasticsearchRoles: string[];
-  elasticsearchUsers: ElasticsearchUser[];
-  elasticsearchUser: ElasticsearchUser;
-  hasAdvancedRoles: boolean;
-  multipleAuthProvidersConfig: boolean;
   roleMapping: ASRoleMapping | null;
   roleMappings: ASRoleMapping[];
   singleUserRoleMapping: UserMapping | null;
@@ -108,13 +69,7 @@ interface RoleMappingsValues {
   roleType: RoleTypes;
   selectedAuthProviders: string[];
   selectedEngines: Set<string>;
-  roleMappingFlyoutOpen: boolean;
-  singleUserRoleMappingFlyoutOpen: boolean;
-  selectedOptions: EuiComboBoxOptionOption[];
-  roleMappingErrors: string[];
-  userFormUserIsExisting: boolean;
-  userCreated: boolean;
-  userFormIsNewUser: boolean;
+  hasAdvancedRoles: boolean;
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
@@ -369,6 +324,21 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setUserFormIsNewUser: (_, { userFormIsNewUser }) => userFormIsNewUser,
       },
     ],
+    smtpSettingsPresent: [
+      false,
+      {
+        setRoleMappingsData: (_, { smtpSettingsPresent }) => smtpSettingsPresent,
+      },
+    ],
+    formLoading: [
+      false,
+      {
+        handleSaveMapping: () => true,
+        handleSaveUser: () => true,
+        initializeRoleMappings: () => false,
+        setRoleMappingErrors: () => false,
+      },
+    ],
   },
   selectors: ({ selectors }) => ({
     selectedOptions: [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
index 88103532bd149..cec7f1541a31a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.test.tsx
@@ -14,7 +14,12 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { UserFlyout, UserAddedInfo, UserInvitationCallout } from '../../../shared/role_mapping';
+import {
+  UserFlyout,
+  UserAddedInfo,
+  UserInvitationCallout,
+  DeactivatedUserCallout,
+} from '../../../shared/role_mapping';
 import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
 import { wsSingleUserRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
@@ -91,6 +96,23 @@ describe('User', () => {
     expect(wrapper.find(UserAddedInfo)).toHaveLength(1);
   });
 
+  it('renders DeactivatedUserCallout', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: {
+        ...wsSingleUserRoleMapping,
+        invitation: null,
+        elasticsearchUser: {
+          ...wsSingleUserRoleMapping.elasticsearchUser,
+          enabled: false,
+        },
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(DeactivatedUserCallout)).toHaveLength(1);
+  });
+
   it('disables form when username value not present', () => {
     setMockValues({
       ...mockValues,
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
index df231fac64df7..018d29706b05f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
@@ -17,6 +17,7 @@ import {
   UserSelector,
   UserAddedInfo,
   UserInvitationCallout,
+  DeactivatedUserCallout,
 } from '../../../shared/role_mapping';
 import { RoleTypes } from '../../types';
 
@@ -48,6 +49,8 @@ export const User: React.FC = () => {
     roleMappingErrors,
     userCreated,
     userFormIsNewUser,
+    smtpSettingsPresent,
+    formLoading,
   } = useValues(RoleMappingsLogic);
 
   const roleTypes = hasAdvancedRoles ? [...standardRoles, ...advancedRoles] : standardRoles;
@@ -55,6 +58,11 @@ export const User: React.FC = () => {
   const showEngineAssignmentSelector = hasEngines && hasAdvancedRoles;
   const flyoutDisabled =
     !userFormUserIsExisting && (!elasticsearchUser.email || !elasticsearchUser.username);
+  const userIsDeactivated = !!(
+    singleUserRoleMapping &&
+    !singleUserRoleMapping.invitation &&
+    !singleUserRoleMapping.elasticsearchUser.enabled
+  );
 
   const userAddedInfo = singleUserRoleMapping && (
     <UserAddedInfo
@@ -76,6 +84,7 @@ export const User: React.FC = () => {
     <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
       <UserSelector
         isNewUser={userFormIsNewUser}
+        smtpSettingsPresent={smtpSettingsPresent}
         elasticsearchUsers={elasticsearchUsers}
         handleRoleChange={handleRoleChange}
         elasticsearchUser={elasticsearchUser}
@@ -94,6 +103,7 @@ export const User: React.FC = () => {
   return (
     <UserFlyout
       disabled={flyoutDisabled}
+      formLoading={formLoading}
       isComplete={userCreated}
       isNew={userFormIsNewUser}
       closeUserFlyout={closeUsersAndRolesFlyout}
@@ -101,6 +111,7 @@ export const User: React.FC = () => {
     >
       {userCreated ? userAddedInfo : createUserForm}
       {userInvitationCallout}
+      {userIsDeactivated && <DeactivatedUserCallout isNew={userFormIsNewUser} />}
     </UserFlyout>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
index 500f560675679..6d9365d63c320 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/__mocks__/elasticsearch_users.ts
@@ -9,5 +9,6 @@ export const elasticsearchUsers = [
   {
     email: 'user1@user.com',
     username: 'user1',
+    enabled: true,
   },
 ];
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
index d19d090b6e706..8fed459b0a8dc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
@@ -9,12 +9,12 @@ import React from 'react';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
-import { EuiComboBox, EuiFieldText } from '@elastic/eui';
+import { EuiComboBox, EuiFieldText, EuiFormRow } from '@elastic/eui';
 
 import { AttributeName } from '../types';
 
 import { AttributeSelector } from './attribute_selector';
-import { ANY_AUTH_PROVIDER, ANY_AUTH_PROVIDER_OPTION_LABEL } from './constants';
+import { ANY_AUTH_PROVIDER, ANY_AUTH_PROVIDER_OPTION_LABEL, REQUIRED_LABEL } from './constants';
 
 const handleAttributeSelectorChange = jest.fn();
 const handleAttributeValueChange = jest.fn();
@@ -166,5 +166,12 @@ describe('AttributeSelector', () => {
         baseProps.elasticsearchRoles[0]
       );
     });
+
+    it('shows helpText when attributeValueInvalid', () => {
+      const wrapper = shallow(<AttributeSelector {...baseProps} attributeValueInvalid />);
+      const formRow = wrapper.find(EuiFormRow).at(2);
+
+      expect(formRow.prop('helpText')).toEqual(REQUIRED_LABEL);
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
index bedb6b3df90f2..e24bc03bea452 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
@@ -21,7 +21,7 @@ import {
   ANY_AUTH_PROVIDER,
   ANY_AUTH_PROVIDER_OPTION_LABEL,
   ATTRIBUTE_VALUE_LABEL,
-  ATTRIBUTE_VALUE_ERROR,
+  REQUIRED_LABEL,
   AUTH_ANY_PROVIDER_LABEL,
   AUTH_INDIVIDUAL_PROVIDER_LABEL,
   AUTH_PROVIDER_LABEL,
@@ -129,8 +129,7 @@ export const AttributeSelector: React.FC<Props> = ({
       <EuiFormRow
         label={ATTRIBUTE_VALUE_LABEL}
         fullWidth
-        isInvalid={attributeValueInvalid}
-        error={[ATTRIBUTE_VALUE_ERROR]}
+        helpText={attributeValueInvalid && REQUIRED_LABEL}
       >
         {attributeName === 'role' ? (
           <EuiSelect
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
index 215c76ffb7ef4..c9fa16ac05a16 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
@@ -91,13 +91,6 @@ export const ATTRIBUTE_VALUE_LABEL = i18n.translate(
   }
 );
 
-export const ATTRIBUTE_VALUE_ERROR = i18n.translate(
-  'xpack.enterpriseSearch.roleMapping.attributeValueError',
-  {
-    defaultMessage: 'Attribute value is required',
-  }
-);
-
 export const REMOVE_ROLE_MAPPING_TITLE = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.removeRoleMappingTitle',
   {
@@ -373,6 +366,13 @@ export const UPDATE_USER_DESCRIPTION = i18n.translate(
   }
 );
 
+export const DEACTIVATED_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.deactivatedLabel',
+  {
+    defaultMessage: 'Deactivated',
+  }
+);
+
 export const INVITATION_PENDING_LABEL = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.invitationPendingLabel',
   {
@@ -422,3 +422,29 @@ export const AUTH_PROVIDER_TOOLTIP = i18n.translate(
       'Provider-specific role mapping is still applied, but configuration is now deprecated.',
   }
 );
+
+export const DEACTIVATED_USER_CALLOUT_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.deactivatedUserCalloutLabel',
+  {
+    defaultMessage: 'User deactivated',
+  }
+);
+
+export const DEACTIVATED_USER_CALLOUT_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.deactivatedUserCalloutDescription',
+  {
+    defaultMessage:
+      'This user is not currently active, and access has been temporarily revoked. Users can be re-activated via the User Management area of the Kibana console.',
+  }
+);
+
+export const SMTP_CALLOUT_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.smtpCalloutLabel',
+  {
+    defaultMessage: 'Personalized invitations will be automatically sent when an Enterprise Search',
+  }
+);
+
+export const SMTP_LINK_LABEL = i18n.translate('xpack.enterpriseSearch.roleMapping.smtpLinkLabel', {
+  defaultMessage: 'SMTP configuration is provided',
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
new file mode 100644
index 0000000000000..5bae7b00dda10
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
@@ -0,0 +1,75 @@
+/*
+ * 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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { DeactivatedUserCallout } from './';
+
+describe('DeactivatedUserCallout', () => {
+  it('renders with new', () => {
+    const wrapper = shallow(<DeactivatedUserCallout isNew />);
+
+    expect(wrapper).toMatchInlineSnapshot(`
+      <Fragment>
+        <EuiText
+          size="s"
+        >
+          <EuiIcon
+            color="warning"
+            type="alert"
+          />
+           
+          <strong>
+            User deactivated
+          </strong>
+        </EuiText>
+        <EuiSpacer
+          size="xs"
+        />
+        <EuiText
+          size="s"
+        >
+          This user is not currently active, and access has been temporarily revoked. Users can be re-activated via the User Management area of the Kibana console.
+        </EuiText>
+        <EuiSpacer />
+      </Fragment>
+    `);
+  });
+
+  it('renders with existing', () => {
+    const wrapper = shallow(<DeactivatedUserCallout isNew={false} />);
+
+    expect(wrapper).toMatchInlineSnapshot(`
+      <Fragment>
+        <EuiSpacer />
+        <EuiText
+          size="s"
+        >
+          <EuiIcon
+            color="warning"
+            type="alert"
+          />
+           
+          <strong>
+            User deactivated
+          </strong>
+        </EuiText>
+        <EuiSpacer
+          size="xs"
+        />
+        <EuiText
+          size="s"
+        >
+          This user is not currently active, and access has been temporarily revoked. Users can be re-activated via the User Management area of the Kibana console.
+        </EuiText>
+        <EuiSpacer />
+      </Fragment>
+    `);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.tsx
new file mode 100644
index 0000000000000..5b69420d169ce
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.tsx
@@ -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 React from 'react';
+
+import { EuiSpacer, EuiText, EuiIcon } from '@elastic/eui';
+
+interface Props {
+  isNew: boolean;
+}
+
+import { DEACTIVATED_USER_CALLOUT_LABEL, DEACTIVATED_USER_CALLOUT_DESCRIPTION } from './constants';
+
+export const DeactivatedUserCallout: React.FC<Props> = ({ isNew }) => (
+  <>
+    {!isNew && <EuiSpacer />}
+    <EuiText size="s">
+      <EuiIcon type="alert" color="warning" /> <strong>{DEACTIVATED_USER_CALLOUT_LABEL}</strong>
+    </EuiText>
+    <EuiSpacer size="xs" />
+    <EuiText size="s">{DEACTIVATED_USER_CALLOUT_DESCRIPTION}</EuiText>
+    <EuiSpacer />
+  </>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
index 8096b86939ff3..c10fc5c9d8242 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
+export * from './types';
 export { AttributeSelector } from './attribute_selector';
+export { DeactivatedUserCallout } from './deactivated_user_callout';
 export { RolesEmptyPrompt } from './roles_empty_prompt';
 export { RoleMappingsTable } from './role_mappings_table';
 export { RoleOptionLabel } from './role_option_label';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
index ffcf5508233fc..651a46f5df85e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
@@ -26,6 +26,7 @@ describe('RoleMappingFlyout', () => {
   const props = {
     isNew: true,
     disabled: false,
+    formLoading: false,
     closeUsersAndRolesFlyout,
     handleSaveMapping,
   };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
index 4416a2de28011..bcaf26ccf2cfc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
@@ -36,6 +36,7 @@ interface Props {
   children: React.ReactNode;
   isNew: boolean;
   disabled: boolean;
+  formLoading: boolean;
   closeUsersAndRolesFlyout(): void;
   handleSaveMapping(): void;
 }
@@ -44,6 +45,7 @@ export const RoleMappingFlyout: React.FC<Props> = ({
   children,
   isNew,
   disabled,
+  formLoading,
   closeUsersAndRolesFlyout,
   handleSaveMapping,
 }) => (
@@ -78,6 +80,7 @@ export const RoleMappingFlyout: React.FC<Props> = ({
           <EuiFlexItem grow={false}>
             <EuiButton
               disabled={disabled}
+              isLoading={formLoading}
               onClick={handleSaveMapping}
               fill
               data-test-subj="FlyoutButton"
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
new file mode 100644
index 0000000000000..2eba171c270f6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { EuiComboBoxOptionOption } from '@elastic/eui';
+
+import { AttributeName, ElasticsearchUser } from '../../shared/types';
+
+export interface RoleMappingsBaseServerDetails {
+  attributes: string[];
+  authProviders: string[];
+  elasticsearchRoles: string[];
+  elasticsearchUsers: ElasticsearchUser[];
+  multipleAuthProvidersConfig: boolean;
+  smtpSettingsPresent: boolean;
+}
+
+export interface RoleMappingsBaseActions {
+  handleAuthProviderChange(value: string[]): { value: string[] };
+  handleAttributeSelectorChange(
+    value: AttributeName,
+    firstElasticsearchRole: string
+  ): { value: AttributeName; firstElasticsearchRole: string };
+  handleAttributeValueChange(value: string): { value: string };
+  handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
+  handleUsernameSelectChange(username: string): { username: string };
+  handleSaveMapping(): void;
+  handleSaveUser(): void;
+  initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
+  initializeSingleUserRoleMapping(roleMappingId?: string): { roleMappingId?: string };
+  initializeRoleMappings(): void;
+  resetState(): void;
+  setElasticsearchUser(
+    elasticsearchUser?: ElasticsearchUser
+  ): { elasticsearchUser: ElasticsearchUser };
+  openRoleMappingFlyout(): void;
+  openSingleUserRoleMappingFlyout(): void;
+  closeUsersAndRolesFlyout(): void;
+  setRoleMappingErrors(errors: string[]): { errors: string[] };
+  enableRoleBasedAccess(): void;
+  setUserExistingRadioValue(userFormUserIsExisting: boolean): { userFormUserIsExisting: boolean };
+  setElasticsearchUsernameValue(username: string): { username: string };
+  setElasticsearchEmailValue(email: string): { email: string };
+  setUserCreated(): void;
+  setUserFormIsNewUser(userFormIsNewUser: boolean): { userFormIsNewUser: boolean };
+}
+
+export interface RoleMappingsBaseValues extends RoleMappingsBaseServerDetails {
+  attributeName: AttributeName;
+  attributeValue: string;
+  availableAuthProviders: string[];
+  dataLoading: boolean;
+  elasticsearchUser: ElasticsearchUser;
+  roleMappingFlyoutOpen: boolean;
+  singleUserRoleMappingFlyoutOpen: boolean;
+  selectedOptions: EuiComboBoxOptionOption[];
+  roleMappingErrors: string[];
+  userFormUserIsExisting: boolean;
+  userCreated: boolean;
+  userFormIsNewUser: boolean;
+  accessAllEngines: boolean;
+  formLoading: boolean;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
index 43333fe048f23..f48ed6a6c7eb9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
@@ -30,6 +30,7 @@ describe('UserFlyout', () => {
     isNew: true,
     isComplete: false,
     disabled: false,
+    formLoading: false,
     closeUserFlyout,
     handleSaveUser,
   };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
index a3be5e295ddfe..8741a2b4517d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
@@ -28,6 +28,7 @@ interface Props {
   isNew: boolean;
   isComplete: boolean;
   disabled: boolean;
+  formLoading: boolean;
   closeUserFlyout(): void;
   handleSaveUser(): void;
 }
@@ -49,6 +50,7 @@ export const UserFlyout: React.FC<Props> = ({
   isNew,
   isComplete,
   disabled,
+  formLoading,
   closeUserFlyout,
   handleSaveUser,
 }) => {
@@ -75,7 +77,7 @@ export const UserFlyout: React.FC<Props> = ({
         <EuiButtonEmpty onClick={closeUserFlyout}>{CANCEL_BUTTON_LABEL}</EuiButtonEmpty>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EuiButton disabled={disabled} onClick={handleSaveUser} fill>
+        <EuiButton disabled={disabled} isLoading={formLoading} onClick={handleSaveUser} fill>
           {isNew ? ADD_USER_LABEL : UPDATE_USER_LABEL}
         </EuiButton>
       </EuiFlexItem>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
index 60bac97d09835..0aea55a51040c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
@@ -34,6 +34,7 @@ describe('UserSelector', () => {
 
   const props = {
     isNewUser: true,
+    smtpSettingsPresent: false,
     userFormUserIsExisting: true,
     elasticsearchUsers,
     elasticsearchUser: elasticsearchUsers[0],
@@ -101,7 +102,7 @@ describe('UserSelector', () => {
         {...props}
         userFormUserIsExisting={false}
         elasticsearchUsers={[]}
-        elasticsearchUser={{ email: '', username: '' }}
+        elasticsearchUser={{ email: '', username: '', enabled: true }}
       />
     );
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
index d65f97265f6a3..25aff5077c680 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
@@ -9,6 +9,7 @@ import React from 'react';
 
 import {
   EuiFieldText,
+  EuiLink,
   EuiRadio,
   EuiFormRow,
   EuiSelect,
@@ -21,6 +22,9 @@ import { ElasticsearchUser } from '../../shared/types';
 import { Role as WSRole } from '../../workplace_search/types';
 
 import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
+import { docLinks } from '../doc_links';
+
+const SMTP_URL = `${docLinks.enterpriseSearchBase}/mailer-configuration.html`;
 
 import {
   NEW_USER_LABEL,
@@ -28,12 +32,15 @@ import {
   USERNAME_NO_USERS_TEXT,
   REQUIRED_LABEL,
   ROLE_LABEL,
+  SMTP_CALLOUT_LABEL,
+  SMTP_LINK_LABEL,
 } from './constants';
 
 type SharedRole = WSRole | ASRole;
 
 interface Props {
   isNewUser: boolean;
+  smtpSettingsPresent: boolean;
   userFormUserIsExisting: boolean;
   elasticsearchUsers: ElasticsearchUser[];
   elasticsearchUser: ElasticsearchUser;
@@ -48,6 +55,7 @@ interface Props {
 
 export const UserSelector: React.FC<Props> = ({
   isNewUser,
+  smtpSettingsPresent,
   userFormUserIsExisting,
   elasticsearchUsers,
   elasticsearchUser,
@@ -66,6 +74,14 @@ export const UserSelector: React.FC<Props> = ({
   }));
   const hasElasticsearchUsers = elasticsearchUsers.length > 0;
   const showNewUserExistingUserControls = userFormUserIsExisting && hasElasticsearchUsers;
+  const smptHelpText = !smtpSettingsPresent && (
+    <>
+      {SMTP_CALLOUT_LABEL}{' '}
+      <EuiLink href={SMTP_URL} target="_blank">
+        {SMTP_LINK_LABEL}
+      </EuiLink>
+    </>
+  );
 
   const roleSelect = (
     <EuiFormRow label={ROLE_LABEL}>
@@ -80,7 +96,7 @@ export const UserSelector: React.FC<Props> = ({
   );
 
   const emailInput = (
-    <EuiFormRow label={EMAIL_LABEL}>
+    <EuiFormRow label={EMAIL_LABEL} helpText={smptHelpText}>
       <EuiFieldText
         name={EMAIL_LABEL}
         data-test-subj="EmailInput"
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
index dc1a2713ced12..ff386ce11b4d4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 import { shallow, mount } from 'enzyme';
 
-import { EuiInMemoryTable, EuiTextColor } from '@elastic/eui';
+import { EuiInMemoryTable, EuiTextColor, EuiBadge } from '@elastic/eui';
 
 import { engines } from '../../app_search/__mocks__/engines.mock';
 
@@ -27,6 +27,7 @@ describe('UsersTable', () => {
     singleUserRoleMappings: [wsSingleUserRoleMapping],
     initializeSingleUserRoleMapping,
     handleDeleteMapping,
+    enabled: true,
   };
 
   it('renders', () => {
@@ -55,6 +56,7 @@ describe('UsersTable', () => {
       elasticsearchUser: {
         email: null,
         username: 'foo',
+        enabled: true,
       },
     };
     const wrapper = mount(<UsersTable {...props} singleUserRoleMappings={[userWithNoEmail]} />);
@@ -97,4 +99,20 @@ describe('UsersTable', () => {
       `${engines[0].name}, ${engines[1].name} + 1`
     );
   });
+
+  it('renders deactivatedBadge', () => {
+    const disabledUser = {
+      ...wsSingleUserRoleMapping,
+      elasticsearchUser: {
+        email: 'email@user.com',
+        username: 'foo',
+        enabled: false,
+      },
+      invitation: null,
+    };
+    const wrapper = mount(<UsersTable {...props} singleUserRoleMappings={[disabledUser]} />);
+    const cell = wrapper.find('[data-test-subj="UsernameCell"]');
+
+    expect(cell.find(EuiBadge)).toHaveLength(1);
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
index 674796775b1d3..25a9eee38f93f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
@@ -15,6 +15,7 @@ import { WSRoleMapping } from '../../workplace_search/types';
 
 import {
   INVITATION_PENDING_LABEL,
+  DEACTIVATED_LABEL,
   ALL_LABEL,
   FILTER_USERS_LABEL,
   NO_USERS_LABEL,
@@ -37,6 +38,7 @@ interface SharedUser extends SingleUserRoleMapping<ASRoleMapping | WSRoleMapping
   email: string | null;
   roleType: string;
   id: string;
+  enabled: boolean;
 }
 
 interface SharedRoleMapping extends ASRoleMapping, WSRoleMapping {
@@ -52,6 +54,7 @@ interface Props {
 
 const noItemsPlaceholder = <EuiTextColor color="subdued">&mdash;</EuiTextColor>;
 const invitationBadge = <EuiBadge color="hollow">{INVITATION_PENDING_LABEL}</EuiBadge>;
+const deactivatedBadge = <EuiBadge color="hollow">{DEACTIVATED_LABEL}</EuiBadge>;
 
 export const UsersTable: React.FC<Props> = ({
   accessItemKey,
@@ -63,6 +66,7 @@ export const UsersTable: React.FC<Props> = ({
   const users = ((singleUserRoleMappings as SharedUser[]).map((user) => ({
     username: user.elasticsearchUser.username,
     email: user.elasticsearchUser.email,
+    enabled: user.elasticsearchUser.enabled,
     roleType: user.roleMapping.roleType,
     id: user.roleMapping.id,
     accessItems: (user.roleMapping as SharedRoleMapping)[accessItemKey],
@@ -73,7 +77,11 @@ export const UsersTable: React.FC<Props> = ({
     {
       field: 'username',
       name: USERNAME_LABEL,
-      render: (_, { username }: SharedUser) => username,
+      render: (_, { username, invitation, enabled }: SharedUser) => (
+        <div data-test-subj="UsernameCell">
+          {username} {!invitation && !enabled && deactivatedBadge}
+        </div>
+      ),
     },
     {
       field: 'email',
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index e6d2c67d1baf8..5a90dd2c4a6bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -49,10 +49,11 @@ export interface Invitation {
 export interface ElasticsearchUser {
   email: string | null;
   username: string;
+  enabled: boolean;
 }
 
 export interface SingleUserRoleMapping<T> {
-  invitation: Invitation;
+  invitation: Invitation | null;
   elasticsearchUser: ElasticsearchUser;
   roleMapping: T;
 }
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
index 20211d40d7010..734716af9f627 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
@@ -59,6 +59,7 @@ export const RoleMapping: React.FC = () => {
     selectedAuthProviders,
     roleMapping,
     roleMappingErrors,
+    formLoading,
   } = useValues(RoleMappingsLogic);
 
   const isNew = !roleMapping;
@@ -69,6 +70,7 @@ export const RoleMapping: React.FC = () => {
   return (
     <RoleMappingFlyout
       disabled={attributeValueInvalid || !hasGroupAssignment}
+      formLoading={formLoading}
       isNew={isNew}
       closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
       handleSaveMapping={handleSaveMapping}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
index c85e86ebcca2c..a412411488b8d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
@@ -57,6 +57,8 @@ describe('RoleMappingsLogic', () => {
     userCreated: false,
     userFormIsNewUser: true,
     userFormUserIsExisting: true,
+    smtpSettingsPresent: false,
+    formLoading: false,
   };
   const roleGroup = {
     id: '123',
@@ -76,6 +78,7 @@ describe('RoleMappingsLogic', () => {
     elasticsearchRoles: [],
     singleUserRoleMappings: [wsSingleUserRoleMapping],
     elasticsearchUsers,
+    smtpSettingsPresent: false,
   };
 
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
index 7f26c8738786c..6e7104964cdb7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
@@ -7,14 +7,17 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { EuiComboBoxOptionOption } from '@elastic/eui';
-
 import {
   clearFlashMessages,
   flashAPIErrors,
   setSuccessMessage,
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
+import {
+  RoleMappingsBaseServerDetails,
+  RoleMappingsBaseActions,
+  RoleMappingsBaseValues,
+} from '../../../shared/role_mapping';
 import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
 import { AttributeName, SingleUserRoleMapping, ElasticsearchUser } from '../../../shared/types';
 import { RoleGroup, WSRoleMapping, Role } from '../../types';
@@ -28,14 +31,9 @@ import {
 
 type UserMapping = SingleUserRoleMapping<WSRoleMapping>;
 
-interface RoleMappingsServerDetails {
+interface RoleMappingsServerDetails extends RoleMappingsBaseServerDetails {
   roleMappings: WSRoleMapping[];
-  attributes: string[];
-  authProviders: string[];
   availableGroups: RoleGroup[];
-  elasticsearchUsers: ElasticsearchUser[];
-  elasticsearchRoles: string[];
-  multipleAuthProvidersConfig: boolean;
   singleUserRoleMappings: UserMapping[];
 }
 
@@ -45,24 +43,8 @@ const getFirstAttributeValue = (roleMapping: WSRoleMapping): string =>
   Object.entries(roleMapping.rules)[0][1] as string;
 const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 
-interface RoleMappingsActions {
-  handleAllGroupsSelectionChange(selected: boolean): { selected: boolean };
-  handleAuthProviderChange(value: string[]): { value: string[] };
-  handleAttributeSelectorChange(
-    value: AttributeName,
-    firstElasticsearchRole: string
-  ): { value: AttributeName; firstElasticsearchRole: string };
-  handleAttributeValueChange(value: string): { value: string };
-  handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
-  handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
-  handleRoleChange(roleType: Role): { roleType: Role };
-  handleUsernameSelectChange(username: string): { username: string };
-  handleSaveMapping(): void;
-  handleSaveUser(): void;
-  initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
-  initializeSingleUserRoleMapping(roleMappingId?: string): { roleMappingId?: string };
-  initializeRoleMappings(): void;
-  resetState(): void;
+interface RoleMappingsActions extends RoleMappingsBaseActions {
+  setDefaultGroup(availableGroups: RoleGroup[]): { availableGroups: RoleGroup[] };
   setRoleMapping(roleMapping: WSRoleMapping): { roleMapping: WSRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
   setRoleMappings({
@@ -71,34 +53,14 @@ interface RoleMappingsActions {
     roleMappings: WSRoleMapping[];
   }): { roleMappings: WSRoleMapping[] };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
-  setElasticsearchUser(
-    elasticsearchUser?: ElasticsearchUser
-  ): { elasticsearchUser: ElasticsearchUser };
-  setDefaultGroup(availableGroups: RoleGroup[]): { availableGroups: RoleGroup[] };
-  openRoleMappingFlyout(): void;
-  openSingleUserRoleMappingFlyout(): void;
-  closeUsersAndRolesFlyout(): void;
-  setRoleMappingErrors(errors: string[]): { errors: string[] };
-  enableRoleBasedAccess(): void;
-  setUserExistingRadioValue(userFormUserIsExisting: boolean): { userFormUserIsExisting: boolean };
-  setElasticsearchUsernameValue(username: string): { username: string };
-  setElasticsearchEmailValue(email: string): { email: string };
-  setUserCreated(): void;
-  setUserFormIsNewUser(userFormIsNewUser: boolean): { userFormIsNewUser: boolean };
+  handleAllGroupsSelectionChange(selected: boolean): { selected: boolean };
+  handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
+  handleRoleChange(roleType: Role): { roleType: Role };
 }
 
-interface RoleMappingsValues {
+interface RoleMappingsValues extends RoleMappingsBaseValues {
   includeInAllGroups: boolean;
-  attributeName: AttributeName;
-  attributeValue: string;
-  attributes: string[];
-  availableAuthProviders: string[];
   availableGroups: RoleGroup[];
-  dataLoading: boolean;
-  elasticsearchRoles: string[];
-  elasticsearchUsers: ElasticsearchUser[];
-  elasticsearchUser: ElasticsearchUser;
-  multipleAuthProvidersConfig: boolean;
   roleMapping: WSRoleMapping | null;
   roleMappings: WSRoleMapping[];
   singleUserRoleMapping: UserMapping | null;
@@ -106,13 +68,6 @@ interface RoleMappingsValues {
   roleType: Role;
   selectedAuthProviders: string[];
   selectedGroups: Set<string>;
-  roleMappingFlyoutOpen: boolean;
-  singleUserRoleMappingFlyoutOpen: boolean;
-  selectedOptions: EuiComboBoxOptionOption[];
-  roleMappingErrors: string[];
-  userFormUserIsExisting: boolean;
-  userCreated: boolean;
-  userFormIsNewUser: boolean;
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
@@ -369,6 +324,21 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setUserFormIsNewUser: (_, { userFormIsNewUser }) => userFormIsNewUser,
       },
     ],
+    smtpSettingsPresent: [
+      false,
+      {
+        setRoleMappingsData: (_, { smtpSettingsPresent }) => smtpSettingsPresent,
+      },
+    ],
+    formLoading: [
+      false,
+      {
+        handleSaveMapping: () => true,
+        handleSaveUser: () => true,
+        initializeRoleMappings: () => false,
+        setRoleMappingErrors: () => false,
+      },
+    ],
   },
   selectors: ({ selectors }) => ({
     selectedOptions: [
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
index 32ee1a7f22875..d8e1fc160901f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.test.tsx
@@ -14,7 +14,12 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { UserFlyout, UserAddedInfo, UserInvitationCallout } from '../../../shared/role_mapping';
+import {
+  UserFlyout,
+  UserAddedInfo,
+  UserInvitationCallout,
+  DeactivatedUserCallout,
+} from '../../../shared/role_mapping';
 import { elasticsearchUsers } from '../../../shared/role_mapping/__mocks__/elasticsearch_users';
 import { wsSingleUserRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
@@ -90,6 +95,23 @@ describe('User', () => {
     expect(wrapper.find(UserAddedInfo)).toHaveLength(1);
   });
 
+  it('renders DeactivatedUserCallout', () => {
+    setMockValues({
+      ...mockValues,
+      singleUserRoleMapping: {
+        ...wsSingleUserRoleMapping,
+        invitation: null,
+        elasticsearchUser: {
+          ...wsSingleUserRoleMapping.elasticsearchUser,
+          enabled: false,
+        },
+      },
+    });
+    const wrapper = shallow(<User />);
+
+    expect(wrapper.find(DeactivatedUserCallout)).toHaveLength(1);
+  });
+
   it('disables form when username value not present', () => {
     setMockValues({
       ...mockValues,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
index bfb32ee31c121..6447f43e6ed4d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
@@ -17,6 +17,7 @@ import {
   UserSelector,
   UserAddedInfo,
   UserInvitationCallout,
+  DeactivatedUserCallout,
 } from '../../../shared/role_mapping';
 import { Role } from '../../types';
 
@@ -46,12 +47,19 @@ export const User: React.FC = () => {
     roleMappingErrors,
     userCreated,
     userFormIsNewUser,
+    smtpSettingsPresent,
+    formLoading,
   } = useValues(RoleMappingsLogic);
 
   const showGroupAssignmentSelector = availableGroups.length > 0;
   const hasAvailableUsers = elasticsearchUsers.length > 0;
   const flyoutDisabled =
     (!userFormUserIsExisting || !hasAvailableUsers) && !elasticsearchUser.username;
+  const userIsDeactivated = !!(
+    singleUserRoleMapping &&
+    !singleUserRoleMapping.invitation &&
+    !singleUserRoleMapping.elasticsearchUser.enabled
+  );
 
   const userAddedInfo = singleUserRoleMapping && (
     <UserAddedInfo
@@ -73,6 +81,7 @@ export const User: React.FC = () => {
     <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
       <UserSelector
         isNewUser={userFormIsNewUser}
+        smtpSettingsPresent={smtpSettingsPresent}
         elasticsearchUsers={elasticsearchUsers}
         handleRoleChange={handleRoleChange}
         elasticsearchUser={elasticsearchUser}
@@ -91,6 +100,7 @@ export const User: React.FC = () => {
   return (
     <UserFlyout
       disabled={flyoutDisabled}
+      formLoading={formLoading}
       isComplete={userCreated}
       isNew={userFormIsNewUser}
       closeUserFlyout={closeUsersAndRolesFlyout}
@@ -98,6 +108,7 @@ export const User: React.FC = () => {
     >
       {userCreated ? userAddedInfo : createUserForm}
       {userInvitationCallout}
+      {userIsDeactivated && <DeactivatedUserCallout isNew={userFormIsNewUser} />}
     </UserFlyout>
   );
 };

From 41b015abc90f89d7b0b3466ba4bdbd3d9092a388 Mon Sep 17 00:00:00 2001
From: Kevin Logan <56395104+kevinlog@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:23:13 -0400
Subject: [PATCH 84/95] [Security Solution] Correct linux OS lookup for
 Endpoint Exceptions (#103038)

---
 .../exceptionable_endpoint_fields.json        | 20 ----
 .../exceptionable_windows_mac_fields.json     | 18 +++-
 .../components/exceptions/helpers.test.tsx    | 11 ---
 .../common/components/exceptions/helpers.tsx  | 99 +++++++++++--------
 4 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
index d5134945441f5..b5480aac27f67 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
@@ -1,19 +1,11 @@
 [
   "Endpoint.policy.applied.id",
-  "Target.process.Ext.code_signature.status",
-  "Target.process.Ext.code_signature.subject_name",
-  "Target.process.Ext.code_signature.trusted",
-  "Target.process.Ext.code_signature.valid",
   "Target.process.Ext.services",
   "Target.process.Ext.user",
   "Target.process.hash.md5",
   "Target.process.hash.sha1",
   "Target.process.hash.sha256",
   "Target.process.hash.sha512",
-  "Target.process.parent.Ext.code_signature.status",
-  "Target.process.parent.Ext.code_signature.subject_name",
-  "Target.process.parent.Ext.code_signature.trusted",
-  "Target.process.parent.Ext.code_signature.valid",
   "Target.process.parent.hash.md5",
   "Target.process.parent.hash.sha1",
   "Target.process.parent.hash.sha256",
@@ -38,10 +30,6 @@
   "event.outcome",
   "event.provider",
   "event.type",
-  "file.Ext.code_signature.status",
-  "file.Ext.code_signature.subject_name",
-  "file.Ext.code_signature.trusted",
-  "file.Ext.code_signature.valid",
   "file.attributes",
   "file.device",
   "file.directory",
@@ -78,20 +66,12 @@
   "host.os.platform",
   "host.os.version",
   "host.type",
-  "process.Ext.code_signature.status",
-  "process.Ext.code_signature.subject_name",
-  "process.Ext.code_signature.trusted",
-  "process.Ext.code_signature.valid",
   "process.Ext.services",
   "process.Ext.user",
   "process.hash.md5",
   "process.hash.sha1",
   "process.hash.sha256",
   "process.hash.sha512",
-  "process.parent.Ext.code_signature.status",
-  "process.parent.Ext.code_signature.subject_name",
-  "process.parent.Ext.code_signature.trusted",
-  "process.parent.Ext.code_signature.valid",
   "process.parent.hash.md5",
   "process.parent.hash.sha1",
   "process.parent.hash.sha256",
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_windows_mac_fields.json b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_windows_mac_fields.json
index 31784bb9c764a..dc21434f96b5a 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_windows_mac_fields.json
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_windows_mac_fields.json
@@ -18,5 +18,21 @@
     "process.parent.executable.caseless",
     "process.parent.name.caseless",
     "process.parent.working_directory.caseless",
-    "process.working_directory.caseless"
+    "process.working_directory.caseless",
+    "Target.process.Ext.code_signature.status",
+    "Target.process.Ext.code_signature.subject_name",
+    "Target.process.Ext.code_signature.trusted",
+    "Target.process.Ext.code_signature.valid",
+    "Target.process.parent.Ext.code_signature.status",
+    "Target.process.parent.Ext.code_signature.subject_name",
+    "Target.process.parent.Ext.code_signature.trusted",
+    "Target.process.parent.Ext.code_signature.valid",
+    "file.Ext.code_signature.status",
+    "file.Ext.code_signature.subject_name",
+    "file.Ext.code_signature.trusted",
+    "file.Ext.code_signature.valid",
+    "process.parent.Ext.code_signature.status",
+    "process.parent.Ext.code_signature.subject_name",
+    "process.parent.Ext.code_signature.trusted",
+    "process.parent.Ext.code_signature.valid"
 ]  
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
index 383b177d40c64..0af83e2cff3b5 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
@@ -87,17 +87,6 @@ const mockLinuxEndpointFields = [
     aggregatable: false,
     readFromDocValues: false,
   },
-  {
-    name: 'file.Ext.code_signature.status',
-    type: 'string',
-    esTypes: ['text'],
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: false,
-    readFromDocValues: false,
-    subType: { nested: { path: 'file.Ext.code_signature' } },
-  },
 ];
 
 export const getEndpointField = (name: string) =>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx
index 20413a6493661..bfb5c7298f330 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx
@@ -236,7 +236,10 @@ export const enrichExceptionItemsWithOS = (
 export const retrieveAlertOsTypes = (alertData?: AlertData): OsTypeArray => {
   const osDefaults: OsTypeArray = ['windows', 'macos'];
   if (alertData != null) {
-    const os = alertData.host && alertData.host.os && alertData.host.os.family;
+    const os =
+      alertData?.agent?.type === 'endpoint'
+        ? alertData.host?.os?.name?.toLowerCase()
+        : alertData.host?.os?.family;
     if (os != null) {
       return osType.is(os) ? [os] : osDefaults;
     }
@@ -361,48 +364,64 @@ export const getPrepopulatedEndpointException = ({
   const { file, host } = alertEcsData;
   const filePath = file?.path ?? '';
   const sha256Hash = file?.hash?.sha256 ?? '';
-  const filePathDefault = host?.os?.family === 'linux' ? 'file.path' : 'file.path.caseless';
+  const isLinux = host?.os?.name === 'Linux';
+
+  const commonFields: Array<{
+    field: string;
+    operator: 'excluded' | 'included';
+    type: 'match';
+    value: string;
+  }> = [
+    {
+      field: isLinux ? 'file.path' : 'file.path.caseless',
+      operator: 'included',
+      type: 'match',
+      value: filePath ?? '',
+    },
+    {
+      field: 'file.hash.sha256',
+      operator: 'included',
+      type: 'match',
+      value: sha256Hash ?? '',
+    },
+    {
+      field: 'event.code',
+      operator: 'included',
+      type: 'match',
+      value: eventCode ?? '',
+    },
+  ];
+  const entriesToAdd = () => {
+    if (isLinux) {
+      return addIdToEntries(commonFields);
+    } else {
+      return addIdToEntries([
+        {
+          field: 'file.Ext.code_signature',
+          type: 'nested',
+          entries: [
+            {
+              field: 'subject_name',
+              operator: 'included',
+              type: 'match',
+              value: codeSignature != null ? codeSignature.subjectName : '',
+            },
+            {
+              field: 'trusted',
+              operator: 'included',
+              type: 'match',
+              value: codeSignature != null ? codeSignature.trusted : '',
+            },
+          ],
+        },
+        ...commonFields,
+      ]);
+    }
+  };
 
   return {
     ...getNewExceptionItem({ listId, namespaceType: listNamespace, ruleName }),
-    entries: addIdToEntries([
-      {
-        field: 'file.Ext.code_signature',
-        type: 'nested',
-        entries: [
-          {
-            field: 'subject_name',
-            operator: 'included',
-            type: 'match',
-            value: codeSignature != null ? codeSignature.subjectName : '',
-          },
-          {
-            field: 'trusted',
-            operator: 'included',
-            type: 'match',
-            value: codeSignature != null ? codeSignature.trusted : '',
-          },
-        ],
-      },
-      {
-        field: filePathDefault,
-        operator: 'included',
-        type: 'match',
-        value: filePath ?? '',
-      },
-      {
-        field: 'file.hash.sha256',
-        operator: 'included',
-        type: 'match',
-        value: sha256Hash ?? '',
-      },
-      {
-        field: 'event.code',
-        operator: 'included',
-        type: 'match',
-        value: eventCode ?? '',
-      },
-    ]),
+    entries: entriesToAdd(),
   };
 };
 

From 4b20ff3bad9f73a4c08973d03295c2dfba754776 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Thu, 24 Jun 2021 20:25:26 -0600
Subject: [PATCH 85/95] [Maps] Add capability to delete features from layer &
 index (#103145)

---
 x-pack/plugins/maps/common/constants.ts       |  1 +
 .../maps/public/actions/map_actions.ts        | 19 +++++++
 .../layers/vector_layer/vector_layer.tsx      |  6 ++
 .../es_search_source/es_search_source.tsx     |  7 ++-
 .../es_search_source/util/feature_edit.ts     | 10 ++++
 .../mvt_single_layer_vector_source.tsx        |  4 ++
 .../sources/vector_source/vector_source.tsx   |  5 ++
 .../classes/util/mb_filter_expressions.ts     |  2 +-
 .../mb_map/draw_control/draw_control.tsx      | 14 +++++
 .../draw_feature_control.tsx                  | 57 ++++++++++++++++++-
 .../draw_feature_control/index.ts             |  9 ++-
 .../mb_map/draw_control/draw_tooltip.tsx      |  4 ++
 .../feature_edit_tools/feature_edit_tools.tsx | 19 +++++++
 .../server/data_indexing/indexing_routes.ts   | 53 +++++++++++++++++
 .../translations/translations/ja-JP.json      |  2 +-
 .../translations/translations/zh-CN.json      |  2 +-
 .../apis/maps/delete_feature.js               | 42 ++++++++++++++
 .../test/api_integration/apis/maps/index.js   |  1 +
 .../es_archives/maps/data/data.json           | 36 ++++++++++++
 .../es_archives/maps/data/mappings.json       | 28 +++++++++
 20 files changed, 314 insertions(+), 7 deletions(-)
 create mode 100644 x-pack/test/api_integration/apis/maps/delete_feature.js

diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index fa065e701184e..c16579cc142f0 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -169,6 +169,7 @@ export enum DRAW_SHAPE {
   POINT = 'POINT',
   LINE = 'LINE',
   SIMPLE_SELECT = 'SIMPLE_SELECT',
+  DELETE = 'DELETE',
 }
 
 export const AGG_DELIMITER = '_of_';
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index 9d0d27496da92..464e4dbc6d5ae 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -376,3 +376,22 @@ export function addNewFeatureToIndex(geometry: Geometry | Position[]) {
     await dispatch(syncDataForLayer(layer, true));
   };
 }
+
+export function deleteFeatureFromIndex(featureId: string) {
+  return async (
+    dispatch: ThunkDispatch<MapStoreState, void, AnyAction>,
+    getState: () => MapStoreState
+  ) => {
+    const editState = getEditState(getState());
+    const layerId = editState ? editState.layerId : undefined;
+    if (!layerId) {
+      return;
+    }
+    const layer = getLayerById(layerId, getState());
+    if (!layer || !(layer instanceof VectorLayer)) {
+      return;
+    }
+    await layer.deleteFeature(featureId);
+    await dispatch(syncDataForLayer(layer, true));
+  };
+}
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 49a0878ef80b2..7a6d91a71db42 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
@@ -99,6 +99,7 @@ export interface IVectorLayer extends ILayer {
   supportsFeatureEditing(): boolean;
   getLeftJoinFields(): Promise<IField[]>;
   addFeature(geometry: Geometry | Position[]): Promise<void>;
+  deleteFeature(featureId: string): Promise<void>;
 }
 
 export class VectorLayer extends AbstractLayer implements IVectorLayer {
@@ -1156,4 +1157,9 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     const layerSource = this.getSource();
     await layerSource.addFeature(geometry);
   }
+
+  async deleteFeature(featureId: string) {
+    const layerSource = this.getSource();
+    await layerSource.deleteFeature(featureId);
+  }
 }
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 9f7bd1260ca22..019c3c1b4943b 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
@@ -66,7 +66,7 @@ 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, getMatchingIndexes } from './util/feature_edit';
+import { addFeatureToIndex, deleteFeatureFromIndex, getMatchingIndexes } from './util/feature_edit';
 
 export function timerangeToTimeextent(timerange: TimeRange): Timeslice | undefined {
   const timeRangeBounds = getTimeFilter().calculateBounds(timerange);
@@ -716,6 +716,11 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
     await addFeatureToIndex(indexPattern.title, geometry, this.getGeoFieldName());
   }
 
+  async deleteFeature(featureId: string) {
+    const indexPattern = await this.getIndexPattern();
+    await deleteFeatureFromIndex(indexPattern.title, featureId);
+  }
+
   async getUrlTemplateWithMeta(
     searchFilters: VectorSourceRequestMeta
   ): Promise<ITiledSingleLayerMvtParams> {
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 ac8e2ba42f282..f306a225df69a 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
@@ -26,6 +26,16 @@ export const addFeatureToIndex = async (
   });
 };
 
+export const deleteFeatureFromIndex = async (indexName: string, featureId: string) => {
+  return await getHttp().fetch({
+    path: `${INDEX_FEATURE_PATH}/${featureId}`,
+    method: 'DELETE',
+    body: JSON.stringify({
+      index: indexName,
+    }),
+  });
+};
+
 export const getMatchingIndexes = async (indexPattern: string) => {
   return await getHttp().fetch({
     path: `${GET_MATCHING_INDEXES_PATH}/${indexPattern}`,
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 5bf7a2e47cc66..f825a85f50bbd 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
@@ -102,6 +102,10 @@ export class MVTSingleLayerVectorSource
     throw new Error('Does not implement addFeature');
   }
 
+  deleteFeature(featureId: string): Promise<void> {
+    throw new Error('Does not implement deleteFeature');
+  }
+
   getMVTFields(): MVTField[] {
     return this._descriptor.fields.map((field: MVTFieldDescriptor) => {
       return new MVTField({
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 8f93de705e365..f006fa7fde3a4 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,6 +69,7 @@ export interface IVectorSource extends ISource {
   getTimesliceMaskFieldName(): Promise<string | null>;
   supportsFeatureEditing(): Promise<boolean>;
   addFeature(geometry: Geometry | Position[]): Promise<void>;
+  deleteFeature(featureId: string): Promise<void>;
 }
 
 export class AbstractVectorSource extends AbstractSource implements IVectorSource {
@@ -165,6 +166,10 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
     throw new Error('Should implement VectorSource#addFeature');
   }
 
+  async deleteFeature(featureId: string): Promise<void> {
+    throw new Error('Should implement VectorSource#deleteFeature');
+  }
+
   async supportsFeatureEditing(): Promise<boolean> {
     return false;
   }
diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
index 6a193216c7c1e..9568ef5c35bb1 100644
--- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
+++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
@@ -20,7 +20,7 @@ export interface TimesliceMaskConfig {
 }
 
 export const EXCLUDE_TOO_MANY_FEATURES_BOX = ['!=', ['get', KBN_TOO_MANY_FEATURES_PROPERTY], true];
-const EXCLUDE_CENTROID_FEATURES = ['!=', ['get', KBN_IS_CENTROID_FEATURE], true];
+export const EXCLUDE_CENTROID_FEATURES = ['!=', ['get', KBN_IS_CENTROID_FEATURE], true];
 
 function getFilterExpression(
   filters: unknown[],
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
index 5d9cb59bbe522..66f0e0c4a9515 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.tsx
@@ -13,6 +13,7 @@ import MapboxDraw from '@mapbox/mapbox-gl-draw';
 import DrawRectangle from 'mapbox-gl-draw-rectangle-mode';
 import type { Map as MbMap } from '@kbn/mapbox-gl';
 import { Feature } from 'geojson';
+import { MapMouseEvent } from '@kbn/mapbox-gl';
 import { DRAW_SHAPE } from '../../../../common/constants';
 import { DrawCircle, DRAW_CIRCLE_RADIUS_MB_FILTER } from './draw_circle';
 import { DrawTooltip } from './draw_tooltip';
@@ -37,6 +38,7 @@ mbDrawModes[DRAW_CIRCLE] = DrawCircle;
 export interface Props {
   drawShape?: DRAW_SHAPE;
   onDraw: (event: { features: Feature[] }, drawControl?: MapboxDraw) => void;
+  onClick?: (event: MapMouseEvent, drawControl?: MapboxDraw) => void;
   mbMap: MbMap;
   enable: boolean;
   updateEditShape: (shapeToDraw: DRAW_SHAPE) => void;
@@ -68,6 +70,12 @@ export class DrawControl extends Component<Props> {
     this.props.onDraw(event, this._mbDrawControl);
   };
 
+  _onClick = (event: MapMouseEvent) => {
+    if (this.props.onClick) {
+      this.props.onClick(event, this._mbDrawControl);
+    }
+  };
+
   // debounce with zero timeout needed to allow mapbox-draw finish logic to complete
   // before _removeDrawControl is called
   _syncDrawControl = _.debounce(() => {
@@ -96,6 +104,9 @@ export class DrawControl extends Component<Props> {
     this.props.mbMap.getCanvas().style.cursor = '';
     this.props.mbMap.off('draw.modechange', this._onModeChange);
     this.props.mbMap.off('draw.create', this._onDraw);
+    if (this.props.onClick) {
+      this.props.mbMap.off('click', this._onClick);
+    }
     this.props.mbMap.removeLayer(GL_DRAW_RADIUS_LABEL_LAYER_ID);
     this.props.mbMap.removeControl(this._mbDrawControl);
     this._mbDrawControlAdded = false;
@@ -131,6 +142,9 @@ export class DrawControl extends Component<Props> {
       this.props.mbMap.getCanvas().style.cursor = 'crosshair';
       this.props.mbMap.on('draw.modechange', this._onModeChange);
       this.props.mbMap.on('draw.create', this._onDraw);
+      if (this.props.onClick) {
+        this.props.mbMap.on('click', this._onClick);
+      }
     }
 
     const { DRAW_LINE_STRING, DRAW_POLYGON, DRAW_POINT, SIMPLE_SELECT } = this._mbDrawControl.modes;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
index fb595e7804dfe..eb5ea9b5ddba5 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
@@ -6,26 +6,34 @@
  */
 
 import React, { Component } from 'react';
-import { Map as MbMap } from 'mapbox-gl';
+import { Map as MbMap, Point as MbPoint } from 'mapbox-gl';
 // @ts-expect-error
 import MapboxDraw from '@mapbox/mapbox-gl-draw';
 import { Feature, Geometry, Position } from 'geojson';
 import { i18n } from '@kbn/i18n';
 // @ts-expect-error
 import * as jsts from 'jsts';
+import { MapMouseEvent } from '@kbn/mapbox-gl';
 import { getToasts } from '../../../../kibana_services';
 import { DrawControl } from '../';
 import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common';
+import { ILayer } from '../../../../classes/layers/layer';
+import {
+  EXCLUDE_CENTROID_FEATURES,
+  EXCLUDE_TOO_MANY_FEATURES_BOX,
+} from '../../../../classes/util/mb_filter_expressions';
 
 const geoJSONReader = new jsts.io.GeoJSONReader();
 
 export interface ReduxStateProps {
   drawShape?: DRAW_SHAPE;
   drawMode: DRAW_MODE;
+  editLayer: ILayer | undefined;
 }
 
 export interface ReduxDispatchProps {
   addNewFeatureToIndex: (geometry: Geometry | Position[]) => void;
+  deleteFeatureFromIndex: (featureId: string) => void;
   disableDrawState: () => void;
 }
 
@@ -75,11 +83,58 @@ export class DrawFeatureControl extends Component<Props, {}> {
     }
   };
 
+  _onClick = async (event: MapMouseEvent, drawControl?: MapboxDraw) => {
+    const mbLngLatPoint: MbPoint = event.point;
+    if (!this.props.editLayer) {
+      return;
+    }
+    const mbEditLayerIds = this.props.editLayer
+      .getMbLayerIds()
+      .filter((mbLayerId) => !!this.props.mbMap.getLayer(mbLayerId));
+    const PADDING = 2; // in pixels
+    const mbBbox = [
+      {
+        x: mbLngLatPoint.x - PADDING,
+        y: mbLngLatPoint.y - PADDING,
+      },
+      {
+        x: mbLngLatPoint.x + PADDING,
+        y: mbLngLatPoint.y + PADDING,
+      },
+    ] as [MbPoint, MbPoint];
+    const selectedFeatures = this.props.mbMap.queryRenderedFeatures(mbBbox, {
+      layers: mbEditLayerIds,
+      filter: ['all', EXCLUDE_TOO_MANY_FEATURES_BOX, EXCLUDE_CENTROID_FEATURES],
+    });
+    if (!selectedFeatures.length) {
+      return;
+    }
+    const topMostFeature = selectedFeatures[0];
+
+    try {
+      if (!(topMostFeature.properties && topMostFeature.properties._id)) {
+        throw Error(`Associated Elasticsearch document id not found`);
+      }
+      const docId = topMostFeature.properties._id;
+      this.props.deleteFeatureFromIndex(docId);
+    } catch (error) {
+      getToasts().addWarning(
+        i18n.translate('xpack.maps.drawFeatureControl.unableToDeleteFeature', {
+          defaultMessage: `Unable to delete feature, error: '{errorMsg}'.`,
+          values: {
+            errorMsg: error.message,
+          },
+        })
+      );
+    }
+  };
+
   render() {
     return (
       <DrawControl
         drawShape={this.props.drawShape}
         onDraw={this._onDraw}
+        onClick={this._onClick}
         mbMap={this.props.mbMap}
         enable={true}
       />
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
index 9034e40913e77..e1d703173fc2d 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/index.ts
@@ -15,16 +15,18 @@ import {
   ReduxStateProps,
   OwnProps,
 } from './draw_feature_control';
-import { addNewFeatureToIndex, updateEditShape } from '../../../../actions';
+import { addNewFeatureToIndex, deleteFeatureFromIndex, updateEditShape } from '../../../../actions';
 import { MapStoreState } from '../../../../reducers/store';
-import { getEditState } from '../../../../selectors/map_selectors';
+import { getEditState, getLayerById } from '../../../../selectors/map_selectors';
 import { getDrawMode } from '../../../../selectors/ui_selectors';
 
 function mapStateToProps(state: MapStoreState): ReduxStateProps {
   const editState = getEditState(state);
+  const editLayer = editState ? getLayerById(editState.layerId, state) : undefined;
   return {
     drawShape: editState ? editState.drawShape : undefined,
     drawMode: getDrawMode(state),
+    editLayer,
   };
 }
 
@@ -35,6 +37,9 @@ function mapDispatchToProps(
     addNewFeatureToIndex(geometry: Geometry | Position[]) {
       dispatch(addNewFeatureToIndex(geometry));
     },
+    deleteFeatureFromIndex(featureId: string) {
+      dispatch(deleteFeatureFromIndex(featureId));
+    },
     disableDrawState() {
       dispatch(updateEditShape(null));
     },
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.tsx
index 5321c30f75245..4122f7ea796d4 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.tsx
@@ -98,6 +98,10 @@ export class DrawTooltip extends Component<Props, State> {
       instructions = i18n.translate('xpack.maps.drawTooltip.pointInstructions', {
         defaultMessage: 'Click to create point.',
       });
+    } else if (this.props.drawShape === DRAW_SHAPE.DELETE) {
+      instructions = i18n.translate('xpack.maps.drawTooltip.deleteInstructions', {
+        defaultMessage: 'Click feature to delete.',
+      });
     } else {
       // unknown draw type, tooltip not needed
       return null;
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
index 66948c0fc9bca..a2b3b20ae1877 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
@@ -34,6 +34,7 @@ export function FeatureEditTools(props: Props) {
   const drawCircleSelected = props.drawShape === DRAW_SHAPE.DISTANCE;
   const drawBBoxSelected = props.drawShape === DRAW_SHAPE.BOUNDS;
   const drawPointSelected = props.drawShape === DRAW_SHAPE.POINT;
+  const deleteSelected = props.drawShape === DRAW_SHAPE.DELETE;
 
   return (
     <EuiPanel paddingSize="none" className="mapToolbarOverlay__buttonGroup">
@@ -117,6 +118,24 @@ export function FeatureEditTools(props: Props) {
         isSelected={drawPointSelected}
         display={drawPointSelected ? 'fill' : 'empty'}
       />
+      <EuiButtonIcon
+        key="delete"
+        size="s"
+        onClick={() => props.setDrawShape(DRAW_SHAPE.DELETE)}
+        iconType="trash"
+        aria-label={i18n.translate(
+          'xpack.maps.toolbarOverlay.featureDraw.deletePointOrShapeLabel',
+          {
+            defaultMessage: 'Delete point or shape',
+          }
+        )}
+        title={i18n.translate('xpack.maps.toolbarOverlay.featureDraw.deletePointOrShapeTitle', {
+          defaultMessage: 'Delete point or shape',
+        })}
+        aria-pressed={deleteSelected}
+        isSelected={deleteSelected}
+        display={deleteSelected ? 'fill' : 'empty'}
+      />
 
       <EuiButtonIcon
         key="exit"
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 b137978025f86..6cae0d0630f90 100644
--- a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
+++ b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
@@ -104,6 +104,59 @@ export function initIndexingRoutes({
     }
   );
 
+  router.delete(
+    {
+      path: `${INDEX_FEATURE_PATH}/{featureId}`,
+      validate: {
+        params: schema.object({
+          featureId: schema.string(),
+        }),
+        body: schema.object({
+          index: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const { body: resp } = await context.core.elasticsearch.client.asCurrentUser.delete({
+          index: request.body.index,
+          id: request.params.featureId,
+          refresh: true,
+        });
+        if (resp.result === 'Error') {
+          throw resp;
+        } else {
+          return response.ok({ body: { success: true } });
+        }
+      } catch (error) {
+        logger.error(error);
+        const errorStatusCode = error.meta?.statusCode;
+        if (errorStatusCode === 401) {
+          return response.unauthorized({
+            body: {
+              message: 'User not authorized to delete indexed feature',
+            },
+          });
+        } else if (errorStatusCode === 403) {
+          return response.forbidden({
+            body: {
+              message: 'Access to delete indexed feature forbidden',
+            },
+          });
+        } else if (errorStatusCode === 404) {
+          return response.notFound({
+            body: { message: 'Feature not found' },
+          });
+        } else {
+          return response.custom({
+            body: 'Unknown error deleting feature',
+            statusCode: 500,
+          });
+        }
+      }
+    }
+  );
+
   router.get(
     {
       path: `${GET_MATCHING_INDEXES_PATH}/{indexPattern}`,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index aab80fe308861..3cf0891bc73b2 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -24284,4 +24284,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
     "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d4f263b58b8ab..3a1836cc25014 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -24660,4 +24660,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/maps/delete_feature.js b/x-pack/test/api_integration/apis/maps/delete_feature.js
new file mode 100644
index 0000000000000..0755b1a1f6b59
--- /dev/null
+++ b/x-pack/test/api_integration/apis/maps/delete_feature.js
@@ -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.
+ */
+
+export default function ({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('doc feature deletion', () => {
+    it('should delete a valid feature document', async () => {
+      await supertest
+        .delete(`/api/maps/feature/999`)
+        .set('kbn-xsrf', 'kibana')
+        .send({
+          index: 'drawing_data',
+        })
+        .expect(200);
+    });
+
+    it('previously deleted document no longer exists in index', async () => {
+      await supertest
+        .delete(`/api/maps/feature/999`)
+        .set('kbn-xsrf', 'kibana')
+        .send({
+          index: 'drawing_data',
+        })
+        .expect(404);
+    });
+
+    it('should fail if not a valid document', async () => {
+      await supertest
+        .delete(`/api/maps/feature/998`)
+        .set('kbn-xsrf', 'kibana')
+        .send({
+          index: 'drawing_data',
+        })
+        .expect(404);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js
index 14a42e06dbb9a..b3f1cf1a89e3b 100644
--- a/x-pack/test/api_integration/apis/maps/index.js
+++ b/x-pack/test/api_integration/apis/maps/index.js
@@ -17,6 +17,7 @@ export default function ({ loadTestFile, getService }) {
     describe('', () => {
       loadTestFile(require.resolve('./get_indexes_matching_pattern'));
       loadTestFile(require.resolve('./create_doc_source'));
+      loadTestFile(require.resolve('./delete_feature'));
       loadTestFile(require.resolve('./index_data'));
       loadTestFile(require.resolve('./fonts_api'));
       loadTestFile(require.resolve('./index_settings'));
diff --git a/x-pack/test/functional/es_archives/maps/data/data.json b/x-pack/test/functional/es_archives/maps/data/data.json
index e44b19504af38..86b257db8205c 100644
--- a/x-pack/test/functional/es_archives/maps/data/data.json
+++ b/x-pack/test/functional/es_archives/maps/data/data.json
@@ -137,6 +137,42 @@
 }
 
 
+{
+  "type": "doc",
+  "value": {
+    "id": "999",
+    "index": "drawing_data",
+    "source": {
+      "geometry": {
+        "coordinates": [
+          [
+            [
+              100,
+              5
+            ],
+            [
+              95,
+              -5
+            ],
+            [
+              105,
+              -5
+            ],
+            [
+              100,
+              5
+            ]
+          ]
+        ],
+        "type": "polygon"
+      },
+      "name": "doc-to-delete",
+      "prop1": 9
+    }
+  }
+}
+
+
 {
   "type": "doc",
   "value": {
diff --git a/x-pack/test/functional/es_archives/maps/data/mappings.json b/x-pack/test/functional/es_archives/maps/data/mappings.json
index 4ad5d6c33295b..3b674d162fced 100644
--- a/x-pack/test/functional/es_archives/maps/data/mappings.json
+++ b/x-pack/test/functional/es_archives/maps/data/mappings.json
@@ -26,6 +26,34 @@
   }
 }
 
+{
+  "type": "index",
+  "value": {
+    "index": "drawing_data",
+    "mappings": {
+      "properties": {
+        "geometry": {
+          "type": "geo_shape"
+        },
+        "name": {
+          "type": "keyword"
+        },
+        "prop1": {
+          "type": "byte"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "0",
+        "number_of_shards": "1",
+        "max_result_window": "10001",
+        "max_inner_result_window": "101"
+      }
+    }
+  }
+}
+
 {
   "type": "index",
   "value": {

From bc8ba8314a615e1cbf54a48974f8d36c7b38b83b Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Fri, 25 Jun 2021 00:22:29 -0400
Subject: [PATCH 86/95] [Fleet] Add support for constant_keyword "value" in
 package field definitions (#103000)

This enables Fleet to accept package field definitions that declare a constant "value"
for `constant_keyword` fields. Fleet will generate an index template for the constant_keyword
field that contains the `value` attribute.

Relates: https://github.com/elastic/package-spec/pull/194

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../__snapshots__/template.test.ts.snap       |  4 ++++
 .../elasticsearch/template/template.test.ts   | 20 +++++++++++++++++++
 .../epm/elasticsearch/template/template.ts    |  6 ++++++
 .../fields/__snapshots__/field.test.ts.snap   |  5 +++++
 .../fleet/server/services/epm/fields/field.ts |  1 +
 .../server/services/epm/fields/tests/base.yml |  3 +++
 6 files changed, 39 insertions(+)

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
index 6a4476316bfa5..eff35a30ba2d6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
@@ -86,6 +86,10 @@ exports[`EPM template tests loading base.yml: base.yml 1`] = `
         },
         "validarray": {
           "type": "integer"
+        },
+        "cycle_type": {
+          "type": "constant_keyword",
+          "value": "bicycle"
         }
       },
       "_meta": {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
index d1f806f67ca5c..10db955c52ee1 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -613,6 +613,26 @@ describe('EPM template', () => {
     expect(JSON.stringify(mappings)).toEqual(JSON.stringify(constantKeywordMapping));
   });
 
+  it('tests constant_keyword field type with value', () => {
+    const constantKeywordLiteralYaml = `
+- name: constantKeyword
+  type: constant_keyword
+  value: always_the_same
+  `;
+    const constantKeywordMapping = {
+      properties: {
+        constantKeyword: {
+          type: 'constant_keyword',
+          value: 'always_the_same',
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(constantKeywordLiteralYaml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(JSON.stringify(mappings)).toEqual(JSON.stringify(constantKeywordMapping));
+  });
+
   it('processes meta fields', () => {
     const metaFieldLiteralYaml = `
 - name: fieldWithMetas
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 6aa7680395bed..d4181201677c5 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -150,6 +150,12 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
             fieldProps.fields = generateMultiFields(field.multi_fields);
           }
           break;
+        case 'constant_keyword':
+          fieldProps.type = field.type;
+          if (field.value) {
+            fieldProps.value = field.value;
+          }
+          break;
         case 'object':
           fieldProps = { ...fieldProps, ...generateDynamicAndEnabled(field), type: 'object' };
           break;
diff --git a/x-pack/plugins/fleet/server/services/epm/fields/__snapshots__/field.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/fields/__snapshots__/field.test.ts.snap
index 5c402b896093a..78f1fbc528696 100644
--- a/x-pack/plugins/fleet/server/services/epm/fields/__snapshots__/field.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/fields/__snapshots__/field.test.ts.snap
@@ -55,6 +55,11 @@ exports[`tests loading fields.yml: base.yml 1`] = `
     "name": "validarray",
     "type": "array",
     "object_type": "integer"
+  },
+  {
+    "name": "cycle_type",
+    "type": "constant_keyword",
+    "value": "bicycle"
   }
 ]
 `;
diff --git a/x-pack/plugins/fleet/server/services/epm/fields/field.ts b/x-pack/plugins/fleet/server/services/epm/fields/field.ts
index b8839b88bb78c..9fa738aa60d09 100644
--- a/x-pack/plugins/fleet/server/services/epm/fields/field.ts
+++ b/x-pack/plugins/fleet/server/services/epm/fields/field.ts
@@ -15,6 +15,7 @@ export interface Field {
   name: string;
   type?: string;
   description?: string;
+  value?: string;
   format?: string;
   fields?: Fields;
   enabled?: boolean;
diff --git a/x-pack/plugins/fleet/server/services/epm/fields/tests/base.yml b/x-pack/plugins/fleet/server/services/epm/fields/tests/base.yml
index 5a71c7dee54dc..ee7cd63539c15 100644
--- a/x-pack/plugins/fleet/server/services/epm/fields/tests/base.yml
+++ b/x-pack/plugins/fleet/server/services/epm/fields/tests/base.yml
@@ -20,4 +20,7 @@
   object_type: integer
 - name: invalidarray
   type: array
+- name: cycle_type
+  type: constant_keyword
+  value: bicycle
 

From bc6ee27a29c24582d9553813d4d84864749a7cc8 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 25 Jun 2021 07:55:06 +0200
Subject: [PATCH 87/95] Maps locators (#102810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 🎸 implement maps locator

* feat: 🎸 add tile map locator

* feat: 🎸 add region map locator

* feat: 🎸 register maps locators

* refactor: 💡 remove usage of mpas url gen, replace by locator

* chore: 🤖 remove url generators

* refactor: 💡 use locators in maps deprecation messages

* chore: 🤖 remove maps url generators

* refactor: 💡 use new property name

* feat: 🎸 use constant

Co-authored-by: Vadim Kibana <vadimkibana@gmail.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/get_deprecation_message.tsx        |  32 +--
 .../public/get_deprecation_message.tsx        |  30 +-
 ...url_generator.test.ts => locators.test.ts} |  85 +++---
 x-pack/plugins/maps/public/locators.ts        | 260 ++++++++++++++++++
 x-pack/plugins/maps/public/plugin.ts          |  36 +--
 .../visualize_geo_field_action.ts             |  35 ++-
 x-pack/plugins/maps/public/url_generator.ts   | 241 ----------------
 7 files changed, 367 insertions(+), 352 deletions(-)
 rename x-pack/plugins/maps/public/{url_generator.test.ts => locators.test.ts} (52%)
 create mode 100644 x-pack/plugins/maps/public/locators.ts
 delete mode 100644 x-pack/plugins/maps/public/url_generator.ts

diff --git a/src/plugins/region_map/public/get_deprecation_message.tsx b/src/plugins/region_map/public/get_deprecation_message.tsx
index 5ae39a1291c4c..2606c8ed108e2 100644
--- a/src/plugins/region_map/public/get_deprecation_message.tsx
+++ b/src/plugins/region_map/public/get_deprecation_message.tsx
@@ -8,8 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { UrlGeneratorContract } from 'src/plugins/share/public';
-import { getCoreService, getQueryService, getShareService } from './kibana_services';
+import { getQueryService, getShareService } from './kibana_services';
 import { Vis } from '../../visualizations/public';
 import { LegacyMapDeprecationMessage } from '../../maps_legacy/public';
 
@@ -25,24 +24,16 @@ function getEmsLayerId(id: string | number, layerId: string) {
 }
 
 export function getDeprecationMessage(vis: Vis) {
-  let mapsRegionMapUrlGenerator:
-    | UrlGeneratorContract<'MAPS_APP_REGION_MAP_URL_GENERATOR'>
-    | undefined;
-  try {
-    mapsRegionMapUrlGenerator = getShareService().urlGenerators.getUrlGenerator(
-      'MAPS_APP_REGION_MAP_URL_GENERATOR'
-    );
-  } catch (error) {
-    // ignore error thrown when url generator is not available
-  }
-
   const title = i18n.translate('regionMap.mapVis.regionMapTitle', { defaultMessage: 'Region Map' });
 
   async function onClick(e: React.MouseEvent<HTMLButtonElement>) {
     e.preventDefault();
 
+    const locator = getShareService().url.locators.get('MAPS_APP_REGION_MAP_LOCATOR');
+    if (!locator) return;
+
     const query = getQueryService();
-    const createUrlParams: { [key: string]: any } = {
+    const params: { [key: string]: any } = {
       label: vis.title ? vis.title : title,
       emsLayerId: vis.params.selectedLayer.isEMS
         ? getEmsLayerId(vis.params.selectedLayer.id, vis.params.selectedLayer.layerId)
@@ -59,23 +50,22 @@ export function getDeprecationMessage(vis: Vis) {
 
     const bucketAggs = vis.data?.aggs?.byType('buckets');
     if (bucketAggs?.length && bucketAggs[0].type.dslName === 'terms') {
-      createUrlParams.termsFieldName = bucketAggs[0].getField()?.name;
-      createUrlParams.termsSize = bucketAggs[0].getParam('size');
+      params.termsFieldName = bucketAggs[0].getField()?.name;
+      params.termsSize = bucketAggs[0].getParam('size');
     }
 
     const metricAggs = vis.data?.aggs?.byType('metrics');
     if (metricAggs?.length) {
-      createUrlParams.metricAgg = metricAggs[0].type.dslName;
-      createUrlParams.metricFieldName = metricAggs[0].getField()?.name;
+      params.metricAgg = metricAggs[0].type.dslName;
+      params.metricFieldName = metricAggs[0].getField()?.name;
     }
 
-    const url = await mapsRegionMapUrlGenerator!.createUrl(createUrlParams);
-    getCoreService().application.navigateToUrl(url);
+    locator.navigate(params);
   }
 
   return (
     <LegacyMapDeprecationMessage
-      isMapsAvailable={!!mapsRegionMapUrlGenerator}
+      isMapsAvailable={!!getShareService().url.locators.get('MAPS_APP_REGION_MAP_LOCATOR')}
       onClick={onClick}
       visualizationLabel={title}
     />
diff --git a/src/plugins/tile_map/public/get_deprecation_message.tsx b/src/plugins/tile_map/public/get_deprecation_message.tsx
index 592b2b5f36eb2..6f71aa15b8a6b 100644
--- a/src/plugins/tile_map/public/get_deprecation_message.tsx
+++ b/src/plugins/tile_map/public/get_deprecation_message.tsx
@@ -8,22 +8,12 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { UrlGeneratorContract } from 'src/plugins/share/public';
-import { getCoreService, getQueryService, getShareService } from './services';
+import { getQueryService, getShareService } from './services';
 import { indexPatterns } from '../../data/public';
 import { Vis } from '../../visualizations/public';
 import { LegacyMapDeprecationMessage } from '../../maps_legacy/public';
 
 export function getDeprecationMessage(vis: Vis) {
-  let mapsTileMapUrlGenerator: UrlGeneratorContract<'MAPS_APP_TILE_MAP_URL_GENERATOR'> | undefined;
-  try {
-    mapsTileMapUrlGenerator = getShareService().urlGenerators.getUrlGenerator(
-      'MAPS_APP_TILE_MAP_URL_GENERATOR'
-    );
-  } catch (error) {
-    // ignore error thrown when url generator is not available
-  }
-
   const title = i18n.translate('tileMap.vis.mapTitle', {
     defaultMessage: 'Coordinate Map',
   });
@@ -31,8 +21,11 @@ export function getDeprecationMessage(vis: Vis) {
   async function onClick(e: React.MouseEvent<HTMLButtonElement>) {
     e.preventDefault();
 
+    const locator = getShareService().url.locators.get('MAPS_APP_TILE_MAP_LOCATOR');
+    if (!locator) return;
+
     const query = getQueryService();
-    const createUrlParams: { [key: string]: any } = {
+    const params: { [key: string]: any } = {
       label: vis.title ? vis.title : title,
       mapType: vis.params.mapType,
       colorSchema: vis.params.colorSchema,
@@ -45,7 +38,7 @@ export function getDeprecationMessage(vis: Vis) {
 
     const bucketAggs = vis.data?.aggs?.byType('buckets');
     if (bucketAggs?.length && bucketAggs[0].type.dslName === 'geohash_grid') {
-      createUrlParams.geoFieldName = bucketAggs[0].getField()?.name;
+      params.geoFieldName = bucketAggs[0].getField()?.name;
     } else if (vis.data.indexPattern) {
       // attempt to default to first geo point field when geohash is not configured yet
       const geoField = vis.data.indexPattern.fields.find((field) => {
@@ -54,23 +47,22 @@ export function getDeprecationMessage(vis: Vis) {
         );
       });
       if (geoField) {
-        createUrlParams.geoFieldName = geoField.name;
+        params.geoFieldName = geoField.name;
       }
     }
 
     const metricAggs = vis.data?.aggs?.byType('metrics');
     if (metricAggs?.length) {
-      createUrlParams.metricAgg = metricAggs[0].type.dslName;
-      createUrlParams.metricFieldName = metricAggs[0].getField()?.name;
+      params.metricAgg = metricAggs[0].type.dslName;
+      params.metricFieldName = metricAggs[0].getField()?.name;
     }
 
-    const url = await mapsTileMapUrlGenerator!.createUrl(createUrlParams);
-    getCoreService().application.navigateToUrl(url);
+    locator.navigate(params);
   }
 
   return (
     <LegacyMapDeprecationMessage
-      isMapsAvailable={!!mapsTileMapUrlGenerator}
+      isMapsAvailable={!!getShareService().url.locators.get('MAPS_APP_TILE_MAP_LOCATOR')}
       onClick={onClick}
       visualizationLabel={title}
     />
diff --git a/x-pack/plugins/maps/public/url_generator.test.ts b/x-pack/plugins/maps/public/locators.test.ts
similarity index 52%
rename from x-pack/plugins/maps/public/url_generator.test.ts
rename to x-pack/plugins/maps/public/locators.test.ts
index 827deb4cc9ad4..d6e82d1cdb601 100644
--- a/x-pack/plugins/maps/public/url_generator.test.ts
+++ b/x-pack/plugins/maps/public/locators.test.ts
@@ -5,49 +5,49 @@
  * 2.0.
  */
 
-import { createMapsUrlGenerator } from './url_generator';
 import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../common/constants';
 import { esFilters } from '../../../../src/plugins/data/public';
+import { MapsAppLocatorDefinition } from './locators';
+import { SerializableState } from '../../../../src/plugins/kibana_utils/common';
+import { LayerDescriptor } from '../common/descriptor_types';
 
-const APP_BASE_PATH: string = 'test/app/maps';
 const MAP_ID: string = '2c9c1f60-1909-11e9-919b-ffe5949a18d2';
 const LAYER_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
 const INDEX_PATTERN_ID: string = '90943e30-9a47-11e8-b64d-95841ca0b247';
 
 describe('visualize url generator', () => {
   test('creates a link to a new visualization', async () => {
-    const generator = createMapsUrlGenerator(() =>
-      Promise.resolve({
-        appBasePath: APP_BASE_PATH,
-        useHashedUrl: false,
-      })
-    );
-    const url = await generator.createUrl!({});
-    expect(url).toMatchInlineSnapshot(`"test/app/maps/map#/?_g=()&_a=()"`);
+    const locator = new MapsAppLocatorDefinition({
+      useHash: false,
+    });
+    const location = await locator.getLocation({});
+
+    expect(location).toMatchObject({
+      app: 'maps',
+      path: '/map#/?_g=()&_a=()',
+      state: {},
+    });
   });
 
   test('creates a link with global time range set up', async () => {
-    const generator = createMapsUrlGenerator(() =>
-      Promise.resolve({
-        appBasePath: APP_BASE_PATH,
-        useHashedUrl: false,
-      })
-    );
-    const url = await generator.createUrl!({
+    const locator = new MapsAppLocatorDefinition({
+      useHash: false,
+    });
+    const location = await locator.getLocation({
       timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
     });
-    expect(url).toMatchInlineSnapshot(
-      `"test/app/maps/map#/?_g=(time:(from:now-15m,mode:relative,to:now))&_a=()"`
-    );
+
+    expect(location).toMatchObject({
+      app: 'maps',
+      path: '/map#/?_g=(time:(from:now-15m,mode:relative,to:now))&_a=()',
+      state: {},
+    });
   });
 
   test('creates a link with initialLayers set up', async () => {
-    const generator = createMapsUrlGenerator(() =>
-      Promise.resolve({
-        appBasePath: APP_BASE_PATH,
-        useHashedUrl: false,
-      })
-    );
+    const locator = new MapsAppLocatorDefinition({
+      useHash: false,
+    });
     const initialLayers = [
       {
         id: LAYER_ID,
@@ -64,22 +64,22 @@ describe('visualize url generator', () => {
         },
       },
     ];
-    const url = await generator.createUrl!({
-      initialLayers,
+    const location = await locator.getLocation({
+      initialLayers: (initialLayers as unknown) as LayerDescriptor[] & SerializableState,
+    });
+
+    expect(location).toMatchObject({
+      app: 'maps',
+      path: `/map#/?_g=()&_a=()&initialLayers=(id%3A'13823000-99b9-11ea-9eb6-d9e8adceb647'%2CsourceDescriptor%3A(geoField%3Atest%2Cid%3A'13823000-99b9-11ea-9eb6-d9e8adceb647'%2CindexPatternId%3A'90943e30-9a47-11e8-b64d-95841ca0b247'%2Clabel%3A'Sample%20Data'%2CscalingType%3ALIMIT%2CtooltipProperties%3A!()%2Ctype%3AES_SEARCH)%2Ctype%3AVECTOR%2Cvisible%3A!t)`,
+      state: {},
     });
-    expect(url).toMatchInlineSnapshot(
-      `"test/app/maps/map#/?_g=()&_a=()&initialLayers=(id%3A'13823000-99b9-11ea-9eb6-d9e8adceb647'%2CsourceDescriptor%3A(geoField%3Atest%2Cid%3A'13823000-99b9-11ea-9eb6-d9e8adceb647'%2CindexPatternId%3A'90943e30-9a47-11e8-b64d-95841ca0b247'%2Clabel%3A'Sample%20Data'%2CscalingType%3ALIMIT%2CtooltipProperties%3A!()%2Ctype%3AES_SEARCH)%2Ctype%3AVECTOR%2Cvisible%3A!t)"`
-    );
   });
 
   test('creates a link with filters, time range, refresh interval and query to a saved visualization', async () => {
-    const generator = createMapsUrlGenerator(() =>
-      Promise.resolve({
-        appBasePath: APP_BASE_PATH,
-        useHashedUrl: false,
-      })
-    );
-    const url = await generator.createUrl!({
+    const locator = new MapsAppLocatorDefinition({
+      useHash: false,
+    });
+    const location = await locator.getLocation({
       timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
       refreshInterval: { pause: false, value: 300 },
       mapId: MAP_ID,
@@ -106,8 +106,11 @@ describe('visualize url generator', () => {
       ],
       query: { query: 'q2', language: 'kuery' },
     });
-    expect(url).toMatchInlineSnapshot(
-      `"test/app/maps/map#/${MAP_ID}?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),query:(language:kuery,query:q2))"`
-    );
+
+    expect(location).toMatchObject({
+      app: 'maps',
+      path: `/map#/${MAP_ID}?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),query:(language:kuery,query:q2))`,
+      state: {},
+    });
   });
 });
diff --git a/x-pack/plugins/maps/public/locators.ts b/x-pack/plugins/maps/public/locators.ts
new file mode 100644
index 0000000000000..7e2be7c6c7ec9
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators.ts
@@ -0,0 +1,260 @@
+/*
+ * 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.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+import rison from 'rison-node';
+import type {
+  TimeRange,
+  Filter,
+  Query,
+  QueryState,
+  RefreshInterval,
+} from '../../../../src/plugins/data/public';
+import { esFilters } from '../../../../src/plugins/data/public';
+import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
+import { SerializableState } from '../../../../src/plugins/kibana_utils/common';
+import type { LocatorDefinition, LocatorPublic } from '../../../../src/plugins/share/public';
+import type { LayerDescriptor } from '../common/descriptor_types';
+import { INITIAL_LAYERS_KEY, APP_ID } from '../common/constants';
+import { lazyLoadMapModules } from './lazy_load_bundle';
+
+export interface MapsAppLocatorParams extends SerializableState {
+  /**
+   * If given, it will load the given map else will load the create a new map page.
+   */
+  mapId?: string;
+
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Optionally set the initial Layers.
+   */
+  initialLayers?: LayerDescriptor[] & SerializableState;
+
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval & SerializableState;
+
+  /**
+   * Optionally apply filers. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has filters saved with it, this will _replace_ those filters.
+   */
+  filters?: Filter[];
+
+  /**
+   * Optionally set a query. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has a query saved with it, this will _replace_ that query.
+   */
+  query?: Query;
+
+  /**
+   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
+   * whether to hash the data in the url to avoid url length issues.
+   */
+  hash?: boolean;
+}
+
+export const MAPS_APP_LOCATOR = 'MAPS_APP_LOCATOR' as const;
+
+export type MapsAppLocator = LocatorPublic<MapsAppLocatorParams>;
+
+export interface MapsAppLocatorDependencies {
+  useHash: boolean;
+}
+
+export class MapsAppLocatorDefinition implements LocatorDefinition<MapsAppLocatorParams> {
+  public readonly id = MAPS_APP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppLocatorParams) => {
+    const { mapId, filters, query, refreshInterval, timeRange, initialLayers, hash } = params;
+    const useHash = hash ?? this.deps.useHash;
+    const appState: {
+      query?: Query;
+      filters?: Filter[];
+      vis?: unknown;
+    } = {};
+    const queryState: QueryState = {};
+
+    if (query) appState.query = query;
+    if (filters && filters.length)
+      appState.filters = filters?.filter((f) => !esFilters.isFilterPinned(f));
+    if (timeRange) queryState.time = timeRange;
+    if (filters && filters.length)
+      queryState.filters = filters?.filter((f) => esFilters.isFilterPinned(f));
+    if (refreshInterval) queryState.refreshInterval = refreshInterval;
+
+    let path = `/map#/${mapId || ''}`;
+    path = setStateToKbnUrl<QueryState>('_g', queryState, { useHash }, path);
+    path = setStateToKbnUrl('_a', appState, { useHash }, path);
+
+    if (initialLayers && initialLayers.length) {
+      const risonEncodedInitialLayers = ((rison as unknown) as {
+        encode_array: (
+          initialLayers: (LayerDescriptor[] & SerializableState) | undefined
+        ) => string;
+      }).encode_array(initialLayers);
+      path = `${path}&${INITIAL_LAYERS_KEY}=${encodeURIComponent(risonEncodedInitialLayers)}`;
+    }
+
+    return {
+      app: APP_ID,
+      path,
+      state: {},
+    };
+  };
+}
+
+export interface MapsAppTileMapLocatorParams extends SerializableState {
+  label: string;
+  mapType: string;
+  colorSchema: string;
+  indexPatternId?: string;
+  geoFieldName?: string;
+  metricAgg: string;
+  metricFieldName?: string;
+  timeRange?: TimeRange;
+  filters?: Filter[];
+  query?: Query;
+  hash?: boolean;
+}
+
+export type MapsAppTileMapLocator = LocatorPublic<MapsAppLocatorParams>;
+
+export const MAPS_APP_TILE_MAP_LOCATOR = 'MAPS_APP_TILE_MAP_LOCATOR' as const;
+
+export interface MapsAppTileMapLocatorDependencies {
+  locator: MapsAppLocator;
+}
+
+export class MapsAppTileMapLocatorDefinition
+  implements LocatorDefinition<MapsAppTileMapLocatorParams> {
+  public readonly id = MAPS_APP_TILE_MAP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppTileMapLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppTileMapLocatorParams) => {
+    const {
+      label,
+      mapType,
+      colorSchema,
+      indexPatternId,
+      geoFieldName,
+      metricAgg,
+      metricFieldName,
+      filters,
+      query,
+      timeRange,
+      hash = true,
+    } = params;
+    const mapModules = await lazyLoadMapModules();
+    const initialLayers = ([] as unknown) as LayerDescriptor[] & SerializableState;
+    const tileMapLayerDescriptor = mapModules.createTileMapLayerDescriptor({
+      label,
+      mapType,
+      colorSchema,
+      indexPatternId,
+      geoFieldName,
+      metricAgg,
+      metricFieldName,
+    });
+
+    if (tileMapLayerDescriptor) {
+      initialLayers.push(tileMapLayerDescriptor);
+    }
+
+    return await this.deps.locator.getLocation({
+      initialLayers,
+      filters,
+      query,
+      timeRange,
+      hash,
+    });
+  };
+}
+
+export interface MapsAppRegionMapLocatorParams extends SerializableState {
+  label: string;
+  emsLayerId?: string;
+  leftFieldName?: string;
+  termsFieldName?: string;
+  termsSize?: number;
+  colorSchema: string;
+  indexPatternId?: string;
+  indexPatternTitle?: string;
+  metricAgg: string;
+  metricFieldName?: string;
+  timeRange?: TimeRange;
+  filters?: Filter[];
+  query?: Query;
+  hash?: boolean;
+}
+
+export type MapsAppRegionMapLocator = LocatorPublic<MapsAppRegionMapLocatorParams>;
+
+export const MAPS_APP_REGION_MAP_LOCATOR = 'MAPS_APP_REGION_MAP_LOCATOR' as const;
+
+export interface MapsAppRegionMapLocatorDependencies {
+  locator: MapsAppLocator;
+}
+
+export class MapsAppRegionMapLocatorDefinition
+  implements LocatorDefinition<MapsAppRegionMapLocatorParams> {
+  public readonly id = MAPS_APP_REGION_MAP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppRegionMapLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppRegionMapLocatorParams) => {
+    const {
+      label,
+      emsLayerId,
+      leftFieldName,
+      termsFieldName,
+      termsSize,
+      colorSchema,
+      indexPatternId,
+      indexPatternTitle,
+      metricAgg,
+      metricFieldName,
+      filters,
+      query,
+      timeRange,
+      hash = true,
+    } = params;
+    const mapModules = await lazyLoadMapModules();
+    const initialLayers = ([] as unknown) as LayerDescriptor[] & SerializableState;
+    const regionMapLayerDescriptor = mapModules.createRegionMapLayerDescriptor({
+      label,
+      emsLayerId,
+      leftFieldName,
+      termsFieldName,
+      termsSize,
+      colorSchema,
+      indexPatternId,
+      indexPatternTitle,
+      metricAgg,
+      metricFieldName,
+    });
+    if (regionMapLayerDescriptor) {
+      initialLayers.push(regionMapLayerDescriptor);
+    }
+
+    return await this.deps.locator.getLocation({
+      initialLayers,
+      filters,
+      query,
+      timeRange,
+      hash,
+    });
+  };
+}
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 740112124a251..b526e7b24d90f 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -36,11 +36,6 @@ import type {
 } from '../../../../src/plugins/visualizations/public';
 import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
 import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../src/plugins/ui_actions/public';
-import {
-  createMapsUrlGenerator,
-  createRegionMapUrlGenerator,
-  createTileMapUrlGenerator,
-} from './url_generator';
 import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
 import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
 import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
@@ -71,6 +66,11 @@ import {
 import { EMSSettings } from '../common/ems_settings';
 import type { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
 import type { ChartsPluginStart } from '../../../../src/plugins/charts/public';
+import {
+  MapsAppLocatorDefinition,
+  MapsAppRegionMapLocatorDefinition,
+  MapsAppTileMapLocatorDefinition,
+} from './locators';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -133,17 +133,21 @@ export class MapsPlugin
     const emsSettings = new EMSSettings(plugins.mapsEms.config, getIsEnterprisePlus);
     setEMSSettings(emsSettings);
 
-    // register url generators
-    const getStartServices = async () => {
-      const [coreStart] = await core.getStartServices();
-      return {
-        appBasePath: coreStart.application.getUrlForApp('maps'),
-        useHashedUrl: coreStart.uiSettings.get('state:storeInSessionStorage'),
-      };
-    };
-    plugins.share.urlGenerators.registerUrlGenerator(createMapsUrlGenerator(getStartServices));
-    plugins.share.urlGenerators.registerUrlGenerator(createTileMapUrlGenerator(getStartServices));
-    plugins.share.urlGenerators.registerUrlGenerator(createRegionMapUrlGenerator(getStartServices));
+    const locator = plugins.share.url.locators.create(
+      new MapsAppLocatorDefinition({
+        useHash: core.uiSettings.get('state:storeInSessionStorage'),
+      })
+    );
+    plugins.share.url.locators.create(
+      new MapsAppTileMapLocatorDefinition({
+        locator,
+      })
+    );
+    plugins.share.url.locators.create(
+      new MapsAppRegionMapLocatorDefinition({
+        locator,
+      })
+    );
 
     plugins.inspector.registerView(MapView);
     if (plugins.home) {
diff --git a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
index acdc5164cb17d..c6daee554c9fc 100644
--- a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
@@ -7,6 +7,7 @@
 
 import uuid from 'uuid/v4';
 import { i18n } from '@kbn/i18n';
+import { SerializableState } from 'src/plugins/kibana_utils/common';
 import {
   createAction,
   ACTION_VISUALIZE_GEO_FIELD,
@@ -17,10 +18,11 @@ import {
   getIndexPatternService,
   getData,
   getShareService,
-  getNavigateToApp,
+  getCore,
 } from '../kibana_services';
-import { MAPS_APP_URL_GENERATOR, MapsUrlGeneratorState } from '../url_generator';
-import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES, APP_ID, MAP_PATH } from '../../common/constants';
+import { MapsAppLocator, MAPS_APP_LOCATOR } from '../locators';
+import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../../common/constants';
+import { LayerDescriptor } from '../../common/descriptor_types';
 
 export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
   id: ACTION_VISUALIZE_GEO_FIELD,
@@ -31,15 +33,19 @@ export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
     }),
   isCompatible: async () => !!getVisualizeCapabilities().show,
   getHref: async (context) => {
-    const url = await getMapsLink(context);
-    return url;
+    const { app, path } = await getMapsLink(context);
+
+    return getCore().application.getUrlForApp(app, {
+      path,
+      absolute: false,
+    });
   },
   execute: async (context) => {
-    const url = await getMapsLink(context);
-    const hash = url.split('#')[1];
+    const { app, path, state } = await getMapsLink(context);
 
-    getNavigateToApp()(APP_ID, {
-      path: `${MAP_PATH}/#${hash}`,
+    getCore().application.navigateToApp(app, {
+      path,
+      state,
     });
   },
 });
@@ -68,12 +74,13 @@ const getMapsLink = async (context: VisualizeFieldContext) => {
     },
   ];
 
-  const generator = getShareService().urlGenerators.getUrlGenerator(MAPS_APP_URL_GENERATOR);
-  const urlState: MapsUrlGeneratorState = {
+  const locator = getShareService().url.locators.get(MAPS_APP_LOCATOR) as MapsAppLocator;
+  const location = await locator.getLocation({
     filters: getData().query.filterManager.getFilters(),
     query: getData().query.queryString.getQuery(),
-    initialLayers,
+    initialLayers: (initialLayers as unknown) as LayerDescriptor[] & SerializableState,
     timeRange: getData().query.timefilter.timefilter.getTime(),
-  };
-  return generator.createUrl(urlState);
+  });
+
+  return location;
 };
diff --git a/x-pack/plugins/maps/public/url_generator.ts b/x-pack/plugins/maps/public/url_generator.ts
deleted file mode 100644
index 9f28b388c4756..0000000000000
--- a/x-pack/plugins/maps/public/url_generator.ts
+++ /dev/null
@@ -1,241 +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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import rison from 'rison-node';
-import type {
-  TimeRange,
-  Filter,
-  Query,
-  QueryState,
-  RefreshInterval,
-} from '../../../../src/plugins/data/public';
-import { esFilters } from '../../../../src/plugins/data/public';
-import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import type { UrlGeneratorsDefinition } from '../../../../src/plugins/share/public';
-import type { LayerDescriptor } from '../common/descriptor_types';
-import { INITIAL_LAYERS_KEY } from '../common/constants';
-import { lazyLoadMapModules } from './lazy_load_bundle';
-
-const STATE_STORAGE_KEY = '_a';
-const GLOBAL_STATE_STORAGE_KEY = '_g';
-
-export const MAPS_APP_URL_GENERATOR = 'MAPS_APP_URL_GENERATOR';
-export const MAPS_APP_TILE_MAP_URL_GENERATOR = 'MAPS_APP_TILE_MAP_URL_GENERATOR';
-export const MAPS_APP_REGION_MAP_URL_GENERATOR = 'MAPS_APP_REGION_MAP_URL_GENERATOR';
-
-export interface MapsUrlGeneratorState {
-  /**
-   * If given, it will load the given map else will load the create a new map page.
-   */
-  mapId?: string;
-  /**
-   * Optionally set the time range in the time picker.
-   */
-  timeRange?: TimeRange;
-
-  /**
-   * Optionally set the initial Layers.
-   */
-  initialLayers?: LayerDescriptor[];
-
-  /**
-   * Optionally set the refresh interval.
-   */
-  refreshInterval?: RefreshInterval;
-
-  /**
-   * Optionally apply filers. NOTE: if given and used in conjunction with `mapId`, and the
-   * saved map has filters saved with it, this will _replace_ those filters.
-   */
-  filters?: Filter[];
-  /**
-   * Optionally set a query. NOTE: if given and used in conjunction with `mapId`, and the
-   * saved map has a query saved with it, this will _replace_ that query.
-   */
-  query?: Query;
-  /**
-   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
-   * whether to hash the data in the url to avoid url length issues.
-   */
-  hash?: boolean;
-}
-
-type GetStartServices = () => Promise<{
-  appBasePath: string;
-  useHashedUrl: boolean;
-}>;
-
-async function createMapUrl({
-  getStartServices,
-  mapId,
-  filters,
-  query,
-  refreshInterval,
-  timeRange,
-  initialLayers,
-  hash,
-}: MapsUrlGeneratorState & { getStartServices: GetStartServices }): Promise<string> {
-  const startServices = await getStartServices();
-  const useHash = hash ?? startServices.useHashedUrl;
-  const appBasePath = startServices.appBasePath;
-
-  const appState: {
-    query?: Query;
-    filters?: Filter[];
-    vis?: unknown;
-  } = {};
-  const queryState: QueryState = {};
-
-  if (query) appState.query = query;
-  if (filters && filters.length)
-    appState.filters = filters?.filter((f) => !esFilters.isFilterPinned(f));
-
-  if (timeRange) queryState.time = timeRange;
-  if (filters && filters.length)
-    queryState.filters = filters?.filter((f) => esFilters.isFilterPinned(f));
-  if (refreshInterval) queryState.refreshInterval = refreshInterval;
-
-  let url = `${appBasePath}/map#/${mapId || ''}`;
-  url = setStateToKbnUrl<QueryState>(GLOBAL_STATE_STORAGE_KEY, queryState, { useHash }, url);
-  url = setStateToKbnUrl(STATE_STORAGE_KEY, appState, { useHash }, url);
-
-  if (initialLayers && initialLayers.length) {
-    // @ts-ignore
-    const risonEncodedInitialLayers = rison.encode_array(initialLayers);
-    url = `${url}&${INITIAL_LAYERS_KEY}=${encodeURIComponent(risonEncodedInitialLayers)}`;
-  }
-
-  return url;
-}
-
-export const createMapsUrlGenerator = (
-  getStartServices: GetStartServices
-): UrlGeneratorsDefinition<typeof MAPS_APP_URL_GENERATOR> => ({
-  id: MAPS_APP_URL_GENERATOR,
-  createUrl: async (mapsUrlGeneratorState: MapsUrlGeneratorState): Promise<string> => {
-    return createMapUrl({ ...mapsUrlGeneratorState, getStartServices });
-  },
-});
-
-export const createTileMapUrlGenerator = (
-  getStartServices: GetStartServices
-): UrlGeneratorsDefinition<typeof MAPS_APP_TILE_MAP_URL_GENERATOR> => ({
-  id: MAPS_APP_TILE_MAP_URL_GENERATOR,
-  createUrl: async ({
-    label,
-    mapType,
-    colorSchema,
-    indexPatternId,
-    geoFieldName,
-    metricAgg,
-    metricFieldName,
-    filters,
-    query,
-    timeRange,
-    hash,
-  }: {
-    label: string;
-    mapType: string;
-    colorSchema: string;
-    indexPatternId?: string;
-    geoFieldName?: string;
-    metricAgg: string;
-    metricFieldName?: string;
-    timeRange?: TimeRange;
-    filters?: Filter[];
-    query?: Query;
-    hash?: boolean;
-  }): Promise<string> => {
-    const mapModules = await lazyLoadMapModules();
-    const initialLayers = [];
-    const tileMapLayerDescriptor = mapModules.createTileMapLayerDescriptor({
-      label,
-      mapType,
-      colorSchema,
-      indexPatternId,
-      geoFieldName,
-      metricAgg,
-      metricFieldName,
-    });
-    if (tileMapLayerDescriptor) {
-      initialLayers.push(tileMapLayerDescriptor);
-    }
-
-    return createMapUrl({
-      initialLayers,
-      filters,
-      query,
-      timeRange,
-      hash: true,
-      getStartServices,
-    });
-  },
-});
-
-export const createRegionMapUrlGenerator = (
-  getStartServices: GetStartServices
-): UrlGeneratorsDefinition<typeof MAPS_APP_REGION_MAP_URL_GENERATOR> => ({
-  id: MAPS_APP_REGION_MAP_URL_GENERATOR,
-  createUrl: async ({
-    label,
-    emsLayerId,
-    leftFieldName,
-    termsFieldName,
-    termsSize,
-    colorSchema,
-    indexPatternId,
-    indexPatternTitle,
-    metricAgg,
-    metricFieldName,
-    filters,
-    query,
-    timeRange,
-    hash,
-  }: {
-    label: string;
-    emsLayerId?: string;
-    leftFieldName?: string;
-    termsFieldName?: string;
-    termsSize?: number;
-    colorSchema: string;
-    indexPatternId?: string;
-    indexPatternTitle?: string;
-    metricAgg: string;
-    metricFieldName?: string;
-    timeRange?: TimeRange;
-    filters?: Filter[];
-    query?: Query;
-    hash?: boolean;
-  }): Promise<string> => {
-    const mapModules = await lazyLoadMapModules();
-    const initialLayers = [];
-    const regionMapLayerDescriptor = mapModules.createRegionMapLayerDescriptor({
-      label,
-      emsLayerId,
-      leftFieldName,
-      termsFieldName,
-      termsSize,
-      colorSchema,
-      indexPatternId,
-      indexPatternTitle,
-      metricAgg,
-      metricFieldName,
-    });
-    if (regionMapLayerDescriptor) {
-      initialLayers.push(regionMapLayerDescriptor);
-    }
-
-    return createMapUrl({
-      initialLayers,
-      filters,
-      query,
-      timeRange,
-      hash: true,
-      getStartServices,
-    });
-  },
-});

From baf2de5415c6c7ad5a29a95ff54f8376896d1b81 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 25 Jun 2021 07:58:03 +0200
Subject: [PATCH 88/95] Dashboard locator (#102854)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add dashboard locator

* feat: 🎸 expose dashboard locator from dashboard plugin

* Use dashboard locator in dashboard drilldown

* Add tests for dashboard locator

* Fix dashboard drilldown tests after refactor

* Deprecate dashboard URL generator

* Fix TypeScript errors in exmaple plugin

* Use correct type for dashboard locator

* refactor: 💡 change "route" attribute to "path"

* chore: 🤖 remove unused bundle

Co-authored-by: Vadim Kibana <vadimkibana@gmail.com>
Co-authored-by: Vadim Kibana <82822460+vadimkibana@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 src/plugins/dashboard/public/index.ts         |   3 +
 src/plugins/dashboard/public/locator.test.ts  | 323 ++++++++++++++++++
 src/plugins/dashboard/public/locator.ts       | 160 +++++++++
 src/plugins/dashboard/public/plugin.tsx       |  36 +-
 src/plugins/dashboard/public/url_generator.ts |   6 +
 .../ui_actions_enhanced_examples/kibana.json  |   3 +-
 .../app1_to_dashboard_drilldown.ts            |   9 +-
 .../app2_to_dashboard_drilldown.ts            |   9 +-
 .../abstract_dashboard_drilldown.tsx          |  28 +-
 ...embeddable_to_dashboard_drilldown.test.tsx |  37 +-
 .../embeddable_to_dashboard_drilldown.tsx     |  23 +-
 11 files changed, 578 insertions(+), 59 deletions(-)
 create mode 100644 src/plugins/dashboard/public/locator.test.ts
 create mode 100644 src/plugins/dashboard/public/locator.ts

diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index c584b44286e07..ff7708689c221 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -22,11 +22,14 @@ export {
   DashboardUrlGenerator,
   DashboardFeatureFlagConfig,
 } from './plugin';
+
 export {
   DASHBOARD_APP_URL_GENERATOR,
   createDashboardUrlGenerator,
   DashboardUrlGeneratorState,
 } from './url_generator';
+export { DashboardAppLocator, DashboardAppLocatorParams } from './locator';
+
 export { DashboardSavedObject } from './saved_dashboards';
 export { SavedDashboardPanel, DashboardContainerInput } from './types';
 
diff --git a/src/plugins/dashboard/public/locator.test.ts b/src/plugins/dashboard/public/locator.test.ts
new file mode 100644
index 0000000000000..0b647ac00ce31
--- /dev/null
+++ b/src/plugins/dashboard/public/locator.test.ts
@@ -0,0 +1,323 @@
+/*
+ * 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 { DashboardAppLocatorDefinition } from './locator';
+import { hashedItemStore } from '../../kibana_utils/public';
+import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock';
+import { esFilters } from '../../data/public';
+
+describe('dashboard locator', () => {
+  beforeEach(() => {
+    // @ts-ignore
+    hashedItemStore.storage = mockStorage;
+  });
+
+  test('creates a link to a saved dashboard', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({});
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: '#/create?_a=()&_g=()',
+      state: {},
+    });
+  });
+
+  test('creates a link with global time range set up', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+    });
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: '#/create?_a=()&_g=(time:(from:now-15m,mode:relative,to:now))',
+      state: {},
+    });
+  });
+
+  test('creates a link with filters, time range, refresh interval and query to a saved object', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      refreshInterval: { pause: false, value: 300 },
+      dashboardId: '123',
+      filters: [
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'hi' },
+        },
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'hi' },
+          $state: {
+            store: esFilters.FilterStateStore.GLOBAL_STATE,
+          },
+        },
+      ],
+      query: { query: 'bye', language: 'kuery' },
+    });
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: `#/view/123?_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:hi))),query:(language:kuery,query:bye))&_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:hi))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))`,
+      state: {},
+    });
+  });
+
+  test('searchSessionId', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      refreshInterval: { pause: false, value: 300 },
+      dashboardId: '123',
+      filters: [],
+      query: { query: 'bye', language: 'kuery' },
+      searchSessionId: '__sessionSearchId__',
+    });
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: `#/view/123?_a=(filters:!(),query:(language:kuery,query:bye))&_g=(filters:!(),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&searchSessionId=__sessionSearchId__`,
+      state: {},
+    });
+  });
+
+  test('savedQuery', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      savedQuery: '__savedQueryId__',
+    });
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: `#/create?_a=(savedQuery:__savedQueryId__)&_g=()`,
+      state: {},
+    });
+    expect(location.path).toContain('__savedQueryId__');
+  });
+
+  test('panels', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      panels: [{ fakePanelContent: 'fakePanelContent' }] as any,
+    });
+
+    expect(location).toMatchObject({
+      app: 'dashboards',
+      path: `#/create?_a=(panels:!((fakePanelContent:fakePanelContent)))&_g=()`,
+      state: {},
+    });
+  });
+
+  test('if no useHash setting is given, uses the one was start services', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: true,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+    });
+
+    expect(location.path.indexOf('relative')).toBe(-1);
+  });
+
+  test('can override a false useHash ui setting', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      useHash: true,
+    });
+
+    expect(location.path.indexOf('relative')).toBe(-1);
+  });
+
+  test('can override a true useHash ui setting', async () => {
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: true,
+      getDashboardFilterFields: async (dashboardId: string) => [],
+    });
+    const location = await definition.getLocation({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      useHash: false,
+    });
+
+    expect(location.path.indexOf('relative')).toBeGreaterThan(1);
+  });
+
+  describe('preserving saved filters', () => {
+    const savedFilter1 = {
+      meta: {
+        alias: null,
+        disabled: false,
+        negate: false,
+      },
+      query: { query: 'savedfilter1' },
+    };
+
+    const savedFilter2 = {
+      meta: {
+        alias: null,
+        disabled: false,
+        negate: false,
+      },
+      query: { query: 'savedfilter2' },
+    };
+
+    const appliedFilter = {
+      meta: {
+        alias: null,
+        disabled: false,
+        negate: false,
+      },
+      query: { query: 'appliedfilter' },
+    };
+
+    test('attaches filters from destination dashboard', async () => {
+      const definition = new DashboardAppLocatorDefinition({
+        useHashedUrl: false,
+        getDashboardFilterFields: async (dashboardId: string) => {
+          return dashboardId === 'dashboard1'
+            ? [savedFilter1]
+            : dashboardId === 'dashboard2'
+            ? [savedFilter2]
+            : [];
+        },
+      });
+
+      const location1 = await definition.getLocation({
+        dashboardId: 'dashboard1',
+        filters: [appliedFilter],
+      });
+
+      expect(location1.path).toEqual(expect.stringContaining('query:savedfilter1'));
+      expect(location1.path).toEqual(expect.stringContaining('query:appliedfilter'));
+
+      const location2 = await definition.getLocation({
+        dashboardId: 'dashboard2',
+        filters: [appliedFilter],
+      });
+
+      expect(location2.path).toEqual(expect.stringContaining('query:savedfilter2'));
+      expect(location2.path).toEqual(expect.stringContaining('query:appliedfilter'));
+    });
+
+    test("doesn't fail if can't retrieve filters from destination dashboard", async () => {
+      const definition = new DashboardAppLocatorDefinition({
+        useHashedUrl: false,
+        getDashboardFilterFields: async (dashboardId: string) => {
+          if (dashboardId === 'dashboard1') {
+            throw new Error('Not found');
+          }
+          return [];
+        },
+      });
+
+      const location = await definition.getLocation({
+        dashboardId: 'dashboard1',
+        filters: [appliedFilter],
+      });
+
+      expect(location.path).not.toEqual(expect.stringContaining('query:savedfilter1'));
+      expect(location.path).toEqual(expect.stringContaining('query:appliedfilter'));
+    });
+
+    test('can enforce empty filters', async () => {
+      const definition = new DashboardAppLocatorDefinition({
+        useHashedUrl: false,
+        getDashboardFilterFields: async (dashboardId: string) => {
+          if (dashboardId === 'dashboard1') {
+            return [savedFilter1];
+          }
+          return [];
+        },
+      });
+
+      const location = await definition.getLocation({
+        dashboardId: 'dashboard1',
+        filters: [],
+        preserveSavedFilters: false,
+      });
+
+      expect(location.path).not.toEqual(expect.stringContaining('query:savedfilter1'));
+      expect(location.path).not.toEqual(expect.stringContaining('query:appliedfilter'));
+      expect(location.path).toMatchInlineSnapshot(
+        `"#/view/dashboard1?_a=(filters:!())&_g=(filters:!())"`
+      );
+    });
+
+    test('no filters in result url if no filters applied', async () => {
+      const definition = new DashboardAppLocatorDefinition({
+        useHashedUrl: false,
+        getDashboardFilterFields: async (dashboardId: string) => {
+          if (dashboardId === 'dashboard1') {
+            return [savedFilter1];
+          }
+          return [];
+        },
+      });
+
+      const location = await definition.getLocation({
+        dashboardId: 'dashboard1',
+      });
+
+      expect(location.path).not.toEqual(expect.stringContaining('filters'));
+      expect(location.path).toMatchInlineSnapshot(`"#/view/dashboard1?_a=()&_g=()"`);
+    });
+
+    test('can turn off preserving filters', async () => {
+      const definition = new DashboardAppLocatorDefinition({
+        useHashedUrl: false,
+        getDashboardFilterFields: async (dashboardId: string) => {
+          if (dashboardId === 'dashboard1') {
+            return [savedFilter1];
+          }
+          return [];
+        },
+      });
+
+      const location = await definition.getLocation({
+        dashboardId: 'dashboard1',
+        filters: [appliedFilter],
+        preserveSavedFilters: false,
+      });
+
+      expect(location.path).not.toEqual(expect.stringContaining('query:savedfilter1'));
+      expect(location.path).toEqual(expect.stringContaining('query:appliedfilter'));
+    });
+  });
+});
diff --git a/src/plugins/dashboard/public/locator.ts b/src/plugins/dashboard/public/locator.ts
new file mode 100644
index 0000000000000..e154351819ee9
--- /dev/null
+++ b/src/plugins/dashboard/public/locator.ts
@@ -0,0 +1,160 @@
+/*
+ * 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 type { SerializableState } from 'src/plugins/kibana_utils/common';
+import type { TimeRange, Filter, Query, QueryState, RefreshInterval } from '../../data/public';
+import type { LocatorDefinition, LocatorPublic } from '../../share/public';
+import type { SavedDashboardPanel } from '../common/types';
+import { esFilters } from '../../data/public';
+import { setStateToKbnUrl } from '../../kibana_utils/public';
+import { ViewMode } from '../../embeddable/public';
+import { DashboardConstants } from './dashboard_constants';
+
+const cleanEmptyKeys = (stateObj: Record<string, unknown>) => {
+  Object.keys(stateObj).forEach((key) => {
+    if (stateObj[key] === undefined) {
+      delete stateObj[key];
+    }
+  });
+  return stateObj;
+};
+
+export const DASHBOARD_APP_LOCATOR = 'DASHBOARD_APP_LOCATOR';
+
+export interface DashboardAppLocatorParams extends SerializableState {
+  /**
+   * If given, the dashboard saved object with this id will be loaded. If not given,
+   * a new, unsaved dashboard will be loaded up.
+   */
+  dashboardId?: string;
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval & SerializableState;
+
+  /**
+   * Optionally apply filers. NOTE: if given and used in conjunction with `dashboardId`, and the
+   * saved dashboard has filters saved with it, this will _replace_ those filters.
+   */
+  filters?: Filter[];
+  /**
+   * Optionally set a query. NOTE: if given and used in conjunction with `dashboardId`, and the
+   * saved dashboard has a query saved with it, this will _replace_ that query.
+   */
+  query?: Query;
+  /**
+   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
+   * whether to hash the data in the url to avoid url length issues.
+   */
+  useHash?: boolean;
+
+  /**
+   * When `true` filters from saved filters from destination dashboard as merged with applied filters
+   * When `false` applied filters take precedence and override saved filters
+   *
+   * true is default
+   */
+  preserveSavedFilters?: boolean;
+
+  /**
+   * View mode of the dashboard.
+   */
+  viewMode?: ViewMode;
+
+  /**
+   * Search search session ID to restore.
+   * (Background search)
+   */
+  searchSessionId?: string;
+
+  /**
+   * List of dashboard panels
+   */
+  panels?: SavedDashboardPanel[] & SerializableState;
+
+  /**
+   * Saved query ID
+   */
+  savedQuery?: string;
+}
+
+export type DashboardAppLocator = LocatorPublic<DashboardAppLocatorParams>;
+
+export interface DashboardAppLocatorDependencies {
+  useHashedUrl: boolean;
+  getDashboardFilterFields: (dashboardId: string) => Promise<Filter[]>;
+}
+
+export class DashboardAppLocatorDefinition implements LocatorDefinition<DashboardAppLocatorParams> {
+  public readonly id = DASHBOARD_APP_LOCATOR;
+
+  constructor(protected readonly deps: DashboardAppLocatorDependencies) {}
+
+  public readonly getLocation = async (params: DashboardAppLocatorParams) => {
+    const useHash = params.useHash ?? this.deps.useHashedUrl;
+    const hash = params.dashboardId ? `view/${params.dashboardId}` : `create`;
+
+    const getSavedFiltersFromDestinationDashboardIfNeeded = async (): Promise<Filter[]> => {
+      if (params.preserveSavedFilters === false) return [];
+      if (!params.dashboardId) return [];
+      try {
+        return await this.deps.getDashboardFilterFields(params.dashboardId);
+      } catch (e) {
+        // In case dashboard is missing, build the url without those filters.
+        // The Dashboard app will handle redirect to landing page with a toast message.
+        return [];
+      }
+    };
+
+    // leave filters `undefined` if no filters was applied
+    // in this case dashboard will restore saved filters on its own
+    const filters = params.filters && [
+      ...(await getSavedFiltersFromDestinationDashboardIfNeeded()),
+      ...params.filters,
+    ];
+
+    let path = setStateToKbnUrl(
+      '_a',
+      cleanEmptyKeys({
+        query: params.query,
+        filters: filters?.filter((f) => !esFilters.isFilterPinned(f)),
+        viewMode: params.viewMode,
+        panels: params.panels,
+        savedQuery: params.savedQuery,
+      }),
+      { useHash },
+      `#/${hash}`
+    );
+
+    path = setStateToKbnUrl<QueryState>(
+      '_g',
+      cleanEmptyKeys({
+        time: params.timeRange,
+        filters: filters?.filter((f) => esFilters.isFilterPinned(f)),
+        refreshInterval: params.refreshInterval,
+      }),
+      { useHash },
+      path
+    );
+
+    if (params.searchSessionId) {
+      path = `${path}&${DashboardConstants.SEARCH_SESSION_ID}=${params.searchSessionId}`;
+    }
+
+    return {
+      app: DashboardConstants.DASHBOARDS_ID,
+      path,
+      state: {},
+    };
+  };
+}
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index b5d6eda71ca4a..53a8e90a8c35c 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -72,6 +72,7 @@ import {
   DASHBOARD_APP_URL_GENERATOR,
   DashboardUrlGeneratorState,
 } from './url_generator';
+import { DashboardAppLocatorDefinition, DashboardAppLocator } from './locator';
 import { createSavedDashboardLoader } from './saved_dashboards';
 import { DashboardConstants } from './dashboard_constants';
 import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
@@ -121,14 +122,25 @@ export interface DashboardStartDependencies {
   visualizations: VisualizationsStart;
 }
 
-export type DashboardSetup = void;
+export interface DashboardSetup {
+  locator?: DashboardAppLocator;
+}
 
 export interface DashboardStart {
   getSavedDashboardLoader: () => SavedObjectLoader;
   getDashboardContainerByValueRenderer: () => ReturnType<
     typeof createDashboardContainerByValueRenderer
   >;
+  /**
+   * @deprecated Use dashboard locator instead. Dashboard locator is available
+   * under `.locator` key. This dashboard URL generator will be removed soon.
+   *
+   * ```ts
+   * plugins.dashboard.locator.getLocation({ ... });
+   * ```
+   */
   dashboardUrlGenerator?: DashboardUrlGenerator;
+  locator?: DashboardAppLocator;
   dashboardFeatureFlagConfig: DashboardFeatureFlagConfig;
 }
 
@@ -142,7 +154,11 @@ export class DashboardPlugin
   private currentHistory: ScopedHistory | undefined = undefined;
   private dashboardFeatureFlagConfig?: DashboardFeatureFlagConfig;
 
+  /**
+   * @deprecated Use locator instead.
+   */
   private dashboardUrlGenerator?: DashboardUrlGenerator;
+  private locator?: DashboardAppLocator;
 
   public setup(
     core: CoreSetup<DashboardStartDependencies, DashboardStart>,
@@ -205,6 +221,19 @@ export class DashboardPlugin
       };
     };
 
+    if (share) {
+      this.locator = share.url.locators.create(
+        new DashboardAppLocatorDefinition({
+          useHashedUrl: core.uiSettings.get('state:storeInSessionStorage'),
+          getDashboardFilterFields: async (dashboardId: string) => {
+            const [, , selfStart] = await core.getStartServices();
+            const dashboard = await selfStart.getSavedDashboardLoader().get(dashboardId);
+            return dashboard?.searchSource?.getField('filter') ?? [];
+          },
+        })
+      );
+    }
+
     const {
       appMounted,
       appUnMounted,
@@ -333,6 +362,10 @@ export class DashboardPlugin
         order: 100,
       });
     }
+
+    return {
+      locator: this.locator,
+    };
   }
 
   public start(core: CoreStart, plugins: DashboardStartDependencies): DashboardStart {
@@ -417,6 +450,7 @@ export class DashboardPlugin
         });
       },
       dashboardUrlGenerator: this.dashboardUrlGenerator,
+      locator: this.locator,
       dashboardFeatureFlagConfig: this.dashboardFeatureFlagConfig!,
     };
   }
diff --git a/src/plugins/dashboard/public/url_generator.ts b/src/plugins/dashboard/public/url_generator.ts
index 58036ef70fa4a..5c0cd32ee5a16 100644
--- a/src/plugins/dashboard/public/url_generator.ts
+++ b/src/plugins/dashboard/public/url_generator.ts
@@ -26,6 +26,9 @@ export const GLOBAL_STATE_STORAGE_KEY = '_g';
 
 export const DASHBOARD_APP_URL_GENERATOR = 'DASHBOARD_APP_URL_GENERATOR';
 
+/**
+ * @deprecated Use dashboard locator instead.
+ */
 export interface DashboardUrlGeneratorState {
   /**
    * If given, the dashboard saved object with this id will be loaded. If not given,
@@ -88,6 +91,9 @@ export interface DashboardUrlGeneratorState {
   savedQuery?: string;
 }
 
+/**
+ * @deprecated Use dashboard locator instead.
+ */
 export const createDashboardUrlGenerator = (
   getStartServices: () => Promise<{
     appBasePath: string;
diff --git a/x-pack/examples/ui_actions_enhanced_examples/kibana.json b/x-pack/examples/ui_actions_enhanced_examples/kibana.json
index 4f5ac8519fe5b..59a0926118962 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/kibana.json
+++ b/x-pack/examples/ui_actions_enhanced_examples/kibana.json
@@ -19,7 +19,6 @@
     "dashboardEnhanced",
     "embeddable",
     "kibanaUtils",
-    "kibanaReact",
-    "share"
+    "kibanaReact"
   ]
 }
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
index 3efe2fed9a78a..1bb911530dc50 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
@@ -10,7 +10,7 @@ import {
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
 } from '../../../../../plugins/dashboard_enhanced/public';
 import { SAMPLE_APP1_CLICK_TRIGGER, SampleApp1ClickContext } from '../../triggers';
-import { KibanaURL } from '../../../../../../src/plugins/share/public';
+import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP1_TO_DASHBOARD_DRILLDOWN = 'APP1_TO_DASHBOARD_DRILLDOWN';
 
@@ -21,12 +21,11 @@ export class App1ToDashboardDrilldown extends AbstractDashboardDrilldown<Context
 
   public readonly supportedTriggers = () => [SAMPLE_APP1_CLICK_TRIGGER];
 
-  protected async getURL(config: Config, context: Context): Promise<KibanaURL> {
-    const path = await this.urlGenerator.createUrl({
+  protected async getLocation(config: Config, context: Context): Promise<KibanaLocation> {
+    const location = await this.locator.getLocation({
       dashboardId: config.dashboardId,
     });
-    const url = new KibanaURL(path);
 
-    return url;
+    return location;
   }
 }
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
index 7245e37414686..daac998872c14 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
@@ -10,7 +10,7 @@ import {
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
 } from '../../../../../plugins/dashboard_enhanced/public';
 import { SAMPLE_APP2_CLICK_TRIGGER, SampleApp2ClickContext } from '../../triggers';
-import { KibanaURL } from '../../../../../../src/plugins/share/public';
+import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP2_TO_DASHBOARD_DRILLDOWN = 'APP2_TO_DASHBOARD_DRILLDOWN';
 
@@ -21,12 +21,11 @@ export class App2ToDashboardDrilldown extends AbstractDashboardDrilldown<Context
 
   public readonly supportedTriggers = () => [SAMPLE_APP2_CLICK_TRIGGER];
 
-  protected async getURL(config: Config, context: Context): Promise<KibanaURL> {
-    const path = await this.urlGenerator.createUrl({
+  protected async getLocation(config: Config, context: Context): Promise<KibanaLocation> {
+    const location = await this.locator.getLocation({
       dashboardId: config.dashboardId,
     });
-    const url = new KibanaURL(path);
 
-    return url;
+    return location;
   }
 }
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
index 1b1fecb2bcaf7..6f02946596a87 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { KibanaLocation } from 'src/plugins/share/public';
 import React from 'react';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { DashboardStart } from 'src/plugins/dashboard/public';
@@ -20,7 +21,6 @@ import {
   CollectConfigProps,
   StartServicesGetter,
 } from '../../../../../../../src/plugins/kibana_utils/public';
-import { KibanaURL } from '../../../../../../../src/plugins/share/public';
 import { Config } from './types';
 
 export interface Params {
@@ -39,7 +39,7 @@ export abstract class AbstractDashboardDrilldown<Context extends object = object
 
   public abstract readonly supportedTriggers: () => string[];
 
-  protected abstract getURL(config: Config, context: Context): Promise<KibanaURL>;
+  protected abstract getLocation(config: Config, context: Context): Promise<KibanaLocation>;
 
   public readonly order = 100;
 
@@ -65,19 +65,25 @@ export abstract class AbstractDashboardDrilldown<Context extends object = object
   };
 
   public readonly getHref = async (config: Config, context: Context): Promise<string> => {
-    const url = await this.getURL(config, context);
-    return url.path;
+    const { app, path } = await this.getLocation(config, context);
+    const url = await this.params.start().core.application.getUrlForApp(app, {
+      path,
+      absolute: true,
+    });
+    return url;
   };
 
   public readonly execute = async (config: Config, context: Context) => {
-    const url = await this.getURL(config, context);
-    await this.params.start().core.application.navigateToApp(url.appName, { path: url.appPath });
+    const { app, path, state } = await this.getLocation(config, context);
+    await this.params.start().core.application.navigateToApp(app, {
+      path,
+      state,
+    });
   };
 
-  protected get urlGenerator() {
-    const urlGenerator = this.params.start().plugins.dashboard.dashboardUrlGenerator;
-    if (!urlGenerator)
-      throw new Error('Dashboard URL generator is required for dashboard drilldown.');
-    return urlGenerator;
+  protected get locator() {
+    const locator = this.params.start().plugins.dashboard.locator;
+    if (!locator) throw new Error('Dashboard locator is required for dashboard drilldown.');
+    return locator;
   }
 }
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
index cd82e23544ad0..a817d9f65c916 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
@@ -7,7 +7,7 @@
 
 import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilldown';
 import { AbstractDashboardDrilldownConfig as Config } from '../abstract_dashboard_drilldown';
-import { coreMock, savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks';
+import { savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks';
 import {
   Filter,
   FilterStateStore,
@@ -19,10 +19,11 @@ import {
   ApplyGlobalFilterActionContext,
   esFilters,
 } from '../../../../../../../src/plugins/data/public';
-import { createDashboardUrlGenerator } from '../../../../../../../src/plugins/dashboard/public/url_generator';
-import { UrlGeneratorsService } from '../../../../../../../src/plugins/share/public/url_generators';
+import {
+  DashboardAppLocatorDefinition,
+  DashboardAppLocatorParams,
+} from '../../../../../../../src/plugins/dashboard/public/locator';
 import { StartDependencies } from '../../../plugin';
-import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public';
 import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_utils/public/core';
 import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
 
@@ -74,13 +75,6 @@ test('inject/extract are defined', () => {
 });
 
 describe('.execute() & getHref', () => {
-  /**
-   * A convenience test setup helper
-   * Beware: `dataPluginMock.createStartContract().actions` and extracting filters from event is mocked!
-   * The url generation is not mocked and uses real implementation
-   * So this tests are mostly focused on making sure the filters returned from `dataPluginMock.createStartContract().actions` helpers
-   * end up in resulting navigation path
-   */
   async function setupTestBed(
     config: Partial<Config>,
     embeddableInput: { filters?: Filter[]; timeRange?: TimeRange; query?: Query },
@@ -90,7 +84,10 @@ describe('.execute() & getHref', () => {
     const navigateToApp = jest.fn();
     const getUrlForApp = jest.fn((app, opt) => `${app}/${opt.path}`);
     const savedObjectsClient = savedObjectsServiceMock.createStartContract().client;
-
+    const definition = new DashboardAppLocatorDefinition({
+      useHashedUrl: false,
+      getDashboardFilterFields: async () => [],
+    });
     const drilldown = new EmbeddableToDashboardDrilldown({
       start: ((() => ({
         core: {
@@ -105,17 +102,11 @@ describe('.execute() & getHref', () => {
         plugins: {
           uiActionsEnhanced: {},
           dashboard: {
-            dashboardUrlGenerator: new UrlGeneratorsService()
-              .setup(coreMock.createSetup())
-              .registerUrlGenerator(
-                createDashboardUrlGenerator(() =>
-                  Promise.resolve({
-                    appBasePath: 'xyz/app/dashboards',
-                    useHashedUrl: false,
-                    savedDashboardLoader: ({} as unknown) as SavedObjectLoader,
-                  })
-                )
-              ),
+            locator: {
+              getLocation: async (params: DashboardAppLocatorParams) => {
+                return await definition.getLocation(params);
+              },
+            },
           },
         },
         self: {},
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
index 7b55244985981..97355d9eb435e 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { DashboardUrlGeneratorState } from '../../../../../../../src/plugins/dashboard/public';
+import type { KibanaLocation } from 'src/plugins/share/public';
+import { DashboardAppLocatorParams } from '../../../../../../../src/plugins/dashboard/public';
 import {
   ApplyGlobalFilterActionContext,
   APPLY_FILTER_TRIGGER,
@@ -23,7 +24,6 @@ import {
   AbstractDashboardDrilldownParams,
   AbstractDashboardDrilldownConfig as Config,
 } from '../abstract_dashboard_drilldown';
-import { KibanaURL } from '../../../../../../../src/plugins/share/public';
 import { EMBEDDABLE_TO_DASHBOARD_DRILLDOWN } from './constants';
 import { createExtract, createInject } from '../../../../common';
 import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
@@ -49,26 +49,26 @@ export class EmbeddableToDashboardDrilldown extends AbstractDashboardDrilldown<C
 
   public readonly supportedTriggers = () => [APPLY_FILTER_TRIGGER];
 
-  protected async getURL(config: Config, context: Context): Promise<KibanaURL> {
-    const state: DashboardUrlGeneratorState = {
+  protected async getLocation(config: Config, context: Context): Promise<KibanaLocation> {
+    const params: DashboardAppLocatorParams = {
       dashboardId: config.dashboardId,
     };
 
     if (context.embeddable) {
       const embeddable = context.embeddable as IEmbeddable<EmbeddableQueryInput>;
       const input = embeddable.getInput();
-      if (isQuery(input.query) && config.useCurrentFilters) state.query = input.query;
+      if (isQuery(input.query) && config.useCurrentFilters) params.query = input.query;
 
       // if useCurrentDashboardDataRange is enabled, then preserve current time range
       // if undefined is passed, then destination dashboard will figure out time range itself
       // for brush event this time range would be overwritten
       if (isTimeRange(input.timeRange) && config.useCurrentDateRange)
-        state.timeRange = input.timeRange;
+        params.timeRange = input.timeRange;
 
       // if useCurrentDashboardFilters enabled, then preserve all the filters (pinned and unpinned)
       // otherwise preserve only pinned
       if (isFilters(input.filters))
-        state.filters = config.useCurrentFilters
+        params.filters = config.useCurrentFilters
           ? input.filters
           : input.filters?.filter((f) => esFilters.isFilterPinned(f));
     }
@@ -79,17 +79,16 @@ export class EmbeddableToDashboardDrilldown extends AbstractDashboardDrilldown<C
     } = esFilters.extractTimeRange(context.filters, context.timeFieldName);
 
     if (filtersFromEvent) {
-      state.filters = [...(state.filters ?? []), ...filtersFromEvent];
+      params.filters = [...(params.filters ?? []), ...filtersFromEvent];
     }
 
     if (timeRangeFromEvent) {
-      state.timeRange = timeRangeFromEvent;
+      params.timeRange = timeRangeFromEvent;
     }
 
-    const path = await this.urlGenerator.createUrl(state);
-    const url = new KibanaURL(path);
+    const location = await this.locator.getLocation(params);
 
-    return url;
+    return location;
   }
 
   public readonly inject = createInject({ drilldownId: this.id });

From 922d7cc73d6d699df9615e2b6352ca580ebb6aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Fri, 25 Jun 2021 11:03:46 +0300
Subject: [PATCH 89/95] [Osquery] Return proper indices permissions for
 osquery_manager package (#103363)

---
 ...kage_policies_to_agent_permissions.test.ts | 104 ++++++++++++++++++
 .../package_policies_to_agent_permissions.ts  |   7 ++
 2 files changed, 111 insertions(+)

diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
index 39759a6fc9e9c..a84118cdf1bfa 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
@@ -274,6 +274,110 @@ describe('storedPackagePoliciesToAgentPermissions()', () => {
       },
     });
   });
+
+  it('Returns the dataset for osquery_manager package', async () => {
+    getPackageInfoMock.mockResolvedValueOnce({
+      format_version: '1.0.0',
+      name: 'osquery_manager',
+      title: 'Osquery Manager',
+      version: '0.3.0',
+      license: 'basic',
+      description:
+        'Centrally manage osquery deployments, run live queries, and schedule recurring queries',
+      type: 'integration',
+      release: 'beta',
+      categories: ['security', 'os_system', 'config_management'],
+      icons: [
+        {
+          src: '/img/logo_osquery.svg',
+          title: 'logo osquery',
+          size: '32x32',
+          type: 'image/svg+xml',
+        },
+      ],
+      owner: { github: 'elastic/integrations' },
+      readme: '/package/osquery_manager/0.3.0/docs/README.md',
+      data_streams: [
+        {
+          dataset: 'osquery_manager.result',
+          package: 'osquery_manager',
+          ingest_pipeline: 'default',
+          path: 'result',
+          streams: [],
+          title: 'Osquery Manager queries',
+          type: 'logs',
+          release: 'experimental',
+        },
+      ],
+      latestVersion: '0.3.0',
+      removable: true,
+      notice: undefined,
+      status: 'not_installed',
+      assets: {
+        kibana: {
+          dashboard: [],
+          visualization: [],
+          search: [],
+          index_pattern: [],
+          map: [],
+          lens: [],
+          security_rule: [],
+          ml_module: [],
+        },
+        elasticsearch: {
+          component_template: [],
+          ingest_pipeline: [],
+          ilm_policy: [],
+          transform: [],
+          index_template: [],
+          data_stream_ilm_policy: [],
+        },
+      },
+    });
+
+    const packagePolicies: PackagePolicy[] = [
+      {
+        id: '12345',
+        name: 'test-policy',
+        namespace: 'test',
+        enabled: true,
+        package: { name: 'osquery_manager', version: '0.0.0', title: 'Test Package' },
+        inputs: [
+          {
+            type: 'osquery_manager',
+            enabled: true,
+            streams: [
+              {
+                id: 'test-logs',
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'some-logs' },
+                compiled_stream: { data_stream: { dataset: 'compiled' } },
+              },
+            ],
+          },
+        ],
+        created_at: '',
+        updated_at: '',
+        created_by: '',
+        updated_by: '',
+        revision: 1,
+        policy_id: '',
+        output_id: '',
+      },
+    ];
+
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, packagePolicies);
+    expect(permissions).toMatchObject({
+      'test-policy': {
+        indices: [
+          {
+            names: ['logs-osquery_manager.result-test'],
+            privileges: ['auto_configure', 'create_doc'],
+          },
+        ],
+      },
+    });
+  });
 });
 
 describe('getDataStreamPermissions()', () => {
diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
index bd73b88e7c893..07ad892adc653 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
@@ -73,6 +73,13 @@ export async function storedPackagePoliciesToAgentPermissions(
           dataStreamsForPermissions = pkg.data_streams;
           break;
 
+        case 'osquery_manager':
+          // - Osquery manager doesn't store the `data_stream` metadata in
+          //   `packagePolicy.inputs`, so we will use _all_ data_streams from
+          //   the package.
+          dataStreamsForPermissions = pkg.data_streams;
+          break;
+
         default:
           // - Normal packages store some of the `data_stream` metadata in
           //   `packagePolicy.inputs[].streams[].data_stream`

From dfc70bdfd19992edda1a8ab832c2224706172a34 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Fri, 25 Jun 2021 14:59:36 +0200
Subject: [PATCH 90/95] [Lens] Enable actions on Lens Embeddable (#102038)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...kibana-plugin-plugins-embeddable-public.md |   1 +
 ...-embeddable-public.useembeddablefactory.md |  22 +++
 src/plugins/embeddable/public/index.ts        |   1 +
 .../embeddables/embeddable_renderer.test.tsx  |  27 ++-
 .../lib/embeddables/embeddable_renderer.tsx   | 154 ++++++++++--------
 .../public/lib/embeddables/index.ts           |   6 +-
 .../lib/panel/embeddable_panel.test.tsx       |  37 +++++
 .../public/lib/panel/embeddable_panel.tsx     |  83 ++++++++--
 .../lib/panel/panel_header/panel_header.tsx   |   6 +-
 src/plugins/embeddable/public/public.api.md   |   5 +
 .../embedded_lens_example/kibana.json         |   1 +
 .../embedded_lens_example/public/app.tsx      |   3 +
 x-pack/plugins/lens/kibana.json               |   1 +
 .../embeddable/embeddable_component.tsx       |  76 ++++++++-
 x-pack/plugins/lens/public/index.ts           |   2 +-
 x-pack/plugins/lens/public/plugin.ts          |   4 +-
 .../public/custom_time_range_action.tsx       |   4 +-
 17 files changed, 333 insertions(+), 100 deletions(-)
 create mode 100644 docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.useembeddablefactory.md

diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md
index b875b1fce4288..444132024596e 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md
@@ -36,6 +36,7 @@
 |  [isSavedObjectEmbeddableInput(input)](./kibana-plugin-plugins-embeddable-public.issavedobjectembeddableinput.md) |  |
 |  [openAddPanelFlyout(options)](./kibana-plugin-plugins-embeddable-public.openaddpanelflyout.md) |  |
 |  [plugin(initializerContext)](./kibana-plugin-plugins-embeddable-public.plugin.md) |  |
+|  [useEmbeddableFactory({ input, factory, onInputUpdated, })](./kibana-plugin-plugins-embeddable-public.useembeddablefactory.md) |  |
 
 ## Interfaces
 
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.useembeddablefactory.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.useembeddablefactory.md
new file mode 100644
index 0000000000000..9af20cacc2cee
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.useembeddablefactory.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [useEmbeddableFactory](./kibana-plugin-plugins-embeddable-public.useembeddablefactory.md)
+
+## useEmbeddableFactory() function
+
+<b>Signature:</b>
+
+```typescript
+export declare function useEmbeddableFactory<I extends EmbeddableInput>({ input, factory, onInputUpdated, }: EmbeddableRendererWithFactory<I>): readonly [ErrorEmbeddable | IEmbeddable<I, import("./i_embeddable").EmbeddableOutput> | undefined, boolean, string | undefined];
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  { input, factory, onInputUpdated, } | <code>EmbeddableRendererWithFactory&lt;I&gt;</code> |  |
+
+<b>Returns:</b>
+
+`readonly [ErrorEmbeddable | IEmbeddable<I, import("./i_embeddable").EmbeddableOutput> | undefined, boolean, string | undefined]`
+
diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
index 25d080dbfd546..80171e1ad2fab 100644
--- a/src/plugins/embeddable/public/index.ts
+++ b/src/plugins/embeddable/public/index.ts
@@ -69,6 +69,7 @@ export {
   EmbeddablePackageState,
   EmbeddableRenderer,
   EmbeddableRendererProps,
+  useEmbeddableFactory,
 } from './lib';
 
 export { AttributeService, ATTRIBUTE_SERVICE_KEY } from './lib/attribute_service';
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.test.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.test.tsx
index 457852c48ed77..b919672ad01e3 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.test.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.test.tsx
@@ -9,14 +9,39 @@
 import React from 'react';
 import { waitFor } from '@testing-library/dom';
 import { render } from '@testing-library/react';
+import { renderHook } from '@testing-library/react-hooks';
 import {
   HelloWorldEmbeddable,
   HelloWorldEmbeddableFactoryDefinition,
   HELLO_WORLD_EMBEDDABLE,
 } from '../../tests/fixtures';
-import { EmbeddableRenderer } from './embeddable_renderer';
+import { EmbeddableRenderer, useEmbeddableFactory } from './embeddable_renderer';
 import { embeddablePluginMock } from '../../mocks';
 
+describe('useEmbeddableFactory', () => {
+  it('should update upstream value changes', async () => {
+    const { setup, doStart } = embeddablePluginMock.createInstance();
+    const getFactory = setup.registerEmbeddableFactory(
+      HELLO_WORLD_EMBEDDABLE,
+      new HelloWorldEmbeddableFactoryDefinition()
+    );
+    doStart();
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useEmbeddableFactory({ factory: getFactory(), input: { id: 'hello' } })
+    );
+
+    const [, loading] = result.current;
+
+    expect(loading).toBe(true);
+
+    await waitForNextUpdate();
+
+    const [embeddable] = result.current;
+    expect(embeddable).toBeDefined();
+  });
+});
+
 describe('<EmbeddableRenderer/>', () => {
   test('Render embeddable', () => {
     const embeddable = new HelloWorldEmbeddable({ id: 'hello' });
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.tsx
index 153564187d4b5..433b21e92cce5 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.tsx
@@ -28,12 +28,6 @@ interface EmbeddableRendererPropsWithEmbeddable<I extends EmbeddableInput> {
   embeddable: IEmbeddable<I>;
 }
 
-function isWithEmbeddable<I extends EmbeddableInput>(
-  props: EmbeddableRendererProps<I>
-): props is EmbeddableRendererPropsWithEmbeddable<I> {
-  return 'embeddable' in props;
-}
-
 interface EmbeddableRendererWithFactory<I extends EmbeddableInput> {
   input: I;
   onInputUpdated?: (newInput: I) => void;
@@ -46,6 +40,72 @@ function isWithFactory<I extends EmbeddableInput>(
   return 'factory' in props;
 }
 
+export function useEmbeddableFactory<I extends EmbeddableInput>({
+  input,
+  factory,
+  onInputUpdated,
+}: EmbeddableRendererWithFactory<I>) {
+  const [embeddable, setEmbeddable] = useState<IEmbeddable<I> | ErrorEmbeddable | undefined>(
+    undefined
+  );
+  const [loading, setLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string | undefined>();
+  const latestInput = React.useRef(input);
+  useEffect(() => {
+    latestInput.current = input;
+  }, [input]);
+
+  useEffect(() => {
+    let canceled = false;
+
+    // keeping track of embeddables created by this component to be able to destroy them
+    let createdEmbeddableRef: IEmbeddable | ErrorEmbeddable | undefined;
+    setEmbeddable(undefined);
+    setLoading(true);
+    factory
+      .create(latestInput.current!)
+      .then((createdEmbeddable) => {
+        if (canceled) {
+          if (createdEmbeddable) {
+            createdEmbeddable.destroy();
+          }
+        } else {
+          createdEmbeddableRef = createdEmbeddable;
+          setEmbeddable(createdEmbeddable);
+        }
+      })
+      .catch((err) => {
+        if (canceled) return;
+        setError(err?.message);
+      })
+      .finally(() => {
+        if (canceled) return;
+        setLoading(false);
+      });
+
+    return () => {
+      canceled = true;
+      if (createdEmbeddableRef) {
+        createdEmbeddableRef.destroy();
+      }
+    };
+  }, [factory]);
+
+  useEffect(() => {
+    if (!embeddable) return;
+    if (isErrorEmbeddable(embeddable)) return;
+    if (!onInputUpdated) return;
+    const sub = embeddable.getInput$().subscribe((newInput) => {
+      onInputUpdated(newInput);
+    });
+    return () => {
+      sub.unsubscribe();
+    };
+  }, [embeddable, onInputUpdated]);
+
+  return [embeddable, loading, error] as const;
+}
+
 /**
  * Helper react component to render an embeddable
  * Can be used if you have an embeddable object or an embeddable factory
@@ -82,72 +142,22 @@ function isWithFactory<I extends EmbeddableInput>(
 export const EmbeddableRenderer = <I extends EmbeddableInput>(
   props: EmbeddableRendererProps<I>
 ) => {
-  const { input, onInputUpdated } = props;
-  const [embeddable, setEmbeddable] = useState<IEmbeddable<I> | ErrorEmbeddable | undefined>(
-    isWithEmbeddable(props) ? props.embeddable : undefined
-  );
-  const [loading, setLoading] = useState<boolean>(!isWithEmbeddable(props));
-  const [error, setError] = useState<string | undefined>();
-  const latestInput = React.useRef(props.input);
-  useEffect(() => {
-    latestInput.current = input;
-  }, [input]);
-
-  const factoryFromProps = isWithFactory(props) ? props.factory : undefined;
-  const embeddableFromProps = isWithEmbeddable(props) ? props.embeddable : undefined;
-  useEffect(() => {
-    let canceled = false;
-    if (embeddableFromProps) {
-      setEmbeddable(embeddableFromProps);
-      return;
-    }
-
-    // keeping track of embeddables created by this component to be able to destroy them
-    let createdEmbeddableRef: IEmbeddable | ErrorEmbeddable | undefined;
-    if (factoryFromProps) {
-      setEmbeddable(undefined);
-      setLoading(true);
-      factoryFromProps
-        .create(latestInput.current!)
-        .then((createdEmbeddable) => {
-          if (canceled) {
-            if (createdEmbeddable) {
-              createdEmbeddable.destroy();
-            }
-          } else {
-            createdEmbeddableRef = createdEmbeddable;
-            setEmbeddable(createdEmbeddable);
-          }
-        })
-        .catch((err) => {
-          if (canceled) return;
-          setError(err?.message);
-        })
-        .finally(() => {
-          if (canceled) return;
-          setLoading(false);
-        });
-    }
-
-    return () => {
-      canceled = true;
-      if (createdEmbeddableRef) {
-        createdEmbeddableRef.destroy();
-      }
-    };
-  }, [factoryFromProps, embeddableFromProps]);
-
-  useEffect(() => {
-    if (!embeddable) return;
-    if (isErrorEmbeddable(embeddable)) return;
-    if (!onInputUpdated) return;
-    const sub = embeddable.getInput$().subscribe((newInput) => {
-      onInputUpdated(newInput);
-    });
-    return () => {
-      sub.unsubscribe();
-    };
-  }, [embeddable, onInputUpdated]);
+  if (isWithFactory(props)) {
+    return <EmbeddableByFactory {...props} />;
+  }
+  return <EmbeddableRoot embeddable={props.embeddable} input={props.input} />;
+};
 
+//
+const EmbeddableByFactory = <I extends EmbeddableInput>({
+  factory,
+  input,
+  onInputUpdated,
+}: EmbeddableRendererWithFactory<I>) => {
+  const [embeddable, loading, error] = useEmbeddableFactory({
+    factory,
+    input,
+    onInputUpdated,
+  });
   return <EmbeddableRoot embeddable={embeddable} loading={loading} error={error} input={input} />;
 };
diff --git a/src/plugins/embeddable/public/lib/embeddables/index.ts b/src/plugins/embeddable/public/lib/embeddables/index.ts
index 71dfd73e534e7..eede745f31794 100644
--- a/src/plugins/embeddable/public/lib/embeddables/index.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/index.ts
@@ -16,4 +16,8 @@ export { ErrorEmbeddable, isErrorEmbeddable } from './error_embeddable';
 export { withEmbeddableSubscription } from './with_subscription';
 export { EmbeddableRoot } from './embeddable_root';
 export * from '../../../common/lib/saved_object_embeddable';
-export { EmbeddableRenderer, EmbeddableRendererProps } from './embeddable_renderer';
+export {
+  EmbeddableRenderer,
+  EmbeddableRendererProps,
+  useEmbeddableFactory,
+} from './embeddable_renderer';
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
index 22001608f63ab..1b3e0388e9bb0 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
@@ -542,3 +542,40 @@ test('Check when hide header option is true', async () => {
   const title = findTestSubject(component, `embeddablePanelHeading-HelloAryaStark`);
   expect(title.length).toBe(0);
 });
+
+test('Should work in minimal way rendering only the inspector action', async () => {
+  const inspector = inspectorPluginMock.createStartContract();
+  inspector.isAvailable = jest.fn(() => true);
+
+  const container = new HelloWorldContainer({ id: '123', panels: {}, viewMode: ViewMode.VIEW }, {
+    getEmbeddableFactory,
+  } as any);
+
+  const embeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Arya',
+    lastName: 'Stark',
+  });
+
+  const component = mount(
+    <I18nProvider>
+      <EmbeddablePanel
+        embeddable={embeddable}
+        getActions={() => Promise.resolve([])}
+        inspector={inspector}
+        hideHeader={false}
+      />
+    </I18nProvider>
+  );
+
+  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
+  expect(findTestSubject(component, `embeddablePanelContextMenuOpen`).length).toBe(1);
+  await nextTick();
+  component.update();
+  expect(findTestSubject(component, `embeddablePanelAction-openInspector`).length).toBe(1);
+  const action = findTestSubject(component, `embeddablePanelAction-ACTION_CUSTOMIZE_PANEL`);
+  expect(action.length).toBe(0);
+});
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index 8cf2de8c80743..b66950c170d69 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -54,16 +54,20 @@ const removeById = (disabledActions: string[]) => ({ id }: { id: string }) =>
 interface Props {
   embeddable: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
   getActions: UiActionsService['getTriggerCompatibleActions'];
-  getEmbeddableFactory: EmbeddableStart['getEmbeddableFactory'];
-  getAllEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'];
-  overlays: CoreStart['overlays'];
-  notifications: CoreStart['notifications'];
-  application: CoreStart['application'];
-  inspector: InspectorStartContract;
-  SavedObjectFinder: React.ComponentType<any>;
+  getEmbeddableFactory?: EmbeddableStart['getEmbeddableFactory'];
+  getAllEmbeddableFactories?: EmbeddableStart['getEmbeddableFactories'];
+  overlays?: CoreStart['overlays'];
+  notifications?: CoreStart['notifications'];
+  application?: CoreStart['application'];
+  inspector?: InspectorStartContract;
+  SavedObjectFinder?: React.ComponentType<any>;
   stateTransfer?: EmbeddableStateTransfer;
   hideHeader?: boolean;
+  actionPredicate?: (actionId: string) => boolean;
   reportUiCounter?: UsageCollectionStart['reportUiCounter'];
+  showShadow?: boolean;
+  showBadges?: boolean;
+  showNotifications?: boolean;
 }
 
 interface State {
@@ -80,7 +84,11 @@ interface State {
   errorEmbeddable?: ErrorEmbeddable;
 }
 
-interface PanelUniversalActions {
+interface InspectorPanelAction {
+  inspectPanel: InspectPanelAction;
+}
+
+interface BasePanelActions {
   customizePanelTitle: CustomizePanelTitleAction;
   addPanel: AddPanelAction;
   inspectPanel: InspectPanelAction;
@@ -88,6 +96,15 @@ interface PanelUniversalActions {
   editPanel: EditPanelAction;
 }
 
+const emptyObject = {};
+type EmptyObject = typeof emptyObject;
+
+type PanelUniversalActions =
+  | BasePanelActions
+  | InspectorPanelAction
+  | (BasePanelActions & InspectorPanelAction)
+  | EmptyObject;
+
 export class EmbeddablePanel extends React.Component<Props, State> {
   private embeddableRoot: React.RefObject<HTMLDivElement>;
   private parentSubscription?: Subscription;
@@ -117,10 +134,15 @@ export class EmbeddablePanel extends React.Component<Props, State> {
   }
 
   private async refreshBadges() {
+    if (!this.mounted) {
+      return;
+    }
+    if (this.props.showBadges === false) {
+      return;
+    }
     let badges = await this.props.getActions(PANEL_BADGE_TRIGGER, {
       embeddable: this.props.embeddable,
     });
-    if (!this.mounted) return;
 
     const { disabledActions } = this.props.embeddable.getInput();
     if (disabledActions) {
@@ -135,10 +157,15 @@ export class EmbeddablePanel extends React.Component<Props, State> {
   }
 
   private async refreshNotifications() {
+    if (!this.mounted) {
+      return;
+    }
+    if (this.props.showNotifications === false) {
+      return;
+    }
     let notifications = await this.props.getActions(PANEL_NOTIFICATION_TRIGGER, {
       embeddable: this.props.embeddable,
     });
-    if (!this.mounted) return;
 
     const { disabledActions } = this.props.embeddable.getInput();
     if (disabledActions) {
@@ -229,13 +256,18 @@ export class EmbeddablePanel extends React.Component<Props, State> {
         paddingSize="none"
         role="figure"
         aria-labelledby={headerId}
+        hasShadow={this.props.showShadow}
       >
         {!this.props.hideHeader && (
           <PanelHeader
             getActionContextMenuPanel={this.getActionContextMenuPanel}
             hidePanelTitle={this.state.hidePanelTitle}
             isViewMode={viewOnlyMode}
-            customizeTitle={this.state.universalActions.customizePanelTitle}
+            customizeTitle={
+              'customizePanelTitle' in this.state.universalActions
+                ? this.state.universalActions.customizePanelTitle
+                : undefined
+            }
             closeContextMenu={this.state.closeContextMenu}
             title={title}
             badges={this.state.badges}
@@ -284,6 +316,23 @@ export class EmbeddablePanel extends React.Component<Props, State> {
   };
 
   private getUniversalActions = (): PanelUniversalActions => {
+    let actions = {};
+    if (this.props.inspector) {
+      actions = {
+        inspectPanel: new InspectPanelAction(this.props.inspector),
+      };
+    }
+    if (
+      !this.props.getEmbeddableFactory ||
+      !this.props.getAllEmbeddableFactories ||
+      !this.props.overlays ||
+      !this.props.notifications ||
+      !this.props.SavedObjectFinder ||
+      !this.props.application
+    ) {
+      return actions;
+    }
+
     const createGetUserData = (overlays: OverlayStart) =>
       async function getUserData(context: { embeddable: IEmbeddable }) {
         return new Promise<{ title: string | undefined; hideTitle?: boolean }>((resolve) => {
@@ -308,6 +357,7 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     // Universal actions are exposed on the context menu for every embeddable, they bypass the trigger
     // registry.
     return {
+      ...actions,
       customizePanelTitle: new CustomizePanelTitleAction(createGetUserData(this.props.overlays)),
       addPanel: new AddPanelAction(
         this.props.getEmbeddableFactory,
@@ -317,7 +367,6 @@ export class EmbeddablePanel extends React.Component<Props, State> {
         this.props.SavedObjectFinder,
         this.props.reportUiCounter
       ),
-      inspectPanel: new InspectPanelAction(this.props.inspector),
       removePanel: new RemovePanelAction(),
       editPanel: new EditPanelAction(
         this.props.getEmbeddableFactory,
@@ -338,9 +387,13 @@ export class EmbeddablePanel extends React.Component<Props, State> {
       regularActions = regularActions.filter(removeDisabledActions);
     }
 
-    const sortedActions = [...regularActions, ...Object.values(this.state.universalActions)].sort(
-      sortByOrderField
-    );
+    let sortedActions = regularActions
+      .concat(Object.values(this.state.universalActions || {}) as Array<Action<object>>)
+      .sort(sortByOrderField);
+
+    if (this.props.actionPredicate) {
+      sortedActions = sortedActions.filter(({ id }) => this.props.actionPredicate!(id));
+    }
 
     return await buildContextMenuForActions({
       actions: sortedActions.map((action) => ({
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index 403aa3e3f4c9f..742a2d1909941 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -36,7 +36,7 @@ export interface PanelHeaderProps {
   embeddable: IEmbeddable;
   headerId?: string;
   showPlaceholderTitle?: boolean;
-  customizeTitle: CustomizePanelTitleAction;
+  customizeTitle?: CustomizePanelTitleAction;
 }
 
 function renderBadges(badges: Array<Action<EmbeddableContext>>, embeddable: IEmbeddable) {
@@ -177,7 +177,7 @@ export function PanelHeader({
         >
           {title || placeholderTitle}
         </span>
-      ) : (
+      ) : customizeTitle ? (
         <EuiLink
           color="text"
           data-test-subj={'embeddablePanelTitleLink'}
@@ -193,7 +193,7 @@ export function PanelHeader({
         >
           {title || placeholderTitle}
         </EuiLink>
-      );
+      ) : null;
     }
     return description ? (
       <EuiToolTip
diff --git a/src/plugins/embeddable/public/public.api.md b/src/plugins/embeddable/public/public.api.md
index af708f9a5e659..98c48dbd848b0 100644
--- a/src/plugins/embeddable/public/public.api.md
+++ b/src/plugins/embeddable/public/public.api.md
@@ -843,6 +843,11 @@ export interface SavedObjectEmbeddableInput extends EmbeddableInput {
 // @public (undocumented)
 export const SELECT_RANGE_TRIGGER = "SELECT_RANGE_TRIGGER";
 
+// Warning: (ae-missing-release-tag) "useEmbeddableFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function useEmbeddableFactory<I extends EmbeddableInput>({ input, factory, onInputUpdated, }: EmbeddableRendererWithFactory<I>): readonly [ErrorEmbeddable | IEmbeddable<I, import("./i_embeddable").EmbeddableOutput> | undefined, boolean, string | undefined];
+
 // Warning: (ae-missing-release-tag) "VALUE_CLICK_TRIGGER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/x-pack/examples/embedded_lens_example/kibana.json b/x-pack/examples/embedded_lens_example/kibana.json
index 5e4caead90bc3..be38e5bf3e761 100644
--- a/x-pack/examples/embedded_lens_example/kibana.json
+++ b/x-pack/examples/embedded_lens_example/kibana.json
@@ -8,6 +8,7 @@
   "requiredPlugins": [
     "lens",
     "data",
+    "embeddable",
     "developerExamples"
   ],
   "optionalPlugins": [],
diff --git a/x-pack/examples/embedded_lens_example/public/app.tsx b/x-pack/examples/embedded_lens_example/public/app.tsx
index 6a39951ad4958..a13ddbbd79ef0 100644
--- a/x-pack/examples/embedded_lens_example/public/app.tsx
+++ b/x-pack/examples/embedded_lens_example/public/app.tsx
@@ -20,6 +20,7 @@ import {
 } from '@elastic/eui';
 import { IndexPattern } from 'src/plugins/data/public';
 import { CoreStart } from 'kibana/public';
+import { ViewMode } from '../../../../src/plugins/embeddable/public';
 import {
   TypedLensByValueInput,
   PersistedIndexPatternLayer,
@@ -193,6 +194,7 @@ export const App = (props: {
                 </EuiFlexGroup>
                 <LensComponent
                   id=""
+                  withActions
                   style={{ height: 500 }}
                   timeRange={time}
                   attributes={getLensAttributes(props.defaultIndexPattern, color)}
@@ -211,6 +213,7 @@ export const App = (props: {
                   onTableRowClick={(_data) => {
                     // call back event for on table row click event
                   }}
+                  viewMode={ViewMode.VIEW}
                 />
                 {isSaveModalVisible && (
                   <LensSaveModalComponent
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
index c5b3e72f39159..fd394aea90d66 100644
--- a/x-pack/plugins/lens/kibana.json
+++ b/x-pack/plugins/lens/kibana.json
@@ -8,6 +8,7 @@
     "data",
     "charts",
     "expressions",
+    "inspector",
     "navigation",
     "urlForwarding",
     "visualizations",
diff --git a/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable_component.tsx b/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable_component.tsx
index fcd337ad1e4ec..82812ee355663 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable_component.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable_component.tsx
@@ -5,10 +5,18 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { FC, useEffect } from 'react';
+import { CoreStart } from 'kibana/public';
+import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
 import {
-  EmbeddableRenderer,
+  EmbeddableInput,
+  EmbeddableOutput,
+  EmbeddablePanel,
+  EmbeddableRoot,
   EmbeddableStart,
+  IEmbeddable,
+  useEmbeddableFactory,
 } from '../../../../../../src/plugins/embeddable/public';
 import type { LensByReferenceInput, LensByValueInput } from './embeddable';
 import type { Document } from '../../persistence';
@@ -43,11 +51,69 @@ export type TypedLensByValueInput = Omit<LensByValueInput, 'attributes'> & {
     | LensAttributes<'lnsMetric', MetricState>;
 };
 
-export type EmbeddableComponentProps = TypedLensByValueInput | LensByReferenceInput;
+export type EmbeddableComponentProps = (TypedLensByValueInput | LensByReferenceInput) & {
+  withActions?: boolean;
+};
+
+interface PluginsStartDependencies {
+  uiActions: UiActionsStart;
+  embeddable: EmbeddableStart;
+  inspector: InspectorStartContract;
+}
 
-export function getEmbeddableComponent(embeddableStart: EmbeddableStart) {
+export function getEmbeddableComponent(core: CoreStart, plugins: PluginsStartDependencies) {
   return (props: EmbeddableComponentProps) => {
+    const { embeddable: embeddableStart, uiActions, inspector } = plugins;
     const factory = embeddableStart.getEmbeddableFactory('lens')!;
-    return <EmbeddableRenderer factory={factory} input={props} />;
+    const input = { ...props };
+    const [embeddable, loading, error] = useEmbeddableFactory({ factory, input });
+    const hasActions = props.withActions === true;
+
+    if (embeddable && hasActions) {
+      return (
+        <EmbeddablePanelWrapper
+          embeddable={embeddable as IEmbeddable<EmbeddableInput, EmbeddableOutput>}
+          uiActions={uiActions}
+          inspector={inspector}
+          actionPredicate={() => hasActions}
+          input={input}
+        />
+      );
+    }
+
+    return <EmbeddableRoot embeddable={embeddable} loading={loading} error={error} input={input} />;
   };
 }
+
+interface EmbeddablePanelWrapperProps {
+  embeddable: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
+  uiActions: PluginsStartDependencies['uiActions'];
+  inspector: PluginsStartDependencies['inspector'];
+  actionPredicate: (id: string) => boolean;
+  input: EmbeddableComponentProps;
+}
+
+const EmbeddablePanelWrapper: FC<EmbeddablePanelWrapperProps> = ({
+  embeddable,
+  uiActions,
+  actionPredicate,
+  inspector,
+  input,
+}) => {
+  useEffect(() => {
+    embeddable.updateInput(input);
+  }, [embeddable, input]);
+
+  return (
+    <EmbeddablePanel
+      hideHeader={false}
+      embeddable={embeddable as IEmbeddable<EmbeddableInput, EmbeddableOutput>}
+      getActions={uiActions.getTriggerCompatibleActions}
+      inspector={inspector}
+      actionPredicate={actionPredicate}
+      showShadow={false}
+      showBadges={false}
+      showNotifications={false}
+    />
+  );
+};
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index 98e0198b9d0fa..a82bc0b9c0d3d 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -7,7 +7,7 @@
 
 import { LensPlugin } from './plugin';
 
-export {
+export type {
   EmbeddableComponentProps,
   TypedLensByValueInput,
 } from './editor_frame_service/embeddable/embeddable_component';
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index 328bea5def557..ad81413e21345 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -6,6 +6,7 @@
  */
 
 import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
+import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
 import { UsageCollectionSetup, UsageCollectionStart } from 'src/plugins/usage_collection/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
@@ -81,6 +82,7 @@ export interface LensPluginStartDependencies {
   savedObjectsTagging?: SavedObjectTaggingPluginStart;
   presentationUtil: PresentationUtilPluginStart;
   indexPatternFieldEditor: IndexPatternFieldEditorStart;
+  inspector: InspectorStartContract;
   usageCollection?: UsageCollectionStart;
 }
 
@@ -256,7 +258,7 @@ export class LensPlugin {
     );
 
     return {
-      EmbeddableComponent: getEmbeddableComponent(startDependencies.embeddable),
+      EmbeddableComponent: getEmbeddableComponent(core, startDependencies),
       SaveModalComponent: getSaveModalComponent(core, startDependencies, this.attributeService!),
       navigateToPrefilledEditor: (input: LensEmbeddableInput, openInNewTab?: boolean) => {
         // for openInNewTab, we set the time range in url via getEditPath below
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
index 6cdb01a992034..5b1ba3bcc206b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
@@ -78,7 +78,9 @@ export class CustomTimeRangeAction implements Action<TimeRangeActionContext> {
     const isMarkdown =
       isVisualizeEmbeddable(embeddable) &&
       (embeddable as VisualizeEmbeddable).getOutput().visTypeName === 'markdown';
-    return Boolean(embeddable && hasTimeRange(embeddable) && !isInputControl && !isMarkdown);
+    return Boolean(
+      embeddable && embeddable.parent && hasTimeRange(embeddable) && !isInputControl && !isMarkdown
+    );
   }
 
   public async execute({ embeddable }: TimeRangeActionContext) {

From d16a464a4cf5e53d1a83440669f143c4fcf56753 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Fri, 25 Jun 2021 13:13:57 -0400
Subject: [PATCH 91/95] [Lens] Document common formulas in product and add
 formula tutorial (#103154)

* [Lens] Document common formulas in product and add formula tutorial

* Make common formulas appear in sidebar and format consistently

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/user/dashboard/lens-advanced.asciidoc    | 43 +++++---
 .../formula/editor/formula_help.tsx           | 98 +++++++++++++++++--
 2 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/docs/user/dashboard/lens-advanced.asciidoc b/docs/user/dashboard/lens-advanced.asciidoc
index ec8d90aa4920e..33e0e362058f4 100644
--- a/docs/user/dashboard/lens-advanced.asciidoc
+++ b/docs/user/dashboard/lens-advanced.asciidoc
@@ -104,7 +104,7 @@ To quickly create many copies of a percentile metric that shows distribution of
 . From the *Chart Type* dropdown, select *Line*.
 +
 [role="screenshot"]
-image::images/lens_advanced_2_1.png[Chart type menu with Line selected]
+image::images/lens_advanced_2_1.png[Chart type menu with Line selected, width=50%]
 
 . From the *Available fields* list, drag and drop *products.price* to the visualization builder.
 
@@ -239,12 +239,11 @@ For each category type that you want to break down, create a filter.
 Change the legend position to the top of the chart.
 
 . From the *Legend* dropdown, select the top position.
-
 +
 [role="screenshot"]
 image::images/lens_advanced_4_1.png[Prices share by category]
 
- Click *Save and return*.
+. Click *Save and return*.
 
 [discrete]
 [[view-the-cumulative-number-of-products-sold-on-weekends]]
@@ -299,7 +298,8 @@ image::images/lens_advanced_5_2.png[Line chart with cumulative sum of orders mad
 [[compare-time-ranges]]
 === Compare time ranges
 
-*Lens* allows you to compare the currently selected time range with historical data using the *Time shift* option.
+*Lens* allows you to compare the currently selected time range with historical data using the *Time shift* option. To calculate the percent
+change, use *Formula*.
 
 Time shifts can be used on any metric. The special shift *previous* will show the time window preceding the currently selected one, spanning the same duration.
 For example, if *Last 7 days* is selected in the time filter, *previous* will show data from 14 days ago to 7 days ago.
@@ -326,9 +326,32 @@ To compare current sales numbers with sales from a week ago, follow these steps:
 .. Click *Time shift*
 
 .. Click the *1 week* option. You can also define custom shifts by typing amount followed by time unit (like *1w* for a one week shift), then hit enter.
-
++
 [role="screenshot"]
-image::images/lens_time_shift.png[Line chart with week-over-week sales comparison]
+image::images/lens_time_shift.png[Line chart with week-over-week sales comparison, width=50%]
+
+. Click *Save and return*.
+
+[float]
+[[compare-time-as-percent]]
+==== Compare time ranges as a percent change
+
+To view the percent change in sales between the current time and the previous week, use a *Formula*:
+
+. Open *Lens*.
+
+. From the *Available fields* list, drag and drop *Records* to the visualization builder.
+
+. Click *Count of Records*, then click *Formula*.
+
+. Type `count() / count(shift='1w') - 1`. To learn more about the formula
+syntax, click *Help*.
+
+. Click *Value format* and select *Percent* with 0 decimals.
+
+. In the *Display name* field, enter `Percent change`, then click *Close*.
+
+. Click *Save and return*.
 
 [discrete]
 [[view-customers-over-time-by-continents]]
@@ -366,18 +389,14 @@ To split the customers count by continent:
 . From the *Available fields* list, drag and drop *geoip.continent_name* to the *Columns* field of the editor.
 +
 [role="screenshot"]
-image::images/lens_advanced_6_1.png[Table with daily customers by continent configuration]
+image::images/lens_advanced_6_1.png[Table with daily customers by continent configuration, width=50%]
 
 . Click *Save and return*.
 
+
 [discrete]
 === Save the dashboard
 
-By default the dashboard attempts to match the palette across panels, but in this case there's no need for that, so it can be disabled.
-
-[role="screenshot"]
-image::images/lens_advanced_7_1.png[Disable palette sync in dashboard]
-
 Now that you have a complete overview of your ecommerce sales data, save the dashboard.
 
 . In the toolbar, click *Save*.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
index aa08dfbe7ea33..dbdbcf226d9bb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
@@ -64,6 +64,88 @@ function FormulaHelp({
     items: [],
   });
 
+  helpGroups.push({
+    label: i18n.translate('xpack.lens.formulaFrequentlyUsedHeading', {
+      defaultMessage: 'Common formulas',
+    }),
+    description: i18n.translate('xpack.lens.formulaCommonFormulaDocumentation', {
+      defaultMessage: `The most common formulas are dividing two values to produce a percent. To display accurately, set "value format" to "percent".`,
+    }),
+
+    items: [
+      {
+        label: i18n.translate('xpack.lens.formulaDocumentation.filterRatio', {
+          defaultMessage: 'Filter ratio',
+        }),
+        description: (
+          <Markdown
+            markdown={i18n.translate('xpack.lens.formulaDocumentation.filterRatioDescription', {
+              defaultMessage: `### Filter ratio:
+
+Use \`kql=''\` to filter one set of documents and compare it to other documents within the same grouping.
+For example, to see how the error rate changes over time:
+
+\`\`\`
+count(kql='response.status_code > 400') / count()
+\`\`\`
+        `,
+
+              description:
+                'Text is in markdown. Do not translate function names, special characters, or field names like sum(bytes)',
+            })}
+          />
+        ),
+      },
+      {
+        label: i18n.translate('xpack.lens.formulaDocumentation.weekOverWeek', {
+          defaultMessage: 'Week over week',
+        }),
+        description: (
+          <Markdown
+            markdown={i18n.translate('xpack.lens.formulaDocumentation.weekOverWeekDescription', {
+              defaultMessage: `### Week over week:
+
+Use \`shift='1w'\` to get the value of each grouping from
+the previous week. Time shift should not be used with the *Top values* function.
+
+\`\`\`
+percentile(system.network.in.bytes, percentile=99) /
+percentile(system.network.in.bytes, percentile=99, shift='1w')
+\`\`\`
+        `,
+
+              description:
+                'Text is in markdown. Do not translate function names, special characters, or field names like sum(bytes)',
+            })}
+          />
+        ),
+      },
+      {
+        label: i18n.translate('xpack.lens.formulaDocumentation.percentOfTotal', {
+          defaultMessage: 'Percent of total',
+        }),
+        description: (
+          <Markdown
+            markdown={i18n.translate('xpack.lens.formulaDocumentation.percentOfTotalDescription', {
+              defaultMessage: `### Percent of total
+
+Formulas can calculate \`overall_sum\` for all the groupings,
+which lets you convert each grouping into a percent of total:
+
+\`\`\`
+sum(products.base_price) / overall_sum(sum(products.base_price))
+\`\`\`
+        `,
+
+              description:
+                'Text is in markdown. Do not translate function names, special characters, or field names like sum(bytes)',
+            })}
+          />
+        ),
+      },
+    ],
+  });
+
   helpGroups.push({
     label: i18n.translate('xpack.lens.formulaDocumentation.elasticsearchSection', {
       defaultMessage: 'Elasticsearch',
@@ -78,7 +160,7 @@ function FormulaHelp({
   const availableFunctions = getPossibleFunctions(indexPattern);
 
   // Es aggs
-  helpGroups[1].items.push(
+  helpGroups[2].items.push(
     ...availableFunctions
       .filter(
         (key) =>
@@ -104,20 +186,20 @@ function FormulaHelp({
 
   helpGroups.push({
     label: i18n.translate('xpack.lens.formulaDocumentation.columnCalculationSection', {
-      defaultMessage: 'Column-wise calculation',
+      defaultMessage: 'Column calculations',
     }),
     description: i18n.translate(
       'xpack.lens.formulaDocumentation.columnCalculationSectionDescription',
       {
         defaultMessage:
-          'These functions will be executed for reach row of the resulting table, using data from cells from other rows as well as the current value.',
+          'These functions are executed for each row, but are provided with the whole column as context. This is also known as a window function.',
       }
     ),
     items: [],
   });
 
   // Calculations aggs
-  helpGroups[2].items.push(
+  helpGroups[3].items.push(
     ...availableFunctions
       .filter(
         (key) =>
@@ -170,7 +252,7 @@ function FormulaHelp({
       });
   }, [indexPattern]);
 
-  helpGroups[3].items.push(
+  helpGroups[4].items.push(
     ...tinymathFns.map(({ label, description, examples }) => {
       return {
         label,
@@ -312,9 +394,9 @@ round(100 * moving_average(
 \`\`\`
 
 Elasticsearch functions take a field name, which can be in quotes. \`sum(bytes)\` is the same
-as \`sum("bytes")\`.
+as \`sum('bytes')\`.
 
-Some functions take named arguments, like moving_average(count(), window=5)
+Some functions take named arguments, like \`moving_average(count(), window=5)\`.
 
 Elasticsearch metrics can be filtered using KQL or Lucene syntax. To add a filter, use the named
 parameter \`kql='field: value'\` or \`lucene=''\`. Always use single quotes when writing KQL or Lucene
@@ -325,7 +407,7 @@ Math functions can take positional arguments, like pow(count(), 3) is the same a
 Use the symbols +, -, /, and * to perform basic math.
                   `,
                   description:
-                    'Text is in markdown. Do not translate function names or field names like sum(bytes)',
+                    'Text is in markdown. Do not translate function names, special characters, or field names like sum(bytes)',
                 })}
               />
             </section>

From 672653776d0361ddf2fe6c501520bdf42949be00 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@gmail.com>
Date: Fri, 25 Jun 2021 20:41:37 +0200
Subject: [PATCH 92/95] Allow additive csp configuration (#102059)

* add additive csp configuration

* add unit tests for new class

* fix types

* adapt test utils

* fix tests

* more unit tests on config

* generated doc

* review comments

* update ascii doc

* update ascii doc links

* automatically add single quotes for keywords

* add missing csp directives

* add more tests

* add additional settings to asciidoc

* add null-check

* revert test config props

* fix usage collection usage

* some review comments

* last review comments

* add kibana-docker variables

* try to fix doc reference

* try to fix doc reference again

* fix tests
---
 ...plugin-core-server.cspconfig.__private_.md |  11 +
 .../kibana-plugin-core-server.cspconfig.md    |   1 +
 docs/setup/settings.asciidoc                  |  51 +-
 src/core/server/csp/config.test.ts            | 460 +++++++++++++++++-
 src/core/server/csp/config.ts                 | 154 +++++-
 src/core/server/csp/csp_config.test.ts        | 109 ++++-
 src/core/server/csp/csp_config.ts             |  28 +-
 src/core/server/csp/csp_directives.test.ts    | 266 ++++++++++
 src/core/server/csp/csp_directives.ts         | 159 ++++++
 .../http/cookie_session_storage.test.ts       |   6 +-
 src/core/server/http/http_config.test.ts      |   5 +-
 .../lifecycle_handlers.test.ts                |   6 +-
 src/core/server/http/test_utils.ts            |   6 +-
 src/core/server/server.api.md                 |   6 +-
 .../resources/base/bin/kibana-docker          |  11 +
 .../collectors/csp/csp_collector.test.ts      |  16 +-
 16 files changed, 1244 insertions(+), 51 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.cspconfig.__private_.md
 create mode 100644 src/core/server/csp/csp_directives.test.ts
 create mode 100644 src/core/server/csp/csp_directives.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.cspconfig.__private_.md b/docs/development/core/server/kibana-plugin-core-server.cspconfig.__private_.md
new file mode 100644
index 0000000000000..217066481d33c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.cspconfig.__private_.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CspConfig](./kibana-plugin-core-server.cspconfig.md) &gt; ["\#private"](./kibana-plugin-core-server.cspconfig.__private_.md)
+
+## CspConfig."\#private" property
+
+<b>Signature:</b>
+
+```typescript
+#private;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.cspconfig.md b/docs/development/core/server/kibana-plugin-core-server.cspconfig.md
index 9f4f3211ea2b1..0337a1f4d3301 100644
--- a/docs/development/core/server/kibana-plugin-core-server.cspconfig.md
+++ b/docs/development/core/server/kibana-plugin-core-server.cspconfig.md
@@ -20,6 +20,7 @@ The constructor for this class is marked as internal. Third-party code should no
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
+|  ["\#private"](./kibana-plugin-core-server.cspconfig.__private_.md) |  | <code></code> |  |
 |  [DEFAULT](./kibana-plugin-core-server.cspconfig.default.md) | <code>static</code> | <code>CspConfig</code> |  |
 |  [disableEmbedding](./kibana-plugin-core-server.cspconfig.disableembedding.md) |  | <code>boolean</code> |  |
 |  [header](./kibana-plugin-core-server.cspconfig.header.md) |  | <code>string</code> |  |
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index c3c29adcea18f..bcaa86d73adc4 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -36,11 +36,57 @@ Set to `false` to disable Console. *Default: `true`*
  <<ops-cGroupOverrides-cpuAcctPath, `ops.cGroupOverrides.cpuAcctPath`>>.
 
 | `csp.rules:`
- | A https://w3c.github.io/webappsec-csp/[content-security-policy] template
+ | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."] 
+A https://w3c.github.io/webappsec-csp/[Content Security Policy] template
 that disables certain unnecessary and potentially insecure capabilities in
 the browser. It is strongly recommended that you keep the default CSP rules
 that ship with {kib}.
 
+| `csp.script_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src[Content Security Policy `script-src` directive].
+
+| `csp.worker_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/worker-src[Content Security Policy `worker-src` directive].
+
+| `csp.style_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src[Content Security Policy `style-src` directive].
+
+| `csp.connect_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/connect-src[Content Security Policy `connect-src` directive].
+
+| `csp.default_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/default-src[Content Security Policy `default-src` directive].
+
+| `csp.font_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/font-src[Content Security Policy `font-src` directive].
+
+| `csp.frame_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-src[Content Security Policy `frame-src` directive].
+
+| `csp.img_src:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/img-src[Content Security Policy `img-src` directive].
+
+| `csp.frame_ancestors:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors[Content Security Policy `frame-ancestors` directive].
+
+|===
+
+[NOTE]
+============
+The `frame-ancestors` directive can also be configured by using 
+<<server-securityResponseHeaders-disableEmbedding, `server.securityResponseHeaders.disableEmbedding`>>. In that case, that takes precedence and any values in `csp.frame_ancestors` 
+are ignored.
+============
+
+[cols="2*<"]
+|===
+
+| `csp.report_uri:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/report-uri[Content Security Policy `report-uri` directive].
+
+| `csp.report_to:`
+| Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/report-to[Content Security Policy `report-to` directive].
+
 |[[csp-strict]] `csp.strict:`
  | Blocks {kib} access to any browser that
 does not enforce even rudimentary CSP rules. In practice, this disables
@@ -538,8 +584,7 @@ a|`server.securityResponseHeaders:`
 is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`.
 To disable, set to `null`. *Default:* `null`
 
-[[server-securityResponseHeaders-disableEmbedding]]
-a|`server.securityResponseHeaders:`
+|[[server-securityResponseHeaders-disableEmbedding]]`server.securityResponseHeaders:`
 `disableEmbedding:`
 | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy[`Content-Security-Policy`] and
 https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options[`X-Frame-Options`] headers are configured to disable embedding
diff --git a/src/core/server/csp/config.test.ts b/src/core/server/csp/config.test.ts
index 8036ebeeaad31..6db93addb7da8 100644
--- a/src/core/server/csp/config.test.ts
+++ b/src/core/server/csp/config.test.ts
@@ -9,11 +9,469 @@
 import { config } from './config';
 
 describe('config.validate()', () => {
-  test(`does not allow "disableEmbedding" to be set to true`, () => {
+  it(`does not allow "disableEmbedding" to be set to true`, () => {
     // This is intentionally not editable in the raw CSP config.
     // Users should set `server.securityResponseHeaders.disableEmbedding` to control this config property.
     expect(() => config.schema.validate({ disableEmbedding: true })).toThrowError(
       '[disableEmbedding]: expected value to equal [false]'
     );
   });
+
+  describe(`"script_src"`, () => {
+    it(`throws if containing 'unsafe-inline' when 'strict' is true`, () => {
+      expect(() =>
+        config.schema.validate({
+          strict: true,
+          warnLegacyBrowsers: false,
+          script_src: [`'self'`, `unsafe-inline`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use \`unsafe-inline\` for \`script_src\` when \`csp.strict\` is true"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          strict: true,
+          warnLegacyBrowsers: false,
+          script_src: [`'self'`, `'unsafe-inline'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use \`unsafe-inline\` for \`script_src\` when \`csp.strict\` is true"`
+      );
+    });
+
+    it(`throws if containing 'unsafe-inline' when 'warnLegacyBrowsers' is true`, () => {
+      expect(() =>
+        config.schema.validate({
+          strict: false,
+          warnLegacyBrowsers: true,
+          script_src: [`'self'`, `unsafe-inline`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use \`unsafe-inline\` for \`script_src\` when \`csp.warnLegacyBrowsers\` is true"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          strict: false,
+          warnLegacyBrowsers: true,
+          script_src: [`'self'`, `'unsafe-inline'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use \`unsafe-inline\` for \`script_src\` when \`csp.warnLegacyBrowsers\` is true"`
+      );
+    });
+
+    it(`does not throw if containing 'unsafe-inline' when 'strict' and 'warnLegacyBrowsers' are false`, () => {
+      expect(() =>
+        config.schema.validate({
+          strict: false,
+          warnLegacyBrowsers: false,
+          script_src: [`'self'`, `unsafe-inline`],
+        })
+      ).not.toThrow();
+
+      expect(() =>
+        config.schema.validate({
+          strict: false,
+          warnLegacyBrowsers: false,
+          script_src: [`'self'`, `'unsafe-inline'`],
+        })
+      ).not.toThrow();
+    });
+
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          script_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          script_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[script_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          script_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[script_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          script_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[script_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"worker_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          worker_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          worker_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[worker_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          worker_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[worker_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          worker_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[worker_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"style_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          style_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          style_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[style_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          style_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[style_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          style_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[style_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"connect_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          connect_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          connect_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[connect_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          connect_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[connect_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          connect_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[connect_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"default_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          default_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          default_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[default_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          default_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[default_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          default_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[default_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"font_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          font_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          font_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[font_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          font_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[font_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          font_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[font_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"frame_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          frame_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          frame_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          frame_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          frame_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"img_src"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          img_src: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          img_src: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[img_src]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          img_src: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[img_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          img_src: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[img_src]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
+
+  describe(`"frame_ancestors"`, () => {
+    it(`throws if 'rules' is also specified`, () => {
+      expect(() =>
+        config.schema.validate({
+          rules: [
+            `script-src 'unsafe-eval' 'self'`,
+            `worker-src 'unsafe-eval' 'self'`,
+            `style-src 'unsafe-eval' 'self'`,
+          ],
+          frame_ancestors: [`'self'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"\\"csp.rules\\" cannot be used when specifying per-directive additions such as \\"script_src\\", \\"worker_src\\" or \\"style_src\\""`
+      );
+    });
+
+    it('throws if using an `nonce-*` value', () => {
+      expect(() =>
+        config.schema.validate({
+          frame_ancestors: [`hello`, `nonce-foo`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_ancestors]: using \\"nonce-*\\" is considered insecure and is not allowed"`
+      );
+    });
+    it("throws if using `none` or `'none'`", () => {
+      expect(() =>
+        config.schema.validate({
+          frame_ancestors: [`hello`, `none`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_ancestors]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+
+      expect(() =>
+        config.schema.validate({
+          frame_ancestors: [`hello`, `'none'`],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[frame_ancestors]: using \\"none\\" would conflict with Kibana's default csp configuration and is not allowed"`
+      );
+    });
+  });
 });
diff --git a/src/core/server/csp/config.ts b/src/core/server/csp/config.ts
index a61fa1b03a45c..3a7cb20985cea 100644
--- a/src/core/server/csp/config.ts
+++ b/src/core/server/csp/config.ts
@@ -7,28 +7,150 @@
  */
 
 import { TypeOf, schema } from '@kbn/config-schema';
+import { ServiceConfigDescriptor } from '../internal_types';
+
+interface DirectiveValidationOptions {
+  allowNone: boolean;
+  allowNonce: boolean;
+}
+
+const getDirectiveValidator = (options: DirectiveValidationOptions) => {
+  const validateValue = getDirectiveValueValidator(options);
+  return (values: string[]) => {
+    for (const value of values) {
+      const error = validateValue(value);
+      if (error) {
+        return error;
+      }
+    }
+  };
+};
+
+const getDirectiveValueValidator = ({ allowNone, allowNonce }: DirectiveValidationOptions) => {
+  return (value: string) => {
+    if (!allowNonce && value.startsWith('nonce-')) {
+      return `using "nonce-*" is considered insecure and is not allowed`;
+    }
+    if (!allowNone && (value === `none` || value === `'none'`)) {
+      return `using "none" would conflict with Kibana's default csp configuration and is not allowed`;
+    }
+  };
+};
+
+const configSchema = schema.object(
+  {
+    rules: schema.maybe(schema.arrayOf(schema.string())),
+    script_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    worker_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    style_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    connect_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    default_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    font_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    frame_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    img_src: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    frame_ancestors: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: false, allowNonce: false }),
+    }),
+    report_uri: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+      validate: getDirectiveValidator({ allowNone: true, allowNonce: false }),
+    }),
+    report_to: schema.arrayOf(schema.string(), {
+      defaultValue: [],
+    }),
+    strict: schema.boolean({ defaultValue: true }),
+    warnLegacyBrowsers: schema.boolean({ defaultValue: true }),
+    disableEmbedding: schema.oneOf([schema.literal<boolean>(false)], { defaultValue: false }),
+  },
+  {
+    validate: (cspConfig) => {
+      if (cspConfig.rules && hasDirectiveSpecified(cspConfig)) {
+        return `"csp.rules" cannot be used when specifying per-directive additions such as "script_src", "worker_src" or "style_src"`;
+      }
+      const hasUnsafeInlineScriptSrc =
+        cspConfig.script_src.includes(`unsafe-inline`) ||
+        cspConfig.script_src.includes(`'unsafe-inline'`);
+
+      if (cspConfig.strict && hasUnsafeInlineScriptSrc) {
+        return 'cannot use `unsafe-inline` for `script_src` when `csp.strict` is true';
+      }
+      if (cspConfig.warnLegacyBrowsers && hasUnsafeInlineScriptSrc) {
+        return 'cannot use `unsafe-inline` for `script_src` when `csp.warnLegacyBrowsers` is true';
+      }
+    },
+  }
+);
+
+const hasDirectiveSpecified = (rawConfig: CspConfigType): boolean => {
+  return Boolean(
+    rawConfig.script_src.length ||
+      rawConfig.worker_src.length ||
+      rawConfig.style_src.length ||
+      rawConfig.connect_src.length ||
+      rawConfig.default_src.length ||
+      rawConfig.font_src.length ||
+      rawConfig.frame_src.length ||
+      rawConfig.img_src.length ||
+      rawConfig.frame_ancestors.length ||
+      rawConfig.report_uri.length ||
+      rawConfig.report_to.length
+  );
+};
 
 /**
  * @internal
  */
-export type CspConfigType = TypeOf<typeof config.schema>;
+export type CspConfigType = TypeOf<typeof configSchema>;
 
-export const config = {
+export const config: ServiceConfigDescriptor<CspConfigType> = {
   // TODO: Move this to server.csp using config deprecations
   // ? https://github.com/elastic/kibana/pull/52251
   path: 'csp',
-  schema: schema.object({
-    rules: schema.arrayOf(schema.string(), {
-      defaultValue: [
-        `script-src 'unsafe-eval' 'self'`,
-        `worker-src blob: 'self'`,
-        `style-src 'unsafe-inline' 'self'`,
-      ],
-    }),
-    strict: schema.boolean({ defaultValue: true }),
-    warnLegacyBrowsers: schema.boolean({ defaultValue: true }),
-    disableEmbedding: schema.oneOf([schema.literal<boolean>(false)], { defaultValue: false }),
-  }),
+  schema: configSchema,
+  deprecations: () => [
+    (rawConfig, fromPath, addDeprecation) => {
+      const cspConfig = rawConfig[fromPath];
+      if (cspConfig?.rules) {
+        addDeprecation({
+          message:
+            '`csp.rules` is deprecated in favor of directive specific configuration. Please use `csp.connect_src`, ' +
+            '`csp.default_src`, `csp.font_src`, `csp.frame_ancestors`, `csp.frame_src`, `csp.img_src`, ' +
+            '`csp.report_uri`, `csp.report_to`, `csp.script_src`, `csp.style_src`, and `csp.worker_src` instead.',
+          correctiveActions: {
+            manualSteps: [
+              `Remove "csp.rules" from the Kibana config file."`,
+              `Add directive specific configurations to the config file using "csp.connect_src", "csp.default_src", "csp.font_src", ` +
+                `"csp.frame_ancestors", "csp.frame_src", "csp.img_src", "csp.report_uri", "csp.report_to", "csp.script_src", ` +
+                `"csp.style_src", and "csp.worker_src".`,
+            ],
+          },
+        });
+      }
+    },
+  ],
 };
-
-export const FRAME_ANCESTORS_RULE = `frame-ancestors 'self'`; // only used by CspConfig when embedding is disabled
diff --git a/src/core/server/csp/csp_config.test.ts b/src/core/server/csp/csp_config.test.ts
index 1e023c6f08ea8..a1bac7d4ae73e 100644
--- a/src/core/server/csp/csp_config.test.ts
+++ b/src/core/server/csp/csp_config.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { CspConfig } from './csp_config';
-import { FRAME_ANCESTORS_RULE } from './config';
+import { config as cspConfig, CspConfigType } from './config';
 
 // CSP rules aren't strictly additive, so any change can potentially expand or
 // restrict the policy in a way we consider a breaking change. For that reason,
@@ -23,6 +23,12 @@ import { FRAME_ANCESTORS_RULE } from './config';
 // the nature of a change in defaults during a PR review.
 
 describe('CspConfig', () => {
+  let defaultConfig: CspConfigType;
+
+  beforeEach(() => {
+    defaultConfig = cspConfig.schema.validate({});
+  });
+
   test('DEFAULT', () => {
     expect(CspConfig.DEFAULT).toMatchInlineSnapshot(`
       CspConfig {
@@ -40,50 +46,129 @@ describe('CspConfig', () => {
   });
 
   test('defaults from config', () => {
-    expect(new CspConfig()).toEqual(CspConfig.DEFAULT);
+    expect(new CspConfig(defaultConfig)).toEqual(CspConfig.DEFAULT);
   });
 
   describe('partial config', () => {
     test('allows "rules" to be set and changes header', () => {
-      const rules = ['foo', 'bar'];
-      const config = new CspConfig({ rules });
+      const rules = [`foo 'self'`, `bar 'self'`];
+      const config = new CspConfig({ ...defaultConfig, rules });
       expect(config.rules).toEqual(rules);
-      expect(config.header).toMatchInlineSnapshot(`"foo; bar"`);
+      expect(config.header).toMatchInlineSnapshot(`"foo 'self'; bar 'self'"`);
     });
 
     test('allows "strict" to be set', () => {
-      const config = new CspConfig({ strict: false });
+      const config = new CspConfig({ ...defaultConfig, strict: false });
       expect(config.strict).toEqual(false);
       expect(config.strict).not.toEqual(CspConfig.DEFAULT.strict);
     });
 
     test('allows "warnLegacyBrowsers" to be set', () => {
       const warnLegacyBrowsers = false;
-      const config = new CspConfig({ warnLegacyBrowsers });
+      const config = new CspConfig({ ...defaultConfig, warnLegacyBrowsers });
       expect(config.warnLegacyBrowsers).toEqual(warnLegacyBrowsers);
       expect(config.warnLegacyBrowsers).not.toEqual(CspConfig.DEFAULT.warnLegacyBrowsers);
     });
 
+    test('allows "worker_src" to be set and changes header', () => {
+      const config = new CspConfig({
+        ...defaultConfig,
+        rules: [],
+        worker_src: ['foo', 'bar'],
+      });
+      expect(config.rules).toEqual([`worker-src foo bar`]);
+      expect(config.header).toEqual(`worker-src foo bar`);
+    });
+
+    test('allows "style_src" to be set and changes header', () => {
+      const config = new CspConfig({
+        ...defaultConfig,
+        rules: [],
+        style_src: ['foo', 'bar'],
+      });
+      expect(config.rules).toEqual([`style-src foo bar`]);
+      expect(config.header).toEqual(`style-src foo bar`);
+    });
+
+    test('allows "script_src" to be set and changes header', () => {
+      const config = new CspConfig({
+        ...defaultConfig,
+        rules: [],
+        script_src: ['foo', 'bar'],
+      });
+      expect(config.rules).toEqual([`script-src foo bar`]);
+      expect(config.header).toEqual(`script-src foo bar`);
+    });
+
+    test('allows all directives to be set and changes header', () => {
+      const config = new CspConfig({
+        ...defaultConfig,
+        rules: [],
+        script_src: ['script', 'foo'],
+        worker_src: ['worker', 'bar'],
+        style_src: ['style', 'dolly'],
+      });
+      expect(config.rules).toEqual([
+        `script-src script foo`,
+        `worker-src worker bar`,
+        `style-src style dolly`,
+      ]);
+      expect(config.header).toEqual(
+        `script-src script foo; worker-src worker bar; style-src style dolly`
+      );
+    });
+
+    test('applies defaults when `rules` is undefined', () => {
+      const config = new CspConfig({
+        ...defaultConfig,
+        rules: undefined,
+        script_src: ['script'],
+        worker_src: ['worker'],
+        style_src: ['style'],
+      });
+      expect(config.rules).toEqual([
+        `script-src 'unsafe-eval' 'self' script`,
+        `worker-src blob: 'self' worker`,
+        `style-src 'unsafe-inline' 'self' style`,
+      ]);
+      expect(config.header).toEqual(
+        `script-src 'unsafe-eval' 'self' script; worker-src blob: 'self' worker; style-src 'unsafe-inline' 'self' style`
+      );
+    });
+
     describe('allows "disableEmbedding" to be set', () => {
       const disableEmbedding = true;
 
       test('and changes rules/header if custom rules are not defined', () => {
-        const config = new CspConfig({ disableEmbedding });
+        const config = new CspConfig({ ...defaultConfig, disableEmbedding });
         expect(config.disableEmbedding).toEqual(disableEmbedding);
         expect(config.disableEmbedding).not.toEqual(CspConfig.DEFAULT.disableEmbedding);
-        expect(config.rules).toEqual(expect.arrayContaining([FRAME_ANCESTORS_RULE]));
+        expect(config.rules).toEqual(expect.arrayContaining([`frame-ancestors 'self'`]));
         expect(config.header).toMatchInlineSnapshot(
           `"script-src 'unsafe-eval' 'self'; worker-src blob: 'self'; style-src 'unsafe-inline' 'self'; frame-ancestors 'self'"`
         );
       });
 
       test('and does not change rules/header if custom rules are defined', () => {
-        const rules = ['foo', 'bar'];
-        const config = new CspConfig({ disableEmbedding, rules });
+        const rules = [`foo 'self'`, `bar 'self'`];
+        const config = new CspConfig({ ...defaultConfig, disableEmbedding, rules });
         expect(config.disableEmbedding).toEqual(disableEmbedding);
         expect(config.disableEmbedding).not.toEqual(CspConfig.DEFAULT.disableEmbedding);
         expect(config.rules).toEqual(rules);
-        expect(config.header).toMatchInlineSnapshot(`"foo; bar"`);
+        expect(config.header).toMatchInlineSnapshot(`"foo 'self'; bar 'self'"`);
+      });
+
+      test('and overrides `frame-ancestors` if set', () => {
+        const config = new CspConfig({
+          ...defaultConfig,
+          disableEmbedding: true,
+          frame_ancestors: ['foo.com'],
+        });
+        expect(config.disableEmbedding).toEqual(disableEmbedding);
+        expect(config.disableEmbedding).not.toEqual(CspConfig.DEFAULT.disableEmbedding);
+        expect(config.header).toMatchInlineSnapshot(
+          `"script-src 'unsafe-eval' 'self'; worker-src blob: 'self'; style-src 'unsafe-inline' 'self'; frame-ancestors 'self'"`
+        );
       });
     });
   });
diff --git a/src/core/server/csp/csp_config.ts b/src/core/server/csp/csp_config.ts
index 649c81576ef52..13778088d9df2 100644
--- a/src/core/server/csp/csp_config.ts
+++ b/src/core/server/csp/csp_config.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { config, FRAME_ANCESTORS_RULE } from './config';
+import { config, CspConfigType } from './config';
+import { CspDirectives } from './csp_directives';
 
 const DEFAULT_CONFIG = Object.freeze(config.schema.validate({}));
 
@@ -50,8 +51,9 @@ export interface ICspConfig {
  * @public
  */
 export class CspConfig implements ICspConfig {
-  static readonly DEFAULT = new CspConfig();
+  static readonly DEFAULT = new CspConfig(DEFAULT_CONFIG);
 
+  readonly #directives: CspDirectives;
   public readonly rules: string[];
   public readonly strict: boolean;
   public readonly warnLegacyBrowsers: boolean;
@@ -62,16 +64,18 @@ export class CspConfig implements ICspConfig {
    * Returns the default CSP configuration when passed with no config
    * @internal
    */
-  constructor(rawCspConfig: Partial<Omit<ICspConfig, 'header'>> = {}) {
-    const source = { ...DEFAULT_CONFIG, ...rawCspConfig };
-
-    this.rules = [...source.rules];
-    this.strict = source.strict;
-    this.warnLegacyBrowsers = source.warnLegacyBrowsers;
-    this.disableEmbedding = source.disableEmbedding;
-    if (!rawCspConfig.rules?.length && source.disableEmbedding) {
-      this.rules.push(FRAME_ANCESTORS_RULE);
+  constructor(rawCspConfig: CspConfigType) {
+    this.#directives = CspDirectives.fromConfig(rawCspConfig);
+    if (!rawCspConfig.rules?.length && rawCspConfig.disableEmbedding) {
+      this.#directives.clearDirectiveValues('frame-ancestors');
+      this.#directives.addDirectiveValue('frame-ancestors', `'self'`);
     }
-    this.header = this.rules.join('; ');
+
+    this.rules = this.#directives.getRules();
+    this.header = this.#directives.getCspHeader();
+
+    this.strict = rawCspConfig.strict;
+    this.warnLegacyBrowsers = rawCspConfig.warnLegacyBrowsers;
+    this.disableEmbedding = rawCspConfig.disableEmbedding;
   }
 }
diff --git a/src/core/server/csp/csp_directives.test.ts b/src/core/server/csp/csp_directives.test.ts
new file mode 100644
index 0000000000000..1077b6ea9f3cd
--- /dev/null
+++ b/src/core/server/csp/csp_directives.test.ts
@@ -0,0 +1,266 @@
+/*
+ * 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 { CspDirectives } from './csp_directives';
+import { config as cspConfig } from './config';
+
+describe('CspDirectives', () => {
+  describe('#addDirectiveValue', () => {
+    it('properly updates the rules', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', 'foo');
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "style-src foo",
+        ]
+      `);
+
+      directives.addDirectiveValue('style-src', 'bar');
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "style-src foo bar",
+        ]
+      `);
+    });
+
+    it('properly updates the header', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', 'foo');
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(`"style-src foo"`);
+
+      directives.addDirectiveValue('style-src', 'bar');
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(`"style-src foo bar"`);
+    });
+
+    it('handles distinct directives', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', 'foo');
+      directives.addDirectiveValue('style-src', 'bar');
+      directives.addDirectiveValue('worker-src', 'dolly');
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"style-src foo bar; worker-src dolly"`
+      );
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "style-src foo bar",
+          "worker-src dolly",
+        ]
+      `);
+    });
+
+    it('removes duplicates', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', 'foo');
+      directives.addDirectiveValue('style-src', 'foo');
+      directives.addDirectiveValue('style-src', 'bar');
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(`"style-src foo bar"`);
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "style-src foo bar",
+        ]
+      `);
+    });
+
+    it('automatically adds single quotes for keywords', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', 'none');
+      directives.addDirectiveValue('style-src', 'self');
+      directives.addDirectiveValue('style-src', 'strict-dynamic');
+      directives.addDirectiveValue('style-src', 'report-sample');
+      directives.addDirectiveValue('style-src', 'unsafe-inline');
+      directives.addDirectiveValue('style-src', 'unsafe-eval');
+      directives.addDirectiveValue('style-src', 'unsafe-hashes');
+      directives.addDirectiveValue('style-src', 'unsafe-allow-redirects');
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"style-src 'none' 'self' 'strict-dynamic' 'report-sample' 'unsafe-inline' 'unsafe-eval' 'unsafe-hashes' 'unsafe-allow-redirects'"`
+      );
+    });
+
+    it('does not add single quotes for keywords when already present', () => {
+      const directives = new CspDirectives();
+      directives.addDirectiveValue('style-src', `'none'`);
+      directives.addDirectiveValue('style-src', `'self'`);
+      directives.addDirectiveValue('style-src', `'strict-dynamic'`);
+      directives.addDirectiveValue('style-src', `'report-sample'`);
+      directives.addDirectiveValue('style-src', `'unsafe-inline'`);
+      directives.addDirectiveValue('style-src', `'unsafe-eval'`);
+      directives.addDirectiveValue('style-src', `'unsafe-hashes'`);
+      directives.addDirectiveValue('style-src', `'unsafe-allow-redirects'`);
+
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"style-src 'none' 'self' 'strict-dynamic' 'report-sample' 'unsafe-inline' 'unsafe-eval' 'unsafe-hashes' 'unsafe-allow-redirects'"`
+      );
+    });
+  });
+
+  describe('#fromConfig', () => {
+    it('returns the correct rules for the default config', () => {
+      const config = cspConfig.schema.validate({});
+      const directives = CspDirectives.fromConfig(config);
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'unsafe-eval' 'self'",
+          "worker-src blob: 'self'",
+          "style-src 'unsafe-inline' 'self'",
+        ]
+      `);
+    });
+
+    it('returns the correct header for the default config', () => {
+      const config = cspConfig.schema.validate({});
+      const directives = CspDirectives.fromConfig(config);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'unsafe-eval' 'self'; worker-src blob: 'self'; style-src 'unsafe-inline' 'self'"`
+      );
+    });
+
+    it('handles config with rules', () => {
+      const config = cspConfig.schema.validate({
+        rules: [`script-src 'self' http://foo.com`, `worker-src 'self'`],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'self' http://foo.com",
+          "worker-src 'self'",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'self' http://foo.com; worker-src 'self'"`
+      );
+    });
+
+    it('adds single quotes for keyword for rules', () => {
+      const config = cspConfig.schema.validate({
+        rules: [`script-src self http://foo.com`, `worker-src self`],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'self' http://foo.com",
+          "worker-src 'self'",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'self' http://foo.com; worker-src 'self'"`
+      );
+    });
+
+    it('handles multiple whitespaces when parsing rules', () => {
+      const config = cspConfig.schema.validate({
+        rules: [`  script-src  'self'  http://foo.com `, `  worker-src   'self'  `],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'self' http://foo.com",
+          "worker-src 'self'",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'self' http://foo.com; worker-src 'self'"`
+      );
+    });
+
+    it('supports unregistered directives', () => {
+      const config = cspConfig.schema.validate({
+        rules: [`script-src 'self' http://foo.com`, `img-src 'self'`, 'foo bar'],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'self' http://foo.com",
+          "img-src 'self'",
+          "foo bar",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'self' http://foo.com; img-src 'self'; foo bar"`
+      );
+    });
+
+    it('adds default value for config with directives', () => {
+      const config = cspConfig.schema.validate({
+        script_src: [`baz`],
+        worker_src: [`foo`],
+        style_src: [`bar`, `dolly`],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'unsafe-eval' 'self' baz",
+          "worker-src blob: 'self' foo",
+          "style-src 'unsafe-inline' 'self' bar dolly",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'unsafe-eval' 'self' baz; worker-src blob: 'self' foo; style-src 'unsafe-inline' 'self' bar dolly"`
+      );
+    });
+
+    it('adds additional values for some directives without defaults', () => {
+      const config = cspConfig.schema.validate({
+        connect_src: [`connect-src`],
+        default_src: [`default-src`],
+        font_src: [`font-src`],
+        frame_src: [`frame-src`],
+        img_src: [`img-src`],
+        frame_ancestors: [`frame-ancestors`],
+        report_uri: [`report-uri`],
+        report_to: [`report-to`],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'unsafe-eval' 'self'",
+          "worker-src blob: 'self'",
+          "style-src 'unsafe-inline' 'self'",
+          "connect-src 'self' connect-src",
+          "default-src 'self' default-src",
+          "font-src 'self' font-src",
+          "frame-src 'self' frame-src",
+          "img-src 'self' img-src",
+          "frame-ancestors 'self' frame-ancestors",
+          "report-uri report-uri",
+          "report-to report-to",
+        ]
+      `);
+    });
+
+    it('adds single quotes for keywords in added directives', () => {
+      const config = cspConfig.schema.validate({
+        script_src: [`unsafe-hashes`],
+      });
+      const directives = CspDirectives.fromConfig(config);
+
+      expect(directives.getRules()).toMatchInlineSnapshot(`
+        Array [
+          "script-src 'unsafe-eval' 'self' 'unsafe-hashes'",
+          "worker-src blob: 'self'",
+          "style-src 'unsafe-inline' 'self'",
+        ]
+      `);
+      expect(directives.getCspHeader()).toMatchInlineSnapshot(
+        `"script-src 'unsafe-eval' 'self' 'unsafe-hashes'; worker-src blob: 'self'; style-src 'unsafe-inline' 'self'"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/csp/csp_directives.ts b/src/core/server/csp/csp_directives.ts
new file mode 100644
index 0000000000000..9e3b60f7f1e4f
--- /dev/null
+++ b/src/core/server/csp/csp_directives.ts
@@ -0,0 +1,159 @@
+/*
+ * 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 { CspConfigType } from './config';
+
+export type CspDirectiveName =
+  | 'script-src'
+  | 'worker-src'
+  | 'style-src'
+  | 'frame-ancestors'
+  | 'connect-src'
+  | 'default-src'
+  | 'font-src'
+  | 'frame-src'
+  | 'img-src'
+  | 'report-uri'
+  | 'report-to';
+
+/**
+ * The default rules that are always applied
+ */
+export const defaultRules: Partial<Record<CspDirectiveName, string[]>> = {
+  'script-src': [`'unsafe-eval'`, `'self'`],
+  'worker-src': [`blob:`, `'self'`],
+  'style-src': [`'unsafe-inline'`, `'self'`],
+};
+
+/**
+ * Per-directive rules that will be added when the configuration contains at least one value
+ * Main purpose is to add `self` value to some directives when the configuration specifies other values
+ */
+export const additionalRules: Partial<Record<CspDirectiveName, string[]>> = {
+  'connect-src': [`'self'`],
+  'default-src': [`'self'`],
+  'font-src': [`'self'`],
+  'img-src': [`'self'`],
+  'frame-ancestors': [`'self'`],
+  'frame-src': [`'self'`],
+};
+
+export class CspDirectives {
+  private readonly directives = new Map<CspDirectiveName, Set<string>>();
+
+  addDirectiveValue(directiveName: CspDirectiveName, directiveValue: string) {
+    if (!this.directives.has(directiveName)) {
+      this.directives.set(directiveName, new Set());
+    }
+    this.directives.get(directiveName)!.add(normalizeDirectiveValue(directiveValue));
+  }
+
+  clearDirectiveValues(directiveName: CspDirectiveName) {
+    this.directives.delete(directiveName);
+  }
+
+  getCspHeader() {
+    return this.getRules().join('; ');
+  }
+
+  getRules() {
+    return [...this.directives.entries()].map(([name, values]) => {
+      return [name, ...values].join(' ');
+    });
+  }
+
+  static fromConfig(config: CspConfigType): CspDirectives {
+    const cspDirectives = new CspDirectives();
+
+    // adding `csp.rules` or `default` rules
+    const initialRules = config.rules ? parseRules(config.rules) : { ...defaultRules };
+    Object.entries(initialRules).forEach(([key, values]) => {
+      values?.forEach((value) => {
+        cspDirectives.addDirectiveValue(key as CspDirectiveName, value);
+      });
+    });
+
+    // adding per-directive configuration
+    const additiveConfig = parseConfigDirectives(config);
+    [...additiveConfig.entries()].forEach(([directiveName, directiveValues]) => {
+      const additionalValues = additionalRules[directiveName] ?? [];
+      [...additionalValues, ...directiveValues].forEach((value) => {
+        cspDirectives.addDirectiveValue(directiveName, value);
+      });
+    });
+
+    return cspDirectives;
+  }
+}
+
+const parseRules = (rules: string[]): Partial<Record<CspDirectiveName, string[]>> => {
+  const directives: Partial<Record<CspDirectiveName, string[]>> = {};
+  rules.forEach((rule) => {
+    const [name, ...values] = rule.replace(/\s+/g, ' ').trim().split(' ');
+    directives[name as CspDirectiveName] = values;
+  });
+  return directives;
+};
+
+const parseConfigDirectives = (cspConfig: CspConfigType): Map<CspDirectiveName, string[]> => {
+  const map = new Map<CspDirectiveName, string[]>();
+
+  if (cspConfig.script_src?.length) {
+    map.set('script-src', cspConfig.script_src);
+  }
+  if (cspConfig.worker_src?.length) {
+    map.set('worker-src', cspConfig.worker_src);
+  }
+  if (cspConfig.style_src?.length) {
+    map.set('style-src', cspConfig.style_src);
+  }
+  if (cspConfig.connect_src?.length) {
+    map.set('connect-src', cspConfig.connect_src);
+  }
+  if (cspConfig.default_src?.length) {
+    map.set('default-src', cspConfig.default_src);
+  }
+  if (cspConfig.font_src?.length) {
+    map.set('font-src', cspConfig.font_src);
+  }
+  if (cspConfig.frame_src?.length) {
+    map.set('frame-src', cspConfig.frame_src);
+  }
+  if (cspConfig.img_src?.length) {
+    map.set('img-src', cspConfig.img_src);
+  }
+  if (cspConfig.frame_ancestors?.length) {
+    map.set('frame-ancestors', cspConfig.frame_ancestors);
+  }
+  if (cspConfig.report_uri?.length) {
+    map.set('report-uri', cspConfig.report_uri);
+  }
+  if (cspConfig.report_to?.length) {
+    map.set('report-to', cspConfig.report_to);
+  }
+
+  return map;
+};
+
+const keywordTokens = [
+  'none',
+  'self',
+  'strict-dynamic',
+  'report-sample',
+  'unsafe-inline',
+  'unsafe-eval',
+  'unsafe-hashes',
+  'unsafe-allow-redirects',
+];
+
+function normalizeDirectiveValue(value: string) {
+  if (keywordTokens.includes(value)) {
+    return `'${value}'`;
+  }
+  return value;
+}
diff --git a/src/core/server/http/cookie_session_storage.test.ts b/src/core/server/http/cookie_session_storage.test.ts
index c802163866423..55af02a08561b 100644
--- a/src/core/server/http/cookie_session_storage.test.ts
+++ b/src/core/server/http/cookie_session_storage.test.ts
@@ -69,7 +69,11 @@ configService.atPath.mockImplementation((path) => {
     } as any);
   }
   if (path === 'csp') {
-    return new BehaviorSubject({} as any);
+    return new BehaviorSubject({
+      strict: false,
+      disableEmbedding: false,
+      warnLegacyBrowsers: true,
+    });
   }
   throw new Error(`Unexpected config path: ${path}`);
 });
diff --git a/src/core/server/http/http_config.test.ts b/src/core/server/http/http_config.test.ts
index 56095336d970b..06a4745632233 100644
--- a/src/core/server/http/http_config.test.ts
+++ b/src/core/server/http/http_config.test.ts
@@ -8,7 +8,7 @@
 
 import uuid from 'uuid';
 import { config, HttpConfig } from './http_config';
-import { CspConfig } from '../csp';
+import { config as cspConfig } from '../csp';
 import { ExternalUrlConfig } from '../external_url';
 
 const validHostnames = ['www.example.com', '8.8.8.8', '::1', 'localhost', '0.0.0.0'];
@@ -459,7 +459,8 @@ describe('HttpConfig', () => {
         },
       },
     });
-    const httpConfig = new HttpConfig(rawConfig, CspConfig.DEFAULT, ExternalUrlConfig.DEFAULT);
+    const rawCspConfig = cspConfig.schema.validate({});
+    const httpConfig = new HttpConfig(rawConfig, rawCspConfig, ExternalUrlConfig.DEFAULT);
 
     expect(httpConfig.customResponseHeaders).toEqual({
       string: 'string',
diff --git a/src/core/server/http/integration_tests/lifecycle_handlers.test.ts b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
index cbd300fdc9c09..c2023c5577d61 100644
--- a/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
+++ b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
@@ -79,7 +79,11 @@ describe('core lifecycle handlers', () => {
         } as any);
       }
       if (path === 'csp') {
-        return new BehaviorSubject({} as any);
+        return new BehaviorSubject({
+          strict: false,
+          disableEmbedding: false,
+          warnLegacyBrowsers: true,
+        });
       }
       throw new Error(`Unexpected config path: ${path}`);
     });
diff --git a/src/core/server/http/test_utils.ts b/src/core/server/http/test_utils.ts
index b3180b43d0026..4e1a88e967f8f 100644
--- a/src/core/server/http/test_utils.ts
+++ b/src/core/server/http/test_utils.ts
@@ -56,7 +56,11 @@ configService.atPath.mockImplementation((path) => {
     } as any);
   }
   if (path === 'csp') {
-    return new BehaviorSubject({} as any);
+    return new BehaviorSubject({
+      strict: false,
+      disableEmbedding: false,
+      warnLegacyBrowsers: true,
+    });
   }
   throw new Error(`Unexpected config path: ${path}`);
 });
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index fcecf39f7e53a..3bc0b54635eb5 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -777,8 +777,12 @@ export interface CountResponse {
 
 // @public
 export class CspConfig implements ICspConfig {
+    // (undocumented)
+    #private;
+    // Warning: (ae-forgotten-export) The symbol "CspConfigType" needs to be exported by the entry point index.d.ts
+    //
     // @internal
-    constructor(rawCspConfig?: Partial<Omit<ICspConfig, 'header'>>);
+    constructor(rawCspConfig: CspConfigType);
     // (undocumented)
     static readonly DEFAULT: CspConfig;
     // (undocumented)
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index b520ab3070b15..a224793bace3f 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -31,6 +31,17 @@ kibana_vars=(
     csp.rules
     csp.strict
     csp.warnLegacyBrowsers
+    csp.script_src
+    csp.worker_src
+    csp.style_src
+    csp.connect_src
+    csp.default_src
+    csp.font_src
+    csp.frame_src
+    csp.img_src
+    csp.frame_ancestors
+    csp.report_uri
+    csp.report_to
     data.autocomplete.valueSuggestions.terminateAfter
     data.autocomplete.valueSuggestions.timeout
     elasticsearch.customHeaders
diff --git a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
index fffbe013d98e8..f5a783a6dfb05 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
@@ -22,7 +22,21 @@ describe('csp collector', () => {
   const mockedFetchContext = createCollectorFetchContextMock();
 
   function updateCsp(config: Partial<ICspConfig>) {
-    httpMock.csp = new CspConfig(config);
+    httpMock.csp = new CspConfig({
+      ...CspConfig.DEFAULT,
+      style_src: [],
+      worker_src: [],
+      script_src: [],
+      connect_src: [],
+      default_src: [],
+      font_src: [],
+      frame_src: [],
+      img_src: [],
+      frame_ancestors: [],
+      report_uri: [],
+      report_to: [],
+      ...config,
+    });
   }
 
   beforeEach(() => {

From c6d04a91952f04b887bd8454a31a96b16ab245b2 Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Fri, 25 Jun 2021 21:57:57 +0100
Subject: [PATCH 93/95] [ML] Converts management app jobs list pages to new
 layout (#103117)

* [ML] Converts management app jobs list pages to new layout

* i[ML] Fix translations

* [ML] Set acccessDenied default state back to false

* [ML] Remove headers for error states and text updates following review

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/application/access_denied/page.tsx |  63 ++++-------
 .../components/access_denied_page.tsx         |  80 +++++--------
 .../components/insufficient_license_page.tsx  | 104 +++++++----------
 .../jobs_list_page/jobs_list_page.tsx         | 106 ++++++++----------
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 6 files changed, 140 insertions(+), 215 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/access_denied/page.tsx b/x-pack/plugins/ml/public/application/access_denied/page.tsx
index fa535eb1bd53a..bc0d17e96fe71 100644
--- a/x-pack/plugins/ml/public/application/access_denied/page.tsx
+++ b/x-pack/plugins/ml/public/application/access_denied/page.tsx
@@ -5,21 +5,11 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
+import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import {
-  EuiCallOut,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
+
+import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPageContent, EuiSpacer } from '@elastic/eui';
 import { NavigationMenu } from '../components/navigation_menu';
 import { HelpMenu } from '../components/help_menu';
 import { useMlKibana } from '../contexts/kibana';
@@ -30,44 +20,35 @@ export const Page = () => {
   } = useMlKibana();
   const helpLink = docLinks.links.ml.guide;
   return (
-    <Fragment>
+    <>
       <NavigationMenu tabId="access-denied" />
-      <EuiPage>
-        <EuiPageBody>
-          <EuiPageContentHeader>
-            <EuiPageContentHeaderSection>
-              <EuiTitle>
-                <h1>
+      <EuiSpacer size="xxl" />
+      <EuiFlexGroup justifyContent="spaceAround">
+        <EuiFlexItem grow={false}>
+          <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+            <EuiEmptyPrompt
+              iconType="alert"
+              title={
+                <h2>
                   <FormattedMessage
                     id="xpack.ml.management.jobsList.accessDeniedTitle"
                     defaultMessage="Access denied"
                   />
-                </h1>
-              </EuiTitle>
-            </EuiPageContentHeaderSection>
-          </EuiPageContentHeader>
-          <EuiPageContentBody>
-            <EuiSpacer size="m" />
-            <EuiCallOut
-              title={i18n.translate('xpack.ml.accessDenied.label', {
-                defaultMessage: 'Insufficient permissions',
-              })}
-              color="danger"
-              iconType="cross"
-            >
-              <EuiText size="s">
+                </h2>
+              }
+              body={
                 <p>
                   <FormattedMessage
                     id="xpack.ml.accessDenied.description"
-                    defaultMessage="You don’t have permission to access the ML plugin"
+                    defaultMessage="You don’t have permission to view the Machine Learning plugin. Access to the plugin requires the Machine Learning feature to be visible in this space."
                   />
                 </p>
-              </EuiText>
-            </EuiCallOut>
-          </EuiPageContentBody>
-        </EuiPageBody>
-      </EuiPage>
+              }
+            />
+          </EuiPageContent>
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <HelpMenu docLink={helpLink} />
-    </Fragment>
+    </>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/access_denied_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/access_denied_page.tsx
index 0d785f1918b0b..4858db1ee55bc 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/access_denied_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/access_denied_page.tsx
@@ -5,59 +5,39 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
+import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
 
-import {
-  EuiCallOut,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiEmptyPrompt, EuiPageContent } from '@elastic/eui';
 
 export const AccessDeniedPage = () => (
-  <Fragment>
-    <EuiPage data-test-subj="mlPageAccessDenied">
-      <EuiPageBody>
-        <EuiPageContentHeader>
-          <EuiPageContentHeaderSection>
-            <EuiTitle>
-              <h1>
-                <FormattedMessage
-                  id="xpack.ml.management.jobsList.insufficientLicenseTitle"
-                  defaultMessage="Machine Learning"
-                />
-              </h1>
-            </EuiTitle>
-          </EuiPageContentHeaderSection>
-        </EuiPageContentHeader>
-        <EuiPageContentBody>
-          <EuiSpacer size="m" />
-          <EuiCallOut
-            title={i18n.translate('xpack.ml.management.jobsList.noPermissionToAccessLabel', {
-              defaultMessage: 'Access denied',
-            })}
-            color="danger"
-            iconType="cross"
-          >
-            <EuiText size="s">
-              <p>
-                <FormattedMessage
-                  id="xpack.ml.management.jobsList.noGrantedPrivilegesDescription"
-                  defaultMessage="You don’t have permission to manage ML jobs"
-                />
-              </p>
-            </EuiText>
-          </EuiCallOut>
-        </EuiPageContentBody>
-      </EuiPageBody>
-    </EuiPage>
-  </Fragment>
+  <>
+    <EuiPageContent
+      verticalPosition="center"
+      horizontalPosition="center"
+      color="danger"
+      data-test-subj="mlPageAccessDenied"
+    >
+      <EuiEmptyPrompt
+        iconType="alert"
+        title={
+          <h2>
+            <FormattedMessage
+              id="xpack.ml.management.jobsList.noPermissionToAccessLabel"
+              defaultMessage="Access denied"
+            />
+          </h2>
+        }
+        body={
+          <p>
+            <FormattedMessage
+              id="xpack.ml.management.jobsList.noGrantedPrivilegesDescription"
+              defaultMessage="You don’t have permission to manage Machine Learning jobs. Access to the plugin requires the Machine Learning feature to be visible in this space."
+            />
+          </p>
+        }
+      />
+    </EuiPageContent>
+  </>
 );
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
index 22951e950045b..6d0c3639d939c 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
@@ -5,78 +5,54 @@
  * 2.0.
  */
 
-import React, { FC, Fragment } from 'react';
+import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
 import { CoreStart } from 'kibana/public';
 
-import {
-  EuiCallOut,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-  EuiLink,
-} from '@elastic/eui';
+import { EuiEmptyPrompt, EuiLink, EuiPageContent } from '@elastic/eui';
 
 interface Props {
   basePath: CoreStart['http']['basePath'];
 }
 
 export const InsufficientLicensePage: FC<Props> = ({ basePath }) => (
-  <Fragment>
-    <EuiPage data-test-subj="mlPageInsufficientLicense">
-      <EuiPageBody>
-        <EuiPageContentHeader>
-          <EuiPageContentHeaderSection>
-            <EuiTitle>
-              <h1>
-                <FormattedMessage
-                  id="xpack.ml.management.jobsList.insufficientLicenseTitle"
-                  defaultMessage="Machine Learning"
-                />
-              </h1>
-            </EuiTitle>
-          </EuiPageContentHeaderSection>
-        </EuiPageContentHeader>
-        <EuiPageContentBody>
-          <EuiSpacer size="m" />
-          <EuiCallOut
-            title={i18n.translate('xpack.ml.management.jobsList.insufficientLicenseLabel', {
-              defaultMessage:
-                'Machine Learning is only available on a trial, platinum or enterprise license',
-            })}
-            color="danger"
-            iconType="cross"
-          >
-            <EuiText size="s">
-              <p>
-                <FormattedMessage
-                  id="xpack.ml.management.jobsList.insufficientLicenseDescription"
-                  defaultMessage="Please {link} to use Machine Learning features"
-                  values={{
-                    link: (
-                      <EuiLink
-                        href={`${basePath.get()}/app/management/stack/license_management/home`}
-                      >
-                        <FormattedMessage
-                          id="xpack.ml.management.jobsList.insufficientLicenseDescription.link"
-                          defaultMessage="upgrade your license or start a trial"
-                        />
-                      </EuiLink>
-                    ),
-                  }}
-                />
-              </p>
-            </EuiText>
-          </EuiCallOut>
-        </EuiPageContentBody>
-      </EuiPageBody>
-    </EuiPage>
-  </Fragment>
+  <>
+    <EuiPageContent
+      verticalPosition="center"
+      horizontalPosition="center"
+      color="danger"
+      data-test-subj="mlPageInsufficientLicense"
+    >
+      <EuiEmptyPrompt
+        iconType="alert"
+        title={
+          <h2>
+            <FormattedMessage
+              id="xpack.ml.management.jobsList.insufficientLicenseLabel"
+              defaultMessage="Insufficient license"
+            />
+          </h2>
+        }
+        body={
+          <p>
+            <FormattedMessage
+              id="xpack.ml.management.jobsList.insufficientLicenseDescription"
+              defaultMessage="Machine Learning is available only with trial, platinum or enterprise licenses. Please {link} to use Machine Learning features."
+              values={{
+                link: (
+                  <EuiLink href={`${basePath.get()}/app/management/stack/license_management/home`}>
+                    <FormattedMessage
+                      id="xpack.ml.management.jobsList.insufficientLicenseDescription.link"
+                      defaultMessage="upgrade your license or start a trial"
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          </p>
+        }
+      />
+    </EuiPageContent>
+  </>
 );
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index ca62ef9aaf0af..77f0e6123dfad 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -8,18 +8,15 @@
 import React, { useEffect, useState, Fragment, FC, useMemo, useCallback } from 'react';
 import { Router } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { CoreStart } from 'kibana/public';
 
 import {
   EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPageContent,
   EuiPageContentBody,
+  EuiPageHeader,
   EuiSpacer,
   EuiTabbedContent,
-  EuiText,
-  EuiTitle,
   EuiTabbedContentTab,
 } from '@elastic/eui';
 
@@ -176,6 +173,19 @@ export const JobsListPage: FC<{
     defaultMessage: 'Analytics jobs docs',
   });
 
+  const docsLink = (
+    <EuiButtonEmpty
+      href={
+        currentTabId === 'anomaly_detection_jobs' ? anomalyDetectionJobsUrl : dataFrameAnalyticsUrl
+      }
+      target="_blank"
+      iconType="help"
+      data-test-subj="documentationLink"
+    >
+      {currentTabId === 'anomaly_detection_jobs' ? anomalyDetectionDocsLabel : analyticsDocsLabel}
+    </EuiButtonEmpty>
+  );
+
   function renderTabs() {
     return (
       <EuiTabbedContent
@@ -209,62 +219,42 @@ export const JobsListPage: FC<{
         >
           <ContextWrapper feature={PLUGIN_ID}>
             <Router history={history}>
-              <EuiPageContent
+              <EuiPageHeader
+                pageTitle={
+                  <FormattedMessage
+                    id="xpack.ml.management.jobsList.jobsListTitle"
+                    defaultMessage="Machine Learning Jobs"
+                  />
+                }
+                description={
+                  <FormattedMessage
+                    id="xpack.ml.management.jobsList.jobsListTagline"
+                    defaultMessage="View machine learning analytics and anomaly detection jobs."
+                  />
+                }
+                rightSideItems={[docsLink]}
+                bottomBorder
+              />
+
+              <EuiSpacer size="l" />
+
+              <EuiPageContentBody
                 id="kibanaManagementMLSection"
                 data-test-subj="mlPageStackManagementJobsList"
               >
-                <EuiTitle size="l">
-                  <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-                    <EuiFlexItem grow={false}>
-                      <h1>
-                        {i18n.translate('xpack.ml.management.jobsList.jobsListTitle', {
-                          defaultMessage: 'Machine Learning Jobs',
-                        })}
-                      </h1>
-                    </EuiFlexItem>
-                    <EuiFlexItem grow={false}>
-                      <EuiButtonEmpty
-                        target="_blank"
-                        iconType="help"
-                        iconSide="left"
-                        color="primary"
-                        href={
-                          currentTabId === 'anomaly_detection_jobs'
-                            ? anomalyDetectionJobsUrl
-                            : dataFrameAnalyticsUrl
-                        }
-                      >
-                        {currentTabId === 'anomaly_detection_jobs'
-                          ? anomalyDetectionDocsLabel
-                          : analyticsDocsLabel}
-                      </EuiButtonEmpty>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiTitle>
-                <EuiSpacer size="s" />
-                <EuiTitle size="s">
-                  <EuiText color="subdued">
-                    {i18n.translate('xpack.ml.management.jobsList.jobsListTagline', {
-                      defaultMessage: 'View machine learning analytics and anomaly detection jobs.',
-                    })}
-                  </EuiText>
-                </EuiTitle>
-                <EuiSpacer size="l" />
-                <EuiPageContentBody>
-                  {spacesEnabled && (
-                    <>
-                      <EuiButtonEmpty onClick={() => setShowSyncFlyout(true)}>
-                        {i18n.translate('xpack.ml.management.jobsList.syncFlyoutButton', {
-                          defaultMessage: 'Synchronize saved objects',
-                        })}
-                      </EuiButtonEmpty>
-                      {showSyncFlyout && <JobSpacesSyncFlyout onClose={onCloseSyncFlyout} />}
-                      <EuiSpacer size="s" />
-                    </>
-                  )}
-                  {renderTabs()}
-                </EuiPageContentBody>
-              </EuiPageContent>
+                {spacesEnabled && (
+                  <>
+                    <EuiButtonEmpty onClick={() => setShowSyncFlyout(true)}>
+                      {i18n.translate('xpack.ml.management.jobsList.syncFlyoutButton', {
+                        defaultMessage: 'Synchronize saved objects',
+                      })}
+                    </EuiButtonEmpty>
+                    {showSyncFlyout && <JobSpacesSyncFlyout onClose={onCloseSyncFlyout} />}
+                    <EuiSpacer size="s" />
+                  </>
+                )}
+                {renderTabs()}
+              </EuiPageContentBody>
             </Router>
           </ContextWrapper>
         </KibanaContextProvider>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 3cf0891bc73b2..22967ad94a083 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -13627,7 +13627,6 @@
     "xpack.maps.visTypeAlias.description": "マップを作成し、複数のレイヤーとインデックスを使用して、スタイルを設定します。",
     "xpack.maps.visTypeAlias.title": "マップ",
     "xpack.ml.accessDenied.description": "ML プラグインへのアクセスパーミッションがありません",
-    "xpack.ml.accessDenied.label": "パーミッションがありません",
     "xpack.ml.accessDeniedLabel": "アクセスが拒否されました",
     "xpack.ml.accessDeniedTabLabel": "アクセス拒否",
     "xpack.ml.actions.applyEntityFieldsFiltersTitle": "値でフィルター",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 3a1836cc25014..b1846be15ffa9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -13805,7 +13805,6 @@
     "xpack.maps.visTypeAlias.description": "使用多个图层和索引创建地图并提供样式。",
     "xpack.maps.visTypeAlias.title": "Maps",
     "xpack.ml.accessDenied.description": "您无权访问 ML 插件",
-    "xpack.ml.accessDenied.label": "权限不足",
     "xpack.ml.accessDeniedLabel": "访问被拒绝",
     "xpack.ml.accessDeniedTabLabel": "访问被拒绝",
     "xpack.ml.actions.applyEntityFieldsFiltersTitle": "筛留值",

From df8787b104efd9185a15d29bd5682826e5d0ceaa Mon Sep 17 00:00:00 2001
From: Michael Marcialis <michael.marcialis@elastic.co>
Date: Fri, 25 Jun 2021 20:58:52 -0400
Subject: [PATCH 94/95] Home & Kibana Overview Page Template Update (#103003)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* apply page template comp to kibana overview

* apply page template comp to home page

* clean up

* strip null actions from array

* update snapshot and remove outdated import

* fix tests and update snapshots

* update tests and snapshots

* Switch to KibanaPageTemplate; use template=“empty”

* update snapshots

* make `EuiCard` transparent

* updated snapshots

* restored data-test-subj="homeApp"

* change scope of styles

* update snapshots
---
 .../__snapshots__/home.test.js.snap           | 1344 ++++++--------
 .../public/application/components/_home.scss  |   16 -
 .../components/_solutions_section.scss        |    4 -
 .../public/application/components/home.js     |   99 +-
 .../application/components/home.test.js       |    2 +-
 .../public/components/_overview.scss          |   22 +-
 .../__snapshots__/add_data.test.tsx.snap      |    2 +-
 .../public/components/add_data/add_data.tsx   |    2 +-
 .../getting_started.test.tsx.snap             |   24 +-
 .../getting_started/getting_started.tsx       |    2 +-
 .../__snapshots__/overview.test.tsx.snap      | 1641 +++++++----------
 .../components/overview/overview.test.tsx     |    2 +-
 .../public/components/overview/overview.tsx   |  261 +--
 .../public/overview_page/index.ts             |    2 +-
 .../overview_page_actions.test.tsx.snap       |  101 +
 .../index.ts                                  |    2 +-
 .../overview_page_actions.test.tsx            |   51 +
 .../overview_page_actions.tsx                 |   88 +
 .../overview_page_header.test.tsx.snap        |   69 -
 .../_overview_page_header.scss                |   14 -
 .../overview_page_header/index.scss           |    1 -
 .../overview_page_header.test.tsx             |   38 -
 .../overview_page_header.tsx                  |  141 --
 23 files changed, 1743 insertions(+), 2185 deletions(-)
 create mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_actions/__snapshots__/overview_page_actions.test.tsx.snap
 rename src/plugins/kibana_react/public/overview_page/{overview_page_header => overview_page_actions}/index.ts (89%)
 create mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
 create mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
 delete mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap
 delete mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_header/_overview_page_header.scss
 delete mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_header/index.scss
 delete mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.test.tsx
 delete mode 100644 src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.tsx

diff --git a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
index b949fa7995d30..153438b34eb47 100644
--- a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
+++ b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
@@ -1,819 +1,707 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`home change home route should render a link to change the default route in advanced settings if advanced settings is enabled 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home directories should not render directory entry when showOnHomePage is false 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home directories should render ADMIN directory entry in "Manage your data" panel 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={
-            Array [
-              Object {
-                "category": "admin",
-                "description": "Manage the index patterns that help retrieve your data from Elasticsearch.",
-                "icon": "indexPatternApp",
-                "id": "index_patterns",
-                "path": "index_management_landing_page",
-                "showOnHomePage": true,
-                "title": "Index Patterns",
-              },
-            ]
-          }
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={
+          Array [
+            Object {
+              "category": "admin",
+              "description": "Manage the index patterns that help retrieve your data from Elasticsearch.",
+              "icon": "indexPatternApp",
+              "id": "index_patterns",
+              "path": "index_management_landing_page",
+              "showOnHomePage": true,
+              "title": "Index Patterns",
+            },
+          ]
+        }
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home directories should render DATA directory entry in "Ingest your data" panel 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={
-            Array [
-              Object {
-                "category": "data",
-                "description": "Display and share a collection of visualizations and saved searches.",
-                "icon": "dashboardApp",
-                "id": "dashboard",
-                "path": "dashboard_landing_page",
-                "showOnHomePage": true,
-                "title": "Dashboard",
-              },
-            ]
-          }
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={
+          Array [
+            Object {
+              "category": "data",
+              "description": "Display and share a collection of visualizations and saved searches.",
+              "icon": "dashboardApp",
+              "id": "dashboard",
+              "path": "dashboard_landing_page",
+              "showOnHomePage": true,
+              "title": "Dashboard",
+            },
+          ]
+        }
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home directories should render solutions in the "solution section" 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={4}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
+    }
+  }
+  template="empty"
+>
+  <SolutionsSection
+    addBasePath={[Function]}
+    directories={Array []}
+    solutions={
+      Array [
+        Object {
+          "appDescriptions": Array [
+            "Analyze data in dashboards",
+          ],
+          "icon": "logoKibana",
+          "id": "kibana",
+          "order": 1,
+          "path": "kibana_landing_page",
+          "subtitle": "Visualize & analyze",
+          "title": "Kibana",
+        },
+        Object {
+          "appDescriptions": Array [
+            "Example use case",
+          ],
+          "icon": "empty",
+          "id": "solution-2",
+          "order": 2,
+          "path": "path-to-solution-two",
+          "subtitle": "Subtitle for solution two",
+          "title": "Solution two",
+        },
+        Object {
+          "appDescriptions": Array [
+            "Example use case",
+          ],
+          "icon": "empty",
+          "id": "solution-3",
+          "order": 3,
+          "path": "path-to-solution-three",
+          "subtitle": "Subtitle for solution three",
+          "title": "Solution three",
+        },
+        Object {
+          "appDescriptions": Array [
+            "Example use case",
+          ],
+          "icon": "empty",
+          "id": "solution-4",
+          "order": 4,
+          "path": "path-to-solution-four",
+          "subtitle": "Subtitle for solution four",
+          "title": "Solution four",
+        },
+      ]
     }
   />
-  <div
-    className="homContent"
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <SolutionsSection
-      addBasePath={[Function]}
-      directories={Array []}
-      solutions={
-        Array [
-          Object {
-            "appDescriptions": Array [
-              "Analyze data in dashboards",
-            ],
-            "icon": "logoKibana",
-            "id": "kibana",
-            "order": 1,
-            "path": "kibana_landing_page",
-            "subtitle": "Visualize & analyze",
-            "title": "Kibana",
-          },
-          Object {
-            "appDescriptions": Array [
-              "Example use case",
-            ],
-            "icon": "empty",
-            "id": "solution-2",
-            "order": 2,
-            "path": "path-to-solution-two",
-            "subtitle": "Subtitle for solution two",
-            "title": "Solution two",
-          },
-          Object {
-            "appDescriptions": Array [
-              "Example use case",
-            ],
-            "icon": "empty",
-            "id": "solution-3",
-            "order": 3,
-            "path": "path-to-solution-three",
-            "subtitle": "Subtitle for solution three",
-            "title": "Solution three",
-          },
-          Object {
-            "appDescriptions": Array [
-              "Example use case",
-            ],
-            "icon": "empty",
-            "id": "solution-4",
-            "order": 4,
-            "path": "path-to-solution-four",
-            "subtitle": "Subtitle for solution four",
-            "title": "Solution four",
-          },
-        ]
-      }
-    />
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home header render 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home header should show "Dev tools" link if console is available 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={
-            Array [
-              Object {
-                "category": "admin",
-                "description": "Skip cURL and use a JSON interface to work with your data in Console.",
-                "icon": "consoleApp",
-                "id": "console",
-                "path": "path-to-dev-tools",
-                "showOnHomePage": false,
-                "title": "Console",
-              },
-            ]
-          }
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={
+          Array [
+            Object {
+              "category": "admin",
+              "description": "Skip cURL and use a JSON interface to work with your data in Console.",
+              "icon": "consoleApp",
+              "id": "console",
+              "path": "path-to-dev-tools",
+              "showOnHomePage": false,
+              "title": "Console",
+            },
+          ]
+        }
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home header should show "Manage" link if stack management is available 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when there are index patterns 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when there are no index patterns 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home should render home component 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home welcome should show the normal home page if loading fails 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home welcome should show the normal home page if welcome screen is disabled locally 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
 
 exports[`home welcome should show the welcome screen if enabled, and there are no index patterns defined 1`] = `
@@ -824,53 +712,45 @@ exports[`home welcome should show the welcome screen if enabled, and there are n
 `;
 
 exports[`home welcome stores skip welcome setting if skipped 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="homWrapper"
+<Component
   data-test-subj="homeApp"
->
-  <mockConstructor
-    addBasePath={[Function]}
-    overlap={0}
-    showDevToolsLink={true}
-    showManagementLink={true}
-    title={
-      <FormattedMessage
+  pageHeader={
+    Object {
+      "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
-  />
-  <div
-    className="homContent"
+  }
+  template="empty"
+>
+  <EuiFlexGroup
+    className="homData homData--expanded"
   >
-    <EuiFlexGroup
-      className="homData homData--expanded"
-    >
-      <EuiFlexItem>
-        <AddData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <ManageData
-          addBasePath={[Function]}
-          features={Array []}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={[Function]}
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/home"
-    />
-  </div>
-</main>
+    <EuiFlexItem>
+      <AddData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <ManageData
+        addBasePath={[Function]}
+        features={Array []}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <mockConstructor
+    addBasePath={[Function]}
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/home"
+  />
+</Component>
 `;
diff --git a/src/plugins/home/public/application/components/_home.scss b/src/plugins/home/public/application/components/_home.scss
index 913e1511a6314..34643433d6112 100644
--- a/src/plugins/home/public/application/components/_home.scss
+++ b/src/plugins/home/public/application/components/_home.scss
@@ -1,19 +1,3 @@
-@import '../../../../../core/public/mixins';
-
-.homWrapper {
-  @include kibanaFullBodyMinHeight();
-  background-color: $euiColorEmptyShade;
-  display: flex;
-  flex-direction: column;
-}
-
-.homContent {
-  margin: 0 auto;
-  max-width: 1200px;
-  padding: $euiSizeXL $euiSize;
-  width: 100%;
-}
-
 .homData--expanded {
   flex-direction: column;
 
diff --git a/src/plugins/home/public/application/components/_solutions_section.scss b/src/plugins/home/public/application/components/_solutions_section.scss
index a808d83916c2d..965447f689f98 100644
--- a/src/plugins/home/public/application/components/_solutions_section.scss
+++ b/src/plugins/home/public/application/components/_solutions_section.scss
@@ -1,7 +1,3 @@
-.homSolutions {
-  margin-top: -($euiSizeXL + $euiSizeL + $euiSizeM);
-}
-
 .homSolutions__content {
   min-height: $euiSize * 16;
 
diff --git a/src/plugins/home/public/application/components/home.js b/src/plugins/home/public/application/components/home.js
index 3c1ba8eea22ca..fdaaeef01f47a 100644
--- a/src/plugins/home/public/application/components/home.js
+++ b/src/plugins/home/public/application/components/home.js
@@ -13,8 +13,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import {
+  KibanaPageTemplate,
+  overviewPageActions,
   OverviewPageFooter,
-  OverviewPageHeader,
 } from '../../../../../../src/plugins/kibana_react/public';
 import { HOME_APP_BASE_PATH } from '../../../common/constants';
 import { FeatureCatalogueCategory } from '../../services';
@@ -113,7 +114,7 @@ export class Home extends Component {
 
   renderNormal() {
     const { addBasePath, solutions, directories } = this.props;
-    const { trackUiMetric } = getServices();
+    const { application, trackUiMetric } = getServices();
     const devTools = this.findDirectoryById('console');
     const addDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.DATA);
     const manageDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
@@ -124,58 +125,56 @@ export class Home extends Component {
     }
 
     return (
-      <main
-        aria-labelledby="kbnOverviewPageHeader__title"
-        className="homWrapper"
+      <KibanaPageTemplate
         data-test-subj="homeApp"
+        pageHeader={{
+          pageTitle: <FormattedMessage id="home.header.title" defaultMessage="Home" />,
+          rightSideItems: overviewPageActions({
+            addBasePath,
+            application,
+            showDevToolsLink: true,
+            showManagementLink: true,
+          }),
+        }}
+        template="empty"
       >
-        <OverviewPageHeader
-          addBasePath={addBasePath}
-          overlap={solutions.length}
-          showDevToolsLink
-          showManagementLink
-          title={<FormattedMessage id="home.header.title" defaultMessage="Home" />}
-        />
-
-        <div className="homContent">
-          {solutions.length ? (
-            <SolutionsSection
-              addBasePath={addBasePath}
-              solutions={solutions}
-              directories={directories}
-            />
-          ) : null}
-
-          <EuiFlexGroup
-            className={`homData ${
-              addDataFeatures.length === 1 && manageDataFeatures.length === 1
-                ? 'homData--compressed'
-                : 'homData--expanded'
-            }`}
-          >
-            <EuiFlexItem>
-              <AddData addBasePath={addBasePath} features={addDataFeatures} />
-            </EuiFlexItem>
-
-            <EuiFlexItem>
-              <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-
-          <EuiHorizontalRule margin="xl" aria-hidden="true" />
-
-          <OverviewPageFooter
+        {solutions.length ? (
+          <SolutionsSection
             addBasePath={addBasePath}
-            path={HOME_APP_BASE_PATH}
-            onSetDefaultRoute={() => {
-              trackUiMetric(METRIC_TYPE.CLICK, 'set_home_as_default_route');
-            }}
-            onChangeDefaultRoute={() => {
-              trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
-            }}
+            solutions={solutions}
+            directories={directories}
           />
-        </div>
-      </main>
+        ) : null}
+
+        <EuiFlexGroup
+          className={`homData ${
+            addDataFeatures.length === 1 && manageDataFeatures.length === 1
+              ? 'homData--compressed'
+              : 'homData--expanded'
+          }`}
+        >
+          <EuiFlexItem>
+            <AddData addBasePath={addBasePath} features={addDataFeatures} />
+          </EuiFlexItem>
+
+          <EuiFlexItem>
+            <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+
+        <EuiHorizontalRule margin="xl" aria-hidden="true" />
+
+        <OverviewPageFooter
+          addBasePath={addBasePath}
+          path={HOME_APP_BASE_PATH}
+          onSetDefaultRoute={() => {
+            trackUiMetric(METRIC_TYPE.CLICK, 'set_home_as_default_route');
+          }}
+          onChangeDefaultRoute={() => {
+            trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
+          }}
+        />
+      </KibanaPageTemplate>
     );
   }
 
diff --git a/src/plugins/home/public/application/components/home.test.js b/src/plugins/home/public/application/components/home.test.js
index 2fe74c8778c0f..fb5ebca5275cc 100644
--- a/src/plugins/home/public/application/components/home.test.js
+++ b/src/plugins/home/public/application/components/home.test.js
@@ -25,8 +25,8 @@ jest.mock('../kibana_services', () => ({
 }));
 
 jest.mock('../../../../../../src/plugins/kibana_react/public', () => ({
+  overviewPageActions: jest.fn().mockReturnValue([]),
   OverviewPageFooter: jest.fn().mockReturnValue(<></>),
-  OverviewPageHeader: jest.fn().mockReturnValue(<></>),
 }));
 
 describe('home', () => {
diff --git a/src/plugins/kibana_overview/public/components/_overview.scss b/src/plugins/kibana_overview/public/components/_overview.scss
index 12e2d9cd921ec..89f2b6272a4b8 100644
--- a/src/plugins/kibana_overview/public/components/_overview.scss
+++ b/src/plugins/kibana_overview/public/components/_overview.scss
@@ -1,18 +1,5 @@
-@import '../../../../core/public/mixins';
-
-.kbnOverviewWrapper {
-  @include kibanaFullBodyMinHeight();
-  background-color: $euiColorEmptyShade;
-  display: flex;
-  flex-direction: column;
-}
-
-.kbnOverviewContent {
-  margin: 0 auto;
-  max-width: 1200px;
-  padding: $euiSizeXL $euiSize;
-  width: 100%;
-
+.kbnOverviewApps__item,
+.kbnOverviewMore__item {
   // Ensure card heights are stretched equally when wrapped with this element
   .kbnRedirectCrossAppLinks {
     align-items: flex-start;
@@ -109,11 +96,6 @@
   }
 }
 
-// Accounting for no `flush="both"` prop on EuiButtonEmpty
-.kbnOverviewDataAdd__actionButton {
-  margin-right: 0;
-}
-
 .kbnOverviewDataManage__item:not(:only-child) {
   @include euiBreakpoint('m', 'l', 'xl') {
     flex: 0 0 calc(50% - #{$euiSizeM * 2});
diff --git a/src/plugins/kibana_overview/public/components/add_data/__snapshots__/add_data.test.tsx.snap b/src/plugins/kibana_overview/public/components/add_data/__snapshots__/add_data.test.tsx.snap
index 25538d2eda287..fb32d2814c0fe 100644
--- a/src/plugins/kibana_overview/public/components/add_data/__snapshots__/add_data.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/add_data/__snapshots__/add_data.test.tsx.snap
@@ -32,7 +32,7 @@ exports[`AddData render 1`] = `
       <div>
         <EuiButtonEmpty
           className="kbnOverviewDataAdd__actionButton"
-          flush="left"
+          flush="both"
           href="#/tutorial_directory/sampleData"
           iconType="visTable"
           size="xs"
diff --git a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
index e43405bd13a4a..ecb38408e2c71 100644
--- a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
+++ b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
@@ -45,7 +45,7 @@ export const AddData: FC<Props> = ({ addBasePath, features }) => {
           <div>
             <EuiButtonEmpty
               className="kbnOverviewDataAdd__actionButton"
-              flush="left"
+              flush="both"
               href={addBasePath('#/tutorial_directory/sampleData')}
               iconType="visTable"
               size="xs"
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
index 374715a277ebc..b5f501eb88a01 100644
--- 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
@@ -49,7 +49,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Analyze data in dashboards."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -69,7 +69,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Search and find insights."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -89,7 +89,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Design pixel-perfect reports."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -109,7 +109,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Plot geographic data."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -129,7 +129,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Model, predict, and detect."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -149,7 +149,7 @@ exports[`GettingStarted dark mode on 1`] = `
           >
             <EuiCard
               description="Reveal patterns and relationships."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -244,7 +244,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Analyze data in dashboards."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -264,7 +264,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Search and find insights."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -284,7 +284,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Design pixel-perfect reports."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -304,7 +304,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Plot geographic data."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -324,7 +324,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Model, predict, and detect."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
@@ -344,7 +344,7 @@ exports[`GettingStarted render 1`] = `
           >
             <EuiCard
               description="Reveal patterns and relationships."
-              display="plain"
+              display="transparent"
               icon={
                 <EuiIcon
                   color="text"
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
index 069b6d033f8c3..56247c4e91fa1 100644
--- a/src/plugins/kibana_overview/public/components/getting_started/getting_started.tsx
+++ b/src/plugins/kibana_overview/public/components/getting_started/getting_started.tsx
@@ -74,7 +74,7 @@ export const GettingStarted: FC<Props> = ({ addBasePath, isDarkTheme, apps }) =>
                 <EuiFlexItem key={title}>
                   <EuiCard
                     description={subtitle}
-                    display="plain"
+                    display="transparent"
                     icon={<EuiIcon color="text" size="l" type={icon} />}
                     layout="horizontal"
                     paddingSize="none"
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 2e7dc9a7ddc60..a32e27050fad1 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
@@ -1,10 +1,234 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Overview render 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="kbnOverviewWrapper"
+<Component
+  pageHeader={
+    Object {
+      "iconType": "logoKibana",
+      "pageTitle": <FormattedMessage
+        defaultMessage="Kibana"
+        id="kibanaOverview.header.title"
+        values={Object {}}
+      />,
+      "rightSideItems": Array [],
+    }
+  }
+  template="empty"
 >
+  <section
+    aria-labelledby="kbnOverviewApps__title"
+    className="kbnOverviewApps"
+  >
+    <EuiScreenReaderOnly>
+      <h2
+        id="kbnOverviewApps__title"
+      >
+        <FormattedMessage
+          defaultMessage="Explore these apps"
+          id="kibanaOverview.apps.title"
+          values={Object {}}
+        />
+      </h2>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="kbnOverviewApps__group kbnOverviewApps__group--primary"
+      justifyContent="center"
+    />
+    <EuiSpacer
+      size="l"
+    />
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <EuiFlexGroup
+    alignItems="flexStart"
+    className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
+  >
+    <EuiFlexItem
+      grow={1}
+    >
+      <NewsFeed
+        newsFetchResult={
+          Object {
+            "error": null,
+            "feedItems": Array [
+              Object {
+                "badge": null,
+                "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "8e18fcedbc",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
+                "publishOn": "2020-08-31T10:23:47.000Z",
+                "title": "The Go client for Elasticsearch: Introduction",
+              },
+              Object {
+                "badge": null,
+                "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "fb3e3d42ef",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
+                "publishOn": "2020-08-14T10:23:47.000Z",
+                "title": "Alerting and anomaly detection for uptime and reliability",
+              },
+              Object {
+                "badge": null,
+                "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "b2fc7d47d5",
+                "linkText": "Learn more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
+                "publishOn": "2020-08-01T10:23:47.000Z",
+                "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
+              },
+            ],
+            "hasNew": true,
+            "kibanaVersion": "8.0.0",
+          }
+        }
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={3}
+    >
+      <section
+        aria-labelledby="kbnOverviewMore__title"
+        className="kbnOverviewMore"
+      >
+        <EuiTitle
+          size="s"
+        >
+          <h2
+            id="kbnOverviewMore__title"
+          >
+            <FormattedMessage
+              defaultMessage="Do more with Elastic"
+              id="kibanaOverview.more.title"
+              values={Object {}}
+            />
+          </h2>
+        </EuiTitle>
+        <EuiSpacer
+          size="m"
+        />
+        <EuiFlexGroup
+          className="kbnOverviewMore__content"
+        >
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="kibana"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution kibana"
+                description=""
+                href="kibana_landing_page"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="logoKibana"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_kibana_2x.png"
+                onClick={[Function]}
+                title="Kibana"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-2"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-2"
+                description="Description of solution two"
+                href="path-to-solution-two"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_2_2x.png"
+                onClick={[Function]}
+                title="Solution two"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-3"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-3"
+                description="Description of solution three"
+                href="path-to-solution-three"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_3_2x.png"
+                onClick={[Function]}
+                title="Solution three"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-4"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-4"
+                description="Description of solution four"
+                href="path-to-solution-four"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_4_2x.png"
+                onClick={[Function]}
+                title="Solution four"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </section>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
   <mockConstructor
     addBasePath={
       [MockFunction] {
@@ -70,311 +294,242 @@ exports[`Overview render 1`] = `
         ],
       }
     }
-    hideToolbar={false}
-    iconType="logoKibana"
-    title={
-      <FormattedMessage
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/kibana_overview"
+  />
+</Component>
+`;
+
+exports[`Overview without features 1`] = `
+<Component
+  pageHeader={
+    Object {
+      "iconType": "logoKibana",
+      "pageTitle": <FormattedMessage
         defaultMessage="Kibana"
         id="kibanaOverview.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
+  }
+  template="empty"
+>
+  <section
+    aria-labelledby="kbnOverviewApps__title"
+    className="kbnOverviewApps"
+  >
+    <EuiScreenReaderOnly>
+      <h2
+        id="kbnOverviewApps__title"
+      >
+        <FormattedMessage
+          defaultMessage="Explore these apps"
+          id="kibanaOverview.apps.title"
+          values={Object {}}
+        />
+      </h2>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="kbnOverviewApps__group kbnOverviewApps__group--primary"
+      justifyContent="center"
+    />
+    <EuiSpacer
+      size="l"
+    />
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
   />
-  <div
-    className="kbnOverviewContent"
+  <EuiFlexGroup
+    alignItems="flexStart"
+    className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
   >
-    <section
-      aria-labelledby="kbnOverviewApps__title"
-      className="kbnOverviewApps"
+    <EuiFlexItem
+      grow={1}
     >
-      <EuiScreenReaderOnly>
-        <h2
-          id="kbnOverviewApps__title"
-        >
-          <FormattedMessage
-            defaultMessage="Explore these apps"
-            id="kibanaOverview.apps.title"
-            values={Object {}}
-          />
-        </h2>
-      </EuiScreenReaderOnly>
-      <EuiFlexGroup
-        className="kbnOverviewApps__group kbnOverviewApps__group--primary"
-        justifyContent="center"
-      />
-      <EuiSpacer
-        size="l"
+      <NewsFeed
+        newsFetchResult={
+          Object {
+            "error": null,
+            "feedItems": Array [
+              Object {
+                "badge": null,
+                "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "8e18fcedbc",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
+                "publishOn": "2020-08-31T10:23:47.000Z",
+                "title": "The Go client for Elasticsearch: Introduction",
+              },
+              Object {
+                "badge": null,
+                "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "fb3e3d42ef",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
+                "publishOn": "2020-08-14T10:23:47.000Z",
+                "title": "Alerting and anomaly detection for uptime and reliability",
+              },
+              Object {
+                "badge": null,
+                "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "b2fc7d47d5",
+                "linkText": "Learn more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
+                "publishOn": "2020-08-01T10:23:47.000Z",
+                "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
+              },
+            ],
+            "hasNew": true,
+            "kibanaVersion": "8.0.0",
+          }
+        }
       />
-    </section>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <EuiFlexGroup
-      alignItems="flexStart"
-      className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={3}
     >
-      <EuiFlexItem
-        grow={1}
+      <section
+        aria-labelledby="kbnOverviewMore__title"
+        className="kbnOverviewMore"
       >
-        <NewsFeed
-          newsFetchResult={
-            Object {
-              "error": null,
-              "feedItems": Array [
-                Object {
-                  "badge": null,
-                  "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "8e18fcedbc",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
-                  "publishOn": "2020-08-31T10:23:47.000Z",
-                  "title": "The Go client for Elasticsearch: Introduction",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "fb3e3d42ef",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
-                  "publishOn": "2020-08-14T10:23:47.000Z",
-                  "title": "Alerting and anomaly detection for uptime and reliability",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "b2fc7d47d5",
-                  "linkText": "Learn more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
-                  "publishOn": "2020-08-01T10:23:47.000Z",
-                  "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
-                },
-              ],
-              "hasNew": true,
-              "kibanaVersion": "8.0.0",
-            }
-          }
+        <EuiTitle
+          size="s"
+        >
+          <h2
+            id="kbnOverviewMore__title"
+          >
+            <FormattedMessage
+              defaultMessage="Do more with Elastic"
+              id="kibanaOverview.more.title"
+              values={Object {}}
+            />
+          </h2>
+        </EuiTitle>
+        <EuiSpacer
+          size="m"
         />
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={3}
-      >
-        <section
-          aria-labelledby="kbnOverviewMore__title"
-          className="kbnOverviewMore"
+        <EuiFlexGroup
+          className="kbnOverviewMore__content"
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="kibana"
           >
-            <h2
-              id="kbnOverviewMore__title"
-            >
-              <FormattedMessage
-                defaultMessage="Do more with Elastic"
-                id="kibanaOverview.more.title"
-                values={Object {}}
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution kibana"
+                description=""
+                href="kibana_landing_page"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="logoKibana"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_kibana_2x.png"
+                onClick={[Function]}
+                title="Kibana"
+                titleElement="h3"
+                titleSize="xs"
               />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGroup
-            className="kbnOverviewMore__content"
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-2"
           >
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="kibana"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution kibana"
-                  description=""
-                  href="kibana_landing_page"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="logoKibana"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_kibana_2x.png"
-                  onClick={[Function]}
-                  title="Kibana"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-2"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-2"
-                  description="Description of solution two"
-                  href="path-to-solution-two"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_2_2x.png"
-                  onClick={[Function]}
-                  title="Solution two"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-3"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-3"
-                  description="Description of solution three"
-                  href="path-to-solution-three"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_3_2x.png"
-                  onClick={[Function]}
-                  title="Solution three"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-4"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-4"
-                  description="Description of solution four"
-                  href="path-to-solution-four"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_4_2x.png"
-                  onClick={[Function]}
-                  title="Solution four"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </section>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={
-        [MockFunction] {
-          "calls": Array [
-            Array [
-              "kibana_landing_page",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            ],
-            Array [
-              "path-to-solution-two",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            ],
-            Array [
-              "path-to-solution-three",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            ],
-            Array [
-              "path-to-solution-four",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            ],
-          ],
-          "results": Array [
-            Object {
-              "type": "return",
-              "value": "kibana_landing_page",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-two",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-three",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-four",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            },
-          ],
-        }
-      }
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/kibana_overview"
-    />
-  </div>
-</main>
-`;
-
-exports[`Overview without features 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="kbnOverviewWrapper"
->
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-2"
+                description="Description of solution two"
+                href="path-to-solution-two"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_2_2x.png"
+                onClick={[Function]}
+                title="Solution two"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-3"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-3"
+                description="Description of solution three"
+                href="path-to-solution-three"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_3_2x.png"
+                onClick={[Function]}
+                title="Solution three"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+          <EuiFlexItem
+            className="kbnOverviewMore__item"
+            key="solution-4"
+          >
+            <mockConstructor>
+              <EuiCard
+                className="kbnOverviewSolution solution-4"
+                description="Description of solution four"
+                href="path-to-solution-four"
+                icon={
+                  <EuiToken
+                    className="kbnOverviewSolution__icon"
+                    fill="light"
+                    iconType="empty"
+                    shape="circle"
+                    size="l"
+                  />
+                }
+                image="/plugins/kibanaOverview/assets/solutions_solution_4_2x.png"
+                onClick={[Function]}
+                title="Solution four"
+                titleElement="h3"
+                titleSize="xs"
+              />
+            </mockConstructor>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </section>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
   <mockConstructor
     addBasePath={
       [MockFunction] {
@@ -496,367 +651,255 @@ exports[`Overview without features 1`] = `
         ],
       }
     }
-    hideToolbar={false}
-    iconType="logoKibana"
-    title={
-      <FormattedMessage
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/kibana_overview"
+  />
+</Component>
+`;
+
+exports[`Overview without solutions 1`] = `
+<Component
+  pageHeader={
+    Object {
+      "iconType": "logoKibana",
+      "pageTitle": <FormattedMessage
         defaultMessage="Kibana"
         id="kibanaOverview.header.title"
         values={Object {}}
-      />
+      />,
+      "rightSideItems": Array [],
     }
+  }
+  template="empty"
+>
+  <section
+    aria-labelledby="kbnOverviewApps__title"
+    className="kbnOverviewApps"
+  >
+    <EuiScreenReaderOnly>
+      <h2
+        id="kbnOverviewApps__title"
+      >
+        <FormattedMessage
+          defaultMessage="Explore these apps"
+          id="kibanaOverview.apps.title"
+          values={Object {}}
+        />
+      </h2>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="kbnOverviewApps__group kbnOverviewApps__group--primary"
+      justifyContent="center"
+    />
+    <EuiSpacer
+      size="l"
+    />
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
   />
-  <div
-    className="kbnOverviewContent"
+  <EuiFlexGroup
+    alignItems="flexStart"
+    className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
   >
-    <section
-      aria-labelledby="kbnOverviewApps__title"
-      className="kbnOverviewApps"
+    <EuiFlexItem
+      grow={1}
     >
-      <EuiScreenReaderOnly>
-        <h2
-          id="kbnOverviewApps__title"
-        >
-          <FormattedMessage
-            defaultMessage="Explore these apps"
-            id="kibanaOverview.apps.title"
-            values={Object {}}
-          />
-        </h2>
-      </EuiScreenReaderOnly>
-      <EuiFlexGroup
-        className="kbnOverviewApps__group kbnOverviewApps__group--primary"
-        justifyContent="center"
-      />
-      <EuiSpacer
-        size="l"
+      <NewsFeed
+        newsFetchResult={
+          Object {
+            "error": null,
+            "feedItems": Array [
+              Object {
+                "badge": null,
+                "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "8e18fcedbc",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
+                "publishOn": "2020-08-31T10:23:47.000Z",
+                "title": "The Go client for Elasticsearch: Introduction",
+              },
+              Object {
+                "badge": null,
+                "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "fb3e3d42ef",
+                "linkText": "Read more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
+                "publishOn": "2020-08-14T10:23:47.000Z",
+                "title": "Alerting and anomaly detection for uptime and reliability",
+              },
+              Object {
+                "badge": null,
+                "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
+                "expireOn": "2050-12-31T11:59:59.000Z",
+                "hash": "b2fc7d47d5",
+                "linkText": "Learn more on the blog",
+                "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
+                "publishOn": "2020-08-01T10:23:47.000Z",
+                "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
+              },
+            ],
+            "hasNew": true,
+            "kibanaVersion": "8.0.0",
+          }
+        }
       />
-    </section>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <EuiFlexGroup
-      alignItems="flexStart"
-      className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={3}
     >
-      <EuiFlexItem
-        grow={1}
+      <EuiFlexGroup
+        className="kbnOverviewData kbnOverviewData--expanded"
       >
-        <NewsFeed
-          newsFetchResult={
-            Object {
-              "error": null,
-              "feedItems": Array [
-                Object {
-                  "badge": null,
-                  "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "8e18fcedbc",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
-                  "publishOn": "2020-08-31T10:23:47.000Z",
-                  "title": "The Go client for Elasticsearch: Introduction",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "fb3e3d42ef",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
-                  "publishOn": "2020-08-14T10:23:47.000Z",
-                  "title": "Alerting and anomaly detection for uptime and reliability",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "b2fc7d47d5",
-                  "linkText": "Learn more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
-                  "publishOn": "2020-08-01T10:23:47.000Z",
-                  "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
-                },
-              ],
-              "hasNew": true,
-              "kibanaVersion": "8.0.0",
+        <EuiFlexItem>
+          <AddData
+            addBasePath={
+              [MockFunction] {
+                "calls": Array [
+                  Array [
+                    "kibana_landing_page",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-two",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-three",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-four",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
+                  ],
+                ],
+                "results": Array [
+                  Object {
+                    "type": "return",
+                    "value": "kibana_landing_page",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-two",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-three",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-four",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
+                  },
+                ],
+              }
             }
-          }
-        />
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={3}
-      >
-        <section
-          aria-labelledby="kbnOverviewMore__title"
-          className="kbnOverviewMore"
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2
-              id="kbnOverviewMore__title"
-            >
-              <FormattedMessage
-                defaultMessage="Do more with Elastic"
-                id="kibanaOverview.more.title"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
+            features={Array []}
           />
-          <EuiFlexGroup
-            className="kbnOverviewMore__content"
-          >
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="kibana"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution kibana"
-                  description=""
-                  href="kibana_landing_page"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="logoKibana"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_kibana_2x.png"
-                  onClick={[Function]}
-                  title="Kibana"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-2"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-2"
-                  description="Description of solution two"
-                  href="path-to-solution-two"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_2_2x.png"
-                  onClick={[Function]}
-                  title="Solution two"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-3"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-3"
-                  description="Description of solution three"
-                  href="path-to-solution-three"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_3_2x.png"
-                  onClick={[Function]}
-                  title="Solution three"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-            <EuiFlexItem
-              className="kbnOverviewMore__item"
-              key="solution-4"
-            >
-              <mockConstructor>
-                <EuiCard
-                  className="kbnOverviewSolution solution-4"
-                  description="Description of solution four"
-                  href="path-to-solution-four"
-                  icon={
-                    <EuiToken
-                      className="kbnOverviewSolution__icon"
-                      fill="light"
-                      iconType="empty"
-                      shape="circle"
-                      size="l"
-                    />
-                  }
-                  image="/plugins/kibanaOverview/assets/solutions_solution_4_2x.png"
-                  onClick={[Function]}
-                  title="Solution four"
-                  titleElement="h3"
-                  titleSize="xs"
-                />
-              </mockConstructor>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </section>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={
-        [MockFunction] {
-          "calls": Array [
-            Array [
-              "kibana_landing_page",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            ],
-            Array [
-              "path-to-solution-two",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            ],
-            Array [
-              "path-to-solution-three",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            ],
-            Array [
-              "path-to-solution-four",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            ],
-            Array [
-              "kibana_landing_page",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            ],
-            Array [
-              "path-to-solution-two",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            ],
-            Array [
-              "path-to-solution-three",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            ],
-            Array [
-              "path-to-solution-four",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            ],
-          ],
-          "results": Array [
-            Object {
-              "type": "return",
-              "value": "kibana_landing_page",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-two",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-three",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-four",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "kibana_landing_page",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-two",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-three",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-four",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            },
-          ],
-        }
-      }
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/kibana_overview"
-    />
-  </div>
-</main>
-`;
-
-exports[`Overview without solutions 1`] = `
-<main
-  aria-labelledby="kbnOverviewPageHeader__title"
-  className="kbnOverviewWrapper"
->
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <ManageData
+            addBasePath={
+              [MockFunction] {
+                "calls": Array [
+                  Array [
+                    "kibana_landing_page",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-two",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-three",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
+                  ],
+                  Array [
+                    "path-to-solution-four",
+                  ],
+                  Array [
+                    "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
+                  ],
+                ],
+                "results": Array [
+                  Object {
+                    "type": "return",
+                    "value": "kibana_landing_page",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-two",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-three",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "path-to-solution-four",
+                  },
+                  Object {
+                    "type": "return",
+                    "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
+                  },
+                ],
+              }
+            }
+            features={Array []}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
   <mockConstructor
     addBasePath={
       [MockFunction] {
@@ -922,315 +965,9 @@ exports[`Overview without solutions 1`] = `
         ],
       }
     }
-    hideToolbar={false}
-    iconType="logoKibana"
-    title={
-      <FormattedMessage
-        defaultMessage="Kibana"
-        id="kibanaOverview.header.title"
-        values={Object {}}
-      />
-    }
+    onChangeDefaultRoute={[Function]}
+    onSetDefaultRoute={[Function]}
+    path="/app/kibana_overview"
   />
-  <div
-    className="kbnOverviewContent"
-  >
-    <section
-      aria-labelledby="kbnOverviewApps__title"
-      className="kbnOverviewApps"
-    >
-      <EuiScreenReaderOnly>
-        <h2
-          id="kbnOverviewApps__title"
-        >
-          <FormattedMessage
-            defaultMessage="Explore these apps"
-            id="kibanaOverview.apps.title"
-            values={Object {}}
-          />
-        </h2>
-      </EuiScreenReaderOnly>
-      <EuiFlexGroup
-        className="kbnOverviewApps__group kbnOverviewApps__group--primary"
-        justifyContent="center"
-      />
-      <EuiSpacer
-        size="l"
-      />
-    </section>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <EuiFlexGroup
-      alignItems="flexStart"
-      className="kbnOverviewSupplements kbnOverviewSupplements--hasNews"
-    >
-      <EuiFlexItem
-        grow={1}
-      >
-        <NewsFeed
-          newsFetchResult={
-            Object {
-              "error": null,
-              "feedItems": Array [
-                Object {
-                  "badge": null,
-                  "description": "The official Go client now includes features like request retries and node discovery. Learn more about its architecture and package and repository layout.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "8e18fcedbc",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/the-go-client-for-elasticsearch-introduction?blade=kibanafeed",
-                  "publishOn": "2020-08-31T10:23:47.000Z",
-                  "title": "The Go client for Elasticsearch: Introduction",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Learn how to use Elastic Uptime to configure alerting and anomaly detection for sites, services, and APIs.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "fb3e3d42ef",
-                  "linkText": "Read more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/alerting-and-anomaly-detection-for-uptime-and-reliability?blade=kibanafeed",
-                  "publishOn": "2020-08-14T10:23:47.000Z",
-                  "title": "Alerting and anomaly detection for uptime and reliability",
-                },
-                Object {
-                  "badge": null,
-                  "description": "Managing data using hot-warm architecture and ILM is a cost-effective way of retaining data — and a great way to easily keep your cloud costs down.",
-                  "expireOn": "2050-12-31T11:59:59.000Z",
-                  "hash": "b2fc7d47d5",
-                  "linkText": "Learn more on the blog",
-                  "linkUrl": "https://www.elastic.co/blog/optimizing-costs-elastic-cloud-hot-warm-index-lifecycle-management?blade=kibanafeed",
-                  "publishOn": "2020-08-01T10:23:47.000Z",
-                  "title": "Optimizing costs in Elastic Cloud: Hot-warm + index lifecycle management",
-                },
-              ],
-              "hasNew": true,
-              "kibanaVersion": "8.0.0",
-            }
-          }
-        />
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={3}
-      >
-        <EuiFlexGroup
-          className="kbnOverviewData kbnOverviewData--expanded"
-        >
-          <EuiFlexItem>
-            <AddData
-              addBasePath={
-                [MockFunction] {
-                  "calls": Array [
-                    Array [
-                      "kibana_landing_page",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-two",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-three",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-four",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-                    ],
-                  ],
-                  "results": Array [
-                    Object {
-                      "type": "return",
-                      "value": "kibana_landing_page",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-two",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-three",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-four",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-                    },
-                  ],
-                }
-              }
-              features={Array []}
-            />
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <ManageData
-              addBasePath={
-                [MockFunction] {
-                  "calls": Array [
-                    Array [
-                      "kibana_landing_page",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-two",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-three",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-                    ],
-                    Array [
-                      "path-to-solution-four",
-                    ],
-                    Array [
-                      "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-                    ],
-                  ],
-                  "results": Array [
-                    Object {
-                      "type": "return",
-                      "value": "kibana_landing_page",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-two",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-three",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "path-to-solution-four",
-                    },
-                    Object {
-                      "type": "return",
-                      "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-                    },
-                  ],
-                }
-              }
-              features={Array []}
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiHorizontalRule
-      aria-hidden="true"
-      margin="xl"
-    />
-    <mockConstructor
-      addBasePath={
-        [MockFunction] {
-          "calls": Array [
-            Array [
-              "kibana_landing_page",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            ],
-            Array [
-              "path-to-solution-two",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            ],
-            Array [
-              "path-to-solution-three",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            ],
-            Array [
-              "path-to-solution-four",
-            ],
-            Array [
-              "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            ],
-          ],
-          "results": Array [
-            Object {
-              "type": "return",
-              "value": "kibana_landing_page",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_kibana_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-two",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_2_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-three",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_3_2x.png",
-            },
-            Object {
-              "type": "return",
-              "value": "path-to-solution-four",
-            },
-            Object {
-              "type": "return",
-              "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
-            },
-          ],
-        }
-      }
-      onChangeDefaultRoute={[Function]}
-      onSetDefaultRoute={[Function]}
-      path="/app/kibana_overview"
-    />
-  </div>
-</main>
+</Component>
 `;
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 6f97b04a6fdf1..9d260469625ad 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
@@ -21,8 +21,8 @@ jest.mock('../../../../../../src/plugins/kibana_react/public', () => ({
     },
   }),
   RedirectAppLinks: jest.fn((element: JSX.Element) => element),
+  overviewPageActions: jest.fn().mockReturnValue([]),
   OverviewPageFooter: jest.fn().mockReturnValue(<></>),
-  OverviewPageHeader: jest.fn().mockReturnValue(<></>),
 }));
 
 jest.mock('../../lib/ui_metric', () => ({
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx
index 68c52b0395591..9bba923371f64 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx
@@ -23,8 +23,9 @@ import { CoreStart } from 'kibana/public';
 import {
   RedirectAppLinks,
   useKibana,
+  KibanaPageTemplate,
+  overviewPageActions,
   OverviewPageFooter,
-  OverviewPageHeader,
 } from '../../../../../../src/plugins/kibana_react/public';
 import { FetchResult } from '../../../../../../src/plugins/newsfeed/public';
 import {
@@ -116,147 +117,149 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
   const remainingApps = kibanaApps.map(({ id }) => id).filter((id) => !mainApps.includes(id));
 
   return (
-    <main aria-labelledby="kbnOverviewPageHeader__title" className="kbnOverviewWrapper">
-      <OverviewPageHeader
-        addBasePath={addBasePath}
-        hideToolbar={isNewKibanaInstance}
-        iconType="logoKibana"
-        title={<FormattedMessage defaultMessage="Kibana" id="kibanaOverview.header.title" />}
-      />
-
-      <div className="kbnOverviewContent">
-        {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>
-
-                  <EuiSpacer size="l" />
-                </>
-              ) : null}
+    <KibanaPageTemplate
+      pageHeader={{
+        iconType: 'logoKibana',
+        pageTitle: <FormattedMessage defaultMessage="Kibana" id="kibanaOverview.header.title" />,
+        rightSideItems: overviewPageActions({
+          addBasePath,
+          application,
+          hidden: isNewKibanaInstance,
+        }),
+      }}
+      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>
 
-              {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}
 
-            <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}
+            {remainingApps.length ? (
+              <EuiFlexGroup
+                className="kbnOverviewApps__group kbnOverviewApps__group--secondary"
+                justifyContent="center"
+              >
+                {remainingApps.map(renderAppCard)}
+              </EuiFlexGroup>
+            ) : null}
+          </section>
 
-              <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>
+          <EuiHorizontalRule aria-hidden="true" margin="xl" />
+
+          <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>
 
-        <EuiHorizontalRule margin="xl" aria-hidden="true" />
+                  <EuiFlexItem>
+                    <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              )}
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </>
+      )}
 
-        <OverviewPageFooter
-          addBasePath={addBasePath}
-          path={PLUGIN_PATH}
-          onSetDefaultRoute={() => {
-            trackUiMetric(METRIC_TYPE.CLICK, 'set_kibana_overview_as_default_route');
-          }}
-          onChangeDefaultRoute={() => {
-            trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
-          }}
-        />
-      </div>
-    </main>
+      <EuiHorizontalRule margin="xl" aria-hidden="true" />
+
+      <OverviewPageFooter
+        addBasePath={addBasePath}
+        path={PLUGIN_PATH}
+        onSetDefaultRoute={() => {
+          trackUiMetric(METRIC_TYPE.CLICK, 'set_kibana_overview_as_default_route');
+        }}
+        onChangeDefaultRoute={() => {
+          trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
+        }}
+      />
+    </KibanaPageTemplate>
   );
 };
diff --git a/src/plugins/kibana_react/public/overview_page/index.ts b/src/plugins/kibana_react/public/overview_page/index.ts
index cd4e9f6befc63..73b35f4d97a37 100644
--- a/src/plugins/kibana_react/public/overview_page/index.ts
+++ b/src/plugins/kibana_react/public/overview_page/index.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
+export * from './overview_page_actions';
 export * from './overview_page_footer';
-export * from './overview_page_header';
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/__snapshots__/overview_page_actions.test.tsx.snap b/src/plugins/kibana_react/public/overview_page/overview_page_actions/__snapshots__/overview_page_actions.test.tsx.snap
new file mode 100644
index 0000000000000..10910f8b87b12
--- /dev/null
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/__snapshots__/overview_page_actions.test.tsx.snap
@@ -0,0 +1,101 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`overviewPageActions all buttons 1`] = `
+Array [
+  <mockConstructor
+    application={
+      Object {
+        "capabilities": Object {
+          "navLinks": Object {
+            "dev_tools": true,
+            "management": true,
+          },
+        },
+      }
+    }
+  >
+    <EuiButtonEmpty
+      className="kbnOverviewPageHeader__actionButton"
+      data-test-subj="homeAddData"
+      flush="both"
+      href="/app/home#/tutorial_directory"
+      iconType="indexOpen"
+    >
+      Add data
+    </EuiButtonEmpty>
+  </mockConstructor>,
+  <mockConstructor
+    application={
+      Object {
+        "capabilities": Object {
+          "navLinks": Object {
+            "dev_tools": true,
+            "management": true,
+          },
+        },
+      }
+    }
+  >
+    <EuiButtonEmpty
+      className="kbnOverviewPageHeader__actionButton"
+      data-test-subj="homeManage"
+      flush="both"
+      href="/app/management"
+      iconType="gear"
+    >
+      Manage
+    </EuiButtonEmpty>
+  </mockConstructor>,
+  <mockConstructor
+    application={
+      Object {
+        "capabilities": Object {
+          "navLinks": Object {
+            "dev_tools": true,
+            "management": true,
+          },
+        },
+      }
+    }
+  >
+    <EuiButtonEmpty
+      className="kbnOverviewPageHeader__actionButton"
+      data-test-subj="homeDevTools"
+      flush="both"
+      href="/app/dev_tools#/console"
+      iconType="wrench"
+    >
+      Dev tools
+    </EuiButtonEmpty>
+  </mockConstructor>,
+]
+`;
+
+exports[`overviewPageActions no buttons 1`] = `Array []`;
+
+exports[`overviewPageActions only add data button 1`] = `
+Array [
+  <mockConstructor
+    application={
+      Object {
+        "capabilities": Object {
+          "navLinks": Object {
+            "dev_tools": true,
+            "management": true,
+          },
+        },
+      }
+    }
+  >
+    <EuiButtonEmpty
+      className="kbnOverviewPageHeader__actionButton"
+      data-test-subj="homeAddData"
+      flush="both"
+      href="/app/home#/tutorial_directory"
+      iconType="indexOpen"
+    >
+      Add data
+    </EuiButtonEmpty>
+  </mockConstructor>,
+]
+`;
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/index.ts b/src/plugins/kibana_react/public/overview_page/overview_page_actions/index.ts
similarity index 89%
rename from src/plugins/kibana_react/public/overview_page/overview_page_header/index.ts
rename to src/plugins/kibana_react/public/overview_page/overview_page_actions/index.ts
index 7017068afd460..8684d6a8ca4e4 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/index.ts
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from './overview_page_header';
+export * from './overview_page_actions';
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
new file mode 100644
index 0000000000000..f324d56196144
--- /dev/null
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
@@ -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 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 { overviewPageActions } from './overview_page_actions';
+import { ApplicationStart } from 'kibana/public';
+
+jest.mock('../../app_links', () => ({
+  RedirectAppLinks: jest.fn((element: JSX.Element) => element),
+}));
+
+afterAll(() => jest.clearAllMocks());
+
+const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
+
+const applicationStartMock = ({
+  capabilities: { navLinks: { management: true, dev_tools: true } },
+} as unknown) as ApplicationStart;
+
+describe('overviewPageActions', () => {
+  test('only add data button', () => {
+    const array = overviewPageActions({
+      addBasePath: addBasePathMock,
+      application: applicationStartMock,
+    });
+    expect(array).toMatchSnapshot();
+  });
+
+  test('all buttons', () => {
+    const array = overviewPageActions({
+      addBasePath: addBasePathMock,
+      application: applicationStartMock,
+      showDevToolsLink: true,
+      showManagementLink: true,
+    });
+    expect(array).toMatchSnapshot();
+  });
+
+  test('no buttons', () => {
+    const array = overviewPageActions({
+      addBasePath: addBasePathMock,
+      application: applicationStartMock,
+      hidden: true,
+    });
+    expect(array).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
new file mode 100644
index 0000000000000..c3f0acd059494
--- /dev/null
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
@@ -0,0 +1,88 @@
+/*
+ * 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 { EuiButtonEmpty } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { ApplicationStart } from 'kibana/public';
+import { RedirectAppLinks } from '../../app_links';
+
+interface Props {
+  addBasePath: (path: string) => string;
+  application: ApplicationStart;
+  hidden?: boolean;
+  showDevToolsLink?: boolean;
+  showManagementLink?: boolean;
+}
+
+export const overviewPageActions = ({
+  addBasePath,
+  application,
+  hidden,
+  showDevToolsLink,
+  showManagementLink,
+}: Props) => {
+  const {
+    management: isManagementEnabled,
+    dev_tools: isDevToolsEnabled,
+  } = application.capabilities.navLinks;
+
+  const actionAddData = (
+    <RedirectAppLinks application={application}>
+      <EuiButtonEmpty
+        data-test-subj="homeAddData"
+        className="kbnOverviewPageHeader__actionButton"
+        flush="both"
+        href={addBasePath('/app/home#/tutorial_directory')}
+        iconType="indexOpen"
+      >
+        {i18n.translate('kibana-react.kbnOverviewPageHeader.addDataButtonLabel', {
+          defaultMessage: 'Add data',
+        })}
+      </EuiButtonEmpty>
+    </RedirectAppLinks>
+  );
+
+  const actionStackManagement =
+    showManagementLink && isManagementEnabled ? (
+      <RedirectAppLinks application={application}>
+        <EuiButtonEmpty
+          data-test-subj="homeManage"
+          className="kbnOverviewPageHeader__actionButton"
+          flush="both"
+          iconType="gear"
+          href={addBasePath('/app/management')}
+        >
+          {i18n.translate('kibana-react.kbnOverviewPageHeader.stackManagementButtonLabel', {
+            defaultMessage: 'Manage',
+          })}
+        </EuiButtonEmpty>
+      </RedirectAppLinks>
+    ) : null;
+
+  const actionDevTools =
+    showDevToolsLink && isDevToolsEnabled ? (
+      <RedirectAppLinks application={application}>
+        <EuiButtonEmpty
+          data-test-subj="homeDevTools"
+          className="kbnOverviewPageHeader__actionButton"
+          flush="both"
+          iconType="wrench"
+          href={addBasePath('/app/dev_tools#/console')}
+        >
+          {i18n.translate('kibana-react.kbnOverviewPageHeader.devToolsButtonLabel', {
+            defaultMessage: 'Dev tools',
+          })}
+        </EuiButtonEmpty>
+      </RedirectAppLinks>
+    ) : null;
+
+  const actions = [actionAddData, actionStackManagement, actionDevTools];
+
+  return !hidden ? actions.filter((obj) => obj) : [];
+};
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap b/src/plugins/kibana_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap
deleted file mode 100644
index 61faefb600191..0000000000000
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap
+++ /dev/null
@@ -1,69 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`OverviewPageHeader render 1`] = `
-<header
-  className="kbnOverviewPageHeader kbnOverviewPageHeader--noOverlap"
->
-  <div
-    className="kbnOverviewPageHeader__inner"
-  >
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiFlexGroup
-          gutterSize="m"
-          responsive={false}
-        >
-          <EuiFlexItem>
-            <EuiTitle
-              size="m"
-            >
-              <h1
-                id="kbnOverviewPageHeader__title"
-              >
-                Page Title
-              </h1>
-            </EuiTitle>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={false}
-      >
-        <EuiFlexGroup
-          className="kbnOverviewPageHeader__actions"
-          responsive={false}
-          wrap={true}
-        >
-          <EuiFlexItem
-            className="kbnOverviewPageHeader__actionItem"
-            grow={false}
-          >
-            <mockConstructor
-              application={
-                Object {
-                  "capabilities": Object {
-                    "navLinks": Object {
-                      "dev_tools": true,
-                      "management": true,
-                    },
-                  },
-                }
-              }
-            >
-              <EuiButtonEmpty
-                className="kbnOverviewPageHeader__actionButton"
-                data-test-subj="homeAddData"
-                flush="both"
-                href="/app/home#/tutorial_directory"
-                iconType="indexOpen"
-              >
-                Add data
-              </EuiButtonEmpty>
-            </mockConstructor>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </div>
-</header>
-`;
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/_overview_page_header.scss b/src/plugins/kibana_react/public/overview_page/overview_page_header/_overview_page_header.scss
deleted file mode 100644
index 80087195e7dbd..0000000000000
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/_overview_page_header.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.kbnOverviewPageHeader {
-  background-color: $euiPageBackgroundColor;
-  border-bottom: $euiBorderWidthThin solid $euiColorLightShade;
-}
-
-.kbnOverviewPageHeader__inner {
-  margin: 0 auto;
-  max-width: 1200px;
-  padding: $euiSizeXL $euiSize;
-
-  .kbnOverviewPageHeader--hasOverlap & {
-    padding-bottom: $euiSizeXL + $euiSizeL;
-  }
-}
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/index.scss b/src/plugins/kibana_react/public/overview_page/overview_page_header/index.scss
deleted file mode 100644
index 3e8fcc537736a..0000000000000
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './overview_page_header';
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.test.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.test.tsx
deleted file mode 100644
index f339bed58bb49..0000000000000
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.test.tsx
+++ /dev/null
@@ -1,38 +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 { OverviewPageHeader } from './overview_page_header';
-import { shallowWithIntl } from '@kbn/test/jest';
-
-jest.mock('../../app_links', () => ({
-  RedirectAppLinks: jest.fn((element: JSX.Element) => element),
-}));
-
-jest.mock('../../context', () => ({
-  useKibana: jest.fn().mockReturnValue({
-    services: {
-      application: { capabilities: { navLinks: { management: true, dev_tools: true } } },
-      notifications: { toast: { addSuccess: jest.fn() } },
-    },
-  }),
-}));
-
-afterAll(() => jest.clearAllMocks());
-
-const mockTitle = 'Page Title';
-const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
-
-describe('OverviewPageHeader', () => {
-  test('render', () => {
-    const component = shallowWithIntl(
-      <OverviewPageHeader addBasePath={addBasePathMock} title={mockTitle} />
-    );
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.tsx
deleted file mode 100644
index cba1e093dedf3..0000000000000
--- a/src/plugins/kibana_react/public/overview_page/overview_page_header/overview_page_header.tsx
+++ /dev/null
@@ -1,141 +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 {
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiTitle,
-  IconType,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks } from '../../app_links';
-import { useKibana } from '../../context';
-
-import './index.scss';
-
-interface Props {
-  hideToolbar?: boolean;
-  iconType?: IconType;
-  overlap?: boolean;
-  showDevToolsLink?: boolean;
-  showManagementLink?: boolean;
-  title: JSX.Element | string;
-  addBasePath: (path: string) => string;
-}
-
-export const OverviewPageHeader: FC<Props> = ({
-  hideToolbar,
-  iconType,
-  overlap,
-  showDevToolsLink,
-  showManagementLink,
-  title,
-  addBasePath,
-}) => {
-  const {
-    services: { application },
-  } = useKibana<CoreStart>();
-
-  const {
-    management: isManagementEnabled,
-    dev_tools: isDevToolsEnabled,
-  } = application.capabilities.navLinks;
-
-  return (
-    <header
-      className={`kbnOverviewPageHeader ${
-        overlap ? 'kbnOverviewPageHeader--hasOverlap' : 'kbnOverviewPageHeader--noOverlap'
-      }`}
-    >
-      <div className="kbnOverviewPageHeader__inner">
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            <EuiFlexGroup gutterSize="m" responsive={false}>
-              {iconType && (
-                <EuiFlexItem grow={false}>
-                  <EuiIcon size="xxl" type={iconType} />
-                </EuiFlexItem>
-              )}
-
-              <EuiFlexItem>
-                <EuiTitle size="m">
-                  <h1 id="kbnOverviewPageHeader__title">{title}</h1>
-                </EuiTitle>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-
-          {!hideToolbar && (
-            <EuiFlexItem grow={false}>
-              <EuiFlexGroup className="kbnOverviewPageHeader__actions" responsive={false} wrap>
-                <EuiFlexItem className="kbnOverviewPageHeader__actionItem" grow={false}>
-                  <RedirectAppLinks application={application}>
-                    <EuiButtonEmpty
-                      data-test-subj="homeAddData"
-                      className="kbnOverviewPageHeader__actionButton"
-                      flush="both"
-                      href={addBasePath('/app/home#/tutorial_directory')}
-                      iconType="indexOpen"
-                    >
-                      {i18n.translate('kibana-react.kbnOverviewPageHeader.addDataButtonLabel', {
-                        defaultMessage: 'Add data',
-                      })}
-                    </EuiButtonEmpty>
-                  </RedirectAppLinks>
-                </EuiFlexItem>
-
-                {showManagementLink && isManagementEnabled ? (
-                  <EuiFlexItem className="kbnOverviewPageHeader__actionItem" grow={false}>
-                    <RedirectAppLinks application={application}>
-                      <EuiButtonEmpty
-                        data-test-subj="homeManage"
-                        className="kbnOverviewPageHeader__actionButton"
-                        flush="both"
-                        iconType="gear"
-                        href={addBasePath('/app/management')}
-                      >
-                        {i18n.translate(
-                          'kibana-react.kbnOverviewPageHeader.stackManagementButtonLabel',
-                          {
-                            defaultMessage: 'Manage',
-                          }
-                        )}
-                      </EuiButtonEmpty>
-                    </RedirectAppLinks>
-                  </EuiFlexItem>
-                ) : null}
-
-                {showDevToolsLink && isDevToolsEnabled ? (
-                  <EuiFlexItem className="kbnOverviewPageHeader__actionItem" grow={false}>
-                    <RedirectAppLinks application={application}>
-                      <EuiButtonEmpty
-                        data-test-subj="homeDevTools"
-                        className="kbnOverviewPageHeader__actionButton"
-                        flush="both"
-                        iconType="wrench"
-                        href={addBasePath('/app/dev_tools#/console')}
-                      >
-                        {i18n.translate('kibana-react.kbnOverviewPageHeader.devToolsButtonLabel', {
-                          defaultMessage: 'Dev tools',
-                        })}
-                      </EuiButtonEmpty>
-                    </RedirectAppLinks>
-                  </EuiFlexItem>
-                ) : null}
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-      </div>
-    </header>
-  );
-};

From 07af5d31c78be3b884e84ed3d7f7582d9da3bcf5 Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Sun, 27 Jun 2021 19:35:01 +0300
Subject: [PATCH 95/95] [Query]  Remove es query dependency on format.convert
 (#103174)

* remove es query dependency on format.convert

* fix types

* types

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../common/es_query/filters/phrases_filter.ts |  7 +--
 .../common/es_query/filters/range_filter.ts   |  5 +--
 .../search/expressions/phrase_filter.test.ts  |  1 -
 .../lib/get_display_value.test.ts             | 45 +++++++++++++++++++
 .../filter_manager/lib/get_display_value.ts   | 11 +++--
 .../filter_manager/lib/mappers/map_phrases.ts | 21 +++++++--
 6 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts

diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
index 8a79472154493..2694461fc1930 100644
--- a/src/plugins/data/common/es_query/filters/phrases_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -41,11 +41,6 @@ export const buildPhrasesFilter = (
   const type = FILTERS.PHRASES;
   const key = field.name;
 
-  const format = (f: IFieldType, value: any) =>
-    f && f.format && f.format.convert ? f.format.convert(value) : value;
-
-  const value = params.map((v: any) => format(field, v)).join(', ');
-
   let should;
   if (field.scripted) {
     should = params.map((v: any) => ({
@@ -60,7 +55,7 @@ export const buildPhrasesFilter = (
   }
 
   return {
-    meta: { index, type, key, value, params },
+    meta: { index, type, key, params },
     query: {
       bool: {
         should,
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index 7bc7a8cff7487..9f1d9a5d08926 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -84,10 +84,7 @@ export const getRangeFilterField = (filter: RangeFilter) => {
 };
 
 const formatValue = (field: IFieldType, params: any[]) =>
-  map(params, (val: any, key: string) => get(operators, key) + format(field, val)).join(' ');
-
-const format = (field: IFieldType, value: any) =>
-  field && field.format && field.format.convert ? field.format.convert(value) : value;
+  map(params, (val: any, key: string) => get(operators, key) + val).join(' ');
 
 // Creates a filter where the value for the given field is in the given range
 // params should be an object containing `lt`, `lte`, `gt`, and/or `gte`
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.test.ts b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
index 39bd907513a0d..a61cc0bfd68ab 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
@@ -32,7 +32,6 @@ describe('interpreter/functions#phraseFilter', () => {
             "something",
           ],
           "type": "phrases",
-          "value": "test, something",
         },
         "query": Object {
           "bool": Object {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
new file mode 100644
index 0000000000000..48e1007534769
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
@@ -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 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 { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
+import { getDisplayValueFromFilter } from './get_display_value';
+
+describe('getDisplayValueFromFilter', () => {
+  it('returns the value if string', () => {
+    phraseFilter.meta.value = 'abc';
+    const displayValue = getDisplayValueFromFilter(phraseFilter, [stubIndexPattern]);
+    expect(displayValue).toBe('abc');
+  });
+
+  it('returns the value if undefined', () => {
+    phraseFilter.meta.value = undefined;
+    const displayValue = getDisplayValueFromFilter(phraseFilter, [stubIndexPattern]);
+    expect(displayValue).toBe('');
+  });
+
+  it('calls the value function if proivided', () => {
+    // The type of value currently doesn't match how it's used. Refactor needed.
+    phraseFilter.meta.value = jest.fn((x) => {
+      return 'abc';
+    }) as any;
+    const displayValue = getDisplayValueFromFilter(phraseFilter, [stubIndexPattern]);
+    expect(displayValue).toBe('abc');
+    expect(phraseFilter.meta.value).toHaveBeenCalledWith(undefined);
+  });
+
+  it('calls the value function if proivided, with formatter', () => {
+    stubIndexPattern.getFormatterForField = jest.fn().mockReturnValue('banana');
+    phraseFilter.meta.value = jest.fn((x) => {
+      return x + 'abc';
+    }) as any;
+    const displayValue = getDisplayValueFromFilter(phraseFilter, [stubIndexPattern]);
+    expect(stubIndexPattern.getFormatterForField).toHaveBeenCalledTimes(1);
+    expect(phraseFilter.meta.value).toHaveBeenCalledWith('banana');
+    expect(displayValue).toBe('bananaabc');
+  });
+});
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
index 45c6167f600bc..1ccfaacb24e4b 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
@@ -28,11 +28,14 @@ function getValueFormatter(indexPattern?: IIndexPattern, key?: string) {
 }
 
 export function getDisplayValueFromFilter(filter: Filter, indexPatterns: IIndexPattern[]): string {
-  if (typeof filter.meta.value === 'function') {
+  const { key, value } = filter.meta;
+  if (typeof value === 'function') {
     const indexPattern = getIndexPatternFromFilter(filter, indexPatterns);
-    const valueFormatter: any = getValueFormatter(indexPattern, filter.meta.key);
-    return (filter.meta.value as any)(valueFormatter);
+    const valueFormatter = getValueFormatter(indexPattern, key);
+    // TODO: distinguish between FilterMeta which is serializable to mapped FilterMeta
+    // Where value can be a function.
+    return (value as any)(valueFormatter);
   } else {
-    return filter.meta.value || '';
+    return value || '';
   }
 }
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
index bfd528264b00f..5601dd66e5206 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
@@ -6,14 +6,29 @@
  * Side Public License, v 1.
  */
 
-import { Filter, isPhrasesFilter } from '../../../../../common';
+import { Filter, FilterValueFormatter, isPhrasesFilter } from '../../../../../common';
+
+const getFormattedValueFn = (params: any) => {
+  return (formatter?: FilterValueFormatter) => {
+    return params
+      .map((v: any) => {
+        return formatter ? formatter.convert(v) : v;
+      })
+      .join(', ');
+  };
+};
 
 export const mapPhrases = (filter: Filter) => {
   if (!isPhrasesFilter(filter)) {
     throw filter;
   }
 
-  const { type, key, value, params } = filter.meta;
+  const { type, key, params } = filter.meta;
 
-  return { type, key, value, params };
+  return {
+    type,
+    key,
+    value: getFormattedValueFn(params),
+    params,
+  };
 };