From b2b60ff061ad8eec2ea7b1fae351eb9888937005 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Wed, 9 Feb 2022 11:42:53 +0100
Subject: [PATCH 01/85] [Screenshotting] Fix potential race condition when
 screenshotting (#123820)

* extract message from error objects

* only warn for 400 and up status codes

* naively wait for vis ready after resizing the browser viewport

* use a single default viewport size, enable layout to set default page viewport for every page that is created

* refactor viewport -> windowSize in chromium args

* allow overriding defaults and use new windowSize arg for chromium args

* always round page dimension numbers. note: this will break if we ever have a "undefined" set as a key value

* added comment

* update snapshot to new width value

* make defaultViewport a required field on createPage

* added comment

* style: use async-await rather than .then chaining. also added a comment

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../browsers/chromium/driver_factory/args.ts  | 15 ++--
 .../chromium/driver_factory/index.test.ts     | 14 ++--
 .../browsers/chromium/driver_factory/index.ts | 18 ++++-
 .../server/layouts/create_layout.ts           | 12 +++-
 .../server/screenshots/index.test.ts          |  2 +-
 .../server/screenshots/index.ts               | 71 +++++++++++--------
 .../server/screenshots/observable.ts          | 24 +++----
 7 files changed, 97 insertions(+), 59 deletions(-)

diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/args.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/args.ts
index e5985082b3c1c..964b8298151f5 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/args.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/args.ts
@@ -7,7 +7,7 @@
 
 import type { ConfigType } from '../../../config';
 
-interface Viewport {
+interface WindowSize {
   height: number;
   width: number;
 }
@@ -16,12 +16,17 @@ type Proxy = ConfigType['browser']['chromium']['proxy'];
 
 interface LaunchArgs {
   userDataDir: string;
-  viewport?: Viewport;
+  windowSize?: WindowSize;
   disableSandbox?: boolean;
   proxy: Proxy;
 }
 
-export const args = ({ userDataDir, disableSandbox, viewport, proxy: proxyConfig }: LaunchArgs) => {
+export const args = ({
+  userDataDir,
+  disableSandbox,
+  windowSize,
+  proxy: proxyConfig,
+}: LaunchArgs) => {
   const flags = [
     // Disable built-in Google Translate service
     '--disable-translate',
@@ -50,11 +55,11 @@ export const args = ({ userDataDir, disableSandbox, viewport, proxy: proxyConfig
     `--mainFrameClipsContent=false`,
   ];
 
-  if (viewport) {
+  if (windowSize) {
     // NOTE: setting the window size does NOT set the viewport size: viewport and window size are different.
     // The viewport may later need to be resized depending on the position of the clip area.
     // These numbers come from the job parameters, so this is a close guess.
-    flags.push(`--window-size=${Math.floor(viewport.width)},${Math.floor(viewport.height)}`);
+    flags.push(`--window-size=${Math.floor(windowSize.width)},${Math.floor(windowSize.height)}`);
   }
 
   if (proxyConfig.enabled) {
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
index 7d9813928f924..bf8a1786735eb 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
@@ -11,7 +11,7 @@ import { mergeMap, take } from 'rxjs/operators';
 import type { Logger } from 'src/core/server';
 import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
 import { ConfigType } from '../../../config';
-import { HeadlessChromiumDriverFactory } from '.';
+import { HeadlessChromiumDriverFactory, DEFAULT_VIEWPORT } from '.';
 
 jest.mock('puppeteer');
 
@@ -70,7 +70,10 @@ describe('HeadlessChromiumDriverFactory', () => {
   describe('createPage', () => {
     it('returns browser driver, unexpected process exit observable, and close callback', async () => {
       await expect(
-        factory.createPage({ openUrlTimeout: 0 }).pipe(take(1)).toPromise()
+        factory
+          .createPage({ openUrlTimeout: 0, defaultViewport: DEFAULT_VIEWPORT })
+          .pipe(take(1))
+          .toPromise()
       ).resolves.toEqual(
         expect.objectContaining({
           driver: expect.anything(),
@@ -85,7 +88,10 @@ describe('HeadlessChromiumDriverFactory', () => {
         `Puppeteer Launch mock fail.`
       );
       expect(() =>
-        factory.createPage({ openUrlTimeout: 0 }).pipe(take(1)).toPromise()
+        factory
+          .createPage({ openUrlTimeout: 0, defaultViewport: DEFAULT_VIEWPORT })
+          .pipe(take(1))
+          .toPromise()
       ).rejects.toThrowErrorMatchingInlineSnapshot(
         `"Error spawning Chromium browser! Puppeteer Launch mock fail."`
       );
@@ -94,7 +100,7 @@ describe('HeadlessChromiumDriverFactory', () => {
     describe('close behaviour', () => {
       it('does not allow close to be called on the browse more than once', async () => {
         await factory
-          .createPage({ openUrlTimeout: 0 })
+          .createPage({ openUrlTimeout: 0, defaultViewport: DEFAULT_VIEWPORT })
           .pipe(
             take(1),
             mergeMap(async ({ close }) => {
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
index 787bd8fbfca99..d26d948beee16 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
@@ -7,6 +7,7 @@
 
 import { getDataPath } from '@kbn/utils';
 import { spawn } from 'child_process';
+import _ from 'lodash';
 import del from 'del';
 import fs from 'fs';
 import { uniq } from 'lodash';
@@ -36,6 +37,12 @@ import { getMetrics, PerformanceMetrics } from './metrics';
 
 interface CreatePageOptions {
   browserTimezone?: string;
+  defaultViewport: {
+    /** Size in pixels */
+    width?: number;
+    /** Size in pixels */
+    height?: number;
+  };
   openUrlTimeout: number;
 }
 
@@ -110,7 +117,7 @@ export class HeadlessChromiumDriverFactory {
       userDataDir: this.userDataDir,
       disableSandbox: this.config.browser.chromium.disableSandbox,
       proxy: this.config.browser.chromium.proxy,
-      viewport: DEFAULT_VIEWPORT,
+      windowSize: DEFAULT_VIEWPORT, // Approximate the default viewport size
     });
   }
 
@@ -118,7 +125,7 @@ export class HeadlessChromiumDriverFactory {
    * Return an observable to objects which will drive screenshot capture for a page
    */
   createPage(
-    { browserTimezone, openUrlTimeout }: CreatePageOptions,
+    { browserTimezone, openUrlTimeout, defaultViewport }: CreatePageOptions,
     pLogger = this.logger
   ): Rx.Observable<CreatePageResult> {
     // FIXME: 'create' is deprecated
@@ -139,6 +146,13 @@ export class HeadlessChromiumDriverFactory {
           ignoreHTTPSErrors: true,
           handleSIGHUP: false,
           args: chromiumArgs,
+
+          // We optionally set this at page creation to reduce the chances of
+          // browser reflow. In most cases only the height needs to be adjusted
+          // before taking a screenshot.
+          // NOTE: _.defaults assigns to the target object, so we copy it.
+          // NOTE NOTE: _.defaults is not the same as { ...DEFAULT_VIEWPORT, ...defaultViewport }
+          defaultViewport: _.defaults({ ...defaultViewport }, DEFAULT_VIEWPORT),
           env: {
             TZ: browserTimezone,
           },
diff --git a/x-pack/plugins/screenshotting/server/layouts/create_layout.ts b/x-pack/plugins/screenshotting/server/layouts/create_layout.ts
index 29a34a07e696f..fa4b3a40e2c79 100644
--- a/x-pack/plugins/screenshotting/server/layouts/create_layout.ts
+++ b/x-pack/plugins/screenshotting/server/layouts/create_layout.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { map as mapRecord } from 'fp-ts/lib/Record';
 import type { LayoutParams } from '../../common/layout';
 import { LayoutTypes } from '../../common';
 import type { Layout } from '.';
@@ -12,13 +13,20 @@ import { CanvasLayout } from './canvas_layout';
 import { PreserveLayout } from './preserve_layout';
 import { PrintLayout } from './print_layout';
 
+/**
+ * We naively round all numeric values in the object, this will break screenshotting
+ * if ever a have a non-number set as a value, but this points to an issue
+ * in the code responsible for creating the dimensions object.
+ */
+const roundNumbers = mapRecord(Math.round);
+
 export function createLayout({ id, dimensions, selectors, ...config }: LayoutParams): Layout {
   if (dimensions && id === LayoutTypes.PRESERVE_LAYOUT) {
-    return new PreserveLayout(dimensions, selectors);
+    return new PreserveLayout(roundNumbers(dimensions), selectors);
   }
 
   if (dimensions && id === LayoutTypes.CANVAS) {
-    return new CanvasLayout(dimensions);
+    return new CanvasLayout(roundNumbers(dimensions));
   }
 
   // layoutParams is optional as PrintLayout doesn't use it
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
index c49f2289ba959..858e1ae9d6093 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
@@ -376,7 +376,7 @@ describe('Screenshot Observable Pipeline', () => {
                     "height": 1200,
                     "left": 0,
                     "top": 0,
-                    "width": 1800,
+                    "width": 1950,
                   },
                   "scroll": Object {
                     "x": 0,
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.ts b/x-pack/plugins/screenshotting/server/screenshots/index.ts
index 363d59ccca950..d7332217e78a5 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.ts
@@ -68,38 +68,47 @@ export function getScreenshots(
     timeouts: { openUrl: openUrlTimeout },
   } = options;
 
-  return browserDriverFactory.createPage({ browserTimezone, openUrlTimeout }, logger).pipe(
-    mergeMap(({ driver, unexpectedExit$, metrics$, close }) => {
-      apmCreatePage?.end();
-      metrics$.subscribe(({ cpu, memory }) => {
-        apmTrans?.setLabel('cpu', cpu, false);
-        apmTrans?.setLabel('memory', memory, false);
-      });
-      unexpectedExit$.subscribe({ error: () => apmTrans?.end() });
+  return browserDriverFactory
+    .createPage(
+      {
+        browserTimezone,
+        openUrlTimeout,
+        defaultViewport: { height: layout.height, width: layout.width },
+      },
+      logger
+    )
+    .pipe(
+      mergeMap(({ driver, unexpectedExit$, metrics$, close }) => {
+        apmCreatePage?.end();
+        metrics$.subscribe(({ cpu, memory }) => {
+          apmTrans?.setLabel('cpu', cpu, false);
+          apmTrans?.setLabel('memory', memory, false);
+        });
+        unexpectedExit$.subscribe({ error: () => apmTrans?.end() });
 
-      const screen = new ScreenshotObservableHandler(driver, logger, layout, options);
+        const screen = new ScreenshotObservableHandler(driver, logger, layout, options);
 
-      return from(options.urls).pipe(
-        concatMap((url, index) =>
-          screen.setupPage(index, url, apmTrans).pipe(
-            catchError((error) => {
-              screen.checkPageIsOpen(); // this fails the job if the browser has closed
+        return from(options.urls).pipe(
+          concatMap((url, index) =>
+            screen.setupPage(index, url, apmTrans).pipe(
+              catchError((error) => {
+                screen.checkPageIsOpen(); // this fails the job if the browser has closed
 
-              logger.error(error);
-              return of({ ...DEFAULT_SETUP_RESULT, error }); // allow failover screenshot capture
-            }),
-            takeUntil(unexpectedExit$),
-            screen.getScreenshots()
-          )
-        ),
-        take(options.urls.length),
-        toArray(),
-        mergeMap((results) => {
-          // At this point we no longer need the page, close it.
-          return close().pipe(mapTo({ layout, metrics$, results }));
-        })
-      );
-    }),
-    first()
-  );
+                logger.error(error);
+                return of({ ...DEFAULT_SETUP_RESULT, error }); // allow failover screenshot capture
+              }),
+              takeUntil(unexpectedExit$),
+              screen.getScreenshots()
+            )
+          ),
+          take(options.urls.length),
+          toArray(),
+          mergeMap((results) => {
+            // At this point we no longer need the page, close it.
+            return close().pipe(mapTo({ layout, metrics$, results }));
+          })
+        );
+      }),
+      first()
+    );
 }
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
index b77180a9399b1..a238af5bcc25b 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
@@ -11,7 +11,7 @@ import { catchError, mergeMap, switchMapTo, timeoutWith } from 'rxjs/operators';
 import type { Logger } from 'src/core/server';
 import type { Layout as ScreenshotModeLayout } from 'src/plugins/screenshot_mode/common';
 import type { ConditionalHeaders, HeadlessChromiumDriver } from '../browsers';
-import { getChromiumDisconnectedError } from '../browsers';
+import { getChromiumDisconnectedError, DEFAULT_VIEWPORT } from '../browsers';
 import type { Layout } from '../layouts';
 import type { ElementsPositionAndAttribute } from './get_element_position_data';
 import { getElementPositionAndAttributes } from './get_element_position_data';
@@ -107,12 +107,9 @@ interface PageSetupResults {
   error?: Error;
 }
 
-const DEFAULT_SCREENSHOT_CLIP_HEIGHT = 1200;
-const DEFAULT_SCREENSHOT_CLIP_WIDTH = 1800;
-
 const getDefaultElementPosition = (dimensions: { height?: number; width?: number } | null) => {
-  const height = dimensions?.height || DEFAULT_SCREENSHOT_CLIP_HEIGHT;
-  const width = dimensions?.width || DEFAULT_SCREENSHOT_CLIP_WIDTH;
+  const height = dimensions?.height || DEFAULT_VIEWPORT.height;
+  const width = dimensions?.width || DEFAULT_VIEWPORT.width;
 
   return [
     {
@@ -130,8 +127,7 @@ const getDefaultElementPosition = (dimensions: { height?: number; width?: number
  * provided by the browser.
  */
 const getDefaultViewPort = () => ({
-  height: DEFAULT_SCREENSHOT_CLIP_HEIGHT,
-  width: DEFAULT_SCREENSHOT_CLIP_WIDTH,
+  ...DEFAULT_VIEWPORT,
   zoom: 1,
 });
 
@@ -180,14 +176,14 @@ export class ScreenshotObservableHandler {
     const waitTimeout = this.options.timeouts.waitForElements;
 
     return defer(() => getNumberOfItems(driver, this.logger, waitTimeout, this.layout)).pipe(
-      mergeMap((itemsCount) => {
-        // set the viewport to the dimentions from the job, to allow elements to flow into the expected layout
+      mergeMap(async (itemsCount) => {
+        // set the viewport to the dimensions from the job, to allow elements to flow into the expected layout
         const viewport = this.layout.getViewport(itemsCount) || getDefaultViewPort();
 
-        return forkJoin([
-          driver.setViewport(viewport, this.logger),
-          waitForVisualizations(driver, this.logger, waitTimeout, itemsCount, this.layout),
-        ]);
+        // Set the viewport allowing time for the browser to handle reflow and redraw
+        // before checking for readiness of visualizations.
+        await driver.setViewport(viewport, this.logger);
+        await waitForVisualizations(driver, this.logger, waitTimeout, itemsCount, this.layout);
       }),
       this.waitUntil(waitTimeout, 'wait for elements')
     );

From ceb14e68429db6d3bb7ef8336b936f35084f1db7 Mon Sep 17 00:00:00 2001
From: Cristina Amico <criamico@users.noreply.github.com>
Date: Wed, 9 Feb 2022 12:33:39 +0100
Subject: [PATCH 02/85] [Fleet] Test new privileges system via cypress
 (#124797)

* Tests new roles introduced with superuser removal

* Use login and roles utilities from security-solution cypress library

* Add some more tests

* expand tests

* Fix failing test

* Fix linter check
---
 .../cypress/integration/fleet_startup.spec.ts |  50 +--
 .../integration/integrations_mock.spec.ts     |   3 +-
 .../integration/integrations_real.spec.ts     |   3 +-
 ...ileges_fleet_all_integrations_none.spec.ts |  42 +++
 ...ileges_fleet_all_integrations_read.spec.ts |  88 +++++
 ...ileges_fleet_none_integrations_all.spec.ts |  40 ++
 x-pack/plugins/fleet/cypress/screens/fleet.ts |  11 +
 .../fleet/cypress/screens/integrations.ts     |   2 +
 .../fleet/cypress/screens/navigation.ts       |   3 +-
 x-pack/plugins/fleet/cypress/tasks/fleet.ts   |  59 +++
 x-pack/plugins/fleet/cypress/tasks/login.ts   | 341 ++++++++++++++++++
 .../plugins/fleet/cypress/tasks/navigation.ts |  13 +-
 .../plugins/fleet/cypress/tasks/privileges.ts | 232 ++++++++++++
 .../fleet/public/applications/fleet/app.tsx   |   4 +-
 .../package_policies_table.tsx                |   1 +
 .../fleet_server_missing_privileges.tsx       |   4 +-
 .../package_policy_actions_menu.tsx           |   4 +
 17 files changed, 847 insertions(+), 53 deletions(-)
 create mode 100644 x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_none.spec.ts
 create mode 100644 x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_read.spec.ts
 create mode 100644 x-pack/plugins/fleet/cypress/integration/privileges_fleet_none_integrations_all.spec.ts
 create mode 100644 x-pack/plugins/fleet/cypress/tasks/fleet.ts
 create mode 100644 x-pack/plugins/fleet/cypress/tasks/login.ts
 create mode 100644 x-pack/plugins/fleet/cypress/tasks/privileges.ts

diff --git a/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts b/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts
index 83423d62e2a43..5c14ee1df6d4e 100644
--- a/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts
+++ b/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts
@@ -5,47 +5,17 @@
  * 2.0.
  */
 
-import { AGENTS_TAB, AGENT_POLICIES_TAB, ENROLLMENT_TOKENS_TAB } from '../screens/fleet';
+import {
+  AGENTS_TAB,
+  ADD_AGENT_BUTTON_TOP,
+  AGENT_FLYOUT_CLOSE_BUTTON,
+  STANDALONE_TAB,
+} from '../screens/fleet';
 import { cleanupAgentPolicies, unenrollAgent } from '../tasks/cleanup';
+import { verifyPolicy, verifyAgentPackage, navigateToTab } from '../tasks/fleet';
 import { FLEET, navigateTo } from '../tasks/navigation';
 
 describe('Fleet startup', () => {
-  function navigateToTab(tab: string) {
-    cy.getBySel(tab).click();
-    cy.get('.euiBasicTable-loading').should('not.exist');
-  }
-
-  function navigateToAgentPolicy(name: string) {
-    cy.get('.euiLink').contains(name).click();
-    cy.get('.euiLoadingSpinner').should('not.exist');
-  }
-
-  function navigateToEnrollmentTokens() {
-    cy.getBySel(ENROLLMENT_TOKENS_TAB).click();
-    cy.get('.euiBasicTable-loading').should('not.exist');
-    cy.get('.euiButtonIcon--danger'); // wait for trash icon
-  }
-
-  function verifyPolicy(name: string, integrations: string[]) {
-    navigateToTab(AGENT_POLICIES_TAB);
-
-    navigateToAgentPolicy(name);
-    integrations.forEach((integration) => {
-      cy.get('.euiLink').contains(integration);
-    });
-
-    cy.get('.euiButtonEmpty').contains('View all agent policies').click();
-
-    navigateToEnrollmentTokens();
-
-    cy.get('.euiTableCellContent').contains(name);
-  }
-
-  function verifyAgentPackage() {
-    cy.visit('/app/integrations/installed');
-    cy.getBySel('integration-card:epr:elastic_agent');
-  }
-
   // skipping Fleet Server enroll, to enable, comment out runner.ts line 23
   describe.skip('Fleet Server', () => {
     it('should display Add agent button and Healthy agent once Fleet Agent page loaded', () => {
@@ -77,8 +47,8 @@ describe('Fleet startup', () => {
     });
 
     it('should create agent policy', () => {
-      cy.getBySel('addAgentBtnTop').click();
-      cy.getBySel('standaloneTab').click();
+      cy.getBySel(ADD_AGENT_BUTTON_TOP).click();
+      cy.getBySel(STANDALONE_TAB).click();
 
       cy.intercept('POST', '/api/fleet/agent_policies?sys_monitoring=true').as('createAgentPolicy');
 
@@ -97,7 +67,7 @@ describe('Fleet startup', () => {
         // verify agent.yml code block has new policy id
         cy.get('.euiCodeBlock__code').contains(`id: ${agentPolicyId}`);
 
-        cy.getBySel('euiFlyoutCloseButton').click();
+        cy.getBySel(AGENT_FLYOUT_CLOSE_BUTTON).click();
 
         // verify policy is created and has system package
         verifyPolicy('Agent policy 1', ['System']);
diff --git a/x-pack/plugins/fleet/cypress/integration/integrations_mock.spec.ts b/x-pack/plugins/fleet/cypress/integration/integrations_mock.spec.ts
index 080b01458e18f..1b969e1a8ca2e 100644
--- a/x-pack/plugins/fleet/cypress/integration/integrations_mock.spec.ts
+++ b/x-pack/plugins/fleet/cypress/integration/integrations_mock.spec.ts
@@ -7,6 +7,7 @@
 
 import { navigateTo } from '../tasks/navigation';
 import { UPDATE_PACKAGE_BTN } from '../screens/integrations';
+import { AGENT_POLICY_SAVE_INTEGRATION } from '../screens/fleet';
 
 describe('Add Integration - Mock API', () => {
   describe('upgrade package and upgrade package policy', () => {
@@ -141,7 +142,7 @@ describe('Add Integration - Mock API', () => {
       );
 
       cy.getBySel('toastCloseButton').click();
-      cy.getBySel('saveIntegration').click();
+      cy.getBySel(AGENT_POLICY_SAVE_INTEGRATION).click();
 
       cy.wait('@updateApachePolicy').then((interception) => {
         expect(interception.request.body.package.version).to.equal(newVersion);
diff --git a/x-pack/plugins/fleet/cypress/integration/integrations_real.spec.ts b/x-pack/plugins/fleet/cypress/integration/integrations_real.spec.ts
index ffb0f14c97a7f..e06b3d3ed5670 100644
--- a/x-pack/plugins/fleet/cypress/integration/integrations_real.spec.ts
+++ b/x-pack/plugins/fleet/cypress/integration/integrations_real.spec.ts
@@ -24,6 +24,7 @@ import {
   SETTINGS_TAB,
   UPDATE_PACKAGE_BTN,
 } from '../screens/integrations';
+import { ADD_PACKAGE_POLICY_BTN } from '../screens/fleet';
 import { cleanupAgentPolicies } from '../tasks/cleanup';
 
 describe('Add Integration - Real API', () => {
@@ -75,7 +76,7 @@ describe('Add Integration - Real API', () => {
 
       cy.visit(`/app/fleet/policies/${agentPolicyId}`);
       cy.intercept('GET', '/api/fleet/epm/packages?*').as('packages');
-      cy.getBySel('addPackagePolicyButton').click();
+      cy.getBySel(ADD_PACKAGE_POLICY_BTN).click();
       cy.wait('@packages');
       cy.get('.euiLoadingSpinner').should('not.exist');
       cy.get('input[placeholder="Search for integrations"]').type('Apache');
diff --git a/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_none.spec.ts b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_none.spec.ts
new file mode 100644
index 0000000000000..f9ae802d3b426
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_none.spec.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FLEET } from '../tasks/navigation';
+import {
+  createUsersAndRoles,
+  FleetAllIntegrNoneRole,
+  FleetAllIntegrNoneUser,
+  deleteUsersAndRoles,
+} from '../tasks/privileges';
+import { loginWithUserAndWaitForPage, logout } from '../tasks/login';
+
+import { MISSING_PRIVILEGES_TITLE, MISSING_PRIVILEGES_MESSAGE } from '../screens/fleet';
+const rolesToCreate = [FleetAllIntegrNoneRole];
+const usersToCreate = [FleetAllIntegrNoneUser];
+
+describe('When the user has All privilege for Fleet but None for integrations', () => {
+  before(() => {
+    createUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  afterEach(() => {
+    logout();
+  });
+
+  after(() => {
+    deleteUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  it('Fleet access is blocked with a callout', () => {
+    loginWithUserAndWaitForPage(FLEET, FleetAllIntegrNoneUser);
+    cy.getBySel(MISSING_PRIVILEGES_TITLE).should('have.text', 'Permission denied');
+    cy.getBySel(MISSING_PRIVILEGES_MESSAGE).should(
+      'contain',
+      'You are not authorized to access Fleet.'
+    );
+  });
+});
diff --git a/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_read.spec.ts b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_read.spec.ts
new file mode 100644
index 0000000000000..327ba39e65377
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_all_integrations_read.spec.ts
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FLEET, INTEGRATIONS, navigateTo } from '../tasks/navigation';
+import {
+  createUsersAndRoles,
+  FleetAllIntegrReadRole,
+  FleetAllIntegrReadUser,
+  deleteUsersAndRoles,
+} from '../tasks/privileges';
+import { loginWithUserAndWaitForPage, logout } from '../tasks/login';
+import { navigateToTab, createAgentPolicy } from '../tasks/fleet';
+import { cleanupAgentPolicies, unenrollAgent } from '../tasks/cleanup';
+
+import {
+  FLEET_SERVER_MISSING_PRIVILEGES_TITLE,
+  FLEET_SERVER_MISSING_PRIVILEGES_MESSAGE,
+  ADD_AGENT_BUTTON_TOP,
+  AGENT_POLICIES_TAB,
+  AGENT_POLICY_SAVE_INTEGRATION,
+  ADD_PACKAGE_POLICY_BTN,
+} from '../screens/fleet';
+import { ADD_POLICY_BTN, AGENT_POLICY_NAME_LINK } from '../screens/integrations';
+
+const rolesToCreate = [FleetAllIntegrReadRole];
+const usersToCreate = [FleetAllIntegrReadUser];
+
+describe('When the user has All privilege for Fleet but Read for integrations', () => {
+  before(() => {
+    createUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  after(() => {
+    deleteUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  afterEach(() => {
+    logout();
+  });
+
+  describe('When there are agent policies', () => {
+    before(() => {
+      navigateTo(FLEET);
+      createAgentPolicy();
+    });
+
+    it('Some elements in the UI are not enabled', () => {
+      logout();
+      loginWithUserAndWaitForPage(FLEET, FleetAllIntegrReadUser);
+      navigateToTab(AGENT_POLICIES_TAB);
+
+      cy.getBySel(AGENT_POLICY_NAME_LINK).click();
+      cy.getBySel(ADD_PACKAGE_POLICY_BTN).should('be.disabled');
+
+      cy.get('a[title="system-1"]').click();
+      cy.getBySel(AGENT_POLICY_SAVE_INTEGRATION).should('be.disabled');
+    });
+
+    after(() => {
+      unenrollAgent();
+      cleanupAgentPolicies();
+    });
+  });
+
+  describe('When there are no agent policies', () => {
+    it('If fleet server is not set up, Fleet shows a callout', () => {
+      loginWithUserAndWaitForPage(FLEET, FleetAllIntegrReadUser);
+      cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES_TITLE).should('have.text', 'Permission denied');
+      cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES_MESSAGE).should(
+        'contain',
+        'Fleet Server needs to be set up.'
+      );
+      cy.getBySel(ADD_AGENT_BUTTON_TOP).should('not.be.disabled');
+    });
+  });
+
+  describe('Integrations', () => {
+    it('are visible but cannot be added', () => {
+      loginWithUserAndWaitForPage(INTEGRATIONS, FleetAllIntegrReadUser);
+      cy.getBySel('integration-card:epr:apache').click();
+      cy.getBySel(ADD_POLICY_BTN).should('be.disabled');
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/cypress/integration/privileges_fleet_none_integrations_all.spec.ts b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_none_integrations_all.spec.ts
new file mode 100644
index 0000000000000..68fcecb76de21
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/integration/privileges_fleet_none_integrations_all.spec.ts
@@ -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 { INTEGRATIONS } from '../tasks/navigation';
+import {
+  createUsersAndRoles,
+  FleetNoneIntegrAllRole,
+  FleetNoneIntegrAllUser,
+  deleteUsersAndRoles,
+} from '../tasks/privileges';
+import { loginWithUserAndWaitForPage, logout } from '../tasks/login';
+
+import { ADD_POLICY_BTN } from '../screens/integrations';
+
+const rolesToCreate = [FleetNoneIntegrAllRole];
+const usersToCreate = [FleetNoneIntegrAllUser];
+
+describe('When the user has All privileges for Integrations but None for for Fleet', () => {
+  before(() => {
+    createUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  afterEach(() => {
+    logout();
+  });
+
+  after(() => {
+    deleteUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  it('Integrations are visible but cannot be added', () => {
+    loginWithUserAndWaitForPage(INTEGRATIONS, FleetNoneIntegrAllUser);
+    cy.getBySel('integration-card:epr:apache').click();
+    cy.getBySel(ADD_POLICY_BTN).should('be.disabled');
+  });
+});
diff --git a/x-pack/plugins/fleet/cypress/screens/fleet.ts b/x-pack/plugins/fleet/cypress/screens/fleet.ts
index 4c0bb7cea161e..32ecdc4f5da71 100644
--- a/x-pack/plugins/fleet/cypress/screens/fleet.ts
+++ b/x-pack/plugins/fleet/cypress/screens/fleet.ts
@@ -6,8 +6,19 @@
  */
 
 export const ADD_AGENT_BUTTON = 'addAgentButton';
+export const ADD_AGENT_BUTTON_TOP = 'addAgentBtnTop';
+export const CREATE_POLICY_BUTTON = 'createPolicyBtn';
+export const AGENT_FLYOUT_CLOSE_BUTTON = 'euiFlyoutCloseButton';
 
 export const AGENTS_TAB = 'fleet-agents-tab';
 export const AGENT_POLICIES_TAB = 'fleet-agent-policies-tab';
 export const ENROLLMENT_TOKENS_TAB = 'fleet-enrollment-tokens-tab';
 export const SETTINGS_TAB = 'fleet-settings-tab';
+export const STANDALONE_TAB = 'standaloneTab';
+export const MISSING_PRIVILEGES_TITLE = 'missingPrivilegesPromptTitle';
+export const MISSING_PRIVILEGES_MESSAGE = 'missingPrivilegesPromptMessage';
+export const FLEET_SERVER_MISSING_PRIVILEGES_MESSAGE = 'fleetServerMissingPrivilegesMessage';
+export const FLEET_SERVER_MISSING_PRIVILEGES_TITLE = 'fleetServerMissingPrivilegesTitle';
+export const AGENT_POLICY_SAVE_INTEGRATION = 'saveIntegration';
+export const PACKAGE_POLICY_TABLE_LINK = 'PackagePoliciesTableLink';
+export const ADD_PACKAGE_POLICY_BTN = 'addPackagePolicyButton';
diff --git a/x-pack/plugins/fleet/cypress/screens/integrations.ts b/x-pack/plugins/fleet/cypress/screens/integrations.ts
index 3c980723cc4df..dddede9e77f8d 100644
--- a/x-pack/plugins/fleet/cypress/screens/integrations.ts
+++ b/x-pack/plugins/fleet/cypress/screens/integrations.ts
@@ -11,6 +11,7 @@ export const INTEGRATIONS_CARD = '.euiCard__titleAnchor';
 
 export const INTEGRATION_NAME_LINK = 'integrationNameLink';
 export const AGENT_POLICY_NAME_LINK = 'agentPolicyNameLink';
+export const AGENT_ACTIONS_BTN = 'agentActionsBtn';
 
 export const CONFIRM_MODAL_BTN = 'confirmModalConfirmButton';
 export const CONFIRM_MODAL_BTN_SEL = `[data-test-subj=${CONFIRM_MODAL_BTN}]`;
@@ -19,6 +20,7 @@ export const FLYOUT_CLOSE_BTN_SEL = '[data-test-subj="euiFlyoutCloseButton"]';
 
 export const SETTINGS_TAB = 'tab-settings';
 export const POLICIES_TAB = 'tab-policies';
+export const ADVANCED_TAB = 'tab-custom';
 
 export const UPDATE_PACKAGE_BTN = 'updatePackageBtn';
 export const LATEST_VERSION = 'latestVersion';
diff --git a/x-pack/plugins/fleet/cypress/screens/navigation.ts b/x-pack/plugins/fleet/cypress/screens/navigation.ts
index fee38161b6b2b..76b73711db495 100644
--- a/x-pack/plugins/fleet/cypress/screens/navigation.ts
+++ b/x-pack/plugins/fleet/cypress/screens/navigation.ts
@@ -5,4 +5,5 @@
  * 2.0.
  */
 
-export const TOGGLE_NAVIGATION_BTN = '[data-test-subj="toggleNavButton"]';
+export const TOGGLE_NAVIGATION_BTN = 'toggleNavButton';
+export const NAV_APP_LINK = 'collapsibleNavAppLink';
diff --git a/x-pack/plugins/fleet/cypress/tasks/fleet.ts b/x-pack/plugins/fleet/cypress/tasks/fleet.ts
new file mode 100644
index 0000000000000..304ab7445d4e4
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/tasks/fleet.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 {
+  AGENT_POLICIES_TAB,
+  ENROLLMENT_TOKENS_TAB,
+  ADD_AGENT_BUTTON_TOP,
+  CREATE_POLICY_BUTTON,
+  AGENT_FLYOUT_CLOSE_BUTTON,
+  STANDALONE_TAB,
+} from '../screens/fleet';
+
+export function createAgentPolicy() {
+  cy.getBySel(ADD_AGENT_BUTTON_TOP).click();
+  cy.getBySel(STANDALONE_TAB).click();
+  cy.getBySel(CREATE_POLICY_BUTTON).click();
+  cy.getBySel('agentPolicyCreateStatusCallOut').contains('Agent policy created');
+  cy.getBySel(AGENT_FLYOUT_CLOSE_BUTTON).click();
+}
+
+export function navigateToTab(tab: string) {
+  cy.getBySel(tab).click();
+  cy.get('.euiBasicTable-loading').should('not.exist');
+}
+
+export function navigateToAgentPolicy(name: string) {
+  cy.get('.euiLink').contains(name).click();
+  cy.get('.euiLoadingSpinner').should('not.exist');
+}
+
+export function navigateToEnrollmentTokens() {
+  cy.getBySel(ENROLLMENT_TOKENS_TAB).click();
+  cy.get('.euiBasicTable-loading').should('not.exist');
+  cy.get('.euiButtonIcon--danger'); // wait for trash icon
+}
+
+export function verifyPolicy(name: string, integrations: string[]) {
+  navigateToTab(AGENT_POLICIES_TAB);
+
+  navigateToAgentPolicy(name);
+  integrations.forEach((integration) => {
+    cy.get('.euiLink').contains(integration);
+  });
+
+  cy.get('.euiButtonEmpty').contains('View all agent policies').click();
+
+  navigateToEnrollmentTokens();
+
+  cy.get('.euiTableCellContent').contains(name);
+}
+
+export function verifyAgentPackage() {
+  cy.visit('/app/integrations/installed');
+  cy.getBySel('integration-card:epr:elastic_agent');
+}
diff --git a/x-pack/plugins/fleet/cypress/tasks/login.ts b/x-pack/plugins/fleet/cypress/tasks/login.ts
new file mode 100644
index 0000000000000..2df7b88f1607b
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/tasks/login.ts
@@ -0,0 +1,341 @@
+/*
+ * 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 Url from 'url';
+import type { UrlObject } from 'url';
+
+import * as yaml from 'js-yaml';
+
+import type { ROLES } from './privileges';
+import { hostDetailsUrl, LOGOUT_URL } from './navigation';
+
+/**
+ * Credentials in the `kibana.dev.yml` config file will be used to authenticate
+ * with Kibana when credentials are not provided via environment variables
+ */
+const KIBANA_DEV_YML_PATH = '../../../config/kibana.dev.yml';
+
+/**
+ * The configuration path in `kibana.dev.yml` to the username to be used when
+ * authenticating with Kibana.
+ */
+const ELASTICSEARCH_USERNAME_CONFIG_PATH = 'config.elasticsearch.username';
+
+/**
+ * The configuration path in `kibana.dev.yml` to the password to be used when
+ * authenticating with Kibana.
+ */
+const ELASTICSEARCH_PASSWORD_CONFIG_PATH = 'config.elasticsearch.password';
+
+/**
+ * The `CYPRESS_ELASTICSEARCH_USERNAME` environment variable specifies the
+ * username to be used when authenticating with Kibana
+ */
+const ELASTICSEARCH_USERNAME = 'ELASTICSEARCH_USERNAME';
+
+/**
+ * The `CYPRESS_ELASTICSEARCH_PASSWORD` environment variable specifies the
+ * username to be used when authenticating with Kibana
+ */
+const ELASTICSEARCH_PASSWORD = 'ELASTICSEARCH_PASSWORD';
+
+/**
+ * The Kibana server endpoint used for authentication
+ */
+const LOGIN_API_ENDPOINT = '/internal/security/login';
+
+/**
+ * cy.visit will default to the baseUrl which uses the default kibana test user
+ * This function will override that functionality in cy.visit by building the baseUrl
+ * directly from the environment variables set up in x-pack/test/security_solution_cypress/runner.ts
+ *
+ * @param role string role/user to log in with
+ * @param route string route to visit
+ */
+export const getUrlWithRoute = (role: ROLES, route: string) => {
+  const url = Cypress.config().baseUrl;
+  const kibana = new URL(String(url));
+  const theUrl = `${Url.format({
+    auth: `${role}:changeme`,
+    username: role,
+    password: 'changeme',
+    protocol: kibana.protocol.replace(':', ''),
+    hostname: kibana.hostname,
+    port: kibana.port,
+  } as UrlObject)}${route.startsWith('/') ? '' : '/'}${route}`;
+  cy.log(`origin: ${theUrl}`);
+  return theUrl;
+};
+
+interface User {
+  username: string;
+  password: string;
+}
+
+/**
+ * Builds a URL with basic auth using the passed in user.
+ *
+ * @param user the user information to build the basic auth with
+ * @param route string route to visit
+ */
+export const constructUrlWithUser = (user: User, route: string) => {
+  const url = Cypress.config().baseUrl;
+  const kibana = new URL(String(url));
+  const hostname = kibana.hostname;
+  const username = user.username;
+  const password = user.password;
+  const protocol = kibana.protocol.replace(':', '');
+  const port = kibana.port;
+
+  const path = `${route.startsWith('/') ? '' : '/'}${route}`;
+  const strUrl = `${protocol}://${username}:${password}@${hostname}:${port}${path}`;
+  const builtUrl = new URL(strUrl);
+
+  cy.log(`origin: ${builtUrl.href}`);
+  return builtUrl.href;
+};
+
+export const getCurlScriptEnvVars = () => ({
+  ELASTICSEARCH_URL: Cypress.env('ELASTICSEARCH_URL'),
+  ELASTICSEARCH_USERNAME: Cypress.env('ELASTICSEARCH_USERNAME'),
+  ELASTICSEARCH_PASSWORD: Cypress.env('ELASTICSEARCH_PASSWORD'),
+  KIBANA_URL: Cypress.config().baseUrl,
+});
+
+export const postRoleAndUser = (role: ROLES) => {
+  const env = getCurlScriptEnvVars();
+  const detectionsRoleScriptPath = `./server/lib/detection_engine/scripts/roles_users/${role}/post_detections_role.sh`;
+  const detectionsRoleJsonPath = `./server/lib/detection_engine/scripts/roles_users/${role}/detections_role.json`;
+  const detectionsUserScriptPath = `./server/lib/detection_engine/scripts/roles_users/${role}/post_detections_user.sh`;
+  const detectionsUserJsonPath = `./server/lib/detection_engine/scripts/roles_users/${role}/detections_user.json`;
+
+  // post the role
+  cy.exec(`bash ${detectionsRoleScriptPath} ${detectionsRoleJsonPath}`, {
+    env,
+  });
+
+  // post the user associated with the role to elasticsearch
+  cy.exec(`bash ${detectionsUserScriptPath} ${detectionsUserJsonPath}`, {
+    env,
+  });
+};
+
+export const deleteRoleAndUser = (role: ROLES) => {
+  const env = getCurlScriptEnvVars();
+  const detectionsUserDeleteScriptPath = `./server/lib/detection_engine/scripts/roles_users/${role}/delete_detections_user.sh`;
+
+  // delete the role
+  cy.exec(`bash ${detectionsUserDeleteScriptPath}`, {
+    env,
+  });
+};
+
+export const loginWithUser = (user: User) => {
+  cy.request({
+    body: {
+      providerType: 'basic',
+      providerName: 'basic',
+      currentURL: '/',
+      params: {
+        username: user.username,
+        password: user.password,
+      },
+    },
+    headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+    method: 'POST',
+    url: constructUrlWithUser(user, LOGIN_API_ENDPOINT),
+  });
+};
+
+export const loginWithRole = async (role: ROLES) => {
+  postRoleAndUser(role);
+  const theUrl = Url.format({
+    auth: `${role}:changeme`,
+    username: role,
+    password: 'changeme',
+    protocol: Cypress.env('protocol'),
+    hostname: Cypress.env('hostname'),
+    port: Cypress.env('configport'),
+  } as UrlObject);
+  cy.log(`origin: ${theUrl}`);
+  cy.request({
+    body: {
+      providerType: 'basic',
+      providerName: 'basic',
+      currentURL: '/',
+      params: {
+        username: role,
+        password: 'changeme',
+      },
+    },
+    headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+    method: 'POST',
+    url: getUrlWithRoute(role, LOGIN_API_ENDPOINT),
+  });
+};
+
+/**
+ * Authenticates with Kibana using, if specified, credentials specified by
+ * environment variables. The credentials in `kibana.dev.yml` will be used
+ * for authentication when the environment variables are unset.
+ *
+ * To speed the execution of tests, prefer this non-interactive authentication,
+ * which is faster than authentication via Kibana's interactive login page.
+ */
+export const login = (role?: ROLES) => {
+  if (role != null) {
+    loginWithRole(role);
+  } else if (credentialsProvidedByEnvironment()) {
+    loginViaEnvironmentCredentials();
+  } else {
+    loginViaConfig();
+  }
+};
+
+/**
+ * Returns `true` if the credentials used to login to Kibana are provided
+ * via environment variables
+ */
+const credentialsProvidedByEnvironment = (): boolean =>
+  Cypress.env(ELASTICSEARCH_USERNAME) != null && Cypress.env(ELASTICSEARCH_PASSWORD) != null;
+
+/**
+ * Authenticates with Kibana by reading credentials from the
+ * `CYPRESS_ELASTICSEARCH_USERNAME` and `CYPRESS_ELASTICSEARCH_PASSWORD`
+ * environment variables, and POSTing the username and password directly to
+ * Kibana's `/internal/security/login` endpoint, bypassing the login page (for speed).
+ */
+const loginViaEnvironmentCredentials = () => {
+  cy.log(
+    `Authenticating via environment credentials from the \`CYPRESS_${ELASTICSEARCH_USERNAME}\` and \`CYPRESS_${ELASTICSEARCH_PASSWORD}\` environment variables`
+  );
+
+  // programmatically authenticate without interacting with the Kibana login page
+  cy.request({
+    body: {
+      providerType: 'basic',
+      providerName: 'basic',
+      currentURL: '/',
+      params: {
+        username: Cypress.env(ELASTICSEARCH_USERNAME),
+        password: Cypress.env(ELASTICSEARCH_PASSWORD),
+      },
+    },
+    headers: { 'kbn-xsrf': 'cypress-creds-via-env' },
+    method: 'POST',
+    url: `${Cypress.config().baseUrl}${LOGIN_API_ENDPOINT}`,
+  });
+};
+
+/**
+ * Authenticates with Kibana by reading credentials from the
+ * `kibana.dev.yml` file and POSTing the username and password directly to
+ * Kibana's `/internal/security/login` endpoint, bypassing the login page (for speed).
+ */
+const loginViaConfig = () => {
+  cy.log(
+    `Authenticating via config credentials \`${ELASTICSEARCH_USERNAME_CONFIG_PATH}\` and \`${ELASTICSEARCH_PASSWORD_CONFIG_PATH}\` from \`${KIBANA_DEV_YML_PATH}\``
+  );
+
+  // read the login details from `kibana.dev.yaml`
+  cy.readFile(KIBANA_DEV_YML_PATH).then((kibanaDevYml) => {
+    const config = yaml.safeLoad(kibanaDevYml);
+
+    // programmatically authenticate without interacting with the Kibana login page
+    cy.request({
+      body: {
+        providerType: 'basic',
+        providerName: 'basic',
+        currentURL: '/',
+        params: {
+          username: config.elasticsearch.username,
+          password: config.elasticsearch.password,
+        },
+      },
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'POST',
+      url: `${Cypress.config().baseUrl}${LOGIN_API_ENDPOINT}`,
+    });
+  });
+};
+
+/**
+ * Get the configured auth details that were used to spawn cypress
+ *
+ * @returns the default Elasticsearch username and password for this environment
+ */
+export const getEnvAuth = (): User => {
+  if (credentialsProvidedByEnvironment()) {
+    return {
+      username: Cypress.env(ELASTICSEARCH_USERNAME),
+      password: Cypress.env(ELASTICSEARCH_PASSWORD),
+    };
+  } else {
+    let user: User = { username: '', password: '' };
+    cy.readFile(KIBANA_DEV_YML_PATH).then((devYml) => {
+      const config = yaml.safeLoad(devYml);
+      user = { username: config.elasticsearch.username, password: config.elasticsearch.password };
+    });
+
+    return user;
+  }
+};
+
+/**
+ * Authenticates with Kibana, visits the specified `url`, and waits for the
+ * Kibana global nav to be displayed before continuing
+ */
+export const loginAndWaitForPage = (
+  url: string,
+  role?: ROLES,
+  onBeforeLoadCallback?: (win: Cypress.AUTWindow) => void
+) => {
+  login(role);
+  cy.visit(
+    `${url}?timerange=(global:(linkTo:!(timeline),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)))`,
+    {
+      onBeforeLoad(win) {
+        if (onBeforeLoadCallback) {
+          onBeforeLoadCallback(win);
+        }
+      },
+    }
+  );
+  cy.get('[data-test-subj="headerGlobalNav"]');
+};
+export const waitForPage = (url: string) => {
+  cy.visit(
+    `${url}?timerange=(global:(linkTo:!(timeline),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)))`
+  );
+  cy.get('[data-test-subj="headerGlobalNav"]');
+};
+
+export const loginAndWaitForPageWithoutDateRange = (url: string, role?: ROLES) => {
+  login(role);
+  cy.visit(role ? getUrlWithRoute(role, url) : url);
+  cy.get('[data-test-subj="headerGlobalNav"]', { timeout: 120000 });
+};
+
+export const loginWithUserAndWaitForPage = (url: string, user: User) => {
+  loginWithUser(user);
+  cy.visit(constructUrlWithUser(user, url));
+  cy.get('[data-test-subj="headerGlobalNav"]', { timeout: 120000 });
+};
+
+export const loginAndWaitForHostDetailsPage = (hostName = 'suricata-iowa') => {
+  loginAndWaitForPage(hostDetailsUrl(hostName));
+  cy.get('[data-test-subj="loading-spinner"]', { timeout: 12000 }).should('not.exist');
+};
+
+export const waitForPageWithoutDateRange = (url: string, role?: ROLES) => {
+  cy.visit(role ? getUrlWithRoute(role, url) : url);
+  cy.get('[data-test-subj="headerGlobalNav"]', { timeout: 120000 });
+};
+
+export const logout = () => {
+  cy.visit(LOGOUT_URL);
+};
diff --git a/x-pack/plugins/fleet/cypress/tasks/navigation.ts b/x-pack/plugins/fleet/cypress/tasks/navigation.ts
index a2dd131b647a6..741a2cf761e8c 100644
--- a/x-pack/plugins/fleet/cypress/tasks/navigation.ts
+++ b/x-pack/plugins/fleet/cypress/tasks/navigation.ts
@@ -5,15 +5,16 @@
  * 2.0.
  */
 
-import { TOGGLE_NAVIGATION_BTN } from '../screens/navigation';
-
 export const INTEGRATIONS = 'app/integrations#/';
 export const FLEET = 'app/fleet/';
+export const LOGIN_API_ENDPOINT = '/internal/security/login';
+export const LOGOUT_API_ENDPOINT = '/api/security/logout';
+export const LOGIN_URL = '/login';
+export const LOGOUT_URL = '/logout';
+
+export const hostDetailsUrl = (hostName: string) =>
+  `/app/security/hosts/${hostName}/authentications`;
 
 export const navigateTo = (page: string) => {
   cy.visit(page);
 };
-
-export const openNavigationFlyout = () => {
-  cy.get(TOGGLE_NAVIGATION_BTN).click();
-};
diff --git a/x-pack/plugins/fleet/cypress/tasks/privileges.ts b/x-pack/plugins/fleet/cypress/tasks/privileges.ts
new file mode 100644
index 0000000000000..edcc8e3749689
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/tasks/privileges.ts
@@ -0,0 +1,232 @@
+/*
+ * 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 { constructUrlWithUser, getEnvAuth } from './login';
+
+interface User {
+  username: string;
+  password: string;
+  description?: string;
+  roles: string[];
+}
+
+interface UserInfo {
+  username: string;
+  full_name: string;
+  email: string;
+}
+
+interface FeaturesPrivileges {
+  [featureId: string]: string[];
+}
+
+interface ElasticsearchIndices {
+  names: string[];
+  privileges: string[];
+}
+
+interface ElasticSearchPrivilege {
+  cluster?: string[];
+  indices?: ElasticsearchIndices[];
+}
+
+interface KibanaPrivilege {
+  spaces: string[];
+  base?: string[];
+  feature?: FeaturesPrivileges;
+}
+
+interface Role {
+  name: string;
+  privileges: {
+    elasticsearch?: ElasticSearchPrivilege;
+    kibana?: KibanaPrivilege[];
+  };
+}
+
+// Create roles with allowed combinations of Fleet and Integrations
+export const FleetAllIntegrAllRole: Role = {
+  name: 'fleet_all_int_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          fleetv2: ['all'],
+          fleet: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+export const FleetAllIntegrAllUser: User = {
+  username: 'fleet_all_int_all_user',
+  password: 'password',
+  roles: [FleetAllIntegrAllRole.name],
+};
+
+export const FleetAllIntegrReadRole: Role = {
+  name: 'fleet_all_int_read_user',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          fleetv2: ['all'],
+          fleet: ['read'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+export const FleetAllIntegrReadUser: User = {
+  username: 'fleet_all_int_read_user',
+  password: 'password',
+  roles: [FleetAllIntegrReadRole.name],
+};
+export const FleetAllIntegrNoneRole: Role = {
+  name: 'fleet_all_int_none_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          fleetv2: ['all'],
+          fleet: ['none'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+export const FleetAllIntegrNoneUser: User = {
+  username: 'fleet_all_int_none_user',
+  password: 'password',
+  roles: [FleetAllIntegrNoneRole.name],
+};
+export const FleetNoneIntegrAllRole: Role = {
+  name: 'fleet_none_int_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          fleetv2: ['none'],
+          fleet: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+export const FleetNoneIntegrAllUser: User = {
+  username: 'fleet_none_int_all_user',
+  password: 'password',
+  roles: [FleetNoneIntegrAllRole.name],
+};
+
+const getUserInfo = (user: User): UserInfo => ({
+  username: user.username,
+  full_name: user.username.replace('_', ' '),
+  email: `${user.username}@elastic.co`,
+});
+
+export enum ROLES {
+  elastic = 'elastic',
+}
+
+export const createUsersAndRoles = (users: User[], roles: Role[]) => {
+  const envUser = getEnvAuth();
+  for (const role of roles) {
+    cy.log(`Creating role: ${JSON.stringify(role)}`);
+    cy.request({
+      body: role.privileges,
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'PUT',
+      url: constructUrlWithUser(envUser, `/api/security/role/${role.name}`),
+    })
+      .its('status')
+      .should('eql', 204);
+  }
+
+  for (const user of users) {
+    const userInfo = getUserInfo(user);
+    cy.log(`Creating user: ${JSON.stringify(user)}`);
+    cy.request({
+      body: {
+        username: user.username,
+        password: user.password,
+        roles: user.roles,
+        full_name: userInfo.full_name,
+        email: userInfo.email,
+      },
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'POST',
+      url: constructUrlWithUser(envUser, `/internal/security/users/${user.username}`),
+    })
+      .its('status')
+      .should('eql', 200);
+  }
+};
+
+export const deleteUsersAndRoles = (users: User[], roles: Role[]) => {
+  const envUser = getEnvAuth();
+  for (const user of users) {
+    cy.log(`Deleting user: ${JSON.stringify(user)}`);
+    cy.request({
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'DELETE',
+      url: constructUrlWithUser(envUser, `/internal/security/users/${user.username}`),
+      failOnStatusCode: false,
+    })
+      .its('status')
+      .should('oneOf', [204, 404]);
+  }
+
+  for (const role of roles) {
+    cy.log(`Deleting role: ${JSON.stringify(role)}`);
+    cy.request({
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'DELETE',
+      url: constructUrlWithUser(envUser, `/api/security/role/${role.name}`),
+      failOnStatusCode: false,
+    })
+      .its('status')
+      .should('oneOf', [204, 404]);
+  }
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index 9799561970e48..29a491fe0c932 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -88,7 +88,7 @@ const PermissionsError: React.FunctionComponent<{ error: string }> = memo(({ err
         <EuiEmptyPrompt
           iconType="securityApp"
           title={
-            <h2>
+            <h2 data-test-subj="missingPrivilegesPromptTitle">
               <FormattedMessage
                 id="xpack.fleet.permissionDeniedErrorTitle"
                 defaultMessage="Permission denied"
@@ -96,7 +96,7 @@ const PermissionsError: React.FunctionComponent<{ error: string }> = memo(({ err
             </h2>
           }
           body={
-            <p>
+            <p data-test-subj="missingPrivilegesPromptMessage">
               <FormattedMessage
                 id="xpack.fleet.permissionDeniedErrorMessage"
                 defaultMessage="You are not authorized to access Fleet. It requires the {roleName1} Kibana privilege for Fleet, and the {roleName2} or {roleName1} privilege for Integrations."
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
index 7fbe4eaecb45a..98735efa54d81 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
@@ -189,6 +189,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
                   </EuiFlexItem>
                   <EuiFlexItem grow={false}>
                     <EuiButton
+                      data-test-subj="PackagePoliciesTableUpgradeButton"
                       size="s"
                       minWidth="0"
                       isDisabled={!canWriteIntegrationPolicies}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/fleet_server_callouts/fleet_server_missing_privileges.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/fleet_server_callouts/fleet_server_missing_privileges.tsx
index 41e02376898c9..b3df28121884e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/fleet_server_callouts/fleet_server_missing_privileges.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/fleet_server_callouts/fleet_server_missing_privileges.tsx
@@ -22,7 +22,7 @@ export const FleetServerMissingPrivileges = () => {
       <EuiEmptyPrompt
         iconType="securityApp"
         title={
-          <h2>
+          <h2 data-test-subj="fleetServerMissingPrivilegesTitle">
             <FormattedMessage
               id="xpack.fleet.fleetServerSetupPermissionDeniedErrorTitle"
               defaultMessage="Permission denied"
@@ -30,7 +30,7 @@ export const FleetServerMissingPrivileges = () => {
           </h2>
         }
         body={
-          <p>
+          <p data-test-subj="fleetServerMissingPrivilegesMessage">
             <FormattedMessage
               id="xpack.fleet.fleetServerSetupPermissionDeniedErrorMessage"
               defaultMessage="Fleet Server needs to be set up. This requires the {roleName} cluster privilege. Contact your administrator."
diff --git a/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx b/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx
index 9b534ff26ab7a..3338405c0b6c1 100644
--- a/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx
+++ b/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx
@@ -60,6 +60,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
     ...(showAddAgent && !agentPolicy.is_managed
       ? [
           <EuiContextMenuItem
+            data-test-subj="PackagePolicyActionsAddAgentItem"
             icon="plusInCircle"
             onClick={() => {
               setIsActionsMenuOpen(false);
@@ -75,6 +76,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
         ]
       : []),
     <EuiContextMenuItem
+      data-test-subj="PackagePolicyActionsEditItem"
       disabled={!canWriteIntegrationPolicies}
       icon="pencil"
       href={getHref('integration_policy_edit', {
@@ -88,6 +90,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
       />
     </EuiContextMenuItem>,
     <EuiContextMenuItem
+      data-test-subj="PackagePolicyActionsUpgradeItem"
       disabled={!packagePolicy.hasUpgrade || !canWriteIntegrationPolicies}
       icon="refresh"
       href={upgradePackagePolicyHref}
@@ -113,6 +116,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
         {(deletePackagePoliciesPrompt) => {
           return (
             <DangerEuiContextMenuItem
+              data-test-subj="PackagePolicyActionsDeleteItem"
               disabled={!canWriteIntegrationPolicies}
               icon="trash"
               onClick={() => {

From 49ec2c4459edb124da1b793b69e8d3315249e434 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:03:23 +0100
Subject: [PATCH 03/85] Add github action for labeling Fleet issues for QA team
 (#124949)

---
 .github/workflows/label-qa-fixed-in.yml | 78 +++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 .github/workflows/label-qa-fixed-in.yml

diff --git a/.github/workflows/label-qa-fixed-in.yml b/.github/workflows/label-qa-fixed-in.yml
new file mode 100644
index 0000000000000..e1dafa061f623
--- /dev/null
+++ b/.github/workflows/label-qa-fixed-in.yml
@@ -0,0 +1,78 @@
+name: Add QA labels to Fleet issues
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  fetch_issues_to_label:
+    runs-on: ubuntu-latest
+    # Only run on PRs that were merged for the Fleet team
+    if: |
+      github.event.pull_request.merged_at &&
+      contains(github.event.pull_request.labels.*.name, 'Team:Fleet')
+    outputs:
+      matrix: ${{ steps.issues_to_label.outputs.value }}
+      label_ids: ${{ steps.label_ids.outputs.value }}
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: closing_issues
+        with:
+          query: |
+            query closingIssueNumbersQuery($prnumber: Int!) {
+              repository(owner: "elastic", name: "kibana") {
+                pullRequest(number: $prnumber) {
+                  closingIssuesReferences(first: 10) {
+                    nodes {
+                      id
+                      labels(first: 20) {
+                        nodes {
+                          id
+                          name
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          prnumber: ${{ github.event.number }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: sergeysova/jq-action@v2
+        id: issues_to_label
+        with:
+          # Map to the issues' node id
+          cmd: echo $CLOSING_ISSUES | jq -c '.repository.pullRequest.closingIssuesReferences.nodes | map(.id)'
+          multiline: true
+        env:
+          CLOSING_ISSUES: ${{ steps.closing_issues.outputs.data }}
+      - uses: sergeysova/jq-action@v2
+        id: label_ids
+        with:
+          # Get list of version labels on pull request and map to label's node id, append 'QA:Ready For Testing' id ("MDU6TGFiZWwyNTQ1NjcwOTI4")
+          cmd: echo $PR_LABELS | jq -c 'map(select(.name | test("v[0-9]+\\.[0-9]+\\.[0-9]+")) | .node_id) + ["MDU6TGFiZWwyNTQ1NjcwOTI4"]'
+          multiline: true
+        env:
+          PR_LABELS: ${{ toJSON(github.event.pull_request.labels) }}
+
+  label_issues:
+    needs: fetch_issues_to_label
+    runs-on: ubuntu-latest
+    # For each issue closed by the PR run this job
+    strategy:
+      matrix:
+        issueNodeId: ${{ fromJSON(needs.fetch_issues_to_label.outputs.matrix) }}
+    name: Label issue ${{ matrix.issueNodeId }}
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_labels_to_closed_issue
+        with:
+          query: |
+            mutation add_label($issueid:String!, $labelids:[String!]!) {
+              addLabelsToLabelable(input: {labelableId: $issueid, labelIds: $labelids}) {
+                clientMutationId
+              }
+            }
+          issueid: ${{ matrix.issueNodeId }}
+          labelids: ${{ needs.fetch_issues_to_label.outputs.label_ids }}
+          token: ${{ secrets.GITHUB_TOKEN }}

From ed36a1322bc42dc29005bce36490713ce7029cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Wed, 9 Feb 2022 13:15:06 +0100
Subject: [PATCH 04/85] [Unified observability] Remove uptime team as
 codeowners from exploratory exploratory view (#125053)

---
 .github/CODEOWNERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3f36f4b67e56b..a8619643d1b2e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -138,13 +138,11 @@
 # Uptime
 /x-pack/plugins/uptime @elastic/uptime
 /x-pack/plugins/ux @elastic/uptime
-/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime
 /x-pack/test/functional_with_es_ssl/apps/uptime  @elastic/uptime
 /x-pack/test/functional/apps/uptime @elastic/uptime
 /x-pack/test/functional/es_archives/uptime @elastic/uptime
 /x-pack/test/functional/services/uptime @elastic/uptime
 /x-pack/test/api_integration/apis/uptime @elastic/uptime
-/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime
 
 # Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/public/application/uxApp.tsx @elastic/uptime

From 939bc3d01e8a19df738859bc27b9654486efa02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <david.sanchezsoler@elastic.co>
Date: Wed, 9 Feb 2022 13:26:30 +0100
Subject: [PATCH 05/85] [Security Solution][Endpoint] Unify remove artifact
 from policy message and fix back buttons (#124936)

* Updates delete messages for event filters and host isolation exceptions list

* Fixes back buttons when click on view full details. Open create dialog by default from artifacts policy view

* Fixes ts checks
---
 .../policy_event_filters_delete_modal.test.tsx   |  1 +
 .../policy_event_filters_delete_modal.tsx        |  6 ++++--
 .../policy_event_filters_empty_unexisting.tsx    |  2 +-
 .../use_policy_event_filters_empty_hooks.ts      | 12 +++++++++---
 .../list/policy_event_filters_list.tsx           |  5 ++++-
 .../components/delete_modal.test.tsx             |  1 +
 .../components/delete_modal.tsx                  |  7 +++++--
 .../components/empty_unexisting.tsx              |  2 +-
 .../components/list.test.tsx                     |  2 +-
 .../components/list.tsx                          | 16 +++++++++++++---
 ...licy_host_isolation_exceptions_empty_hooks.ts | 12 +++++++++---
 .../host_isolation_exceptions_tab.tsx            |  2 +-
 .../policy_trusted_apps_empty_unexisting.tsx     |  2 +-
 .../empty/use_policy_trusted_apps_empty_hooks.ts | 12 +++++++++---
 .../layout/policy_trusted_apps_layout.tsx        |  2 +-
 .../list/policy_trusted_apps_list.test.tsx       |  2 +-
 .../list/policy_trusted_apps_list.tsx            | 11 +++++++----
 17 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.test.tsx
index 20522e35e8983..2e00dab303007 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.test.tsx
@@ -39,6 +39,7 @@ describe('Policy details event filter delete modal', () => {
         renderResult = mockedContext.render(
           <PolicyEventFiltersDeleteModal
             policyId={policyId}
+            policyName="fakeName"
             onCancel={onCancel}
             exception={exception}
           />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.tsx
index eca26a0026dd1..bfa2f09ab9773 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/delete_modal/policy_event_filters_delete_modal.tsx
@@ -16,10 +16,12 @@ import { useBulkUpdateEventFilters } from '../hooks';
 
 export const PolicyEventFiltersDeleteModal = ({
   policyId,
+  policyName,
   exception,
   onCancel,
 }: {
   policyId: string;
+  policyName: string;
   exception: ExceptionListItemSchema;
   onCancel: () => void;
 }) => {
@@ -36,8 +38,8 @@ export const PolicyEventFiltersDeleteModal = ({
           text: i18n.translate(
             'xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.successToastText',
             {
-              defaultMessage: '"{exception}" has been removed from policy',
-              values: { exception: exception.name },
+              defaultMessage: '"{eventFilterName}" has been removed from {policyName} policy',
+              values: { eventFilterName: exception.name, policyName },
             }
           ),
         });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/policy_event_filters_empty_unexisting.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/policy_event_filters_empty_unexisting.tsx
index c4b9e778664ef..7976fc8a566da 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/policy_event_filters_empty_unexisting.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/policy_event_filters_empty_unexisting.tsx
@@ -16,7 +16,7 @@ interface CommonProps {
 }
 
 export const PolicyEventFiltersEmptyUnexisting = memo<CommonProps>(({ policyId, policyName }) => {
-  const { onClickHandler, toRouteUrl } = useGetLinkTo(policyId, policyName);
+  const { onClickHandler, toRouteUrl } = useGetLinkTo(policyId, policyName, { show: 'create' });
   return (
     <EuiPageTemplate template="centeredContent">
       <EuiEmptyPrompt
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/use_policy_event_filters_empty_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/use_policy_event_filters_empty_hooks.ts
index 124b60a4e4220..0a7aa8fbabf6d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/use_policy_event_filters_empty_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/empty/use_policy_event_filters_empty_hooks.ts
@@ -11,16 +11,21 @@ import { useNavigateToAppEventHandler } from '../../../../../../common/hooks/end
 import { useAppUrl } from '../../../../../../common/lib/kibana/hooks';
 import { getPolicyEventFiltersPath, getEventFiltersListPath } from '../../../../../common/routing';
 import { APP_UI_ID } from '../../../../../../../common/constants';
+import { EventFiltersPageLocation } from '../../../../event_filters/types';
 
-export const useGetLinkTo = (policyId: string, policyName: string) => {
+export const useGetLinkTo = (
+  policyId: string,
+  policyName: string,
+  location?: Partial<EventFiltersPageLocation>
+) => {
   const { getAppUrl } = useAppUrl();
   const { toRoutePath, toRouteUrl } = useMemo(() => {
-    const path = getEventFiltersListPath();
+    const path = getEventFiltersListPath(location);
     return {
       toRoutePath: path,
       toRouteUrl: getAppUrl({ path }),
     };
-  }, [getAppUrl]);
+  }, [getAppUrl, location]);
 
   const policyEventFiltersPath = useMemo(() => getPolicyEventFiltersPath(policyId), [policyId]);
   const policyEventFilterRouteState = useMemo(() => {
@@ -55,5 +60,6 @@ export const useGetLinkTo = (policyId: string, policyName: string) => {
   return {
     onClickHandler,
     toRouteUrl,
+    state: policyEventFilterRouteState,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/list/policy_event_filters_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/list/policy_event_filters_list.tsx
index 5ab6f4bfb0eba..63930610f8aa7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/list/policy_event_filters_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/event_filters/list/policy_event_filters_list.tsx
@@ -33,6 +33,7 @@ import { PolicyEventFiltersDeleteModal } from '../delete_modal';
 import { isGlobalPolicyEffected } from '../../../../../components/effected_policy_select/utils';
 import { getEventFiltersListPath } from '../../../../../common/routing';
 import { useUserPrivileges } from '../../../../../../common/components/user_privileges';
+import { useGetLinkTo } from '../empty/use_policy_event_filters_empty_hooks';
 
 interface PolicyEventFiltersListProps {
   policy: ImmutableObject<PolicyData>;
@@ -47,6 +48,7 @@ export const PolicyEventFiltersList = React.memo<PolicyEventFiltersListProps>(({
   const [exceptionItemToDelete, setExceptionItemToDelete] = useState<
     ExceptionListItemSchema | undefined
   >();
+  const { state } = useGetLinkTo(policy.id, policy.name);
 
   const {
     data: eventFilters,
@@ -116,7 +118,7 @@ export const PolicyEventFiltersList = React.memo<PolicyEventFiltersListProps>(({
       ),
       href: getAppUrl({ appId: APP_UI_ID, path: viewUrlPath }),
       navigateAppId: APP_UI_ID,
-      navigateOptions: { path: viewUrlPath },
+      navigateOptions: { path: viewUrlPath, state },
       'data-test-subj': 'view-full-details-action',
     };
     const item = artifact as ExceptionListItemSchema;
@@ -159,6 +161,7 @@ export const PolicyEventFiltersList = React.memo<PolicyEventFiltersListProps>(({
       {exceptionItemToDelete && (
         <PolicyEventFiltersDeleteModal
           policyId={policy.id}
+          policyName={policy.name}
           exception={exceptionItemToDelete}
           onCancel={handleDeleteModalClose}
         />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.test.tsx
index bd9bfbf5d653d..5e750b5599d71 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.test.tsx
@@ -43,6 +43,7 @@ describe('Policy details host isolation exceptions delete modal', () => {
       (renderResult = mockedContext.render(
         <PolicyHostIsolationExceptionsDeleteModal
           policyId={policyId}
+          policyName="fakeName"
           exception={exception}
           onCancel={onCancel}
         />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.tsx
index 655107b8f357d..ad8868bf68346 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/delete_modal.tsx
@@ -17,10 +17,12 @@ import { updateOneHostIsolationExceptionItem } from '../../../../host_isolation_
 
 export const PolicyHostIsolationExceptionsDeleteModal = ({
   policyId,
+  policyName,
   exception,
   onCancel,
 }: {
   policyId: string;
+  policyName: string;
   exception: ExceptionListItemSchema;
   onCancel: () => void;
 }) => {
@@ -51,8 +53,9 @@ export const PolicyHostIsolationExceptionsDeleteModal = ({
       text: i18n.translate(
         'xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.removeDialog.successToastText',
         {
-          defaultMessage: '"{exception}" has been removed from policy',
-          values: { exception: exception.name },
+          defaultMessage:
+            '"{hostIsolationExceptionName}" has been removed from {policyName} policy',
+          values: { hostIsolationExceptionName: exception.name, policyName },
         }
       ),
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/empty_unexisting.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/empty_unexisting.tsx
index 34246caf7c313..94185904ce6cc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/empty_unexisting.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/empty_unexisting.tsx
@@ -16,7 +16,7 @@ export const PolicyHostIsolationExceptionsEmptyUnexisting = ({
 }: {
   policy: PolicyData;
 }) => {
-  const { onClickHandler, toRouteUrl } = useGetLinkTo(policy.id, policy.name);
+  const { onClickHandler, toRouteUrl } = useGetLinkTo(policy.id, policy.name, { show: 'create' });
 
   return (
     <EuiPageTemplate template="centeredContent">
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.test.tsx
index 4ad3919fcc563..17e3ace9a6410 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.test.tsx
@@ -52,7 +52,7 @@ describe('Policy details host isolation exceptions tab', () => {
     ({ history } = mockedContext);
     render = () =>
       (renderResult = mockedContext.render(
-        <PolicyHostIsolationExceptionsList policyId={policyId} />
+        <PolicyHostIsolationExceptionsList policyId={policyId} policyName="fakeName" />
       ));
 
     act(() => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.tsx
index feee5491da314..3b5244aad30da 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/list.tsx
@@ -33,14 +33,23 @@ import { getCurrentArtifactsLocation } from '../../../store/policy_details/selec
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import { PolicyHostIsolationExceptionsDeleteModal } from './delete_modal';
 import { useFetchHostIsolationExceptionsList } from '../../../../host_isolation_exceptions/view/hooks';
-
-export const PolicyHostIsolationExceptionsList = ({ policyId }: { policyId: string }) => {
+import { useGetLinkTo } from './use_policy_host_isolation_exceptions_empty_hooks';
+
+export const PolicyHostIsolationExceptionsList = ({
+  policyId,
+  policyName,
+}: {
+  policyId: string;
+  policyName: string;
+}) => {
   const history = useHistory();
   const { getAppUrl } = useAppUrl();
 
   const privileges = useUserPrivileges().endpointPrivileges;
   const location = usePolicyDetailsSelector(getCurrentArtifactsLocation);
 
+  const { state } = useGetLinkTo(policyId, policyName);
+
   // load the list of policies>
   const policiesRequest = useGetEndpointSpecificPolicies();
   const urlParams = usePolicyDetailsSelector(getCurrentArtifactsLocation);
@@ -127,7 +136,7 @@ export const PolicyHostIsolationExceptionsList = ({ policyId }: { policyId: stri
       ),
       href: getAppUrl({ appId: APP_UI_ID, path: viewUrlPath }),
       navigateAppId: APP_UI_ID,
-      navigateOptions: { path: viewUrlPath },
+      navigateOptions: { path: viewUrlPath, state },
       'data-test-subj': 'view-full-details-action',
     };
 
@@ -172,6 +181,7 @@ export const PolicyHostIsolationExceptionsList = ({ policyId }: { policyId: stri
       {exceptionItemToDelete ? (
         <PolicyHostIsolationExceptionsDeleteModal
           policyId={policyId}
+          policyName={policyName}
           exception={exceptionItemToDelete}
           onCancel={handleDeleteModalClose}
         />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/use_policy_host_isolation_exceptions_empty_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/use_policy_host_isolation_exceptions_empty_hooks.ts
index 6aba11a4499ea..494dfd9a7ae08 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/use_policy_host_isolation_exceptions_empty_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/components/use_policy_host_isolation_exceptions_empty_hooks.ts
@@ -14,16 +14,21 @@ import {
   getHostIsolationExceptionsListPath,
 } from '../../../../../common/routing';
 import { APP_UI_ID } from '../../../../../../../common/constants';
+import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
 
-export const useGetLinkTo = (policyId: string, policyName: string) => {
+export const useGetLinkTo = (
+  policyId: string,
+  policyName: string,
+  location?: Partial<HostIsolationExceptionsPageLocation>
+) => {
   const { getAppUrl } = useAppUrl();
   const { toRoutePath, toRouteUrl } = useMemo(() => {
-    const path = getHostIsolationExceptionsListPath();
+    const path = getHostIsolationExceptionsListPath(location);
     return {
       toRoutePath: path,
       toRouteUrl: getAppUrl({ path }),
     };
-  }, [getAppUrl]);
+  }, [getAppUrl, location]);
 
   const policyHostIsolationExceptionsPath = useMemo(
     () => getPolicyHostIsolationExceptionsPath(policyId),
@@ -61,5 +66,6 @@ export const useGetLinkTo = (policyId: string, policyName: string) => {
   return {
     onClickHandler,
     toRouteUrl,
+    state: policyHostIsolationExceptionsRouteState,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/host_isolation_exceptions_tab.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/host_isolation_exceptions_tab.tsx
index 1836997e74c16..f9ec756a8be76 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/host_isolation_exceptions_tab.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/host_isolation_exceptions/host_isolation_exceptions_tab.tsx
@@ -181,7 +181,7 @@ export const PolicyHostIsolationExceptionsTab = ({ policy }: { policy: PolicyDat
         color="transparent"
         borderRadius="none"
       >
-        <PolicyHostIsolationExceptionsList policyId={policyId} />
+        <PolicyHostIsolationExceptionsList policyId={policyId} policyName={policy.name} />
       </EuiPageContent>
     </div>
   ) : (
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/policy_trusted_apps_empty_unexisting.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/policy_trusted_apps_empty_unexisting.tsx
index 1c96398b8347e..1fe834a9fce46 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/policy_trusted_apps_empty_unexisting.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/policy_trusted_apps_empty_unexisting.tsx
@@ -16,7 +16,7 @@ interface CommonProps {
 }
 
 export const PolicyTrustedAppsEmptyUnexisting = memo<CommonProps>(({ policyId, policyName }) => {
-  const { onClickHandler, toRouteUrl } = useGetLinkTo(policyId, policyName);
+  const { onClickHandler, toRouteUrl } = useGetLinkTo(policyId, policyName, { show: 'create' });
   return (
     <EuiPageTemplate template="centeredContent">
       <EuiEmptyPrompt
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/use_policy_trusted_apps_empty_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/use_policy_trusted_apps_empty_hooks.ts
index ff6e044682224..f393f1f436d1c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/use_policy_trusted_apps_empty_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/empty/use_policy_trusted_apps_empty_hooks.ts
@@ -11,16 +11,21 @@ import { useNavigateToAppEventHandler } from '../../../../../../common/hooks/end
 import { useAppUrl } from '../../../../../../common/lib/kibana/hooks';
 import { getPolicyTrustedAppsPath, getTrustedAppsListPath } from '../../../../../common/routing';
 import { APP_UI_ID } from '../../../../../../../common/constants';
+import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
 
-export const useGetLinkTo = (policyId: string, policyName: string) => {
+export const useGetLinkTo = (
+  policyId: string,
+  policyName: string,
+  location?: Partial<TrustedAppsListPageLocation>
+) => {
   const { getAppUrl } = useAppUrl();
   const { toRoutePath, toRouteUrl } = useMemo(() => {
-    const path = getTrustedAppsListPath();
+    const path = getTrustedAppsListPath(location);
     return {
       toRoutePath: path,
       toRouteUrl: getAppUrl({ path }),
     };
-  }, [getAppUrl]);
+  }, [getAppUrl, location]);
 
   const policyTrustedAppsPath = useMemo(() => getPolicyTrustedAppsPath(policyId), [policyId]);
   const policyTrustedAppRouteState = useMemo(() => {
@@ -55,5 +60,6 @@ export const useGetLinkTo = (policyId: string, policyName: string) => {
   return {
     onClickHandler,
     toRouteUrl,
+    state: policyTrustedAppRouteState,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/layout/policy_trusted_apps_layout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/layout/policy_trusted_apps_layout.tsx
index 83fb3663104a6..dd89cca43c10d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/layout/policy_trusted_apps_layout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/layout/policy_trusted_apps_layout.tsx
@@ -166,7 +166,7 @@ export const PolicyTrustedAppsLayout = React.memo(() => {
             />
           )
         ) : displayHeaderAndContent ? (
-          <PolicyTrustedAppsList />
+          <PolicyTrustedAppsList policyId={policyItem.id} policyName={policyItem.name} />
         ) : (
           <ManagementPageLoader data-test-subj="policyTrustedAppsListLoader" />
         )}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
index 67b435f4873a1..da304adc2db44 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
@@ -87,7 +87,7 @@ describe('when rendering the PolicyTrustedAppsList', () => {
 
     mockedApis = policyDetailsPageAllApiHttpMocks(appTestContext.coreStart.http);
     waitForAction = appTestContext.middlewareSpy.waitForAction;
-    componentRenderProps = {};
+    componentRenderProps = { policyId: '9f08b220-342d-4c8d-8971-4cf96adcac29', policyName: 'test' };
 
     render = async (waitForLoadedState: boolean = true) => {
       appTestContext.history.push(
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
index fa4d4e40b3e52..54dabf87f474b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
@@ -22,7 +22,6 @@ import {
   getPolicyTrustedAppsListPagination,
   getTrustedAppsAllPoliciesById,
   isPolicyTrustedAppListLoading,
-  policyIdFromParams,
   getCurrentPolicyArtifactsFilter,
 } from '../../../store/policy_details/selectors';
 import {
@@ -39,21 +38,23 @@ import { ArtifactEntryCollapsibleCardProps } from '../../../../../components/art
 import { useTestIdGenerator } from '../../../../../components/hooks/use_test_id_generator';
 import { RemoveTrustedAppFromPolicyModal } from './remove_trusted_app_from_policy_modal';
 import { useUserPrivileges } from '../../../../../../common/components/user_privileges';
+import { useGetLinkTo } from '../empty/use_policy_trusted_apps_empty_hooks';
 
 const DATA_TEST_SUBJ = 'policyTrustedAppsGrid';
 
 export interface PolicyTrustedAppsListProps {
   hideTotalShowingLabel?: boolean;
+  policyId: string;
+  policyName: string;
 }
 
 export const PolicyTrustedAppsList = memo<PolicyTrustedAppsListProps>(
-  ({ hideTotalShowingLabel = false }) => {
+  ({ hideTotalShowingLabel = false, policyId, policyName }) => {
     const getTestId = useTestIdGenerator(DATA_TEST_SUBJ);
     const toasts = useToasts();
     const history = useHistory();
     const { getAppUrl } = useAppUrl();
     const { canCreateArtifactsByPolicy } = useUserPrivileges().endpointPrivileges;
-    const policyId = usePolicyDetailsSelector(policyIdFromParams);
     const isLoading = usePolicyDetailsSelector(isPolicyTrustedAppListLoading);
     const defaultFilter = usePolicyDetailsSelector(getCurrentPolicyArtifactsFilter);
     const trustedAppItems = usePolicyDetailsSelector(getPolicyTrustedAppList);
@@ -62,6 +63,7 @@ export const PolicyTrustedAppsList = memo<PolicyTrustedAppsListProps>(
     const allPoliciesById = usePolicyDetailsSelector(getTrustedAppsAllPoliciesById);
     const trustedAppsApiError = usePolicyDetailsSelector(getPolicyTrustedAppListError);
     const navigateCallback = usePolicyDetailsNavigateCallback();
+    const { state } = useGetLinkTo(policyId, policyName);
 
     const [isCardExpanded, setCardExpanded] = useState<Record<string, boolean>>({});
     const [trustedAppsForRemoval, setTrustedAppsForRemoval] = useState<typeof trustedAppItems>([]);
@@ -152,7 +154,7 @@ export const PolicyTrustedAppsList = memo<PolicyTrustedAppsListProps>(
             ),
             href: getAppUrl({ appId: APP_UI_ID, path: viewUrlPath }),
             navigateAppId: APP_UI_ID,
-            navigateOptions: { path: viewUrlPath },
+            navigateOptions: { path: viewUrlPath, state },
             'data-test-subj': getTestId('viewFullDetailsAction'),
           },
         ];
@@ -201,6 +203,7 @@ export const PolicyTrustedAppsList = memo<PolicyTrustedAppsListProps>(
       isCardExpanded,
       trustedAppItems,
       canCreateArtifactsByPolicy,
+      state,
     ]);
 
     const provideCardProps = useCallback<Required<ArtifactCardGridProps>['cardComponentProps']>(

From c5454536ad8d9e60544e02b0438c1c0488371e22 Mon Sep 17 00:00:00 2001
From: Michael Dokolin <mikhail.dokolin@elastic.co>
Date: Wed, 9 Feb 2022 14:45:50 +0100
Subject: [PATCH 06/85] [Screenshotting] Limit number of concurrently running
 Chromium instances (#124720)

* Convert screenshots capturing function into a service
* Update screenshots service to limit the number of concurrent sessions
---
 .../server/config/schema.test.ts              |   2 +
 .../screenshotting/server/config/schema.ts    |   1 +
 x-pack/plugins/screenshotting/server/mock.ts  |   3 +-
 .../plugins/screenshotting/server/plugin.ts   |  19 ++-
 .../server/screenshots/index.test.ts          |  38 ++++--
 .../server/screenshots/index.ts               | 121 ++++++++++--------
 .../screenshotting/server/screenshots/mock.ts |   8 +-
 .../server/screenshots/semaphore.test.ts      |  73 +++++++++++
 .../server/screenshots/semaphore.ts           |  70 ++++++++++
 9 files changed, 255 insertions(+), 80 deletions(-)
 create mode 100644 x-pack/plugins/screenshotting/server/screenshots/semaphore.test.ts
 create mode 100644 x-pack/plugins/screenshotting/server/screenshots/semaphore.ts

diff --git a/x-pack/plugins/screenshotting/server/config/schema.test.ts b/x-pack/plugins/screenshotting/server/config/schema.test.ts
index 9180f0d180d5f..e25791b0ebad9 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.test.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.test.ts
@@ -54,6 +54,7 @@ describe('ConfigSchema', () => {
             },
           ],
         },
+        "poolSize": 1,
       }
     `);
   });
@@ -105,6 +106,7 @@ describe('ConfigSchema', () => {
             },
           ],
         },
+        "poolSize": 1,
       }
     `);
   });
diff --git a/x-pack/plugins/screenshotting/server/config/schema.ts b/x-pack/plugins/screenshotting/server/config/schema.ts
index bcf2fa9feead9..7711ffe1ea8e8 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.ts
@@ -67,6 +67,7 @@ export const ConfigSchema = schema.object({
       }),
     }),
   }),
+  poolSize: schema.number({ defaultValue: 1, min: 1 }),
 });
 
 export type ConfigType = TypeOf<typeof ConfigSchema>;
diff --git a/x-pack/plugins/screenshotting/server/mock.ts b/x-pack/plugins/screenshotting/server/mock.ts
index 49d69521f2c19..f7d3421ca0f3e 100644
--- a/x-pack/plugins/screenshotting/server/mock.ts
+++ b/x-pack/plugins/screenshotting/server/mock.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
 import { createMockBrowserDriverFactory } from './browsers/mock';
 import { createMockScreenshots } from './screenshots/mock';
 import type { ScreenshottingStart } from '.';
@@ -17,6 +16,6 @@ export function createMockScreenshottingStart(): jest.Mocked<ScreenshottingStart
 
   return {
     diagnose,
-    getScreenshots: jest.fn((options) => getScreenshots(driver, {} as Logger, options)),
+    getScreenshots: jest.fn((options) => getScreenshots(options)),
   };
 }
diff --git a/x-pack/plugins/screenshotting/server/plugin.ts b/x-pack/plugins/screenshotting/server/plugin.ts
index c7870322ccdfc..138193815debe 100755
--- a/x-pack/plugins/screenshotting/server/plugin.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.ts
@@ -17,7 +17,7 @@ import type {
 import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
 import { ChromiumArchivePaths, HeadlessChromiumDriverFactory, install } from './browsers';
 import { ConfigType, createConfig } from './config';
-import { getScreenshots, ScreenshotOptions } from './screenshots';
+import { Screenshots } from './screenshots';
 import { getChromiumPackage } from './utils';
 
 interface SetupDeps {
@@ -39,7 +39,7 @@ export interface ScreenshottingStart {
    * @param options Screenshots session options.
    * @returns Observable with screenshotting results.
    */
-  getScreenshots(options: ScreenshotOptions): ReturnType<typeof getScreenshots>;
+  getScreenshots: Screenshots['getScreenshots'];
 }
 
 export class ScreenshottingPlugin implements Plugin<void, ScreenshottingStart, SetupDeps> {
@@ -47,6 +47,7 @@ export class ScreenshottingPlugin implements Plugin<void, ScreenshottingStart, S
   private logger: Logger;
   private screenshotMode!: ScreenshotModePluginSetup;
   private browserDriverFactory!: Promise<HeadlessChromiumDriverFactory>;
+  private screenshots!: Promise<Screenshots>;
 
   constructor(context: PluginInitializerContext<ConfigType>) {
     this.logger = context.logger.get();
@@ -65,12 +66,20 @@ export class ScreenshottingPlugin implements Plugin<void, ScreenshottingStart, S
 
       return new HeadlessChromiumDriverFactory(this.screenshotMode, config, logger, binaryPath);
     })();
-
     this.browserDriverFactory.catch((error) => {
       this.logger.error('Error in screenshotting setup, it may not function properly.');
       this.logger.error(error);
     });
 
+    this.screenshots = (async () => {
+      const browserDriverFactory = await this.browserDriverFactory;
+      const logger = this.logger.get('screenshot');
+
+      return new Screenshots(browserDriverFactory, logger, this.config);
+    })();
+    // Already handled in `browserDriverFactory`
+    this.screenshots.catch(() => {});
+
     return {};
   }
 
@@ -79,8 +88,8 @@ export class ScreenshottingPlugin implements Plugin<void, ScreenshottingStart, S
       diagnose: () =>
         from(this.browserDriverFactory).pipe(switchMap((factory) => factory.diagnose())),
       getScreenshots: (options) =>
-        from(this.browserDriverFactory).pipe(
-          switchMap((factory) => getScreenshots(factory, this.logger.get('screenshot'), options))
+        from(this.screenshots).pipe(
+          switchMap((screenshots) => screenshots.getScreenshots(options))
         ),
     };
   }
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
index 858e1ae9d6093..eae7a6a5bc031 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
@@ -7,12 +7,13 @@
 
 import { of, throwError, NEVER } from 'rxjs';
 import type { Logger } from 'src/core/server';
+import type { ConfigType } from '../config';
 import { createMockBrowserDriver, createMockBrowserDriverFactory } from '../browsers/mock';
 import type { HeadlessChromiumDriverFactory } from '../browsers';
 import * as Layouts from '../layouts/create_layout';
 import { createMockLayout } from '../layouts/mock';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
-import { getScreenshots, ScreenshotOptions } from '.';
+import { Screenshots, ScreenshotOptions } from '.';
 
 /*
  * Tests
@@ -23,6 +24,7 @@ describe('Screenshot Observable Pipeline', () => {
   let layout: ReturnType<typeof createMockLayout>;
   let logger: jest.Mocked<Logger>;
   let options: ScreenshotOptions;
+  let screenshots: Screenshots;
 
   beforeEach(async () => {
     driver = createMockBrowserDriver();
@@ -45,6 +47,7 @@ describe('Screenshot Observable Pipeline', () => {
       },
       urls: ['/welcome/home/start/index.htm'],
     } as unknown as typeof options;
+    screenshots = new Screenshots(driverFactory, logger, { poolSize: 1 } as ConfigType);
 
     jest.spyOn(Layouts, 'createLayout').mockReturnValue(layout);
 
@@ -56,7 +59,7 @@ describe('Screenshot Observable Pipeline', () => {
   });
 
   it('pipelines a single url into screenshot and timeRange', async () => {
-    const result = await getScreenshots(driverFactory, logger, options).toPromise();
+    const result = await screenshots.getScreenshots(options).toPromise();
 
     expect(result).toHaveProperty('results');
     expect(result.results).toMatchInlineSnapshot(`
@@ -112,10 +115,12 @@ describe('Screenshot Observable Pipeline', () => {
 
   it('pipelines multiple urls into', async () => {
     driver.screenshot.mockResolvedValue(Buffer.from('some screenshots'));
-    const result = await getScreenshots(driverFactory, logger, {
-      ...options,
-      urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php'],
-    }).toPromise();
+    const result = await screenshots
+      .getScreenshots({
+        ...options,
+        urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php'],
+      })
+      .toPromise();
 
     expect(result).toHaveProperty('results');
     expect(result.results).toMatchInlineSnapshot(`
@@ -245,10 +250,15 @@ describe('Screenshot Observable Pipeline', () => {
       driver.waitForSelector.mockImplementation((selectorArg: string) => {
         throw new Error('Mock error!');
       });
-      const result = await getScreenshots(driverFactory, logger, {
-        ...options,
-        urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php3'],
-      }).toPromise();
+      const result = await screenshots
+        .getScreenshots({
+          ...options,
+          urls: [
+            '/welcome/home/start/index2.htm',
+            '/welcome/home/start/index.php3?page=./home.php3',
+          ],
+        })
+        .toPromise();
 
       expect(result).toHaveProperty('results');
       expect(result.results).toMatchInlineSnapshot(`
@@ -351,9 +361,9 @@ describe('Screenshot Observable Pipeline', () => {
         })
       );
 
-      await expect(
-        getScreenshots(driverFactory, logger, options).toPromise()
-      ).rejects.toMatchInlineSnapshot(`"Instant timeout has fired!"`);
+      await expect(screenshots.getScreenshots(options).toPromise()).rejects.toMatchInlineSnapshot(
+        `"Instant timeout has fired!"`
+      );
     });
 
     it(`uses defaults for element positions and size when Kibana page is not ready`, async () => {
@@ -362,7 +372,7 @@ describe('Screenshot Observable Pipeline', () => {
       );
 
       layout.getViewport = () => null;
-      const result = await getScreenshots(driverFactory, logger, options).toPromise();
+      const result = await screenshots.getScreenshots(options).toPromise();
 
       expect(result).toHaveProperty('results');
       expect(result.results).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.ts b/x-pack/plugins/screenshotting/server/screenshots/index.ts
index d7332217e78a5..a43fd4549e482 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.ts
@@ -19,11 +19,13 @@ import {
 } from 'rxjs/operators';
 import type { Logger } from 'src/core/server';
 import { LayoutParams } from '../../common';
+import type { ConfigType } from '../config';
 import type { HeadlessChromiumDriverFactory, PerformanceMetrics } from '../browsers';
 import { createLayout } from '../layouts';
 import type { Layout } from '../layouts';
 import { ScreenshotObservableHandler } from './observable';
 import type { ScreenshotObservableOptions, ScreenshotObservableResult } from './observable';
+import { Semaphore } from './semaphore';
 
 export interface ScreenshotOptions extends ScreenshotObservableOptions {
   layout: LayoutParams;
@@ -51,64 +53,73 @@ const DEFAULT_SETUP_RESULT = {
   timeRange: null,
 };
 
-export function getScreenshots(
-  browserDriverFactory: HeadlessChromiumDriverFactory,
-  logger: Logger,
-  options: ScreenshotOptions
-): Observable<ScreenshotResult> {
-  const apmTrans = apm.startTransaction('screenshot-pipeline', 'screenshotting');
-  const apmCreateLayout = apmTrans?.startSpan('create-layout', 'setup');
-  const layout = createLayout(options.layout);
-  logger.debug(`Layout: width=${layout.width} height=${layout.height}`);
-  apmCreateLayout?.end();
+export class Screenshots {
+  private semaphore: Semaphore;
 
-  const apmCreatePage = apmTrans?.startSpan('create-page', 'wait');
-  const {
-    browserTimezone,
-    timeouts: { openUrl: openUrlTimeout },
-  } = options;
+  constructor(
+    private readonly browserDriverFactory: HeadlessChromiumDriverFactory,
+    private readonly logger: Logger,
+    { poolSize }: ConfigType
+  ) {
+    this.semaphore = new Semaphore(poolSize);
+  }
 
-  return browserDriverFactory
-    .createPage(
-      {
-        browserTimezone,
-        openUrlTimeout,
-        defaultViewport: { height: layout.height, width: layout.width },
-      },
-      logger
-    )
-    .pipe(
-      mergeMap(({ driver, unexpectedExit$, metrics$, close }) => {
-        apmCreatePage?.end();
-        metrics$.subscribe(({ cpu, memory }) => {
-          apmTrans?.setLabel('cpu', cpu, false);
-          apmTrans?.setLabel('memory', memory, false);
-        });
-        unexpectedExit$.subscribe({ error: () => apmTrans?.end() });
+  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult> {
+    const apmTrans = apm.startTransaction('screenshot-pipeline', 'screenshotting');
+    const apmCreateLayout = apmTrans?.startSpan('create-layout', 'setup');
+    const layout = createLayout(options.layout);
+    this.logger.debug(`Layout: width=${layout.width} height=${layout.height}`);
+    apmCreateLayout?.end();
 
-        const screen = new ScreenshotObservableHandler(driver, logger, layout, options);
+    const apmCreatePage = apmTrans?.startSpan('create-page', 'wait');
+    const {
+      browserTimezone,
+      timeouts: { openUrl: openUrlTimeout },
+    } = options;
 
-        return from(options.urls).pipe(
-          concatMap((url, index) =>
-            screen.setupPage(index, url, apmTrans).pipe(
-              catchError((error) => {
-                screen.checkPageIsOpen(); // this fails the job if the browser has closed
+    return this.browserDriverFactory
+      .createPage(
+        {
+          browserTimezone,
+          openUrlTimeout,
+          defaultViewport: { height: layout.height, width: layout.width },
+        },
+        this.logger
+      )
+      .pipe(
+        this.semaphore.acquire(),
+        mergeMap(({ driver, unexpectedExit$, metrics$, close }) => {
+          apmCreatePage?.end();
+          metrics$.subscribe(({ cpu, memory }) => {
+            apmTrans?.setLabel('cpu', cpu, false);
+            apmTrans?.setLabel('memory', memory, false);
+          });
+          unexpectedExit$.subscribe({ error: () => apmTrans?.end() });
 
-                logger.error(error);
-                return of({ ...DEFAULT_SETUP_RESULT, error }); // allow failover screenshot capture
-              }),
-              takeUntil(unexpectedExit$),
-              screen.getScreenshots()
-            )
-          ),
-          take(options.urls.length),
-          toArray(),
-          mergeMap((results) => {
-            // At this point we no longer need the page, close it.
-            return close().pipe(mapTo({ layout, metrics$, results }));
-          })
-        );
-      }),
-      first()
-    );
+          const screen = new ScreenshotObservableHandler(driver, this.logger, layout, options);
+
+          return from(options.urls).pipe(
+            concatMap((url, index) =>
+              screen.setupPage(index, url, apmTrans).pipe(
+                catchError((error) => {
+                  screen.checkPageIsOpen(); // this fails the job if the browser has closed
+
+                  this.logger.error(error);
+                  return of({ ...DEFAULT_SETUP_RESULT, error }); // allow failover screenshot capture
+                }),
+                takeUntil(unexpectedExit$),
+                screen.getScreenshots()
+              )
+            ),
+            take(options.urls.length),
+            toArray(),
+            mergeMap((results) => {
+              // At this point we no longer need the page, close it.
+              return close().pipe(mapTo({ layout, metrics$, results }));
+            })
+          );
+        }),
+        first()
+      );
+  }
 }
diff --git a/x-pack/plugins/screenshotting/server/screenshots/mock.ts b/x-pack/plugins/screenshotting/server/screenshots/mock.ts
index edef9c9044c9a..c4b5707243136 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/mock.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/mock.ts
@@ -7,11 +7,11 @@
 
 import { of, NEVER } from 'rxjs';
 import { createMockLayout } from '../layouts/mock';
-import type { getScreenshots, ScreenshotResult } from '.';
+import type { Screenshots, ScreenshotResult } from '.';
 
-export function createMockScreenshots(): jest.Mocked<{ getScreenshots: typeof getScreenshots }> {
+export function createMockScreenshots(): jest.Mocked<Screenshots> {
   return {
-    getScreenshots: jest.fn((driverFactory, logger, options) =>
+    getScreenshots: jest.fn((options) =>
       of({
         layout: createMockLayout(),
         metrics$: NEVER,
@@ -27,5 +27,5 @@ export function createMockScreenshots(): jest.Mocked<{ getScreenshots: typeof ge
         })),
       } as ScreenshotResult)
     ),
-  };
+  } as unknown as jest.Mocked<Screenshots>;
 }
diff --git a/x-pack/plugins/screenshotting/server/screenshots/semaphore.test.ts b/x-pack/plugins/screenshotting/server/screenshots/semaphore.test.ts
new file mode 100644
index 0000000000000..6d6dd21347974
--- /dev/null
+++ b/x-pack/plugins/screenshotting/server/screenshots/semaphore.test.ts
@@ -0,0 +1,73 @@
+/*
+ * 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 { TestScheduler } from 'rxjs/testing';
+import { Semaphore } from './semaphore';
+
+describe('Semaphore', () => {
+  let testScheduler: TestScheduler;
+
+  beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      return expect(actual).toStrictEqual(expected);
+    });
+  });
+
+  describe('acquire', () => {
+    it('should limit the number of concurrently subscribed observables', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const semaphore = new Semaphore(2);
+        const observable1 = cold('500ms a|').pipe(semaphore.acquire());
+        const observable2 = cold('500ms b|').pipe(semaphore.acquire());
+        const observable3 = cold('500ms c|').pipe(semaphore.acquire());
+
+        expectObservable(observable1).toBe('500ms a|');
+        expectObservable(observable2).toBe('500ms b|');
+        expectObservable(observable3).toBe('1001ms c|');
+      });
+    });
+
+    it('should release semaphore on unsubscription', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const semaphore = new Semaphore(2);
+        const observable1 = cold('500ms a|').pipe(semaphore.acquire());
+        const observable2 = cold('500ms b|').pipe(semaphore.acquire());
+        const observable3 = cold('500ms c|').pipe(semaphore.acquire());
+
+        expectObservable(observable1).toBe('500ms a|');
+        expectObservable(observable2, '^ 100ms !').toBe('');
+        expectObservable(observable3).toBe('601ms c|');
+      });
+    });
+
+    it('should release semaphore on error', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const semaphore = new Semaphore(2);
+        const observable1 = cold('500ms a|').pipe(semaphore.acquire());
+        const observable2 = cold('100ms #').pipe(semaphore.acquire());
+        const observable3 = cold('500ms c|').pipe(semaphore.acquire());
+
+        expectObservable(observable1).toBe('500ms a|');
+        expectObservable(observable2).toBe('100ms #');
+        expectObservable(observable3).toBe('600ms c|');
+      });
+    });
+
+    it('should remove from the queue on unsubscription', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const semaphore = new Semaphore(1);
+        const observable1 = cold('500ms a|').pipe(semaphore.acquire());
+        const observable2 = cold('500ms b').pipe(semaphore.acquire());
+        const observable3 = cold('500ms c|').pipe(semaphore.acquire());
+
+        expectObservable(observable1).toBe('500ms a|');
+        expectObservable(observable2, '^ 100ms !').toBe('');
+        expectObservable(observable3).toBe('1001ms c|');
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/screenshotting/server/screenshots/semaphore.ts b/x-pack/plugins/screenshotting/server/screenshots/semaphore.ts
new file mode 100644
index 0000000000000..cdf021da0f63e
--- /dev/null
+++ b/x-pack/plugins/screenshotting/server/screenshots/semaphore.ts
@@ -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 { Observable } from 'rxjs';
+import type { OperatorFunction } from 'rxjs';
+import { finalize } from 'rxjs/operators';
+
+type Task = () => void;
+
+export class Semaphore {
+  private queue: Task[] = [];
+
+  constructor(private capacity: number) {
+    this.release = this.release.bind(this);
+  }
+
+  acquire<T>(): OperatorFunction<T, T> {
+    return (inner) =>
+      new Observable((outer) => {
+        const task = () => {
+          /**
+           * outer.remove(cancel);
+           *
+           * @todo Uncomment the line above when RxJS is bumped to at least 6.6.3.
+           * @see https://github.com/ReactiveX/rxjs/pull/5659
+           */
+
+          outer.add(inner.pipe(finalize(this.release)).subscribe(outer));
+        };
+        const cancel = this.cancel.bind(this, task);
+
+        outer.add(cancel);
+        this.schedule(task);
+      });
+  }
+
+  protected release(): void {
+    this.capacity++;
+    this.next();
+  }
+
+  private next() {
+    if (this.capacity <= 0 || !this.queue.length) {
+      return;
+    }
+
+    const task = this.queue.shift()!;
+    this.capacity--;
+
+    task();
+  }
+
+  private schedule(task: Task) {
+    this.queue.push(task);
+    this.next();
+  }
+
+  private cancel(task: Task) {
+    const index = this.queue.indexOf(task);
+    if (index < 0) {
+      return;
+    }
+
+    this.queue.splice(index, 1);
+  }
+}

From 9790a7e0087838a6c757192039e1f604ee64b765 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 9 Feb 2022 13:49:20 +0000
Subject: [PATCH 07/85] [ML] Adding category definition and category examples
 api tests (#124710)

* [ML] Adding category definition api tests

* adding test

* adding category examples tests

* updating test checks

* changes based on review

* removing test

* correcting mistake where wrong test was removed

* correctling text text

* fixing test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../ml/results/get_category_definition.ts     | 174 +++++++++++++++++
 .../apis/ml/results/get_category_examples.ts  | 178 ++++++++++++++++++
 .../api_integration/apis/ml/results/index.ts  |   2 +
 x-pack/test/functional/services/ml/api.ts     |  10 +-
 4 files changed, 361 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
 create mode 100644 x-pack/test/api_integration/apis/ml/results/get_category_examples.ts

diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
new file mode 100644
index 0000000000000..36f0f3946ac66
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
@@ -0,0 +1,174 @@
+/*
+ * 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 { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
+import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+  const spacesService = getService('spaces');
+
+  const jobIdSpace1 = `sample_logs_${Date.now()}`;
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+
+  const PARTITION_FIELD_NAME = 'event.dataset';
+  const testJobConfig = {
+    job_id: jobIdSpace1,
+    groups: ['sample_logs', 'bootstrap', 'categorization'],
+    description: "count by mlcategory (message) on 'sample logs' dataset with 15m bucket span",
+    analysis_config: {
+      bucket_span: '15m',
+      categorization_field_name: 'message',
+      per_partition_categorization: { enabled: true, stop_on_warn: true },
+      detectors: [
+        {
+          function: 'count',
+          by_field_name: 'mlcategory',
+          partition_field_name: PARTITION_FIELD_NAME,
+        },
+      ],
+      influencers: ['mlcategory'],
+    },
+    analysis_limits: { model_memory_limit: '26MB' },
+    data_description: { time_field: '@timestamp', time_format: 'epoch_ms' },
+    model_plot_config: { enabled: false, annotations_enabled: true },
+    model_snapshot_retention_days: 10,
+    daily_model_snapshot_retention_after_days: 1,
+    allow_lazy_open: false,
+  };
+  // @ts-expect-error not full interface
+  const testDatafeedConfig: Datafeed = {
+    datafeed_id: `datafeed-${jobIdSpace1}`,
+    indices: ['ft_module_sample_logs'],
+    job_id: jobIdSpace1,
+    query: { bool: { must: [{ match_all: {} }] } },
+  };
+
+  const expectedCategoryDefinition = {
+    categoryId: '1',
+    examplesLength: 4,
+  };
+
+  async function getCategoryDefinition(
+    jobId: string,
+    categoryId: string,
+    user: USER,
+    expectedStatusCode: number,
+    space?: string
+  ) {
+    const { body } = await supertest
+      .post(`${space ? `/s/${space}` : ''}/api/ml/results/category_definition`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS)
+      .send({ jobId, categoryId })
+      .expect(expectedStatusCode);
+
+    return body;
+  }
+
+  describe('get category_definition', function () {
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+
+      await ml.api.createAndRunAnomalyDetectionLookbackJob(
+        // @ts-expect-error not full interface
+        testJobConfig,
+        testDatafeedConfig,
+        idSpace1
+      );
+    });
+
+    after(async () => {
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+    });
+
+    it('should produce the correct category for the job', async () => {
+      const resp = await getCategoryDefinition(
+        jobIdSpace1,
+        expectedCategoryDefinition.categoryId,
+        USER.ML_POWERUSER,
+        200,
+        idSpace1
+      );
+
+      expect(resp.categoryId).to.eql(
+        expectedCategoryDefinition.categoryId,
+        `categoryId should be ${expectedCategoryDefinition.categoryId} (got ${resp.categoryId})`
+      );
+      expect(resp.examples.length).to.eql(
+        expectedCategoryDefinition.examplesLength,
+        `examples list length should be ${expectedCategoryDefinition.examplesLength} (got ${resp.examples.length})`
+      );
+      expect(resp.terms.length).to.be.greaterThan(
+        0,
+        `terms string length should be greater than 0 (got ${resp.terms.length})`
+      );
+      expect(resp.regex.length).to.be.greaterThan(
+        0,
+        `regex string length should be greater than 0 (got ${resp.regex.length})`
+      );
+    });
+
+    it('should not produce the correct category for the job in the wrong space', async () => {
+      await getCategoryDefinition(
+        jobIdSpace1,
+        expectedCategoryDefinition.categoryId,
+        USER.ML_POWERUSER,
+        404,
+        idSpace2
+      );
+    });
+
+    it('should produce the correct category for ml viewer user', async () => {
+      const resp = await getCategoryDefinition(
+        jobIdSpace1,
+        expectedCategoryDefinition.categoryId,
+        USER.ML_VIEWER,
+        200,
+        idSpace1
+      );
+
+      expect(resp.categoryId).to.eql(
+        expectedCategoryDefinition.categoryId,
+        `categoryId should be ${expectedCategoryDefinition.categoryId} (got ${resp.categoryId})`
+      );
+      expect(resp.examples.length).to.eql(
+        expectedCategoryDefinition.examplesLength,
+        `examples list length should be ${expectedCategoryDefinition.examplesLength} (got ${resp.examples.length})`
+      );
+      expect(resp.terms.length).to.be.greaterThan(
+        0,
+        `terms string length should be greater than 0 (got ${resp.terms.length})`
+      );
+      expect(resp.regex.length).to.be.greaterThan(
+        0,
+        `regex string length should be greater than 0 (got ${resp.regex.length})`
+      );
+    });
+
+    it('should not produce the correct category for ml unauthorized user', async () => {
+      await getCategoryDefinition(
+        jobIdSpace1,
+        expectedCategoryDefinition.categoryId,
+        USER.ML_UNAUTHORIZED,
+        403,
+        idSpace1
+      );
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
new file mode 100644
index 0000000000000..79586daaa4aac
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
@@ -0,0 +1,178 @@
+/*
+ * 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 { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
+import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+  const spacesService = getService('spaces');
+
+  const jobIdSpace1 = `sample_logs_${Date.now()}`;
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+
+  const PARTITION_FIELD_NAME = 'event.dataset';
+  const testJobConfig = {
+    job_id: jobIdSpace1,
+    groups: ['sample_logs', 'bootstrap', 'categorization'],
+    description: "count by mlcategory (message) on 'sample logs' dataset with 15m bucket span",
+    analysis_config: {
+      bucket_span: '15m',
+      categorization_field_name: 'message',
+      per_partition_categorization: { enabled: true, stop_on_warn: true },
+      detectors: [
+        {
+          function: 'count',
+          by_field_name: 'mlcategory',
+          partition_field_name: PARTITION_FIELD_NAME,
+        },
+      ],
+      influencers: ['mlcategory'],
+    },
+    analysis_limits: { model_memory_limit: '26MB' },
+    data_description: { time_field: '@timestamp', time_format: 'epoch_ms' },
+    model_plot_config: { enabled: false, annotations_enabled: true },
+    model_snapshot_retention_days: 10,
+    daily_model_snapshot_retention_after_days: 1,
+    allow_lazy_open: false,
+  };
+  // @ts-expect-error not full interface
+  const testDatafeedConfig: Datafeed = {
+    datafeed_id: `datafeed-${jobIdSpace1}`,
+    indices: ['ft_module_sample_logs'],
+    job_id: jobIdSpace1,
+    query: { bool: { must: [{ match_all: {} }] } },
+  };
+
+  const expectedCategoryExamples = {
+    categoryId: '1',
+    examplesLength: 3,
+  };
+
+  async function getCategoryExamples(
+    jobId: string,
+    categoryIds: string[],
+    maxExamples: number,
+    user: USER,
+    expectedStatusCode: number,
+    space?: string
+  ) {
+    const { body } = await supertest
+      .post(`${space ? `/s/${space}` : ''}/api/ml/results/category_examples`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS)
+      .send({ jobId, categoryIds, maxExamples })
+      .expect(expectedStatusCode);
+
+    return body;
+  }
+
+  describe('get category_examples', function () {
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+
+      await ml.api.createAndRunAnomalyDetectionLookbackJob(
+        // @ts-expect-error not full interface
+        testJobConfig,
+        testDatafeedConfig,
+        idSpace1
+      );
+    });
+
+    after(async () => {
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+    });
+
+    it('should produce the correct 1 example for the job', async () => {
+      const maxExamples = 1;
+      const resp = await getCategoryExamples(
+        jobIdSpace1,
+        [expectedCategoryExamples.categoryId],
+        maxExamples,
+        USER.ML_POWERUSER,
+        200,
+        idSpace1
+      );
+
+      expect(resp[expectedCategoryExamples.categoryId].length).to.eql(
+        maxExamples,
+        `response examples length should be ${maxExamples} (got ${
+          resp[expectedCategoryExamples.categoryId].length
+        })`
+      );
+    });
+
+    it('should produce the correct 3 examples for the job', async () => {
+      const resp = await getCategoryExamples(
+        jobIdSpace1,
+        [expectedCategoryExamples.categoryId],
+        expectedCategoryExamples.examplesLength,
+        USER.ML_POWERUSER,
+        200,
+        idSpace1
+      );
+
+      expect(resp[expectedCategoryExamples.categoryId].length).to.eql(
+        expectedCategoryExamples.examplesLength,
+        `response examples length should be ${expectedCategoryExamples.examplesLength} (got ${
+          resp[expectedCategoryExamples.categoryId].length
+        })`
+      );
+    });
+
+    it('should not produce the correct examples for the job in the wrong space', async () => {
+      await getCategoryExamples(
+        jobIdSpace1,
+        [expectedCategoryExamples.categoryId],
+        expectedCategoryExamples.examplesLength,
+        USER.ML_POWERUSER,
+        404,
+        idSpace2
+      );
+    });
+
+    it('should produce the correct example for the job for the ml viewer user', async () => {
+      const resp = await getCategoryExamples(
+        jobIdSpace1,
+        [expectedCategoryExamples.categoryId],
+        expectedCategoryExamples.examplesLength,
+        USER.ML_VIEWER,
+        200,
+        idSpace1
+      );
+
+      expect(resp[expectedCategoryExamples.categoryId].length).to.eql(
+        expectedCategoryExamples.examplesLength,
+        `response examples length should be ${expectedCategoryExamples.examplesLength} (got ${
+          resp[expectedCategoryExamples.categoryId].length
+        })`
+      );
+    });
+
+    it('should not produce the correct example for the job for the ml unauthorized user', async () => {
+      await getCategoryExamples(
+        jobIdSpace1,
+        [expectedCategoryExamples.categoryId],
+        expectedCategoryExamples.examplesLength,
+        USER.ML_UNAUTHORIZED,
+        403,
+        idSpace1
+      );
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/results/index.ts b/x-pack/test/api_integration/apis/ml/results/index.ts
index 83338dcab57cd..575435fa3a720 100644
--- a/x-pack/test/api_integration/apis/ml/results/index.ts
+++ b/x-pack/test/api_integration/apis/ml/results/index.ts
@@ -12,5 +12,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./get_anomalies_table_data'));
     loadTestFile(require.resolve('./get_categorizer_stats'));
     loadTestFile(require.resolve('./get_stopped_partitions'));
+    loadTestFile(require.resolve('./get_category_definition'));
+    loadTestFile(require.resolve('./get_category_examples'));
   });
 }
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index ebe7f7e84d158..58f0b6d678cc2 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -681,9 +681,13 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       log.debug('> Datafeed stopped.');
     },
 
-    async createAndRunAnomalyDetectionLookbackJob(jobConfig: Job, datafeedConfig: Datafeed) {
-      await this.createAnomalyDetectionJob(jobConfig);
-      await this.createDatafeed(datafeedConfig);
+    async createAndRunAnomalyDetectionLookbackJob(
+      jobConfig: Job,
+      datafeedConfig: Datafeed,
+      space?: string
+    ) {
+      await this.createAnomalyDetectionJob(jobConfig, space);
+      await this.createDatafeed(datafeedConfig, space);
       await this.openAnomalyDetectionJob(jobConfig.job_id);
       await this.startDatafeed(datafeedConfig.datafeed_id, { start: '0', end: `${Date.now()}` });
       await this.waitForDatafeedState(datafeedConfig.datafeed_id, DATAFEED_STATE.STOPPED);

From 7dfc395423d100144ed9ca235ca0dfb973f92f93 Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Wed, 9 Feb 2022 06:11:21 -0800
Subject: [PATCH 08/85] Adjusting uptime readonly feature (#125031)

* Adjusting uptime readonly feature

* Missed another occurrence, good call Xavier
---
 x-pack/plugins/uptime/server/kibana.index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index f5008e3f39da7..461c2ba16366a 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -60,7 +60,7 @@ export const initServerWithKibana = (
         catalogue: ['uptime'],
         api: ['uptime-read', 'uptime-write', 'lists-all'],
         savedObject: {
-          all: [umDynamicSettings.name, 'alert', syntheticsMonitorType, syntheticsApiKeyObjectType],
+          all: [umDynamicSettings.name, syntheticsMonitorType, syntheticsApiKeyObjectType],
           read: [],
         },
         alerting: {
@@ -91,7 +91,7 @@ export const initServerWithKibana = (
         catalogue: ['uptime'],
         api: ['uptime-read', 'lists-read'],
         savedObject: {
-          all: ['alert'],
+          all: [],
           read: [umDynamicSettings.name, syntheticsMonitorType, syntheticsApiKeyObjectType],
         },
         alerting: {

From 691315a27450ccf19b1f67ede5e1ac32451300c5 Mon Sep 17 00:00:00 2001
From: sphilipse <94373878+sphilipse@users.noreply.github.com>
Date: Wed, 9 Feb 2022 15:44:40 +0100
Subject: [PATCH 09/85] Fix minor textual errors in Workplace Search (#121853)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../content_sources/components/add_source/save_custom.tsx     | 2 +-
 .../workplace_search/views/content_sources/constants.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
index 9dbbcc537fa31..c136f22d91d3d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
@@ -174,7 +174,7 @@ export const SaveCustom: React.FC<SaveCustomProps> = ({
                   <p>
                     <FormattedMessage
                       id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.permissions.text"
-                      defaultMessage="{link} manage content access content on individual or group attributes. Allow or deny access to specific documents."
+                      defaultMessage="{link} manage content access on individual or group attributes. Allow or deny access to specific documents."
                       values={{
                         link: (
                           <EuiLink
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
index 43b391bc1d824..92749f5129197 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
@@ -108,7 +108,7 @@ export const DOCUMENT_PERMISSIONS_TEXT = i18n.translate(
 export const DOCUMENT_PERMISSIONS_DISABLED_TEXT = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.sources.documentPermissionsDisabled.text',
   {
-    defaultMessage: 'Disabled for this sources',
+    defaultMessage: 'Disabled for this source',
   }
 );
 
@@ -162,7 +162,7 @@ export const DOC_PERMISSIONS_DESCRIPTION = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description',
   {
     defaultMessage:
-      'Document-level permissions manage content access content on individual or group attributes. Allow or deny access to specific documents.',
+      'Document-level permissions manage content access on individual or group attributes. Allow or deny access to specific documents.',
   }
 );
 

From 449f8e67383228436168176c1f0831be85b26f51 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 9 Feb 2022 08:54:30 -0600
Subject: [PATCH 10/85] [App Search] Add `EuiThemeProvider` to fix crashing bug
 (#124993)

---
 .../shared/log_stream/log_stream.test.tsx     | 35 ++++++++++---------
 .../shared/log_stream/log_stream.tsx          | 15 ++++----
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
index a934afb3b0d29..d2dd41e82b2e3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
@@ -9,18 +9,17 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { LogStream } from '../../../../../infra/public';
-
 import { EntSearchLogStream } from './';
 
 describe('EntSearchLogStream', () => {
   const mockDateNow = jest.spyOn(global.Date, 'now').mockReturnValue(160000000);
 
   describe('renders with default props', () => {
-    const wrapper = shallow(<EntSearchLogStream />);
+    /** As a result of the theme provider being added, we have to extract the child component to correctly assert */
+    const wrapper = shallow(shallow(<EntSearchLogStream />).prop('children'));
 
-    it('renders a LogStream component', () => {
-      expect(wrapper.type()).toEqual(LogStream);
+    it('renders a LogStream (wrapped in React.Suspense) component', () => {
+      expect(wrapper.type()).toEqual(React.Suspense);
     });
 
     it('renders with the enterprise search log source ID', () => {
@@ -36,7 +35,9 @@ describe('EntSearchLogStream', () => {
   describe('renders custom props', () => {
     it('overrides the default props', () => {
       const wrapper = shallow(
-        <EntSearchLogStream sourceId="test" startTimestamp={1} endTimestamp={2} />
+        shallow(<EntSearchLogStream sourceId="test" startTimestamp={1} endTimestamp={2} />).prop(
+          'children'
+        )
       );
 
       expect(wrapper.prop('sourceId')).toEqual('test');
@@ -45,7 +46,7 @@ describe('EntSearchLogStream', () => {
     });
 
     it('allows passing a custom hoursAgo that modifies the default start timestamp', () => {
-      const wrapper = shallow(<EntSearchLogStream hoursAgo={1} />);
+      const wrapper = shallow(shallow(<EntSearchLogStream hoursAgo={1} />).prop('children'));
 
       expect(wrapper.prop('startTimestamp')).toEqual(156400000);
       expect(wrapper.prop('endTimestamp')).toEqual(160000000);
@@ -53,15 +54,17 @@ describe('EntSearchLogStream', () => {
 
     it('allows passing any prop that the LogStream component takes', () => {
       const wrapper = shallow(
-        <EntSearchLogStream
-          height={500}
-          highlight="some-log-id"
-          columns={[
-            { type: 'timestamp', header: 'Timestamp' },
-            { type: 'field', field: 'log.level', header: 'Log level', width: 300 },
-          ]}
-          filters={[]}
-        />
+        shallow(
+          <EntSearchLogStream
+            height={500}
+            highlight="some-log-id"
+            columns={[
+              { type: 'timestamp', header: 'Timestamp' },
+              { type: 'field', field: 'log.level', header: 'Log level', width: 300 },
+            ]}
+            filters={[]}
+          />
+        ).prop('children')
       );
 
       expect(wrapper.prop('height')).toEqual(500);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
index c1f4262881bd2..e826a559451f6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 
+import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
 import { LogStream, LogStreamProps } from '../../../../../infra/public';
 
 import { LOGS_SOURCE_ID } from '../../../../common/constants';
@@ -37,11 +38,13 @@ export const EntSearchLogStream: React.FC<Props> = ({
   if (!startTimestamp) startTimestamp = endTimestamp - hoursAgo * 60 * 60 * 1000;
 
   return (
-    <LogStream
-      sourceId={LOGS_SOURCE_ID}
-      startTimestamp={startTimestamp}
-      endTimestamp={endTimestamp}
-      {...props}
-    />
+    <EuiThemeProvider>
+      <LogStream
+        sourceId={LOGS_SOURCE_ID}
+        startTimestamp={startTimestamp}
+        endTimestamp={endTimestamp}
+        {...props}
+      />
+    </EuiThemeProvider>
   );
 };

From 440f5f0d51373b7fa79735879fb853fbda310ed9 Mon Sep 17 00:00:00 2001
From: Faisal Kanout <faisal.kanout@elastic.co>
Date: Wed, 9 Feb 2022 18:32:46 +0300
Subject: [PATCH 11/85] [RAC][Logs]Use symbols comparator in logs reason msg
 (#124727)

* Use symbols comparator in logs reason msg

* Update i18n keys

* Codereview fixes - Use symbols without i18n

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../alerting/logs/log_threshold/types.ts      | 31 +++++++++++++++++++
 .../log_threshold/reason_formatters.ts        | 18 +++++------
 2 files changed, 40 insertions(+), 9 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 dba94d2c8fd93..845f5d928df26 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
@@ -92,6 +92,37 @@ export const ComparatorToi18nMap = {
   ),
 };
 
+export const ComparatorToi18nSymbolsMap = {
+  [Comparator.GT]: '>',
+  [Comparator.GT_OR_EQ]: '≥',
+  [Comparator.LT]: '<',
+  [Comparator.LT_OR_EQ]: '≤',
+  [Comparator.EQ]: '=',
+  [Comparator.NOT_EQ]: '≠',
+  [`${Comparator.EQ}:number`]: '=',
+  [`${Comparator.NOT_EQ}:number`]: '≠',
+
+  // TODO: We could need to update the next messages to use symbols.
+  [Comparator.MATCH]: i18n.translate('xpack.infra.logs.alerting.comparator.symbol.match', {
+    defaultMessage: 'matches',
+  }),
+  [Comparator.NOT_MATCH]: i18n.translate('xpack.infra.logs.alerting.comparator.symbol.notMatch', {
+    defaultMessage: 'does not match',
+  }),
+  [Comparator.MATCH_PHRASE]: i18n.translate(
+    'xpack.infra.logs.alerting.comparator.symbol.matchPhrase',
+    {
+      defaultMessage: 'matches phrase',
+    }
+  ),
+  [Comparator.NOT_MATCH_PHRASE]: i18n.translate(
+    'xpack.infra.logs.alerting.comparator.symbol.notMatchPhrase',
+    {
+      defaultMessage: 'does not match phrase',
+    }
+  ),
+};
+
 // Alert parameters //
 export enum AlertStates {
   OK,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
index 25f8ca50e995d..5f43ac01485ed 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import {
   Comparator,
-  ComparatorToi18nMap,
+  ComparatorToi18nSymbolsMap,
   TimeUnit,
 } from '../../../../common/alerting/logs/log_threshold/types';
 
@@ -23,11 +23,11 @@ export const getReasonMessageForUngroupedCountAlert = (
 ) =>
   i18n.translate('xpack.infra.logs.alerting.threshold.ungroupedCountAlertReasonDescription', {
     defaultMessage:
-      '{actualCount, plural, one {{actualCount} log entry} other {{actualCount} log entries}} in the last {duration}. Alert when ({translatedComparator} {expectedCount}).',
+      '{actualCount, plural, one {{actualCount} log entry} other {{actualCount} log entries}} in the last {duration}. Alert when {comparator} {expectedCount}.',
     values: {
       actualCount,
       expectedCount,
-      translatedComparator: ComparatorToi18nMap[comparator],
+      comparator: ComparatorToi18nSymbolsMap[comparator],
       duration: formatDurationFromTimeUnitChar(timeSize, timeUnit as TimeUnitChar),
     },
   });
@@ -42,12 +42,12 @@ export const getReasonMessageForGroupedCountAlert = (
 ) =>
   i18n.translate('xpack.infra.logs.alerting.threshold.groupedCountAlertReasonDescription', {
     defaultMessage:
-      '{actualCount, plural, one {{actualCount} log entry} other {{actualCount} log entries}} in the last {duration} for {groupName}. Alert when ({translatedComparator} {expectedCount}).',
+      '{actualCount, plural, one {{actualCount} log entry} other {{actualCount} log entries}} in the last {duration} for {groupName}. Alert when {comparator} {expectedCount}.',
     values: {
       actualCount,
       expectedCount,
       groupName,
-      translatedComparator: ComparatorToi18nMap[comparator],
+      comparator: ComparatorToi18nSymbolsMap[comparator],
       duration: formatDurationFromTimeUnitChar(timeSize, timeUnit as TimeUnitChar),
     },
   });
@@ -61,11 +61,11 @@ export const getReasonMessageForUngroupedRatioAlert = (
 ) =>
   i18n.translate('xpack.infra.logs.alerting.threshold.ungroupedRatioAlertReasonDescription', {
     defaultMessage:
-      'The ratio of selected logs is {actualRatio} in the last {duration}. Alert when ({translatedComparator} {expectedRatio}).',
+      'The ratio of selected logs is {actualRatio} in the last {duration}. Alert when {comparator} {expectedRatio}.',
     values: {
       actualRatio,
       expectedRatio,
-      translatedComparator: ComparatorToi18nMap[comparator],
+      comparator: ComparatorToi18nSymbolsMap[comparator],
       duration: formatDurationFromTimeUnitChar(timeSize, timeUnit as TimeUnitChar),
     },
   });
@@ -80,12 +80,12 @@ export const getReasonMessageForGroupedRatioAlert = (
 ) =>
   i18n.translate('xpack.infra.logs.alerting.threshold.groupedRatioAlertReasonDescription', {
     defaultMessage:
-      'The ratio of selected logs is {actualRatio} in the last {duration} for {groupName}. Alert when ({translatedComparator} {expectedRatio}).',
+      'The ratio of selected logs is {actualRatio} in the last {duration} for {groupName}. Alert when {comparator} {expectedRatio}.',
     values: {
       actualRatio,
       expectedRatio,
       groupName,
-      translatedComparator: ComparatorToi18nMap[comparator],
+      comparator: ComparatorToi18nSymbolsMap[comparator],
       duration: formatDurationFromTimeUnitChar(timeSize, timeUnit as TimeUnitChar),
     },
   });

From 79c861639929e8618590dbacbe4ce1f56fdc6aa2 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 9 Feb 2022 10:51:01 -0500
Subject: [PATCH 12/85] [Fleet] Get package info should not store the whole
 package (#123509)

---
 .../fleet/server/routes/epm/handlers.ts       |   4 +-
 .../routes/package_policy/handlers.test.ts    |   2 +-
 .../fleet/server/services/epm/packages/get.ts |  39 +
 .../server/services/epm/packages/index.ts     |   1 +
 .../epm/__snapshots__/install_by_upload.snap  | 712 ------------------
 .../fleet_api_integration/apis/epm/get.ts     |   8 +-
 .../apis/epm/install_by_upload.ts             |  14 -
 7 files changed, 47 insertions(+), 733 deletions(-)
 delete mode 100644 x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap

diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
index 4953cecbf211d..16f2d2e13e18c 100644
--- a/x-pack/plugins/fleet/server/routes/epm/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -43,7 +43,7 @@ import {
   getCategories,
   getPackages,
   getFile,
-  getPackageInfo,
+  getPackageInfoFromRegistry,
   isBulkInstallError,
   installPackage,
   removeInstallation,
@@ -199,7 +199,7 @@ export const getInfoHandler: FleetRequestHandler<
     if (pkgVersion && !semverValid(pkgVersion)) {
       throw new IngestManagerError('Package version is not a valid semver');
     }
-    const res = await getPackageInfo({
+    const res = await getPackageInfoFromRegistry({
       savedObjectsClient,
       pkgName,
       pkgVersion: pkgVersion || '',
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
index c4cef2a4d8d3b..a178422e20ee5 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -90,7 +90,7 @@ jest.mock(
 jest.mock('../../services/epm/packages', () => {
   return {
     ensureInstalledPackage: jest.fn(() => Promise.resolve()),
-    getPackageInfo: jest.fn(() => Promise.resolve()),
+    getPackageInfoFromRegistry: jest.fn(() => Promise.resolve()),
   };
 });
 
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
index 755fafd8fbc7a..a7cbea4d6462a 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@@ -98,6 +98,45 @@ export async function getPackageSavedObjects(
 
 export const getInstallations = getPackageSavedObjects;
 
+export async function getPackageInfoFromRegistry(options: {
+  savedObjectsClient: SavedObjectsClientContract;
+  pkgName: string;
+  pkgVersion: string;
+}): Promise<PackageInfo> {
+  const { savedObjectsClient, pkgName, pkgVersion } = options;
+  const [savedObject, latestPackage] = await Promise.all([
+    getInstallationObject({ savedObjectsClient, pkgName }),
+    Registry.fetchFindLatestPackage(pkgName),
+  ]);
+
+  // If no package version is provided, use the installed version in the response
+  let responsePkgVersion = pkgVersion || savedObject?.attributes.install_version;
+  // If no installed version of the given package exists, default to the latest version of the package
+  if (!responsePkgVersion) {
+    responsePkgVersion = latestPackage.version;
+  }
+  const packageInfo = await Registry.fetchInfo(pkgName, responsePkgVersion);
+
+  // Fix the paths
+  const paths =
+    packageInfo?.assets?.map((path) =>
+      path.replace(`/package/${pkgName}/${pkgVersion}`, `${pkgName}-${pkgVersion}`)
+    ) ?? [];
+
+  // add properties that aren't (or aren't yet) on the package
+  const additions: EpmPackageAdditions = {
+    latestVersion: latestPackage.version,
+    title: packageInfo.title || nameAsTitle(packageInfo.name),
+    assets: Registry.groupPathsByService(paths || []),
+    removable: true,
+    notice: Registry.getNoticePath(paths || []),
+    keepPoliciesUpToDate: savedObject?.attributes.keep_policies_up_to_date ?? false,
+  };
+  const updated = { ...packageInfo, ...additions };
+
+  return createInstallableFrom(updated, savedObject);
+}
+
 export async function getPackageInfo(options: {
   savedObjectsClient: SavedObjectsClientContract;
   pkgName: string;
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/index.ts b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
index 2c79045c626d3..fa2e5781a209e 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
@@ -20,6 +20,7 @@ export {
   getInstallation,
   getInstallations,
   getPackageInfo,
+  getPackageInfoFromRegistry,
   getPackages,
   getLimitedPackages,
 } from './get';
diff --git a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap b/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
deleted file mode 100644
index 2e0014b998bdc..0000000000000
--- a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
+++ /dev/null
@@ -1,712 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Fleet Endpoints EPM Endpoints installs packages from direct upload should install a zip archive correctly and package info should return correctly after validation 1`] = `
-Object {
-  "assets": Object {
-    "elasticsearch": Object {
-      "ingest_pipeline": Array [
-        Object {
-          "dataset": "access",
-          "file": "default.yml",
-          "path": "apache-0.1.4/data_stream/access/elasticsearch/ingest_pipeline/default.yml",
-          "pkgkey": "apache-0.1.4",
-          "service": "elasticsearch",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "dataset": "error",
-          "file": "default.yml",
-          "path": "apache-0.1.4/data_stream/error/elasticsearch/ingest_pipeline/default.yml",
-          "pkgkey": "apache-0.1.4",
-          "service": "elasticsearch",
-          "type": "ingest_pipeline",
-        },
-      ],
-    },
-    "kibana": Object {
-      "dashboard": Array [
-        Object {
-          "file": "apache-Logs-Apache-Dashboard-ecs-new.json",
-          "path": "apache-0.1.4/kibana/dashboard/apache-Logs-Apache-Dashboard-ecs-new.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "dashboard",
-        },
-        Object {
-          "file": "apache-Metrics-Apache-HTTPD-server-status-ecs.json",
-          "path": "apache-0.1.4/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "dashboard",
-        },
-      ],
-      "search": Array [
-        Object {
-          "file": "Apache-access-logs-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-access-logs-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-        Object {
-          "file": "Apache-errors-log-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-errors-log-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-        Object {
-          "file": "Apache-HTTPD-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-HTTPD-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-      ],
-      "visualization": Array [
-        Object {
-          "file": "Apache-access-unique-IPs-map-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-access-unique-IPs-map-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-CPU-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-CPU-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Load1-slash-5-slash-15-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Load1-slash-5-slash-15-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-response-codes-over-time-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-response-codes-over-time-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Workers-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Workers-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Hostname-list-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Hostname-list-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-error-logs-over-time-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-error-logs-over-time-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Scoreboard-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Scoreboard-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Uptime-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Uptime-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-operating-systems-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-operating-systems-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Total-accesses-and-kbytes-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Total-accesses-and-kbytes-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-browsers-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-browsers-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-response-codes-of-top-URLs-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-response-codes-of-top-URLs-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-      ],
-    },
-  },
-  "categories": Array [
-    "web",
-  ],
-  "conditions": Object {
-    "kibana.version": "^7.9.0",
-  },
-  "data_streams": Array [
-    Object {
-      "dataset": "apache.access",
-      "package": "apache",
-      "path": "access",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache access logs",
-          "input": "logfile",
-          "template_path": "log.yml.hbs",
-          "title": "Apache access logs",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "/var/log/apache2/access.log*",
-                "/var/log/apache2/other_vhosts_access.log*",
-                "/var/log/httpd/access_log*",
-              ],
-              "multi": true,
-              "name": "paths",
-              "required": true,
-              "show_user": true,
-              "title": "Paths",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache access logs",
-      "type": "logs",
-    },
-    Object {
-      "dataset": "apache.status",
-      "package": "apache",
-      "path": "status",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache status metrics",
-          "input": "apache/metrics",
-          "template_path": "stream.yml.hbs",
-          "title": "Apache status metrics",
-          "vars": Array [
-            Object {
-              "default": "10s",
-              "multi": false,
-              "name": "period",
-              "required": true,
-              "show_user": true,
-              "title": "Period",
-              "type": "text",
-            },
-            Object {
-              "default": "/server-status",
-              "multi": false,
-              "name": "server_status_path",
-              "required": true,
-              "show_user": false,
-              "title": "Server Status Path",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache status metrics",
-      "type": "metrics",
-    },
-    Object {
-      "dataset": "apache.error",
-      "package": "apache",
-      "path": "error",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache error logs",
-          "input": "logfile",
-          "template_path": "log.yml.hbs",
-          "title": "Apache error logs",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "/var/log/apache2/error.log*",
-                "/var/log/httpd/error_log*",
-              ],
-              "multi": true,
-              "name": "paths",
-              "required": true,
-              "show_user": true,
-              "title": "Paths",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache error logs",
-      "type": "logs",
-    },
-  ],
-  "description": "Apache Uploaded Test Integration",
-  "format_version": "1.0.0",
-  "icons": Array [
-    Object {
-      "size": "32x32",
-      "src": "/img/logo_apache_test.svg",
-      "title": "Apache Logo",
-      "type": "image/svg+xml",
-    },
-  ],
-  "keepPoliciesUpToDate": false,
-  "license": "basic",
-  "name": "apache",
-  "owner": Object {
-    "github": "elastic/integrations-services",
-  },
-  "policy_templates": Array [
-    Object {
-      "description": "Collect logs and metrics from Apache instances",
-      "inputs": Array [
-        Object {
-          "description": "Collecting Apache access and error logs",
-          "title": "Collect logs from Apache instances",
-          "type": "logfile",
-          "vars": Array [],
-        },
-        Object {
-          "description": "Collecting Apache status metrics",
-          "title": "Collect metrics from Apache instances",
-          "type": "apache/metrics",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "http://127.0.0.1",
-              ],
-              "multi": true,
-              "name": "hosts",
-              "required": true,
-              "show_user": true,
-              "title": "Hosts",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "multiple": true,
-      "name": "apache",
-      "title": "Apache logs and metrics",
-    },
-  ],
-  "readme": "/package/apache/0.1.4/docs/README.md",
-  "release": "experimental",
-  "removable": true,
-  "savedObject": Object {
-    "attributes": Object {
-      "es_index_patterns": Object {
-        "access": "logs-apache.access-*",
-        "error": "logs-apache.error-*",
-        "status": "metrics-apache.status-*",
-      },
-      "install_source": "upload",
-      "install_status": "installed",
-      "install_version": "0.1.4",
-      "installed_es": Array [
-        Object {
-          "id": "logs-apache.access-0.1.4-default",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "id": "logs-apache.error-0.1.4-default",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "id": "logs-apache.access",
-          "type": "index_template",
-        },
-        Object {
-          "id": "logs-apache.access@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.access@custom",
-          "type": "component_template",
-        },
-        Object {
-          "id": "metrics-apache.status",
-          "type": "index_template",
-        },
-        Object {
-          "id": "metrics-apache.status@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "metrics-apache.status@custom",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.error",
-          "type": "index_template",
-        },
-        Object {
-          "id": "logs-apache.error@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.error@custom",
-          "type": "component_template",
-        },
-      ],
-      "installed_kibana": Array [
-        Object {
-          "id": "apache-Logs-Apache-Dashboard-ecs",
-          "type": "dashboard",
-        },
-        Object {
-          "id": "apache-Metrics-Apache-HTTPD-server-status-ecs",
-          "type": "dashboard",
-        },
-        Object {
-          "id": "Apache-access-unique-IPs-map-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-CPU-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Load1-slash-5-slash-15-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-response-codes-over-time-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Workers-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Hostname-list-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-error-logs-over-time-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Scoreboard-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Uptime-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-operating-systems-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Total-accesses-and-kbytes-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-browsers-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-response-codes-of-top-URLs-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-access-logs-ecs",
-          "type": "search",
-        },
-        Object {
-          "id": "Apache-errors-log-ecs",
-          "type": "search",
-        },
-        Object {
-          "id": "Apache-HTTPD-ecs",
-          "type": "search",
-        },
-      ],
-      "installed_kibana_space_id": "default",
-      "name": "apache",
-      "package_assets": Array [
-        Object {
-          "id": "2f1ab9c0-8cf6-5e83-afcd-0d12851c8108",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "841166f1-6db0-5f7a-a8d9-768e88ddf984",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b12ae5e1-daf2-51a7-99d8-0888d1f13b5b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "2f263b24-c36a-5ea8-a707-76d1f274c888",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "bd5ff9ad-ba4a-5215-b5af-cef58a3aa886",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "5fc59aa9-1d7e-50ae-8ce5-b875ab44cfc5",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "7c850453-346b-5010-a946-28b83fc69e48",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f02f8adb-3e0c-5f2f-b4f2-a04dc645b713",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "889d88db-6214-5836-aeff-1a87f8513b27",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "06a6b940-a745-563c-abf4-83eb3335926b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e68fd7ac-302e-5b75-bbbb-d69b441c8848",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "2c57fe0f-3b1a-57da-a63b-28f9b9e82bce",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "13db43e8-f8f9-57f0-b131-a171c2f2070f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e8750081-1c0b-5c55-bcab-fa6d47f01a85",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "71af57fe-25c4-5935-9879-ca4a2fba730e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "cc287718-9573-5c56-a9ed-6dfef6589506",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8badd8ba-289a-5e60-a1c0-f3d39e15cda3",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "20300efc-10eb-5fac-ba90-f6aa9b467e84",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "047c89df-33c2-5d74-b0a4-8b441879761c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "9838a13f-1b89-5c54-844e-978620d66a1d",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e105414b-221d-5433-8b24-452625f59b7c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "eb166c25-843b-5271-8d43-6fb005d2df5a",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "342dbf4d-d88d-53e8-b365-d3639ebbbb14",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f98c44a3-eaea-505f-8598-3b7f1097ef59",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "12da8c6c-d0e3-589c-9244-88d857ea76b6",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e2d151ed-709c-542d-b797-cb95f353b9b3",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f434cffe-0b00-59de-a17f-c1e71bd4ab0f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "5bd0c25f-04a5-5fd0-8298-ba9aa2f6fe5e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "279da3a3-8e9b-589b-86e0-bd7364821bab",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b8758fcb-08bf-50fa-89bd-24398955298a",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "96e4eb36-03c3-5856-af44-559fd5133f2b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "a59a79c3-66bd-5cfc-91f5-ee84f7227855",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "395143f9-54bf-5b46-b1be-a7b2a6142ad9",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "3449b8d2-ffd5-5aec-bb32-4245f2fbcde4",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "ab44094e-6c9d-50b8-b5c4-2e518d89912e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b093bfc0-6e98-5a1b-a502-e838a36f6568",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "03d86823-b756-5b91-850d-7ad231d33546",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "a76af2f0-049b-5be1-8d20-e87c9d1c2709",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "bc2f0c1e-992e-5407-9435-fedb39ff74ea",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "84668ac1-d5ef-545b-88f3-1e49f8f1c8ad",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "69b41271-91a0-5a2e-a62c-60364d5a9c8f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8e4ec555-5fbf-55d3-bea3-3af12c9aca3f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "aa18f3f9-f62a-5ab8-9b34-75696efa5c48",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "71c8c6b1-2116-5817-b65f-7a87ef5ef2b7",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8f6d7a1f-1e7f-5a60-8fe7-ce19115ed460",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "c115dbbf-edad-59f2-b046-c65a0373a81c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b7d696c3-8106-585c-9ecc-94a75cf1e3da",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "639e6a78-59d8-5ce8-9687-64e8f9af7e71",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "ae60c853-7a90-58d2-ab6c-04d3be5f1847",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "0cd33163-2ae4-57eb-96f6-c50af6685cab",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "39e0f78f-1172-5e61-9446-65ef3c0cb46c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b08f10ee-6afd-5e89-b9b4-569064fbdd9f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "efcbe1c6-b2d5-521c-b27a-2146f08a604d",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f9422c02-d43f-5ebb-b7c5-9e32f9b77c21",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "c276e880-3ba8-58e7-a5d5-c07707dba6b7",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "561a3711-c386-541c-9a77-2d0fa256caf6",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "1378350d-2e2b-52dd-ab3a-d8b9a09df92f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "94e40729-4aea-59c8-86ba-075137c000dc",
-          "type": "epm-packages-assets",
-        },
-      ],
-      "removable": true,
-      "version": "0.1.4",
-    },
-    "id": "apache",
-    "namespaces": Array [],
-    "references": Array [],
-    "type": "epm-packages",
-  },
-  "screenshots": Array [
-    Object {
-      "size": "1215x1199",
-      "src": "/img/kibana-apache-test.png",
-      "title": "Apache Integration",
-      "type": "image/png",
-    },
-    Object {
-      "size": "1919x1079",
-      "src": "/img/apache_httpd_server_status.png",
-      "title": "Apache HTTPD Server Status",
-      "type": "image/png",
-    },
-  ],
-  "status": "installed",
-  "title": "Apache",
-  "type": "integration",
-  "version": "0.1.4",
-}
-`;
diff --git a/x-pack/test/fleet_api_integration/apis/epm/get.ts b/x-pack/test/fleet_api_integration/apis/epm/get.ts
index df6cbf3c4fecb..c605adc44233a 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/get.ts
@@ -66,10 +66,10 @@ export default function (providerContext: FtrProviderContext) {
         .get(`/api/fleet/epm/packages/${testPkgName}/${testPkgVersion}`)
         .expect(200);
       const packageInfo = res.body.item;
-      // the uploaded version will have this description
-      expect(packageInfo.description).to.equal('Apache Uploaded Test Integration');
-      // download property should not exist on uploaded packages
-      expect(packageInfo.download).to.equal(undefined);
+      // Get package info always return data from the registry
+      expect(packageInfo.description).to.not.equal('Apache Uploaded Test Integration');
+      // download property exist on uploaded packages
+      expect(packageInfo.download).to.not.equal(undefined);
       await uninstallPackage(testPkgName, testPkgVersion);
     });
     it('returns correct package info from registry if a different version is installed by upload', async function () {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
index 1ac5f2750fc98..83ff7611ded8e 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -87,20 +87,6 @@ export default function (providerContext: FtrProviderContext) {
         .send(buf)
         .expect(200);
       expect(res.body.items.length).to.be(27);
-
-      const packageInfoRes = await supertest
-        .get(`/api/fleet/epm/packages/${testPkgName}/${testPkgVersion}`)
-        .set('kbn-xsrf', 'xxxx')
-        .expect(200);
-
-      delete packageInfoRes.body.item.latestVersion;
-      delete packageInfoRes.body.item.savedObject.attributes.install_started_at;
-      delete packageInfoRes.body.item.savedObject.version;
-      delete packageInfoRes.body.item.savedObject.updated_at;
-      delete packageInfoRes.body.item.savedObject.coreMigrationVersion;
-      delete packageInfoRes.body.item.savedObject.migrationVersion;
-
-      expectSnapshot(packageInfoRes.body.item).toMatch();
     });
 
     it('should throw an error if the archive is zip but content type is gzip', async function () {

From 9ccef34fdd1df66b7009a0abf9710af9bfd6eddb Mon Sep 17 00:00:00 2001
From: James Rodewig <james.rodewig@elastic.co>
Date: Wed, 9 Feb 2022 10:59:41 -0500
Subject: [PATCH 13/85] Use sentence case in Index Management list titles
 (#125037)

Updates some description list titles on the Index Management page to use sentence case rather than title case.
---
 .../home/index_list/detail_panel/summary/summary.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/detail_panel/summary/summary.js b/x-pack/plugins/index_management/public/application/sections/home/index_list/detail_panel/summary/summary.js
index 3e78188ebbd24..d01ee49320070 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/detail_panel/summary/summary.js
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/detail_panel/summary/summary.js
@@ -36,16 +36,16 @@ const getHeaders = () => {
       defaultMessage: 'Replicas',
     }),
     documents: i18n.translate('xpack.idxMgmt.summary.headers.documentsHeader', {
-      defaultMessage: 'Docs Count',
+      defaultMessage: 'Docs count',
     }),
     documents_deleted: i18n.translate('xpack.idxMgmt.summary.headers.deletedDocumentsHeader', {
-      defaultMessage: 'Docs Deleted',
+      defaultMessage: 'Docs deleted',
     }),
     size: i18n.translate('xpack.idxMgmt.summary.headers.storageSizeHeader', {
-      defaultMessage: 'Storage Size',
+      defaultMessage: 'Storage size',
     }),
     primary_size: i18n.translate('xpack.idxMgmt.summary.headers.primaryStorageSizeHeader', {
-      defaultMessage: 'Primary Storage Size',
+      defaultMessage: 'Primary storage size',
     }),
     aliases: i18n.translate('xpack.idxMgmt.summary.headers.aliases', {
       defaultMessage: 'Aliases',

From f2e9efe4570e529a5cb6ec2a181770147d3845f8 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 9 Feb 2022 10:15:07 -0600
Subject: [PATCH 14/85] [DOCS] Adds 8.0.0 release notes (#124399)

* [DOCS] Adds 8.0.0 release notes

* Update docs/CHANGELOG.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/CHANGELOG.asciidoc

Co-authored-by: Brandon Morelli <bmorelli25@gmail.com>

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
Co-authored-by: Brandon Morelli <bmorelli25@gmail.com>
---
 docs/CHANGELOG.asciidoc                       | 114 +++++++++++++++++-
 .../development-visualize-index.asciidoc      |   2 +-
 docs/index.asciidoc                           |   2 -
 docs/setup/upgrade/upgrade-standard.asciidoc  |   4 +-
 docs/user/whats-new.asciidoc                  |   2 +-
 5 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 446c305c03b95..3101b649b09a5 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -10,6 +10,7 @@
 
 Review important information about the {kib} 8.0.0 releases.
 
+* <<release-notes-8.0.0>>
 * <<release-notes-8.0.0-rc2>>
 * <<release-notes-8.0.0-rc1>>
 * <<release-notes-8.0.0-beta1>>
@@ -17,6 +18,113 @@ Review important information about the {kib} 8.0.0 releases.
 * <<release-notes-8.0.0-alpha1>>
 
 --
+[[release-notes-8.0.0]]
+== {kib} 8.0.0
+
+coming::[8.0.0]
+
+Review the {kib} 8.0.0 changes, then use the {kibana-ref-all}/7.17/upgrade-assistant.html[Upgrade Assistant] to complete the upgrade.
+
+[float]
+[[breaking-changes-8.0.0]]
+=== Breaking change
+
+Breaking changes can prevent your application from optimal operation and performance.
+Before you upgrade to 8.0.0, review the breaking change, then mitigate the impact to your application.
+
+// tag::notable-breaking-changes[]
+
+[discrete]
+[[breaking-123754]]
+.Removes the `console.ssl` setting
+[%collapsible]
+====
+*Details* +
+The `console.ssl` setting has been removed. For more information, refer to {kibana-pull}123754[#123754].
+
+*Impact* +
+Before you upgrade to 8.0.0, remove `console.ssl` from kibana.yml.
+====
+
+// end::notable-breaking-changes[]
+
+
+To review the breaking changes in previous versions, refer to the following: 
+
+<<breaking-changes-8.0.0-rc2,8.0.0-rc2>> | <<breaking-changes-8.0.0-rc1,8.0.0-rc1>> | <<breaking-changes-8.0.0-beta1,8.0.0-beta1>> | <<breaking-changes-8.0.0-alpha2,8.0.0-alpha2>> | 
+<<breaking-changes-8.0.0-alpha1,8.0.0-alpha1>>
+
+[float]
+[[deprecations-8.0.0]]
+=== Deprecation
+
+The following functionality is deprecated in 8.0.0, and will be removed in 9.0.0.
+Deprecated functionality does not have an immediate impact on your application, but we strongly recommend
+you make the necessary updates after you upgrade to 8.0.0.
+
+[discrete]
+[[deprecation-123229]]
+.Removes support for `monitoring.cluster_alerts.allowedSpaces`
+[%collapsible]
+====
+*Details* +
+The `monitoring.cluster_alerts.allowedSpaces` setting, which {kib} uses to create Stack Monitoring alerts, has been removed. For more information, refer to {kibana-pull}123229[#123229].
+
+*Impact* +
+Before you upgrade to 8.0.0, remove `monitoring.cluster_alerts.allowedSpaces` from kibana.yml.
+====
+
+To review the deprecations in previous versions, refer to the following:
+
+<<deprecations-8.0.0-rc1,8.0.0-rc1>> | <<deprecations-8.0.0-alpha1,8.0.0-alpha1>>
+
+[float]
+[[features-8.0.0]]
+=== Features
+For information about the features introduced in 8.0.0, refer to <<whats-new,What's new in 8.0>>.
+
+Elastic Security::
+For the Elastic Security 8.0.0 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
+
+To review the features in previous versions, refer to the following: 
+
+<<features-8.0.0-rc2,8.0.0-rc2>> | <<features-8.0.0-rc1,8.0.0-rc1>> | <<features-8.0.0-beta1,8.0.0-beta1>> | <<features-8.0.0-alpha2,8.0.0-alpha2>>
+
+[[enhancements-and-bug-fixes-v8.0.0]]
+=== Enhancements and bug fixes
+
+For detailed information about the 8.0.0 release, review the enhancements and bug fixes.
+
+[float]
+[[enhancement-v8.0.0]]
+==== Enhancements
+Dashboard::
+Clone ReferenceOrValueEmbeddables by value {kibana-pull}122199[#122199]
+
+Elastic Security::
+For the Elastic Security 8.0.0 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
+
+[float]
+[[fixes-v8.0.0]]
+==== Bug Fixes
+APM::
+Restrict aggregated transaction metrics search to date range {kibana-pull}123445[#123445]
+
+Elastic Security::
+For the Elastic Security 8.0.0 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
+
+Fleet::
+Allow empty strings for required text fields in package policies {kibana-pull}123610[#123610]
+
+Maps::
+Fixes Label border color is not removed from legend when disabled {kibana-pull}122705[#122705]
+
+Monitoring::
+Ensure logstash getNodes always contains a uuid {kibana-pull}124201[#124201]
+
+Security::
+Long-running requests no longer cause sporadic logouts in certain cases, even when user sessions are active {kibana-pull}122155[#122155]
+
 [[release-notes-8.0.0-rc2]]
 == {kib} 8.0.0-rc2
 
@@ -29,8 +137,6 @@ For information about the {kib} 8.0.0-rc2 release, review the following informat
 Breaking changes can prevent your application from optimal operation and performance.
 Before you upgrade, review the breaking change, then mitigate the impact to your application.
 
-// tag::notable-breaking-changes[]
-
 [discrete]
 [[breaking-122722]]
 .Removes the ability to use `elasticsearch.username: elastic` in production
@@ -42,8 +148,6 @@ In production, you are no longer able to use the `elastic` superuser to authenti
 *Impact* +
 When you configure `elasticsearch.username: elastic`, {kib} fails.
 ====
-  
-// end::notable-breaking-changes[]
 
 To review the breaking changes in previous versions, refer to the following: 
 
@@ -1304,7 +1408,7 @@ Use the `xpack.monitoring.clusterAlertsEmail` in kibana.yml.
 ====
 
 [float]
-[[enhancements-and-bug-fixes-v8.0.0]]
+[[enhancements-and-bug-fixes-v8.0.0-alpha1]]
 === Bug fix
 
 The 8.0.0-alpha1 release includes the following bug fix.
diff --git a/docs/developer/architecture/development-visualize-index.asciidoc b/docs/developer/architecture/development-visualize-index.asciidoc
index d41ee32c1fb27..b941cdedf9df9 100644
--- a/docs/developer/architecture/development-visualize-index.asciidoc
+++ b/docs/developer/architecture/development-visualize-index.asciidoc
@@ -19,7 +19,7 @@ We would recommend waiting until later in `7.x` to upgrade your plugins if possi
 If you would like to keep up with progress on the visualizations plugin in the meantime,
 here are a few resources:
 
-* The <<breaking-changes,breaking changes>> documentation, where we try to capture any changes to the APIs as they occur across minors.
+* The <<breaking-changes-8.0.0,breaking changes>> documentation, where we try to capture any changes to the APIs as they occur across minors.
 * link:https://github.com/elastic/kibana/issues/44121[Meta issue] which is tracking the move of the plugin to the new {kib} platform
 * Our link:https://www.elastic.co/blog/join-our-elastic-stack-workspace-on-slack[Elastic Stack workspace on Slack].
 * The {kib-repo}blob/{branch}/src/plugins/visualizations[source code], which will continue to be
diff --git a/docs/index.asciidoc b/docs/index.asciidoc
index ec1a99fa5bffc..668a6edcad3db 100644
--- a/docs/index.asciidoc
+++ b/docs/index.asciidoc
@@ -24,8 +24,6 @@ include::user/index.asciidoc[]
 
 include::accessibility.asciidoc[]
 
-include::migration.asciidoc[]
-
 include::CHANGELOG.asciidoc[]
 
 include::developer/index.asciidoc[]
diff --git a/docs/setup/upgrade/upgrade-standard.asciidoc b/docs/setup/upgrade/upgrade-standard.asciidoc
index b43da6aef9765..b01759b4f3511 100644
--- a/docs/setup/upgrade/upgrade-standard.asciidoc
+++ b/docs/setup/upgrade/upgrade-standard.asciidoc
@@ -37,7 +37,7 @@ from 4.x, you will need to copy the configurations from your old config
 (`/etc/kibana/kibana.yml`).
 
 Make sure you remove or update any configurations
-that are indicated in the <<breaking-changes,breaking changes>> documentation
+that are indicated in the <<breaking-changes-8.0.0,breaking changes>> documentation
 otherwise {kib} will fail to start.
 --
 . Upgrade any plugins by removing the existing plugin and reinstalling the
@@ -58,7 +58,7 @@ and becomes a new instance in the monitoring data.
 --
 . Copy the files from the `config` directory from your old installation to your
   new installation. Make sure you remove or update any configurations that are
-  indicated in the <<breaking-changes,breaking changes>> documentation
+  indicated in the <<breaking-changes-8.0.0,breaking changes>> documentation
   otherwise {kib} will fail to start.
 . Copy the files from the `data` directory from your old installation to your
   new installation.
diff --git a/docs/user/whats-new.asciidoc b/docs/user/whats-new.asciidoc
index 587f4588bb442..aa16a98a27fdb 100644
--- a/docs/user/whats-new.asciidoc
+++ b/docs/user/whats-new.asciidoc
@@ -2,7 +2,7 @@
 == What's new in 8.0
 
 This section summarizes the most important changes in each release. For the 
-full list, see <<release-notes>> and <<breaking-changes>>. 
+full list, see <<release-notes>> and <<breaking-changes-8.0.0>>. 
 
 coming[8.0.0]
 

From 67cd496daa93537a37ab1ddafbcc163d4c64c44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Wed, 9 Feb 2022 17:17:30 +0100
Subject: [PATCH 15/85] [IM] Removed undefined data stream link (#124847)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../home/indices_tab.helpers.ts               |  8 ++++++
 .../home/indices_tab.test.ts                  | 25 +++++++++++++++++--
 .../index_list/index_table/index_table.js     |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
index 719758e18525a..7daa3cc9e2221 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
@@ -33,6 +33,7 @@ export interface IndicesTestBed extends TestBed<TestSubjects> {
     getIncludeHiddenIndicesToggleStatus: () => boolean;
     clickIncludeHiddenIndicesToggle: () => void;
     clickDataStreamAt: (index: number) => void;
+    dataStreamLinkExistsAt: (index: number) => boolean;
     clickManageContextMenuButton: () => void;
     clickContextMenuOption: (optionDataTestSubject: string) => void;
     clickModalConfirm: () => void;
@@ -103,6 +104,12 @@ export const setup = async (overridingDependencies: any = {}): Promise<IndicesTe
     component.update();
   };
 
+  const dataStreamLinkExistsAt = (index: number) => {
+    const { table } = testBed;
+    const { rows } = table.getMetaData('indexTable');
+    return findTestSubject(rows[index].reactWrapper, 'dataStreamLink').exists();
+  };
+
   const clickModalConfirm = async () => {
     const { find, component } = testBed;
 
@@ -129,6 +136,7 @@ export const setup = async (overridingDependencies: any = {}): Promise<IndicesTe
       getIncludeHiddenIndicesToggleStatus,
       clickIncludeHiddenIndicesToggle,
       clickDataStreamAt,
+      dataStreamLinkExistsAt,
       clickManageContextMenuButton,
       clickContextMenuOption,
       clickModalConfirm,
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
index 6387a0904a69c..8193d48629f6f 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 
-import { API_BASE_PATH } from '../../../common/constants';
+import { API_BASE_PATH } from '../../../common';
 import { setupEnvironment, nextTick } from '../helpers';
 import { IndicesTestBed, setup } from './indices_tab.helpers';
 import { createDataStreamPayload, createNonDataStreamIndex } from './data_streams_tab.helpers';
@@ -100,6 +100,18 @@ describe('<IndexManagementHome />', () => {
           name: 'data-stream-index',
           data_stream: 'dataStream1',
         },
+        {
+          health: '',
+          status: '',
+          primary: '',
+          replica: '',
+          documents: '',
+          documents_deleted: '',
+          size: '',
+          primary_size: '',
+          name: 'no-data-stream-index',
+          data_stream: null,
+        },
       ]);
 
       // The detail panel should still appear even if there are no data streams.
@@ -125,14 +137,23 @@ describe('<IndexManagementHome />', () => {
       const {
         findDataStreamDetailPanel,
         findDataStreamDetailPanelTitle,
-        actions: { clickDataStreamAt },
+        actions: { clickDataStreamAt, dataStreamLinkExistsAt },
       } = testBed;
 
+      expect(dataStreamLinkExistsAt(0)).toBeTruthy();
       await clickDataStreamAt(0);
 
       expect(findDataStreamDetailPanel().length).toBe(1);
       expect(findDataStreamDetailPanelTitle()).toBe('dataStream1');
     });
+
+    test(`doesn't show data stream link if the index doesn't have a data stream`, () => {
+      const {
+        actions: { dataStreamLinkExistsAt },
+      } = testBed;
+
+      expect(dataStreamLinkExistsAt(1)).toBeFalsy();
+    });
   });
 
   describe('index detail panel with % character in index name', () => {
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_table/index_table.js b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_table/index_table.js
index 63e4503180f23..70a7f48178192 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_table/index_table.js
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_table/index_table.js
@@ -285,7 +285,7 @@ export class IndexTable extends Component {
           {renderBadges(index, filterChanged, appServices.extensionsService)}
         </Fragment>
       );
-    } else if (fieldName === 'data_stream') {
+    } else if (fieldName === 'data_stream' && value) {
       return (
         <EuiLink
           data-test-subj="dataStreamLink"

From ded0478ed7a726e4ca675fe6a74225eed29f9bb9 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 9 Feb 2022 10:32:20 -0600
Subject: [PATCH 16/85] [data view management] Fix set default data view
 permissions check (#124897)

* fix set default data view permissions

* fix fields table

* fix scripted field add button

* fix jest tests

* lint fixes

* fix test

* updte snapshot
---
 .../create_edit_field/create_edit_field.tsx   |  6 +++++-
 .../edit_index_pattern/edit_index_pattern.tsx |  7 ++++---
 .../index_header/index_header.tsx             |  6 ++++--
 .../indexed_fields_table.test.tsx.snap        | 10 +++++++++
 .../indexed_fields_table.test.tsx             | 21 ++++++++++++++-----
 .../indexed_fields_table.tsx                  | 18 ++++------------
 .../components/header/header.tsx              |  4 ++--
 .../scripted_field_table.test.tsx             | 18 ++++++++++------
 .../scripted_fields_table.tsx                 | 18 ++++------------
 .../edit_index_pattern/tabs/tabs.tsx          |  9 +++++---
 .../mount_management_section.tsx              |  3 +--
 .../data_view_management/public/mocks.ts      |  6 +++---
 .../data_view_management/public/types.ts      |  2 --
 src/plugins/data_views/public/mocks.ts        |  1 +
 14 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
index 0f41c08fbc6fe..2d8469975430b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
@@ -70,7 +70,11 @@ export const CreateEditField = withRouter(
     if (spec) {
       return (
         <>
-          <IndexHeader indexPattern={indexPattern} defaultIndex={uiSettings.get('defaultIndex')} />
+          <IndexHeader
+            indexPattern={indexPattern}
+            defaultIndex={uiSettings.get('defaultIndex')}
+            canSave={dataViews.getCanSaveSync()}
+          />
           <EuiSpacer size={'l'} />
           <FieldEditor
             indexPattern={indexPattern}
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 6b0d7912ce598..5d5ef260a088c 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -65,7 +65,7 @@ const securitySolution = 'security-solution';
 
 export const EditIndexPattern = withRouter(
   ({ indexPattern, history, location }: EditIndexPatternProps) => {
-    const { application, uiSettings, overlays, chrome, dataViews } =
+    const { uiSettings, overlays, chrome, dataViews } =
       useKibana<IndexPatternManagmentContext>().services;
     const [fields, setFields] = useState<DataViewField[]>(indexPattern.getNonScriptedFields());
     const [conflictedFields, setConflictedFields] = useState<DataViewField[]>(
@@ -143,15 +143,16 @@ export const EditIndexPattern = withRouter(
     const showTagsSection = Boolean(indexPattern.timeFieldName || (tags && tags.length > 0));
     const kibana = useKibana();
     const docsUrl = kibana.services.docLinks!.links.elasticsearch.mapping;
-    const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
+    const userEditPermission = dataViews.getCanSaveSync();
 
     return (
       <div data-test-subj="editIndexPattern" role="region" aria-label={headingAriaLabel}>
         <IndexHeader
           indexPattern={indexPattern}
           setDefault={setDefaultPattern}
-          {...(userEditPermission ? { deleteIndexPatternClick: removePattern } : {})}
+          deleteIndexPatternClick={removePattern}
           defaultIndex={defaultIndex}
+          canSave={userEditPermission}
         >
           {showTagsSection && (
             <EuiFlexGroup wrap gutterSize="s">
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
index b64aed5c0811c..e40ef6a7ddf2f 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
@@ -16,6 +16,7 @@ interface IndexHeaderProps {
   defaultIndex?: string;
   setDefault?: () => void;
   deleteIndexPatternClick?: () => void;
+  canSave: boolean;
 }
 
 const setDefaultAriaLabel = i18n.translate('indexPatternManagement.editDataView.setDefaultAria', {
@@ -40,12 +41,13 @@ export const IndexHeader: React.FC<IndexHeaderProps> = ({
   setDefault,
   deleteIndexPatternClick,
   children,
+  canSave,
 }) => {
   return (
     <EuiPageHeader
       pageTitle={<span data-test-subj="indexPatternTitle">{indexPattern.title}</span>}
       rightSideItems={[
-        defaultIndex !== indexPattern.id && setDefault && (
+        defaultIndex !== indexPattern.id && setDefault && canSave && (
           <EuiToolTip content={setDefaultTooltip}>
             <EuiButtonIcon
               color="text"
@@ -56,7 +58,7 @@ export const IndexHeader: React.FC<IndexHeaderProps> = ({
             />
           </EuiToolTip>
         ),
-        deleteIndexPatternClick && (
+        canSave && (
           <EuiToolTip content={removeTooltip}>
             <EuiButtonIcon
               color="danger"
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
index a8e8228c34119..abed44135e6ea 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
@@ -161,6 +161,8 @@ exports[`IndexedFieldsTable IndexedFieldsTable with rollup index pattern should
         },
       ]
     }
+    openModal={[Function]}
+    theme={Object {}}
   />
 </div>
 `;
@@ -196,6 +198,8 @@ exports[`IndexedFieldsTable should filter based on the query bar 1`] = `
         },
       ]
     }
+    openModal={[Function]}
+    theme={Object {}}
   />
 </div>
 `;
@@ -233,6 +237,8 @@ exports[`IndexedFieldsTable should filter based on the schema filter 1`] = `
         },
       ]
     }
+    openModal={[Function]}
+    theme={Object {}}
   />
 </div>
 `;
@@ -267,6 +273,8 @@ exports[`IndexedFieldsTable should filter based on the type filter 1`] = `
         },
       ]
     }
+    openModal={[Function]}
+    theme={Object {}}
   />
 </div>
 `;
@@ -366,6 +374,8 @@ exports[`IndexedFieldsTable should render normally 1`] = `
         },
       ]
     }
+    openModal={[Function]}
+    theme={Object {}}
   />
 </div>
 `;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
index e179050ca7fe2..c7b92c227a5d9 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -97,6 +97,12 @@ const fields = [
   },
 ].map(mockFieldToIndexPatternField);
 
+const mockedServices = {
+  userEditPermission: false,
+  openModal: () => ({ onClose: new Promise<void>(() => {}), close: async () => {} }),
+  theme: {} as any,
+};
+
 describe('IndexedFieldsTable', () => {
   test('should render normally', async () => {
     const component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>> = shallow(
@@ -110,8 +116,9 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter={[]}
         schemaFieldTypeFilter={[]}
         fieldFilter=""
+        {...mockedServices}
       />
-    ).dive();
+    );
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.update();
@@ -131,8 +138,9 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter={[]}
         schemaFieldTypeFilter={[]}
         fieldFilter=""
+        {...mockedServices}
       />
-    ).dive();
+    );
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.setProps({ fieldFilter: 'Elast' });
@@ -153,8 +161,9 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter={[]}
         schemaFieldTypeFilter={[]}
         fieldFilter=""
+        {...mockedServices}
       />
-    ).dive();
+    );
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.setProps({ indexedFieldTypeFilter: ['date'] });
@@ -175,8 +184,9 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter={[]}
         schemaFieldTypeFilter={[]}
         fieldFilter=""
+        {...mockedServices}
       />
-    ).dive();
+    );
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.setProps({ schemaFieldTypeFilter: ['runtime'] });
@@ -198,8 +208,9 @@ describe('IndexedFieldsTable', () => {
           indexedFieldTypeFilter={[]}
           schemaFieldTypeFilter={[]}
           fieldFilter=""
+          {...mockedServices}
         />
-      ).dive();
+      );
 
       await new Promise((resolve) => process.nextTick(resolve));
       component.update();
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
index 07a3bf50aab53..ad85499009db0 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -10,10 +10,8 @@ import React, { Component } from 'react';
 import { createSelector } from 'reselect';
 import { OverlayStart, ThemeServiceStart } from 'src/core/public';
 import { DataViewField, DataView } from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
 import { Table } from './components/table';
 import { IndexedFieldItem } from './types';
-import { IndexPatternManagmentContext } from '../../../types';
 
 interface IndexedFieldsTableProps {
   fields: DataViewField[];
@@ -36,16 +34,10 @@ interface IndexedFieldsTableState {
   fields: IndexedFieldItem[];
 }
 
-const withHooks = (Comp: typeof Component) => {
-  return (props: any) => {
-    const { application } = useKibana<IndexPatternManagmentContext>().services;
-    const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
-
-    return <Comp userEditPermission={userEditPermission} {...props} />;
-  };
-};
-
-class IndexedFields extends Component<IndexedFieldsTableProps, IndexedFieldsTableState> {
+export class IndexedFieldsTable extends Component<
+  IndexedFieldsTableProps,
+  IndexedFieldsTableState
+> {
   constructor(props: IndexedFieldsTableProps) {
     super(props);
 
@@ -158,5 +150,3 @@ class IndexedFields extends Component<IndexedFieldsTableProps, IndexedFieldsTabl
     );
   }
 }
-
-export const IndexedFieldsTable = withHooks(IndexedFields);
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
index c3fd03617be6b..651f0c5757f12 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
@@ -22,9 +22,9 @@ interface HeaderProps extends RouteComponentProps {
 }
 
 export const Header = withRouter(({ indexPatternId, history }: HeaderProps) => {
-  const { application, docLinks } = useKibana<IndexPatternManagmentContext>().services;
+  const { dataViews, docLinks } = useKibana<IndexPatternManagmentContext>().services;
   const links = docLinks?.links;
-  const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
+  const userEditPermission = dataViews.getCanSaveSync();
   return (
     <EuiFlexGroup alignItems="center">
       <EuiFlexItem>
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 169b3673001a1..4febfdf0e1219 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -68,9 +68,10 @@ describe('ScriptedFieldsTable', () => {
         helpers={helpers}
         painlessDocLink={'painlessDoc'}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     // Allow the componentWillMount code to execute
     // https://github.com/airbnb/enzyme/issues/450
@@ -87,9 +88,10 @@ describe('ScriptedFieldsTable', () => {
         helpers={helpers}
         painlessDocLink={'painlessDoc'}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     // Allow the componentWillMount code to execute
     // https://github.com/airbnb/enzyme/issues/450
@@ -119,9 +121,10 @@ describe('ScriptedFieldsTable', () => {
         painlessDocLink={'painlessDoc'}
         helpers={helpers}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     // Allow the componentWillMount code to execute
     // https://github.com/airbnb/enzyme/issues/450
@@ -145,9 +148,10 @@ describe('ScriptedFieldsTable', () => {
         painlessDocLink={'painlessDoc'}
         helpers={helpers}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     // Allow the componentWillMount code to execute
     // https://github.com/airbnb/enzyme/issues/450
@@ -166,9 +170,10 @@ describe('ScriptedFieldsTable', () => {
         helpers={helpers}
         painlessDocLink={'painlessDoc'}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     await component.update(); // Fire `componentWillMount()`
     // @ts-expect-error lang is not valid
@@ -194,9 +199,10 @@ describe('ScriptedFieldsTable', () => {
         helpers={helpers}
         painlessDocLink={'painlessDoc'}
         saveIndexPattern={async () => {}}
+        userEditPermission={false}
         scriptedFieldLanguageFilter={[]}
       />
-    ).dive();
+    );
 
     await component.update(); // Fire `componentWillMount()`
     // @ts-expect-error
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 1b9d63e2d2c6a..540131c50b236 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -15,10 +15,8 @@ import {
 
 import { Table, Header, CallOuts, DeleteScritpedFieldConfirmationModal } from './components';
 import { ScriptedFieldItem } from './types';
-import { IndexPatternManagmentContext } from '../../../types';
 
 import { DataView, DataViewsPublicPluginStart } from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
 
 interface ScriptedFieldsTableProps {
   indexPattern: DataView;
@@ -41,16 +39,10 @@ interface ScriptedFieldsTableState {
   fields: ScriptedFieldItem[];
 }
 
-const withHooks = (Comp: typeof Component) => {
-  return (props: any) => {
-    const { application } = useKibana<IndexPatternManagmentContext>().services;
-    const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
-
-    return <Comp userEditPermission={userEditPermission} {...props} />;
-  };
-};
-
-class ScriptedFields extends Component<ScriptedFieldsTableProps, ScriptedFieldsTableState> {
+export class ScriptedFieldsTable extends Component<
+  ScriptedFieldsTableProps,
+  ScriptedFieldsTableState
+> {
   constructor(props: ScriptedFieldsTableProps) {
     super(props);
 
@@ -168,5 +160,3 @@ class ScriptedFields extends Component<ScriptedFieldsTableProps, ScriptedFieldsT
     );
   }
 }
-
-export const ScriptedFieldsTable = withHooks(ScriptedFields);
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
index 7bf9292fad788..762d30685ba38 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -132,7 +132,7 @@ export function Tabs({
   location,
   refreshFields,
 }: TabsProps) {
-  const { application, uiSettings, docLinks, dataViewFieldEditor, overlays, theme } =
+  const { uiSettings, docLinks, dataViewFieldEditor, overlays, theme, dataViews } =
     useKibana<IndexPatternManagmentContext>().services;
   const [fieldFilter, setFieldFilter] = useState<string>('');
   const [syncingStateFunc, setSyncingStateFunc] = useState<any>({
@@ -241,7 +241,7 @@ export function Tabs({
     [uiSettings]
   );
 
-  const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
+  const userEditPermission = dataViews.getCanSaveSync();
   const getFilterSection = useCallback(
     (type: string) => {
       return (
@@ -448,7 +448,8 @@ export function Tabs({
                       getFieldInfo,
                     }}
                     openModal={overlays.openModal}
-                    theme={theme}
+                    theme={theme!}
+                    userEditPermission={dataViews.getCanSaveSync()}
                   />
                 )}
               </DeleteRuntimeFieldProvider>
@@ -472,6 +473,7 @@ export function Tabs({
                 }}
                 onRemoveField={refreshFilters}
                 painlessDocLink={docLinks.links.scriptedFields.painless}
+                userEditPermission={dataViews.getCanSaveSync()}
               />
             </Fragment>
           );
@@ -510,6 +512,7 @@ export function Tabs({
       refreshFields,
       overlays,
       theme,
+      dataViews,
     ]
   );
 
diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
index 1b876e34a42fb..e4978acbc9d17 100644
--- a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -39,7 +39,7 @@ export async function mountManagementSection(
   params: ManagementAppMountParams
 ) {
   const [
-    { chrome, application, uiSettings, notifications, overlays, http, docLinks, theme },
+    { chrome, uiSettings, notifications, overlays, http, docLinks, theme },
     { data, dataViewFieldEditor, dataViewEditor, dataViews, fieldFormats },
     indexPatternManagementStart,
   ] = await getStartServices();
@@ -51,7 +51,6 @@ export async function mountManagementSection(
 
   const deps: IndexPatternManagmentContext = {
     chrome,
-    application,
     uiSettings,
     notifications,
     overlays,
diff --git a/src/plugins/data_view_management/public/mocks.ts b/src/plugins/data_view_management/public/mocks.ts
index 3404ca4912c88..54c1900d37f4c 100644
--- a/src/plugins/data_view_management/public/mocks.ts
+++ b/src/plugins/data_view_management/public/mocks.ts
@@ -13,6 +13,7 @@ import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
 import { dataPluginMock } from '../../data/public/mocks';
 import { indexPatternFieldEditorPluginMock } from '../../data_view_field_editor/public/mocks';
 import { indexPatternEditorPluginMock } from '../../data_view_editor/public/mocks';
+import { dataViewPluginMocks } from '../../data_views/public/mocks';
 import {
   IndexPatternManagementSetup,
   IndexPatternManagementStart,
@@ -54,15 +55,14 @@ const docLinks = {
 const createIndexPatternManagmentContext = (): {
   [key in keyof IndexPatternManagmentContext]: any;
 } => {
-  const { chrome, application, uiSettings, notifications, overlays } = coreMock.createStart();
+  const { chrome, uiSettings, notifications, overlays } = coreMock.createStart();
   const { http } = coreMock.createSetup();
   const data = dataPluginMock.createStartContract();
   const dataViewFieldEditor = indexPatternFieldEditorPluginMock.createStartContract();
-  const dataViews = data.indexPatterns;
+  const dataViews = dataViewPluginMocks.createStartContract();
 
   return {
     chrome,
-    application,
     uiSettings,
     notifications,
     overlays,
diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
index dc5e0198a64f1..f0a79416892ef 100644
--- a/src/plugins/data_view_management/public/types.ts
+++ b/src/plugins/data_view_management/public/types.ts
@@ -8,7 +8,6 @@
 
 import {
   ChromeStart,
-  ApplicationStart,
   IUiSettingsClient,
   OverlayStart,
   NotificationsStart,
@@ -26,7 +25,6 @@ import { FieldFormatsStart } from '../../field_formats/public';
 
 export interface IndexPatternManagmentContext {
   chrome: ChromeStart;
-  application: ApplicationStart;
   uiSettings: IUiSettingsClient;
   notifications: NotificationsStart;
   overlays: OverlayStart;
diff --git a/src/plugins/data_views/public/mocks.ts b/src/plugins/data_views/public/mocks.ts
index c9aece61c4e02..61713c9406c23 100644
--- a/src/plugins/data_views/public/mocks.ts
+++ b/src/plugins/data_views/public/mocks.ts
@@ -27,6 +27,7 @@ const createStartContract = (): Start => {
     }),
     get: jest.fn().mockReturnValue(Promise.resolve({})),
     clearCache: jest.fn(),
+    getCanSaveSync: jest.fn(),
   } as unknown as jest.Mocked<DataViewsContract>;
 };
 

From 7d57d6be11de7e70d52ead26769d392cf2fb213e Mon Sep 17 00:00:00 2001
From: Melissa Burpo <melissa.burpo@elastic.co>
Date: Wed, 9 Feb 2022 10:54:59 -0600
Subject: [PATCH 17/85] Update x-pack readme to fix broken link (#124874)

Functional testing info is now available at https://www.elastic.co/guide/en/kibana/current/development-tests.html in the Kibana Developer Guide.
---
 x-pack/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/README.md b/x-pack/README.md
index 852b713e78465..d104dffff3d28 100644
--- a/x-pack/README.md
+++ b/x-pack/README.md
@@ -16,7 +16,7 @@ By default, this will also set the password for native realm accounts to the pas
 
 # Testing
 
-For information on testing, see [the Elastic functional test development guide](https://www.elastic.co/guide/en/kibana/current/development-functional-tests.html).
+For information on testing, see [the Elastic functional test development guide](https://www.elastic.co/guide/en/kibana/current/development-tests.html).
 
 #### Running functional tests
 

From 5fde0a07e3755c83fab0dfd5b2c22eb9f250c542 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Wed, 9 Feb 2022 09:02:48 -0800
Subject: [PATCH 18/85] [DOCS] Edits to upgrade docs (#125019)

* [DOCS] Edits to upgrade docs

* Apply suggestions from code review

Co-authored-by: Kaarina Tungseth <kaarina.tungseth@elastic.co>

Co-authored-by: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../setup/upgrade/upgrade-migrations.asciidoc | 93 +++++++++++--------
 1 file changed, 55 insertions(+), 38 deletions(-)

diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index 7136011a4f8f8..53b89b38cc88d 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -23,7 +23,10 @@ Saved objects are stored in two indices:
 The index aliases `.kibana` and `.kibana_task_manager` will always point to
 the most up-to-date saved object indices.
 
-The first time a newer {kib} starts, it will first perform an upgrade migration before starting plugins or serving HTTP traffic. To prevent losing acknowledged writes old nodes should be shutdown before starting the upgrade. To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later will add a write block to the outdated index. Table 1 lists the saved objects indices used by previous versions of {kib}.
+When you start a new {kib} installation, an upgrade migration is performed before starting plugins or serving HTTP traffic.
+Before you upgrade, shut down old nodes to prevent losing acknowledged writes.
+To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later
+adds a write block to the outdated index. Table 1 lists the saved objects indices used by previous versions of {kib}.
 
 .Saved object indices and aliases per {kib} version
 [options="header"]
@@ -40,11 +43,15 @@ The first time a newer {kib} starts, it will first perform an upgrade migration
 |=======================
 
 ==== Upgrading multiple {kib} instances
-When upgrading several {kib} instances connected to the same {es} cluster, ensure that all outdated instances are shutdown before starting the upgrade.
+When upgrading several {kib} instances connected to the same {es} cluster,
+ensure that all outdated instances are shut down before starting the upgrade.
 
-Kibana does not support rolling upgrades. However, once outdated instances are shutdown, all upgraded instances can be started in parallel in which case all instances will participate in the upgrade migration in parallel.
+{kib} does not support rolling upgrades. However, once outdated instances are shut down,
+all upgraded instances can be started in parallel, in which case all instances will participate in the upgrade migration in parallel.
 
-For large deployments with more than 10 {kib} instances and more than 10 000 saved objects, the upgrade downtime can be reduced by bringing up a single {kib} instance and waiting for it to complete the upgrade migration before bringing up the remaining instances.
+For large deployments with more than 10 {kib} instances, and more than 10,000 saved objects,
+you can reduce the upgrade downtime by bringing up a single {kib} instance and waiting for it to
+complete the upgrade migration before bringing up the remaining instances.
 
 [float]
 [[preventing-migration-failures]]
@@ -53,9 +60,9 @@ This section highlights common causes of {kib} upgrade failures and how to preve
 
 [float]
 ===== timeout_exception or receive_timeout_transport_exception
-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.
+There is a known issue in 7.12.0 for users who tried the {fleet} beta.
+Upgrade migrations fail because of a large number of documents in the `.kibana` index, which causes {kib} to log errors such as:
 
-This can cause Kibana to log errors like:
 
 [source,sh]
 --------------------------------------------
@@ -68,11 +75,12 @@ Instructions to work around this issue are in https://github.com/elastic/kibana/
 
 [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.
+We highly recommend testing your {kib} upgrade in a development cluster to find 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 `Unable to migrate the corrupt Saved Object document ...`.
-Corrupt documents will have to be fixed or deleted before an upgrade migration can succeed.
+For a successful upgrade migration, you must fix or delete corrupt documents.
 
 For example, given the following error message:
 
@@ -81,7 +89,7 @@ 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 delete the document that is causing the migration to fail:
+To delete the documents that cause migrations to fail, take the following steps:
 
 . Remove the write block which the migration system has placed on the previous index:
 +
@@ -104,15 +112,15 @@ DELETE .kibana_7.12.0_001/_doc/marketing_space:dashboard:e3c5fc71-ac71-4805-bcab
 
 . 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**.
+In this example, the dashboard with ID `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` that belongs to the space `marketing_space` **is no longer 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
-Matching index templates which specify `settings.refresh_interval` or `mappings` are known to interfere with {kib} upgrades.
+Matching index templates that specify `settings.refresh_interval` or `mappings` are known to interfere with {kib} upgrades.
 
-Prevention: narrow down the index patterns of any user-defined index templates to ensure that these won't apply to new `.kibana*` indices.
+Prevention: Narrow down the {data-sources} of any user-defined index templates to ensure that these won't apply to new `.kibana*` indices.
 
 NOTE: {kib} < 6.5 creates it's own index template called `kibana_index_template:.kibana`
 and uses an index pattern of `.kibana`. This index template will not interfere and does not need to be changed or removed.
@@ -127,19 +135,21 @@ Problems with your {es} cluster can prevent {kib} upgrades from succeeding. Ensu
 
 [float]
 ===== Different versions of {kib} connected to the same {es} index
-When different versions of {kib} are attempting an upgrade migration in parallel this can lead to migration failures. Ensure that all {kib} instances are running the same version, configuration and plugins.
+When you perform an upgrade migration of different {kib} versions, the migration can fail.
+Ensure that all {kib} instances are running the same version, configuration, and plugins.
 
 [float]
 ===== Incompatible `xpack.tasks.index` configuration setting
-For {kib} versions prior to 7.5.1, if the task manager index is set to `.tasks` with the configuration setting `xpack.tasks.index: ".tasks"`, upgrade migrations will fail. {kib} 7.5.1 and later prevents this by refusing to start with an incompatible configuration setting.
+For {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks` with the configuration setting `xpack.tasks.index: ".tasks"`,
+upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuration setting prevents upgrade migrations from starting.
 
 [float]
 [[resolve-migrations-failures]]
 ==== Resolving migration failures
 
-If {kib} terminates unexpectedly while migrating a saved object index it will automatically attempt to
-perform the migration again once the process has restarted. Do not delete any saved objects indices to
-attempt to fix a failed migration. Unlike previous versions, {kib} version 7.12.0 and
+If {kib} unexpectedly terminates while migrating a saved object index, {kib} automatically attempts to
+perform the migration again when the process restarts. Do not delete any saved objects indices to
+attempt to fix a failed migration. Unlike previous versions, {kib} 7.12.0 and
 later does not require deleting any indices to release a failed migration lock.
 
 If upgrade migrations fail repeatedly, follow the advice in
@@ -154,41 +164,48 @@ If you're unable to resolve a failed migration following these steps, please con
 
 If you've followed the advice in <<preventing-migration-failures, preventing migration failures>>
 and <<resolve-migrations-failures, resolving migration failures>> and
-{kib} is still not able to upgrade successfully, you might choose to rollback {kib} until
+If {kib} is still unable to upgrade successfully, rollback {kib} until
 you're able to identify and fix the root cause.
 
-WARNING: Before rolling back {kib}, ensure that the version you wish to rollback to is compatible with
-your {es} cluster. If the version you're rolling back to is not compatible, you will have to also rollback {es}.
-Any changes made after an upgrade will be lost when rolling back to a previous version.
+WARNING: Before rolling back {kib}, ensure that the version you want to rollback to is compatible with
+your {es} cluster. If the version you're rolling back to is not compatible, you must also rollback {es}.
+Any changes made after an upgrade are lost when rolling back to a previous version.
 
-In order to rollback after a failed upgrade migration, the saved object indices have to be
+To rollback after a failed upgrade migration, the saved object indices have to be
 rolled back to be compatible with the previous {kib} version.
 
 [float]
-===== Rollback by restoring a backup snapshot:
+===== Rollback by restoring a backup snapshot
 
-1. Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state.
+. Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state.
    Snapshots include this feature state by default.
-2. Shutdown all {kib} instances to be 100% sure that there are no instances currently performing a migration.
-3. Delete all saved object indices with `DELETE /.kibana*`
-4. {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state from the snapshot.
-5. Start up all {kib} instances on the older version you wish to rollback to.
+. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
+. Delete all saved object indices with `DELETE /.kibana*`.
+. {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state from the snapshot.
+. Start all {kib} instances on the older version you want to rollback to.
 
 [float]
-===== (Not recommended) Rollback without a backup snapshot:
+===== (Not recommended) Rollback without a backup snapshot
 
-1. Shutdown all {kib} instances to be 100% sure that there are no {kib} instances currently performing a migration.
-2. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. Snapshots include this feature state by default.
-3. Delete the version specific indices created by the failed upgrade migration. For example, if you wish to rollback from a failed upgrade to v7.12.0 `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`
-4. Inspect the output of `GET /_cat/aliases`.
-If either the `.kibana` and/or `.kibana_task_manager` alias is missing, these will have to be created manually.
+. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
+. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. By default, snapshots include the feature state.
+. Delete the version-specific indices created by the failed upgrade migration.
++
+For example, to rollback from a failed upgrade
+to v7.12.0: `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`
+. Inspect the output of `GET /_cat/aliases`.
++
+If the `.kibana` or `.kibana_task_manager` aliases are missing, you must create them manually.
 Find the latest index from the output of `GET /_cat/indices` and create the missing alias to point to the latest index.
-For example. if the `.kibana` alias was missing and the latest index is `.kibana_3` create a new alias with `POST /.kibana_3/_aliases/.kibana`.
-5. Remove the write block from the rollback indices. `PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`
-6. Start up {kib} on the older version you wish to rollback to.
+For example, if the `.kibana` alias is missing, and the latest index is `.kibana_3`, create a new alias with `POST /.kibana_3/_aliases/.kibana`.
+. To remove the write block from the rollback indices:
+`PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`
+. Start {kib} on the older version you want to rollback to.
 
 [float]
 [[upgrade-migrations-old-indices]]
 ==== Handling old `.kibana_N` indices
 
-After migrations have completed, there will be multiple {kib} indices in {es}: (`.kibana_1`, `.kibana_2`, `.kibana_7.12.0` etc). {kib} only uses the index that the `.kibana` and `.kibana_task_manager` alias points to. The other {kib} indices can be safely deleted, but are left around as a matter of historical record, and to facilitate rolling {kib} back to a previous version.
+After the migrations complete, multiple {kib} indices are created in {es}: (`.kibana_1`, `.kibana_2`, `.kibana_7.12.0` etc).
+{kib} only uses the index that the `.kibana` and `.kibana_task_manager` aliases point to.
+The other {kib} indices can be safely deleted, but are left around as a matter of historical record, and to facilitate rolling {kib} back to a previous version.

From 8e8c4b8d96a6bc9a23b9d58996882fedef8147be Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Wed, 9 Feb 2022 10:11:10 -0700
Subject: [PATCH 19/85] [Canvas] Migrate by value embeddables (#123515)

* Add migrations for by value embeddables

Check for id in embeddable input

Removed unused import

Fixed tests

Fix variable name

Move migration into embeddable function definition

Remove unused code

* Cleanup

* Fix embeddable test

* Remove check for by-value embeddables in embeddable function migration

* Removed unused import

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../functions/external/embeddable.test.ts     | 11 +++++--
 .../functions/external/embeddable.ts          | 32 ++++++++++++++++++-
 .../functions/external/index.ts               |  1 +
 .../canvas/canvas_plugin_src/plugin.ts        |  1 +
 x-pack/plugins/canvas/server/plugin.ts        |  1 +
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
index 001fb0e3f62e3..ad25b8a3081a1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
@@ -9,7 +9,6 @@ import { embeddableFunctionFactory } from './embeddable';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
 import { encode } from '../../../common/lib/embeddable_dataurl';
-import { InitializeArguments } from '.';
 
 const filterContext: ExpressionValueFilter = {
   type: 'filter',
@@ -32,8 +31,16 @@ const filterContext: ExpressionValueFilter = {
   ],
 };
 
+const embeddablePersistableStateServiceMock = {
+  extract: jest.fn(),
+  inject: jest.fn(),
+  getAllMigrations: jest.fn(),
+};
+
 describe('embeddable', () => {
-  const fn = embeddableFunctionFactory({} as InitializeArguments)().fn;
+  const fn = embeddableFunctionFactory({
+    embeddablePersistableStateService: embeddablePersistableStateServiceMock,
+  })().fn;
   const config = {
     id: 'some-id',
     timerange: { from: '15m', to: 'now' },
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
index 7ef8f0a09eb90..8ec299c60dae5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
@@ -5,7 +5,16 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { mapValues } from 'lodash';
+import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionAstFunction,
+} from 'src/plugins/expressions/common';
+import {
+  MigrateFunction,
+  MigrateFunctionsObject,
+} from '../../../../../../src/plugins/kibana_utils/common';
 import { ExpressionValueFilter, EmbeddableInput } from '../../../types';
 import { EmbeddableExpressionType, EmbeddableExpression } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
@@ -45,6 +54,22 @@ export function embeddableFunctionFactory({
   return function embeddable(): EmbeddableFunction {
     const { help, args: argHelp } = getFunctionHelp().embeddable;
 
+    const migrateByValueEmbeddable =
+      (
+        migrateFn: MigrateFunction<EmbeddableStateWithType, EmbeddableStateWithType>
+      ): MigrateFunction<ExpressionAstFunction, ExpressionAstFunction> =>
+      (state: ExpressionAstFunction): ExpressionAstFunction => {
+        const embeddableInput = decode(state.arguments.config[0] as string);
+
+        const embeddableType = state.arguments.type[0];
+        const migratedInput = migrateFn({ ...embeddableInput, type: embeddableType });
+
+        state.arguments.config[0] = encode(migratedInput);
+        state.arguments.type[0] = migratedInput.type as string;
+
+        return state;
+      };
+
     return {
       name: 'embeddable',
       help,
@@ -140,6 +165,11 @@ export function embeddableFunctionFactory({
         }
         return state;
       },
+
+      migrations: mapValues<
+        MigrateFunctionsObject,
+        MigrateFunction<ExpressionAstFunction, ExpressionAstFunction>
+      >(embeddablePersistableStateService.getAllMigrations(), migrateByValueEmbeddable),
     };
   };
 }
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
index 1d69e181b5fd9..29200d938b53a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -16,6 +16,7 @@ export interface InitializeArguments {
   embeddablePersistableStateService: {
     extract: EmbeddableStart['extract'];
     inject: EmbeddableStart['inject'];
+    getAllMigrations: EmbeddableStart['getAllMigrations'];
   };
 }
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index 591795637aebe..6153d20b657f5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -46,6 +46,7 @@ export class CanvasSrcPlugin implements Plugin<void, void, SetupDeps, StartDeps>
         embeddablePersistableStateService: {
           extract: depsStart.embeddable.extract,
           inject: depsStart.embeddable.inject,
+          getAllMigrations: depsStart.embeddable.getAllMigrations,
         },
       });
       plugins.canvas.addFunctions(externalFunctions);
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index 27b6186216b69..172d1e8dd8bf1 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -58,6 +58,7 @@ export class CanvasPlugin implements Plugin {
       embeddablePersistableStateService: {
         extract: plugins.embeddable.extract,
         inject: plugins.embeddable.inject,
+        getAllMigrations: plugins.embeddable.getAllMigrations,
       },
     });
 

From 153b7e135c6a8a24a6b29efece8cd7ca70251fcd Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 9 Feb 2022 12:22:08 -0500
Subject: [PATCH 20/85] [Fleet] Fix fleet server hosts client validation
 (#125085)

---
 .../use_fleet_server_host_form.test.tsx       | 83 +++++++++++++++++++
 .../use_fleet_server_host_form.tsx            |  7 +-
 .../plugins/fleet/public/hooks/use_input.ts   | 26 +++---
 3 files changed, 102 insertions(+), 14 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.test.tsx

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.test.tsx
new file mode 100644
index 0000000000000..151a3d5354c17
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.test.tsx
@@ -0,0 +1,83 @@
+/*
+ * 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-test-renderer';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+
+import { useFleetServerHostsForm } from './use_fleet_server_host_form';
+
+jest.mock('../../services/agent_and_policies_count', () => ({
+  ...jest.requireActual('../../services/agent_and_policies_count'),
+  getAgentAndPolicyCount: () => ({ agentCount: 0, agentPolicyCount: 0 }),
+}));
+jest.mock('../../hooks/use_confirm_modal', () => ({
+  ...jest.requireActual('../../hooks/use_confirm_modal'),
+  useConfirmModal: () => ({ confirm: () => true }),
+}));
+
+describe('useFleetServerHostsForm', () => {
+  it('should not allow to submit an invalid form', async () => {
+    const testRenderer = createFleetTestRendererMock();
+    const onSucess = jest.fn();
+    const { result } = testRenderer.renderHook(() => useFleetServerHostsForm([], onSucess));
+
+    act(() =>
+      result.current.fleetServerHostsInput.props.onChange(['http://test.fr', 'http://test.fr'])
+    );
+
+    await act(() => result.current.submit());
+
+    expect(result.current.fleetServerHostsInput.props.errors).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "index": 0,
+          "message": "Duplicate URL",
+        },
+        Object {
+          "index": 1,
+          "message": "Duplicate URL",
+        },
+      ]
+    `);
+    expect(onSucess).not.toBeCalled();
+    expect(result.current.isDisabled).toBeTruthy();
+  });
+
+  it('should submit a valid form', async () => {
+    const testRenderer = createFleetTestRendererMock();
+    const onSucess = jest.fn();
+    testRenderer.startServices.http.post.mockResolvedValue({});
+    const { result } = testRenderer.renderHook(() => useFleetServerHostsForm([], onSucess));
+
+    act(() => result.current.fleetServerHostsInput.props.onChange(['http://test.fr']));
+
+    await act(() => result.current.submit());
+    expect(onSucess).toBeCalled();
+  });
+
+  it('should allow the user to correct and submit a invalid form', async () => {
+    const testRenderer = createFleetTestRendererMock();
+    const onSucess = jest.fn();
+    testRenderer.startServices.http.post.mockResolvedValue({});
+    const { result } = testRenderer.renderHook(() => useFleetServerHostsForm([], onSucess));
+
+    act(() =>
+      result.current.fleetServerHostsInput.props.onChange(['http://test.fr', 'http://test.fr'])
+    );
+
+    await act(() => result.current.submit());
+    expect(onSucess).not.toBeCalled();
+    expect(result.current.isDisabled).toBeTruthy();
+
+    act(() => result.current.fleetServerHostsInput.props.onChange(['http://test.fr']));
+    expect(result.current.isDisabled).toBeFalsy();
+
+    await act(() => result.current.submit());
+    expect(onSucess).toBeCalled();
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
index 230985352da58..afe96713f065d 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
@@ -142,7 +142,7 @@ export function useFleetServerHostsForm(
 
   const submit = useCallback(async () => {
     try {
-      if (!validate) {
+      if (!validate()) {
         return;
       }
       const { agentCount, agentPolicyCount } = await getAgentAndPolicyCount();
@@ -178,9 +178,12 @@ export function useFleetServerHostsForm(
     }
   }, [fleetServerHostsInput.value, validate, notifications, confirm, onSuccess]);
 
+  const isDisabled =
+    isLoading || !fleetServerHostsInput.hasChanged || fleetServerHostsInput.props.isInvalid;
+
   return {
     isLoading,
-    isDisabled: isLoading || !fleetServerHostsInput.hasChanged,
+    isDisabled,
     submit,
     fleetServerHostsInput,
   };
diff --git a/x-pack/plugins/fleet/public/hooks/use_input.ts b/x-pack/plugins/fleet/public/hooks/use_input.ts
index 1c89fb232a66e..435cfec95b028 100644
--- a/x-pack/plugins/fleet/public/hooks/use_input.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_input.ts
@@ -125,11 +125,22 @@ export function useComboInput(
 
   const isInvalid = errors !== undefined;
 
+  const validateCallback = useCallback(() => {
+    if (validate) {
+      const newErrors = validate(value);
+      setErrors(newErrors);
+
+      return newErrors === undefined;
+    }
+
+    return true;
+  }, [validate, value]);
+
   const onChange = useCallback(
     (newValues: string[]) => {
       setValue(newValues);
-      if (errors && validate && validate(newValues) === undefined) {
-        setErrors(undefined);
+      if (errors && validate) {
+        setErrors(validate(newValues));
       }
     },
     [validate, errors]
@@ -149,16 +160,7 @@ export function useComboInput(
       setValue([]);
     },
     setValue,
-    validate: () => {
-      if (validate) {
-        const newErrors = validate(value);
-        setErrors(newErrors);
-
-        return newErrors === undefined;
-      }
-
-      return true;
-    },
+    validate: validateCallback,
     hasChanged,
   };
 }

From 809246721d966a084b1c748c2839528b8636303b Mon Sep 17 00:00:00 2001
From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com>
Date: Wed, 9 Feb 2022 10:28:39 -0700
Subject: [PATCH 21/85] [ResponseOps] Change the duration/percentile display
 format to mm:ss (#124647)

* Change the duration/percentile display format to mm:ss

* Addressed comments

* Add time format to tooltip

* Addressed comments, percentiles can show N/A

* Fix flaky test

* remove only

* address comments, now tests for N/A

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../application/lib/monitoring_utils.test.ts  | 23 +++++++---
 .../application/lib/monitoring_utils.ts       | 17 ++++++--
 .../components/alerts_list.test.tsx           | 42 ++++++++++++-------
 .../alerts_list/components/alerts_list.tsx    | 23 ++++------
 .../components/rule_duration_format.tsx       | 39 +++++++++++++++++
 .../alert_create_flyout.ts                    |  2 +-
 .../apps/triggers_actions_ui/alerts_list.ts   | 27 ++++++++----
 7 files changed, 126 insertions(+), 47 deletions(-)
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/rule_duration_format.tsx

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.test.ts
index 151fd001f9fa1..2ac04ffd6eaaf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.test.ts
@@ -4,7 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getFormattedSuccessRatio, getFormattedRuleExecutionPercentile } from './monitoring_utils';
+import {
+  getFormattedSuccessRatio,
+  getFormattedDuration,
+  getFormattedMilliseconds,
+} from './monitoring_utils';
 
 describe('monitoring_utils', () => {
   it('should return a decimal as a percent', () => {
@@ -12,9 +16,18 @@ describe('monitoring_utils', () => {
     expect(getFormattedSuccessRatio(0.75345345345345)).toEqual('75%');
   });
 
-  it('should return percentiles as an integer', () => {
-    expect(getFormattedRuleExecutionPercentile(0)).toEqual('0ms');
-    expect(getFormattedRuleExecutionPercentile(100.5555)).toEqual('101ms');
-    expect(getFormattedRuleExecutionPercentile(99.1111)).toEqual('99ms');
+  it('should return a formatted duration', () => {
+    expect(getFormattedDuration(0)).toEqual('00:00');
+    expect(getFormattedDuration(100.111)).toEqual('00:00');
+    expect(getFormattedDuration(50000)).toEqual('00:50');
+    expect(getFormattedDuration(500000)).toEqual('08:20');
+    expect(getFormattedDuration(5000000)).toEqual('83:20');
+    expect(getFormattedDuration(50000000)).toEqual('833:20');
+  });
+
+  it('should format a duration as an integer', () => {
+    expect(getFormattedMilliseconds(0)).toEqual('0 ms');
+    expect(getFormattedMilliseconds(100.5555)).toEqual('101 ms');
+    expect(getFormattedMilliseconds(99.1111)).toEqual('99 ms');
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.ts
index 29c03f118436f..f5bec63056103 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/monitoring_utils.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import moment from 'moment';
 import numeral from '@elastic/numeral';
 
 export function getFormattedSuccessRatio(successRatio: number) {
@@ -11,7 +12,17 @@ export function getFormattedSuccessRatio(successRatio: number) {
   return `${formatted}%`;
 }
 
-export function getFormattedRuleExecutionPercentile(percentile: number) {
-  const formatted = numeral(percentile).format('0,0');
-  return `${formatted}ms`;
+export function getFormattedDuration(value: number) {
+  if (!value) {
+    return '00:00';
+  }
+  const duration = moment.duration(value);
+  const minutes = Math.floor(duration.asMinutes()).toString().padStart(2, '0');
+  const seconds = duration.seconds().toString().padStart(2, '0');
+  return `${minutes}:${seconds}`;
+}
+
+export function getFormattedMilliseconds(value: number) {
+  const formatted = numeral(value).format('0,0');
+  return `${formatted} ms`;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx
index 2ca32ec04cd70..28aa0b2097aba 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx
@@ -18,6 +18,8 @@ import {
   ALERTS_FEATURE_ID,
   parseDuration,
 } from '../../../../../../alerting/common';
+import { getFormattedDuration, getFormattedMilliseconds } from '../../../lib/monitoring_utils';
+
 import { useKibana } from '../../../../common/lib/kibana';
 jest.mock('../../../../common/lib/kibana');
 
@@ -180,22 +182,22 @@ describe('alerts_list component with items', () => {
           history: [
             {
               success: true,
-              duration: 100,
+              duration: 1000000,
             },
             {
               success: true,
-              duration: 200,
+              duration: 200000,
             },
             {
               success: false,
-              duration: 300,
+              duration: 300000,
             },
           ],
           calculated_metrics: {
             success_ratio: 0.66,
-            p50: 200,
-            p95: 300,
-            p99: 300,
+            p50: 200000,
+            p95: 300000,
+            p99: 300000,
           },
         },
       },
@@ -227,18 +229,18 @@ describe('alerts_list component with items', () => {
           history: [
             {
               success: true,
-              duration: 100,
+              duration: 100000,
             },
             {
               success: true,
-              duration: 500,
+              duration: 500000,
             },
           ],
           calculated_metrics: {
             success_ratio: 1,
             p50: 0,
-            p95: 100,
-            p99: 500,
+            p95: 100000,
+            p99: 500000,
           },
         },
       },
@@ -458,7 +460,7 @@ describe('alerts_list component with items', () => {
 
     wrapper.update();
     expect(wrapper.find('.euiToolTipPopover').text()).toBe(
-      'The length of time it took for the rule to run.'
+      'The length of time it took for the rule to run (mm:ss).'
     );
 
     // Status column
@@ -508,14 +510,24 @@ describe('alerts_list component with items', () => {
     ).toBeTruthy();
 
     let percentiles = wrapper.find(
-      `EuiTableRowCell[data-test-subj="alertsTableCell-ruleExecutionPercentile"] span[data-test-subj="${Percentiles.P50}Percentile"]`
+      `EuiTableRowCell[data-test-subj="alertsTableCell-ruleExecutionPercentile"] span[data-test-subj="rule-duration-format-value"]`
     );
 
     mockedAlertsData.forEach((rule, index) => {
       if (typeof rule.monitoring?.execution.calculated_metrics.p50 === 'number') {
+        // Ensure the table cells are getting the correct values
         expect(percentiles.at(index).text()).toEqual(
-          `${rule.monitoring.execution.calculated_metrics.p50}ms`
+          getFormattedDuration(rule.monitoring.execution.calculated_metrics.p50)
         );
+        // Ensure the tooltip is showing the correct content
+        expect(
+          wrapper
+            .find(
+              'EuiTableRowCell[data-test-subj="alertsTableCell-ruleExecutionPercentile"] [data-test-subj="rule-duration-format-tooltip"]'
+            )
+            .at(index)
+            .props().content
+        ).toEqual(getFormattedMilliseconds(rule.monitoring.execution.calculated_metrics.p50));
       } else {
         expect(percentiles.at(index).text()).toEqual('N/A');
       }
@@ -581,13 +593,13 @@ describe('alerts_list component with items', () => {
     ).toBeTruthy();
 
     percentiles = wrapper.find(
-      `EuiTableRowCell[data-test-subj="alertsTableCell-ruleExecutionPercentile"] span[data-test-subj="${Percentiles.P95}Percentile"]`
+      `EuiTableRowCell[data-test-subj="alertsTableCell-ruleExecutionPercentile"] span[data-test-subj="rule-duration-format-value"]`
     );
 
     mockedAlertsData.forEach((rule, index) => {
       if (typeof rule.monitoring?.execution.calculated_metrics.p95 === 'number') {
         expect(percentiles.at(index).text()).toEqual(
-          `${rule.monitoring.execution.calculated_metrics.p95}ms`
+          getFormattedDuration(rule.monitoring.execution.calculated_metrics.p95)
         );
       } else {
         expect(percentiles.at(index).text()).toEqual('N/A');
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
index 40b5e981c181e..72228c285238d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -86,14 +86,9 @@ import { ManageLicenseModal } from './manage_license_modal';
 import { checkAlertTypeEnabled } from '../../../lib/check_alert_type_enabled';
 import { RuleEnabledSwitch } from './rule_enabled_switch';
 import { PercentileSelectablePopover } from './percentile_selectable_popover';
-import {
-  formatMillisForDisplay,
-  shouldShowDurationWarning,
-} from '../../../lib/execution_duration_utils';
-import {
-  getFormattedSuccessRatio,
-  getFormattedRuleExecutionPercentile,
-} from '../../../lib/monitoring_utils';
+import { RuleDurationFormat } from './rule_duration_format';
+import { shouldShowDurationWarning } from '../../../lib/execution_duration_utils';
+import { getFormattedSuccessRatio } from '../../../lib/monitoring_utils';
 
 const ENTER_KEY = 13;
 
@@ -396,7 +391,7 @@ export const AlertsList: React.FunctionComponent = () => {
           content={i18n.translate(
             'xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.ruleExecutionPercentileTooltip',
             {
-              defaultMessage: `{percentileOrdinal} percentile of this rule's past {sampleLimit} execution durations`,
+              defaultMessage: `{percentileOrdinal} percentile of this rule's past {sampleLimit} execution durations (mm:ss).`,
               values: {
                 percentileOrdinal: percentileOrdinals[selectedPercentile!],
                 sampleLimit: MONITORING_HISTORY_LIMIT,
@@ -420,7 +415,7 @@ export const AlertsList: React.FunctionComponent = () => {
   const renderPercentileCellValue = (value: number) => {
     return (
       <span data-test-subj={`${selectedPercentile}Percentile`}>
-        {typeof value === 'number' ? getFormattedRuleExecutionPercentile(value) : 'N/A'}
+        <RuleDurationFormat allowZero={false} duration={value} />
       </span>
     );
   };
@@ -630,7 +625,7 @@ export const AlertsList: React.FunctionComponent = () => {
             content={i18n.translate(
               'xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.durationTitle',
               {
-                defaultMessage: 'The length of time it took for the rule to run.',
+                defaultMessage: 'The length of time it took for the rule to run (mm:ss).',
               }
             )}
           >
@@ -651,7 +646,7 @@ export const AlertsList: React.FunctionComponent = () => {
 
           return (
             <>
-              {`${formatMillisForDisplay(value)}`}
+              {<RuleDurationFormat duration={value} />}
               {showDurationWarning && (
                 <EuiIconTip
                   data-test-subj="ruleDurationWarning"
@@ -671,6 +666,7 @@ export const AlertsList: React.FunctionComponent = () => {
           );
         },
       },
+      getPercentileColumn(),
       {
         field: 'monitoring.execution.calculated_metrics.success_ratio',
         width: '12%',
@@ -680,7 +676,7 @@ export const AlertsList: React.FunctionComponent = () => {
             content={i18n.translate(
               'xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.successRatioTitle',
               {
-                defaultMessage: 'How often this rule executes successfully',
+                defaultMessage: 'How often this rule executes successfully.',
               }
             )}
           >
@@ -701,7 +697,6 @@ export const AlertsList: React.FunctionComponent = () => {
           );
         },
       },
-      getPercentileColumn(),
       {
         field: 'executionStatus.status',
         name: i18n.translate(
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/rule_duration_format.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/rule_duration_format.tsx
new file mode 100644
index 0000000000000..b6512b93d8a94
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/rule_duration_format.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, { memo, useMemo } from 'react';
+import { EuiToolTip } from '@elastic/eui';
+import { getFormattedDuration, getFormattedMilliseconds } from '../../../lib/monitoring_utils';
+
+interface Props {
+  duration: number;
+  allowZero?: boolean;
+}
+
+export const RuleDurationFormat = memo((props: Props) => {
+  const { duration, allowZero = true } = props;
+
+  const formattedDuration = useMemo(() => {
+    if (allowZero || typeof duration === 'number') {
+      return getFormattedDuration(duration);
+    }
+    return 'N/A';
+  }, [duration, allowZero]);
+
+  const formattedTooltip = useMemo(() => {
+    if (allowZero || typeof duration === 'number') {
+      return getFormattedMilliseconds(duration);
+    }
+    return 'N/A';
+  }, [duration, allowZero]);
+
+  return (
+    <EuiToolTip data-test-subj="rule-duration-format-tooltip" content={formattedTooltip}>
+      <span data-test-subj="rule-duration-format-value">{formattedDuration}</span>
+    </EuiToolTip>
+  );
+});
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
index eaf71c107edd9..95ff24fc8beef 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
@@ -168,7 +168,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         tags: '',
         interval: '1 min',
       });
-      expect(searchResultAfterSave.duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResultAfterSave.duration).to.match(/\d{2,}:\d{2}/);
 
       // clean up created alert
       const alertsToDelete = await getAlertsByName(alertName);
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts
index 0edf65b4e3d42..2b45a12790107 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts
@@ -81,7 +81,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       expect(searchResults[0].name).to.equal(`${createdAlert.name}Test: Noop`);
       expect(searchResults[0].interval).to.equal('1 min');
       expect(searchResults[0].tags).to.equal('2');
-      expect(searchResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResults[0].duration).to.match(/\d{2,}:\d{2}/);
     });
 
     it('should update alert list on the search clear button click', async () => {
@@ -103,7 +103,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       expect(searchResults[0].name).to.equal('bTest: Noop');
       expect(searchResults[0].interval).to.equal('1 min');
       expect(searchResults[0].tags).to.equal('2');
-      expect(searchResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResults[0].duration).to.match(/\d{2,}:\d{2}/);
 
       const searchClearButton = await find.byCssSelector('.euiFormControlLayoutClearButton');
       await searchClearButton.click();
@@ -115,11 +115,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       expect(searchResultsAfterClear[0].name).to.equal('bTest: Noop');
       expect(searchResultsAfterClear[0].interval).to.equal('1 min');
       expect(searchResultsAfterClear[0].tags).to.equal('2');
-      expect(searchResultsAfterClear[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResultsAfterClear[0].duration).to.match(/\d{2,}:\d{2}/);
       expect(searchResultsAfterClear[1].name).to.equal('cTest: Noop');
       expect(searchResultsAfterClear[1].interval).to.equal('1 min');
       expect(searchResultsAfterClear[1].tags).to.equal('');
-      expect(searchResultsAfterClear[1].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResultsAfterClear[1].duration).to.match(/\d{2,}:\d{2}/);
     });
 
     it('should search for tags', async () => {
@@ -136,7 +136,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       expect(searchResults[0].name).to.equal(`${createdAlert.name}Test: Noop`);
       expect(searchResults[0].interval).to.equal('1 min');
       expect(searchResults[0].tags).to.equal('3');
-      expect(searchResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+      expect(searchResults[0].duration).to.match(/\d{2,}:\d{2}/);
     });
 
     it('should display an empty list when search did not return any alerts', async () => {
@@ -369,11 +369,20 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.existOrFail('P50Percentile');
 
       await retry.try(async () => {
+        const percentileCell = await find.byCssSelector(
+          '[data-test-subj="P50Percentile"]:nth-of-type(1)'
+        );
+        const percentileCellText = await percentileCell.getVisibleText();
+        expect(percentileCellText).to.match(/^N\/A|\d{2,}:\d{2}$/);
+
         await testSubjects.click('percentileSelectablePopover-iconButton');
         await testSubjects.existOrFail('percentileSelectablePopover-selectable');
         const searchClearButton = await find.byCssSelector(
           '[data-test-subj="percentileSelectablePopover-selectable"] li:nth-child(2)'
         );
+        const alertResults = await pageObjects.triggersActionsUI.getAlertsList();
+        expect(alertResults[0].duration).to.match(/^N\/A|\d{2,}:\d{2}$/);
+
         await searchClearButton.click();
         await testSubjects.missingOrFail('percentileSelectablePopover-selectable');
         await testSubjects.existOrFail('alertsTable-P95ColumnName');
@@ -427,7 +436,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         expect(filterErrorOnlyResults[0].name).to.equal(`${failingAlert.name}Test: Failing`);
         expect(filterErrorOnlyResults[0].interval).to.equal('30 sec');
         expect(filterErrorOnlyResults[0].status).to.equal('Error');
-        expect(filterErrorOnlyResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+        expect(filterErrorOnlyResults[0].duration).to.match(/\d{2,}:\d{2}/);
       });
     });
 
@@ -440,7 +449,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         expect(refreshResults[0].name).to.equal(`${createdAlert.name}Test: Noop`);
         expect(refreshResults[0].interval).to.equal('1 min');
         expect(refreshResults[0].status).to.equal('Ok');
-        expect(refreshResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+        expect(refreshResults[0].duration).to.match(/\d{2,}:\d{2}/);
       });
 
       const alertsErrorBannerWhenNoErrors = await find.allByCssSelector(
@@ -484,7 +493,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         expect(filterFailingAlertOnlyResults.length).to.equal(1);
         expect(filterFailingAlertOnlyResults[0].name).to.equal(`${failingAlert.name}Test: Failing`);
         expect(filterFailingAlertOnlyResults[0].interval).to.equal('30 sec');
-        expect(filterFailingAlertOnlyResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+        expect(filterFailingAlertOnlyResults[0].duration).to.match(/\d{2,}:\d{2}/);
       });
     });
 
@@ -518,7 +527,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           `${noopAlertWithAction.name}Test: Noop`
         );
         expect(filterWithSlackOnlyResults[0].interval).to.equal('1 min');
-        expect(filterWithSlackOnlyResults[0].duration).to.match(/\d{2}:\d{2}:\d{2}.\d{3}/);
+        expect(filterWithSlackOnlyResults[0].duration).to.match(/\d{2,}:\d{2}/);
       });
       await testSubjects.click('alertTypeFilterButton');
 

From 3c73b605aa32bbf1d90dcad48253e8cbfe142410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Casper=20H=C3=BCbertz?= <casper@formgeist.com>
Date: Wed, 9 Feb 2022 19:00:26 +0100
Subject: [PATCH 22/85] [Unified Observability] Overview style updates
 (#124702)

* Big chunk of style updates

* New layout and position for news and resources

* Alerts updated

* Rename headings and links

* Removed unncessary prop

* More fixes

* Remove active status

* Fixing tests

* fix tests

* fix checks

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Ester Marti <ester.martivilaseca@elastic.co>
---
 .../components/app/chart_container/index.tsx  |   4 +-
 .../public/components/app/news_feed/index.tsx |  85 +++++++-------
 .../public/components/app/resources/index.tsx |   2 +-
 .../components/app/section/alerts/index.tsx   | 108 ++++++++++--------
 .../components/app/section/apm/index.test.tsx |  18 +--
 .../components/app/section/apm/index.tsx      |   4 +-
 .../public/components/app/section/index.tsx   |  19 +--
 .../components/app/section/logs/index.tsx     |   6 +-
 .../components/app/section/metrics/index.tsx  |   4 +-
 .../components/app/section/uptime/index.tsx   |   6 +-
 .../components/app/section/ux/index.test.tsx  |   6 +-
 .../components/app/section/ux/index.tsx       |   2 +-
 .../public/pages/overview/data_sections.tsx   |   2 +-
 .../pages/overview/old_overview_page.tsx      |  42 ++++---
 14 files changed, 164 insertions(+), 144 deletions(-)

diff --git a/x-pack/plugins/observability/public/components/app/chart_container/index.tsx b/x-pack/plugins/observability/public/components/app/chart_container/index.tsx
index 6251afc1013a8..5164684e3490b 100644
--- a/x-pack/plugins/observability/public/components/app/chart_container/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/chart_container/index.tsx
@@ -18,12 +18,12 @@ interface Props {
   children: React.ReactNode;
 }
 
-const CHART_HEIGHT = 170;
+const CHART_HEIGHT = 120;
 
 export function ChartContainer({
   isInitialLoad,
   children,
-  iconSize = 'xl',
+  iconSize = 'l',
   height = CHART_HEIGHT,
 }: Props) {
   if (isInitialLoad) {
diff --git a/x-pack/plugins/observability/public/components/app/news_feed/index.tsx b/x-pack/plugins/observability/public/components/app/news_feed/index.tsx
index 6f1a5f33b9ba7..bdf82213aaa07 100644
--- a/x-pack/plugins/observability/public/components/app/news_feed/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/news_feed/index.tsx
@@ -9,7 +9,7 @@ import {
   EuiErrorBoundary,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiHorizontalRule,
+  EuiPanel,
   EuiLink,
   EuiText,
   EuiTitle,
@@ -56,48 +56,49 @@ function NewsItem({ item }: { item: INewsItem }) {
   const theme = useContext(ThemeContext);
 
   return (
-    <EuiFlexGroup direction="column" gutterSize="s">
-      <EuiFlexItem grow={false}>
-        <EuiTitle size="xxxs">
-          <h4>{item.title.en}</h4>
-        </EuiTitle>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiFlexGroup gutterSize="s">
-          <EuiFlexItem>
-            <EuiFlexGroup direction="column" gutterSize="s" alignItems="baseline">
-              <EuiFlexItem>
-                <EuiText grow={false} size="xs" color="subdued">
-                  {limitString(item.description.en, 128)}
-                </EuiText>
-              </EuiFlexItem>
+    <EuiPanel hasBorder={true}>
+      <EuiFlexGroup direction="column" gutterSize="s">
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xxs">
+            <h4>{item.title.en}</h4>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup gutterSize="s">
+            <EuiFlexItem>
+              <EuiFlexGroup direction="column" gutterSize="s" alignItems="baseline">
+                <EuiFlexItem>
+                  <EuiText grow={false} size="s" color="subdued">
+                    {limitString(item.description.en, 128)}
+                  </EuiText>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiText size="s">
+                    <EuiLink href={item.link_url.en} target="_blank" external>
+                      {i18n.translate('xpack.observability.news.readFullStory', {
+                        defaultMessage: 'Read full story',
+                      })}
+                    </EuiLink>
+                  </EuiText>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+            {item.image_url?.en && (
               <EuiFlexItem grow={false}>
-                <EuiText size="xs">
-                  <EuiLink href={item.link_url.en} target="_blank" external>
-                    {i18n.translate('xpack.observability.news.readFullStory', {
-                      defaultMessage: 'Read full story',
-                    })}
-                  </EuiLink>
-                </EuiText>
+                <img
+                  data-test-subj="newsImage"
+                  style={{ border: theme.eui.euiBorderThin }}
+                  width={48}
+                  height={48}
+                  alt={item.title.en}
+                  src={item.image_url.en}
+                  className="obsNewsFeed__itemImg"
+                />
               </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-          {item.image_url?.en && (
-            <EuiFlexItem grow={false}>
-              <img
-                data-test-subj="newsImage"
-                style={{ border: theme.eui.euiBorderThin }}
-                width={48}
-                height={48}
-                alt={item.title.en}
-                src={item.image_url.en}
-                className="obsNewsFeed__itemImg"
-              />
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-      </EuiFlexItem>
-      <EuiHorizontalRule margin="s" />
-    </EuiFlexGroup>
+            )}
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
   );
 }
diff --git a/x-pack/plugins/observability/public/components/app/resources/index.tsx b/x-pack/plugins/observability/public/components/app/resources/index.tsx
index 763b30860cd78..f2bcca594653e 100644
--- a/x-pack/plugins/observability/public/components/app/resources/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/resources/index.tsx
@@ -42,7 +42,7 @@ const resources = [
 
 export function Resources() {
   return (
-    <EuiFlexGroup direction="column" alignItems="flexStart" gutterSize="xs">
+    <EuiFlexGroup direction="column" alignItems="flexStart">
       <EuiFlexItem grow={false}>
         <EuiTitle size="xs">
           <h4>
diff --git a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
index 328de71ac7874..77ea5eeea14ba 100644
--- a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
@@ -9,15 +9,14 @@ import {
   EuiBadge,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiHorizontalRule,
-  EuiIconTip,
   EuiLink,
   EuiText,
   EuiSpacer,
   EuiTitle,
-  EuiButton,
+  EuiButtonEmpty,
   EuiLoadingSpinner,
   EuiCallOut,
+  EuiPanel,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -68,7 +67,7 @@ export function AlertsSection() {
     return (
       <EuiFlexGroup alignItems="center" justifyContent="center" responsive={false}>
         <EuiFlexItem grow={false}>
-          <EuiLoadingSpinner size="xl" />
+          <EuiLoadingSpinner size="l" />
         </EuiFlexItem>
       </EuiFlexGroup>
     );
@@ -99,7 +98,12 @@ export function AlertsSection() {
 
   return (
     <div>
-      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" responsive={false}>
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+        responsive={false}
+        gutterSize="s"
+      >
         <EuiFlexItem grow={false}>
           <EuiTitle size="xs">
             <h4>
@@ -110,73 +114,77 @@ export function AlertsSection() {
           </EuiTitle>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiButton size="s" href={manageLink}>
+          <EuiButtonEmpty iconType="sortRight" color="text" size="xs" href={manageLink}>
             {i18n.translate('xpack.observability.overview.alert.appLink', {
-              defaultMessage: 'Manage alerts',
+              defaultMessage: 'Show all alerts',
             })}
-          </EuiButton>
+          </EuiButtonEmpty>
         </EuiFlexItem>
       </EuiFlexGroup>
       <>
         <EuiFlexItem grow={false}>
-          <EuiSpacer />
+          <EuiSpacer size="s" />
           <EuiSelect
             compressed
-            fullWidth={true}
             id="filterAlerts"
             options={[allTypes, ...filterOptions]}
             value={filter}
             onChange={(e) => setFilter(e.target.value)}
+            prepend="Show"
           />
-          <EuiSpacer />
+          <EuiSpacer size="s" />
         </EuiFlexItem>
         {alerts
           .filter((alert) => filter === ALL_TYPES || alert.consumer === filter)
           .map((alert, index) => {
-            const isLastElement = index === alerts.length - 1;
             return (
-              <EuiFlexGroup direction="column" gutterSize="s" key={alert.id}>
-                <EuiFlexItem grow={false}>
-                  <EuiLink
-                    href={core.http.basePath.prepend(paths.management.alertDetails(alert.id))}
-                  >
-                    <EuiText size="s">{alert.name}</EuiText>
-                  </EuiLink>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiFlexGroup gutterSize="xs">
-                    <EuiFlexItem grow={false}>
-                      <EuiBadge color="hollow">{alert.alertTypeId}</EuiBadge>
-                    </EuiFlexItem>
-                    {alert.tags.map((tag, idx) => {
-                      return (
-                        <EuiFlexItem key={idx} grow={false}>
-                          <EuiBadge color="default">{tag}</EuiBadge>
-                        </EuiFlexItem>
-                      );
-                    })}
-                  </EuiFlexGroup>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiFlexGroup gutterSize="s">
-                    <EuiFlexItem grow={false}>
-                      <EuiText color="subdued" size="xs">
-                        Updated {moment.duration(moment().diff(alert.updatedAt)).humanize()} ago
-                      </EuiText>
-                    </EuiFlexItem>
-                    {alert.muteAll && (
+              <EuiFlexGroup>
+                <EuiFlexItem>
+                  <EuiPanel>
+                    <EuiFlexGroup direction="column" gutterSize="s" key={alert.id}>
                       <EuiFlexItem grow={false}>
-                        <EuiIconTip
-                          type="minusInCircle"
-                          content={i18n.translate('xpack.observability.overview.alerts.muted', {
-                            defaultMessage: 'Muted',
+                        <EuiLink
+                          href={core.http.basePath.prepend(paths.management.alertDetails(alert.id))}
+                        >
+                          <EuiText size="s">{alert.name}</EuiText>
+                        </EuiLink>
+                      </EuiFlexItem>
+                      <EuiFlexItem grow={false}>
+                        <EuiFlexGroup gutterSize="xs">
+                          <EuiFlexItem grow={false}>
+                            <EuiBadge color="hollow">{alert.alertTypeId}</EuiBadge>
+                          </EuiFlexItem>
+                          {alert.tags.map((tag, idx) => {
+                            return (
+                              <EuiFlexItem key={idx} grow={false}>
+                                <EuiBadge color="default">{tag}</EuiBadge>
+                              </EuiFlexItem>
+                            );
                           })}
-                        />
+                        </EuiFlexGroup>
+                      </EuiFlexItem>
+                      <EuiFlexItem grow={false}>
+                        <EuiFlexGroup gutterSize="s" alignItems="center">
+                          {alert.muteAll && (
+                            <EuiFlexItem grow={false}>
+                              <EuiBadge color="hollow">
+                                {i18n.translate('xpack.observability.overview.alerts.muted', {
+                                  defaultMessage: 'Muted',
+                                })}
+                              </EuiBadge>
+                            </EuiFlexItem>
+                          )}
+                          <EuiFlexItem grow={false}>
+                            <EuiText color="subdued" size="xs">
+                              Last updated{' '}
+                              {moment.duration(moment().diff(alert.updatedAt)).humanize()} ago
+                            </EuiText>
+                          </EuiFlexItem>
+                        </EuiFlexGroup>
                       </EuiFlexItem>
-                    )}
-                  </EuiFlexGroup>
+                    </EuiFlexGroup>
+                  </EuiPanel>
                 </EuiFlexItem>
-                {!isLastElement && <EuiHorizontalRule margin="xs" />}
               </EuiFlexGroup>
             );
           })}
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
index 35835cd0bc8e6..5e45eda0d3176 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
@@ -84,12 +84,12 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByTestId } = render(
+    const { getByRole, getByText, queryAllByTestId } = render(
       <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
     );
 
-    expect(getByText('APM')).toBeInTheDocument();
-    expect(getByText('View in app')).toBeInTheDocument();
+    expect(getByRole('heading')).toHaveTextContent('Services');
+    expect(getByText('Show service inventory')).toBeInTheDocument();
     expect(getByText('Services 11')).toBeInTheDocument();
     expect(getByText('Throughput 900.0 tpm')).toBeInTheDocument();
     expect(queryAllByTestId('loading')).toEqual([]);
@@ -101,12 +101,12 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByTestId } = render(
+    const { getByRole, getByText, queryAllByTestId } = render(
       <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
     );
 
-    expect(getByText('APM')).toBeInTheDocument();
-    expect(getByText('View in app')).toBeInTheDocument();
+    expect(getByRole('heading')).toHaveTextContent('Services');
+    expect(getByText('Show service inventory')).toBeInTheDocument();
     expect(getByText('Services 11')).toBeInTheDocument();
     expect(getByText('Throughput 312.00k tpm')).toBeInTheDocument();
     expect(queryAllByTestId('loading')).toEqual([]);
@@ -117,13 +117,13 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.LOADING,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByText, getByTestId } = render(
+    const { getByRole, queryAllByText, getByTestId } = render(
       <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
     );
 
-    expect(getByText('APM')).toBeInTheDocument();
+    expect(getByRole('heading')).toHaveTextContent('Services');
     expect(getByTestId('loading')).toBeInTheDocument();
-    expect(queryAllByText('View in app')).toEqual([]);
+    expect(queryAllByText('Show service inventory')).toEqual([]);
     expect(queryAllByText('Services 11')).toEqual([]);
     expect(queryAllByText('Throughput 312.00k tpm')).toEqual([]);
   });
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
index 11565cfb972e7..6c61ecb3f270e 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
@@ -93,12 +93,12 @@ export function APMSection({ bucketSize }: Props) {
   return (
     <SectionContainer
       title={i18n.translate('xpack.observability.overview.apm.title', {
-        defaultMessage: 'APM',
+        defaultMessage: 'Services',
       })}
       appLink={{
         href: appLink,
         label: i18n.translate('xpack.observability.overview.apm.appLink', {
-          defaultMessage: 'View in app',
+          defaultMessage: 'Show service inventory',
         }),
       }}
       hasError={status === FETCH_STATUS.FAILURE}
diff --git a/x-pack/plugins/observability/public/components/app/section/index.tsx b/x-pack/plugins/observability/public/components/app/section/index.tsx
index a983f4e1fae92..8c8fc61a0bb45 100644
--- a/x-pack/plugins/observability/public/components/app/section/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiAccordion, EuiPanel, EuiSpacer, EuiTitle, EuiButton } from '@elastic/eui';
+import { EuiAccordion, EuiPanel, EuiSpacer, EuiTitle, EuiButtonEmpty } from '@elastic/eui';
 import React from 'react';
 import { ErrorPanel } from './error_panel';
 import { usePluginContext } from '../../../hooks/use_plugin_context';
@@ -25,29 +25,32 @@ interface Props {
 export function SectionContainer({ title, appLink, children, hasError }: Props) {
   const { core } = usePluginContext();
   return (
-    <EuiPanel hasBorder={true}>
+    <EuiPanel hasShadow={true} color="subdued">
       <EuiAccordion
         initialIsOpen
         id={title}
         buttonContentClassName="accordion-button"
         buttonContent={
-          <EuiTitle size="s">
+          <EuiTitle size="xs">
             <h5>{title}</h5>
           </EuiTitle>
         }
         extraAction={
           appLink?.href && (
-            <EuiButton size="s" href={core.http.basePath.prepend(appLink.href)}>
+            <EuiButtonEmpty
+              iconType={'sortRight'}
+              size="xs"
+              color="text"
+              href={core.http.basePath.prepend(appLink.href)}
+            >
               {appLink.label}
-            </EuiButton>
+            </EuiButtonEmpty>
           )
         }
       >
         <>
           <EuiSpacer size="s" />
-          <EuiPanel hasShadow={false} paddingSize="s">
-            {hasError ? <ErrorPanel /> : <>{children}</>}
-          </EuiPanel>
+          <EuiPanel hasShadow={true}>{hasError ? <ErrorPanel /> : <>{children}</>}</EuiPanel>
         </>
       </EuiAccordion>
     </EuiPanel>
diff --git a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
index 0ff2c203c7707..78c23638a91bd 100644
--- a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
@@ -92,17 +92,17 @@ export function LogsSection({ bucketSize }: Props) {
   return (
     <SectionContainer
       title={i18n.translate('xpack.observability.overview.logs.title', {
-        defaultMessage: 'Logs',
+        defaultMessage: 'Log Events',
       })}
       appLink={{
         href: appLink,
         label: i18n.translate('xpack.observability.overview.logs.appLink', {
-          defaultMessage: 'View in app',
+          defaultMessage: 'Show log stream',
         }),
       }}
       hasError={status === FETCH_STATUS.FAILURE}
     >
-      <EuiTitle size="xs">
+      <EuiTitle size="xxs">
         <h4>
           {i18n.translate('xpack.observability.overview.logs.subtitle', {
             defaultMessage: 'Logs rate per minute',
diff --git a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
index 8cd49efe4787a..f7f35552fb686 100644
--- a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
@@ -202,12 +202,12 @@ export function MetricsSection({ bucketSize }: Props) {
   return (
     <SectionContainer
       title={i18n.translate('xpack.observability.overview.metrics.title', {
-        defaultMessage: 'Metrics',
+        defaultMessage: 'Hosts',
       })}
       appLink={{
         href: appLink,
         label: i18n.translate('xpack.observability.overview.metrics.appLink', {
-          defaultMessage: 'View in app',
+          defaultMessage: 'Show inventory',
         }),
       }}
       hasError={status === FETCH_STATUS.FAILURE}
diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
index 4c9e7b42f40c6..5176b3f0721c8 100644
--- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
@@ -74,17 +74,17 @@ export function UptimeSection({ bucketSize }: Props) {
   const { appLink, stats, series } = data || {};
 
   const downColor = theme.eui.euiColorVis2;
-  const upColor = theme.eui.euiColorLightShade;
+  const upColor = theme.eui.euiColorMediumShade;
 
   return (
     <SectionContainer
       title={i18n.translate('xpack.observability.overview.uptime.title', {
-        defaultMessage: 'Uptime',
+        defaultMessage: 'Monitors',
       })}
       appLink={{
         href: appLink,
         label: i18n.translate('xpack.observability.overview.uptime.appLink', {
-          defaultMessage: 'View in app',
+          defaultMessage: 'Show monitors',
         }),
       }}
       hasError={status === FETCH_STATUS.FAILURE}
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
index b4dda3ed3559e..d1597b9a94021 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
@@ -78,7 +78,7 @@ describe('UXSection', () => {
     );
 
     expect(getByText('User Experience')).toBeInTheDocument();
-    expect(getByText('View in app')).toBeInTheDocument();
+    expect(getByText('Show dashboard')).toBeInTheDocument();
     expect(getByText('elastic-co-frontend')).toBeInTheDocument();
     expect(getByText('Largest contentful paint')).toBeInTheDocument();
     expect(getByText('1.94 s')).toBeInTheDocument();
@@ -113,7 +113,7 @@ describe('UXSection', () => {
 
     expect(getByText('User Experience')).toBeInTheDocument();
     expect(getAllByText('--')).toHaveLength(3);
-    expect(queryAllByText('View in app')).toEqual([]);
+    expect(queryAllByText('Show dashboard')).toEqual([]);
     expect(getByText('elastic-co-frontend')).toBeInTheDocument();
   });
   it('shows empty state', () => {
@@ -128,7 +128,7 @@ describe('UXSection', () => {
 
     expect(getByText('User Experience')).toBeInTheDocument();
     expect(getAllByText('No data is available.')).toHaveLength(3);
-    expect(queryAllByText('View in app')).toEqual([]);
+    expect(queryAllByText('Show dashboard')).toEqual([]);
     expect(getByText('elastic-co-frontend')).toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
index 3092c7bf77f7a..6863916f9bb8c 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
@@ -57,7 +57,7 @@ export function UXSection({ bucketSize }: Props) {
       appLink={{
         href: appLink,
         label: i18n.translate('xpack.observability.overview.ux.appLink', {
-          defaultMessage: 'View in app',
+          defaultMessage: 'Show dashboard',
         }),
       }}
       hasError={status === FETCH_STATUS.FAILURE}
diff --git a/x-pack/plugins/observability/public/pages/overview/data_sections.tsx b/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
index 335f527560c7a..19827cd3eb459 100644
--- a/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
@@ -23,7 +23,7 @@ interface Props {
 export function DataSections({ bucketSize }: Props) {
   return (
     <EuiFlexItem grow={false}>
-      <EuiFlexGroup direction="column">
+      <EuiFlexGroup direction="column" gutterSize="s">
         <EuiFlexItem grow={false}>
           <LogsSection bucketSize={bucketSize} />
         </EuiFlexItem>
diff --git a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
index 7100a0552876d..a6af0d9182215 100644
--- a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiPanel } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiPanel, EuiHorizontalRule } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useTrackPageview } from '../..';
@@ -100,30 +100,38 @@ export function OverviewPage({ routeParams }: Props) {
       {hasData && (
         <>
           <ObservabilityHeaderMenu />
-          <EuiFlexGroup>
-            <EuiFlexItem grow={6}>
-              {/* Data sections */}
-              {hasAnyData && <DataSections bucketSize={bucketSize} />}
-              <EmptySections />
-              <EuiSpacer size="l" />
-              <EuiFlexGroup>
-                <EuiFlexItem>
-                  {/* Resources / What's New sections */}
-                  <EuiPanel hasBorder={true}>
-                    <Resources />
-                    <EuiSpacer size="l" />
-                    {!!newsFeed?.items?.length && <NewsFeed items={newsFeed.items.slice(0, 5)} />}
-                  </EuiPanel>
-                </EuiFlexItem>
+          <EuiFlexGroup direction="column" gutterSize="s">
+            <EuiFlexItem>
+              <EuiFlexGroup direction="column" gutterSize="s">
                 {hasDataMap?.alert?.hasData && (
                   <EuiFlexItem>
-                    <EuiPanel hasBorder={true}>
+                    <EuiPanel color="subdued">
                       <AlertsSection />
                     </EuiPanel>
                   </EuiFlexItem>
                 )}
               </EuiFlexGroup>
             </EuiFlexItem>
+            <EuiFlexItem>
+              {/* Data sections */}
+              {hasAnyData && <DataSections bucketSize={bucketSize} />}
+              <EmptySections />
+            </EuiFlexItem>
+            <EuiSpacer size="s" />
+          </EuiFlexGroup>
+          <EuiHorizontalRule />
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              {/* Resources / What's New sections */}
+              <EuiFlexGroup direction="row">
+                <EuiFlexItem grow={4}>
+                  {!!newsFeed?.items?.length && <NewsFeed items={newsFeed.items.slice(0, 3)} />}
+                </EuiFlexItem>
+                <EuiFlexItem grow={2}>
+                  <Resources />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </>
       )}

From a208ae974f4a2784fe7c050f7921da33258732a7 Mon Sep 17 00:00:00 2001
From: Corey Robertson <corey.robertson@elastic.co>
Date: Wed, 9 Feb 2022 13:26:04 -0500
Subject: [PATCH 23/85] Change index-pattern text to data view (#125108)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/canvas/i18n/functions/dict/escount.ts        | 2 +-
 x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts         | 2 +-
 x-pack/plugins/canvas/i18n/ui.ts                            | 2 +-
 .../canvas/server/routes/es_fields/es_fields.test.ts        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/canvas/i18n/functions/dict/escount.ts b/x-pack/plugins/canvas/i18n/functions/dict/escount.ts
index af1337360ba6d..c831213e1f923 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/escount.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/escount.ts
@@ -26,7 +26,7 @@ export const help: FunctionHelp<FunctionFactory<typeof escount>> = {
       },
     }),
     index: i18n.translate('xpack.canvas.functions.escount.args.indexHelpText', {
-      defaultMessage: 'An index or index pattern. For example, {example}.',
+      defaultMessage: 'An index or data view. For example, {example}.',
       values: {
         example: '`"logstash-*"`',
       },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts b/x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts
index 6be5acdb8bc90..99979b566f529 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts
@@ -35,7 +35,7 @@ export const help: FunctionHelp<FunctionFactory<typeof esdocs>> = {
       defaultMessage: 'A comma-separated list of fields. For better performance, use fewer fields.',
     }),
     index: i18n.translate('xpack.canvas.functions.esdocs.args.indexHelpText', {
-      defaultMessage: 'An index or index pattern. For example, {example}.',
+      defaultMessage: 'An index or data view. For example, {example}.',
       values: {
         example: '`"logstash-*"`',
       },
diff --git a/x-pack/plugins/canvas/i18n/ui.ts b/x-pack/plugins/canvas/i18n/ui.ts
index dcbaf92abbe4e..2448db2d99904 100644
--- a/x-pack/plugins/canvas/i18n/ui.ts
+++ b/x-pack/plugins/canvas/i18n/ui.ts
@@ -405,7 +405,7 @@ export const DataSourceStrings = {
       }),
     getIndexLabel: () =>
       i18n.translate('xpack.canvas.uis.dataSources.esdocs.indexLabel', {
-        defaultMessage: 'Enter an index name or select an index pattern',
+        defaultMessage: 'Enter an index name or select a data view',
       }),
     getQueryTitle: () =>
       i18n.translate('xpack.canvas.uis.dataSources.esdocs.queryTitle', {
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
index 977aaacdc2669..21b3357703866 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
+++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
@@ -30,7 +30,7 @@ describe('Retrieve ES Fields', () => {
     routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
-  it(`returns 200 with fields from existing index/index pattern`, async () => {
+  it(`returns 200 with fields from existing index/data view`, async () => {
     const index = 'test';
     const mockResults = {
       body: {
@@ -85,7 +85,7 @@ describe('Retrieve ES Fields', () => {
     `);
   });
 
-  it(`returns 200 with empty object when index/index pattern has no fields`, async () => {
+  it(`returns 200 with empty object when index/data view has no fields`, async () => {
     const index = 'test';
     const mockResults = { body: { indices: [index], fields: {} } };
     const request = httpServerMock.createKibanaRequest({
@@ -107,7 +107,7 @@ describe('Retrieve ES Fields', () => {
     expect(response.payload).toMatchInlineSnapshot('Object {}');
   });
 
-  it(`returns 200 with empty object when index/index pattern does not have specified field(s)`, async () => {
+  it(`returns 200 with empty object when index/data view does not have specified field(s)`, async () => {
     const index = 'test';
 
     const mockResults = {

From a1a273238e676947898ea582ef8e3faebb637e5c Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 9 Feb 2022 14:39:17 -0600
Subject: [PATCH 24/85] [DOCS] Updates the 8.0.0 upgrade docs (#125128)

* [DOCS] Updates the 8.0.0 upgrade docs

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
---
 docs/setup/upgrade.asciidoc                   | 23 ++---
 .../logging-configuration-changes.asciidoc    |  2 +-
 .../setup/upgrade/upgrade-migrations.asciidoc | 93 +++++++++----------
 3 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index 4eabfa0c07714..98713e75d24f6 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -1,33 +1,30 @@
 [[upgrade]]
 == Upgrade {kib}
 
-To upgrade from 7.16 or earlier to {version}, 
-**you must first upgrade to {prev-major-last}**.
-This enables you to use the Upgrade Assistant to
-{stack-ref}/upgrading-elastic-stack.html#prepare-to-upgrade[prepare to upgrade].
-You must resolve all critical issues identified by the Upgrade Assistant
-before proceeding with the upgrade. 
+To upgrade from 7.16.0 or earlier to {version}, 
+**you must first upgrade to {prev-major-last}**, which enables you to use the *Upgrade Assistant* to
+{stack-ref}/upgrading-elastic-stack.html#prepare-to-upgrade[prepare for the upgrade].
+Before you upgrade, you must resolve all critical issues identified by the *Upgrade Assistant*. 
 
-{kib} does not support rolling upgrades. 
-You must shut down all {kib} instances, install the new software, and restart {kib}.
+Rolling upgrades are unsupported in {kib}. To upgrade,  
+you must shut down all {kib} instances, install the new software, and restart {kib}.
 Upgrading while older {kib} instances are running can cause data loss or upgrade failures.
 
 [WARNING]
 ====
-{kib} automatically runs <<saved-object-migrations, saved object migrations>> 
-when required. 
+When required, {kib} automatically migrates <<saved-object-migrations, saved objects>>. 
 In case of an upgrade failure, you can roll back to an
 earlier version of {kib}. To roll back, you **must** have a
 {ref}/snapshot-restore.html[backup snapshot] that includes the `kibana` feature
-state. Snapshots include this feature state by default.
+state. By default, snapshots include the `kibana` feature state.
 ====
 
 For more information about upgrading, 
 refer to {stack-ref}/upgrading-elastic-stack.html[Upgrading to Elastic {version}.]
 
 IMPORTANT: You can upgrade to pre-release versions for testing, 
-but upgrading from a pre-release to the General Available version is not supported.
-Pre-releases should only be used for testing in a temporary environment.
+but upgrading from a pre-release to the General Available version is unsupported.
+You should use pre-release versions only for testing in a temporary environment.
 
 include::upgrade/upgrade-migrations.asciidoc[leveloffset=-1]
 
diff --git a/docs/setup/upgrade/logging-configuration-changes.asciidoc b/docs/setup/upgrade/logging-configuration-changes.asciidoc
index 4d5f5f732536e..4a9d03d3b5312 100644
--- a/docs/setup/upgrade/logging-configuration-changes.asciidoc
+++ b/docs/setup/upgrade/logging-configuration-changes.asciidoc
@@ -2,7 +2,7 @@
 [[logging-config-changes]]
 === Logging configuration changes
 
-WARNING: {kib} 8.0 and later uses a new logging system. Be sure to read the documentation for your version of {kib} before proceeding.
+WARNING: {kib} 8.0.0 and later uses a new logging system. Before you upgrade, read the documentation for your {kib} version.
 
 [[logging-pattern-format-old-and-new-example]]
 [options="header"]
diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index 53b89b38cc88d..059ae47d2e476 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -2,14 +2,14 @@
 [[saved-object-migrations]]
 === Saved object migrations
 
-Every time {kib} is upgraded it will perform an upgrade migration to ensure that all <<managing-saved-objects,saved objects>> are compatible with the new version.
+Each time you upgrade {kib}, an upgrade migration is performed to ensure that all <<managing-saved-objects,saved objects>> are compatible with the new version.
 
-NOTE: 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant]
-to help you prepare for your upgrade to 7.0. To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
+NOTE: To help you prepare for the upgrade to 7.0.0, 6.7.0 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[*Upgrade Assistant*]. 
+To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
 
-WARNING: {kib} 7.12.0 and later uses a new migration process and index naming scheme. Be sure to read the documentation for your version of {kib} before proceeding.
+WARNING: {kib} 7.12.0 and later uses a new migration process and index naming scheme. Before you upgrade, read the documentation for your version of {kib}.
 
-WARNING: The following instructions assumes {kib} is using the default index names. If the `kibana.index` or `xpack.tasks.index` configuration settings were changed these instructions will have to be adapted accordingly.
+WARNING: The following instructions assumes {kib} is using the default index names. If the `kibana.index` or `xpack.tasks.index` configuration settings are different from the default, adapt the instructions accordingly.
 
 [float]
 [[upgrade-migrations-process]]
@@ -17,16 +17,16 @@ WARNING: The following instructions assumes {kib} is using the default index nam
 
 Saved objects are stored in two indices:
 
-* `.kibana_{kibana_version}_001`, e.g. for Kibana v7.12.0 `.kibana_7.12.0_001`.
-* `.kibana_task_manager_{kibana_version}_001`, e.g. for Kibana v7.12.0 `.kibana_task_manager_7.12.0_001`.
+* `.kibana_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_7.12.0_001`.
+* `.kibana_task_manager_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_task_manager_7.12.0_001`.
 
-The index aliases `.kibana` and `.kibana_task_manager` will always point to
+The index aliases `.kibana` and `.kibana_task_manager` always point to
 the most up-to-date saved object indices.
 
 When you start a new {kib} installation, an upgrade migration is performed before starting plugins or serving HTTP traffic.
 Before you upgrade, shut down old nodes to prevent losing acknowledged writes.
 To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later
-adds a write block to the outdated index. Table 1 lists the saved objects indices used by previous versions of {kib}.
+adds a write block to the outdated index. Table 1 lists the saved objects indices used by previous {kib} versions.
 
 .Saved object indices and aliases per {kib} version
 [options="header"]
@@ -46,8 +46,8 @@ adds a write block to the outdated index. Table 1 lists the saved objects indice
 When upgrading several {kib} instances connected to the same {es} cluster,
 ensure that all outdated instances are shut down before starting the upgrade.
 
-{kib} does not support rolling upgrades. However, once outdated instances are shut down,
-all upgraded instances can be started in parallel, in which case all instances will participate in the upgrade migration in parallel.
+Rolling upgrades are unsupported in {kib}. However, when outdated instances are shut down, you can start all upgraded instances in parallel, 
+which allows all instances to participate in the upgrade migration in parallel.
 
 For large deployments with more than 10 {kib} instances, and more than 10,000 saved objects,
 you can reduce the upgrade downtime by bringing up a single {kib} instance and waiting for it to
@@ -56,7 +56,7 @@ complete the upgrade migration before bringing up the remaining instances.
 [float]
 [[preventing-migration-failures]]
 ==== Preventing migration failures
-This section highlights common causes of {kib} upgrade failures and how to prevent them.
+Review the common causes of {kib} upgrade failures and how to prevent them.
 
 [float]
 ===== timeout_exception or receive_timeout_transport_exception
@@ -71,18 +71,18 @@ Error: Unable to complete saved object migrations for the [.kibana] index. Pleas
 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]
 --------------------------------------------
 
-Instructions to work around this issue are in https://github.com/elastic/kibana/issues/95321[this GitHub issue].
+For instructions on how to mitigate the known issue, refer to https://github.com/elastic/kibana/issues/95321[the GitHub issue].
 
 [float]
 ===== Corrupt saved objects
-We highly recommend testing your {kib} upgrade in a development cluster to find and remedy problems
-caused by corrupt documents, especially when there are custom integrations creating saved objects in your environment.
+To find and remedy problems caused by corrupt documents, we highly recommend testing your {kib} upgrade in a development cluster, 
+especially when there are custom integrations that create saved objects in your environment.
 
-Saved objects that were corrupted through manual editing or integrations will cause migration
-failures with a log message like `Unable to migrate the corrupt Saved Object document ...`.
+Saved objects that are corrupted through manual editing or integrations cause migration
+failures with a log message, such as `Unable to migrate the corrupt Saved Object document ...`.
 For a successful upgrade migration, you must fix or delete corrupt documents.
 
-For example, given the following error message:
+For example, you receive the following error message:
 
 [source,sh]
 --------------------------------------------
@@ -112,18 +112,18 @@ DELETE .kibana_7.12.0_001/_doc/marketing_space:dashboard:e3c5fc71-ac71-4805-bcab
 
 . Restart {kib}.
 +
-In this example, the dashboard with ID `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` that belongs to the space `marketing_space` **is no longer available**.
+The dashboard with the `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` ID that belongs to the `marketing_space` space **is no longer 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.
+Be sure you have a snapshot before you delete the corrupt document. If you are unable to restore from a snapshot, it is recommended to also delete the `temp` and `target` indices the migration creates before you restart {kib} and retry the snapshot restore.
 
 [float]
-===== User defined index templates that causes new `.kibana*` indices to have incompatible settings or mappings
+===== User defined index templates that cause new `.kibana*` indices to have incompatible settings or mappings
 Matching index templates that specify `settings.refresh_interval` or `mappings` are known to interfere with {kib} upgrades.
 
-Prevention: Narrow down the {data-sources} of any user-defined index templates to ensure that these won't apply to new `.kibana*` indices.
+To make sure the index templates won't apply to new `.kibana*` indices, narrow down the {data-sources} of any user-defined index templates.
 
-NOTE: {kib} < 6.5 creates it's own index template called `kibana_index_template:.kibana`
-and uses an index pattern of `.kibana`. This index template will not interfere and does not need to be changed or removed.
+NOTE: In {kib} 6.5.0 and earlier, {kib} creates a `kibana_index_template:.kibana` index template
+and uses a `.kibana` index pattern. You do not need to change or remove the index template.
 
 [float]
 ===== An unhealthy {es} cluster
@@ -140,7 +140,7 @@ Ensure that all {kib} instances are running the same version, configuration, and
 
 [float]
 ===== Incompatible `xpack.tasks.index` configuration setting
-For {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks` with the configuration setting `xpack.tasks.index: ".tasks"`,
+In {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks` with the configuration setting `xpack.tasks.index: ".tasks"`,
 upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuration setting prevents upgrade migrations from starting.
 
 [float]
@@ -149,56 +149,55 @@ upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuratio
 
 If {kib} unexpectedly terminates while migrating a saved object index, {kib} automatically attempts to
 perform the migration again when the process restarts. Do not delete any saved objects indices to
-attempt to fix a failed migration. Unlike previous versions, {kib} 7.12.0 and
-later does not require deleting any indices to release a failed migration lock.
+to fix a failed migration. Unlike previous versions, {kib} 7.12.0 and
+later does not require deleting indices to release a failed migration lock.
 
-If upgrade migrations fail repeatedly, follow the advice in
+If upgrade migrations fail repeatedly, refer to
 <<preventing-migration-failures, preventing migration failures>>.
-Once the root cause for the migration failure has been addressed,
-{kib} will automatically retry the migration without any further intervention.
-If you're unable to resolve a failed migration following these steps, please contact support.
+When you address the root cause for the migration failure,
+{kib} automatically retries the migration.
+If you're unable to resolve a failed migration, contact Support.
 
 [float]
 [[upgrade-migrations-rolling-back]]
 ==== Rolling back to a previous version of {kib}
 
-If you've followed the advice in <<preventing-migration-failures, preventing migration failures>>
-and <<resolve-migrations-failures, resolving migration failures>> and
-If {kib} is still unable to upgrade successfully, rollback {kib} until
+If you've followed <<preventing-migration-failures, preventing migration failures>>
+and <<resolve-migrations-failures, resolving migration failures>>, and
+{kib} is still unable to successfully upgrade, rollback {kib} until
 you're able to identify and fix the root cause.
 
-WARNING: Before rolling back {kib}, ensure that the version you want to rollback to is compatible with
-your {es} cluster. If the version you're rolling back to is not compatible, you must also rollback {es}.
-Any changes made after an upgrade are lost when rolling back to a previous version.
+WARNING: Before you roll back {kib}, ensure that the version you want to roll back to is compatible with
+your {es} cluster. If the version you want to roll back to is not compatible, you must also rollback {es}.
+Any changes made after an upgrade are lost when you roll back to a previous version.
 
-To rollback after a failed upgrade migration, the saved object indices have to be
-rolled back to be compatible with the previous {kib} version.
+To roll back after a failed upgrade migration, you must also rollback the saved object indices to be compatible with the previous {kib} version.
 
 [float]
-===== Rollback by restoring a backup snapshot
+===== Roll back by restoring a backup snapshot
 
 . Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state.
-   Snapshots include this feature state by default.
+   By default, snapshots include the `kibana` feature state.
 . To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
-. Delete all saved object indices with `DELETE /.kibana*`.
+. To delete all saved object indices, use `DELETE /.kibana*`.
 . {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state from the snapshot.
 . Start all {kib} instances on the older version you want to rollback to.
 
 [float]
-===== (Not recommended) Rollback without a backup snapshot
+===== (Not recommended) Roll back without a backup snapshot
 
 . To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
-. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. By default, snapshots include the feature state.
+. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. By default, snapshots include the `kibana` feature state.
 . Delete the version-specific indices created by the failed upgrade migration.
 +
 For example, to rollback from a failed upgrade
-to v7.12.0: `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`
+to v7.12.0, use `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`.
 . Inspect the output of `GET /_cat/aliases`.
 +
 If the `.kibana` or `.kibana_task_manager` aliases are missing, you must create them manually.
 Find the latest index from the output of `GET /_cat/indices` and create the missing alias to point to the latest index.
-For example, if the `.kibana` alias is missing, and the latest index is `.kibana_3`, create a new alias with `POST /.kibana_3/_aliases/.kibana`.
-. To remove the write block from the rollback indices:
+For example, if the `.kibana` alias is missing, and the latest index is `.kibana_3`, create a new alias using `POST /.kibana_3/_aliases/.kibana`.
+. To remove the write block from the roll back indices, use
 `PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`
 . Start {kib} on the older version you want to rollback to.
 

From c78a4f355cc5546753db03ab5ccedb60bbf8b9ed Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Wed, 9 Feb 2022 20:43:57 +0000
Subject: [PATCH 25/85] chore(NA): upgrade bazelisk into v1.11.0 (#125070)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .bazeliskversion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bazeliskversion b/.bazeliskversion
index 4dae2985b58cc..1cac385c6cb86 100644
--- a/.bazeliskversion
+++ b/.bazeliskversion
@@ -1 +1 @@
-1.10.1
+1.11.0

From 855c0148c7d889b78f929d008c13ca654870989c Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 9 Feb 2022 14:52:39 -0600
Subject: [PATCH 26/85] [DOCS] Reformats the Security settings tables into
 definition lists (#123965)

* [DOCS] Reformats the Security settings tables into definition lists

* Review comments

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 docs/settings/security-settings.asciidoc | 430 +++++++++--------------
 1 file changed, 157 insertions(+), 273 deletions(-)

diff --git a/docs/settings/security-settings.asciidoc b/docs/settings/security-settings.asciidoc
index 56d08ee24efe1..787efa64f0775 100644
--- a/docs/settings/security-settings.asciidoc
+++ b/docs/settings/security-settings.asciidoc
@@ -8,10 +8,6 @@
 You do not need to configure any additional settings to use the
 {security-features} in {kib}. They are enabled by default.
 
-[float]
-[[general-security-settings]]
-==== General security settings
-
 [float]
 [[authentication-security-settings]]
 ==== Authentication security settings
@@ -46,123 +42,80 @@ xpack.security.authc:
 <3> Specifies the settings for the SAML authentication provider with a `saml1` name.
 <4> Specifies the settings for the SAML authentication provider with a `saml2` name.
 
-The valid settings in the `xpack.security.authc.providers` namespace vary depending on the authentication provider type. For more information, refer to <<kibana-authentication>>.
-
 [float]
 [[authentication-provider-settings]]
-===== Valid settings for all authentication providers
-
-[cols="2*<"]
-|===
-| `xpack.security.authc.providers.`
-`<provider-type>.<provider-name>.enabled` {ess-icon}
-| Determines if the authentication provider should be enabled. By default, {kib} enables the provider as soon as you configure any of its properties.
-
-| `xpack.security.authc.providers.`
-`<provider-type>.<provider-name>.order` {ess-icon}
-| Order of the provider in the authentication chain and on the Login Selector UI.
-
-| `xpack.security.authc.providers.`
-`<provider-type>.<provider-name>.description` {ess-icon}
-| Custom description of the provider entry displayed on the Login Selector UI.
-
-| `xpack.security.authc.providers.`
-`<provider-type>.<provider-name>.hint` {ess-icon}
-| Custom hint for the provider entry displayed on the Login Selector UI.
-
-| `xpack.security.authc.providers.`
-`<provider-type>.<provider-name>.icon` {ess-icon}
-| Custom icon for the provider entry displayed on the Login Selector UI.
-
-| `xpack.security.authc.providers.<provider-type>.`
-`<provider-name>.showInSelector` {ess-icon}
-| Flag that indicates if the provider should have an entry on the Login Selector UI. Setting this to `false` doesn't remove the provider from the authentication chain.
-
-2+a|
-[TIP]
-[NOTE]
-============
-You are unable to set this setting to `false` for `basic` and `token` authentication providers.
-============
-
-| `xpack.security.authc.providers.<provider-type>.`
-`<provider-name>.accessAgreement.message` {ess-icon}
-| Access agreement text in Markdown format. For more information, refer to <<xpack-security-access-agreement>>.
-
-| [[xpack-security-provider-session-idleTimeout]] `xpack.security.authc.providers.<provider-type>.`
-`<provider-name>.session.idleTimeout` {ess-icon}
-| Ensures that user sessions will expire after a period of inactivity. Setting this to `0` will prevent sessions from expiring because of inactivity. By default, this setting is equal to <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>>.
-
-2+a|
-[TIP]
-============
-Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
-============
-
-| [[xpack-security-provider-session-lifespan]] `xpack.security.authc.providers.<provider-type>.`
-`<provider-name>.session.lifespan` {ess-icon}
-| Ensures that user sessions will expire after the defined time period. This behavior is also known as an "absolute timeout". If
-this is set to `0`, user sessions could stay active indefinitely. By default, this setting is equal to <<xpack-session-lifespan, `xpack.security.session.lifespan`>>.
+==== Valid settings for all authentication providers
+
+The valid settings in the `xpack.security.authc.providers` namespace vary depending on the authentication provider type. For more information, refer to <<kibana-authentication>>.
+
+xpack.security.authc.providers.<provider-type>.<provider-name>.enabled {ess-icon}::
+Determines if the authentication provider should be enabled. By default, {kib} enables the provider as soon as you configure any of its properties.
+
+xpack.security.authc.providers.<provider-type>.<provider-name>.order {ess-icon}::
+Order of the provider in the authentication chain and on the Login Selector UI.
+
+xpack.security.authc.providers.<provider-type>.<provider-name>.description {ess-icon}::
+Custom description of the provider entry displayed on the Login Selector UI.
 
-2+a|
-[TIP]
-============
-Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
-============
+xpack.security.authc.providers.<provider-type>.<provider-name>.hint {ess-icon}::
+Custom hint for the provider entry displayed on the Login Selector UI.
 
-|===
+xpack.security.authc.providers.<provider-type>.<provider-name>.icon {ess-icon}::
+Custom icon for the provider entry displayed on the Login Selector UI.
+
+xpack.security.authc.providers.<provider-type>.<provider-name>.showInSelector {ess-icon}::
+Flag that indicates if the provider should have an entry on the Login Selector UI. Setting this to `false` doesn't remove the provider from the authentication chain.
++
+NOTE: You are unable to set this setting to `false` for `basic` and `token` authentication providers.
+
+xpack.security.authc.providers.<provider-type>.<provider-name>.accessAgreement.message {ess-icon}::
+Access agreement text in Markdown format. For more information, refer to <<xpack-security-access-agreement>>.
+
+[[xpack-security-provider-session-idleTimeout]] xpack.security.authc.providers.<provider-type>.<provider-name>.session.idleTimeout {ess-icon}::
+Ensures that user sessions will expire after a period of inactivity. Setting this to `0` will prevent sessions from expiring because of inactivity. By default, this setting is equal to <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>>.
++
+NOTE: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
+
+[[xpack-security-provider-session-lifespan]] xpack.security.authc.providers.<provider-type>.<provider-name>.session.lifespan {ess-icon}::
+Ensures that user sessions will expire after the defined time period. This behavior is also known as an "absolute timeout". If
+this is set to `0`, user sessions could stay active indefinitely. By default, this setting is equal to <<xpack-session-lifespan, `xpack.security.session.lifespan`>>.
++
+NOTE: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
 
 [float]
 [[saml-authentication-provider-settings]]
-===== SAML authentication provider settings
+==== SAML authentication provider settings
 
 In addition to <<authentication-provider-settings,the settings that are valid for all providers>>, you can specify the following settings:
 
-[cols="2*<"]
-|===
-| `xpack.security.authc.providers.`
-`saml.<provider-name>.realm` {ess-icon}
-| SAML realm in {es} that provider should use.
+xpack.security.authc.providers.saml.<provider-name>.realm {ess-icon}::
+SAML realm in {es} that provider should use.
 
-| `xpack.security.authc.providers.`
-`saml.<provider-name>.useRelayStateDeepLink` {ess-icon}
-| Determines if the provider should treat the `RelayState` parameter as a deep link in {kib} during Identity Provider initiated log in. By default, this setting is set to `false`. The link specified in `RelayState` should be a relative, URL-encoded {kib} URL. For example, the `/app/dashboards#/list` link in `RelayState` parameter would look like this: `RelayState=%2Fapp%2Fdashboards%23%2Flist`.
-
-|===
+xpack.security.authc.providers.saml.<provider-name>.useRelayStateDeepLink {ess-icon}::
+Determines if the provider should treat the `RelayState` parameter as a deep link in {kib} during Identity Provider initiated log in. By default, this setting is set to `false`. The link specified in `RelayState` should be a relative, URL-encoded {kib} URL. For example, the `/app/dashboards#/list` link in `RelayState` parameter would look like this: `RelayState=%2Fapp%2Fdashboards%23%2Flist`.
 
 [float]
 [[oidc-authentication-provider-settings]]
-===== OpenID Connect authentication provider settings
+==== OpenID Connect authentication provider settings
 
 In addition to <<authentication-provider-settings,the settings that are valid for all providers>>, you can specify the following settings:
 
-[cols="2*<"]
-|===
-| `xpack.security.authc.providers.`
-`oidc.<provider-name>.realm` {ess-icon}
-| OpenID Connect realm in {es} that the provider should use.
-
-|===
+xpack.security.authc.providers.oidc.<provider-name>.realm {ess-icon}::
+OpenID Connect realm in {es} that the provider should use.
 
 [float]
 [[anonymous-authentication-provider-settings]]
-===== Anonymous authentication provider settings
+==== Anonymous authentication provider settings
 
 In addition to <<authentication-provider-settings,the settings that are valid for all providers>>, you can specify the following settings:
 
-[NOTE]
-============
-You can configure only one anonymous provider per {kib} instance.
-============
-
-[cols="2*<"]
-|===
-| `xpack.security.authc.providers.`
-`anonymous.<provider-name>.credentials` {ess-icon}
-| Credentials that {kib} should use internally to authenticate anonymous requests to {es}. Possible values are: username and password, API key, or the constant `elasticsearch_anonymous_user` if you want to leverage {ref}/anonymous-access.html[{es} anonymous access].
-
-2+a| For example:
+NOTE: You can configure only one anonymous provider per {kib} instance.
 
+xpack.security.authc.providers.anonymous.<provider-name>.credentials {ess-icon}::
+Credentials that {kib} should use internally to authenticate anonymous requests to {es}. Possible values are: username and password, API key, or the constant `elasticsearch_anonymous_user` if you want to leverage {ref}/anonymous-access.html[{es} anonymous access].
++
+For example:
++
 [source,yaml]
 ----------------------------------------
 # Username and password credentials
@@ -187,45 +140,35 @@ xpack.security.authc.providers.anonymous.anonymous1:
   credentials: "elasticsearch_anonymous_user"
 ----------------------------------------
 
-|===
-
 [float]
 [[http-authentication-settings]]
-===== HTTP authentication settings
+==== HTTP authentication settings
 
 There is a very limited set of cases when you'd want to change these settings. For more information, refer to <<http-authentication>>.
 
-[cols="2*<"]
-|===
-| `xpack.security.authc.http.enabled`
-| Determines if HTTP authentication should be enabled. By default, this setting is set to `true`.
-
-| `xpack.security.authc.http.autoSchemesEnabled`
-| Determines if HTTP authentication schemes used by the enabled authentication providers should be automatically supported during HTTP authentication. By default, this setting is set to `true`.
+xpack.security.authc.http.enabled::
+Determines if HTTP authentication should be enabled. By default, this setting is set to `true`.
 
-| `xpack.security.authc.http.schemes[]`
-| List of HTTP authentication schemes that {kib} HTTP authentication should support. By default, this setting is set to `['apikey', 'bearer']` to support HTTP authentication with the <<api-keys, `ApiKey`>> and <<http-authentication, `Bearer`>> schemes.
+xpack.security.authc.http.autoSchemesEnabled::
+Determines if HTTP authentication schemes used by the enabled authentication providers should be automatically supported during HTTP authentication. By default, this setting is set to `true`.
 
-|===
+xpack.security.authc.http.schemes[]::
+List of HTTP authentication schemes that {kib} HTTP authentication should support. By default, this setting is set to `['apikey', 'bearer']` to support HTTP authentication with the <<api-keys, `ApiKey`>> and <<http-authentication, `Bearer`>> schemes.
 
 [float]
 [[login-ui-settings]]
-===== Login user interface settings
+==== Login user interface settings
 
 You can configure the following settings in the `kibana.yml` file.
 
-[cols="2*<"]
-|===
-| `xpack.security.loginAssistanceMessage` {ess-icon}
-| Adds a message to the login UI. Useful for displaying information about maintenance windows, links to corporate sign up pages, and so on.
+xpack.security.loginAssistanceMessage {ess-icon}::
+Adds a message to the login UI. Useful for displaying information about maintenance windows, links to corporate sign up pages, and so on.
 
-| `xpack.security.loginHelp` {ess-icon}
-| Adds a message accessible at the login UI with additional help information for the login process.
+xpack.security.loginHelp {ess-icon}::
+Adds a message accessible at the login UI with additional help information for the login process.
 
-| `xpack.security.authc.selector.enabled` {ess-icon}
-| Determines if the login selector UI should be enabled. By default, this setting is set to `true` if more than one authentication provider is configured.
-
-|===
+xpack.security.authc.selector.enabled {ess-icon}::
+Determines if the login selector UI should be enabled. By default, this setting is set to `true` if more than one authentication provider is configured.
 
 [float]
 [[security-session-and-cookie-settings]]
@@ -233,81 +176,49 @@ You can configure the following settings in the `kibana.yml` file.
 
 You can configure the following settings in the `kibana.yml` file.
 
-[cols="2*<"]
-|===
-| `xpack.security.cookieName`
-  | Sets the name of the cookie used for the session. The default value is `"sid"`.
-
-|[[xpack-security-encryptionKey]] `xpack.security.encryptionKey`
-  | An arbitrary string of 32 characters or more that is used to encrypt session information. Do **not** expose this key to users of {kib}. By
-  default, a value is automatically generated in memory. If you use that default
-  behavior, all sessions are invalidated when {kib} restarts.
-  In addition, high-availability deployments of {kib} will behave unexpectedly
-  if this setting isn't the same for all instances of {kib}.
-
-|[[xpack-security-secureCookies]] `xpack.security.secureCookies`
-  | Sets the `secure` flag of the session cookie. The default value is `false`. It
-  is automatically set to `true` if <<server-ssl-enabled, `server.ssl.enabled`>> is set to `true`. Set
-  this to `true` if SSL is configured outside of {kib} (for example, you are
-  routing requests through a load balancer or proxy).
-
-| [[xpack-security-sameSiteCookies]] `xpack.security.sameSiteCookies` {ess-icon}
-  | Sets the `SameSite` attribute of the session cookie. This allows you to declare whether your cookie should be restricted to a first-party or same-site context.
-  Valid values are `Strict`, `Lax`, `None`.
-  This is *not set* by default, which modern browsers will treat as `Lax`. If you use Kibana embedded in an iframe in modern browsers, you might need to set it to `None`. Setting this value to `None` requires cookies to be sent over a secure connection by setting <<xpack-security-secureCookies, `xpack.security.secureCookies`>>: `true`.
-
-|[[xpack-session-idleTimeout]] `xpack.security.session.idleTimeout` {ess-icon}
-  | Ensures that user sessions will expire after a period of inactivity. This and <<xpack-session-lifespan,`xpack.security.session.lifespan`>> are both
-highly recommended. You can also specify this setting for <<xpack-security-provider-session-idleTimeout, every provider separately>>. If this is set to `0`, then sessions will never expire due to inactivity. By default, this value is 8 hours.
-
-2+a|
-[TIP]
-============
-Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
-============
-
-|[[xpack-session-lifespan]] `xpack.security.session.lifespan` {ess-icon}
-  | Ensures that user sessions will expire after the defined time period. This behavior is also known as an "absolute timeout". If
-this is set to `0`, user sessions could stay active indefinitely. This and <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>> are both highly
-recommended. You can also specify this setting for <<xpack-security-provider-session-lifespan, every provider separately>>. By default, this value is 30 days.
+xpack.security.cookieName::
+Sets the name of the cookie used for the session. The default value is `"sid"`.
 
-2+a|
-[TIP]
-============
-Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
-============
+[[xpack-security-encryptionKey]] xpack.security.encryptionKey::
+An arbitrary string of 32 characters or more that is used to encrypt session information. Do **not** expose this key to users of {kib}. By default, a value is automatically generated in memory. If you use that default behavior, all sessions are invalidated when {kib} restarts. In addition, high-availability deployments of {kib} will behave unexpectedly if this setting isn't the same for all instances of {kib}.
 
-| `xpack.security.session.cleanupInterval` {ess-icon}
-| Sets the interval at which {kib} tries to remove expired and invalid sessions from the session index. By default, this value is 1 hour. The minimum value is 10 seconds.
+[[xpack-security-secureCookies]] xpack.security.secureCookies::
+Sets the `secure` flag of the session cookie. The default value is `false`. It
+is automatically set to `true` if <<server-ssl-enabled, `server.ssl.enabled`>> is set to `true`. Set this to `true` if SSL is configured outside of {kib} (for example, you are routing requests through a load balancer or proxy).
 
-2+a|
-[TIP]
-============
-Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
-============
+[[xpack-security-sameSiteCookies]] xpack.security.sameSiteCookies {ess-icon}::
+Sets the `SameSite` attribute of the session cookie. This allows you to declare whether your cookie should be restricted to a first-party or same-site context. 
+Valid values are `Strict`, `Lax`, `None`.
+This is *not set* by default, which modern browsers will treat as `Lax`. If you use Kibana embedded in an iframe in modern browsers, you might need to set it to `None`. Setting this value to `None` requires cookies to be sent over a secure connection by setting <<xpack-security-secureCookies, `xpack.security.secureCookies`>>: `true`.
 
-|===
+[[xpack-session-idleTimeout]] xpack.security.session.idleTimeout {ess-icon}::
+Ensures that user sessions will expire after a period of inactivity. This and <<xpack-session-lifespan,`xpack.security.session.lifespan`>> are both highly recommended. You can also specify this setting for <<xpack-security-provider-session-idleTimeout, every provider separately>>. If this is set to `0`, then sessions will never expire due to inactivity. By default, this value is 8 hours.
++
+NOTE: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
+
+[[xpack-session-lifespan]] xpack.security.session.lifespan {ess-icon}::
+Ensures that user sessions will expire after the defined time period. This behavior is also known as an "absolute timeout". If this is set to `0`, user sessions could stay active indefinitely. This and <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>> are both highly
+recommended. You can also specify this setting for <<xpack-security-provider-session-lifespan, every provider separately>>. By default, this value is 30 days.
++
+TIP: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
+
+xpack.security.session.cleanupInterval {ess-icon}::
+Sets the interval at which {kib} tries to remove expired and invalid sessions from the session index. By default, this value is 1 hour. The minimum value is 10 seconds.
++
+TIP: Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w').
 
 [[security-encrypted-saved-objects-settings]]
 ==== Encrypted saved objects settings
 
 These settings control the encryption of saved objects with sensitive data. For more details, refer to <<xpack-security-secure-saved-objects>>.
 
-[IMPORTANT]
-============
-In high-availability deployments, make sure you use the same encryption and decryption keys for all instances of {kib}. Although the keys can be specified in clear text in `kibana.yml`, it's recommended to store them securely in the <<secure-settings,{kib} Keystore>>.
-============
+IMPORTANT: In high-availability deployments, make sure you use the same encryption and decryption keys for all instances of {kib}. Although the keys can be specified in clear text in `kibana.yml`, it's recommended to store them securely in the <<secure-settings,{kib} Keystore>>.
 
-[cols="2*<"]
-|===
-| [[xpack-encryptedSavedObjects-encryptionKey]] `xpack.encryptedSavedObjects.`
-`encryptionKey`
-| An arbitrary string of at least 32 characters that is used to encrypt sensitive properties of saved objects before they're stored in {es}. If not set, {kib} will generate a random key on startup, but certain features won't be available until you set the encryption key explicitly.
+[[xpack-encryptedSavedObjects-encryptionKey]] xpack.encryptedSavedObjects.encryptionKey::
+An arbitrary string of at least 32 characters that is used to encrypt sensitive properties of saved objects before they're stored in {es}. If not set, {kib} will generate a random key on startup, but certain features won't be available until you set the encryption key explicitly.
 
-| [[xpack-encryptedSavedObjects-keyRotation-decryptionOnlyKeys]] `xpack.encryptedSavedObjects.`
-`keyRotation.decryptionOnlyKeys`
-| An optional list of previously used encryption keys. Like <<xpack-encryptedSavedObjects-encryptionKey, `xpack.encryptedSavedObjects.encryptionKey`>>, these must be at least 32 characters in length. {kib} doesn't use these keys for encryption, but may still require them to decrypt some existing saved objects. Use this setting if you wish to change your encryption key, but don't want to lose access to saved objects that were previously encrypted with a different key.
-|===
+[[xpack-encryptedSavedObjects-keyRotation-decryptionOnlyKeys]] xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys::
+An optional list of previously used encryption keys. Like <<xpack-encryptedSavedObjects-encryptionKey, `xpack.encryptedSavedObjects.encryptionKey`>>, these must be at least 32 characters in length. {kib} doesn't use these keys for encryption, but may still require them to decrypt some existing saved objects. Use this setting if you wish to change your encryption key, but don't want to lose access to saved objects that were previously encrypted with a different key.
 
 [float]
 [[audit-logging-settings]]
@@ -315,18 +226,17 @@ In high-availability deployments, make sure you use the same encryption and decr
 
 You can enable audit logging to support compliance, accountability, and security. When enabled, {kib} will capture:
 
-- Who performed an action
-- What action was performed
-- When the action occurred
+* Who performed an action
+* What action was performed
+* When the action occurred
 
 For more details and a reference of audit events, refer to <<xpack-security-audit-logging>>.
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.enabled` {ess-icon}
-| Set to `true` to enable audit logging`. *Default:* `false`
-
-2+a| For example:
+xpack.security.audit.enabled {ess-icon}::
+Set to `true` to enable audit logging`. *Default:* `false`
++
+For example:
++
 [source,yaml]
 ----------------------------------------
 xpack.security.audit.enabled: true
@@ -346,128 +256,103 @@ xpack.security.audit.appender: <1>
 <2> Rotates log files every 24 hours.
 <3> Keeps maximum of 10 log files before deleting older ones.
 
-| `xpack.security.audit.appender`
-| Optional. Specifies where audit logs should be written to and how they should be formatted. If no appender is specified, a default appender will be used (see above).
-
-| `xpack.security.audit.appender.type`
-| Required. Specifies where audit logs should be written to. Allowed values are `console`, `file`, or `rolling-file`. 
+xpack.security.audit.appender::
+Optional. Specifies where audit logs should be written to and how they should be formatted. If no appender is specified, a default appender will be used (see above).
 
+xpack.security.audit.appender.type::
+Required. Specifies where audit logs should be written to. Allowed values are `console`, `file`, or `rolling-file`. 
++
 Refer to <<audit-logging-file-appender>> and <<audit-logging-rolling-file-appender>> for appender specific settings.
 
-| `xpack.security.audit.appender.layout.type`
-| Required. Specifies how audit logs should be formatted. Allowed values are `json` or `pattern`.
-
+xpack.security.audit.appender.layout.type::
+Required. Specifies how audit logs should be formatted. Allowed values are `json` or `pattern`.
++
 Refer to <<audit-logging-pattern-layout>> for layout specific settings.
-
-2+a| 
-[TIP]
-============
-We recommend using `json` format to allow ingesting {kib} audit logs into {es} using Filebeat.
-============
-
-|======
++
+TIP: We recommend using `json` format to allow ingesting {kib} audit logs into {es} using Filebeat.
 
 [float]
 [[audit-logging-file-appender,file appender]]
-===== File appender
+==== File appender
 
 The `file` appender writes to a file and can be configured using the following settings:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.fileName`
-| Required. Full file path the log file should be written to.
-|======
+xpack.security.audit.appender.fileName::
+Required. Full file path the log file should be written to.
 
 [float]
 [[audit-logging-rolling-file-appender, rolling file appender]]
-===== Rolling file appender
+==== Rolling file appender
 
 The `rolling-file` appender writes to a file and rotates it using a rolling strategy, when a particular policy is triggered:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.fileName`
-| Required. Full file path the log file should be written to.
-
-| `xpack.security.audit.appender.policy.type`
-| Specifies when a rollover should occur. Allowed values are `size-limit` and `time-interval`. *Default:* `time-interval`.
+xpack.security.audit.appender.fileName::
+Required. Full file path the log file should be written to.
 
+xpack.security.audit.appender.policy.type::
+Specifies when a rollover should occur. Allowed values are `size-limit` and `time-interval`. *Default:* `time-interval`.
++
 Refer to <<audit-logging-size-limit-policy>> and <<audit-logging-time-interval-policy>> for policy specific settings.
-| `xpack.security.audit.appender.strategy.type`
-| Specifies how the rollover should occur. Only allowed value is currently `numeric`. *Default:* `numeric`
 
+xpack.security.audit.appender.strategy.type::
+Specifies how the rollover should occur. Only allowed value is currently `numeric`. *Default:* `numeric`
++
 Refer to <<audit-logging-numeric-strategy>> for strategy specific settings.
-|======
 
 [float]
 [[audit-logging-size-limit-policy, size limit policy]]
-===== Size limit triggering policy
+==== Size limit triggering policy
 
 The `size-limit` triggering policy will rotate the file when it reaches a certain size:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.policy.size`
-| Maximum size the log file should reach before a rollover should be performed. *Default:* `100mb`
-|======
+xpack.security.audit.appender.policy.size::
+Maximum size the log file should reach before a rollover should be performed. *Default:* `100mb`
 
 [float]
 [[audit-logging-time-interval-policy, time interval policy]]
-===== Time interval triggering policy
+==== Time interval triggering policy
 
 The `time-interval` triggering policy will rotate the file every given interval of time:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.policy.interval`
-| How often a rollover should occur. *Default:* `24h`
+xpack.security.audit.appender.policy.interval::
+How often a rollover should occur. *Default:* `24h`
 
-| `xpack.security.audit.appender.policy.modulate`
-| Whether the interval should be adjusted to cause the next rollover to occur on the interval boundary. *Default:* `true`
-|======
+xpack.security.audit.appender.policy.modulate::
+Whether the interval should be adjusted to cause the next rollover to occur on the interval boundary. *Default:* `true`
 
 [float]
 [[audit-logging-numeric-strategy, numeric strategy]]
-===== Numeric rolling strategy
+==== Numeric rolling strategy
 
 The `numeric` rolling strategy will suffix the log file with a given pattern when rolling over, and will retain a fixed number of rolled files:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.strategy.pattern`
-| Suffix to append to the file name when rolling over. Must include `%i`. *Default:* `-%i`
+xpack.security.audit.appender.strategy.pattern::
+Suffix to append to the file name when rolling over. Must include `%i`. *Default:* `-%i`
 
-| `xpack.security.audit.appender.strategy.max`
-| Maximum number of files to keep. Once this number is reached, oldest files will be deleted. *Default:* `7`
-|======
+xpack.security.audit.appender.strategy.max::
+Maximum number of files to keep. Once this number is reached, oldest files will be deleted. *Default:* `7`
 
 [float]
 [[audit-logging-pattern-layout, pattern layout]]
-===== Pattern layout
+==== Pattern layout
 
 The `pattern` layout outputs a string, formatted using a pattern with special placeholders, which will be replaced with data from the actual log message:
 
-[cols="2*<"]
-|======
-| `xpack.security.audit.appender.layout.pattern`
-| Optional. Specifies how the log line should be formatted. *Default:* `[%date][%level][%logger]%meta %message`
+xpack.security.audit.appender.layout.pattern::
+Optional. Specifies how the log line should be formatted. *Default:* `[%date][%level][%logger]%meta %message`
 
-| `xpack.security.audit.appender.layout.highlight`
-| Optional. Set to `true` to enable highlighting log messages with colors.
-|======
+xpack.security.audit.appender.layout.highlight::
+Optional. Set to `true` to enable highlighting log messages with colors.
 
 [float]
 [[audit-logging-ignore-filters]]
-===== Ignore filters
-
-[cols="2*<"]
-|======
-| `xpack.security.audit.ignore_filters[]` {ess-icon}
-| List of filters that determine which events should be excluded from the audit log. An event will get filtered out if at least one of the provided filters matches.
-
-2+a| For example:
+==== Ignore filters
 
+xpack.security.audit.ignore_filters[] {ess-icon}::
+List of filters that determine which events should be excluded from the audit log. An event will get filtered out if at least one of the provided filters matches.
++
+For example:
++
 [source,yaml]
 ----------------------------------------
 xpack.security.audit.ignore_filters:
@@ -478,15 +363,14 @@ xpack.security.audit.ignore_filters:
 <1> Filters out HTTP request events
 <2> Filters out any data write events
 
-| `xpack.security.audit.ignore_filters[].actions[]` {ess-icon}
-| List of values matched against the `event.action` field of an audit event. Refer to <<xpack-security-audit-logging>> for a list of available events.
+xpack.security.audit.ignore_filters[].actions[] {ess-icon}::
+List of values matched against the `event.action` field of an audit event. Refer to <<xpack-security-audit-logging>> for a list of available events.
 
-| `xpack.security.audit.ignore_filters[].categories[]` {ess-icon}
-| List of values matched against the `event.category` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-category.html[ECS categorization field] for allowed values.
+xpack.security.audit.ignore_filters[].categories[] {ess-icon}::
+List of values matched against the `event.category` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-category.html[ECS categorization field] for allowed values.
 
-| `xpack.security.audit.ignore_filters[].types[]` {ess-icon}
-| List of values matched against the `event.type` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-type.html[ECS type field] for allowed values.
+xpack.security.audit.ignore_filters[].types[] {ess-icon}::
+List of values matched against the `event.type` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-type.html[ECS type field] for allowed values.
 
-| `xpack.security.audit.ignore_filters[].outcomes[]` {ess-icon}
-| List of values matched against the `event.outcome` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-outcome.html[ECS outcome field] for allowed values.
-|======
+xpack.security.audit.ignore_filters[].outcomes[] {ess-icon}::
+List of values matched against the `event.outcome` field of an audit event. Refer to https://www.elastic.co/guide/en/ecs/1.5/ecs-allowed-values-event-outcome.html[ECS outcome field] for allowed values.
\ No newline at end of file

From fcd564152008bdf8f4bbccab359eb6a48145ce35 Mon Sep 17 00:00:00 2001
From: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
Date: Wed, 9 Feb 2022 22:14:41 +0100
Subject: [PATCH 27/85] Migrate the pre-7.11 tasks that has no schedule field.
 (#124304)

* Migrate the pre-7.11 tasks that has no schedule field.
---
 .../server/saved_objects/migrations.test.ts   | 62 +++++++++++++++++++
 .../server/saved_objects/migrations.ts        | 53 +++++++++++-----
 x-pack/plugins/task_manager/server/task.ts    |  7 ++-
 .../es_archives/task_manager_tasks/data.json  | 33 +++++++++-
 .../test_suites/task_manager/migrations.ts    | 30 ++++++++-
 5 files changed, 167 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
index 73141479d9081..e912eda258090 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
@@ -108,6 +108,68 @@ describe('successful migrations', () => {
       });
     });
   });
+
+  describe('8.2.0', () => {
+    test('resets attempts and status of a "failed" alerting tasks without schedule interval', () => {
+      const migration820 = getMigrations()['8.2.0'];
+      const taskInstance = getMockData({
+        taskType: 'alerting:123',
+        status: 'failed',
+        schedule: undefined,
+      });
+
+      expect(migration820(taskInstance, migrationContext)).toEqual({
+        ...taskInstance,
+        attributes: {
+          ...taskInstance.attributes,
+          attempts: 0,
+          status: 'idle',
+        },
+      });
+    });
+
+    test('resets attempts and status of a "running" alerting tasks without schedule interval', () => {
+      const migration820 = getMigrations()['8.2.0'];
+      const taskInstance = getMockData({
+        taskType: 'alerting:123',
+        status: 'running',
+        schedule: undefined,
+      });
+
+      expect(migration820(taskInstance, migrationContext)).toEqual({
+        ...taskInstance,
+        attributes: {
+          ...taskInstance.attributes,
+          attempts: 0,
+          status: 'idle',
+        },
+      });
+    });
+
+    test('does not update the tasks that are not "failed"', () => {
+      const migration820 = getMigrations()['8.2.0'];
+      const taskInstance = getMockData({
+        taskType: 'alerting:123',
+        status: 'idle',
+        attempts: 3,
+        schedule: undefined,
+      });
+
+      expect(migration820(taskInstance, migrationContext)).toEqual(taskInstance);
+    });
+
+    test('does not update the tasks that are not "failed" and has a schedule', () => {
+      const migration820 = getMigrations()['8.2.0'];
+      const taskInstance = getMockData({
+        taskType: 'alerting:123',
+        status: 'idle',
+        attempts: 3,
+        schedule: { interval: '1000' },
+      });
+
+      expect(migration820(taskInstance, migrationContext)).toEqual(taskInstance);
+    });
+  });
 });
 
 describe('handles errors during migrations', () => {
diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
index 89bbb3d783881..f50b3d6a927ad 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
@@ -13,15 +13,15 @@ import {
   SavedObjectsUtils,
   SavedObjectUnsanitizedDoc,
 } from '../../../../../src/core/server';
-import { TaskInstance, TaskInstanceWithDeprecatedFields } from '../task';
+import { ConcreteTaskInstance, TaskStatus } from '../task';
 
 interface TaskInstanceLogMeta extends LogMeta {
-  migrations: { taskInstanceDocument: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields> };
+  migrations: { taskInstanceDocument: SavedObjectUnsanitizedDoc<ConcreteTaskInstance> };
 }
 
 type TaskInstanceMigration = (
-  doc: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>
-) => SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>;
+  doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>
+) => SavedObjectUnsanitizedDoc<ConcreteTaskInstance>;
 
 export function getMigrations(): SavedObjectMigrationMap {
   return {
@@ -37,18 +37,19 @@ export function getMigrations(): SavedObjectMigrationMap {
       pipeMigrations(alertingTaskLegacyIdToSavedObjectIds, actionsTasksLegacyIdToSavedObjectIds),
       '8.0.0'
     ),
+    '8.2.0': executeMigrationWithErrorHandling(
+      pipeMigrations(resetAttemptsAndStatusForTheTasksWithoutSchedule),
+      '8.2.0'
+    ),
   };
 }
 
 function executeMigrationWithErrorHandling(
-  migrationFunc: SavedObjectMigrationFn<
-    TaskInstanceWithDeprecatedFields,
-    TaskInstanceWithDeprecatedFields
-  >,
+  migrationFunc: SavedObjectMigrationFn<ConcreteTaskInstance, ConcreteTaskInstance>,
   version: string
 ) {
   return (
-    doc: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>,
+    doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>,
     context: SavedObjectMigrationContext
   ) => {
     try {
@@ -68,8 +69,8 @@ function executeMigrationWithErrorHandling(
 }
 
 function alertingTaskLegacyIdToSavedObjectIds(
-  doc: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>
-): SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields> {
+  doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>
+): SavedObjectUnsanitizedDoc<ConcreteTaskInstance> {
   if (doc.attributes.taskType.startsWith('alerting:')) {
     let params: { spaceId?: string; alertId?: string } = {};
     params = JSON.parse(doc.attributes.params as unknown as string);
@@ -94,8 +95,8 @@ function alertingTaskLegacyIdToSavedObjectIds(
 }
 
 function actionsTasksLegacyIdToSavedObjectIds(
-  doc: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>
-): SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields> {
+  doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>
+): SavedObjectUnsanitizedDoc<ConcreteTaskInstance> {
   if (doc.attributes.taskType.startsWith('actions:')) {
     let params: { spaceId?: string; actionTaskParamsId?: string } = {};
     params = JSON.parse(doc.attributes.params as unknown as string);
@@ -126,7 +127,7 @@ function actionsTasksLegacyIdToSavedObjectIds(
 function moveIntervalIntoSchedule({
   attributes: { interval, ...attributes },
   ...doc
-}: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>): SavedObjectUnsanitizedDoc<TaskInstance> {
+}: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>): SavedObjectUnsanitizedDoc<ConcreteTaskInstance> {
   return {
     ...doc,
     attributes: {
@@ -143,6 +144,28 @@ function moveIntervalIntoSchedule({
 }
 
 function pipeMigrations(...migrations: TaskInstanceMigration[]): TaskInstanceMigration {
-  return (doc: SavedObjectUnsanitizedDoc<TaskInstanceWithDeprecatedFields>) =>
+  return (doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>) =>
     migrations.reduce((migratedDoc, nextMigration) => nextMigration(migratedDoc), doc);
 }
+
+function resetAttemptsAndStatusForTheTasksWithoutSchedule(
+  doc: SavedObjectUnsanitizedDoc<ConcreteTaskInstance>
+): SavedObjectUnsanitizedDoc<ConcreteTaskInstance> {
+  if (doc.attributes.taskType.startsWith('alerting:')) {
+    if (
+      !doc.attributes.schedule?.interval &&
+      (doc.attributes.status === TaskStatus.Failed || doc.attributes.status === TaskStatus.Running)
+    ) {
+      return {
+        ...doc,
+        attributes: {
+          ...doc.attributes,
+          attempts: 0,
+          status: TaskStatus.Idle,
+        },
+      };
+    }
+  }
+
+  return doc;
+}
diff --git a/x-pack/plugins/task_manager/server/task.ts b/x-pack/plugins/task_manager/server/task.ts
index 2452e3e6f4920..6d12a3f5984ca 100644
--- a/x-pack/plugins/task_manager/server/task.ts
+++ b/x-pack/plugins/task_manager/server/task.ts
@@ -307,7 +307,12 @@ export interface ConcreteTaskInstance extends TaskInstance {
   id: string;
 
   /**
-   * The saved object version from the Elaticsearch document.
+   * @deprecated This field has been moved under schedule (deprecated) with version 7.6.0
+   */
+  interval?: string;
+
+  /**
+   * The saved object version from the Elasticsearch document.
    */
   version?: string;
 
diff --git a/x-pack/test/functional/es_archives/task_manager_tasks/data.json b/x-pack/test/functional/es_archives/task_manager_tasks/data.json
index b59abd341a7af..3431419dda17e 100644
--- a/x-pack/test/functional/es_archives/task_manager_tasks/data.json
+++ b/x-pack/test/functional/es_archives/task_manager_tasks/data.json
@@ -58,4 +58,35 @@
       "updated_at": "2020-11-30T15:43:08.277Z"
     }
   }
-}
\ No newline at end of file
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "task:d33d7590-8377-11ec-8c11-2dfe94229b95",
+    "index": ".kibana_task_manager_1",
+    "source": {
+      "migrationVersion": {
+        "task": "7.6.0"
+      },
+      "task": {
+        "taskType": "alerting:xpack.uptime.alerts.monitorStatus",
+        "retryAt": null,
+        "runAt": "2222-02-01T15:59:42.908Z",
+        "scope": [
+          "alerting"
+        ],
+        "startedAt": null,
+        "state": "{}",
+        "params": "{\"alertId\":\"c9a10a61-7dcc-4297-991a-6c52c10eb7d2\",\"spaceId\":\"default\"}",
+        "ownerId": null,
+        "scheduledAt": "2022-02-01T15:58:41.000Z",
+        "attempts": 3,
+        "status": "failed"
+      },
+      "references": [],
+      "updated_at": "2022-02-01T15:58:44.109Z",
+      "type": "task"
+    }
+  }
+}
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
index 329aee7e74b98..1e6bb11c13583 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
@@ -8,7 +8,11 @@
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { TransportResult } from '@elastic/elasticsearch';
-import { TaskInstanceWithDeprecatedFields } from '../../../../plugins/task_manager/server/task';
+import {
+  ConcreteTaskInstance,
+  TaskInstanceWithDeprecatedFields,
+  TaskStatus,
+} from '../../../../plugins/task_manager/server/task';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { SavedObjectsUtils } from '../../../../../src/core/server/saved_objects';
 
@@ -76,5 +80,29 @@ export default function createGetTests({ getService }: FtrProviderContext) {
         )}"}`
       );
     });
+
+    it('8.2.0 migrates alerting tasks that has no schedule.interval', async () => {
+      const searchResult: TransportResult<
+        estypes.SearchResponse<{ task: ConcreteTaskInstance }>,
+        unknown
+      > = await es.search(
+        {
+          index: '.kibana_task_manager',
+          body: {
+            query: {
+              term: {
+                _id: 'task:d33d7590-8377-11ec-8c11-2dfe94229b95',
+              },
+            },
+          },
+        },
+        { meta: true }
+      );
+      expect(searchResult.statusCode).to.equal(200);
+      expect((searchResult.body.hits.total as estypes.SearchTotalHits).value).to.equal(1);
+      const hit = searchResult.body.hits.hits[0];
+      expect(hit!._source!.task.attempts).to.be(0);
+      expect(hit!._source!.task.status).to.be(TaskStatus.Idle);
+    });
   });
 }

From 46f679878b53c7c8d566379b5b38fdaa28d7bf31 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:30:49 -0800
Subject: [PATCH 28/85] [DOCS] Removes Homebrew docs (#125155)

---
 docs/redirects.asciidoc                  |  5 ++
 docs/setup/install.asciidoc              |  8 ---
 docs/setup/install/brew-running.asciidoc |  9 ----
 docs/setup/install/brew.asciidoc         | 65 ------------------------
 docs/setup/start-stop.asciidoc           |  8 ---
 5 files changed, 5 insertions(+), 90 deletions(-)
 delete mode 100644 docs/setup/install/brew-running.asciidoc
 delete mode 100644 docs/setup/install/brew.asciidoc

diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 0ca518c3a8788..6a34076f10988 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -400,3 +400,8 @@ This content has moved. Refer to <<saved-object-migrations>>.
 == Upgrade Assistant
 
 This content has moved. Refer to {kibana-ref-all}/7.17/upgrade-assistant.html[Upgrade Assistant].
+
+[role="exclude",id="brew"]
+== Install {kib} on macOS with Homebrew
+
+This page has been deleted. Refer to <<install>>.
diff --git a/docs/setup/install.asciidoc b/docs/setup/install.asciidoc
index 8b64bdf5fe2a2..ac49946d877bc 100644
--- a/docs/setup/install.asciidoc
+++ b/docs/setup/install.asciidoc
@@ -46,12 +46,6 @@ downloaded from the Elastic Docker Registry.
 +
 <<docker,Running Kibana on Docker>>
 
-`brew`::
-
-Formulae are available from the Elastic Homebrew tap for installing {kib} on macOS with the Homebrew package manager.
-+
-<<brew>>
-
 IMPORTANT: If your Elasticsearch installation is protected by
 {ref}/elasticsearch-security.html[{stack-security-features}] see
 {kibana-ref}/using-kibana-with-security.html[Configuring security in {kib}] for
@@ -66,5 +60,3 @@ include::install/deb.asciidoc[]
 include::install/rpm.asciidoc[]
 
 include::{kib-repo-dir}/setup/docker.asciidoc[]
-
-include::install/brew.asciidoc[]
diff --git a/docs/setup/install/brew-running.asciidoc b/docs/setup/install/brew-running.asciidoc
deleted file mode 100644
index d73102b098ec1..0000000000000
--- a/docs/setup/install/brew-running.asciidoc
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Run {kib} with `brew services`
-
-With Homebrew, Kibana can be started and stopped as follows:
-
-[source,sh]
---------------------------------------------------
-brew services start elastic/tap/kibana-full
-brew services stop elastic/tap/kibana-full
---------------------------------------------------
diff --git a/docs/setup/install/brew.asciidoc b/docs/setup/install/brew.asciidoc
deleted file mode 100644
index eeba869a259d4..0000000000000
--- a/docs/setup/install/brew.asciidoc
+++ /dev/null
@@ -1,65 +0,0 @@
-[[brew]]
-=== Install {kib} on macOS with Homebrew
-++++
-<titleabbrev>Install on macOS with Homebrew</titleabbrev>
-++++
-
-Elastic publishes Homebrew formulae so you can install {kib} with the https://brew.sh/[Homebrew] package manager.
-
-To install with Homebrew, you first need to tap the Elastic Homebrew repository:
-
-[source,sh]
--------------------------
-brew tap elastic/tap
--------------------------
-
-Once you've tapped the Elastic Homebrew repo, you can use `brew install` to
-install the **latest version** of {kib}:
-
-[source,sh]
--------------------------
-brew install elastic/tap/kibana-full
--------------------------
-
-[[brew-layout]]
-==== Directory layout for Homebrew installs
-
-When you install {kib} with `brew install`, the config files, logs,
-and data directory are stored in the following locations.
-
-[cols="<h,<,<m,<m",options="header",]
-|=======================================================================
-| Type | Description | Default Location | Setting
-| home
-  | Kibana home directory or `$KIBANA_HOME`
-  | /usr/local/var/homebrew/linked/kibana-full
- d|
-
-| bin
-  | Binary scripts including `kibana` to start a node
-    and `kibana-plugin` to install plugins
-  | /usr/local/var/homebrew/linked/kibana-full/bin
- d|
-
-| conf
-  | Configuration files including `kibana.yml`
-  | /usr/local/etc/kibana
- d|
-
-| data
-  | The location of the data files of each index / shard allocated
-    on the node. Can hold multiple locations.
-  | /usr/local/var/lib/kibana
-  | path.data
-
-| logs
-  | Log files location.
-  | /usr/local/var/log/kibana
-  | path.logs
-
-| plugins
-  | Plugin files location. Each plugin will be contained in a subdirectory.
-  | /usr/local/var/homebrew/linked/kibana-full/plugins
- d|
-
-|=======================================================================
diff --git a/docs/setup/start-stop.asciidoc b/docs/setup/start-stop.asciidoc
index 8952cd3a23cd3..b20fb104753f5 100644
--- a/docs/setup/start-stop.asciidoc
+++ b/docs/setup/start-stop.asciidoc
@@ -30,11 +30,3 @@ include::install/windows-running.asciidoc[]
 
 [float]
 include::install/systemd.asciidoc[]
-
-[float]
-=== Homebrew packages
-
-If you installed {kib} with the Elastic Homebrew formulae, you can start and stop {kib} from the command line using `brew services`.
-
-[float]
-include::install/brew-running.asciidoc[]

From bad98b6892fefeecedff0905056174b7d3ef331e Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Wed, 9 Feb 2022 16:43:04 -0700
Subject: [PATCH 29/85] [Security Solution] Bugfix for inspect index pattern
 not aligned with data view index pattern (#125007)

---
 .../common/components/inspect/index.test.tsx  | 141 ++++++++++++--
 .../common/components/inspect/index.tsx       |  41 ++--
 .../common/components/inspect/modal.test.tsx  | 180 +++++++-----------
 .../common/components/inspect/modal.tsx       |  59 ++++--
 .../common/components/inspect/translations.ts |  15 ++
 5 files changed, 283 insertions(+), 153 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
index d73b4cb7d98d6..b3dbbb86ace68 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
@@ -21,6 +21,10 @@ import { UpdateQueryParams, upsertQuery } from '../../store/inputs/helpers';
 import { InspectButton } from '.';
 import { cloneDeep } from 'lodash/fp';
 
+jest.mock('./modal', () => ({
+  ModalInspectQuery: jest.fn(() => <div data-test-subj="mocker-modal" />),
+}));
+
 describe('Inspect Button', () => {
   const refetch = jest.fn();
   const state: State = mockGlobalState;
@@ -103,6 +107,54 @@ describe('Inspect Button', () => {
       );
       expect(wrapper.find('.euiButtonIcon').get(0).props.disabled).toBe(true);
     });
+
+    test('Button disabled when inspect == null', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = null;
+      myState.inputs = upsertQuery(myQuery);
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
+      );
+      expect(wrapper.find('.euiButtonIcon').get(0).props.disabled).toBe(true);
+    });
+
+    test('Button disabled when inspect.dsl.length == 0', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: [],
+        response: ['my response'],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
+      );
+      expect(wrapper.find('.euiButtonIcon').get(0).props.disabled).toBe(true);
+    });
+
+    test('Button disabled when inspect.response.length == 0', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: ['my dsl'],
+        response: [],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
+      );
+      expect(wrapper.find('.euiButtonIcon').get(0).props.disabled).toBe(true);
+    });
   });
 
   describe('Modal Inspect - happy path', () => {
@@ -127,46 +179,103 @@ describe('Inspect Button', () => {
       wrapper.update();
 
       expect(store.getState().inputs.global.queries[0].isInspected).toBe(true);
-      expect(wrapper.find('button[data-test-subj="modal-inspect-close"]').first().exists()).toBe(
-        true
-      );
+      expect(wrapper.find('[data-test-subj="mocker-modal"]').first().exists()).toBe(true);
     });
 
-    test('Close Inspect Modal', () => {
+    test('Do not Open Inspect Modal if it is loading', () => {
       const wrapper = mount(
         <TestProviders store={store}>
           <InspectButton queryId={newQuery.id} title="My title" />
         </TestProviders>
       );
+      expect(store.getState().inputs.global.queries[0].isInspected).toBe(false);
+      store.getState().inputs.global.queries[0].loading = true;
       wrapper.find('button[data-test-subj="inspect-icon-button"]').first().simulate('click');
 
       wrapper.update();
 
-      wrapper.find('button[data-test-subj="modal-inspect-close"]').first().simulate('click');
-
-      wrapper.update();
-
-      expect(store.getState().inputs.global.queries[0].isInspected).toBe(false);
+      expect(store.getState().inputs.global.queries[0].isInspected).toBe(true);
       expect(wrapper.find('button[data-test-subj="modal-inspect-close"]').first().exists()).toBe(
         false
       );
     });
+  });
 
-    test('Do not Open Inspect Modal if it is loading', () => {
+  describe('Modal Inspect - show or hide', () => {
+    test('shows when request/response are complete and isInspected=true', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: ['a length'],
+        response: ['my response'],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      myState.inputs.global.queries[0].isInspected = true;
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
       const wrapper = mount(
         <TestProviders store={store}>
           <InspectButton queryId={newQuery.id} title="My title" />
         </TestProviders>
       );
-      store.getState().inputs.global.queries[0].loading = true;
-      wrapper.find('button[data-test-subj="inspect-icon-button"]').first().simulate('click');
 
-      wrapper.update();
+      expect(wrapper.find('[data-test-subj="mocker-modal"]').first().exists()).toEqual(true);
+    });
 
-      expect(store.getState().inputs.global.queries[0].isInspected).toBe(true);
-      expect(wrapper.find('button[data-test-subj="modal-inspect-close"]').first().exists()).toBe(
-        false
+    test('hides when request/response are complete and isInspected=false', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: ['a length'],
+        response: ['my response'],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      myState.inputs.global.queries[0].isInspected = false;
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
+      );
+
+      expect(wrapper.find('[data-test-subj="mocker-modal"]').first().exists()).toEqual(false);
+    });
+
+    test('hides when request is empty and isInspected=true', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: [],
+        response: ['my response'],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      myState.inputs.global.queries[0].isInspected = true;
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
+      );
+
+      expect(wrapper.find('[data-test-subj="mocker-modal"]').first().exists()).toEqual(false);
+    });
+
+    test('hides when response is empty and isInspected=true', () => {
+      const myState = cloneDeep(state);
+      const myQuery = cloneDeep(newQuery);
+      myQuery.inspect = {
+        dsl: ['my dsl'],
+        response: [],
+      };
+      myState.inputs = upsertQuery(myQuery);
+      myState.inputs.global.queries[0].isInspected = true;
+      store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <InspectButton queryId={newQuery.id} title="My title" />
+        </TestProviders>
       );
+
+      expect(wrapper.find('[data-test-subj="mocker-modal"]').first().exists()).toEqual(false);
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/index.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/index.tsx
index 4f52703620b5f..defb90b9054f1 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { omit } from 'lodash/fp';
-import React, { useCallback } from 'react';
+import React, { useMemo, useCallback } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { inputsSelectors, State } from '../../store';
@@ -52,10 +52,10 @@ const InspectButtonComponent: React.FC<InspectButtonProps> = ({
   compact = false,
   inputId = 'global',
   inspect,
+  inspectIndex = 0,
   isDisabled,
   isInspected,
   loading,
-  inspectIndex = 0,
   multiple = false, // If multiple = true we ignore the inspectIndex and pass all requests and responses to the inspect modal
   onCloseInspect,
   queryId = '',
@@ -63,7 +63,6 @@ const InspectButtonComponent: React.FC<InspectButtonProps> = ({
   setIsInspected,
   title = '',
 }) => {
-  const isShowingModal = !loading && selectedInspectIndex === inspectIndex && isInspected;
   const handleClick = useCallback(() => {
     setIsInspected({
       id: queryId,
@@ -105,6 +104,16 @@ const InspectButtonComponent: React.FC<InspectButtonProps> = ({
     }
   }
 
+  const isShowingModal = useMemo(
+    () => !loading && selectedInspectIndex === inspectIndex && isInspected,
+    [inspectIndex, isInspected, loading, selectedInspectIndex]
+  );
+
+  const isButtonDisabled = useMemo(
+    () => loading || isDisabled || request == null || response == null,
+    [isDisabled, loading, request, response]
+  );
+
   return (
     <>
       {inputId === 'timeline' && !compact && (
@@ -115,7 +124,7 @@ const InspectButtonComponent: React.FC<InspectButtonProps> = ({
           color="text"
           iconSide="left"
           iconType="inspect"
-          isDisabled={loading || isDisabled || false}
+          isDisabled={isButtonDisabled}
           isLoading={loading}
           onClick={handleClick}
         >
@@ -129,21 +138,23 @@ const InspectButtonComponent: React.FC<InspectButtonProps> = ({
           data-test-subj="inspect-icon-button"
           iconSize="m"
           iconType="inspect"
-          isDisabled={loading || isDisabled || false}
+          isDisabled={isButtonDisabled}
           title={i18n.INSPECT}
           onClick={handleClick}
         />
       )}
-      <ModalInspectQuery
-        closeModal={handleCloseModal}
-        isShowing={isShowingModal}
-        request={request}
-        response={response}
-        additionalRequests={additionalRequests}
-        additionalResponses={additionalResponses}
-        title={title}
-        data-test-subj="inspect-modal"
-      />
+      {isShowingModal && request !== null && response !== null && (
+        <ModalInspectQuery
+          additionalRequests={additionalRequests}
+          additionalResponses={additionalResponses}
+          closeModal={handleCloseModal}
+          data-test-subj="inspect-modal"
+          inputId={inputId}
+          request={request}
+          response={response}
+          title={title}
+        />
+      )}
     </>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
index 572513180025f..7a9c36a986afd 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
@@ -7,103 +7,50 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
-import { ThemeProvider } from 'styled-components';
+import { TestProviders } from '../../mock';
 
 import { NO_ALERT_INDEX } from '../../../../common/constants';
 import { ModalInspectQuery, formatIndexPatternRequested } from './modal';
-import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
+import { InputsModelId } from '../../store/inputs/constants';
+import { EXCLUDE_ELASTIC_CLOUD_INDEX } from '../../containers/sourcerer';
 
-const mockTheme = getMockTheme({
-  eui: {
-    euiBreakpoints: {
-      l: '1200px',
-    },
-  },
+jest.mock('react-router-dom', () => {
+  const original = jest.requireActual('react-router-dom');
+
+  return {
+    ...original,
+    useLocation: jest.fn().mockReturnValue([{ pathname: '/overview' }]),
+  };
 });
 
-const request =
-  '{"index": ["auditbeat-*","filebeat-*","packetbeat-*","winlogbeat-*"],"allowNoIndices": true, "ignoreUnavailable": true, "body": { "aggregations": {"hosts": {"cardinality": {"field": "host.name" } }, "hosts_histogram": {"auto_date_histogram": {"field": "@timestamp","buckets": "6"},"aggs": { "count": {"cardinality": {"field": "host.name" }}}}}, "query": {"bool": {"filter": [{"range": { "@timestamp": {"gte": 1562290224506,"lte": 1562376624506 }}}]}}, "size": 0, "track_total_hits": false}}';
+const getRequest = (
+  indices: string[] = ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*']
+) =>
+  `{"index": ${JSON.stringify(
+    indices
+  )},"allowNoIndices": true, "ignoreUnavailable": true, "body": { "aggregations": {"hosts": {"cardinality": {"field": "host.name" } }, "hosts_histogram": {"auto_date_histogram": {"field": "@timestamp","buckets": "6"},"aggs": { "count": {"cardinality": {"field": "host.name" }}}}}, "query": {"bool": {"filter": [{"range": { "@timestamp": {"gte": 1562290224506,"lte": 1562376624506 }}}]}}, "size": 0, "track_total_hits": false}}`;
+
+const request = getRequest();
+
 const response =
   '{"took": 880,"timed_out": false,"_shards": {"total": 26,"successful": 26,"skipped": 0,"failed": 0},"hits": {"max_score": null,"hits": []},"aggregations": {"hosts": {"value": 541},"hosts_histogram": {"buckets": [{"key_as_string": "2019 - 07 - 05T01: 00: 00.000Z", "key": 1562288400000, "doc_count": 1492321, "count": { "value": 105 }}, {"key_as_string": "2019 - 07 - 05T13: 00: 00.000Z", "key": 1562331600000, "doc_count": 2412761, "count": { "value": 453}},{"key_as_string": "2019 - 07 - 06T01: 00: 00.000Z", "key": 1562374800000, "doc_count": 111658, "count": { "value": 15}}],"interval": "12h"}},"status": 200}';
 
 describe('Modal Inspect', () => {
   const closeModal = jest.fn();
-
-  describe('rendering', () => {
-    test('when isShowing is positive and request and response are not null', () => {
-      const wrapper = mount(
-        <ThemeProvider theme={mockTheme}>
-          <ModalInspectQuery
-            closeModal={closeModal}
-            isShowing={true}
-            request={request}
-            response={response}
-            title="My title"
-          />
-        </ThemeProvider>
-      );
-      expect(wrapper.find('[data-test-subj="modal-inspect-euiModal"]').first().exists()).toBe(true);
-      expect(wrapper.find('.euiModalHeader__title').first().text()).toBe('Inspect My title');
-    });
-
-    test('when isShowing is negative and request and response are not null', () => {
-      const wrapper = mount(
-        <ModalInspectQuery
-          closeModal={closeModal}
-          isShowing={false}
-          request={request}
-          response={response}
-          title="My title"
-        />
-      );
-      expect(wrapper.find('[data-test-subj="modal-inspect-euiModal"]').first().exists()).toBe(
-        false
-      );
-    });
-
-    test('when isShowing is positive and request is null and response is not null', () => {
-      const wrapper = mount(
-        <ModalInspectQuery
-          closeModal={closeModal}
-          isShowing={true}
-          request={null}
-          response={response}
-          title="My title"
-        />
-      );
-      expect(wrapper.find('[data-test-subj="modal-inspect-euiModal"]').first().exists()).toBe(
-        false
-      );
-    });
-
-    test('when isShowing is positive and request is not null and response is null', () => {
-      const wrapper = mount(
-        <ModalInspectQuery
-          closeModal={closeModal}
-          isShowing={true}
-          request={request}
-          response={null}
-          title="My title"
-        />
-      );
-      expect(wrapper.find('[data-test-subj="modal-inspect-euiModal"]').first().exists()).toBe(
-        false
-      );
-    });
-  });
+  const defaultProps = {
+    closeModal,
+    inputId: 'timeline' as InputsModelId,
+    request,
+    response,
+    title: 'My title',
+  };
 
   describe('functionality from tab statistics/request/response', () => {
     test('Click on statistic Tab', () => {
       const wrapper = mount(
-        <ThemeProvider theme={mockTheme}>
-          <ModalInspectQuery
-            closeModal={closeModal}
-            isShowing={true}
-            request={request}
-            response={response}
-            title="My title"
-          />
-        </ThemeProvider>
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} />
+        </TestProviders>
       );
 
       wrapper.find('.euiTab').first().simulate('click');
@@ -134,15 +81,9 @@ describe('Modal Inspect', () => {
 
     test('Click on request Tab', () => {
       const wrapper = mount(
-        <ThemeProvider theme={mockTheme}>
-          <ModalInspectQuery
-            closeModal={closeModal}
-            isShowing={true}
-            request={request}
-            response={response}
-            title="My title"
-          />
-        </ThemeProvider>
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} />
+        </TestProviders>
       );
 
       wrapper.find('.euiTab').at(2).simulate('click');
@@ -201,15 +142,9 @@ describe('Modal Inspect', () => {
 
     test('Click on response Tab', () => {
       const wrapper = mount(
-        <ThemeProvider theme={mockTheme}>
-          <ModalInspectQuery
-            closeModal={closeModal}
-            isShowing={true}
-            request={request}
-            response={response}
-            title="My title"
-          />
-        </ThemeProvider>
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} />
+        </TestProviders>
       );
 
       wrapper.find('.euiTab').at(1).simulate('click');
@@ -237,15 +172,9 @@ describe('Modal Inspect', () => {
   describe('events', () => {
     test('Make sure that toggle function has been called when you click on the close button', () => {
       const wrapper = mount(
-        <ThemeProvider theme={mockTheme}>
-          <ModalInspectQuery
-            closeModal={closeModal}
-            isShowing={true}
-            request={request}
-            response={response}
-            title="My title"
-          />
-        </ThemeProvider>
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} />
+        </TestProviders>
       );
 
       wrapper.find('button[data-test-subj="modal-inspect-close"]').simulate('click');
@@ -280,4 +209,37 @@ describe('Modal Inspect', () => {
       expect(expected).toEqual('Sorry about that, something went wrong.');
     });
   });
+
+  describe('index pattern messaging', () => {
+    test('no messaging when all patterns are in sourcerer selection', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} />
+        </TestProviders>
+      );
+      expect(wrapper.find('i[data-test-subj="not-sourcerer-msg"]').first().exists()).toEqual(false);
+      expect(wrapper.find('i[data-test-subj="exclude-logs-msg"]').first().exists()).toEqual(false);
+    });
+    test('not-sourcerer-msg when not all patterns are in sourcerer selection', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <ModalInspectQuery {...defaultProps} request={getRequest(['differentbeat-*'])} />
+        </TestProviders>
+      );
+      expect(wrapper.find('i[data-test-subj="not-sourcerer-msg"]').first().exists()).toEqual(true);
+      expect(wrapper.find('i[data-test-subj="exclude-logs-msg"]').first().exists()).toEqual(false);
+    });
+    test('exclude-logs-msg when EXCLUDE_ELASTIC_CLOUD_INDEX is present in patterns', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <ModalInspectQuery
+            {...defaultProps}
+            request={getRequest([EXCLUDE_ELASTIC_CLOUD_INDEX, 'logs-*'])}
+          />
+        </TestProviders>
+      );
+      expect(wrapper.find('i[data-test-subj="not-sourcerer-msg"]').first().exists()).toEqual(false);
+      expect(wrapper.find('i[data-test-subj="exclude-logs-msg"]').first().exists()).toEqual(true);
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/modal.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/modal.tsx
index 78a3d744e46bb..45fcf1e746b87 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/modal.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/modal.tsx
@@ -19,11 +19,19 @@ import {
   EuiTabbedContent,
 } from '@elastic/eui';
 import numeral from '@elastic/numeral';
-import React, { Fragment, ReactNode } from 'react';
+import React, { useMemo, Fragment, ReactNode } from 'react';
 import styled from 'styled-components';
 
+import { useLocation } from 'react-router-dom';
 import { NO_ALERT_INDEX } from '../../../../common/constants';
 import * as i18n from './translations';
+import {
+  EXCLUDE_ELASTIC_CLOUD_INDEX,
+  getScopeFromPath,
+  useSourcererDataView,
+} from '../../containers/sourcerer';
+import { InputsModelId } from '../../store/inputs/constants';
+import { SourcererScopeName } from '../../store/sourcerer/model';
 
 const DescriptionListStyled = styled(EuiDescriptionList)`
   @media only screen and (min-width: ${(props) => props.theme.eui.euiBreakpoints.s}) {
@@ -40,12 +48,12 @@ const DescriptionListStyled = styled(EuiDescriptionList)`
 DescriptionListStyled.displayName = 'DescriptionListStyled';
 
 interface ModalInspectProps {
-  closeModal: () => void;
-  isShowing: boolean;
-  request: string | null;
-  response: string | null;
   additionalRequests?: string[] | null;
   additionalResponses?: string[] | null;
+  closeModal: () => void;
+  inputId?: InputsModelId;
+  request: string;
+  response: string;
   title: string | React.ReactElement | React.ReactNode;
 }
 
@@ -101,18 +109,18 @@ export const formatIndexPatternRequested = (indices: string[] = []) => {
 };
 
 export const ModalInspectQuery = ({
+  additionalRequests,
+  additionalResponses,
   closeModal,
-  isShowing = false,
+  inputId,
   request,
   response,
-  additionalRequests,
-  additionalResponses,
   title,
 }: ModalInspectProps) => {
-  if (!isShowing || request == null || response == null) {
-    return null;
-  }
-
+  const { pathname } = useLocation();
+  const { selectedPatterns } = useSourcererDataView(
+    inputId === 'timeline' ? SourcererScopeName.timeline : getScopeFromPath(pathname)
+  );
   const requests: string[] = [request, ...(additionalRequests != null ? additionalRequests : [])];
   const responses: string[] = [
     response,
@@ -122,6 +130,16 @@ export const ModalInspectQuery = ({
   const inspectRequests: Request[] = parseInspectStrings(requests);
   const inspectResponses: Response[] = parseInspectStrings(responses);
 
+  const isSourcererPattern = useMemo(
+    () => (inspectRequests[0]?.index ?? []).every((pattern) => selectedPatterns.includes(pattern)),
+    [inspectRequests, selectedPatterns]
+  );
+
+  const isLogsExclude = useMemo(
+    () => (inspectRequests[0]?.index ?? []).includes(EXCLUDE_ELASTIC_CLOUD_INDEX),
+    [inspectRequests]
+  );
+
   const statistics: Array<{
     title: NonNullable<ReactNode | string>;
     description: NonNullable<ReactNode | string>;
@@ -135,7 +153,22 @@ export const ModalInspectQuery = ({
       ),
       description: (
         <span data-test-subj="index-pattern-description">
-          {formatIndexPatternRequested(inspectRequests[0]?.index ?? [])}
+          <p>{formatIndexPatternRequested(inspectRequests[0]?.index ?? [])}</p>
+
+          {!isSourcererPattern && (
+            <p>
+              <small>
+                <i data-test-subj="not-sourcerer-msg">{i18n.INSPECT_PATTERN_DIFFERENT}</i>
+              </small>
+            </p>
+          )}
+          {isLogsExclude && (
+            <p>
+              <small>
+                <i data-test-subj="exclude-logs-msg">{i18n.LOGS_EXCLUDE_MESSAGE}</i>
+              </small>
+            </p>
+          )}
         </span>
       ),
     },
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/translations.ts b/x-pack/plugins/security_solution/public/common/components/inspect/translations.ts
index 28561aadf8d7e..732432c659d4c 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/translations.ts
@@ -36,6 +36,21 @@ export const INDEX_PATTERN_DESC = i18n.translate(
   }
 );
 
+export const INSPECT_PATTERN_DIFFERENT = i18n.translate(
+  'xpack.securitySolution.inspectPatternDifferent',
+  {
+    defaultMessage: 'This element has a unique index pattern separate from the data view setting.',
+  }
+);
+
+export const LOGS_EXCLUDE_MESSAGE = i18n.translate(
+  'xpack.securitySolution.inspectPatternExcludeLogs',
+  {
+    defaultMessage:
+      'When the logs-* index pattern is selected, Elastic cloud logs are excluded from the search.',
+  }
+);
+
 export const QUERY_TIME = i18n.translate('xpack.securitySolution.inspect.modal.queryTimeLabel', {
   defaultMessage: 'Query time',
 });

From dba7207787654c54e2bdf1abf399378f3f9c94f8 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:02:25 -0800
Subject: [PATCH 30/85] [Security Solution][Lists] - Update exception item
 viewer overflow (#125145)

### Summary

Addresses #119012

- updates exception item viewer UI
---
 .../exception_lists/new/exception_list.json   |   4 +-
 .../exception_item/exception_details.tsx      |  16 +-
 .../exception_item/exception_entries.tsx      |   3 +-
 .../exceptions/viewer/helpers.test.tsx        | 267 +++++++++++-------
 .../components/exceptions/viewer/helpers.tsx  |  35 ++-
 5 files changed, 209 insertions(+), 116 deletions(-)

diff --git a/x-pack/plugins/lists/server/scripts/exception_lists/new/exception_list.json b/x-pack/plugins/lists/server/scripts/exception_lists/new/exception_list.json
index 73271514269da..68bbcc6288df2 100644
--- a/x-pack/plugins/lists/server/scripts/exception_lists/new/exception_list.json
+++ b/x-pack/plugins/lists/server/scripts/exception_lists/new/exception_list.json
@@ -2,6 +2,6 @@
   "list_id": "simple_list",
   "tags": ["user added string for a tag", "malware"],
   "type": "detection",
-  "description": "This is a sample endpoint type exception",
-  "name": "Sample Endpoint Exception List"
+  "description": "This is a sample detection type exception",
+  "name": "Sample Detection Exception List"
 }
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
index 3354637b9f745..429f9672aece5 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
@@ -11,7 +11,6 @@ import {
   EuiDescriptionList,
   EuiButtonEmpty,
   EuiDescriptionListTitle,
-  EuiDescriptionListDescription,
   EuiToolTip,
 } from '@elastic/eui';
 import React, { useMemo, Fragment } from 'react';
@@ -92,7 +91,11 @@ const ExceptionDetailsComponent = ({
     <MyExceptionDetails grow={2}>
       <EuiFlexGroup direction="column" alignItems="flexStart">
         <EuiFlexItem grow={1} className="eventFiltersDescriptionList">
-          <EuiDescriptionList compressed type="column" data-test-subj="exceptionsViewerItemDetails">
+          <EuiDescriptionList
+            compressed
+            type="responsiveColumn"
+            data-test-subj="exceptionsViewerItemDetails"
+          >
             {descriptionListItems.map((item) => (
               <Fragment key={`${item.title}`}>
                 <EuiToolTip content={item.title} anchorClassName="eventFiltersDescriptionListTitle">
@@ -100,14 +103,7 @@ const ExceptionDetailsComponent = ({
                     {item.title}
                   </EuiDescriptionListTitle>
                 </EuiToolTip>
-                <EuiToolTip
-                  content={item.description}
-                  anchorClassName="eventFiltersDescriptionListDescription"
-                >
-                  <EuiDescriptionListDescription className="eui-textBreakWord eui-textTruncate eui-fullWidth">
-                    {item.description}
-                  </EuiDescriptionListDescription>
-                </EuiToolTip>
+                {item.description}
               </Fragment>
             ))}
           </EuiDescriptionList>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
index 10210463e9a1e..4db00bea5c932 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
@@ -150,8 +150,7 @@ const ExceptionEntriesComponent = ({
         },
       },
     ],
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [entries]
+    []
   );
 
   return (
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
index d67f526fa9bdc..25e260e67855a 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
@@ -8,7 +8,7 @@
 import moment from 'moment-timezone';
 
 import { getFormattedEntries, formatEntry, getDescriptionListContent } from './helpers';
-import { FormattedEntry, DescriptionListItem } from '../types';
+import { FormattedEntry } from '../types';
 import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { getEntriesArrayMock } from '../../../../../../lists/common/schemas/types/entries.mock';
 import { getEntryMatchMock } from '../../../../../../lists/common/schemas/types/entry_match.mock';
@@ -157,103 +157,171 @@ describe('Exception viewer helpers', () => {
       const payload = getExceptionListItemSchemaMock({ os_types: ['linux'] });
       payload.description = '';
       const result = getDescriptionListContent(payload);
-      const expected: DescriptionListItem[] = [
-        {
-          description: 'Linux',
-          title: 'OS',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date created',
-        },
-        {
-          description: 'some user',
-          title: 'Created by',
-        },
-      ];
+      const os = result.find(({ title }) => title === 'OS');
 
-      expect(result).toEqual(expected);
+      expect(os).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiToolTip
+            anchorClassName="eventFiltersDescriptionListDescription"
+            content="Linux"
+            delay="regular"
+            display="inlineBlock"
+            position="top"
+          >
+            <EuiDescriptionListDescription
+              className="eui-fullWidth"
+            >
+              Linux
+            </EuiDescriptionListDescription>
+          </EuiToolTip>,
+          "title": "OS",
+        }
+      `);
     });
 
     test('it returns formatted description list with a description if one specified', () => {
       const payload = getExceptionListItemSchemaMock({ os_types: ['linux'] });
       payload.description = 'Im a description';
       const result = getDescriptionListContent(payload);
-      const expected: DescriptionListItem[] = [
-        {
-          description: 'Linux',
-          title: 'OS',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date created',
-        },
-        {
-          description: 'some user',
-          title: 'Created by',
-        },
-        {
-          description: 'Im a description',
-          title: 'Description',
-        },
-      ];
+      const description = result.find(({ title }) => title === 'Description');
 
-      expect(result).toEqual(expected);
+      expect(description).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiToolTip
+            anchorClassName="eventFiltersDescriptionListDescription"
+            content="Im a description"
+            delay="regular"
+            display="inlineBlock"
+            position="top"
+          >
+            <EuiDescriptionListDescription
+              className="eui-fullWidth"
+            >
+              Im a description
+            </EuiDescriptionListDescription>
+          </EuiToolTip>,
+          "title": "Description",
+        }
+      `);
     });
 
-    test('it returns just user and date created if no other fields specified', () => {
+    test('it returns scrolling element when description is longer than 75 charachters', () => {
       const payload = getExceptionListItemSchemaMock({ os_types: ['linux'] });
-      payload.description = '';
+      payload.description =
+        'Puppy kitty ipsum dolor sit good dog foot stick canary. Teeth Mittens grooming vaccine walk swimming nest good boy furry tongue heel furry treats fish. Cage run fast kitten dinnertime ball run foot park fleas throw house train licks stick dinnertime window. Yawn litter fish yawn toy pet gate throw Buddy kitty wag tail ball groom crate ferret heel wet nose Rover toys pet supplies. Bird Food treats tongue lick teeth ferret litter box slobbery litter box crate bird small animals yawn small animals shake slobber gimme five toys polydactyl meow. ';
       const result = getDescriptionListContent(payload);
-      const expected: DescriptionListItem[] = [
-        {
-          description: 'Linux',
-          title: 'OS',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date created',
-        },
-        {
-          description: 'some user',
-          title: 'Created by',
-        },
-      ];
+      const description = result.find(({ title }) => title === 'Description');
 
-      expect(result).toEqual(expected);
+      expect(description).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiDescriptionListDescription
+            style={
+              Object {
+                "height": 150,
+                "overflowY": "hidden",
+              }
+            }
+          >
+            <EuiText
+              aria-label=""
+              className="eui-yScrollWithShadows"
+              role="region"
+              size="s"
+              tabIndex={0}
+            >
+              Puppy kitty ipsum dolor sit good dog foot stick canary. Teeth Mittens grooming vaccine walk swimming nest good boy furry tongue heel furry treats fish. Cage run fast kitten dinnertime ball run foot park fleas throw house train licks stick dinnertime window. Yawn litter fish yawn toy pet gate throw Buddy kitty wag tail ball groom crate ferret heel wet nose Rover toys pet supplies. Bird Food treats tongue lick teeth ferret litter box slobbery litter box crate bird small animals yawn small animals shake slobber gimme five toys polydactyl meow. 
+            </EuiText>
+          </EuiDescriptionListDescription>,
+          "title": "Description",
+        }
+      `);
     });
 
-    test('it returns Modified By/On info. when `includeModified` is true', () => {
+    test('it returns just user and date created if no other fields specified', () => {
+      const payload = getExceptionListItemSchemaMock();
+      payload.description = '';
+      const result = getDescriptionListContent(payload);
+      expect(result).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "description": <EuiToolTip
+              anchorClassName="eventFiltersDescriptionListDescription"
+              content="April 20th 2020 @ 15:25:31"
+              delay="regular"
+              display="inlineBlock"
+              position="top"
+            >
+              <EuiDescriptionListDescription
+                className="eui-fullWidth"
+              >
+                April 20th 2020 @ 15:25:31
+              </EuiDescriptionListDescription>
+            </EuiToolTip>,
+            "title": "Date created",
+          },
+          Object {
+            "description": <EuiToolTip
+              anchorClassName="eventFiltersDescriptionListDescription"
+              content="some user"
+              delay="regular"
+              display="inlineBlock"
+              position="top"
+            >
+              <EuiDescriptionListDescription
+                className="eui-fullWidth"
+              >
+                some user
+              </EuiDescriptionListDescription>
+            </EuiToolTip>,
+            "title": "Created by",
+          },
+        ]
+      `);
+    });
+
+    test('it returns Modified By/On info when `includeModified` is true', () => {
       const result = getDescriptionListContent(
         getExceptionListItemSchemaMock({ os_types: ['linux'] }),
         true
       );
-      expect(result).toEqual([
-        {
-          description: 'Linux',
-          title: 'OS',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date created',
-        },
-        {
-          description: 'some user',
-          title: 'Created by',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date modified',
-        },
-        {
-          description: 'some user',
-          title: 'Modified by',
-        },
-        {
-          description: 'some description',
-          title: 'Description',
-        },
-      ]);
+      const dateModified = result.find(({ title }) => title === 'Date modified');
+      const modifiedBy = result.find(({ title }) => title === 'Modified by');
+      expect(modifiedBy).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiToolTip
+            anchorClassName="eventFiltersDescriptionListDescription"
+            content="some user"
+            delay="regular"
+            display="inlineBlock"
+            position="top"
+          >
+            <EuiDescriptionListDescription
+              className="eui-fullWidth"
+            >
+              some user
+            </EuiDescriptionListDescription>
+          </EuiToolTip>,
+          "title": "Modified by",
+        }
+      `);
+      expect(dateModified).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiToolTip
+            anchorClassName="eventFiltersDescriptionListDescription"
+            content="April 20th 2020 @ 15:25:31"
+            delay="regular"
+            display="inlineBlock"
+            position="top"
+          >
+            <EuiDescriptionListDescription
+              className="eui-fullWidth"
+            >
+              April 20th 2020 @ 15:25:31
+            </EuiDescriptionListDescription>
+          </EuiToolTip>,
+          "title": "Date modified",
+        }
+      `);
     });
 
     test('it returns Name when `includeName` is true', () => {
@@ -262,28 +330,25 @@ describe('Exception viewer helpers', () => {
         false,
         true
       );
-      expect(result).toEqual([
-        {
-          description: 'some name',
-          title: 'Name',
-        },
-        {
-          description: 'Linux',
-          title: 'OS',
-        },
-        {
-          description: 'April 20th 2020 @ 15:25:31',
-          title: 'Date created',
-        },
-        {
-          description: 'some user',
-          title: 'Created by',
-        },
-        {
-          description: 'some description',
-          title: 'Description',
-        },
-      ]);
+      const name = result.find(({ title }) => title === 'Name');
+      expect(name).toMatchInlineSnapshot(`
+        Object {
+          "description": <EuiToolTip
+            anchorClassName="eventFiltersDescriptionListDescription"
+            content="some name"
+            delay="regular"
+            display="inlineBlock"
+            position="top"
+          >
+            <EuiDescriptionListDescription
+              className="eui-fullWidth"
+            >
+              some name
+            </EuiDescriptionListDescription>
+          </EuiToolTip>,
+          "title": "Name",
+        }
+      `);
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
index 597e8a6fed52f..37bfeb6166405 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
@@ -14,6 +14,8 @@ import {
   BuilderEntry,
 } from '@kbn/securitysolution-list-utils';
 
+import React from 'react';
+import { EuiDescriptionListDescription, EuiText, EuiToolTip } from '@elastic/eui';
 import { formatOperatingSystems } from '../helpers';
 import type { FormattedEntry, DescriptionListItem } from '../types';
 import * as i18n from '../translations';
@@ -125,7 +127,38 @@ export const getDescriptionListContent = (
 
   return details.reduce<DescriptionListItem[]>((acc, { value, title }) => {
     if (value != null && value.trim() !== '') {
-      return [...acc, { title, description: value }];
+      const valueElement = (
+        <EuiToolTip content={value} anchorClassName="eventFiltersDescriptionListDescription">
+          <EuiDescriptionListDescription className="eui-fullWidth">
+            {value}
+          </EuiDescriptionListDescription>
+        </EuiToolTip>
+      );
+      if (title === i18n.DESCRIPTION) {
+        return [
+          ...acc,
+          {
+            title,
+            description:
+              value.length > 75 ? (
+                <EuiDescriptionListDescription style={{ height: 150, overflowY: 'hidden' }}>
+                  <EuiText
+                    tabIndex={0}
+                    role="region"
+                    aria-label=""
+                    className="eui-yScrollWithShadows"
+                    size="s"
+                  >
+                    {value}
+                  </EuiText>
+                </EuiDescriptionListDescription>
+              ) : (
+                valueElement
+              ),
+          },
+        ];
+      }
+      return [...acc, { title, description: valueElement }];
     } else {
       return acc;
     }

From 7407c245ef0a261b9be5a520129a25fbf023f312 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Thu, 10 Feb 2022 02:38:35 +0000
Subject: [PATCH 31/85] skip flaky suite (#118432)

---
 test/functional/apps/discover/_search_on_page_load.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/discover/_search_on_page_load.ts b/test/functional/apps/discover/_search_on_page_load.ts
index 0198881e981b8..3df6ce1c13c43 100644
--- a/test/functional/apps/discover/_search_on_page_load.ts
+++ b/test/functional/apps/discover/_search_on_page_load.ts
@@ -58,7 +58,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    describe(`when it's false`, () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/118432
+    describe.skip(`when it's false`, () => {
       beforeEach(async () => await initSearchOnPageLoad(false));
 
       it('should not fetch data from ES initially', async function () {

From 560ca276b301cf639f9987f5aeca6f6b0e622473 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Thu, 10 Feb 2022 02:43:29 +0000
Subject: [PATCH 32/85] skip flaky suite (#124663)

---
 .../functional/apps/management/_index_pattern_create_delete.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index 62612ad5a9080..a07141a073d64 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -35,7 +35,8 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    describe('validation', function () {
+    // FLAKY: https://github.com/elastic/kibana/issues/124663
+    describe.skip('validation', function () {
       it('can display errors', async function () {
         await PageObjects.settings.clickAddNewIndexPatternButton();
         await PageObjects.settings.setIndexPatternField('log-fake*');

From 87eaa7525cd7ad3b56b51b1321e6b2e3dbfe5cd0 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:25:43 -0700
Subject: [PATCH 33/85] [Reporting] Switch from EventLog integration to ECS
 logging (#124762)

* [Reporting] Remove EventLog Dependency

* calculate duration

* use LogMeta interface of core logger

* fix ts

* rename the debug log tag

* clean up return types for testing

* remove reporting fields from the event log mappings

* unwrap code from iife

* add class for log adapter

* remove useless factory fn

* remove eventLog

* user field was meant to be ECS field

* duration is nanoseconds

* fix nanoseconds application and test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../plugins/event_log/generated/mappings.json |  13 --
 x-pack/plugins/event_log/generated/schemas.ts |   7 --
 x-pack/plugins/event_log/scripts/mappings.js  |  14 ---
 x-pack/plugins/reporting/kibana.json          |   1 -
 x-pack/plugins/reporting/server/core.ts       |   4 +-
 .../server/lib/event_logger/adapter.test.ts   |  67 ++++++++++
 .../server/lib/event_logger/adapter.ts        |  57 +++++++++
 .../server/lib/event_logger/index.ts          |   7 +-
 .../server/lib/event_logger/logger.test.ts    |  51 +++-----
 .../server/lib/event_logger/logger.ts         | 116 +++++++++---------
 .../server/lib/event_logger/types.ts          |  63 +++-------
 .../reporting/server/lib/level_logger.ts      |   9 +-
 x-pack/plugins/reporting/server/plugin.ts     |   3 -
 .../create_mock_reportingplugin.ts            |   4 -
 x-pack/plugins/reporting/server/types.ts      |   2 -
 x-pack/plugins/reporting/tsconfig.json        |   1 -
 .../__snapshots__/event_log.snap              |  11 --
 .../reporting_and_security/event_log.ts       |  88 -------------
 .../reporting_and_security/index.ts           |   1 -
 19 files changed, 220 insertions(+), 299 deletions(-)
 create mode 100644 x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
 create mode 100644 x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
 delete mode 100644 x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/event_log.snap
 delete mode 100644 x-pack/test/reporting_api_integration/reporting_and_security/event_log.ts

diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json
index 5e6a9d660f82a..e9f030ffbc886 100644
--- a/x-pack/plugins/event_log/generated/mappings.json
+++ b/x-pack/plugins/event_log/generated/mappings.json
@@ -309,19 +309,6 @@
                         }
                     }
                 },
-                "reporting": {
-                    "properties": {
-                        "id": {
-                            "type": "keyword"
-                        },
-                        "jobType": {
-                            "type": "keyword"
-                        },
-                        "byteSize": {
-                            "type": "long"
-                        }
-                    }
-                },
                 "saved_objects": {
                     "type": "nested",
                     "properties": {
diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts
index 4607495b85c4e..d61689d6238e4 100644
--- a/x-pack/plugins/event_log/generated/schemas.ts
+++ b/x-pack/plugins/event_log/generated/schemas.ts
@@ -140,13 +140,6 @@ export const EventSchema = schema.maybe(
             ),
           })
         ),
-        reporting: schema.maybe(
-          schema.object({
-            id: ecsString(),
-            jobType: ecsString(),
-            byteSize: ecsNumber(),
-          })
-        ),
         saved_objects: schema.maybe(
           schema.arrayOf(
             schema.object({
diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js
index 22d36d7f20d4c..091b50eceea6c 100644
--- a/x-pack/plugins/event_log/scripts/mappings.js
+++ b/x-pack/plugins/event_log/scripts/mappings.js
@@ -91,20 +91,6 @@ exports.EcsCustomPropertyMappings = {
           },
         },
       },
-      // reporting specific fields
-      reporting: {
-        properties: {
-          id: {
-            type: 'keyword',
-          },
-          jobType: {
-            type: 'keyword',
-          },
-          byteSize: {
-            type: 'long',
-          },
-        },
-      },
       // array of saved object references, for "linking" via search
       saved_objects: {
         type: 'nested',
diff --git a/x-pack/plugins/reporting/kibana.json b/x-pack/plugins/reporting/kibana.json
index e7162d0974de6..8f75a462ed8f6 100644
--- a/x-pack/plugins/reporting/kibana.json
+++ b/x-pack/plugins/reporting/kibana.json
@@ -18,7 +18,6 @@
     "licensing",
     "uiActions",
     "taskManager",
-    "eventLog",
     "embeddable",
     "screenshotting",
     "screenshotMode",
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 5c00089afc381..745542c358a69 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -21,7 +21,6 @@ import type {
 import type { PluginStart as DataPluginStart } from 'src/plugins/data/server';
 import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
 import { KibanaRequest, ServiceStatusLevels } from '../../../../src/core/server';
-import type { IEventLogService } from '../../event_log/server';
 import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import type { LicensingPluginStart } from '../../licensing/server';
 import type { ScreenshotResult, ScreenshottingStart } from '../../screenshotting/server';
@@ -40,7 +39,6 @@ import { ExecuteReportTask, MonitorReportsTask, ReportTaskParams } from './lib/t
 import type { ReportingPluginRouter, ScreenshotOptions } from './types';
 
 export interface ReportingInternalSetup {
-  eventLog: IEventLogService;
   basePath: Pick<BasePath, 'set'>;
   router: ReportingPluginRouter;
   features: FeaturesPluginSetup;
@@ -390,7 +388,7 @@ export class ReportingCore {
   }
 
   public getEventLogger(report: IReport, task?: { id: string }) {
-    const ReportingEventLogger = reportingEventLoggerFactory(this.pluginSetupDeps!.eventLog);
+    const ReportingEventLogger = reportingEventLoggerFactory(this.logger);
     return new ReportingEventLogger(report, task);
   }
 }
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
new file mode 100644
index 0000000000000..aef569a49e357
--- /dev/null
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
@@ -0,0 +1,67 @@
+/*
+ * 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 { LogMeta } from 'kibana/server';
+import { createMockLevelLogger } from '../../test_helpers';
+import { EcsLogAdapter } from './adapter';
+
+describe('EcsLogAdapter', () => {
+  const logger = createMockLevelLogger();
+  beforeAll(() => {
+    jest
+      .spyOn(global.Date, 'now')
+      .mockImplementationOnce(() => new Date('2021-04-12T16:00:00.000Z').valueOf())
+      .mockImplementationOnce(() => new Date('2021-04-12T16:02:00.000Z').valueOf());
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('captures a log event', () => {
+    const eventLogger = new EcsLogAdapter(logger, { event: { provider: 'test-adapting' } });
+
+    const event = { kibana: { reporting: { wins: 5000 } } } as object & LogMeta; // an object that extends LogMeta
+    eventLogger.logEvent('hello world', event);
+
+    expect(logger.debug).toBeCalledWith('hello world', ['events'], {
+      event: {
+        duration: undefined,
+        end: undefined,
+        provider: 'test-adapting',
+        start: undefined,
+      },
+      kibana: {
+        reporting: {
+          wins: 5000,
+        },
+      },
+    });
+  });
+
+  it('captures timings between start and complete', () => {
+    const eventLogger = new EcsLogAdapter(logger, { event: { provider: 'test-adapting' } });
+    eventLogger.startTiming();
+
+    const event = { kibana: { reporting: { wins: 9000 } } } as object & LogMeta; // an object that extends LogMeta
+    eventLogger.logEvent('hello duration', event);
+
+    expect(logger.debug).toBeCalledWith('hello duration', ['events'], {
+      event: {
+        duration: 120000000000,
+        end: '2021-04-12T16:02:00.000Z',
+        provider: 'test-adapting',
+        start: '2021-04-12T16:00:00.000Z',
+      },
+      kibana: {
+        reporting: {
+          wins: 9000,
+        },
+      },
+    });
+  });
+});
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
new file mode 100644
index 0000000000000..c9487a79d9e70
--- /dev/null
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
@@ -0,0 +1,57 @@
+/*
+ * 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 deepMerge from 'deepmerge';
+import { LogMeta } from 'src/core/server';
+import { LevelLogger } from '../level_logger';
+import { IReportingEventLogger } from './logger';
+
+/** @internal */
+export class EcsLogAdapter implements IReportingEventLogger {
+  start?: Date;
+  end?: Date;
+
+  /**
+   * This class provides a logging system to Reporting code, using a shape similar to the EventLog service.
+   * The logging action causes ECS data with Reporting metrics sent to DEBUG logs.
+   *
+   * @param {LevelLogger} logger - Reporting's wrapper of the core logger
+   * @param {Partial<LogMeta>} properties - initial ECS data with template for Reporting metrics
+   */
+  constructor(private logger: LevelLogger, private properties: Partial<LogMeta>) {}
+
+  logEvent(message: string, properties: LogMeta) {
+    if (this.start && !this.end) {
+      this.end = new Date(Date.now());
+    }
+
+    let duration: number | undefined;
+    if (this.end && this.start) {
+      duration = (this.end.valueOf() - this.start.valueOf()) * 1000000; // nanoseconds
+    }
+
+    // add the derived properties for timing between "start" and "complete" logging calls
+    const newProperties: LogMeta = deepMerge(this.properties, {
+      event: {
+        duration,
+        start: this.start?.toISOString(),
+        end: this.end?.toISOString(),
+      },
+    });
+
+    // sends an ECS object with Reporting metrics to the DEBUG logs
+    this.logger.debug(message, ['events'], deepMerge(newProperties, properties));
+  }
+
+  startTiming() {
+    this.start = new Date(Date.now());
+  }
+
+  stopTiming() {
+    this.end = new Date(Date.now());
+  }
+}
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/index.ts b/x-pack/plugins/reporting/server/lib/event_logger/index.ts
index 566f0a21e2b05..f9c4c5574b3e1 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/index.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/index.ts
@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-import { IEventLogService } from '../../../../event_log/server';
-import { PLUGIN_ID } from '../../../common/constants';
-
 export enum ActionType {
   SCHEDULE_TASK = 'schedule-task',
   CLAIM_TASK = 'claim-task',
@@ -16,7 +13,5 @@ export enum ActionType {
   SAVE_REPORT = 'save-report',
   RETRY = 'retry',
   FAIL_REPORT = 'fail-report',
-}
-export function registerEventLogProviderActions(eventLog: IEventLogService) {
-  eventLog.registerProviderActions(PLUGIN_ID, Object.values(ActionType));
+  EXECUTE_ERROR = 'execute-error',
 }
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
index 21c4ee2d5e4cf..9a1c282a01a59 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { ConcreteTaskInstance } from '../../../../task_manager/server';
-import { eventLogServiceMock } from '../../../../event_log/server/mocks';
+import { createMockLevelLogger } from '../../test_helpers';
 import { BasePayload } from '../../types';
 import { Report } from '../store';
 import { ReportingEventLogger, reportingEventLoggerFactory } from './logger';
@@ -21,7 +21,7 @@ describe('Event Logger', () => {
   let factory: ReportingEventLogger;
 
   beforeEach(() => {
-    factory = reportingEventLoggerFactory(eventLogServiceMock.create());
+    factory = reportingEventLoggerFactory(createMockLevelLogger());
   });
 
   it(`should construct with an internal seed object`, () => {
@@ -29,7 +29,6 @@ describe('Event Logger', () => {
     expect(logger.eventObj).toMatchInlineSnapshot(`
       Object {
         "event": Object {
-          "provider": "reporting",
           "timezone": "UTC",
         },
         "kibana": Object {
@@ -38,9 +37,6 @@ describe('Event Logger', () => {
             "jobType": "csv",
           },
         },
-        "log": Object {
-          "logger": "reporting",
-        },
         "user": undefined,
       }
     `);
@@ -51,7 +47,6 @@ describe('Event Logger', () => {
     expect(logger.eventObj).toMatchInlineSnapshot(`
       Object {
         "event": Object {
-          "provider": "reporting",
           "timezone": "UTC",
         },
         "kibana": Object {
@@ -60,9 +55,6 @@ describe('Event Logger', () => {
             "jobType": "csv",
           },
         },
-        "log": Object {
-          "logger": "reporting",
-        },
         "user": Object {
           "name": "thundercat",
         },
@@ -77,7 +69,6 @@ describe('Event Logger', () => {
     expect(logger.eventObj).toMatchInlineSnapshot(`
       Object {
         "event": Object {
-          "provider": "reporting",
           "timezone": "UTC",
         },
         "kibana": Object {
@@ -89,9 +80,6 @@ describe('Event Logger', () => {
             "id": "some-task-id-123",
           },
         },
-        "log": Object {
-          "logger": "reporting",
-        },
         "user": Object {
           "name": "thundercat",
         },
@@ -101,16 +89,16 @@ describe('Event Logger', () => {
 
   it(`logExecutionStart`, () => {
     const logger = new factory(mockReport);
+    jest.spyOn(logger.completionLogger, 'startTiming');
+    jest.spyOn(logger.completionLogger, 'stopTiming');
     const result = logger.logExecutionStart();
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "execute-start",
-          "kind": "event",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "execute-start",
           "id": "12348",
           "jobType": "csv",
         },
@@ -119,23 +107,23 @@ describe('Event Logger', () => {
     `);
     expect(result.message).toMatchInlineSnapshot(`"starting csv execution"`);
     expect(logger.completionLogger.startTiming).toBeCalled();
+    expect(logger.completionLogger.stopTiming).not.toBeCalled();
   });
 
   it(`logExecutionComplete`, () => {
     const logger = new factory(mockReport);
+    jest.spyOn(logger.completionLogger, 'startTiming');
+    jest.spyOn(logger.completionLogger, 'stopTiming');
     logger.logExecutionStart();
 
     const result = logger.logExecutionComplete({ byteSize: 444 });
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "execute-complete",
-          "kind": "metrics",
-          "outcome": "success",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "execute-complete",
           "byteSize": 444,
           "id": "12348",
           "jobType": "csv",
@@ -154,13 +142,10 @@ describe('Event Logger', () => {
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "execute-complete",
-          "kind": "error",
-          "outcome": "failure",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "execute-error",
           "id": "12348",
           "jobType": "csv",
         },
@@ -176,12 +161,10 @@ describe('Event Logger', () => {
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "claim-task",
-          "kind": "event",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "claim-task",
           "id": "12348",
           "jobType": "csv",
         },
@@ -196,12 +179,10 @@ describe('Event Logger', () => {
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "fail-report",
-          "kind": "event",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "fail-report",
           "id": "12348",
           "jobType": "csv",
         },
@@ -215,12 +196,10 @@ describe('Event Logger', () => {
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "save-report",
-          "kind": "event",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "save-report",
           "id": "12348",
           "jobType": "csv",
         },
@@ -234,12 +213,10 @@ describe('Event Logger', () => {
     expect([result.event, result.kibana.reporting, result.message]).toMatchInlineSnapshot(`
       Array [
         Object {
-          "action": "retry",
-          "kind": "event",
-          "provider": "reporting",
           "timezone": "UTC",
         },
         Object {
+          "actionType": "retry",
           "id": "12348",
           "jobType": "csv",
         },
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
index 0ec864e36620b..ccdee24d1879e 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
@@ -6,16 +6,19 @@
  */
 
 import deepMerge from 'deepmerge';
-import { IEventLogger, IEventLogService } from '../../../../event_log/server';
+import { LogMeta } from 'src/core/server';
+import { LevelLogger } from '../';
 import { PLUGIN_ID } from '../../../common/constants';
 import { IReport } from '../store';
 import { ActionType } from './';
+import { EcsLogAdapter } from './adapter';
 import {
   ClaimedTask,
   CompletedExecution,
   ErrorAction,
   ExecuteError,
   FailedReport,
+  ReportingAction,
   SavedReport,
   ScheduledRetry,
   ScheduledTask,
@@ -27,171 +30,162 @@ export interface ExecutionCompleteMetrics {
   byteSize: number;
 }
 
+export interface IReportingEventLogger {
+  logEvent(message: string, properties: LogMeta): void;
+  startTiming(): void;
+  stopTiming(): void;
+}
+
 /** @internal */
-export function reportingEventLoggerFactory(eventLog: IEventLogService) {
-  const genericLogger = eventLog.getLogger({ event: { provider: PLUGIN_ID } });
+export function reportingEventLoggerFactory(logger: LevelLogger) {
+  const genericLogger = new EcsLogAdapter(logger, { event: { provider: PLUGIN_ID } });
 
   return class ReportingEventLogger {
     readonly eventObj: {
       event: {
         timezone: string;
-        provider: 'reporting';
       };
-      kibana: { reporting: StartedExecution['kibana']['reporting']; task?: { id: string } };
-      log: { logger: 'reporting' };
+      kibana: {
+        reporting: ReportingAction<ActionType>['kibana']['reporting'];
+        task?: { id: string };
+      };
       user?: { name: string };
     };
 
     readonly report: IReport;
     readonly task?: { id: string };
 
-    completionLogger: IEventLogger;
+    completionLogger: IReportingEventLogger;
 
     constructor(report: IReport, task?: { id: string }) {
       this.report = report;
       this.task = task;
       this.eventObj = {
-        event: { timezone: report.payload.browserTimezone, provider: 'reporting' },
+        event: { timezone: report.payload.browserTimezone },
         kibana: {
           reporting: { id: report._id, jobType: report.jobtype },
           ...(task?.id ? { task: { id: task.id } } : undefined),
         },
-        log: { logger: 'reporting' },
         user: report.created_by ? { name: report.created_by } : undefined,
       };
 
       // create a "complete" logger that will use EventLog helpers to calculate timings
-      this.completionLogger = eventLog.getLogger({ event: { provider: PLUGIN_ID } });
+      this.completionLogger = new EcsLogAdapter(logger, { event: { provider: PLUGIN_ID } });
     }
 
     logScheduleTask(): ScheduledTask {
+      const message = `queued report ${this.report._id}`;
       const event = deepMerge(
         {
-          message: `queued report ${this.report._id}`,
-          event: { kind: 'event', action: ActionType.SCHEDULE_TASK },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.SCHEDULE_TASK } },
         } as Partial<ScheduledTask>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logExecutionStart(): StartedExecution {
-      this.completionLogger.startTiming(this.eventObj);
+      const message = `starting ${this.report.jobtype} execution`;
+      this.completionLogger.startTiming();
       const event = deepMerge(
         {
-          message: `starting ${this.report.jobtype} execution`,
-          event: { kind: 'event', action: ActionType.EXECUTE_START },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.EXECUTE_START } },
         } as Partial<StartedExecution>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logExecutionComplete({ byteSize }: ExecutionCompleteMetrics): CompletedExecution {
-      this.completionLogger.stopTiming(this.eventObj);
+      const message = `completed ${this.report.jobtype} execution`;
+      this.completionLogger.stopTiming();
       const event = deepMerge(
         {
-          message: `completed ${this.report.jobtype} execution`,
-          event: {
-            kind: 'metrics',
-            outcome: 'success',
-            action: ActionType.EXECUTE_COMPLETE,
-          },
-          kibana: { reporting: { byteSize } },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.EXECUTE_COMPLETE, byteSize } },
         } as Partial<CompletedExecution>,
         this.eventObj
       );
-      this.completionLogger.logEvent(event);
+      this.completionLogger.logEvent(message, event);
       return event;
     }
 
     logError(error: ErrorAction): ExecuteError {
-      interface LoggedErrorMessage {
-        message: string;
-        error: ExecuteError['error'];
-        event: Omit<ExecuteError['event'], 'provider' | 'id' | 'timezone'>;
-        log: Omit<ExecuteError['log'], 'logger'>;
-      }
-      const logErrorMessage: LoggedErrorMessage = {
-        message: error.message,
+      const message = `an error occurred`;
+      const logErrorMessage = {
+        message,
+        kibana: { reporting: { actionType: ActionType.EXECUTE_ERROR } },
         error: {
           message: error.message,
           code: error.code,
           stack_trace: error.stack_trace,
           type: error.type,
         },
-        event: {
-          kind: 'error',
-          outcome: 'failure',
-          action: ActionType.EXECUTE_COMPLETE,
-        },
-        log: { level: 'error' },
-      };
+      } as Partial<ExecuteError>;
       const event = deepMerge(logErrorMessage, this.eventObj);
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logClaimTask(): ClaimedTask {
+      const message = `claimed report ${this.report._id}`;
       const event = deepMerge(
         {
-          message: `claimed report ${this.report._id}`,
-          event: { kind: 'event', action: ActionType.CLAIM_TASK },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.CLAIM_TASK } },
         } as Partial<ClaimedTask>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logReportFailure(): FailedReport {
+      const message = `report ${this.report._id} has failed`;
       const event = deepMerge(
         {
-          message: `report ${this.report._id} has failed`,
-          event: { kind: 'event', action: ActionType.FAIL_REPORT },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.FAIL_REPORT } },
         } as Partial<FailedReport>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logReportSaved(): SavedReport {
+      const message = `saved report ${this.report._id}`;
       const event = deepMerge(
         {
-          message: `saved report ${this.report._id}`,
-          event: { kind: 'event', action: ActionType.SAVE_REPORT },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.SAVE_REPORT } },
         } as Partial<SavedReport>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
 
     logRetry(): ScheduledRetry {
+      const message = `scheduled retry for report ${this.report._id}`;
       const event = deepMerge(
         {
-          message: `scheduled retry for report ${this.report._id}`,
-          event: { kind: 'event', action: ActionType.RETRY },
-          log: { level: 'info' },
+          message,
+          kibana: { reporting: { actionType: ActionType.RETRY } },
         } as Partial<ScheduledRetry>,
         this.eventObj
       );
 
-      genericLogger.logEvent(event);
+      genericLogger.logEvent(message, event);
       return event;
     }
   };
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/types.ts b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
index 1c31292d03e44..3ae06dfdb4775 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/types.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
@@ -5,31 +5,23 @@
  * 2.0.
  */
 
+import { LogMeta } from 'src/core/server';
 import { ActionType } from './';
 
-type ActionKind = 'event' | 'error' | 'metrics';
-type ActionOutcome = 'success' | 'failure';
-
-interface ActionBase<
-  A extends ActionType,
-  K extends ActionKind,
-  O extends ActionOutcome,
-  EventProvider
-> {
+interface ActionBase<A extends ActionType> {
   event: {
-    action: A;
-    kind: K;
-    outcome?: O;
-    provider: 'reporting';
     timezone: string;
   };
-  kibana: EventProvider & { task?: { id?: string } };
-  user?: { name: string };
-  log: {
-    logger: 'reporting';
-    level: K extends 'error' ? 'error' : 'info';
-  };
   message: string;
+  kibana: {
+    reporting: {
+      actionType?: A;
+      id?: string; // "immediate download" exports have no ID
+      jobType: string;
+      byteSize?: number;
+    };
+  } & { task?: { id?: string } };
+  user?: { name: string };
 }
 
 export interface ErrorAction {
@@ -39,30 +31,15 @@ export interface ErrorAction {
   type?: string;
 }
 
-type ReportingAction<
-  A extends ActionType,
-  K extends ActionKind,
-  O extends ActionOutcome = 'success'
-> = ActionBase<
-  A,
-  K,
-  O,
-  {
-    reporting: {
-      id?: string; // "immediate download" exports have no ID
-      jobType: string;
-      byteSize?: number;
-    };
-  }
->;
+export type ReportingAction<A extends ActionType> = ActionBase<A> & LogMeta;
 
-export type ScheduledTask = ReportingAction<ActionType.SCHEDULE_TASK, 'event'>;
-export type StartedExecution = ReportingAction<ActionType.EXECUTE_START, 'event'>;
-export type CompletedExecution = ReportingAction<ActionType.EXECUTE_COMPLETE, 'metrics'>;
-export type SavedReport = ReportingAction<ActionType.SAVE_REPORT, 'event'>;
-export type ClaimedTask = ReportingAction<ActionType.CLAIM_TASK, 'event'>;
-export type ScheduledRetry = ReportingAction<ActionType.RETRY, 'event'>;
-export type FailedReport = ReportingAction<ActionType.FAIL_REPORT, 'event'>;
-export type ExecuteError = ReportingAction<ActionType.EXECUTE_COMPLETE, 'error', 'failure'> & {
+export type ScheduledTask = ReportingAction<ActionType.SCHEDULE_TASK>;
+export type StartedExecution = ReportingAction<ActionType.EXECUTE_START>;
+export type CompletedExecution = ReportingAction<ActionType.EXECUTE_COMPLETE>;
+export type SavedReport = ReportingAction<ActionType.SAVE_REPORT>;
+export type ClaimedTask = ReportingAction<ActionType.CLAIM_TASK>;
+export type ScheduledRetry = ReportingAction<ActionType.RETRY>;
+export type FailedReport = ReportingAction<ActionType.FAIL_REPORT>;
+export type ExecuteError = ReportingAction<ActionType.EXECUTE_ERROR> & {
   error: ErrorAction;
 };
diff --git a/x-pack/plugins/reporting/server/lib/level_logger.ts b/x-pack/plugins/reporting/server/lib/level_logger.ts
index 4985ae2d681d0..91cf6757dbee2 100644
--- a/x-pack/plugins/reporting/server/lib/level_logger.ts
+++ b/x-pack/plugins/reporting/server/lib/level_logger.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { LoggerFactory } from 'src/core/server';
+import { LoggerFactory, LogMeta } from 'src/core/server';
 
 const trimStr = (toTrim: string) => {
   return typeof toTrim === 'string' ? toTrim.trim() : toTrim;
 };
 
 export interface GenericLevelLogger {
-  debug: (msg: string) => void;
+  debug: <T extends LogMeta>(msg: string, tags: string[], meta: T) => void;
   info: (msg: string) => void;
   warning: (msg: string) => void;
   error: (msg: Error) => void;
@@ -46,8 +46,9 @@ export class LevelLogger implements GenericLevelLogger {
     this.getLogger(tags).warn(msg);
   }
 
-  public debug(msg: string, tags: string[] = []) {
-    this.getLogger(tags).debug(msg);
+  // only "debug" logging supports the LogMeta for now...
+  public debug<T extends LogMeta>(msg: string, tags: string[] = [], meta?: T) {
+    this.getLogger(tags).debug<T>(msg, meta);
   }
 
   public trace(msg: string, tags: string[] = []) {
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
index 3b25fedd0d5fb..a0d4bfed7c7e0 100644
--- a/x-pack/plugins/reporting/server/plugin.ts
+++ b/x-pack/plugins/reporting/server/plugin.ts
@@ -11,7 +11,6 @@ import { ReportingCore } from './';
 import { buildConfig, registerUiSettings, ReportingConfigType } from './config';
 import { registerDeprecations } from './deprecations';
 import { LevelLogger, ReportingStore } from './lib';
-import { registerEventLogProviderActions } from './lib/event_logger';
 import { registerRoutes } from './routes';
 import { setFieldFormats } from './services';
 import type {
@@ -38,7 +37,6 @@ export class ReportingPlugin
 
   public setup(core: CoreSetup, plugins: ReportingSetupDeps) {
     const { http, status } = core;
-
     const reportingCore = new ReportingCore(this.logger, this.initContext);
 
     // prevent throwing errors in route handlers about async deps not being initialized
@@ -60,7 +58,6 @@ export class ReportingPlugin
       ...plugins,
     });
 
-    registerEventLogProviderActions(plugins.eventLog);
     registerUiSettings(core);
     registerDeprecations({ core, reportingCore });
     registerReportingUsageCollector(reportingCore, plugins.usageCollection);
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
index aa065e7be52c7..49d92a0fe4448 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
@@ -40,10 +40,6 @@ export const createMockPluginSetup = (
     taskManager: taskManagerMock.createSetup(),
     logger: createMockLevelLogger(),
     status: statusServiceMock.createSetupContract(),
-    eventLog: {
-      registerProviderActions: jest.fn(),
-      getLogger: jest.fn(() => ({ logEvent: jest.fn() })),
-    },
     ...setupMock,
   };
 };
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index c695df6d0a410..cd28972f5941a 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -12,7 +12,6 @@ import { FieldFormatsStart } from 'src/plugins/field_formats/server';
 import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
 import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import type { Writable } from 'stream';
-import { IEventLogService } from '../../event_log/server';
 import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import type { LicensingPluginStart } from '../../licensing/server';
 import type {
@@ -96,7 +95,6 @@ export interface ExportTypeDefinition<
  * @internal
  */
 export interface ReportingSetupDeps {
-  eventLog: IEventLogService;
   features: FeaturesPluginSetup;
   screenshotMode: ScreenshotModePluginSetup;
   security?: SecurityPluginSetup;
diff --git a/x-pack/plugins/reporting/tsconfig.json b/x-pack/plugins/reporting/tsconfig.json
index 24db825856627..cb22a7d9e719a 100644
--- a/x-pack/plugins/reporting/tsconfig.json
+++ b/x-pack/plugins/reporting/tsconfig.json
@@ -20,7 +20,6 @@
     { "path": "../../../src/plugins/ui_actions/tsconfig.json" },
     { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
     { "path": "../../../src/plugins/field_formats/tsconfig.json" },
-    { "path": "../event_log/tsconfig.json" },
     { "path": "../features/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../screenshotting/tsconfig.json" },
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/event_log.snap b/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/event_log.snap
deleted file mode 100644
index 603ab78db8c13..0000000000000
--- a/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/event_log.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Reporting APIs Report generation event logging creates a completed action for a PDF report 1`] = `
-"\\"_id\\",\\"_index\\",\\"_score\\",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
-zQMtOW0BH63Xcmy432DJ,ecommerce,1,\\"Men's Clothing\\",\\"Men's Clothing\\",EUR,Eddie,Eddie,\\"Eddie Underwood\\",\\"Eddie Underwood\\",MALE,38,Underwood,Underwood,\\"(empty)\\",Monday,0,\\"eddie@underwood-family.zzz\\",Cairo,Africa,EG,\\"POINT (31.3 30.1)\\",\\"Cairo Governorate\\",\\"Elitelligence, Oceanavigations\\",\\"Elitelligence, Oceanavigations\\",\\"Jul 7, 2019 @ 00:00:00.000\\",584677,\\"sold_product_584677_6283, sold_product_584677_19400\\",\\"sold_product_584677_6283, sold_product_584677_19400\\",\\"11.992, 24.984\\",\\"11.992, 24.984\\",\\"Men's Clothing, Men's Clothing\\",\\"Men's Clothing, Men's Clothing\\",\\"Dec 26, 2016 @ 00:00:00.000, Dec 26, 2016 @ 00:00:00.000\\",\\"0, 0\\",\\"0, 0\\",\\"Elitelligence, Oceanavigations\\",\\"Elitelligence, Oceanavigations\\",\\"6.352, 11.75\\",\\"11.992, 24.984\\",\\"6,283, 19,400\\",\\"Basic T-shirt - dark blue/white, Sweatshirt - grey multicolor\\",\\"Basic T-shirt - dark blue/white, Sweatshirt - grey multicolor\\",\\"1, 1\\",\\"ZO0549605496, ZO0299602996\\",\\"0, 0\\",\\"11.992, 24.984\\",\\"11.992, 24.984\\",\\"0, 0\\",\\"ZO0549605496, ZO0299602996\\",\\"36.969\\",\\"36.969\\",2,2,order,eddie
-zgMtOW0BH63Xcmy432DJ,ecommerce,1,\\"Women's Clothing\\",\\"Women's Clothing\\",EUR,Mary,Mary,\\"Mary Bailey\\",\\"Mary Bailey\\",FEMALE,20,Bailey,Bailey,\\"(empty)\\",Sunday,6,\\"mary@bailey-family.zzz\\",Dubai,Asia,AE,\\"POINT (55.3 25.3)\\",Dubai,\\"Champion Arts, Pyramidustries\\",\\"Champion Arts, Pyramidustries\\",\\"Jul 6, 2019 @ 00:00:00.000\\",584021,\\"sold_product_584021_11238, sold_product_584021_20149\\",\\"sold_product_584021_11238, sold_product_584021_20149\\",\\"24.984, 28.984\\",\\"24.984, 28.984\\",\\"Women's Clothing, Women's Clothing\\",\\"Women's Clothing, Women's Clothing\\",\\"Dec 25, 2016 @ 00:00:00.000, Dec 25, 2016 @ 00:00:00.000\\",\\"0, 0\\",\\"0, 0\\",\\"Champion Arts, Pyramidustries\\",\\"Champion Arts, Pyramidustries\\",\\"11.75, 15.648\\",\\"24.984, 28.984\\",\\"11,238, 20,149\\",\\"Denim dress - black denim, Shorts - black\\",\\"Denim dress - black denim, Shorts - black\\",\\"1, 1\\",\\"ZO0489604896, ZO0185501855\\",\\"0, 0\\",\\"24.984, 28.984\\",\\"24.984, 28.984\\",\\"0, 0\\",\\"ZO0489604896, ZO0185501855\\",\\"53.969\\",\\"53.969\\",2,2,order,mary
-zwMtOW0BH63Xcmy432DJ,ecommerce,1,\\"Women's Shoes, Women's Clothing\\",\\"Women's Shoes, Women's Clothing\\",EUR,Gwen,Gwen,\\"Gwen Butler\\",\\"Gwen Butler\\",FEMALE,26,Butler,Butler,\\"(empty)\\",Sunday,6,\\"gwen@butler-family.zzz\\",\\"Los Angeles\\",\\"North America\\",US,\\"POINT (-118.2 34.1)\\",California,\\"Low Tide Media, Oceanavigations\\",\\"Low Tide Media, Oceanavigations\\",\\"Jul 6, 2019 @ 00:00:00.000\\",584058,\\"sold_product_584058_22794, sold_product_584058_23386\\",\\"sold_product_584058_22794, sold_product_584058_23386\\",\\"100, 100\\",\\"100, 100\\",\\"Women's Shoes, Women's Clothing\\",\\"Women's Shoes, Women's Clothing\\",\\"Dec 25, 2016 @ 00:00:00.000, Dec 25, 2016 @ 00:00:00.000\\",\\"0, 0\\",\\"0, 0\\",\\"Low Tide Media, Oceanavigations\\",\\"Low Tide Media, Oceanavigations\\",\\"46, 54\\",\\"100, 100\\",\\"22,794, 23,386\\",\\"Boots - Midnight Blue, Short coat - white/black\\",\\"Boots - Midnight Blue, Short coat - white/black\\",\\"1, 1\\",\\"ZO0374603746, ZO0272202722\\",\\"0, 0\\",\\"100, 100\\",\\"100, 100\\",\\"0, 0\\",\\"ZO0374603746, ZO0272202722\\",200,200,2,2,order,gwen
-0AMtOW0BH63Xcmy432DJ,ecommerce,1,\\"Women's Shoes, Women's Clothing\\",\\"Women's Shoes, Women's Clothing\\",EUR,Diane,Diane,\\"Diane Chandler\\",\\"Diane Chandler\\",FEMALE,22,Chandler,Chandler,\\"(empty)\\",Sunday,6,\\"diane@chandler-family.zzz\\",\\"-\\",Europe,GB,\\"POINT (-0.1 51.5)\\",\\"-\\",\\"Primemaster, Oceanavigations\\",\\"Primemaster, Oceanavigations\\",\\"Jul 6, 2019 @ 00:00:00.000\\",584093,\\"sold_product_584093_12304, sold_product_584093_19587\\",\\"sold_product_584093_12304, sold_product_584093_19587\\",\\"75, 100\\",\\"75, 100\\",\\"Women's Shoes, Women's Clothing\\",\\"Women's Shoes, Women's Clothing\\",\\"Dec 25, 2016 @ 00:00:00.000, Dec 25, 2016 @ 00:00:00.000\\",\\"0, 0\\",\\"0, 0\\",\\"Primemaster, Oceanavigations\\",\\"Primemaster, Oceanavigations\\",\\"34.5, 47\\",\\"75, 100\\",\\"12,304, 19,587\\",\\"High heeled sandals - argento, Classic coat - black\\",\\"High heeled sandals - argento, Classic coat - black\\",\\"1, 1\\",\\"ZO0360303603, ZO0272002720\\",\\"0, 0\\",\\"75, 100\\",\\"75, 100\\",\\"0, 0\\",\\"ZO0360303603, ZO0272002720\\",175,175,2,2,order,diane
-0QMtOW0BH63Xcmy432DJ,ecommerce,1,\\"Men's Clothing, Men's Accessories\\",\\"Men's Clothing, Men's Accessories\\",EUR,Eddie,Eddie,\\"Eddie Weber\\",\\"Eddie Weber\\",MALE,38,Weber,Weber,\\"(empty)\\",Monday,0,\\"eddie@weber-family.zzz\\",Cairo,Africa,EG,\\"POINT (31.3 30.1)\\",\\"Cairo Governorate\\",Elitelligence,Elitelligence,\\"Jun 30, 2019 @ 00:00:00.000\\",574916,\\"sold_product_574916_11262, sold_product_574916_15713\\",\\"sold_product_574916_11262, sold_product_574916_15713\\",\\"60, 20.984\\",\\"60, 20.984\\",\\"Men's Clothing, Men's Accessories\\",\\"Men's Clothing, Men's Accessories\\",\\"Dec 19, 2016 @ 00:00:00.000, Dec 19, 2016 @ 00:00:00.000\\",\\"0, 0\\",\\"0, 0\\",\\"Elitelligence, Elitelligence\\",\\"Elitelligence, Elitelligence\\",\\"28.203, 10.703\\",\\"60, 20.984\\",\\"11,262, 15,713\\",\\"Winter jacket - black, Watch - green\\",\\"Winter jacket - black, Watch - green\\",\\"1, 1\\",\\"ZO0542505425, ZO0601306013\\",\\"0, 0\\",\\"60, 20.984\\",\\"60, 20.984\\",\\"0, 0\\",\\"ZO0542505425, ZO0601306013\\",81,81,2,2,order,eddie
-"
-`;
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/event_log.ts b/x-pack/test/reporting_api_integration/reporting_and_security/event_log.ts
deleted file mode 100644
index 63317e7644021..0000000000000
--- a/x-pack/test/reporting_api_integration/reporting_and_security/event_log.ts
+++ /dev/null
@@ -1,88 +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 { omit } from 'lodash';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const reportingAPI = getService('reportingAPI');
-  const es = getService('es');
-
-  // FLAKY: https://github.com/elastic/kibana/issues/124649
-  describe.skip('Report generation event logging', () => {
-    before(async () => {
-      await reportingAPI.initEcommerce();
-    });
-
-    after(async () => {
-      await reportingAPI.teardownEcommerce();
-    });
-
-    it('creates a completed action for a PDF report', async () => {
-      const res = await reportingAPI.generateCsv({
-        browserTimezone: 'UTC',
-        title: 'Test-PDF',
-        objectType: 'search',
-        searchSource: {
-          version: true,
-          fields: [{ field: '*', include_unmapped: 'true' }],
-          index: '5193f870-d861-11e9-a311-0fa548c5f953',
-        },
-        columns: [],
-        version: '7.16.0',
-      });
-      expect(res.status).to.eql(200);
-      expect(res.body.path).to.match(/download/);
-
-      const { path } = res.body;
-
-      // wait for the the pending job to complete
-      await reportingAPI.waitForJobToFinish(path);
-
-      const csvFile = await reportingAPI.getCompletedJobOutput(path);
-      expectSnapshot(csvFile).toMatch();
-
-      // search for the raw event log data
-      const events = await es.search<{ event: any; kibana: { reporting: any } }>({
-        index: '.kibana-event-log*',
-        filter_path: 'hits.hits._source.event,hits.hits._source.kibana',
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  must: [
-                    { term: { 'event.provider': 'reporting' } },
-                    { term: { 'event.action': 'execute-complete' } },
-                  ],
-                },
-              },
-            ],
-          },
-        },
-        sort: [{ '@timestamp': { order: 'desc' } }] as unknown as string[],
-        size: 1,
-      });
-
-      // validate the log has the expected fields with expected values
-      const logSource = events.hits.hits[0]._source;
-      expect(omit(logSource?.kibana.reporting, 'id')).to.eql({
-        byteSize: 5943,
-        jobType: 'csv_searchsource',
-      });
-      expect(omit(logSource?.event, ['duration', 'start', 'end'])).to.eql({
-        action: 'execute-complete',
-        kind: 'metrics',
-        outcome: 'success',
-        provider: 'reporting',
-        timezone: 'UTC',
-      });
-    });
-  });
-}
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
index e2f70eed3a508..02a2915fffd60 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
@@ -24,7 +24,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./bwc_existing_indexes'));
     loadTestFile(require.resolve('./security_roles_privileges'));
     loadTestFile(require.resolve('./download_csv_dashboard'));
-    loadTestFile(require.resolve('./event_log'));
     loadTestFile(require.resolve('./generate_csv_discover'));
     loadTestFile(require.resolve('./network_policy'));
     loadTestFile(require.resolve('./spaces'));

From 109a3be015aee0ba005e9881fb95993dc436ee5f Mon Sep 17 00:00:00 2001
From: Miriam <31922082+MiriamAparicio@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:11:54 +0000
Subject: [PATCH 34/85] Remove transaction type filter in errors table
 (#124933)

* delete transaxtion type filter from errors queries

* Remove transaction type filter on errors tableat service overview

* Fix api tests
---
 .../app/error_group_overview/index.tsx        | 25 +++----------------
 .../service_overview_errors_table/index.tsx   |  9 ++-----
 .../errors/__snapshots__/queries.test.ts.snap | 10 --------
 .../get_error_group_detailed_statistics.ts    |  7 ------
 .../get_error_group_main_statistics.ts        |  5 ----
 .../apm/server/routes/errors/queries.test.ts  |  2 --
 .../plugins/apm/server/routes/errors/route.ts | 18 ++-----------
 .../tests/errors/error_group_list.spec.ts     |  1 -
 .../tests/feature_controls.spec.ts            |  2 +-
 .../error_groups_detailed_statistics.spec.ts  |  1 -
 .../error_groups_main_statistics.spec.ts      |  1 -
 .../error_groups/get_error_group_ids.ts       |  1 -
 12 files changed, 9 insertions(+), 73 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
index a6ba3febeb01d..46b963d13e510 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
@@ -46,7 +46,7 @@ const INITIAL_STATE_DETAILED_STATISTICS: ErrorGroupDetailedStatistics = {
 };
 
 export function ErrorGroupOverview() {
-  const { serviceName, transactionType } = useApmServiceContext();
+  const { serviceName } = useApmServiceContext();
 
   const {
     query: {
@@ -82,7 +82,7 @@ export function ErrorGroupOverview() {
         const normalizedSortDirection =
           sortDirection === 'asc' ? 'asc' : 'desc';
 
-        if (start && end && transactionType) {
+        if (start && end) {
           return callApmApi(
             'GET /internal/apm/services/{serviceName}/errors/groups/main_statistics',
             {
@@ -92,7 +92,6 @@ export function ErrorGroupOverview() {
                 },
                 query: {
                   environment,
-                  transactionType,
                   kuery,
                   start,
                   end,
@@ -110,16 +109,7 @@ export function ErrorGroupOverview() {
           });
         }
       },
-      [
-        environment,
-        kuery,
-        serviceName,
-        transactionType,
-        start,
-        end,
-        sortField,
-        sortDirection,
-      ]
+      [environment, kuery, serviceName, start, end, sortField, sortDirection]
     );
 
   const { requestId, errorGroupMainStatistics } = errorGroupListData;
@@ -128,13 +118,7 @@ export function ErrorGroupOverview() {
     data: errorGroupDetailedStatistics = INITIAL_STATE_DETAILED_STATISTICS,
   } = useFetcher(
     (callApmApi) => {
-      if (
-        requestId &&
-        errorGroupMainStatistics.length &&
-        start &&
-        end &&
-        transactionType
-      ) {
+      if (requestId && errorGroupMainStatistics.length && start && end) {
         return callApmApi(
           'GET /internal/apm/services/{serviceName}/errors/groups/detailed_statistics',
           {
@@ -146,7 +130,6 @@ export function ErrorGroupOverview() {
                 start,
                 end,
                 numBuckets: 20,
-                transactionType,
                 groupIds: JSON.stringify(
                   errorGroupMainStatistics.map(({ groupId }) => groupId).sort()
                 ),
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx
index 84f65d4e5feb6..cffc5563d75cd 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx
@@ -15,7 +15,6 @@ import { i18n } from '@kbn/i18n';
 import { orderBy } from 'lodash';
 import React, { useState } from 'react';
 import uuid from 'uuid';
-import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
@@ -62,7 +61,6 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
   const {
     urlParams: { comparisonType, comparisonEnabled },
   } = useLegacyUrlParams();
-  const { transactionType } = useApmServiceContext();
   const [tableOptions, setTableOptions] = useState<{
     pageIndex: number;
     sort: {
@@ -92,7 +90,7 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
 
   const { data = INITIAL_STATE_MAIN_STATISTICS, status } = useFetcher(
     (callApmApi) => {
-      if (!start || !end || !transactionType) {
+      if (!start || !end) {
         return;
       }
       return callApmApi(
@@ -105,7 +103,6 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
               kuery,
               start,
               end,
-              transactionType,
             },
           },
         }
@@ -131,7 +128,6 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
       start,
       end,
       serviceName,
-      transactionType,
       pageIndex,
       direction,
       field,
@@ -148,7 +144,7 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
     data: errorGroupDetailedStatistics = INITIAL_STATE_DETAILED_STATISTICS,
   } = useFetcher(
     (callApmApi) => {
-      if (requestId && items.length && start && end && transactionType) {
+      if (requestId && items.length && start && end) {
         return callApmApi(
           'GET /internal/apm/services/{serviceName}/errors/groups/detailed_statistics',
           {
@@ -160,7 +156,6 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
                 start,
                 end,
                 numBuckets: 20,
-                transactionType,
                 groupIds: JSON.stringify(
                   items.map(({ groupId: groupId }) => groupId).sort()
                 ),
diff --git a/x-pack/plugins/apm/server/routes/errors/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/routes/errors/__snapshots__/queries.test.ts.snap
index 0317009b01f59..dd28f6d1389ee 100644
--- a/x-pack/plugins/apm/server/routes/errors/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/routes/errors/__snapshots__/queries.test.ts.snap
@@ -103,11 +103,6 @@ Object {
               "service.name": "serviceName",
             },
           },
-          Object {
-            "term": Object {
-              "transaction.type": "request",
-            },
-          },
           Object {
             "range": Object {
               "@timestamp": Object {
@@ -176,11 +171,6 @@ Object {
               "service.name": "serviceName",
             },
           },
-          Object {
-            "term": Object {
-              "transaction.type": "request",
-            },
-          },
           Object {
             "range": Object {
               "@timestamp": Object {
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
index 870c307a3f769..9eda5769e7fb8 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
@@ -10,7 +10,6 @@ import { Coordinate } from '../../../../typings/timeseries';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,
-  TRANSACTION_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { rangeQuery, kqlQuery } from '../../../../../observability/server';
@@ -23,7 +22,6 @@ export async function getErrorGroupDetailedStatistics({
   serviceName,
   setup,
   numBuckets,
-  transactionType,
   groupIds,
   environment,
   start,
@@ -33,7 +31,6 @@ export async function getErrorGroupDetailedStatistics({
   serviceName: string;
   setup: Setup;
   numBuckets: number;
-  transactionType: string;
   groupIds: string[];
   environment: string;
   start: number;
@@ -56,7 +53,6 @@ export async function getErrorGroupDetailedStatistics({
             filter: [
               { terms: { [ERROR_GROUP_ID]: groupIds } },
               { term: { [SERVICE_NAME]: serviceName } },
-              { term: { [TRANSACTION_TYPE]: transactionType } },
               ...rangeQuery(start, end),
               ...environmentQuery(environment),
               ...kqlQuery(kuery),
@@ -111,7 +107,6 @@ export async function getErrorGroupPeriods({
   serviceName,
   setup,
   numBuckets,
-  transactionType,
   groupIds,
   environment,
   comparisonStart,
@@ -123,7 +118,6 @@ export async function getErrorGroupPeriods({
   serviceName: string;
   setup: Setup;
   numBuckets: number;
-  transactionType: string;
   groupIds: string[];
   environment: string;
   comparisonStart?: number;
@@ -137,7 +131,6 @@ export async function getErrorGroupPeriods({
     serviceName,
     setup,
     numBuckets,
-    transactionType,
     groupIds,
   };
 
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
index e460991029915..d6b58b197914d 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
@@ -15,7 +15,6 @@ import {
   ERROR_GROUP_ID,
   ERROR_LOG_MESSAGE,
   SERVICE_NAME,
-  TRANSACTION_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { environmentQuery } from '../../../../common/utils/environment_query';
@@ -27,7 +26,6 @@ export async function getErrorGroupMainStatistics({
   serviceName,
   setup,
   environment,
-  transactionType,
   sortField,
   sortDirection = 'desc',
   start,
@@ -37,7 +35,6 @@ export async function getErrorGroupMainStatistics({
   serviceName: string;
   setup: Setup;
   environment: string;
-  transactionType: string;
   sortField?: string;
   sortDirection?: 'asc' | 'desc';
   start: number;
@@ -66,7 +63,6 @@ export async function getErrorGroupMainStatistics({
           bool: {
             filter: [
               { term: { [SERVICE_NAME]: serviceName } },
-              { term: { [TRANSACTION_TYPE]: transactionType } },
               ...rangeQuery(start, end),
               ...environmentQuery(environment),
               ...kqlQuery(kuery),
@@ -82,7 +78,6 @@ export async function getErrorGroupMainStatistics({
             },
             aggs: {
               sample: {
-                // change to top_metrics
                 top_hits: {
                   size: 1,
                   _source: [
diff --git a/x-pack/plugins/apm/server/routes/errors/queries.test.ts b/x-pack/plugins/apm/server/routes/errors/queries.test.ts
index af4a4aef694fc..7cb84db0d7862 100644
--- a/x-pack/plugins/apm/server/routes/errors/queries.test.ts
+++ b/x-pack/plugins/apm/server/routes/errors/queries.test.ts
@@ -42,7 +42,6 @@ describe('error queries', () => {
         sortDirection: 'asc',
         sortField: 'foo',
         serviceName: 'serviceName',
-        transactionType: 'request',
         setup,
         environment: ENVIRONMENT_ALL.value,
         kuery: '',
@@ -60,7 +59,6 @@ describe('error queries', () => {
         sortDirection: 'asc',
         sortField: 'lastSeen',
         serviceName: 'serviceName',
-        transactionType: 'request',
         setup,
         environment: ENVIRONMENT_ALL.value,
         kuery: '',
diff --git a/x-pack/plugins/apm/server/routes/errors/route.ts b/x-pack/plugins/apm/server/routes/errors/route.ts
index f1d1c79b24f18..52a72a70b7d67 100644
--- a/x-pack/plugins/apm/server/routes/errors/route.ts
+++ b/x-pack/plugins/apm/server/routes/errors/route.ts
@@ -35,9 +35,6 @@ const errorsMainStatisticsRoute = createApmServerRoute({
       environmentRt,
       kueryRt,
       rangeRt,
-      t.type({
-        transactionType: t.string,
-      }),
     ]),
   }),
   options: { tags: ['access:apm'] },
@@ -57,21 +54,13 @@ const errorsMainStatisticsRoute = createApmServerRoute({
     const { params } = resources;
     const setup = await setupRequest(resources);
     const { serviceName } = params.path;
-    const {
-      environment,
-      transactionType,
-      kuery,
-      sortField,
-      sortDirection,
-      start,
-      end,
-    } = params.query;
+    const { environment, kuery, sortField, sortDirection, start, end } =
+      params.query;
 
     const errorGroups = await getErrorGroupMainStatistics({
       environment,
       kuery,
       serviceName,
-      transactionType,
       sortField,
       sortDirection,
       setup,
@@ -97,7 +86,6 @@ const errorsDetailedStatisticsRoute = createApmServerRoute({
       comparisonRangeRt,
       t.type({
         numBuckets: toNumberRt,
-        transactionType: t.string,
         groupIds: jsonRt.pipe(t.array(t.string)),
       }),
     ]),
@@ -127,7 +115,6 @@ const errorsDetailedStatisticsRoute = createApmServerRoute({
         environment,
         kuery,
         numBuckets,
-        transactionType,
         groupIds,
         comparisonStart,
         comparisonEnd,
@@ -142,7 +129,6 @@ const errorsDetailedStatisticsRoute = createApmServerRoute({
       serviceName,
       setup,
       numBuckets,
-      transactionType,
       groupIds,
       comparisonStart,
       comparisonEnd,
diff --git a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
index 4820eda1870a0..7ec0380429cb9 100644
--- a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
@@ -38,7 +38,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           start: new Date(start).toISOString(),
           end: new Date(end).toISOString(),
           environment: 'ENVIRONMENT_ALL',
-          transactionType: 'request',
           kuery: '',
           ...overrides?.query,
         },
diff --git a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
index 64e9ce248b455..77b8faf781eb9 100644
--- a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
@@ -44,7 +44,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     {
       // this doubles as a smoke test for the _inspect query parameter
       req: {
-        url: `/internal/apm/services/foo/errors/groups/main_statistics?start=${start}&end=${end}&_inspect=true&environment=ENVIRONMENT_ALL&transactionType=bar&kuery=`,
+        url: `/internal/apm/services/foo/errors/groups/main_statistics?start=${start}&end=${end}&_inspect=true&environment=ENVIRONMENT_ALL&kuery=`,
       },
       expectForbidden: expect403,
       expectResponse: expect200,
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
index 0d5d61ee57297..9d09e7046519b 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
@@ -43,7 +43,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           start: new Date(start).toISOString(),
           end: new Date(end).toISOString(),
           numBuckets: 20,
-          transactionType: 'request',
           groupIds: JSON.stringify(['foo']),
           environment: 'ENVIRONMENT_ALL',
           kuery: '',
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
index d81c3106e4e2e..43df9a5c4ec5e 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
@@ -38,7 +38,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         query: {
           start: new Date(start).toISOString(),
           end: new Date(end).toISOString(),
-          transactionType: 'request',
           environment: 'ENVIRONMENT_ALL',
           kuery: '',
           ...overrides?.query,
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/get_error_group_ids.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/get_error_group_ids.ts
index ae0f552819920..914f6962d9bce 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/get_error_group_ids.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/get_error_group_ids.ts
@@ -27,7 +27,6 @@ export async function getErrorGroupIds({
       query: {
         start: new Date(start).toISOString(),
         end: new Date(end).toISOString(),
-        transactionType: 'request',
         environment: 'ENVIRONMENT_ALL',
         kuery: '',
       },

From 8b5293bd6a7f79cca36b05506b9d793a5b426c5b Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Thu, 10 Feb 2022 03:40:01 -0500
Subject: [PATCH 35/85] [Response Ops][Cases] Fixing Metrics User Actions
 access (#125024)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../cases/server/authorization/index.ts       |   5 +-
 .../tests/common/metrics/get_case_metrics.ts  | 118 +++++++++++++++++-
 2 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/cases/server/authorization/index.ts b/x-pack/plugins/cases/server/authorization/index.ts
index 8347a456f0811..bf37e3530a710 100644
--- a/x-pack/plugins/cases/server/authorization/index.ts
+++ b/x-pack/plugins/cases/server/authorization/index.ts
@@ -58,6 +58,7 @@ const EVENT_TYPES: Record<string, EcsEventType> = {
 const DELETE_COMMENT_OPERATION = 'deleteComment';
 const ACCESS_COMMENT_OPERATION = 'getComment';
 const ACCESS_CASE_OPERATION = 'getCase';
+const ACCESS_USER_ACTION_OPERATION = 'getUserActions';
 
 /**
  * Database constant for ECS category for use for audit logging.
@@ -293,7 +294,7 @@ export const Operations: Record<ReadOperations | WriteOperations, OperationDetai
   },
   [ReadOperations.GetUserActions]: {
     ecsType: EVENT_TYPES.access,
-    name: ReadOperations.GetUserActions,
+    name: ACCESS_USER_ACTION_OPERATION,
     action: 'case_user_actions_get',
     verbs: accessVerbs,
     docType: 'user actions',
@@ -301,7 +302,7 @@ export const Operations: Record<ReadOperations | WriteOperations, OperationDetai
   },
   [ReadOperations.GetUserActionMetrics]: {
     ecsType: EVENT_TYPES.access,
-    name: ReadOperations.GetUserActionMetrics,
+    name: ACCESS_USER_ACTION_OPERATION,
     action: 'case_user_action_get_metrics',
     verbs: accessVerbs,
     docType: 'user actions',
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics.ts
index c874f5dbbfc42..cf1b842db0fe7 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics.ts
@@ -8,13 +8,26 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-import { deleteAllCaseItems, getCaseMetrics } from '../../../../common/lib/utils';
+import { createCase, deleteAllCaseItems, getCaseMetrics } from '../../../../common/lib/utils';
+import {
+  secOnly,
+  obsOnly,
+  globalRead,
+  superUser,
+  secOnlyRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  obsSec,
+} from '../../../../common/lib/authentication/users';
+import { getPostCaseRequest } from '../../../../common/lib/mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
   const es = getService('es');
   const kibanaServer = getService('kibanaServer');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('case metrics', () => {
     describe('closed case from kbn archive', () => {
@@ -95,6 +108,109 @@ export default ({ getService }: FtrProviderContext): void => {
         });
       });
     });
+
+    describe('rbac', () => {
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should retrieve the metrics without getting an authorization error', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        for (const user of [globalRead, superUser, secOnly, secOnlyRead, obsSec, obsSecRead]) {
+          const metrics = await getCaseMetrics({
+            supertest: supertestWithoutAuth,
+            caseId: newCase.id,
+            features: [
+              'lifespan',
+              'alerts.hosts',
+              'alerts.users',
+              'alerts.count',
+              'connectors',
+              'actions.isolateHost',
+            ],
+            auth: { user, space: 'space1' },
+          });
+
+          expect(metrics.alerts).to.eql({
+            count: 0,
+            hosts: { total: 0, values: [] },
+            users: { total: 0, values: [] },
+          });
+          expect(metrics.connectors).to.eql({
+            total: 0,
+          });
+          expect(metrics.actions).to.eql({
+            isolateHost: { isolate: { total: 0 }, unisolate: { total: 0 } },
+          });
+          expect(metrics.lifespan).to.not.eql(undefined);
+        }
+      });
+
+      it('should receive a 403 when attempting to retrieve the metrics when the user does not have access to the owner', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        for (const user of [noKibanaPrivileges, obsOnly, obsOnlyRead]) {
+          await getCaseMetrics({
+            supertest: supertestWithoutAuth,
+            caseId: newCase.id,
+            features: [
+              'lifespan',
+              'alerts.hosts',
+              'alerts.users',
+              'alerts.count',
+              'connectors',
+              'actions.isolateHost',
+            ],
+            expectedHttpCode: 403,
+            auth: { user, space: 'space1' },
+          });
+        }
+      });
+
+      it('should receive a 403 when attempting to retrieve the metrics when the user does not have permissions in the space', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await getCaseMetrics({
+          supertest: supertestWithoutAuth,
+          caseId: newCase.id,
+          features: [
+            'lifespan',
+            'alerts.hosts',
+            'alerts.users',
+            'alerts.count',
+            'connectors',
+            'actions.isolateHost',
+          ],
+          expectedHttpCode: 403,
+          auth: { user: secOnly, space: 'space2' },
+        });
+      });
+    });
   });
 };
 

From 227e4d1c6390e216c19fbd3d4845a6eecf06b0af Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 09:48:22 +0100
Subject: [PATCH 36/85] make locator async (#125112)

---
 src/plugins/visualizations/common/locator.ts  | 62 ++---------------
 .../visualizations/common/locator_location.ts | 68 +++++++++++++++++++
 2 files changed, 73 insertions(+), 57 deletions(-)
 create mode 100644 src/plugins/visualizations/common/locator_location.ts

diff --git a/src/plugins/visualizations/common/locator.ts b/src/plugins/visualizations/common/locator.ts
index a1d15ee5188d3..8e562eedb765a 100644
--- a/src/plugins/visualizations/common/locator.ts
+++ b/src/plugins/visualizations/common/locator.ts
@@ -6,21 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { SerializableRecord, Serializable } from '@kbn/utility-types';
-import { omitBy } from 'lodash';
-import type { ParsedQuery } from 'query-string';
-import { stringify } from 'query-string';
-import rison from 'rison-node';
-import { Filter, isFilterPinned } from '@kbn/es-query';
+import type { SerializableRecord } from '@kbn/utility-types';
+import { Filter } from '@kbn/es-query';
 import type { Query, RefreshInterval, TimeRange } from 'src/plugins/data/common';
 import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
-import { url } from '../../kibana_utils/common';
-import { GLOBAL_STATE_STORAGE_KEY, STATE_STORAGE_KEY, VisualizeConstants } from './constants';
 import type { SavedVisState } from './types';
 
-const removeEmptyKeys = (o: Record<string, Serializable>): Record<string, Serializable> =>
-  omitBy(o, (v) => v == null);
-
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type VisualizeLocatorParams = {
   /**
@@ -83,51 +74,8 @@ export const VISUALIZE_APP_LOCATOR = 'VISUALIZE_APP_LOCATOR';
 export class VisualizeLocatorDefinition implements LocatorDefinition<VisualizeLocatorParams> {
   id = VISUALIZE_APP_LOCATOR;
 
-  public async getLocation({
-    visId,
-    timeRange,
-    filters,
-    refreshInterval,
-    linked,
-    uiState,
-    query,
-    vis,
-    savedSearchId,
-    indexPattern,
-  }: VisualizeLocatorParams) {
-    let path = visId
-      ? `#${VisualizeConstants.EDIT_PATH}/${visId}`
-      : `#${VisualizeConstants.CREATE_PATH}`;
-
-    const urlState: ParsedQuery = {
-      [GLOBAL_STATE_STORAGE_KEY]: rison.encode(
-        removeEmptyKeys({
-          time: timeRange,
-          filters: filters?.filter((f) => isFilterPinned(f)),
-          refreshInterval,
-        })
-      ),
-      [STATE_STORAGE_KEY]: rison.encode(
-        removeEmptyKeys({
-          linked,
-          filters: filters?.filter((f) => !isFilterPinned(f)),
-          uiState,
-          query,
-          vis,
-        })
-      ),
-    };
-
-    path += `?${stringify(url.encodeQuery(urlState), { encode: false, sort: false })}`;
-
-    const otherParams = stringify({ type: vis?.type, savedSearchId, indexPattern });
-
-    if (otherParams) path += `&${otherParams}`;
-
-    return {
-      app: VisualizeConstants.APP_ID,
-      path,
-      state: {},
-    };
+  public async getLocation(params: VisualizeLocatorParams) {
+    const { getLocation } = await import('./locator_location');
+    return getLocation(params);
   }
 }
diff --git a/src/plugins/visualizations/common/locator_location.ts b/src/plugins/visualizations/common/locator_location.ts
new file mode 100644
index 0000000000000..1e6ee3d362d68
--- /dev/null
+++ b/src/plugins/visualizations/common/locator_location.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { Serializable } from '@kbn/utility-types';
+import { omitBy } from 'lodash';
+import type { ParsedQuery } from 'query-string';
+import { stringify } from 'query-string';
+import rison from 'rison-node';
+import { isFilterPinned } from '@kbn/es-query';
+import { url } from '../../kibana_utils/common';
+import { GLOBAL_STATE_STORAGE_KEY, STATE_STORAGE_KEY, VisualizeConstants } from './constants';
+import type { VisualizeLocatorParams } from './locator';
+
+const removeEmptyKeys = (o: Record<string, Serializable>): Record<string, Serializable> =>
+  omitBy(o, (v) => v == null);
+
+export async function getLocation({
+  visId,
+  timeRange,
+  filters,
+  refreshInterval,
+  linked,
+  uiState,
+  query,
+  vis,
+  savedSearchId,
+  indexPattern,
+}: VisualizeLocatorParams) {
+  let path = visId
+    ? `#${VisualizeConstants.EDIT_PATH}/${visId}`
+    : `#${VisualizeConstants.CREATE_PATH}`;
+
+  const urlState: ParsedQuery = {
+    [GLOBAL_STATE_STORAGE_KEY]: rison.encode(
+      removeEmptyKeys({
+        time: timeRange,
+        filters: filters?.filter((f) => isFilterPinned(f)),
+        refreshInterval,
+      })
+    ),
+    [STATE_STORAGE_KEY]: rison.encode(
+      removeEmptyKeys({
+        linked,
+        filters: filters?.filter((f) => !isFilterPinned(f)),
+        uiState,
+        query,
+        vis,
+      })
+    ),
+  };
+
+  path += `?${stringify(url.encodeQuery(urlState), { encode: false, sort: false })}`;
+
+  const otherParams = stringify({ type: vis?.type, savedSearchId, indexPattern });
+
+  if (otherParams) path += `&${otherParams}`;
+
+  return {
+    app: VisualizeConstants.APP_ID,
+    path,
+    state: {},
+  };
+}

From 157f8e1bbb833bda906a155d1ba12922d2c12274 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 09:49:37 +0100
Subject: [PATCH 37/85] remove legacy import (#125119)

---
 .../vis_types/vega/public/vega_view/vega_base_view.js  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
index a87c8318e319c..23856950e3405 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
@@ -15,8 +15,8 @@ import { version as vegaLiteVersion } from 'vega-lite';
 import { Utils } from '../data_model/utils';
 import { euiPaletteColorBlind } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { buildQueryFilter, compareFilters } from '@kbn/es-query';
 import { TooltipHandler } from './vega_tooltip';
-import { esFilters } from '../../../../data/public';
 
 import { getEnableExternalUrls, getData } from '../services';
 import { extractIndexPatternsFromSpec } from '../lib/extract_index_pattern';
@@ -344,7 +344,7 @@ export class VegaBaseView {
    */
   async addFilterHandler(query, index, alias) {
     const indexId = await this.findIndex(index);
-    const filter = esFilters.buildQueryFilter(query, indexId, alias);
+    const filter = buildQueryFilter(query, indexId, alias);
 
     this._fireEvent({ name: 'applyFilter', data: { filters: [filter] } });
   }
@@ -355,12 +355,10 @@ export class VegaBaseView {
    */
   async removeFilterHandler(query, index) {
     const indexId = await this.findIndex(index);
-    const filterToRemove = esFilters.buildQueryFilter(query, indexId);
+    const filterToRemove = buildQueryFilter(query, indexId);
 
     const currentFilters = this._filterManager.getFilters();
-    const existingFilter = currentFilters.find((filter) =>
-      esFilters.compareFilters(filter, filterToRemove)
-    );
+    const existingFilter = currentFilters.find((filter) => compareFilters(filter, filterToRemove));
 
     if (!existingFilter) return;
 

From e93a651c1d7f7c0923a01ed41be87d6daf5abd4e Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 10 Feb 2022 09:54:10 +0100
Subject: [PATCH 38/85] [Uptime monitor management] Add full screen/copy button
 ability in browser inline script editing (#124500)

---
 .../__snapshots__/code_editor.test.tsx.snap   |  76 +++----
 .../public/code_editor/code_editor.tsx        | 204 +++++++++++++++---
 .../public/code_editor/editor.scss            |  17 ++
 .../components/fleet_package/code_editor.tsx  |   2 +
 4 files changed, 228 insertions(+), 71 deletions(-)

diff --git a/src/plugins/kibana_react/public/code_editor/__snapshots__/code_editor.test.tsx.snap b/src/plugins/kibana_react/public/code_editor/__snapshots__/code_editor.test.tsx.snap
index b05abbcece0b9..9a4511f8b03f5 100644
--- a/src/plugins/kibana_react/public/code_editor/__snapshots__/code_editor.test.tsx.snap
+++ b/src/plugins/kibana_react/public/code_editor/__snapshots__/code_editor.test.tsx.snap
@@ -126,6 +126,7 @@ exports[`<CodeEditor /> is rendered 1`] = `
 >
   <div
     className="kibanaCodeEditor"
+    onKeyDown={[Function]}
   >
     <EuiToolTip
       content={
@@ -181,47 +182,50 @@ exports[`<CodeEditor /> is rendered 1`] = `
         />
       </span>
     </EuiToolTip>
-    <mockMonacoEditor
-      editorDidMount={[Function]}
-      editorWillMount={[Function]}
-      height={250}
-      language="loglang"
-      onChange={[Function]}
-      options={
-        Object {
-          "fontFamily": "Roboto Mono",
-          "fontSize": 12,
-          "lineHeight": 21,
-          "matchBrackets": "never",
-          "minimap": Object {
-            "enabled": false,
-          },
-          "renderLineHighlight": "none",
-          "scrollBeyondLastLine": false,
-          "scrollbar": Object {
-            "alwaysConsumeMouseWheel": false,
-            "useShadows": false,
-          },
-          "wordBasedSuggestions": false,
-          "wordWrap": "on",
-          "wrappingIndent": "indent",
+    <Component>
+      <mockMonacoEditor
+        editorDidMount={[Function]}
+        editorWillMount={[Function]}
+        height={250}
+        language="loglang"
+        onChange={[Function]}
+        options={
+          Object {
+            "fontFamily": "Roboto Mono",
+            "fontSize": 12,
+            "lineHeight": 21,
+            "matchBrackets": "never",
+            "minimap": Object {
+              "enabled": false,
+            },
+            "padding": Object {},
+            "renderLineHighlight": "none",
+            "scrollBeyondLastLine": false,
+            "scrollbar": Object {
+              "alwaysConsumeMouseWheel": false,
+              "useShadows": false,
+            },
+            "wordBasedSuggestions": false,
+            "wordWrap": "on",
+            "wrappingIndent": "indent",
+          }
         }
-      }
-      theme="euiColors"
-      value="
+        theme="euiColors"
+        value="
 [Sun Mar 7 20:54:27 2004] [notice] [client xx.xx.xx.xx] This is a notice!
 [Sun Mar 7 20:58:27 2004] [info] [client xx.xx.xx.xx] (104)Connection reset by peer: client stopped connection before send body completed
 [Sun Mar 7 21:16:17 2004] [error] [client xx.xx.xx.xx] File does not exist: /home/httpd/twiki/view/Main/WebHome
 "
-    >
-      <div>
-        <div />
-        <textarea
-          data-test-subj="monacoEditorTextarea"
-          onKeyDown={[Function]}
-        />
-      </div>
-    </mockMonacoEditor>
+      >
+        <div>
+          <div />
+          <textarea
+            data-test-subj="monacoEditorTextarea"
+            onKeyDown={[Function]}
+          />
+        </div>
+      </mockMonacoEditor>
+    </Component>
     <ResizeDetector
       handleHeight={true}
       handleWidth={true}
diff --git a/src/plugins/kibana_react/public/code_editor/code_editor.tsx b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
index a8df56981f5d5..500aefc82d601 100644
--- a/src/plugins/kibana_react/public/code_editor/code_editor.tsx
+++ b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
@@ -6,10 +6,21 @@
  * Side Public License, v 1.
  */
 
-import React, { useState, useRef, useCallback, useMemo, useEffect } from 'react';
+import React, { useState, useRef, useCallback, useMemo, useEffect, KeyboardEvent } from 'react';
 import ReactResizeDetector from 'react-resize-detector';
 import ReactMonacoEditor from 'react-monaco-editor';
-import { htmlIdGenerator, EuiToolTip, keys } from '@elastic/eui';
+import {
+  htmlIdGenerator,
+  EuiToolTip,
+  keys,
+  EuiButtonIcon,
+  EuiOverlayMask,
+  EuiI18n,
+  EuiFocusTrap,
+  EuiCopy,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
 import { monaco } from '@kbn/monaco';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -114,6 +125,9 @@ export interface Props {
    * Accessible name for the editor. (Defaults to "Code editor")
    */
   'aria-label'?: string;
+
+  isCopyable?: boolean;
+  allowFullScreen?: boolean;
 }
 
 export const CodeEditor: React.FC<Props> = ({
@@ -136,6 +150,8 @@ export const CodeEditor: React.FC<Props> = ({
   'aria-label': ariaLabel = i18n.translate('kibana-react.kibanaCodeEditor.ariaLabel', {
     defaultMessage: 'Code Editor',
   }),
+  isCopyable = false,
+  allowFullScreen = false,
 }) => {
   // We need to be able to mock the MonacoEditor in our test in order to not test implementation
   // detail and not have to call methods on the <CodeEditor /> component instance.
@@ -147,6 +163,11 @@ export const CodeEditor: React.FC<Props> = ({
       : ReactMonacoEditor;
   }, []);
 
+  const { FullScreenDisplay, FullScreenButton, isFullScreen, setIsFullScreen, onKeyDown } =
+    useFullScreen({
+      allowFullScreen,
+    });
+
   const isReadOnly = options?.readOnly ?? false;
 
   const _editor = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
@@ -197,6 +218,7 @@ export const CodeEditor: React.FC<Props> = ({
           stopEditing();
           editorHint.current?.focus();
         }
+        setIsFullScreen(false);
       }
     },
     [stopEditing]
@@ -396,42 +418,59 @@ export const CodeEditor: React.FC<Props> = ({
     };
   }, [placeholder, value]);
 
+  const { CopyButton } = useCopy({ isCopyable, value });
+
   return (
-    <div className="kibanaCodeEditor">
+    <div className="kibanaCodeEditor" onKeyDown={onKeyDown}>
       {renderPrompt()}
 
-      <MonacoEditor
-        theme={transparentBackground ? 'euiColorsTransparent' : 'euiColors'}
-        language={languageId}
-        value={value}
-        onChange={onChange}
-        width={width}
-        height={height}
-        editorWillMount={_editorWillMount}
-        editorDidMount={_editorDidMount}
-        options={{
-          renderLineHighlight: 'none',
-          scrollBeyondLastLine: false,
-          minimap: {
-            enabled: false,
-          },
-          scrollbar: {
-            useShadows: false,
-            // Scroll events are handled only when there is scrollable content. When there is scrollable content, the
-            // editor should scroll to the bottom then break out of that scroll context and continue scrolling on any
-            // outer scrollbars.
-            alwaysConsumeMouseWheel: false,
-          },
-          wordBasedSuggestions: false,
-          wordWrap: 'on',
-          wrappingIndent: 'indent',
-          matchBrackets: 'never',
-          fontFamily: 'Roboto Mono',
-          fontSize: 12,
-          lineHeight: 21,
-          ...options,
-        }}
-      />
+      <FullScreenDisplay>
+        {allowFullScreen || isCopyable ? (
+          <div className="kibanaCodeEditor__controls">
+            <EuiFlexGroup gutterSize="xs">
+              <EuiFlexItem>
+                <CopyButton />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <FullScreenButton />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </div>
+        ) : null}
+        <MonacoEditor
+          theme={transparentBackground ? 'euiColorsTransparent' : 'euiColors'}
+          language={languageId}
+          value={value}
+          onChange={onChange}
+          width={isFullScreen ? '100vw' : width}
+          height={isFullScreen ? '100vh' : height}
+          editorWillMount={_editorWillMount}
+          editorDidMount={_editorDidMount}
+          options={{
+            padding: allowFullScreen || isCopyable ? { top: 24 } : {},
+            renderLineHighlight: 'none',
+            scrollBeyondLastLine: false,
+            minimap: {
+              enabled: false,
+            },
+            scrollbar: {
+              useShadows: false,
+              // Scroll events are handled only when there is scrollable content. When there is scrollable content, the
+              // editor should scroll to the bottom then break out of that scroll context and continue scrolling on any
+              // outer scrollbars.
+              alwaysConsumeMouseWheel: false,
+            },
+            wordBasedSuggestions: false,
+            wordWrap: 'on',
+            wrappingIndent: 'indent',
+            matchBrackets: 'never',
+            fontFamily: 'Roboto Mono',
+            fontSize: isFullScreen ? 16 : 12,
+            lineHeight: isFullScreen ? 24 : 21,
+            ...options,
+          }}
+        />
+      </FullScreenDisplay>
       <ReactResizeDetector
         handleWidth
         handleHeight
@@ -442,6 +481,101 @@ export const CodeEditor: React.FC<Props> = ({
   );
 };
 
+/**
+ * Fullscreen logic
+ */
+
+const useFullScreen = ({ allowFullScreen }: { allowFullScreen?: boolean }) => {
+  const [isFullScreen, setIsFullScreen] = useState(false);
+
+  const toggleFullScreen = () => {
+    setIsFullScreen(!isFullScreen);
+  };
+
+  const onKeyDown = useCallback((event: KeyboardEvent<HTMLElement>) => {
+    if (event.key === keys.ESCAPE) {
+      event.preventDefault();
+      event.stopPropagation();
+      setIsFullScreen(false);
+    }
+  }, []);
+
+  const FullScreenButton: React.FC = () => {
+    if (!allowFullScreen) return null;
+    return (
+      <EuiI18n
+        tokens={['euiCodeBlock.fullscreenCollapse', 'euiCodeBlock.fullscreenExpand']}
+        defaults={['Collapse', 'Expand']}
+      >
+        {([fullscreenCollapse, fullscreenExpand]: string[]) => (
+          <EuiButtonIcon
+            className="euiCodeBlock__fullScreenButton"
+            onClick={toggleFullScreen}
+            iconType={isFullScreen ? 'fullScreenExit' : 'fullScreen'}
+            color="text"
+            aria-label={isFullScreen ? fullscreenCollapse : fullscreenExpand}
+            size="xs"
+          />
+        )}
+      </EuiI18n>
+    );
+  };
+
+  const FullScreenDisplay = useMemo(
+    () =>
+      ({ children }: { children: Array<JSX.Element | null> | JSX.Element }) => {
+        if (!isFullScreen) return <>{children}</>;
+
+        return (
+          <EuiOverlayMask>
+            <EuiFocusTrap clickOutsideDisables={true}>
+              <div className={'kibanaCodeEditor__isFullScreen'}>{children}</div>
+            </EuiFocusTrap>
+          </EuiOverlayMask>
+        );
+      },
+    [isFullScreen]
+  );
+
+  return {
+    FullScreenButton,
+    FullScreenDisplay,
+    onKeyDown,
+    isFullScreen,
+    setIsFullScreen,
+  };
+};
+
+const useCopy = ({ isCopyable, value }: { isCopyable: boolean; value: string }) => {
+  const showCopyButton = isCopyable && value;
+
+  const CopyButton = () => {
+    if (!showCopyButton) return null;
+
+    return (
+      <div className="euiCodeBlock__copyButton">
+        <EuiI18n token="euiCodeBlock.copyButton" default="Copy">
+          {(copyButton: string) => (
+            <EuiCopy textToCopy={value}>
+              {(copy) => (
+                <EuiButtonIcon
+                  onClick={copy}
+                  iconType="copyClipboard"
+                  color="text"
+                  aria-label={copyButton}
+                  size="xs"
+                />
+              )}
+            </EuiCopy>
+          )}
+        </EuiI18n>
+      </div>
+    );
+  };
+
+  return { showCopyButton, CopyButton };
+};
+
 // React.lazy requires default export
 // eslint-disable-next-line import/no-default-export
 export default CodeEditor;
diff --git a/src/plugins/kibana_react/public/code_editor/editor.scss b/src/plugins/kibana_react/public/code_editor/editor.scss
index 584522f7a7eba..ac98b200d8b17 100644
--- a/src/plugins/kibana_react/public/code_editor/editor.scss
+++ b/src/plugins/kibana_react/public/code_editor/editor.scss
@@ -27,4 +27,21 @@
       display: none;
     }
   }
+
+  &__controls {
+    top: $euiSizeXS;
+    right: $euiSize;
+    position: absolute;
+    z-index: 1000
+  }
+
+  &__isFullScreen {
+    position: absolute;
+    left: 0;
+    top: 0;
+    .kibanaCodeEditor__controls {
+      top: $euiSizeL;
+      right: $euiSizeL;
+    }
+  }
 }
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx b/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
index d2fe3f9b30e84..3f80b5f9f365e 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
@@ -38,6 +38,8 @@ export const CodeEditor = ({ ariaLabel, id, languageId, onChange, value }: Props
           options={{
             renderValidationDecorations: value ? 'on' : 'off',
           }}
+          isCopyable={true}
+          allowFullScreen={true}
         />
       </div>
     </CodeEditorContainer>

From 4d2bd607eb251bec181573819e0bd3fcd01347cb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 10:08:49 +0100
Subject: [PATCH 39/85] Update dependency elastic-apm-node to ^3.28.0 (#125179)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package.json |  2 +-
 yarn.lock    | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 978186d22386d..d0f659ffec9f7 100644
--- a/package.json
+++ b/package.json
@@ -232,7 +232,7 @@
     "deep-freeze-strict": "^1.1.1",
     "deepmerge": "^4.2.2",
     "del": "^5.1.0",
-    "elastic-apm-node": "^3.27.0",
+    "elastic-apm-node": "^3.28.0",
     "execa": "^4.0.2",
     "exit-hook": "^2.2.0",
     "expiry-js": "0.1.7",
diff --git a/yarn.lock b/yarn.lock
index cc10bb8f012f5..7b29962a36107 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13543,10 +13543,10 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.6.1"
 
-elastic-apm-http-client@^10.3.0:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-10.3.0.tgz#12b95dc190a755cd1a8ce2c296cd28ef50f16aa4"
-  integrity sha512-BAqB7k5JA/x09L8BVj04WRoknRptmW2rLAoHQVrPvPhUm/IgNz63wPfiBuhWVE//Hl7xEpURO5pMV6az0UArkA==
+elastic-apm-http-client@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-10.4.0.tgz#e466aaf04ef8beda22d9922fbf3543158f1ffb8a"
+  integrity sha512-mH3Cn61ICbj/rxhILAQ0NHQNmzD+kLBGyXklC0wSqIaiJs56yhCNgtXQZ3ajYxzrYW9Ox1QI4NVg3Gezg7nTCg==
   dependencies:
     breadth-filter "^2.0.0"
     container-info "^1.0.1"
@@ -13555,12 +13555,13 @@ elastic-apm-http-client@^10.3.0:
     fast-stream-to-buffer "^1.0.0"
     object-filter-sequence "^1.0.0"
     readable-stream "^3.4.0"
+    semver "^6.3.0"
     stream-chopper "^3.0.1"
 
-elastic-apm-node@^3.27.0:
-  version "3.27.0"
-  resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.27.0.tgz#0de441e36519e7384e66f6d420ec9a00a2669a1a"
-  integrity sha512-x8rWjGBgwKYcYN9IQWUv3dzq88RxEVnVIC6KMXQpFkRBG6XtWG4FeMvLaDSeTdXVnDBKTDVGCF9np5HdGhYbBw==
+elastic-apm-node@^3.28.0:
+  version "3.28.0"
+  resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.28.0.tgz#74bb0278a711549a45bd8c8b561c23e02e5865e3"
+  integrity sha512-6P6IAiozEIUDCZGMQ/Lul1c7a10p5uSIIYISxXd7ms+470fvTOL2pKDfE8ygeXyCvvzwjbvuTQC4y4PWKhj8rg==
   dependencies:
     "@elastic/ecs-pino-format" "^1.2.0"
     after-all-results "^2.0.0"
@@ -13569,7 +13570,7 @@ elastic-apm-node@^3.27.0:
     basic-auth "^2.0.1"
     cookie "^0.4.0"
     core-util-is "^1.0.2"
-    elastic-apm-http-client "^10.3.0"
+    elastic-apm-http-client "^10.4.0"
     end-of-stream "^1.4.4"
     error-callsites "^2.0.4"
     error-stack-parser "^2.0.6"

From 05f187aae2477c9a5e71f025edfa6329c38c7485 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Thu, 10 Feb 2022 10:26:22 +0100
Subject: [PATCH 40/85] [Cases] Refactor timeline and cases add alert to new
 case. Move postComment inside cases (#124831)

---
 .../create/flyout/create_case_flyout.test.tsx |  20 +-
 .../create/flyout/create_case_flyout.tsx      |  63 +++---
 .../public/components/create/form.test.tsx    |   6 +-
 .../cases/public/components/create/form.tsx   |  24 ++-
 .../components/create/form_context.test.tsx   | 198 ++++++++++++------
 .../public/components/create/form_context.tsx |  23 +-
 .../public/methods/get_create_case_flyout.tsx |   2 +
 .../timeline/cases/add_to_case_action.tsx     |  43 +++-
 .../timeline/cases/add_to_new_case_button.tsx |   1 +
 .../timelines/public/hooks/use_add_to_case.ts |  53 +----
 10 files changed, 263 insertions(+), 170 deletions(-)

diff --git a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.test.tsx b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.test.tsx
index 87a409fba9a0f..325fffb460ee0 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.test.tsx
@@ -6,11 +6,11 @@
  */
 
 import React from 'react';
-import { act, render } from '@testing-library/react';
+import { act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { CreateCaseFlyout } from './create_case_flyout';
-import { TestProviders } from '../../../common/mock';
+import { AppMockRenderer, createAppMockRenderer } from '../../../common/mock';
 
 jest.mock('../../../common/lib/kibana');
 
@@ -23,27 +23,21 @@ const defaultProps = {
 };
 
 describe('CreateCaseFlyout', () => {
+  let mockedContext: AppMockRenderer;
   beforeEach(() => {
+    mockedContext = createAppMockRenderer();
     jest.clearAllMocks();
   });
 
   it('renders', async () => {
-    const { getByTestId } = render(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
+    const { getByTestId } = mockedContext.render(<CreateCaseFlyout {...defaultProps} />);
     await act(async () => {
       expect(getByTestId('create-case-flyout')).toBeTruthy();
     });
   });
 
-  it('Closing flyout calls onCloseCaseModal', async () => {
-    const { getByTestId } = render(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
+  it('should call onCloseCaseModal when closing the flyout', async () => {
+    const { getByTestId } = mockedContext.render(<CreateCaseFlyout {...defaultProps} />);
     await act(async () => {
       userEvent.click(getByTestId('euiFlyoutCloseButton'));
     });
diff --git a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
index 143a2f0bf03cd..0097df1587a73 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
@@ -11,12 +11,14 @@ import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eu
 
 import * as i18n from '../translations';
 import { Case } from '../../../../common/ui/types';
-import { CreateCaseForm } from '../form';
+import { CreateCaseForm, CreateCaseAttachment } from '../form';
+import { UsePostComment } from '../../../containers/use_post_comment';
 
 export interface CreateCaseFlyoutProps {
-  afterCaseCreated?: (theCase: Case) => Promise<void>;
+  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
   onClose: () => void;
   onSuccess: (theCase: Case) => Promise<void>;
+  attachments?: CreateCaseAttachment;
 }
 
 const StyledFlyout = styled(EuiFlyout)`
@@ -63,33 +65,36 @@ const FormWrapper = styled.div`
 `;
 
 export const CreateCaseFlyout = React.memo<CreateCaseFlyoutProps>(
-  ({ afterCaseCreated, onClose, onSuccess }) => (
-    <>
-      <GlobalStyle />
-      <StyledFlyout
-        onClose={onClose}
-        data-test-subj="create-case-flyout"
-        // maskProps is needed in order to apply the z-index to the parent overlay element, not to the flyout only
-        maskProps={{ className: maskOverlayClassName }}
-      >
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            <h2>{i18n.CREATE_CASE_TITLE}</h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <StyledEuiFlyoutBody>
-          <FormWrapper>
-            <CreateCaseForm
-              afterCaseCreated={afterCaseCreated}
-              onCancel={onClose}
-              onSuccess={onSuccess}
-              withSteps={false}
-            />
-          </FormWrapper>
-        </StyledEuiFlyoutBody>
-      </StyledFlyout>
-    </>
-  )
+  ({ afterCaseCreated, onClose, onSuccess, attachments }) => {
+    return (
+      <>
+        <GlobalStyle />
+        <StyledFlyout
+          onClose={onClose}
+          data-test-subj="create-case-flyout"
+          // maskProps is needed in order to apply the z-index to the parent overlay element, not to the flyout only
+          maskProps={{ className: maskOverlayClassName }}
+        >
+          <EuiFlyoutHeader hasBorder>
+            <EuiTitle size="m">
+              <h2>{i18n.CREATE_CASE_TITLE}</h2>
+            </EuiTitle>
+          </EuiFlyoutHeader>
+          <StyledEuiFlyoutBody>
+            <FormWrapper>
+              <CreateCaseForm
+                afterCaseCreated={afterCaseCreated}
+                attachments={attachments}
+                onCancel={onClose}
+                onSuccess={onSuccess}
+                withSteps={false}
+              />
+            </FormWrapper>
+          </StyledEuiFlyoutBody>
+        </StyledFlyout>
+      </>
+    );
+  }
 );
 
 CreateCaseFlyout.displayName = 'CreateCaseFlyout';
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 dd0759ce723ae..c073e9190b495 100644
--- a/x-pack/plugins/cases/public/components/create/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.test.tsx
@@ -74,7 +74,7 @@ describe('CreateCaseForm', () => {
     useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
   });
 
-  it('it renders with steps', async () => {
+  it('renders with steps', async () => {
     const wrapper = mount(
       <MockHookWrapperComponent>
         <CreateCaseForm {...casesFormProps} />
@@ -84,7 +84,7 @@ describe('CreateCaseForm', () => {
     expect(wrapper.find(`[data-test-subj="case-creation-form-steps"]`).exists()).toBeTruthy();
   });
 
-  it('it renders without steps', async () => {
+  it('renders without steps', async () => {
     const wrapper = mount(
       <MockHookWrapperComponent>
         <CreateCaseForm {...casesFormProps} withSteps={false} />
@@ -94,7 +94,7 @@ describe('CreateCaseForm', () => {
     expect(wrapper.find(`[data-test-subj="case-creation-form-steps"]`).exists()).toBeFalsy();
   });
 
-  it('it renders all form fields except case selection', async () => {
+  it('renders all form fields except case selection', async () => {
     const wrapper = mount(
       <MockHookWrapperComponent>
         <CreateCaseForm {...casesFormProps} />
diff --git a/x-pack/plugins/cases/public/components/create/form.tsx b/x-pack/plugins/cases/public/components/create/form.tsx
index 506bfdd974b47..c4784f9a891b1 100644
--- a/x-pack/plugins/cases/public/components/create/form.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.tsx
@@ -23,7 +23,11 @@ import { Tags } from './tags';
 import { Connector } from './connector';
 import * as i18n from './translations';
 import { SyncAlertsToggle } from './sync_alerts_toggle';
-import { ActionConnector } from '../../../common/api';
+import {
+  ActionConnector,
+  CommentRequestUserType,
+  CommentRequestAlertType,
+} from '../../../common/api';
 import { Case } from '../../containers/types';
 import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../timeline_context';
 import { InsertTimeline } from '../insert_timeline';
@@ -51,6 +55,8 @@ const MySpinner = styled(EuiLoadingSpinner)`
   left: 50%;
   z-index: 99;
 `;
+export type SupportedCreateCaseAttachment = CommentRequestAlertType | CommentRequestUserType;
+export type CreateCaseAttachment = SupportedCreateCaseAttachment[];
 
 export interface CreateCaseFormFieldsProps {
   connectors: ActionConnector[];
@@ -62,6 +68,7 @@ export interface CreateCaseFormProps extends Pick<Partial<CreateCaseFormFieldsPr
   onSuccess: (theCase: Case) => Promise<void>;
   afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
   timelineIntegration?: CasesTimelineIntegration;
+  attachments?: CreateCaseAttachment;
 }
 
 const empty: ActionConnector[] = [];
@@ -157,9 +164,20 @@ export const CreateCaseFormFields: React.FC<CreateCaseFormFieldsProps> = React.m
 CreateCaseFormFields.displayName = 'CreateCaseFormFields';
 
 export const CreateCaseForm: React.FC<CreateCaseFormProps> = React.memo(
-  ({ withSteps = true, afterCaseCreated, onCancel, onSuccess, timelineIntegration }) => (
+  ({
+    withSteps = true,
+    afterCaseCreated,
+    onCancel,
+    onSuccess,
+    timelineIntegration,
+    attachments,
+  }) => (
     <CasesTimelineIntegrationProvider timelineIntegration={timelineIntegration}>
-      <FormContext afterCaseCreated={afterCaseCreated} onSuccess={onSuccess}>
+      <FormContext
+        afterCaseCreated={afterCaseCreated}
+        onSuccess={onSuccess}
+        attachments={attachments}
+      >
         <CreateCaseFormFields
           connectors={empty}
           isLoadingConnectors={false}
diff --git a/x-pack/plugins/cases/public/components/create/form_context.test.tsx b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
index f9c75121a521a..a6f176a4c929f 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
-import { act, waitFor } from '@testing-library/react';
+import { act, RenderResult, waitFor, within } from '@testing-library/react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { ConnectorTypes } from '../../../common/api';
+import { CommentType, ConnectorTypes } from '../../../common/api';
 import { useKibana } from '../../common/lib/kibana';
-import { TestProviders } from '../../common/mock';
+import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
 import { usePostCase } from '../../containers/use_post_case';
 import { usePostComment } from '../../containers/use_post_comment';
 import { useGetTags } from '../../containers/use_get_tags';
@@ -40,6 +40,7 @@ import { CreateCaseFormFields, CreateCaseFormFieldsProps } from './form';
 import { SubmitCaseButton } from './submit_button';
 import { usePostPushToService } from '../../containers/use_post_push_to_service';
 import { Choice } from '../connectors/servicenow/types';
+import userEvent from '@testing-library/user-event';
 
 const sampleId = 'case-id';
 
@@ -110,12 +111,30 @@ const fillForm = (wrapper: ReactWrapper) => {
   });
 };
 
+const fillFormReactTestingLib = async (renderResult: RenderResult) => {
+  const titleInput = within(renderResult.getByTestId('caseTitle')).getByTestId('input');
+  userEvent.type(titleInput, sampleData.title);
+
+  const descriptionInput = renderResult.container.querySelector(
+    `[data-test-subj="caseDescription"] textarea`
+  );
+  if (descriptionInput) {
+    userEvent.type(descriptionInput, sampleData.description);
+  }
+  const caseTags = renderResult.getByTestId('caseTags');
+  for (let i = 0; i < sampleTags.length; i++) {
+    const tagsInput = await within(caseTags).findByTestId('comboBoxInput');
+    userEvent.type(tagsInput, `${sampleTags[i]}{enter}`);
+  }
+};
+
 describe('Create case', () => {
   const fetchTags = jest.fn();
   const onFormSubmitSuccess = jest.fn();
   const afterCaseCreated = jest.fn();
   const postComment = jest.fn();
   let onChoicesSuccess: (values: Choice[]) => void;
+  let mockedContext: AppMockRenderer;
 
   beforeAll(() => {
     postCase.mockResolvedValue({
@@ -149,29 +168,23 @@ describe('Create case', () => {
   });
 
   beforeEach(() => {
+    mockedContext = createAppMockRenderer();
     jest.clearAllMocks();
   });
 
   describe('Step 1 - Case Fields', () => {
-    it('it renders', async () => {
-      const wrapper = mount(
-        <TestProviders>
-          <FormContext onSuccess={onFormSubmitSuccess}>
-            <CreateCaseFormFields {...defaultCreateCaseForm} />
-            <SubmitCaseButton />
-          </FormContext>
-        </TestProviders>
+    it('renders correctly', async () => {
+      const renderResult = mockedContext.render(
+        <FormContext onSuccess={onFormSubmitSuccess}>
+          <CreateCaseFormFields {...defaultCreateCaseForm} />
+          <SubmitCaseButton />
+        </FormContext>
       );
-      await act(async () => {
-        wrapper.update();
-      });
-      expect(wrapper.find(`[data-test-subj="caseTitle"]`).first().exists()).toBeTruthy();
-      expect(wrapper.find(`[data-test-subj="caseDescription"]`).first().exists()).toBeTruthy();
-      expect(wrapper.find(`[data-test-subj="caseTags"]`).first().exists()).toBeTruthy();
-      expect(wrapper.find(`[data-test-subj="caseConnectors"]`).first().exists()).toBeTruthy();
-      expect(
-        wrapper.find(`[data-test-subj="case-creation-form-steps"]`).first().exists()
-      ).toBeTruthy();
+      expect(renderResult.getByTestId('caseTitle')).toBeTruthy();
+      expect(renderResult.getByTestId('caseDescription')).toBeTruthy();
+      expect(renderResult.getByTestId('caseTags')).toBeTruthy();
+      expect(renderResult.getByTestId('caseConnectors')).toBeTruthy();
+      expect(renderResult.getByTestId('case-creation-form-steps')).toBeTruthy();
     });
 
     it('should post case on submit click', async () => {
@@ -180,21 +193,21 @@ describe('Create case', () => {
         connectors: connectorsMock,
       });
 
-      const wrapper = mount(
-        <TestProviders>
-          <FormContext onSuccess={onFormSubmitSuccess}>
-            <CreateCaseFormFields {...defaultCreateCaseForm} />
-            <SubmitCaseButton />
-          </FormContext>
-        </TestProviders>
+      const renderResult = mockedContext.render(
+        <FormContext onSuccess={onFormSubmitSuccess}>
+          <CreateCaseFormFields {...defaultCreateCaseForm} />
+          <SubmitCaseButton />
+        </FormContext>
       );
 
-      fillForm(wrapper);
-      wrapper.find(`[data-test-subj="create-case-submit"]`).first().simulate('click');
-      await waitFor(() => expect(postCase).toBeCalledWith(sampleData));
+      await fillFormReactTestingLib(renderResult);
+      userEvent.click(renderResult.getByTestId('create-case-submit'));
+      await waitFor(() => {
+        expect(postCase).toBeCalledWith(sampleData);
+      });
     });
 
-    it('it does not submits the title when the length is longer than 64 characters', async () => {
+    it('does not submits the title when the length is longer than 64 characters', async () => {
       const longTitle =
         'This is a title that should not be saved as it is longer than 64 characters.';
 
@@ -271,7 +284,7 @@ describe('Create case', () => {
       );
     });
 
-    it('it should select the default connector set in the configuration', async () => {
+    it('should select the default connector set in the configuration', async () => {
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         connector: {
@@ -321,7 +334,7 @@ describe('Create case', () => {
       );
     });
 
-    it('it should default to none if the default connector does not exist in connectors', async () => {
+    it('should default to none if the default connector does not exist in connectors', async () => {
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         connector: {
@@ -357,7 +370,7 @@ describe('Create case', () => {
   });
 
   describe('Step 2 - Connector Fields', () => {
-    it(`it should submit and push to Jira connector`, async () => {
+    it(`should submit and push to Jira connector`, async () => {
       useConnectorsMock.mockReturnValue({
         ...sampleConnectorData,
         connectors: connectorsMock,
@@ -424,7 +437,7 @@ describe('Create case', () => {
       });
     });
 
-    it(`it should submit and push to resilient connector`, async () => {
+    it(`should submit and push to resilient connector`, async () => {
       useConnectorsMock.mockReturnValue({
         ...sampleConnectorData,
         connectors: connectorsMock,
@@ -494,7 +507,7 @@ describe('Create case', () => {
       });
     });
 
-    it(`it should submit and push to servicenow itsm connector`, async () => {
+    it(`should submit and push to servicenow itsm connector`, async () => {
       useConnectorsMock.mockReturnValue({
         ...sampleConnectorData,
         connectors: connectorsMock,
@@ -589,7 +602,7 @@ describe('Create case', () => {
       });
     });
 
-    it(`it should submit and push to servicenow sir connector`, async () => {
+    it(`should submit and push to servicenow sir connector`, async () => {
       useConnectorsMock.mockReturnValue({
         ...sampleConnectorData,
         connectors: connectorsMock,
@@ -692,32 +705,28 @@ describe('Create case', () => {
     });
   });
 
-  it(`it should call afterCaseCreated`, async () => {
+  it(`should call afterCaseCreated`, async () => {
     useConnectorsMock.mockReturnValue({
       ...sampleConnectorData,
       connectors: connectorsMock,
     });
 
-    const wrapper = mount(
-      <TestProviders>
-        <FormContext onSuccess={onFormSubmitSuccess} afterCaseCreated={afterCaseCreated}>
-          <CreateCaseFormFields {...defaultCreateCaseForm} />
-          <SubmitCaseButton />
-        </FormContext>
-      </TestProviders>
+    const wrapper = mockedContext.render(
+      <FormContext onSuccess={onFormSubmitSuccess} afterCaseCreated={afterCaseCreated}>
+        <CreateCaseFormFields {...defaultCreateCaseForm} />
+        <SubmitCaseButton />
+      </FormContext>
     );
 
-    fillForm(wrapper);
-    expect(wrapper.find(`[data-test-subj="connector-fields-jira"]`).exists()).toBeFalsy();
-    wrapper.find('button[data-test-subj="dropdown-connectors"]').simulate('click');
-    wrapper.find(`button[data-test-subj="dropdown-connector-jira-1"]`).simulate('click');
-
-    await waitFor(() => {
-      wrapper.update();
-      expect(wrapper.find(`[data-test-subj="connector-fields-jira"]`).exists()).toBeTruthy();
+    await fillFormReactTestingLib(wrapper);
+    expect(wrapper.queryByTestId('connector-fields-jira')).toBeFalsy();
+    userEvent.click(wrapper.getByTestId('dropdown-connectors'));
+    await act(async () => {
+      userEvent.click(wrapper.getByTestId('dropdown-connector-jira-1'));
     });
+    expect(wrapper.getByTestId('connector-fields-jira')).toBeTruthy();
 
-    wrapper.find(`[data-test-subj="create-case-submit"]`).first().simulate('click');
+    userEvent.click(wrapper.getByTestId('create-case-submit'));
     await waitFor(() => {
       expect(afterCaseCreated).toHaveBeenCalledWith(
         {
@@ -729,15 +738,75 @@ describe('Create case', () => {
     });
   });
 
-  it(`it should call callbacks in correct order`, async () => {
+  it('should call `postComment` with the attachments after the case is created', async () => {
     useConnectorsMock.mockReturnValue({
       ...sampleConnectorData,
       connectors: connectorsMock,
     });
+    const attachments = [
+      {
+        alertId: '1234',
+        index: '',
+        rule: {
+          id: '45321',
+          name: 'my rule',
+        },
+        owner: 'owner',
+        type: CommentType.alert as const,
+      },
+      {
+        alertId: '7896',
+        index: '',
+        rule: {
+          id: '445324',
+          name: 'my rule',
+        },
+        owner: 'second-owner',
+        type: CommentType.alert as const,
+      },
+    ];
+
+    const wrapper = mockedContext.render(
+      <FormContext onSuccess={onFormSubmitSuccess} attachments={attachments}>
+        <CreateCaseFormFields {...defaultCreateCaseForm} />
+        <SubmitCaseButton />
+      </FormContext>
+    );
+
+    await fillFormReactTestingLib(wrapper);
+
+    await act(async () => {
+      userEvent.click(wrapper.getByTestId('create-case-submit'));
+    });
+    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[0] });
+    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[1] });
+  });
+
+  it(`should call callbacks in correct order`, async () => {
+    useConnectorsMock.mockReturnValue({
+      ...sampleConnectorData,
+      connectors: connectorsMock,
+    });
+    const attachments = [
+      {
+        alertId: '1234',
+        index: '',
+        rule: {
+          id: '45321',
+          name: 'my rule',
+        },
+        owner: 'owner',
+        type: CommentType.alert as const,
+      },
+    ];
 
     const wrapper = mount(
       <TestProviders>
-        <FormContext onSuccess={onFormSubmitSuccess} afterCaseCreated={afterCaseCreated}>
+        <FormContext
+          onSuccess={onFormSubmitSuccess}
+          afterCaseCreated={afterCaseCreated}
+          attachments={attachments}
+        >
           <CreateCaseFormFields {...defaultCreateCaseForm} />
           <SubmitCaseButton />
         </FormContext>
@@ -757,26 +826,23 @@ describe('Create case', () => {
     wrapper.find(`[data-test-subj="create-case-submit"]`).first().simulate('click');
     await waitFor(() => {
       expect(postCase).toHaveBeenCalled();
+      expect(postComment).toHaveBeenCalled();
       expect(afterCaseCreated).toHaveBeenCalled();
       expect(pushCaseToExternalService).toHaveBeenCalled();
       expect(onFormSubmitSuccess).toHaveBeenCalled();
     });
 
     const postCaseOrder = postCase.mock.invocationCallOrder[0];
+    const postCommentOrder = postComment.mock.invocationCallOrder[0];
     const afterCaseOrder = afterCaseCreated.mock.invocationCallOrder[0];
     const pushCaseToExternalServiceOrder = pushCaseToExternalService.mock.invocationCallOrder[0];
     const onFormSubmitSuccessOrder = onFormSubmitSuccess.mock.invocationCallOrder[0];
 
     expect(
-      postCaseOrder < afterCaseOrder &&
-        postCaseOrder < pushCaseToExternalServiceOrder &&
-        postCaseOrder < onFormSubmitSuccessOrder
+      postCaseOrder < postCommentOrder &&
+        postCommentOrder < afterCaseOrder &&
+        afterCaseOrder < pushCaseToExternalServiceOrder &&
+        pushCaseToExternalServiceOrder < onFormSubmitSuccessOrder
     ).toBe(true);
-
-    expect(
-      afterCaseOrder < pushCaseToExternalServiceOrder && afterCaseOrder < onFormSubmitSuccessOrder
-    ).toBe(true);
-
-    expect(pushCaseToExternalServiceOrder < onFormSubmitSuccessOrder).toBe(true);
   });
 });
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 dca67cac7e688..499996942f6b9 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -19,6 +19,7 @@ import { UsePostComment, usePostComment } from '../../containers/use_post_commen
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useCasesFeatures } from '../cases_context/use_cases_features';
 import { getConnectorById } from '../utils';
+import { CreateCaseAttachment } from './form';
 
 const initialCaseValue: FormProps = {
   description: '',
@@ -34,9 +35,15 @@ interface Props {
   afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
   children?: JSX.Element | JSX.Element[];
   onSuccess?: (theCase: Case) => Promise<void>;
+  attachments?: CreateCaseAttachment;
 }
 
-export const FormContext: React.FC<Props> = ({ afterCaseCreated, children, onSuccess }) => {
+export const FormContext: React.FC<Props> = ({
+  afterCaseCreated,
+  children,
+  onSuccess,
+  attachments,
+}) => {
   const { connectors, loading: isLoadingConnectors } = useConnectors();
   const { owner } = useCasesContext();
   const { isSyncAlertsEnabled } = useCasesFeatures();
@@ -69,6 +76,19 @@ export const FormContext: React.FC<Props> = ({ afterCaseCreated, children, onSuc
           owner: selectedOwner ?? owner[0],
         });
 
+        // add attachments to the case
+        if (updatedCase && Array.isArray(attachments)) {
+          // TODO currently the API only supports to add a comment at the time
+          // once the API is updated we should use bulk post comment #124814
+          // this operation is intentionally made in sequence
+          for (const attachment of attachments) {
+            await postComment({
+              caseId: updatedCase.id,
+              data: attachment,
+            });
+          }
+        }
+
         if (afterCaseCreated && updatedCase) {
           await afterCaseCreated(updatedCase, postComment);
         }
@@ -92,6 +112,7 @@ export const FormContext: React.FC<Props> = ({ afterCaseCreated, children, onSuc
       owner,
       afterCaseCreated,
       onSuccess,
+      attachments,
       postComment,
       pushCaseToExternalService,
     ]
diff --git a/x-pack/plugins/cases/public/methods/get_create_case_flyout.tsx b/x-pack/plugins/cases/public/methods/get_create_case_flyout.tsx
index 1e2143888bf1e..90fbeafaa9ed0 100644
--- a/x-pack/plugins/cases/public/methods/get_create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/methods/get_create_case_flyout.tsx
@@ -22,6 +22,7 @@ export const getCreateCaseFlyoutLazy = ({
   afterCaseCreated,
   onClose,
   onSuccess,
+  attachments,
 }: GetCreateCaseFlyoutProps) => (
   <CasesProvider value={{ owner, userCanCrud, features }}>
     <Suspense fallback={<EuiLoadingSpinner />}>
@@ -29,6 +30,7 @@ export const getCreateCaseFlyoutLazy = ({
         afterCaseCreated={afterCaseCreated}
         onClose={onClose}
         onSuccess={onSuccess}
+        attachments={attachments}
       />
     </Suspense>
   </CasesProvider>
diff --git a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_case_action.tsx b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_case_action.tsx
index 6648bedd390a4..193d63e2e849c 100644
--- a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_case_action.tsx
+++ b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_case_action.tsx
@@ -7,7 +7,16 @@
 
 import React, { memo, useMemo, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
-import { CaseStatuses, StatusAll, CasesFeatures } from '../../../../../../cases/common';
+import {
+  GetAllCasesSelectorModalProps,
+  GetCreateCaseFlyoutProps,
+} from '../../../../../../cases/public';
+import {
+  CaseStatuses,
+  StatusAll,
+  CasesFeatures,
+  CommentType,
+} from '../../../../../../cases/common';
 import { TimelineItem } from '../../../../../common/search_strategy';
 import { useAddToCase, normalizedEventFields } from '../../../../hooks/use_add_to_case';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
@@ -43,12 +52,12 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
   const {
     onCaseClicked,
     onCaseSuccess,
-    attachAlertToCase,
+    onCaseCreated,
     isAllCaseModalOpen,
     isCreateCaseFlyoutOpen,
   } = useAddToCase({ event, casePermissions, appId, owner, onClose });
 
-  const allCasesSelectorModalProps = useMemo(() => {
+  const allCasesSelectorModalProps: GetAllCasesSelectorModalProps = useMemo(() => {
     const { ruleId, ruleName } = normalizedEventFields(event);
     return {
       alertData: {
@@ -86,23 +95,40 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
     dispatch(setOpenAddToNewCase({ id: eventId, isOpen: false }));
   }, [dispatch, eventId]);
 
-  const createCaseFlyoutProps = useMemo(() => {
+  const createCaseFlyoutProps: GetCreateCaseFlyoutProps = useMemo(() => {
+    const { ruleId, ruleName } = normalizedEventFields(event);
+    const attachments = [
+      {
+        alertId: eventId,
+        index: eventIndex ?? '',
+        rule: {
+          id: ruleId,
+          name: ruleName,
+        },
+        owner,
+        type: CommentType.alert as const,
+      },
+    ];
     return {
-      afterCaseCreated: attachAlertToCase,
+      afterCaseCreated: onCaseCreated,
       onClose: closeCaseFlyoutOpen,
       onSuccess: onCaseSuccess,
       useInsertTimeline,
       owner: [owner],
       userCanCrud: casePermissions?.crud ?? false,
       features: casesFeatures,
+      attachments,
     };
   }, [
-    attachAlertToCase,
+    event,
+    eventId,
+    eventIndex,
+    owner,
+    onCaseCreated,
     closeCaseFlyoutOpen,
     onCaseSuccess,
     useInsertTimeline,
-    owner,
-    casePermissions,
+    casePermissions?.crud,
     casesFeatures,
   ]);
 
@@ -113,6 +139,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
     </>
   );
 };
+AddToCaseActionComponent.displayName = 'AddToCaseAction';
 
 export const AddToCaseAction = memo(AddToCaseActionComponent);
 
diff --git a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
index c2e2302355f5f..a83cca49c1fd7 100644
--- a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
+++ b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
@@ -51,6 +51,7 @@ const AddToNewCaseButtonComponent: React.FC<AddToNewCaseButtonProps> = ({
     </>
   );
 };
+AddToNewCaseButtonComponent.displayName = 'AddToNewCaseButton';
 
 export const AddToNewCaseButton = memo(AddToNewCaseButtonComponent);
 
diff --git a/x-pack/plugins/timelines/public/hooks/use_add_to_case.ts b/x-pack/plugins/timelines/public/hooks/use_add_to_case.ts
index da42646d4fda9..0e45a9bdb984d 100644
--- a/x-pack/plugins/timelines/public/hooks/use_add_to_case.ts
+++ b/x-pack/plugins/timelines/public/hooks/use_add_to_case.ts
@@ -23,11 +23,7 @@ interface UseAddToCase {
   addExistingCaseClick: () => void;
   onCaseClicked: (theCase?: Case) => void;
   onCaseSuccess: (theCase: Case) => Promise<void>;
-  attachAlertToCase: (
-    theCase: Case,
-    postComment?: ((arg: PostCommentArg) => Promise<void>) | undefined,
-    updateCase?: ((newCase: Case) => void) | undefined
-  ) => Promise<void>;
+  onCaseCreated: () => Promise<void>;
   isAllCaseModalOpen: boolean;
   isDisabled: boolean;
   userCanCrud: boolean;
@@ -38,27 +34,13 @@ interface UseAddToCase {
   isCreateCaseFlyoutOpen: boolean;
 }
 
-interface PostCommentArg {
-  caseId: string;
-  data: {
-    type: 'alert';
-    alertId: string | string[];
-    index: string | string[];
-    rule: { id: string | null; name: string | null };
-    owner: string;
-  };
-  updateCase?: (newCase: Case) => void;
-}
-
 export const useAddToCase = ({
   event,
   casePermissions,
   appId,
-  owner,
   onClose,
 }: AddToCaseActionProps): UseAddToCase => {
   const eventId = event?.ecs._id ?? '';
-  const eventIndex = event?.ecs._index ?? '';
   const dispatch = useDispatch();
   // TODO: use correct value in standalone or integrated.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -116,33 +98,10 @@ export const useAddToCase = ({
     [navigateToApp, appId]
   );
 
-  const attachAlertToCase = useCallback(
-    async (
-      theCase: Case,
-      postComment?: (arg: PostCommentArg) => Promise<void>,
-      updateCase?: (newCase: Case) => void
-    ) => {
-      dispatch(tGridActions.setOpenAddToNewCase({ id: eventId, isOpen: false }));
-      const { ruleId, ruleName } = normalizedEventFields(event);
-      if (postComment) {
-        await postComment({
-          caseId: theCase.id,
-          data: {
-            type: 'alert',
-            alertId: eventId,
-            index: eventIndex ?? '',
-            rule: {
-              id: ruleId,
-              name: ruleName,
-            },
-            owner,
-          },
-          updateCase,
-        });
-      }
-    },
-    [eventId, eventIndex, owner, dispatch, event]
-  );
+  const onCaseCreated = useCallback(async () => {
+    dispatch(tGridActions.setOpenAddToNewCase({ id: eventId, isOpen: false }));
+  }, [eventId, dispatch]);
+
   const onCaseSuccess = useCallback(
     async (theCase: Case) => {
       dispatch(tGridActions.setOpenAddToExistingCase({ id: eventId, isOpen: false }));
@@ -185,7 +144,7 @@ export const useAddToCase = ({
     addExistingCaseClick,
     onCaseClicked,
     onCaseSuccess,
-    attachAlertToCase,
+    onCaseCreated,
     isAllCaseModalOpen,
     isDisabled,
     userCanCrud,

From 00fb06cac5672954a945be27c395e9b3a2cfa5c2 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <rudolf.meijering@elastic.co>
Date: Thu, 10 Feb 2022 10:33:53 +0100
Subject: [PATCH 41/85] Move saved objects loader to dashboard plugin (#124708)

* Move SavedObjectLoader into the dashboard plugin

* Remove old comment recommending savedobjectloader

* Fix types
---
 .../public/services}/saved_object_loader.ts      | 12 +++++++++---
 .../dashboard/public/services/saved_objects.ts   |  4 ++--
 .../public/services}/string_utils.test.ts        | 16 ++++++++--------
 .../public/services}/string_utils.ts             | 16 +++++++---------
 src/plugins/saved_objects/public/index.ts        |  8 +-------
 .../saved_objects/public/saved_object/index.ts   |  2 --
 .../public/saved_object/saved_object.ts          |  2 --
 7 files changed, 27 insertions(+), 33 deletions(-)
 rename src/plugins/{saved_objects/public/saved_object => dashboard/public/services}/saved_object_loader.ts (95%)
 rename src/plugins/{saved_objects/public/saved_object/helpers => dashboard/public/services}/string_utils.test.ts (53%)
 rename src/plugins/{saved_objects/public/saved_object/helpers => dashboard/public/services}/string_utils.ts (55%)

diff --git a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts b/src/plugins/dashboard/public/services/saved_object_loader.ts
similarity index 95%
rename from src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
rename to src/plugins/dashboard/public/services/saved_object_loader.ts
index 10872b5d9cd1a..521d6645e30f9 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
+++ b/src/plugins/dashboard/public/services/saved_object_loader.ts
@@ -12,9 +12,13 @@ import {
   SavedObjectsFindOptionsReference,
   SavedObjectReference,
 } from 'kibana/public';
-import { SavedObject } from '../types';
-import { StringUtils } from './helpers/string_utils';
+import { SavedObject } from '../../../saved_objects/public';
+import { upperFirst } from './string_utils';
 
+/**
+ * @deprecated
+ * @removeBy 8.0
+ */
 export interface SavedObjectLoaderFindOptions {
   size?: number;
   fields?: string[];
@@ -23,6 +27,8 @@ export interface SavedObjectLoaderFindOptions {
 
 /**
  * @deprecated
+ * @removeBy 8.0
+ *
  * The SavedObjectLoader class provides some convenience functions
  * to load and save one kind of saved objects (specified in the constructor).
  *
@@ -46,7 +52,7 @@ export class SavedObjectLoader {
 
     this.loaderProperties = {
       name: `${this.lowercaseType}s`,
-      noun: StringUtils.upperFirst(this.type),
+      noun: upperFirst(this.type),
       nouns: `${this.lowercaseType}s`,
     };
   }
diff --git a/src/plugins/dashboard/public/services/saved_objects.ts b/src/plugins/dashboard/public/services/saved_objects.ts
index 305ff3c2014f8..afd778d78b271 100644
--- a/src/plugins/dashboard/public/services/saved_objects.ts
+++ b/src/plugins/dashboard/public/services/saved_objects.ts
@@ -11,11 +11,11 @@ export type {
   SavedObject,
   SavedObjectsStart,
   SavedObjectSaveOpts,
-  SavedObjectLoaderFindOptions,
 } from '../../../saved_objects/public';
 export {
   showSaveModal,
-  SavedObjectLoader,
   SavedObjectSaveModal,
   getSavedObjectFinder,
 } from '../../../saved_objects/public';
+export { SavedObjectLoader } from './saved_object_loader';
+export type { SavedObjectLoaderFindOptions } from './saved_object_loader';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts b/src/plugins/dashboard/public/services/string_utils.test.ts
similarity index 53%
rename from src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts
rename to src/plugins/dashboard/public/services/string_utils.test.ts
index 4e7258f1575dc..ed96cb4f1a0a1 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts
+++ b/src/plugins/dashboard/public/services/string_utils.test.ts
@@ -6,17 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { StringUtils } from './string_utils';
+import { upperFirst } from './string_utils';
 
-describe('StringUtils class', () => {
-  describe('static upperFirst', () => {
+describe('StringUtils', () => {
+  describe('upperFirst', () => {
     test('should converts the first character of string to upper case', () => {
-      expect(StringUtils.upperFirst()).toBe('');
-      expect(StringUtils.upperFirst('')).toBe('');
+      expect(upperFirst()).toBe('');
+      expect(upperFirst('')).toBe('');
 
-      expect(StringUtils.upperFirst('Fred')).toBe('Fred');
-      expect(StringUtils.upperFirst('fred')).toBe('Fred');
-      expect(StringUtils.upperFirst('FRED')).toBe('FRED');
+      expect(upperFirst('Fred')).toBe('Fred');
+      expect(upperFirst('fred')).toBe('Fred');
+      expect(upperFirst('FRED')).toBe('FRED');
     });
   });
 });
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts b/src/plugins/dashboard/public/services/string_utils.ts
similarity index 55%
rename from src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts
rename to src/plugins/dashboard/public/services/string_utils.ts
index 5d4551f0c200c..31a36b38155d7 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts
+++ b/src/plugins/dashboard/public/services/string_utils.ts
@@ -6,13 +6,11 @@
  * Side Public License, v 1.
  */
 
-export class StringUtils {
-  /**
-   * Returns a version of the string with the first letter capitalized.
-   * @param str {string}
-   * @returns {string}
-   */
-  public static upperFirst(str: string = ''): string {
-    return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
-  }
+/**
+ * Returns a version of the string with the first letter capitalized.
+ * @param str {string}
+ * @returns {string}
+ */
+export function upperFirst(str: string = ''): string {
+  return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
 }
diff --git a/src/plugins/saved_objects/public/index.ts b/src/plugins/saved_objects/public/index.ts
index d63e20f5f5673..5e6e67f7e4acc 100644
--- a/src/plugins/saved_objects/public/index.ts
+++ b/src/plugins/saved_objects/public/index.ts
@@ -13,17 +13,11 @@ export { SavedObjectSaveModal, SavedObjectSaveModalOrigin, showSaveModal } from
 export type { SavedObjectFinderUiProps, SavedObjectMetaData } from './finder';
 export { getSavedObjectFinder, SavedObjectFinderUi } from './finder';
 export type {
-  SavedObjectLoaderFindOptions,
   SavedObjectDecorator,
   SavedObjectDecoratorFactory,
   SavedObjectDecoratorConfig,
 } from './saved_object';
-export {
-  SavedObjectLoader,
-  checkForDuplicateTitle,
-  saveWithConfirmation,
-  isErrorNonFatal,
-} from './saved_object';
+export { checkForDuplicateTitle, saveWithConfirmation, isErrorNonFatal } from './saved_object';
 export type { SavedObjectSaveOpts, SavedObject, SavedObjectConfig } from './types';
 export { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 export type { SavedObjectsStart, SavedObjectSetup } from './plugin';
diff --git a/src/plugins/saved_objects/public/saved_object/index.ts b/src/plugins/saved_objects/public/saved_object/index.ts
index f30730a1c39ac..01770866b65ed 100644
--- a/src/plugins/saved_objects/public/saved_object/index.ts
+++ b/src/plugins/saved_objects/public/saved_object/index.ts
@@ -7,8 +7,6 @@
  */
 
 export { createSavedObjectClass } from './saved_object';
-export type { SavedObjectLoaderFindOptions } from './saved_object_loader';
-export { SavedObjectLoader } from './saved_object_loader';
 export { checkForDuplicateTitle } from './helpers/check_for_duplicate_title';
 export { saveWithConfirmation } from './helpers/save_with_confirmation';
 export { isErrorNonFatal } from './helpers/save_saved_object';
diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.ts b/src/plugins/saved_objects/public/saved_object/saved_object.ts
index c038669510b78..a437431a9d827 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object.ts
@@ -29,8 +29,6 @@ export function createSavedObjectClass(
    * provides additional functionality besides loading/saving/deleting/etc.
    *
    * It is overloaded and configured to provide type-aware functionality.
-   * To just retrieve the attributes of saved objects, it is recommended to use SavedObjectLoader
-   * which returns instances of SimpleSavedObject which don't introduce additional type-specific complexity.
    * @param {*} config
    */
   class SavedObjectClass {

From 9b999772e25f8d388855c2a9b5355d2072ed82d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Thu, 10 Feb 2022 10:51:53 +0100
Subject: [PATCH 42/85] Delete unneeded APM issue template (#125167)

---
 .github/ISSUE_TEMPLATE/APM.yml | 44 ----------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/APM.yml

diff --git a/.github/ISSUE_TEMPLATE/APM.yml b/.github/ISSUE_TEMPLATE/APM.yml
deleted file mode 100644
index cbcabdee25718..0000000000000
--- a/.github/ISSUE_TEMPLATE/APM.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: APM Issue
-description: Issues related to the curated APM UI in Kibana
-labels: Team:apm
-title: "[APM] "
-body: 
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for our interest in Elastic APM. This issue tracker is meant for reporting bugs and problems with APM UI. For questions around how to use or setup APM, please refer to our [Discuss Forum](https://discuss.elastic.co/)
-  - type: input
-    attributes:
-      label: Kibana version
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: APM Server version (if applicable)
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Elasticsearch version (if applicable)
-    validations:
-      required: false      
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: Steps to reproduce the behavior.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Actual Behavior
-      description: A concise description of what you're experiencing.
-    validations:
-      required: false
-    
-

From d79ec73aeba0aeabdf2f9be9d1ec347f47abf80d Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 10 Feb 2022 11:12:35 +0100
Subject: [PATCH 43/85] [Uptime Monitor management] Simplify configs (#124988)

---
 x-pack/plugins/uptime/common/config.ts            |  1 -
 x-pack/plugins/uptime/e2e/config.ts               |  1 -
 .../server/lib/saved_objects/saved_objects.ts     |  4 ++--
 .../lib/synthetics_service/get_es_hosts.test.ts   |  3 ---
 x-pack/plugins/uptime/server/plugin.ts            | 15 +++++++++++----
 .../server/rest_api/uptime_route_wrapper.ts       |  2 +-
 x-pack/test/api_integration/config.ts             |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/uptime/common/config.ts b/x-pack/plugins/uptime/common/config.ts
index 6a2c630d31fae..678ca8009bf24 100644
--- a/x-pack/plugins/uptime/common/config.ts
+++ b/x-pack/plugins/uptime/common/config.ts
@@ -10,7 +10,6 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { sslSchema } from '@kbn/server-http-tools';
 
 const serviceConfig = schema.object({
-  enabled: schema.maybe(schema.boolean()),
   username: schema.maybe(schema.string()),
   password: schema.maybe(schema.string()),
   manifestUrl: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/uptime/e2e/config.ts b/x-pack/plugins/uptime/e2e/config.ts
index 4e265d948ffef..4d509d4045be9 100644
--- a/x-pack/plugins/uptime/e2e/config.ts
+++ b/x-pack/plugins/uptime/e2e/config.ts
@@ -47,7 +47,6 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
         `--xpack.uptime.service.manifestUrl=${process.env.SYNTHETICS_SERVICE_MANIFEST}`,
         `--xpack.uptime.service.username=${process.env.SYNTHETICS_SERVICE_USERNAME}`,
         `--xpack.uptime.service.password=${process.env.SYNTHETICS_SERVICE_PASSWORD}`,
-        '--xpack.uptime.service.enabled=true',
         '--xpack.uptime.ui.monitorManagement.enabled=true',
       ],
     },
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts b/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
index 1f2dbc98edd1b..67f05bfb55d03 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
@@ -22,11 +22,11 @@ import { syntheticsServiceApiKey } from './service_api_key';
 export const registerUptimeSavedObjects = (
   savedObjectsService: SavedObjectsServiceSetup,
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup,
-  config: UptimeConfig
+  isServiceEnabled: boolean
 ) => {
   savedObjectsService.registerType(umDynamicSettings);
 
-  if (config?.service?.enabled) {
+  if (isServiceEnabled) {
     savedObjectsService.registerType(syntheticsMonitor);
     savedObjectsService.registerType(syntheticsServiceApiKey);
 
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
index 496f39557adb1..d9795219ede28 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
@@ -26,7 +26,6 @@ describe('getEsHostsTest', () => {
     const esHosts = getEsHosts({
       cloud: cloudSetup,
       config: {
-        enabled: true,
         manifestUrl: 'https://testing.com',
       },
     });
@@ -39,7 +38,6 @@ describe('getEsHostsTest', () => {
   it('should return expected host from config', function () {
     const esHosts = getEsHosts({
       config: {
-        enabled: true,
         manifestUrl: 'https://testing.com',
         hosts: ['http://localhost:9200'],
       },
@@ -51,7 +49,6 @@ describe('getEsHostsTest', () => {
     const esHosts = getEsHosts({
       cloud: cloudSetup,
       config: {
-        enabled: true,
         manifestUrl: 'https://testing.com',
         hosts: ['http://localhost:9200'],
       },
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts
index df88f895f2f7d..4dc8437cbbcb6 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/uptime/server/plugin.ts
@@ -37,10 +37,13 @@ export class Plugin implements PluginType {
   private logger: Logger;
   private server?: UptimeServerSetup;
   private syntheticService?: SyntheticsService;
+  private readonly isServiceEnabled?: boolean;
 
   constructor(initializerContext: PluginInitializerContext<UptimeConfig>) {
     this.initContext = initializerContext;
     this.logger = initializerContext.logger.get();
+    const config = this.initContext.config.get<UptimeConfig>();
+    this.isServiceEnabled = config?.ui?.monitorManagement?.enabled && Boolean(config.service);
   }
 
   public setup(core: CoreSetup, plugins: UptimeCorePluginsSetup) {
@@ -75,7 +78,7 @@ export class Plugin implements PluginType {
       logger: this.logger,
     } as UptimeServerSetup;
 
-    if (this.server?.config?.service?.enabled) {
+    if (this.isServiceEnabled && this.server.config.service) {
       this.syntheticService = new SyntheticsService(
         this.logger,
         this.server,
@@ -87,7 +90,11 @@ export class Plugin implements PluginType {
 
     initServerWithKibana(this.server, plugins, ruleDataClient, this.logger);
 
-    registerUptimeSavedObjects(core.savedObjects, plugins.encryptedSavedObjects, config);
+    registerUptimeSavedObjects(
+      core.savedObjects,
+      plugins.encryptedSavedObjects,
+      Boolean(this.isServiceEnabled)
+    );
 
     KibanaTelemetryAdapter.registerUsageCollector(
       plugins.usageCollection,
@@ -100,7 +107,7 @@ export class Plugin implements PluginType {
   }
 
   public start(coreStart: CoreStart, plugins: UptimeCorePluginsStart) {
-    if (this.server?.config?.service?.enabled) {
+    if (this.isServiceEnabled) {
       this.savedObjectsClient = new SavedObjectsClient(
         coreStart.savedObjects.createInternalRepository([syntheticsServiceApiKey.name])
       );
@@ -117,7 +124,7 @@ export class Plugin implements PluginType {
       this.server.savedObjectsClient = this.savedObjectsClient;
     }
 
-    if (this.server?.config?.service?.enabled) {
+    if (this.isServiceEnabled) {
       this.syntheticService?.init();
       this.syntheticService?.scheduleSyncTask(plugins.taskManager);
       if (this.server && this.syntheticService) {
diff --git a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts b/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
index ffe4d4ed4bf93..cf03e7d58fd14 100644
--- a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
+++ b/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
@@ -23,7 +23,7 @@ export const uptimeRouteWrapper: UMKibanaRouteWrapper = (uptimeRoute, server) =>
   handler: async (context, request, response) => {
     const { client: esClient } = context.core.elasticsearch;
     let savedObjectsClient: SavedObjectsClientContract;
-    if (server.config?.service?.enabled) {
+    if (server.config?.ui?.monitorManagement?.enabled) {
       savedObjectsClient = context.core.savedObjects.getClient({
         includedHiddenTypes: [syntheticsServiceApiKey.name],
       });
diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
index 87306e78b0edc..aa2a61f8b0092 100644
--- a/x-pack/test/api_integration/config.ts
+++ b/x-pack/test/api_integration/config.ts
@@ -35,7 +35,7 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi
         '--xpack.ruleRegistry.write.enabled=true',
         '--xpack.ruleRegistry.write.enabled=true',
         '--xpack.ruleRegistry.write.cache.enabled=false',
-        '--xpack.uptime.service.enabled=true',
+        '--xpack.uptime.ui.monitorManagement.enabled=true',
         '--xpack.uptime.service.password=test',
         '--xpack.uptime.service.manifestUrl=http://test.com',
         '--xpack.uptime.service.username=localKibanaIntegrationTestsUser',

From c9118b4d41925077ff6940adb3673c162e537633 Mon Sep 17 00:00:00 2001
From: mgiota <panagiota.mitsopoulou@elastic.co>
Date: Thu, 10 Feb 2022 11:27:38 +0100
Subject: [PATCH 44/85] Move use links hook to o11y (#124486)

* use rules link from observability plugin (todo: delete it from infra and update paths)

* delete from infra plugin and update paths accordingly

* update observability path

* move use_prefix_path_with_basepath to observability

* fix linter issue

* fix errors

* explicitly export symbols

* fix linter issues

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../components/metrics_alert_dropdown.tsx     | 12 ++++-------
 .../manage_alerts_context_menu_item.tsx       |  9 +++------
 .../components/alert_dropdown.tsx             | 19 +++++++-----------
 .../infra/public/apps/common_providers.tsx    |  2 +-
 .../analyze_in_ml_button.tsx                  |  2 +-
 .../user_management_link.tsx                  |  2 +-
 .../log_entry_actions_menu.tsx                |  2 +-
 .../logging/log_source_error_page.tsx         |  2 +-
 .../view_source_configuration_button.tsx      |  2 +-
 .../infra/public/hooks/use_breadcrumbs.ts     |  2 +-
 .../pages/link_to/redirect_to_node_detail.tsx |  2 +-
 .../pages/link_to/redirect_to_node_logs.tsx   |  2 +-
 .../analyze_dataset_in_ml_action.tsx          |  2 +-
 .../category_example_message.tsx              |  3 +--
 .../sections/anomalies/log_entry_example.tsx  |  2 +-
 .../infra/public/pages/logs/page_content.tsx  |  2 +-
 .../index_pattern_configuration_panel.tsx     |  2 +-
 .../source_configuration_settings.tsx         |  2 +-
 .../logs/stream/page_no_indices_content.tsx   |  2 +-
 .../infra/public/pages/metrics/index.tsx      |  2 +-
 .../anomalies_table/anomalies_table.tsx       |  2 +-
 .../ml/anomaly_detection/flyout_home.tsx      |  2 +-
 .../components/node_details/overlay.tsx       |  2 +-
 .../components/node_details/tabs/logs.tsx     |  2 +-
 .../components/waffle/node_context_menu.tsx   |  2 +-
 .../inventory_view/lib/create_uptime_link.ts  |  2 +-
 .../metric_detail/components/invalid_node.tsx |  2 +-
 .../pages/metrics/metric_detail/index.tsx     |  2 +-
 .../components/chart_context_menu.tsx         |  2 +-
 .../components/helpers/create_tsvb_link.ts    |  2 +-
 .../source_configuration_settings.tsx         |  2 +-
 .../public/hooks/use_link_props.test.tsx      |  6 +++---
 .../public/hooks/use_link_props.ts}           |  4 ++--
 .../hooks/use_prefix_path_with_basepath.tsx   |  0
 .../public/hooks/use_rules_link.ts            | 20 +++++++++++++++++++
 x-pack/plugins/observability/public/index.ts  |  5 +++++
 .../navigation_warning_prompt/context.tsx     |  6 +++---
 .../utils/navigation_warning_prompt/index.ts  |  0
 .../navigation_warning_prompt/prompt.tsx      |  1 +
 39 files changed, 76 insertions(+), 63 deletions(-)
 rename x-pack/plugins/{infra => observability}/public/hooks/use_link_props.test.tsx (98%)
 rename x-pack/plugins/{infra/public/hooks/use_link_props.tsx => observability/public/hooks/use_link_props.ts} (98%)
 rename x-pack/plugins/{infra => observability}/public/hooks/use_prefix_path_with_basepath.tsx (100%)
 create mode 100644 x-pack/plugins/observability/public/hooks/use_rules_link.ts
 rename x-pack/plugins/{infra => observability}/public/utils/navigation_warning_prompt/context.tsx (85%)
 rename x-pack/plugins/{infra => observability}/public/utils/navigation_warning_prompt/index.ts (100%)
 rename x-pack/plugins/{infra => observability}/public/utils/navigation_warning_prompt/prompt.tsx (91%)

diff --git a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
index 21a47ff18cd76..61d9c52608810 100644
--- a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
@@ -17,8 +17,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { PrefilledInventoryAlertFlyout } from '../../inventory/components/alert_flyout';
 import { PrefilledThresholdAlertFlyout } from '../../metric_threshold/components/alert_flyout';
-import { useLinkProps } from '../../../hooks/use_link_props';
-
+import { useRulesLink } from '../../../../../observability/public';
 type VisibleFlyoutType = 'inventory' | 'threshold' | null;
 
 export const MetricsAlertDropdown = () => {
@@ -84,10 +83,7 @@ export const MetricsAlertDropdown = () => {
     [setVisibleFlyoutType, closePopover]
   );
 
-  const manageAlertsLinkProps = useLinkProps({
-    app: 'management',
-    pathname: '/insightsAndAlerting/triggersActions/alerts',
-  });
+  const manageRulesLinkProps = useRulesLink();
 
   const manageAlertsMenuItem = useMemo(
     () => ({
@@ -95,9 +91,9 @@ export const MetricsAlertDropdown = () => {
         defaultMessage: 'Manage rules',
       }),
       icon: 'tableOfContents',
-      onClick: manageAlertsLinkProps.onClick,
+      onClick: manageRulesLinkProps.onClick,
     }),
-    [manageAlertsLinkProps]
+    [manageRulesLinkProps]
   );
 
   const firstPanelMenuItems: EuiContextMenuPanelDescriptor['items'] = useMemo(
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
index ef352dc7b5a33..4bd0438af9b76 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
@@ -8,15 +8,12 @@
 import { EuiContextMenuItem } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useRulesLink } from '../../../../../observability/public';
 
 export const ManageAlertsContextMenuItem = () => {
-  const manageAlertsLinkProps = useLinkProps({
-    app: 'management',
-    pathname: '/insightsAndAlerting/triggersActions/alerts',
-  });
+  const manageRulesLinkProps = useRulesLink();
   return (
-    <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
+    <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageRulesLinkProps}>
       <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage rules" />
     </EuiContextMenuItem>
   );
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
index a447fbf837d80..9fbc88ed5352f 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiPopover, EuiContextMenuItem, EuiContextMenuPanel, EuiHeaderLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { AlertFlyout } from './alert_flyout';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useRulesLink } from '../../../../../observability/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 
 const readOnlyUserTooltipContent = i18n.translate(
@@ -36,15 +36,10 @@ export const AlertDropdown = () => {
   const canCreateAlerts = capabilities?.logs?.save ?? false;
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [flyoutVisible, setFlyoutVisible] = useState(false);
-  const manageAlertsLinkProps = useLinkProps(
-    {
-      app: 'management',
-      pathname: '/insightsAndAlerting/triggersActions/alerts',
-    },
-    {
-      hrefOnly: true,
-    }
-  );
+
+  const manageRulesLinkProps = useRulesLink({
+    hrefOnly: true,
+  });
 
   const closePopover = useCallback(() => {
     setPopoverOpen(false);
@@ -74,14 +69,14 @@ export const AlertDropdown = () => {
           defaultMessage="Create rule"
         />
       </EuiContextMenuItem>,
-      <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
+      <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageRulesLinkProps}>
         <FormattedMessage
           id="xpack.infra.alerting.logs.manageAlerts"
           defaultMessage="Manage rules"
         />
       </EuiContextMenuItem>,
     ];
-  }, [manageAlertsLinkProps, canCreateAlerts, openFlyout]);
+  }, [manageRulesLinkProps, canCreateAlerts, openFlyout]);
 
   return (
     <>
diff --git a/x-pack/plugins/infra/public/apps/common_providers.tsx b/x-pack/plugins/infra/public/apps/common_providers.tsx
index eb1ce01fac963..81852659e6087 100644
--- a/x-pack/plugins/infra/public/apps/common_providers.tsx
+++ b/x-pack/plugins/infra/public/apps/common_providers.tsx
@@ -18,7 +18,7 @@ import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions
 import { createKibanaContextForPlugin } from '../hooks/use_kibana';
 import { InfraClientStartDeps } from '../types';
 import { HeaderActionMenuProvider } from '../utils/header_action_menu_provider';
-import { NavigationWarningPromptProvider } from '../utils/navigation_warning_prompt';
+import { NavigationWarningPromptProvider } from '../../../observability/public';
 import { TriggersActionsProvider } from '../utils/triggers_actions_context';
 
 export const CommonInfraProviders: React.FC<{
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
index 40cff5143e0ea..1e6556065ae44 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
@@ -9,7 +9,7 @@ import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { shouldHandleLinkEvent } from '../../../hooks/use_link_props';
+import { shouldHandleLinkEvent } from '../../../../../observability/public';
 
 export const AnalyzeInMlButton: React.FunctionComponent<{
   href?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
index 55b0f0b53d29f..206db81193967 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
@@ -8,7 +8,7 @@
 import { EuiButton, EuiButtonProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../observability/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 
 export const UserManagementLink: React.FunctionComponent<EuiButtonProps> = (props) => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
index f0ea8152ce41c..e1b3a39fd65e9 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useMemo } from 'react';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
 import { getApmTraceUrl } from '../../../../../observability/public';
-import { useLinkProps, LinkDescriptor } from '../../../hooks/use_link_props';
+import { useLinkProps, LinkDescriptor } from '../../../../../observability/public';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
 
 const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];
diff --git a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
index 651e0be02e931..23718bf16b401 100644
--- a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
@@ -14,7 +14,7 @@ import {
   FetchLogSourceStatusError,
   ResolveLogSourceConfigurationError,
 } from '../../../common/log_sources';
-import { useLinkProps } from '../../hooks/use_link_props';
+import { useLinkProps } from '../../../../observability/public';
 import { LogsPageTemplate } from '../../pages/logs/page_template';
 
 export const LogSourceErrorPage: React.FC<{
diff --git a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
index 2528c1bcfc056..f7c1a5763ba07 100644
--- a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
+++ b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
-import { useLinkProps } from '../../hooks/use_link_props';
+import { useLinkProps } from '../../../../observability/public';
 
 interface ViewSourceConfigurationButtonProps {
   'data-test-subj'?: string;
diff --git a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
index 32127f21b75f5..92a3b581d0bca 100644
--- a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
@@ -9,7 +9,7 @@ import { ChromeBreadcrumb } from 'kibana/public';
 import { useEffect } from 'react';
 import { observabilityTitle } from '../translations';
 import { useKibanaContextForPlugin } from './use_kibana';
-import { useLinkProps } from './use_link_props';
+import { useLinkProps } from '../../../observability/public';
 
 type AppId = 'logs' | 'metrics';
 
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
index 2f9d94483d740..e3d17f17af586 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
@@ -11,7 +11,7 @@ import { Redirect, RouteComponentProps } from 'react-router-dom';
 import { replaceMetricTimeInQueryString } from '../metrics/metric_detail/hooks/use_metrics_time';
 import { getFromFromLocation, getToFromLocation } from './query_params';
 import { InventoryItemType } from '../../../common/inventory_models/types';
-import { LinkDescriptor } from '../../hooks/use_link_props';
+import { LinkDescriptor } from '../../../../observability/public';
 
 type RedirectToNodeDetailProps = RouteComponentProps<{
   nodeId: string;
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index a8d339cfe979a..66abef53f021e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -17,7 +17,7 @@ import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter'
 import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { useLogSource } from '../../containers/logs/log_source';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
-import { LinkDescriptor } from '../../hooks/use_link_props';
+import { LinkDescriptor } from '../../../../observability/public';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
 
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
index 15e27705395bb..1b172135cfc6c 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
@@ -13,7 +13,7 @@ import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { useMlHref, ML_PAGES } from '../../../../../../../ml/public';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
-import { shouldHandleLinkEvent } from '../../../../../hooks/use_link_props';
+import { shouldHandleLinkEvent } from '../../../../../../../observability/public';
 
 export const AnalyzeCategoryDatasetInMlAction: React.FunctionComponent<{
   categorizationJobId: string;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
index c14960720768a..f18d8b4d3e04d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
@@ -26,8 +26,7 @@ import {
 } from '../../../../../components/logging/log_text_stream';
 import { LogColumnConfiguration } from '../../../../../utils/source_configuration';
 import { LogEntryContextMenu } from '../../../../../components/logging/log_text_stream/log_entry_context_menu';
-import { useLinkProps } from '../../../../../hooks/use_link_props';
-import { useUiTracker } from '../../../../../../../observability/public';
+import { useUiTracker, useLinkProps } from '../../../../../../../observability/public';
 
 export const exampleMessageScale = 'medium' as const;
 export const exampleTimestampFormat = 'dateTime' as const;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
index 4e1815e754a59..be20e44a1434e 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
@@ -27,7 +27,7 @@ import {
   LogColumnHeadersWrapper,
   LogColumnHeader,
 } from '../../../../../components/logging/log_text_stream/column_headers';
-import { useLinkProps, shouldHandleLinkEvent } from '../../../../../hooks/use_link_props';
+import { useLinkProps, shouldHandleLinkEvent } from '../../../../../../../observability/public';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
 import { LogEntryExample, isCategoryAnomaly } from '../../../../../../common/log_analysis';
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index b8fc4ebef26c5..9643483fd199b 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -23,7 +23,7 @@ import { LogsSettingsPage } from './settings';
 import { StreamPage } from './stream';
 import { HeaderMenuPortal } from '../../../../observability/public';
 import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';
-import { useLinkProps } from '../../hooks/use_link_props';
+import { useLinkProps } from '../../../../observability/public';
 import { useReadOnlyBadge } from '../../hooks/use_readonly_badge';
 
 export const LogsPageContent: React.FunctionComponent = () => {
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
index c7cae13a93c4b..17d537101e5d2 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
 import { LogIndexPatternReference } from '../../../../common/log_sources';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../observability/public';
 import { FormElement } from './form_elements';
 import { getFormRowProps } from './form_field_props';
 import { IndexPatternSelector } from './index_pattern_selector';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
index b2614ea84b0a9..daf4e73847163 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
@@ -21,7 +21,7 @@ import { useTrackPageview } from '../../../../../observability/public';
 import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
-import { Prompt } from '../../../utils/navigation_warning_prompt';
+import { Prompt } from '../../../../../observability/public';
 import { IndicesConfigurationPanel } from './indices_configuration_panel';
 import { LogColumnsConfigurationPanel } from './log_columns_configuration_panel';
 import { NameConfigurationPanel } from './name_configuration_panel';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
index 2259a8d3528af..7475ca331aadd 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 import { NoIndices } from '../../../components/empty_states/no_indices';
 import { ViewSourceConfigurationButton } from '../../../components/source_configuration/view_source_configuration_button';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../observability/public';
 
 export const LogsPageNoIndicesContent = () => {
   const {
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index da970f3000099..9c437db85bcb3 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -39,7 +39,7 @@ import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabi
 import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout';
 import { createExploratoryViewUrl, HeaderMenuPortal } from '../../../../observability/public';
 import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';
-import { useLinkProps } from '../../hooks/use_link_props';
+import { useLinkProps } from '../../../../observability/public';
 import { CreateDerivedIndexPattern } from '../../containers/metrics_source';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
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 17c0b9178dac4..41dde2ee02582 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
@@ -30,7 +30,7 @@ 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';
-import { useLinkProps } from '../../../../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../../../../observability/public';
 import { useSorting } from '../../../../../../../hooks/use_sorting';
 import { useMetricsK8sAnomaliesResults } from '../../../../hooks/use_metrics_k8s_anomalies';
 import { useMetricsHostsAnomaliesResults } from '../../../../hooks/use_metrics_hosts_anomalies';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
index 972887fb60bbe..1918d17b5e53a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
@@ -26,7 +26,7 @@ import {
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { LoadingPrompt } from '../../../../../../components/loading_page';
-import { useLinkProps } from '../../../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../../../observability/public';
 import { AnomaliesTable } from './anomalies_table/anomalies_table';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
index 047c7e8724d7b..93b17bd8f42ba 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
@@ -22,7 +22,7 @@ import { PropertiesTab } from './tabs/properties/index';
 import { AnomaliesTab } from './tabs/anomalies/anomalies';
 import { OsqueryTab } from './tabs/osquery';
 import { OVERLAY_Y_START, OVERLAY_BOTTOM_MARGIN } from './tabs/shared';
-import { useLinkProps } from '../../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../../observability/public';
 import { getNodeDetailUrl } from '../../../../link_to';
 import { findInventoryModel } from '../../../../../../common/inventory_models';
 import { createUptimeLink } from '../../lib/create_uptime_link';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
index c63d48fdf9c12..058928d1c8591 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
@@ -17,7 +17,7 @@ import { TabContent, TabProps } from './shared';
 import { LogStream } from '../../../../../../components/log_stream';
 import { useWaffleOptionsContext } from '../../../hooks/use_waffle_options';
 import { findInventoryFields } from '../../../../../../../common/inventory_models';
-import { useLinkProps } from '../../../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../../../observability/public';
 import { getNodeLogsUrl } from '../../../../../link_to';
 
 const TabComponent = (props: TabProps) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
index 65d8fbbca7a2d..66078fb46f6e6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
@@ -27,7 +27,7 @@ import {
   SectionLink,
   ActionMenuDivider,
 } from '../../../../../../../observability/public';
-import { useLinkProps } from '../../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../../observability/public';
 
 interface Props {
   options: InfraWaffleMapOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_uptime_link.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_uptime_link.ts
index b6fa4fe4273ab..6154ed729ebdd 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_uptime_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_uptime_link.ts
@@ -8,7 +8,7 @@
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../lib/lib';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { getFieldByType } from '../../../../../common/inventory_models';
-import { LinkDescriptor } from '../../../../hooks/use_link_props';
+import { LinkDescriptor } from '../../../../../../observability/public';
 
 export const createUptimeLink = (
   options: InfraWaffleMapOptions,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
index 784002999b03e..14cc8d4d3eb1b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { ViewSourceConfigurationButton } from '../../../../components/source_configuration/view_source_configuration_button';
-import { useLinkProps } from '../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../observability/public';
 
 interface InvalidNodeErrorProps {
   nodeName: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
index b8a52a8f34400..7d5c9b78b0095 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
@@ -19,7 +19,7 @@ import { NavItem } from './lib/side_nav_context';
 import { NodeDetailsPage } from './components/node_details_page';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
 import { useMetricsTimeContext } from './hooks/use_metrics_time';
-import { useLinkProps } from '../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../observability/public';
 import { MetricsPageTemplate } from '../page_template';
 import { inventoryTitle } from '../../../translations';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
index 581eec3e824ae..461d0defb000a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
@@ -28,7 +28,7 @@ import { createTSVBLink } from './helpers/create_tsvb_link';
 import { getNodeDetailUrl } from '../../../link_to/redirect_to_node_detail';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { HOST_FIELD, POD_FIELD, CONTAINER_FIELD } from '../../../../../common/constants';
-import { useLinkProps } from '../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../../../../observability/public';
 
 export interface Props {
   options: MetricsExplorerOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index 5d1f9bafdedaf..7c6e77876ac67 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -23,7 +23,7 @@ import {
 import { metricToFormat } from './metric_to_format';
 import { InfraFormatterType } from '../../../../../lib/lib';
 import { createMetricLabel } from './create_metric_label';
-import { LinkDescriptor } from '../../../../../hooks/use_link_props';
+import { LinkDescriptor } from '../../../../../../../observability/public';
 
 /*
  We've recently changed the default index pattern in Metrics UI from `metricbeat-*` to
diff --git a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
index b144b39d26dd4..076110a7a79c2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
@@ -19,7 +19,7 @@ import React, { useCallback, useContext, useMemo } from 'react';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { Source } from '../../../containers/metrics_source';
 import { useInfraMLCapabilitiesContext } from '../../../containers/ml/infra_ml_capabilities';
-import { Prompt } from '../../../utils/navigation_warning_prompt';
+import { Prompt } from '../../../../../observability/public';
 import { IndicesConfigurationPanel } from './indices_configuration_panel';
 import { MLConfigurationPanel } from './ml_configuration_panel';
 import { NameConfigurationPanel } from './name_configuration_panel';
diff --git a/x-pack/plugins/infra/public/hooks/use_link_props.test.tsx b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
similarity index 98%
rename from x-pack/plugins/infra/public/hooks/use_link_props.test.tsx
rename to x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
index bbe9b48ec59a7..5741b20e693a2 100644
--- a/x-pack/plugins/infra/public/hooks/use_link_props.test.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
@@ -7,7 +7,7 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 import { createMemoryHistory } from 'history';
-import React from 'react';
+import React, { PropsWithChildren } from 'react';
 import { Router } from 'react-router-dom';
 import { encode } from 'rison-node';
 import { coreMock } from 'src/core/public/mocks';
@@ -29,13 +29,13 @@ const history = createMemoryHistory();
 history.push(`${PREFIX}${INTERNAL_APP}`);
 const scopedHistory = new ScopedHistory(history, `${PREFIX}${INTERNAL_APP}`);
 
-const ProviderWrapper: React.FC = ({ children }) => {
+function ProviderWrapper({ children }: PropsWithChildren<{}>) {
   return (
     <Router history={scopedHistory}>
       <KibanaContextProvider services={{ ...coreStartMock }}>{children}</KibanaContextProvider>;
     </Router>
   );
-};
+}
 
 const renderUseLinkPropsHook = (props?: Partial<LinkDescriptor>) => {
   return renderHook(() => useLinkProps({ app: INTERNAL_APP, ...props }), {
diff --git a/x-pack/plugins/infra/public/hooks/use_link_props.tsx b/x-pack/plugins/observability/public/hooks/use_link_props.ts
similarity index 98%
rename from x-pack/plugins/infra/public/hooks/use_link_props.tsx
rename to x-pack/plugins/observability/public/hooks/use_link_props.ts
index 7546f9f0c9f79..8777d2a944ddf 100644
--- a/x-pack/plugins/infra/public/hooks/use_link_props.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.ts
@@ -21,12 +21,12 @@ export interface LinkDescriptor {
   search?: Search;
 }
 
-interface LinkProps {
+export interface LinkProps {
   href?: string;
   onClick?: (e: React.MouseEvent | React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>) => void;
 }
 
-interface Options {
+export interface Options {
   hrefOnly?: boolean;
 }
 
diff --git a/x-pack/plugins/infra/public/hooks/use_prefix_path_with_basepath.tsx b/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
similarity index 100%
rename from x-pack/plugins/infra/public/hooks/use_prefix_path_with_basepath.tsx
rename to x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
diff --git a/x-pack/plugins/observability/public/hooks/use_rules_link.ts b/x-pack/plugins/observability/public/hooks/use_rules_link.ts
new file mode 100644
index 0000000000000..af9f1967d81fd
--- /dev/null
+++ b/x-pack/plugins/observability/public/hooks/use_rules_link.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 { useLinkProps, Options, LinkProps } from './use_link_props';
+
+export function useRulesLink(options?: Options): LinkProps {
+  const manageRulesLinkProps = useLinkProps(
+    {
+      app: 'management',
+      pathname: '/insightsAndAlerting/triggersActions/alerts',
+    },
+    options
+  );
+
+  return manageRulesLinkProps;
+}
diff --git a/x-pack/plugins/observability/public/index.ts b/x-pack/plugins/observability/public/index.ts
index 08bdace817c15..3efbe4bef55e1 100644
--- a/x-pack/plugins/observability/public/index.ts
+++ b/x-pack/plugins/observability/public/index.ts
@@ -81,6 +81,11 @@ export * from './typings';
 export { useChartTheme } from './hooks/use_chart_theme';
 export { useBreadcrumbs } from './hooks/use_breadcrumbs';
 export { useTheme } from './hooks/use_theme';
+export { useRulesLink } from './hooks/use_rules_link';
+export { useLinkProps, shouldHandleLinkEvent } from './hooks/use_link_props';
+export type { LinkDescriptor } from './hooks/use_link_props';
+
+export { NavigationWarningPromptProvider, Prompt } from './utils/navigation_warning_prompt';
 export { getApmTraceUrl } from './utils/get_apm_trace_url';
 export { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/utils';
 export { ALL_VALUES_SELECTED } from './components/shared/field_value_suggestions/field_value_combobox';
diff --git a/x-pack/plugins/infra/public/utils/navigation_warning_prompt/context.tsx b/x-pack/plugins/observability/public/utils/navigation_warning_prompt/context.tsx
similarity index 85%
rename from x-pack/plugins/infra/public/utils/navigation_warning_prompt/context.tsx
rename to x-pack/plugins/observability/public/utils/navigation_warning_prompt/context.tsx
index cff685f27b05c..73e0502890728 100644
--- a/x-pack/plugins/infra/public/utils/navigation_warning_prompt/context.tsx
+++ b/x-pack/plugins/observability/public/utils/navigation_warning_prompt/context.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useState, PropsWithChildren } from 'react';
 import { createContext, useContext } from 'react';
 
 interface ContextValues {
@@ -21,7 +21,7 @@ export const useNavigationWarningPrompt = () => {
   return useContext(NavigationWarningPromptContext);
 };
 
-export const NavigationWarningPromptProvider: React.FC = ({ children }) => {
+export function NavigationWarningPromptProvider({ children }: PropsWithChildren<{}>) {
   const [prompt, setPrompt] = useState<string | undefined>(undefined);
 
   return (
@@ -29,4 +29,4 @@ export const NavigationWarningPromptProvider: React.FC = ({ children }) => {
       {children}
     </NavigationWarningPromptContext.Provider>
   );
-};
+}
diff --git a/x-pack/plugins/infra/public/utils/navigation_warning_prompt/index.ts b/x-pack/plugins/observability/public/utils/navigation_warning_prompt/index.ts
similarity index 100%
rename from x-pack/plugins/infra/public/utils/navigation_warning_prompt/index.ts
rename to x-pack/plugins/observability/public/utils/navigation_warning_prompt/index.ts
diff --git a/x-pack/plugins/infra/public/utils/navigation_warning_prompt/prompt.tsx b/x-pack/plugins/observability/public/utils/navigation_warning_prompt/prompt.tsx
similarity index 91%
rename from x-pack/plugins/infra/public/utils/navigation_warning_prompt/prompt.tsx
rename to x-pack/plugins/observability/public/utils/navigation_warning_prompt/prompt.tsx
index 4ef6e6032d141..f4d09e24c761c 100644
--- a/x-pack/plugins/infra/public/utils/navigation_warning_prompt/prompt.tsx
+++ b/x-pack/plugins/observability/public/utils/navigation_warning_prompt/prompt.tsx
@@ -12,6 +12,7 @@ interface Props {
   prompt?: string;
 }
 
+// eslint-disable-next-line react/function-component-definition
 export const Prompt: React.FC<Props> = ({ prompt }) => {
   const { setPrompt } = useNavigationWarningPrompt();
 

From aad83ed0b626f7f8a960cd9d9f70d977754fc160 Mon Sep 17 00:00:00 2001
From: Kate Farrar <kate.farrar@gmail.com>
Date: Thu, 10 Feb 2022 04:25:54 -0700
Subject: [PATCH 45/85] [Stack Monitoring] Page layout fixes (#124182)

* adding EUI page layout components

* adding context menu button to toolbar and cleaning up tabs

* [Monitoring] Integrate setup mode toggle button with React tree

* Update unit tests

* Only show setup mode button on supported pages

* Move setup mode supported responsibility to renderer

* Fix failing unit test

Co-authored-by: Milton Hultgren <milton.hultgren@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../application/pages/page_template.tsx       | 76 ++++++++++++-------
 .../__snapshots__/setup_mode.test.js.snap     | 28 ++-----
 .../public/components/renderers/setup_mode.js | 50 +++++-------
 .../components/renderers/setup_mode.test.js   | 26 +++++--
 .../__snapshots__/enter_button.test.tsx.snap  | 18 -----
 .../components/setup_mode/enter_button.scss   |  3 -
 .../setup_mode/enter_button.test.tsx          | 43 -----------
 .../components/setup_mode/exit_button.tsx     | 32 ++++++++
 .../setup_mode/toggle_button.test.tsx         | 52 +++++++++++++
 .../{enter_button.tsx => toggle_button.tsx}   | 48 ++++++------
 .../public/components/shared/toolbar.tsx      | 58 +++++---------
 .../monitoring/public/lib/setup_mode.test.js  | 24 ------
 .../monitoring/public/lib/setup_mode.tsx      | 33 ++------
 13 files changed, 225 insertions(+), 266 deletions(-)
 delete mode 100644 x-pack/plugins/monitoring/public/components/setup_mode/__snapshots__/enter_button.test.tsx.snap
 delete mode 100644 x-pack/plugins/monitoring/public/components/setup_mode/enter_button.scss
 delete mode 100644 x-pack/plugins/monitoring/public/components/setup_mode/enter_button.test.tsx
 create mode 100644 x-pack/plugins/monitoring/public/components/setup_mode/exit_button.tsx
 create mode 100644 x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.test.tsx
 rename x-pack/plugins/monitoring/public/components/setup_mode/{enter_button.tsx => toggle_button.tsx} (50%)

diff --git a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
index 37ac69a56e40d..06a274d94be10 100644
--- a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
@@ -5,7 +5,15 @@
  * 2.0.
  */
 
-import { EuiTab, EuiTabs } from '@elastic/eui';
+import {
+  EuiPage,
+  EuiPageContent,
+  EuiPageBody,
+  EuiPageContentBody,
+  EuiTab,
+  EuiTabs,
+  EuiSpacer,
+} from '@elastic/eui';
 import React, { useContext, useState, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
@@ -16,11 +24,13 @@ import { PageLoading } from '../../components';
 import {
   getSetupModeState,
   isSetupModeFeatureEnabled,
+  toggleSetupMode,
   updateSetupModeData,
 } from '../../lib/setup_mode';
 import { SetupModeFeature } from '../../../common/enums';
 import { AlertsDropdown } from '../../alerts/alerts_dropdown';
 import { useRequestErrorHandler } from '../hooks/use_request_error_handler';
+import { SetupModeToggleButton } from '../../components/setup_mode/toggle_button';
 import { HeaderMenuPortal } from '../../../../observability/public';
 import { HeaderActionMenuContext } from '../../application/contexts/header_action_menu_context';
 
@@ -104,34 +114,44 @@ export const PageTemplate: React.FC<PageTemplateProps> = ({
     return children;
   };
 
+  const { supported, enabled } = getSetupModeState();
+
   return (
-    <div className="app-container" data-test-subj="monitoringAppContainer">
-      {setHeaderActionMenu && theme$ && (
-        <HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu} theme$={theme$}>
-          <AlertsDropdown />
-        </HeaderMenuPortal>
-      )}
-      <MonitoringToolbar pageTitle={pageTitle} onRefresh={onRefresh} />
-      {tabs && (
-        <EuiTabs>
-          {tabs.map((item, idx) => {
-            return (
-              <EuiTab
-                key={idx}
-                disabled={isDisabledTab(product)}
-                title={item.label}
-                data-test-subj={item.testSubj}
-                href={createHref(item.route)}
-                isSelected={isTabSelected(item.route)}
-              >
-                {item.label}
-              </EuiTab>
-            );
-          })}
-        </EuiTabs>
-      )}
-      <div>{renderContent()}</div>
-    </div>
+    <EuiPage data-test-subj="monitoringAppContainer">
+      <EuiPageBody>
+        <EuiPageContent>
+          {setHeaderActionMenu && theme$ && (
+            <HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu} theme$={theme$}>
+              {supported && (
+                <SetupModeToggleButton enabled={enabled} toggleSetupMode={toggleSetupMode} />
+              )}
+              <AlertsDropdown />
+            </HeaderMenuPortal>
+          )}
+          <MonitoringToolbar pageTitle={pageTitle} onRefresh={onRefresh} />
+          <EuiSpacer size="m" />
+          {tabs && (
+            <EuiTabs size="l">
+              {tabs.map((item, idx) => {
+                return (
+                  <EuiTab
+                    key={idx}
+                    disabled={isDisabledTab(product)}
+                    title={item.label}
+                    data-test-subj={item.testSubj}
+                    href={createHref(item.route)}
+                    isSelected={isTabSelected(item.route)}
+                  >
+                    {item.label}
+                  </EuiTab>
+                );
+              })}
+            </EuiTabs>
+          )}
+          <EuiPageContentBody>{renderContent()}</EuiPageContentBody>
+        </EuiPageContent>
+      </EuiPageBody>
+    </EuiPage>
   );
 };
 
diff --git a/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap b/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
index b5d37c2c2afae..2e0caa8472fbd 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
@@ -76,17 +76,9 @@ exports[`SetupModeRenderer should render the flyout open 1`] = `
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
-              color="danger"
-              data-test-subj="exitSetupModeBtn"
-              fill={true}
-              iconSide="right"
-              iconType="flag"
-              onClick={[Function]}
-              size="s"
-            >
-              Exit setup mode
-            </EuiButton>
+            <SetupModeExitButton
+              exitSetupMode={[Function]}
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
@@ -177,17 +169,9 @@ exports[`SetupModeRenderer should render with setup mode enabled 1`] = `
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
-              color="danger"
-              data-test-subj="exitSetupModeBtn"
-              fill={true}
-              iconSide="right"
-              iconType="flag"
-              onClick={[Function]}
-              size="s"
-            >
-              Exit setup mode
-            </EuiButton>
+            <SetupModeExitButton
+              exitSetupMode={[Function]}
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
diff --git a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
index 1ee9158d957fd..3680a00cbe3c7 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
+++ b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
@@ -5,31 +5,31 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
-import {
-  getSetupModeState,
-  initSetupModeState,
-  updateSetupModeData,
-  disableElasticsearchInternalCollection,
-  toggleSetupMode,
-  setSetupModeMenuItem,
-} from '../../lib/setup_mode';
-import { Flyout } from '../metricbeat_migration/flyout';
 import {
   EuiBottomBar,
-  EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiTextColor,
   EuiIcon,
   EuiSpacer,
+  EuiTextColor,
 } from '@elastic/eui';
-import { findNewUuid } from './lib/find_new_uuid';
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { GlobalStateContext } from '../../application/contexts/global_state_context';
+import React, { Fragment } from 'react';
 import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { GlobalStateContext } from '../../application/contexts/global_state_context';
 import { useRequestErrorHandler } from '../../application/hooks/use_request_error_handler';
+import {
+  disableElasticsearchInternalCollection,
+  getSetupModeState,
+  initSetupModeState,
+  markSetupModeSupported,
+  markSetupModeUnsupported,
+  toggleSetupMode,
+  updateSetupModeData,
+} from '../../lib/setup_mode';
+import { Flyout } from '../metricbeat_migration/flyout';
+import { SetupModeExitButton } from '../setup_mode/exit_button';
+import { findNewUuid } from './lib/find_new_uuid';
 
 export class WrappedSetupModeRenderer extends React.Component {
   globalState;
@@ -44,6 +44,7 @@ export class WrappedSetupModeRenderer extends React.Component {
   UNSAFE_componentWillMount() {
     this.globalState = this.context;
     const { kibana, onHttpError } = this.props;
+    markSetupModeSupported();
     initSetupModeState(this.globalState, kibana.services.http, onHttpError, (_oldData) => {
       const newState = { renderState: true };
 
@@ -70,7 +71,10 @@ export class WrappedSetupModeRenderer extends React.Component {
 
       this.setState(newState);
     });
-    setSetupModeMenuItem();
+  }
+
+  componentWillUnmount() {
+    markSetupModeUnsupported();
   }
 
   reset() {
@@ -155,19 +159,7 @@ export class WrappedSetupModeRenderer extends React.Component {
             <EuiFlexItem grow={false}>
               <EuiFlexGroup gutterSize="s">
                 <EuiFlexItem grow={false}>
-                  <EuiButton
-                    color="danger"
-                    fill
-                    iconType="flag"
-                    iconSide="right"
-                    size="s"
-                    onClick={() => toggleSetupMode(false)}
-                    data-test-subj="exitSetupModeBtn"
-                  >
-                    {i18n.translate('xpack.monitoring.setupMode.exit', {
-                      defaultMessage: `Exit setup mode`,
-                    })}
-                  </EuiButton>
+                  <SetupModeExitButton exitSetupMode={() => toggleSetupMode(false)} />
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiFlexItem>
diff --git a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.test.js b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.test.js
index 9672da8b8088a..f2e952c96e88f 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.test.js
+++ b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.test.js
@@ -23,11 +23,13 @@ describe('SetupModeRenderer', () => {
   it('should render with setup mode disabled', () => {
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: false,
       }),
       initSetupModeState: () => {},
       updateSetupModeData: () => {},
-      setSetupModeMenuItem: () => {},
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -53,6 +55,7 @@ describe('SetupModeRenderer', () => {
   it('should render with setup mode enabled', () => {
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: true,
         data: {
           elasticsearch: {},
@@ -61,7 +64,8 @@ describe('SetupModeRenderer', () => {
       }),
       initSetupModeState: () => {},
       updateSetupModeData: () => {},
-      setSetupModeMenuItem: () => {},
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -87,6 +91,7 @@ describe('SetupModeRenderer', () => {
   it('should render the flyout open', () => {
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: true,
         data: {
           elasticsearch: {
@@ -97,7 +102,8 @@ describe('SetupModeRenderer', () => {
       }),
       initSetupModeState: () => {},
       updateSetupModeData: () => {},
-      setSetupModeMenuItem: () => {},
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -125,6 +131,7 @@ describe('SetupModeRenderer', () => {
   it('should handle a new node/instance scenario', () => {
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: true,
         data: {
           elasticsearch: {
@@ -135,7 +142,8 @@ describe('SetupModeRenderer', () => {
       }),
       initSetupModeState: () => {},
       updateSetupModeData: () => {},
-      setSetupModeMenuItem: () => {},
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -166,6 +174,7 @@ describe('SetupModeRenderer', () => {
     jest.useFakeTimers();
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: true,
         data: {
           elasticsearch: {
@@ -188,7 +197,8 @@ describe('SetupModeRenderer', () => {
         }, 500);
       },
       updateSetupModeData: () => {},
-      setSetupModeMenuItem: () => {},
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -220,9 +230,9 @@ describe('SetupModeRenderer', () => {
   it('should set the top menu items', () => {
     const newProduct = { id: 1 };
 
-    const setSetupModeMenuItem = jest.fn();
     jest.doMock('../../lib/setup_mode', () => ({
       getSetupModeState: () => ({
+        supported: true,
         enabled: true,
         data: {
           elasticsearch: {
@@ -245,7 +255,8 @@ describe('SetupModeRenderer', () => {
         }, 500);
       },
       updateSetupModeData: () => {},
-      setSetupModeMenuItem,
+      markSetupModeSupported: () => {},
+      markSetupModeUnsupported: () => {},
     }));
     const SetupModeRenderer = require('./setup_mode').WrappedSetupModeRenderer;
 
@@ -267,6 +278,5 @@ describe('SetupModeRenderer', () => {
 
     component.setState({ isFlyoutOpen: true });
     component.update();
-    expect(setSetupModeMenuItem).toHaveBeenCalled();
   });
 });
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/__snapshots__/enter_button.test.tsx.snap b/x-pack/plugins/monitoring/public/components/setup_mode/__snapshots__/enter_button.test.tsx.snap
deleted file mode 100644
index 0cf078d260ec7..0000000000000
--- a/x-pack/plugins/monitoring/public/components/setup_mode/__snapshots__/enter_button.test.tsx.snap
+++ /dev/null
@@ -1,18 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EnterButton should render properly 1`] = `
-<div
-  className="monSetupModeEnterButton__buttonWrapper"
->
-  <EuiButton
-    data-test-subj="monitoringSetupModeBtn"
-    iconSide="right"
-    iconType="flag"
-    isLoading={false}
-    onClick={[Function]}
-    size="s"
-  >
-    Enter setup mode
-  </EuiButton>
-</div>
-`;
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.scss b/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.scss
deleted file mode 100644
index e19b4fa760641..0000000000000
--- a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.monSetupModeEnterButton__buttonWrapper {
-  padding: $euiSizeM;
-}
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.test.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.test.tsx
deleted file mode 100644
index 287918b11ba30..0000000000000
--- a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.test.tsx
+++ /dev/null
@@ -1,43 +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 { SetupModeEnterButton } from './enter_button';
-
-describe('EnterButton', () => {
-  it('should render properly', () => {
-    const component = shallow(<SetupModeEnterButton enabled={true} toggleSetupMode={jest.fn()} />);
-    expect(component).toMatchSnapshot();
-  });
-
-  it('should show a loading state', () => {
-    const component = shallow(<SetupModeEnterButton enabled={true} toggleSetupMode={jest.fn()} />);
-
-    component.find('EuiButton').simulate('click');
-
-    expect(component.find('EuiButton').prop('isLoading')).toBe(true);
-  });
-
-  it('should call toggleSetupMode', () => {
-    const toggleSetupMode = jest.fn();
-    const component = shallow(
-      <SetupModeEnterButton enabled={true} toggleSetupMode={toggleSetupMode} />
-    );
-
-    component.find('EuiButton').simulate('click');
-    expect(toggleSetupMode).toHaveBeenCalledWith(true);
-  });
-
-  it('should not render if not enabled', () => {
-    const toggleSetupMode = jest.fn();
-    const component = shallow(
-      <SetupModeEnterButton enabled={false} toggleSetupMode={toggleSetupMode} />
-    );
-    expect(component.html()).toBe(null);
-  });
-});
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/exit_button.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/exit_button.tsx
new file mode 100644
index 0000000000000..b8c5a9ec10f04
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/components/setup_mode/exit_button.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 { i18n } from '@kbn/i18n';
+import { EuiButton } from '@elastic/eui';
+import React from 'react';
+
+interface SetupModeExitButtonProps {
+  exitSetupMode: () => void;
+}
+
+export function SetupModeExitButton({ exitSetupMode }: SetupModeExitButtonProps) {
+  return (
+    <EuiButton
+      color="danger"
+      fill
+      iconType="flag"
+      iconSide="right"
+      size="s"
+      onClick={exitSetupMode}
+      data-test-subj="exitSetupModeBtn"
+    >
+      {i18n.translate('xpack.monitoring.setupMode.exit', {
+        defaultMessage: `Exit setup mode`,
+      })}
+    </EuiButton>
+  );
+}
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.test.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.test.tsx
new file mode 100644
index 0000000000000..a2d2904b5f9c9
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.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 { act, fireEvent, render } from '@testing-library/react';
+import { SetupModeToggleButton } from './toggle_button';
+
+describe('ToggleButton', () => {
+  describe('when setup mode is disabled', () => {
+    it('should render the enter setup mode button', () => {
+      const { getByText } = render(
+        <SetupModeToggleButton enabled={false} toggleSetupMode={jest.fn()} />
+      );
+      expect(getByText('Enter setup mode')).toBeInTheDocument();
+    });
+
+    it('should call toggleSetupMode to enable setup mode', () => {
+      const toggleSetupMode = jest.fn();
+      const { getByText } = render(
+        <SetupModeToggleButton enabled={false} toggleSetupMode={toggleSetupMode} />
+      );
+      act(() => {
+        fireEvent.click(getByText('Enter setup mode'));
+      });
+      expect(toggleSetupMode).toHaveBeenCalledWith(true);
+    });
+  });
+
+  describe('when setup mode is enabled', () => {
+    it('should render the exit setup mode button', () => {
+      const { getByText } = render(
+        <SetupModeToggleButton enabled={true} toggleSetupMode={jest.fn()} />
+      );
+      expect(getByText('Exit setup mode')).toBeInTheDocument();
+    });
+
+    it('should call toggleSetupMode to disable setup mode', () => {
+      const toggleSetupMode = jest.fn();
+      const { getByText } = render(
+        <SetupModeToggleButton enabled={true} toggleSetupMode={toggleSetupMode} />
+      );
+      act(() => {
+        fireEvent.click(getByText('Exit setup mode'));
+      });
+      expect(toggleSetupMode).toHaveBeenCalledWith(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
similarity index 50%
rename from x-pack/plugins/monitoring/public/components/setup_mode/enter_button.tsx
rename to x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
index 42b60c5930af9..3e931caadcdff 100644
--- a/x-pack/plugins/monitoring/public/components/setup_mode/enter_button.tsx
+++ b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
@@ -8,49 +8,47 @@
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import './enter_button.scss';
 import { METRIC_TYPE, useUiTracker } from '../../../../observability/public';
 import { TELEMETRY_METRIC_BUTTON_CLICK } from '../../../common/constants';
+import { SetupModeExitButton } from './exit_button';
 
-export interface SetupModeEnterButtonProps {
+export interface SetupModeToggleButtonProps {
   enabled: boolean;
   toggleSetupMode: (state: boolean) => void;
 }
 
-export const SetupModeEnterButton: React.FC<SetupModeEnterButtonProps> = (
-  props: SetupModeEnterButtonProps
+export const SetupModeToggleButton: React.FC<SetupModeToggleButtonProps> = (
+  props: SetupModeToggleButtonProps
 ) => {
   const [isLoading, setIsLoading] = React.useState(false);
   const trackStat = useUiTracker({ app: 'stack_monitoring' });
 
-  if (!props.enabled) {
-    return null;
-  }
-
-  async function enterSetupMode() {
+  function toggleSetupMode(enabled: boolean, stat: string) {
     setIsLoading(true);
-    await props.toggleSetupMode(true);
+    props.toggleSetupMode(enabled);
     trackStat({
-      metric: `${TELEMETRY_METRIC_BUTTON_CLICK}setupmode_enter`,
+      metric: `${TELEMETRY_METRIC_BUTTON_CLICK}setupmode_${stat}`,
       metricType: METRIC_TYPE.CLICK,
     });
     setIsLoading(false);
   }
 
+  if (props.enabled) {
+    return <SetupModeExitButton exitSetupMode={() => toggleSetupMode(false, 'exit')} />;
+  }
+
   return (
-    <div className="monSetupModeEnterButton__buttonWrapper">
-      <EuiButton
-        onClick={enterSetupMode}
-        iconType="flag"
-        size="s"
-        iconSide="right"
-        isLoading={isLoading}
-        data-test-subj="monitoringSetupModeBtn"
-      >
-        {i18n.translate('xpack.monitoring.setupMode.enter', {
-          defaultMessage: 'Enter setup mode',
-        })}
-      </EuiButton>
-    </div>
+    <EuiButton
+      onClick={() => toggleSetupMode(true, 'enter')}
+      iconType="flag"
+      size="s"
+      iconSide="right"
+      isLoading={isLoading}
+      data-test-subj="monitoringSetupModeBtn"
+    >
+      {i18n.translate('xpack.monitoring.setupMode.enter', {
+        defaultMessage: 'Enter setup mode',
+      })}
+    </EuiButton>
   );
 };
diff --git a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
index eac4814580adb..7ae60d1cc102b 100644
--- a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
+++ b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
@@ -5,13 +5,7 @@
  * 2.0.
  */
 
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSuperDatePicker,
-  EuiTitle,
-  OnRefreshChangeProps,
-} from '@elastic/eui';
+import { EuiPageHeader, EuiSuperDatePicker, OnRefreshChangeProps } from '@elastic/eui';
 import React, { useContext, useCallback, useMemo } from 'react';
 import { MonitoringTimeContainer } from '../../application/hooks/use_monitoring_time';
 import { GlobalStateContext } from '../../application/contexts/global_state_context';
@@ -83,39 +77,21 @@ export const MonitoringToolbar: React.FC<MonitoringToolbarProps> = ({ pageTitle,
   );
 
   return (
-    <EuiFlexGroup gutterSize="l" justifyContent="spaceBetween" responsive>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" justifyContent="spaceEvenly" direction="column" responsive>
-          <EuiFlexItem>
-            <div id="setupModeNav">{/* HERE GOES THE SETUP BUTTON */}</div>
-          </EuiFlexItem>
-          <EuiFlexItem className="monTopNavSecondItem">
-            {pageTitle && (
-              <div data-test-subj="monitoringPageTitle">
-                <EuiTitle size="xs">
-                  <h1>{pageTitle}</h1>
-                </EuiTitle>
-              </div>
-            )}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <div style={{ padding: 8 }}>
-          <EuiSuperDatePicker
-            isDisabled={isDisabled}
-            start={currentTimerange.from}
-            end={currentTimerange.to}
-            onTimeChange={onTimeChange}
-            onRefresh={onRefresh}
-            isPaused={isPaused}
-            refreshInterval={refreshInterval}
-            onRefreshChange={onRefreshChange}
-            commonlyUsedRanges={commonlyUsedRanges}
-          />
-        </div>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <EuiPageHeader
+      pageTitle={pageTitle}
+      rightSideItems={[
+        <EuiSuperDatePicker
+          isDisabled={isDisabled}
+          start={currentTimerange.from}
+          end={currentTimerange.to}
+          onTimeChange={onTimeChange}
+          onRefresh={onRefresh}
+          isPaused={isPaused}
+          refreshInterval={refreshInterval}
+          onRefreshChange={onRefreshChange}
+          commonlyUsedRanges={commonlyUsedRanges}
+        />,
+      ]}
+    />
   );
 };
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.test.js b/x-pack/plugins/monitoring/public/lib/setup_mode.test.js
index bacc305764d68..5cd462f05b8ed 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.test.js
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.test.js
@@ -9,15 +9,10 @@ let toggleSetupMode;
 let initSetupModeState;
 let getSetupModeState;
 let updateSetupModeData;
-let setSetupModeMenuItem;
 
 const handleErrorsMock = jest.fn();
 const callbackMock = jest.fn();
 
-jest.mock('react-dom', () => ({
-  render: jest.fn(),
-}));
-
 jest.mock('../legacy_shims', () => {
   return {
     Legacy: {
@@ -39,7 +34,6 @@ function setModulesAndMocks() {
   initSetupModeState = setupMode.initSetupModeState;
   getSetupModeState = setupMode.getSetupModeState;
   updateSetupModeData = setupMode.updateSetupModeData;
-  setSetupModeMenuItem = setupMode.setSetupModeMenuItem;
 }
 
 function waitForSetupModeData() {
@@ -80,24 +74,6 @@ describe('setup_mode', () => {
       toggleSetupMode(false);
       expect(globalState.inSetupMode).toBe(false);
     });
-
-    it('should set top nav config', async () => {
-      const globalState = {
-        inSetupMode: false,
-        save: jest.fn(),
-      };
-      const httpServiceMock = {
-        post: jest.fn(),
-      };
-
-      const render = require('react-dom').render;
-
-      await initSetupModeState(globalState, httpServiceMock, handleErrorsMock, callbackMock);
-      setSetupModeMenuItem();
-      toggleSetupMode(true);
-
-      expect(render.mock.calls.length).toBe(2);
-    });
   });
 
   describe('in setup mode', () => {
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
index 2fae120012d73..eca6ba2818503 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
@@ -5,33 +5,27 @@
  * 2.0.
  */
 
-import React from 'react';
-import { render } from 'react-dom';
-import { get, includes } from 'lodash';
+import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { HttpStart, IHttpFetchError, ResponseErrorBody } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 import { Legacy } from '../legacy_shims';
-import { SetupModeEnterButton } from '../components/setup_mode/enter_button';
 import { SetupModeFeature } from '../../common/enums';
 import { ISetupModeContext } from '../components/setup_mode/setup_mode_context';
 import { State as GlobalState } from '../application/contexts/global_state_context';
 
-function isOnPage(hash: string) {
-  return includes(window.location.hash, hash);
-}
-
 let globalState: GlobalState;
 let httpService: HttpStart;
 let errorHandler: (error: IHttpFetchError<ResponseErrorBody>) => void;
 
 interface ISetupModeState {
+  supported: boolean;
   enabled: boolean;
   data: any;
   callback?: (() => void) | null;
   hideBottomBar: boolean;
 }
 const setupModeState: ISetupModeState = {
+  supported: false,
   enabled: false,
   data: null,
   callback: null,
@@ -132,7 +126,6 @@ export const toggleSetupMode = (inSetupMode: boolean) => {
   setupModeState.enabled = inSetupMode;
   globalState.inSetupMode = inSetupMode;
   globalState.save?.();
-  setSetupModeMenuItem();
   notifySetupModeDataChange();
 
   if (inSetupMode) {
@@ -141,22 +134,12 @@ export const toggleSetupMode = (inSetupMode: boolean) => {
   }
 };
 
-export const setSetupModeMenuItem = () => {
-  if (isOnPage('no-data')) {
-    return;
-  }
+export const markSetupModeSupported = () => {
+  setupModeState.supported = true;
+};
 
-  const enabled = !globalState.inSetupMode;
-  const I18nContext = Legacy.shims.I18nContext;
-
-  render(
-    <KibanaContextProvider services={Legacy.shims.kibanaServices}>
-      <I18nContext>
-        <SetupModeEnterButton enabled={enabled} toggleSetupMode={toggleSetupMode} />
-      </I18nContext>
-    </KibanaContextProvider>,
-    document.getElementById('setupModeNav')
-  );
+export const markSetupModeUnsupported = () => {
+  setupModeState.supported = false;
 };
 
 export const initSetupModeState = async (

From f693a236c2e5caa417c97f511962b7f34f134e58 Mon Sep 17 00:00:00 2001
From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Date: Thu, 10 Feb 2022 12:45:38 +0100
Subject: [PATCH 46/85] [Fleet] Edit package policy tests (#125068)

* edit package policy test

* moved out styled component, added null checks

* added tests for submit
---
 x-pack/plugins/fleet/README.md                |  15 +-
 .../package_policy_input_config.tsx           |   3 +-
 .../components/package_policy_input_panel.tsx |   4 +-
 .../package_policy_input_stream.tsx           |  10 +-
 .../edit_package_policy_page/index.test.tsx   | 379 ++++++++++++++++++
 .../edit_package_policy_page/index.tsx        |  14 +-
 .../applications/integrations/hooks/index.ts  |   4 +-
 7 files changed, 406 insertions(+), 23 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.test.tsx

diff --git a/x-pack/plugins/fleet/README.md b/x-pack/plugins/fleet/README.md
index f67314ba49fa4..8fc7967234e8f 100644
--- a/x-pack/plugins/fleet/README.md
+++ b/x-pack/plugins/fleet/README.md
@@ -147,10 +147,11 @@ Write stories by creating `.stories.tsx` files colocated with the components you
 
 The projects below are dependent on Fleet, most using Fleet API as well. In case of breaking changes in Fleet functionality/API, the project owners have to be notified to make sure they can plan for the necessary changes on their end to avoid unexpected break in functionality.
 
- * [Elastic Agent](https://github.com/elastic/beats/blob/master/x-pack/elastic-agent): uses Fleet API to enroll agents. [See here](https://github.com/elastic/beats/blob/master/x-pack/elastic-agent/pkg/agent/cmd/container.go)
- * [Fleet Server](https://github.com/elastic/fleet-server): uses Fleet API to enroll fleet server [See here](https://github.com/elastic/fleet-server/blob/master/cmd/fleet/router.go)
- * [elastic-package](https://github.com/elastic/elastic-package): command line tool, uses Fleet with docker compose and Fleet API [See here](https://github.com/elastic/elastic-package/tree/master/internal/kibana)
- * [Azure VM extension](https://github.com/elastic/azure-vm-extension): automation tool for Azure VMs, uses Fleet API to enroll agents [See here](https://github.com/elastic/azure-vm-extension/blob/main/src/handler/windows/scripts/enable.ps1)
- * [e2e-testing](https://github.com/elastic/e2e-testing): internal project that runs Fleet and tests Fleet API [See here](https://github.com/elastic/e2e-testing/tree/main/internal/kibana)
- * [observability-test-environments](https://github.com/elastic/observability-test-environments): internal project, uses Fleet API [See here](https://github.com/elastic/observability-test-environments/blob/master/ansible/tasks-fleet-config.yml)
-  * [ECK](https://github.com/elastic/cloud-on-k8s): Elastic Cloud on Kubernetes, orchestrates Elastic Stack applications, including Kibana with Fleet (no direct dependency, has examples that include Fleet config) [See here](https://github.com/elastic/cloud-on-k8s/blob/main/docs/orchestrating-elastic-stack-applications/agent-fleet.asciidoc)
\ No newline at end of file
+ * [Elastic Agent](https://github.com/elastic/beats/blob/master/x-pack/elastic-agent): uses Fleet API to enroll agents. [Check here](https://github.com/elastic/beats/blob/master/x-pack/elastic-agent/pkg/agent/cmd/container.go)
+ * [Fleet Server](https://github.com/elastic/fleet-server): uses Fleet API to enroll fleet server [Check here](https://github.com/elastic/fleet-server/blob/master/cmd/fleet/router.go)
+ * [elastic-package](https://github.com/elastic/elastic-package): command line tool, uses Fleet with docker compose and Fleet API [Check here](https://github.com/elastic/elastic-package/tree/master/internal/kibana)
+ * [Azure VM extension](https://github.com/elastic/azure-vm-extension): automation tool for Azure VMs, uses Fleet API to enroll agents [Check here](https://github.com/elastic/azure-vm-extension/blob/main/src/handler/windows/scripts/enable.ps1)
+ * [e2e-testing](https://github.com/elastic/e2e-testing): internal project that runs Fleet and tests Fleet API [Check here](https://github.com/elastic/e2e-testing/tree/main/internal/kibana)
+ * [observability-test-environments](https://github.com/elastic/observability-test-environments): internal project, uses Fleet API [Check here](https://github.com/elastic/observability-test-environments/blob/master/ansible/tasks-fleet-config.yml)
+  * [ECK](https://github.com/elastic/cloud-on-k8s): Elastic Cloud on Kubernetes, orchestrates Elastic Stack applications, including Kibana with Fleet (no direct dependency, has examples that include Fleet config) [Check here](https://github.com/elastic/cloud-on-k8s/blob/main/docs/orchestrating-elastic-stack-applications/agent-fleet.asciidoc)
+  * [APM Server](https://github.com/elastic/apm-server) APM Server, receives data from Elastic APM agents. Using docker compose for testing. [Check here](https://github.com/elastic/apm-server/pull/7227/files) 
\ No newline at end of file
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
index 50305249ab7f4..73a74d09abb33 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
@@ -105,7 +105,8 @@ export const PackagePolicyInputConfig: React.FunctionComponent<{
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
               const { name: varName, type: varType } = varDef;
-              const { value, frozen } = packagePolicyInput.vars![varName];
+              if (!packagePolicyInput.vars) return;
+              const { value, frozen } = packagePolicyInput.vars[varName];
               return (
                 <EuiFlexItem key={varName}>
                   <PackagePolicyInputVarField
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
index 4883972c455d5..ce8762dcfb842 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
@@ -193,7 +193,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
               packageInputVars={packageInput.vars}
               packagePolicyInput={packagePolicyInput}
               updatePackagePolicyInput={updatePackagePolicyInput}
-              inputVarsValidationResults={{ vars: inputValidationResults.vars }}
+              inputVarsValidationResults={{ vars: inputValidationResults?.vars }}
               forceShowErrors={forceShowErrors}
             />
             {hasInputStreams ? <ShortenedHorizontalRule margin="m" /> : <EuiSpacer size="l" />}
@@ -238,7 +238,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
                     updatePackagePolicyInput(updatedInput);
                   }}
                   inputStreamValidationResults={
-                    inputValidationResults.streams![packagePolicyInputStream!.data_stream!.dataset]
+                    inputValidationResults?.streams![packagePolicyInputStream!.data_stream!.dataset]
                   }
                   forceShowErrors={forceShowErrors}
                 />
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
index edc7d6f02bc0a..3e376d4344938 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
@@ -70,9 +70,9 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
     const advancedVarsWithErrorsCount: number = useMemo(
       () =>
         advancedVars.filter(
-          ({ name: varName }) => inputStreamValidationResults.vars?.[varName]?.length
+          ({ name: varName }) => inputStreamValidationResults?.vars?.[varName]?.length
         ).length,
-      [advancedVars, inputStreamValidationResults.vars]
+      [advancedVars, inputStreamValidationResults?.vars]
     );
 
     return (
@@ -106,7 +106,7 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
         <FlexItemWithMaxWidth>
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
-              if (!packagePolicyInputStream.vars) return null;
+              if (!packagePolicyInputStream?.vars) return null;
               const { name: varName, type: varType } = varDef;
               const varConfigEntry = packagePolicyInputStream.vars?.[varName];
               const value = varConfigEntry?.value;
@@ -129,7 +129,7 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
                         },
                       });
                     }}
-                    errors={inputStreamValidationResults.vars![varName]}
+                    errors={inputStreamValidationResults?.vars![varName]}
                     forceShowErrors={forceShowErrors}
                   />
                 </EuiFlexItem>
@@ -187,7 +187,7 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
                                 },
                               });
                             }}
-                            errors={inputStreamValidationResults.vars![varName]}
+                            errors={inputStreamValidationResults?.vars![varName]}
                             forceShowErrors={forceShowErrors}
                           />
                         </EuiFlexItem>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.test.tsx
new file mode 100644
index 0000000000000..3a5050b1b6d06
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.test.tsx
@@ -0,0 +1,379 @@
+/*
+ * 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 { fireEvent, act, waitFor } from '@testing-library/react';
+
+import type { TestRenderer } from '../../../../../mock';
+import { createFleetTestRendererMock } from '../../../../../mock';
+
+import {
+  useUIExtension,
+  sendGetOneAgentPolicy,
+  sendGetOnePackagePolicy,
+  sendUpgradePackagePolicyDryRun,
+  sendUpdatePackagePolicy,
+  useStartServices,
+} from '../../../hooks';
+import { useGetOnePackagePolicy } from '../../../../integrations/hooks';
+
+import { EditPackagePolicyPage } from '.';
+
+type MockFn = jest.MockedFunction<any>;
+
+jest.mock('../../../hooks', () => {
+  return {
+    ...jest.requireActual('../../../hooks'),
+    sendGetAgentStatus: jest.fn().mockResolvedValue({ data: { results: { total: 0 } } }),
+    sendUpdatePackagePolicy: jest.fn(),
+    sendGetOnePackagePolicy: jest.fn(),
+    sendGetOneAgentPolicy: jest.fn(),
+    sendUpgradePackagePolicyDryRun: jest.fn(),
+    sendGetPackageInfoByKey: jest.fn().mockImplementation((name, version) =>
+      Promise.resolve({
+        data: {
+          item: {
+            name,
+            title: 'Nginx',
+            version,
+            release: 'ga',
+            description: 'Collect logs and metrics from Nginx HTTP servers with Elastic Agent.',
+            policy_templates: [
+              {
+                name: 'nginx',
+                title: 'Nginx logs and metrics',
+                description: 'Collect logs and metrics from Nginx instances',
+                inputs: [
+                  {
+                    type: 'logfile',
+                    title: 'Collect logs from Nginx instances',
+                    description: 'Collecting Nginx access and error logs',
+                  },
+                ],
+                multiple: true,
+              },
+            ],
+            data_streams: [
+              {
+                type: 'logs',
+                dataset: 'nginx.access',
+                title: 'Nginx access logs',
+                release: 'experimental',
+                ingest_pipeline: 'default',
+                streams: [
+                  {
+                    input: 'logfile',
+                    vars: [
+                      {
+                        name: 'paths',
+                        type: 'text',
+                        title: 'Paths',
+                        multi: true,
+                        required: true,
+                        show_user: true,
+                        default: ['/var/log/nginx/access.log*'],
+                      },
+                    ],
+                    template_path: 'stream.yml.hbs',
+                    title: 'Nginx access logs',
+                    description: 'Collect Nginx access logs',
+                    enabled: true,
+                  },
+                ],
+                package: 'nginx',
+                path: 'access',
+              },
+            ],
+            latestVersion: version,
+            removable: true,
+            keepPoliciesUpToDate: false,
+            status: 'not_installed',
+          },
+        },
+        isLoading: false,
+      })
+    ),
+    useUIExtension: jest.fn(),
+    useStartServices: jest.fn().mockReturnValue({
+      application: { navigateToApp: jest.fn(), navigateToUrl: jest.fn() },
+      notifications: {
+        toasts: {
+          addError: jest.fn(),
+          addSuccess: jest.fn(),
+        },
+      },
+      docLinks: {
+        links: {
+          fleet: {},
+        },
+      },
+      http: {
+        basePath: {
+          get: () => 'http://localhost:5620',
+          prepend: (url: string) => 'http://localhost:5620' + url,
+        },
+      },
+      chrome: {
+        docTitle: {
+          change: jest.fn(),
+        },
+        setBreadcrumbs: jest.fn(),
+      },
+    }),
+    useLink: jest.fn().mockReturnValue({ getHref: jest.fn().mockReturnValue('/navigate/path') }),
+  };
+});
+
+jest.mock('../../../../integrations/hooks', () => {
+  return {
+    ...jest.requireActual('../../../../integrations/hooks'),
+    useGetOnePackagePolicy: jest.fn(),
+  };
+});
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useRouteMatch: jest.fn().mockReturnValue({
+    params: {
+      packagePolicyId: 'nginx-1',
+    },
+  }),
+}));
+
+const mockPackagePolicy = {
+  id: 'nginx-1',
+  name: 'nginx-1',
+  namespace: 'default',
+  description: 'Nginx description',
+  package: { name: 'nginx', title: 'Nginx', version: '1.3.0' },
+  enabled: true,
+  policy_id: 'agent-policy-1',
+  output_id: '',
+  inputs: [
+    {
+      type: 'logfile',
+      policy_template: 'nginx',
+      enabled: true,
+      streams: [
+        {
+          enabled: true,
+          data_stream: { type: 'logs', dataset: 'nginx.access' },
+          vars: {
+            paths: { value: ['/var/log/nginx/access.log*'], type: 'text' },
+          },
+        },
+      ],
+      vars: undefined,
+    },
+  ],
+};
+
+const mockPackagePolicyNewVersion = {
+  ...mockPackagePolicy,
+  package: { name: 'nginx', title: 'Nginx', version: '1.4.0' },
+};
+
+const TestComponent = async () => {
+  return {
+    default: () => {
+      return <div />;
+    },
+  };
+};
+
+describe('edit package policy page', () => {
+  let testRenderer: TestRenderer;
+  let renderResult: ReturnType<typeof testRenderer.render>;
+  const render = () => (renderResult = testRenderer.render(<EditPackagePolicyPage />));
+
+  beforeEach(() => {
+    testRenderer = createFleetTestRendererMock();
+
+    (useGetOnePackagePolicy as MockFn).mockReturnValue({
+      data: {
+        item: mockPackagePolicy,
+      },
+    });
+    (sendGetOnePackagePolicy as MockFn).mockResolvedValue({
+      data: {
+        item: mockPackagePolicy,
+      },
+    });
+    (sendGetOneAgentPolicy as MockFn).mockResolvedValue({
+      data: { item: { id: 'agent-policy-1', name: 'Agent policy 1', namespace: 'default' } },
+    });
+    (sendUpgradePackagePolicyDryRun as MockFn).mockResolvedValue({
+      data: [
+        {
+          diff: [mockPackagePolicy, mockPackagePolicy],
+        },
+      ],
+    });
+    (sendUpdatePackagePolicy as MockFn).mockResolvedValue({});
+    (useStartServices().application.navigateToUrl as MockFn).mockReset();
+    (useStartServices().notifications.toasts.addError as MockFn).mockReset();
+  });
+
+  it('should disable submit button on invalid form with empty package var', async () => {
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText('Collect logs from Nginx instances')).toBeInTheDocument();
+      expect(renderResult.getByDisplayValue('nginx-1')).toBeInTheDocument();
+      expect(renderResult.getByDisplayValue('Nginx description')).toBeInTheDocument();
+    });
+
+    await act(async () => {
+      fireEvent.click(renderResult.getByLabelText('Show logfile inputs'));
+    });
+
+    await act(async () => {
+      fireEvent.change(renderResult.getByDisplayValue('/var/log/nginx/access.log*'), {
+        target: { value: '' },
+      });
+    });
+
+    expect(
+      renderResult.getByText('Your integration policy has errors. Please fix them before saving.')
+    ).toBeInTheDocument();
+    expect(renderResult.getByText(/Save integration/).closest('button')!).toBeDisabled();
+
+    renderResult.getAllByRole('link', { name: 'Cancel' }).forEach((btn) => {
+      expect(btn).toHaveAttribute('href', '/navigate/path');
+    });
+  });
+
+  it('should navigate on submit', async () => {
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText('Collect logs from Nginx instances')).toBeInTheDocument();
+    });
+    act(() => {
+      fireEvent.click(renderResult.getByRole('switch'));
+    });
+
+    await act(async () => {
+      fireEvent.click(renderResult.getByText('Save integration').closest('button')!);
+    });
+
+    const { id, ...restProps } = mockPackagePolicy;
+    expect(sendUpdatePackagePolicy).toHaveBeenCalledWith('nginx-1', {
+      ...restProps,
+      inputs: [
+        {
+          ...mockPackagePolicy.inputs[0],
+          enabled: false,
+          streams: [
+            {
+              ...mockPackagePolicy.inputs[0].streams[0],
+              enabled: false,
+            },
+          ],
+        },
+      ],
+    });
+    expect(useStartServices().application.navigateToUrl).toHaveBeenCalledWith('/navigate/path');
+  });
+
+  it('should show out of date error on 409 statusCode on submit', async () => {
+    (sendUpdatePackagePolicy as MockFn).mockResolvedValue({ error: { statusCode: 409 } });
+
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText('Collect logs from Nginx instances')).toBeInTheDocument();
+    });
+    act(() => {
+      fireEvent.click(renderResult.getByRole('switch'));
+    });
+
+    await act(async () => {
+      fireEvent.click(renderResult.getByText('Save integration').closest('button')!);
+    });
+
+    expect(useStartServices().notifications.toasts.addError).toHaveBeenCalledWith(
+      { statusCode: 409 },
+      {
+        title: "Error updating 'nginx-1'",
+        toastMessage: 'Data is out of date. Refresh the page to get the latest policy.',
+      }
+    );
+
+    expect(useStartServices().application.navigateToUrl).not.toHaveBeenCalled();
+  });
+
+  it('should show generic error on other statusCode on submit', async () => {
+    (sendUpdatePackagePolicy as MockFn).mockResolvedValue({ error: { statusCode: 500 } });
+
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText('Collect logs from Nginx instances')).toBeInTheDocument();
+    });
+    act(() => {
+      fireEvent.click(renderResult.getByRole('switch'));
+    });
+
+    await act(async () => {
+      fireEvent.click(renderResult.getByText('Save integration').closest('button')!);
+    });
+
+    expect(useStartServices().notifications.toasts.addError).toHaveBeenCalledWith(
+      { statusCode: 500 },
+      { title: "Error updating 'nginx-1'" }
+    );
+
+    expect(useStartServices().application.navigateToUrl).not.toHaveBeenCalled();
+  });
+
+  it('should show ready for upgrade if package useLatestPackageVersion and no conflicts', async () => {
+    (useUIExtension as MockFn).mockReturnValue({
+      useLatestPackageVersion: true,
+      Component: TestComponent,
+    });
+    (sendUpgradePackagePolicyDryRun as MockFn).mockResolvedValue({
+      data: [
+        {
+          diff: [mockPackagePolicy, mockPackagePolicyNewVersion],
+        },
+      ],
+    });
+
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText(/Upgrade integration/).closest('button')!).not.toBeDisabled();
+      expect(
+        renderResult.getByText(
+          'This integration is ready to be upgraded from version 1.3.0 to 1.4.0. Review the changes below and save to upgrade.'
+        )
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('should show review field conflicts if package useLatestPackageVersion and has conflicts', async () => {
+    (useUIExtension as MockFn).mockReturnValue({
+      useLatestPackageVersion: true,
+      Component: TestComponent,
+    });
+    (sendUpgradePackagePolicyDryRun as MockFn).mockResolvedValue({
+      data: [
+        {
+          hasErrors: true,
+          diff: [mockPackagePolicy, mockPackagePolicyNewVersion],
+        },
+      ],
+    });
+
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByText('Review field conflicts')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index 8151215c3cced..c731703e43bc6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -347,6 +347,8 @@ export const EditPackagePolicyForm = memo<{
         : false;
       if (!hasValidationErrors) {
         setFormState('VALID');
+      } else {
+        setFormState('INVALID');
       }
     },
     [packagePolicy, updatePackagePolicyValidation]
@@ -732,6 +734,12 @@ const UpgradeBreadcrumb: React.FunctionComponent<{
   return null;
 };
 
+const FlyoutBody = styled(EuiFlyoutBody)`
+  .euiFlyoutBody__overflowContent {
+    padding: 0;
+  }
+`;
+
 const UpgradeStatusCallout: React.FunctionComponent<{
   dryRunData: UpgradePackagePolicyDryRunResponse;
 }> = ({ dryRunData }) => {
@@ -745,12 +753,6 @@ const UpgradeStatusCallout: React.FunctionComponent<{
 
   const [currentPackagePolicy, proposedUpgradePackagePolicy] = dryRunData[0].diff || [];
 
-  const FlyoutBody = styled(EuiFlyoutBody)`
-    .euiFlyoutBody__overflowContent {
-      padding: 0;
-    }
-  `;
-
   return (
     <>
       {isPreviousVersionFlyoutOpen && currentPackagePolicy && (
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts
index 9e4cdde064e70..9c907436af6e3 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts
@@ -6,8 +6,8 @@
  */
 export * from '../../../hooks';
 
-export { useBreadcrumbs } from './use_breadcrumbs';
-export { useLinks } from './use_links';
+export * from './use_breadcrumbs';
+export * from './use_links';
 export * from './use_local_search';
 export * from './use_package_install';
 export * from './use_agent_policy_context';

From e37efbcc57668b82d6491bc5a358b0b255d9f76e Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Thu, 10 Feb 2022 06:50:21 -0500
Subject: [PATCH 47/85] [Response Ops][Cases] Adding more type checks for
 operations (#125137)

Co-authored-by: Christos Nasikas <christos.nasikas@elastic.co>
---
 .../cases/server/authorization/index.test.ts  |  2 +-
 .../cases/server/authorization/index.ts       | 31 ++++++++++---------
 .../cases/server/authorization/types.ts       |  3 +-
 .../security/server/authorization/index.ts    |  1 +
 .../feature_privilege_builder/cases.ts        | 18 +++++++----
 .../feature_privilege_builder/index.ts        |  1 +
 .../server/authorization/privileges/index.ts  |  1 +
 x-pack/plugins/security/server/index.ts       |  2 +-
 8 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/cases/server/authorization/index.test.ts b/x-pack/plugins/cases/server/authorization/index.test.ts
index ef2a5eed09eaa..df74b230c6435 100644
--- a/x-pack/plugins/cases/server/authorization/index.test.ts
+++ b/x-pack/plugins/cases/server/authorization/index.test.ts
@@ -18,6 +18,6 @@ describe('index tests', () => {
   });
 
   it('should not identify an invalid operation as a write operation', () => {
-    expect(isWriteOperation({ name: 'blah' } as OperationDetails)).toBeFalsy();
+    expect(isWriteOperation({ name: 'blah' } as unknown as OperationDetails)).toBeFalsy();
   });
 });
diff --git a/x-pack/plugins/cases/server/authorization/index.ts b/x-pack/plugins/cases/server/authorization/index.ts
index bf37e3530a710..0239aad4a4424 100644
--- a/x-pack/plugins/cases/server/authorization/index.ts
+++ b/x-pack/plugins/cases/server/authorization/index.ts
@@ -13,6 +13,7 @@ import {
   CASE_USER_ACTION_SAVED_OBJECT,
 } from '../../common/constants';
 import { Verbs, ReadOperations, WriteOperations, OperationDetails } from './types';
+import { CasesSupportedOperations } from '../../../security/server';
 
 export * from './authorization';
 export * from './audit_logger';
@@ -55,10 +56,10 @@ const EVENT_TYPES: Record<string, EcsEventType> = {
  * There currently isn't a use case for a user to delete one comment but not all or differentiating between get, get all,
  * and find operations from a privilege stand point.
  */
-const DELETE_COMMENT_OPERATION = 'deleteComment';
-const ACCESS_COMMENT_OPERATION = 'getComment';
-const ACCESS_CASE_OPERATION = 'getCase';
-const ACCESS_USER_ACTION_OPERATION = 'getUserActions';
+const DELETE_COMMENT_OPERATION: CasesSupportedOperations = 'deleteComment';
+const ACCESS_COMMENT_OPERATION: CasesSupportedOperations = 'getComment';
+const ACCESS_CASE_OPERATION: CasesSupportedOperations = 'getCase';
+const ACCESS_USER_ACTION_OPERATION: CasesSupportedOperations = 'getUserActions';
 
 /**
  * Database constant for ECS category for use for audit logging.
@@ -127,7 +128,7 @@ const CaseOperations = {
   },
   [WriteOperations.CreateCase]: {
     ecsType: EVENT_TYPES.creation,
-    name: WriteOperations.CreateCase,
+    name: WriteOperations.CreateCase as const,
     action: 'case_create',
     verbs: createVerbs,
     docType: 'case',
@@ -135,7 +136,7 @@ const CaseOperations = {
   },
   [WriteOperations.DeleteCase]: {
     ecsType: EVENT_TYPES.deletion,
-    name: WriteOperations.DeleteCase,
+    name: WriteOperations.DeleteCase as const,
     action: 'case_delete',
     verbs: deleteVerbs,
     docType: 'case',
@@ -143,7 +144,7 @@ const CaseOperations = {
   },
   [WriteOperations.UpdateCase]: {
     ecsType: EVENT_TYPES.change,
-    name: WriteOperations.UpdateCase,
+    name: WriteOperations.UpdateCase as const,
     action: 'case_update',
     verbs: updateVerbs,
     docType: 'case',
@@ -151,7 +152,7 @@ const CaseOperations = {
   },
   [WriteOperations.PushCase]: {
     ecsType: EVENT_TYPES.change,
-    name: WriteOperations.PushCase,
+    name: WriteOperations.PushCase as const,
     action: 'case_push',
     verbs: updateVerbs,
     docType: 'case',
@@ -162,7 +163,7 @@ const CaseOperations = {
 const ConfigurationOperations = {
   [ReadOperations.FindConfigurations]: {
     ecsType: EVENT_TYPES.access,
-    name: ReadOperations.FindConfigurations,
+    name: ReadOperations.FindConfigurations as const,
     action: 'case_configuration_find',
     verbs: accessVerbs,
     docType: 'case configurations',
@@ -170,7 +171,7 @@ const ConfigurationOperations = {
   },
   [WriteOperations.CreateConfiguration]: {
     ecsType: EVENT_TYPES.creation,
-    name: WriteOperations.CreateConfiguration,
+    name: WriteOperations.CreateConfiguration as const,
     action: 'case_configuration_create',
     verbs: createVerbs,
     docType: 'case configuration',
@@ -178,7 +179,7 @@ const ConfigurationOperations = {
   },
   [WriteOperations.UpdateConfiguration]: {
     ecsType: EVENT_TYPES.change,
-    name: WriteOperations.UpdateConfiguration,
+    name: WriteOperations.UpdateConfiguration as const,
     action: 'case_configuration_update',
     verbs: updateVerbs,
     docType: 'case configuration',
@@ -229,7 +230,7 @@ const AttachmentOperations = {
   },
   [WriteOperations.CreateComment]: {
     ecsType: EVENT_TYPES.creation,
-    name: WriteOperations.CreateComment,
+    name: WriteOperations.CreateComment as const,
     action: 'case_comment_create',
     verbs: createVerbs,
     docType: 'comments',
@@ -253,7 +254,7 @@ const AttachmentOperations = {
   },
   [WriteOperations.UpdateComment]: {
     ecsType: EVENT_TYPES.change,
-    name: WriteOperations.UpdateComment,
+    name: WriteOperations.UpdateComment as const,
     action: 'case_comment_update',
     verbs: updateVerbs,
     docType: 'comments',
@@ -270,7 +271,7 @@ export const Operations: Record<ReadOperations | WriteOperations, OperationDetai
   ...AttachmentOperations,
   [ReadOperations.GetTags]: {
     ecsType: EVENT_TYPES.access,
-    name: ReadOperations.GetTags,
+    name: ReadOperations.GetTags as const,
     action: 'case_tags_get',
     verbs: accessVerbs,
     docType: 'case',
@@ -278,7 +279,7 @@ export const Operations: Record<ReadOperations | WriteOperations, OperationDetai
   },
   [ReadOperations.GetReporters]: {
     ecsType: EVENT_TYPES.access,
-    name: ReadOperations.GetReporters,
+    name: ReadOperations.GetReporters as const,
     action: 'case_reporters_get',
     verbs: accessVerbs,
     docType: 'case',
diff --git a/x-pack/plugins/cases/server/authorization/types.ts b/x-pack/plugins/cases/server/authorization/types.ts
index f9c297111a7ff..2c9a5959f0965 100644
--- a/x-pack/plugins/cases/server/authorization/types.ts
+++ b/x-pack/plugins/cases/server/authorization/types.ts
@@ -8,6 +8,7 @@
 import { EcsEventType, KibanaRequest } from 'kibana/server';
 import type { KueryNode } from '@kbn/es-query';
 import { Space } from '../../../spaces/server';
+import { CasesSupportedOperations } from '../../../security/server';
 
 /**
  * The tenses for describing the action performed by a API route
@@ -76,7 +77,7 @@ export interface OperationDetails {
    * The name of the operation to authorize against for the privilege check.
    * These values need to match one of the operation strings defined here: x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
    */
-  name: string;
+  name: CasesSupportedOperations;
   /**
    * The ECS `event.action` field, should be in the form of <entity>_<operation> e.g comment_get, case_fined
    */
diff --git a/x-pack/plugins/security/server/authorization/index.ts b/x-pack/plugins/security/server/authorization/index.ts
index 265ec2dce5a31..9e701e866767b 100644
--- a/x-pack/plugins/security/server/authorization/index.ts
+++ b/x-pack/plugins/security/server/authorization/index.ts
@@ -15,3 +15,4 @@ export type { CheckSavedObjectsPrivileges } from './check_saved_objects_privileg
 export type { CheckPrivilegesPayload } from './types';
 export type { ElasticsearchRole } from './roles';
 export { transformElasticsearchRoleToRole } from './roles';
+export type { CasesSupportedOperations } from './privileges';
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
index 4b04f98704c8f..a5a3c76c30c77 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
@@ -10,17 +10,20 @@ import { uniq } from 'lodash';
 import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
+export type CasesSupportedOperations = typeof allOperations[number];
+
 // if you add a value here you'll likely also need to make changes here:
 // x-pack/plugins/cases/server/authorization/index.ts
-const readOperations: string[] = [
+const readOperations = [
   'getCase',
   'getComment',
   'getTags',
   'getReporters',
   'getUserActions',
   'findConfigurations',
-];
-const writeOperations: string[] = [
+] as const;
+
+const writeOperations = [
   'createCase',
   'deleteCase',
   'updateCase',
@@ -30,15 +33,18 @@ const writeOperations: string[] = [
   'updateComment',
   'createConfiguration',
   'updateConfiguration',
-];
-const allOperations: string[] = [...readOperations, ...writeOperations];
+] as const;
+const allOperations = [...readOperations, ...writeOperations] as const;
 
 export class FeaturePrivilegeCasesBuilder extends BaseFeaturePrivilegeBuilder {
   public getActions(
     privilegeDefinition: FeatureKibanaPrivileges,
     feature: KibanaFeature
   ): string[] {
-    const getCasesPrivilege = (operations: string[], owners: readonly string[]) => {
+    const getCasesPrivilege = (
+      operations: readonly CasesSupportedOperations[],
+      owners: readonly string[]
+    ) => {
       return owners.flatMap((owner) =>
         operations.map((operation) => this.actions.cases.get(owner, operation))
       );
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
index d46f30ef53ab4..795246eedb121 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
@@ -20,6 +20,7 @@ import { FeaturePrivilegeNavlinkBuilder } from './navlink';
 import { FeaturePrivilegeSavedObjectBuilder } from './saved_object';
 import { FeaturePrivilegeUIBuilder } from './ui';
 
+export type { CasesSupportedOperations } from './cases';
 export type { FeaturePrivilegeBuilder };
 
 export const featurePrivilegeBuilderFactory = (actions: Actions): FeaturePrivilegeBuilder => {
diff --git a/x-pack/plugins/security/server/authorization/privileges/index.ts b/x-pack/plugins/security/server/authorization/privileges/index.ts
index 7e98730abd71e..1056aa6dcd9af 100644
--- a/x-pack/plugins/security/server/authorization/privileges/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/index.ts
@@ -6,4 +6,5 @@
  */
 
 export type { PrivilegesService } from './privileges';
+export type { CasesSupportedOperations } from './feature_privilege_builder';
 export { privilegesFactory } from './privileges';
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index 2d85c7e2b2ba1..bc23a094634ff 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -28,7 +28,7 @@ export type {
   GrantAPIKeyResult,
   AuthenticationServiceStart,
 } from './authentication';
-export type { CheckPrivilegesPayload } from './authorization';
+export type { CheckPrivilegesPayload, CasesSupportedOperations } from './authorization';
 export type AuthorizationServiceSetup = SecurityPluginStart['authz'];
 export type { AuditLogger, AuditEvent } from './audit';
 export type { SecurityPluginSetup, SecurityPluginStart };

From 820bfde69a1991b312ca763ba1d95858fd0899b5 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Thu, 10 Feb 2022 06:26:53 -0600
Subject: [PATCH 48/85] [DOCS] Removes tags from 8.0.0 release docs (#125115)

Removes the coming tags from the 8.0.0 What's new and Release notes.
---
 docs/CHANGELOG.asciidoc      | 2 --
 docs/user/whats-new.asciidoc | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 3101b649b09a5..720f9a29431d1 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -21,8 +21,6 @@ Review important information about the {kib} 8.0.0 releases.
 [[release-notes-8.0.0]]
 == {kib} 8.0.0
 
-coming::[8.0.0]
-
 Review the {kib} 8.0.0 changes, then use the {kibana-ref-all}/7.17/upgrade-assistant.html[Upgrade Assistant] to complete the upgrade.
 
 [float]
diff --git a/docs/user/whats-new.asciidoc b/docs/user/whats-new.asciidoc
index aa16a98a27fdb..640a824180480 100644
--- a/docs/user/whats-new.asciidoc
+++ b/docs/user/whats-new.asciidoc
@@ -4,8 +4,6 @@
 This section summarizes the most important changes in each release. For the 
 full list, see <<release-notes>> and <<breaking-changes-8.0.0>>. 
 
-coming[8.0.0]
-
 //NOTE: The notable-highlights tagged regions are re-used in the
 //Installation and Upgrade Guide
 

From 9c87f230b5759c5c1d00230fe7fc88cfc3549457 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 13:29:26 +0100
Subject: [PATCH 49/85] only overwrite index pattern on setup if it is not set
 (#125215)

---
 src/plugins/vis_types/timeseries/public/metrics_type.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/vis_types/timeseries/public/metrics_type.ts b/src/plugins/vis_types/timeseries/public/metrics_type.ts
index 5cb77efc5bcba..4695748661299 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_type.ts
@@ -58,7 +58,7 @@ async function withDefaultIndexPattern(
   const { indexPatterns } = getDataStart();
 
   const defaultIndex = await indexPatterns.getDefault();
-  if (!defaultIndex || !defaultIndex.id) return vis;
+  if (!defaultIndex || !defaultIndex.id || vis.params.index_pattern) return vis;
   vis.params.index_pattern = {
     id: defaultIndex.id,
   };

From 63bd4c6bb793d423f9271e10ccb2817b614041e1 Mon Sep 17 00:00:00 2001
From: Katerina Patticha <aikaterini.patticha@elastic.co>
Date: Thu, 10 Feb 2022 13:29:36 +0100
Subject: [PATCH 50/85] [APM] Add e2e tests for feature flags (#125201)

* [APM] Add e2e tests for feature flags

* Do not abstracth apm base url
---
 .../power_user/feature_flag/comparison.ts     | 95 +++++++++++++++++++
 .../power_user/feature_flag/infrastructure.ts | 70 ++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/comparison.ts
 create mode 100644 x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/comparison.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/comparison.ts
new file mode 100644
index 0000000000000..1bc4ad0a478b6
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/comparison.ts
@@ -0,0 +1,95 @@
+/*
+ * 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 { synthtrace } from '../../../../synthtrace';
+import { opbeans } from '../../../fixtures/synthtrace/opbeans';
+
+const settingsPath = '/app/management/kibana/settings';
+
+const start = '2021-10-10T00:00:00.000Z';
+const end = '2021-10-10T00:15:00.000Z';
+describe('Comparison feature flag', () => {
+  const comparisonToggle =
+    '[data-test-subj="advancedSetting-editField-observability:enableComparisonByDefault"]';
+
+  before(async () => {
+    await synthtrace.index(
+      opbeans({
+        from: new Date(start).getTime(),
+        to: new Date(end).getTime(),
+      })
+    );
+  });
+
+  after(async () => {
+    await synthtrace.clean();
+  });
+
+  beforeEach(() => {
+    cy.loginAsPowerUser();
+  });
+
+  describe('when comparison feature is enabled', () => {
+    it('shows the flag as enabled in kibana advanced settings', () => {
+      cy.visit(settingsPath);
+
+      cy.get(comparisonToggle)
+        .should('have.attr', 'aria-checked')
+        .and('equal', 'true');
+    });
+
+    it('shows the comparison feature enabled in services overview', () => {
+      cy.visit('/app/apm/services');
+      cy.get('input[type="checkbox"]#comparison').should('be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('not.be.disabled');
+    });
+
+    it('shows the comparison feature enabled in services overview', () => {
+      cy.visit('/app/apm/backends');
+      cy.get('input[type="checkbox"]#comparison').should('be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('not.be.disabled');
+    });
+
+    it('shows the comparison feature disabled in service map overview page', () => {
+      cy.visit('/app/apm/service-map');
+      cy.get('input[type="checkbox"]#comparison').should('be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('not.be.disabled');
+    });
+  });
+
+  describe('when comparison feature is disabled', () => {
+    it('shows the flag as disabled in kibana advanced settings', () => {
+      cy.visit(settingsPath);
+      cy.get(comparisonToggle).click();
+      cy.contains('Save changes').should('not.be.disabled');
+      cy.contains('Save changes').click();
+      cy.get(comparisonToggle).should('not.be.checked');
+
+      cy.get(comparisonToggle)
+        .should('have.attr', 'aria-checked')
+        .and('equal', 'false');
+    });
+
+    it('shows the comparison feature disabled in services overview', () => {
+      cy.visit('/app/apm/services');
+      cy.get('input[type="checkbox"]#comparison').should('not.be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('be.disabled');
+    });
+
+    it('shows the comparison feature disabled in dependencies overview page', () => {
+      cy.visit('/app/apm/backends');
+      cy.get('input[type="checkbox"]#comparison').should('not.be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('be.disabled');
+    });
+
+    it('shows the comparison feature disabled in service map overview page', () => {
+      cy.visit('/app/apm/service-map');
+      cy.get('input[type="checkbox"]#comparison').should('not.be.checked');
+      cy.get('[data-test-subj="comparisonSelect"]').should('be.disabled');
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
new file mode 100644
index 0000000000000..0b142e41ab607
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
@@ -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 { synthtrace } from '../../../../synthtrace';
+import { opbeans } from '../../../fixtures/synthtrace/opbeans';
+
+const settingsPath = '/app/management/kibana/settings';
+const serviceOverviewPath = '/app/apm/services/opbeans-python/overview';
+
+const start = '2021-10-10T00:00:00.000Z';
+const end = '2021-10-10T00:15:00.000Z';
+
+describe('Infrastracture feature flag', () => {
+  const infraToggle =
+    '[data-test-subj="advancedSetting-editField-observability:enableInfrastructureView"]';
+
+  before(async () => {
+    await synthtrace.index(
+      opbeans({
+        from: new Date(start).getTime(),
+        to: new Date(end).getTime(),
+      })
+    );
+  });
+
+  after(async () => {
+    await synthtrace.clean();
+  });
+
+  beforeEach(() => {
+    cy.loginAsPowerUser();
+  });
+
+  describe('when infrastracture feature is enabled', () => {
+    it('shows the flag as enabled in kibana advanced settings', () => {
+      cy.visit(settingsPath);
+
+      cy.get(infraToggle)
+        .should('have.attr', 'aria-checked')
+        .and('equal', 'true');
+    });
+
+    it('shows infrastructure tab in service overview page', () => {
+      cy.visit(serviceOverviewPath);
+      cy.contains('a[role="tab"]', 'Infrastructure').click();
+    });
+  });
+
+  describe('when infrastracture feature is disabled', () => {
+    it('shows the flag as disabled in kibana advanced settings', () => {
+      cy.visit(settingsPath);
+      cy.get(infraToggle).click();
+      cy.contains('Save changes').should('not.be.disabled');
+      cy.contains('Save changes').click();
+
+      cy.get(infraToggle)
+        .should('have.attr', 'aria-checked')
+        .and('equal', 'false');
+    });
+
+    it('hides infrastructure tab in service overview page', () => {
+      cy.visit(serviceOverviewPath);
+      cy.contains('a[role="tab"]', 'Infrastructure').should('not.exist');
+    });
+  });
+});

From e2480a131dce0b78d6feea3818fa9d475312c239 Mon Sep 17 00:00:00 2001
From: James Rodewig <james.rodewig@elastic.co>
Date: Thu, 10 Feb 2022 07:58:28 -0500
Subject: [PATCH 51/85] [DOCS] Remove 8.0.0 coming tag (#125229)

Removes a coming tag from the 8.0.0 Breaking Changes.
---
 docs/migration/migrate_8_0.asciidoc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/migration/migrate_8_0.asciidoc b/docs/migration/migrate_8_0.asciidoc
index 8936e41762c69..18be9a9364c22 100644
--- a/docs/migration/migrate_8_0.asciidoc
+++ b/docs/migration/migrate_8_0.asciidoc
@@ -7,8 +7,6 @@
 This section discusses the changes that you need to be aware of when migrating
 your application to Kibana 8.0.
 
-coming[8.0.0]
-
 See also <<whats-new>> and <<release-notes>>.
 
 * <<breaking_80_index_pattern_changes>>

From 561d0b798b442fbd7bf33e2c82b9a1af9937df0e Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <rudolf.meijering@elastic.co>
Date: Thu, 10 Feb 2022 14:17:50 +0100
Subject: [PATCH 52/85] Docs for preventing migrations failing for unknown
 saved object types

---
 .../setup/upgrade/upgrade-migrations.asciidoc | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index 059ae47d2e476..de51ec6acd6b4 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -58,6 +58,29 @@ complete the upgrade migration before bringing up the remaining instances.
 ==== Preventing migration failures
 Review the common causes of {kib} upgrade failures and how to prevent them.
 
+[float]
+====== Documents were found for unknown saved object types
+Migrations will fail if saved objects were found which belong to an unknown
+saved object type. This could be caused by writing malformed documents directly
+to the Elasticsearch index, or by disabling a plugin that had previously
+created a saved object.
+
+We recommend using the <<upgrade-assistant,Upgrade Assistant>> to discover and
+remedy any unknown saved object types. In addition to the upgrade assistant, 
+{kib} version 7.17.0 deployments containing unknown saved object types will 
+also log the following warning message:
+
+[source,sh]
+--------------------------------------------
+CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
+--------------------------------------------
+
+If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
+[source,sh]
+--------------------------------------------
+Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the ".kibana_7.17.0_001" index.
+--------------------------------------------
+
 [float]
 ===== timeout_exception or receive_timeout_transport_exception
 There is a known issue in 7.12.0 for users who tried the {fleet} beta.

From 580d61d990784522f707b9411ec6ecd554511fc2 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <rudolf.meijering@elastic.co>
Date: Thu, 10 Feb 2022 14:19:12 +0100
Subject: [PATCH 53/85] Revert "Docs for preventing migrations failing for
 unknown saved object types"

This reverts commit 561d0b798b442fbd7bf33e2c82b9a1af9937df0e.

Oops shouldn't have pushed this to main directly
---
 .../setup/upgrade/upgrade-migrations.asciidoc | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index de51ec6acd6b4..059ae47d2e476 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -58,29 +58,6 @@ complete the upgrade migration before bringing up the remaining instances.
 ==== Preventing migration failures
 Review the common causes of {kib} upgrade failures and how to prevent them.
 
-[float]
-====== Documents were found for unknown saved object types
-Migrations will fail if saved objects were found which belong to an unknown
-saved object type. This could be caused by writing malformed documents directly
-to the Elasticsearch index, or by disabling a plugin that had previously
-created a saved object.
-
-We recommend using the <<upgrade-assistant,Upgrade Assistant>> to discover and
-remedy any unknown saved object types. In addition to the upgrade assistant, 
-{kib} version 7.17.0 deployments containing unknown saved object types will 
-also log the following warning message:
-
-[source,sh]
---------------------------------------------
-CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
---------------------------------------------
-
-If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
-[source,sh]
---------------------------------------------
-Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the ".kibana_7.17.0_001" index.
---------------------------------------------
-
 [float]
 ===== timeout_exception or receive_timeout_transport_exception
 There is a known issue in 7.12.0 for users who tried the {fleet} beta.

From 1ad34cbe2fefe460bdc8c93af14824fc264c48fe Mon Sep 17 00:00:00 2001
From: Cristina Amico <criamico@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:46:37 +0100
Subject: [PATCH 54/85] [Fleet] Improve privileges integration testing
 (#125102)

* [Fleet] Improve privileges integration testing

* Further testing
---
 .../apis/agents/actions.ts                    | 16 ++++++
 .../apis/agents/delete.ts                     |  8 +--
 .../fleet_api_integration/apis/agents/list.ts |  5 +-
 .../apis/agents/reassign.ts                   | 14 ++++++
 .../apis/agents/upgrade.ts                    | 24 +++++++++
 .../apis/enrollment_api_keys/crud.ts          | 50 +++++++++++++++++++
 .../apis/epm/bulk_upgrade.ts                  | 11 +++-
 .../fleet_api_integration/apis/epm/delete.ts  | 12 ++++-
 .../fleet_api_integration/apis/epm/file.ts    | 28 +++++++++++
 .../fleet_api_integration/apis/epm/get.ts     | 16 +++++-
 .../apis/epm/install_by_upload.ts             | 13 ++++-
 .../fleet_api_integration/apis/epm/list.ts    | 22 +++++++-
 .../fleet_api_integration/apis/test_users.ts  | 41 +++++++++++++--
 13 files changed, 240 insertions(+), 20 deletions(-)

diff --git a/x-pack/test/fleet_api_integration/apis/agents/actions.ts b/x-pack/test/fleet_api_integration/apis/agents/actions.ts
index a701d44319a95..00bb00eb9c68c 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/actions.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/actions.ts
@@ -7,11 +7,13 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('fleet_agents_actions', () => {
     before(async () => {
@@ -97,5 +99,19 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(404);
     });
+
+    it('should return a 403 if user lacks fleet all permissions', async () => {
+      await supertestWithoutAuth
+        .post(`/api/fleet/agents/agent1/actions`)
+        .set('kbn-xsrf', 'xx')
+        .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
+        .send({
+          action: {
+            type: 'POLICY_CHANGE',
+            data: { data: 'action_data' },
+          },
+        })
+        .expect(403);
+    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/agents/delete.ts b/x-pack/test/fleet_api_integration/apis/agents/delete.ts
index 45c468e095e70..6b05d3e66cb39 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/delete.ts
@@ -18,7 +18,8 @@ export default function ({ getService }: FtrProviderContext) {
     fleet_user: {
       permissions: {
         feature: {
-          fleet: ['read'],
+          fleet: ['all'],
+          fleetv2: ['none'],
         },
         spaces: ['*'],
       },
@@ -26,9 +27,9 @@ export default function ({ getService }: FtrProviderContext) {
       password: 'changeme',
     },
     fleet_admin: {
-      roles: ['superuser'],
       permissions: {
         feature: {
+          fleetv2: ['all'],
           fleet: ['all'],
         },
         spaces: ['*'],
@@ -63,8 +64,7 @@ export default function ({ getService }: FtrProviderContext) {
     after(async () => {
       await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
-
-    it('should return a 403 if user lacks fleet-write permissions', async () => {
+    it('should return a 403 if user lacks fleet all permissions', async () => {
       const { body: apiResponse } = await supertest
         .delete(`/api/fleet/agents/agent1`)
         .auth(users.fleet_user.username, users.fleet_user.password)
diff --git a/x-pack/test/fleet_api_integration/apis/agents/list.ts b/x-pack/test/fleet_api_integration/apis/agents/list.ts
index 0b3d8fd4e9a3c..17316ce4086ae 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/list.ts
@@ -23,11 +23,10 @@ export default function ({ getService }: FtrProviderContext) {
       await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
-    // Only superuser can access Fleet for now.
     it.skip('should return a 200 if a user with the fleet all try to access the list', async () => {
       await supertest
         .get(`/api/fleet/agents`)
-        .auth(testUsers.fleet_all.username, testUsers.fleet_all.password)
+        .auth(testUsers.fleet_all_only.username, testUsers.fleet_all_only.password)
         .expect(200);
     });
 
@@ -38,7 +37,7 @@ export default function ({ getService }: FtrProviderContext) {
         .expect(403);
     });
 
-    it('should return the list of agents when requesting as a superuser', async () => {
+    it('should return the list of agents when requesting as admin', async () => {
       const { body: apiResponse } = await supertest.get(`/api/fleet/agents`).expect(200);
 
       expect(apiResponse).to.have.keys('page', 'total', 'items', 'list');
diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
index a2ef226eb3d85..6ba5bbc3b965a 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
@@ -8,11 +8,13 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from './services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('reassign agent(s)', () => {
     before(async () => {
@@ -205,6 +207,18 @@ export default function (providerContext: FtrProviderContext) {
           })
           .expect(404);
       });
+
+      it('should return a 403 if user lacks fleet all permissions', async () => {
+        await supertestWithoutAuth
+          .post(`/api/fleet/agents/bulk_reassign`)
+          .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            agents: ['agent2', 'agent3'],
+            policy_id: 'policy2',
+          })
+          .expect(403);
+      });
     });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
index 57e57a6524b0e..e84aa13475564 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -11,6 +11,7 @@ import { FtrProviderContext } from '../../../api_integration/ftr_provider_contex
 import { setupFleetAndAgents } from './services';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { AGENTS_INDEX } from '../../../../plugins/fleet/common';
+import { testUsers } from '../test_users';
 
 const makeSnapshotVersion = (version: string) => {
   return version.endsWith('-SNAPSHOT') ? version : `${version}-SNAPSHOT`;
@@ -22,6 +23,7 @@ export default function (providerContext: FtrProviderContext) {
   const es = getService('es');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('fleet upgrade', () => {
     skipIfNoDockerRegistry(providerContext);
@@ -255,6 +257,28 @@ export default function (providerContext: FtrProviderContext) {
         const agent1data = await supertest.get(`/api/fleet/agents/agent1`);
         expect(typeof agent1data.body.item.upgrade_started_at).to.be('undefined');
       });
+
+      it('should respond 403 if user lacks fleet all permissions', async () => {
+        const kibanaVersion = await kibanaServer.version.get();
+        await es.update({
+          id: 'agent1',
+          refresh: 'wait_for',
+          index: AGENTS_INDEX,
+          body: {
+            doc: {
+              local_metadata: { elastic: { agent: { upgradeable: true, version: '0.0.0' } } },
+            },
+          },
+        });
+        await supertestWithoutAuth
+          .post(`/api/fleet/agents/agent1/upgrade`)
+          .set('kbn-xsrf', 'xxx')
+          .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
+          .send({
+            version: kibanaVersion,
+          })
+          .expect(403);
+      });
     });
 
     describe('multiple agents', () => {
diff --git a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
index d03b77153fa6b..703621dc7f9d4 100644
--- a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
+++ b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
@@ -11,6 +11,8 @@ import { FtrProviderContext } from '../../../api_integration/ftr_provider_contex
 import { setupFleetAndAgents, getEsClientForAPIKey } from '../agents/services';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
+import { testUsers } from '../test_users';
+
 const ENROLLMENT_KEY_ID = 'ed22ca17-e178-4cfe-8b02-54ea29fbd6d0';
 
 export default function (providerContext: FtrProviderContext) {
@@ -18,6 +20,7 @@ export default function (providerContext: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const es = getService('es');
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('fleet_enrollment_api_keys_crud', () => {
     before(async () => {
@@ -41,6 +44,20 @@ export default function (providerContext: FtrProviderContext) {
         expect(apiResponse.items[0]).to.have.keys('id', 'api_key_id', 'name');
         expect(apiResponse).to.have.keys('items');
       });
+
+      it('should return 200 if the user has correct permissions', async () => {
+        await supertestWithoutAuth
+          .get(`/api/fleet/enrollment_api_keys`)
+          .auth(testUsers.setup.username, testUsers.setup.password)
+          .expect(200);
+      });
+
+      it('should return 403 if the user does not have correct permissions', async () => {
+        await supertestWithoutAuth
+          .get(`/api/fleet/enrollment_api_keys`)
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .expect(403);
+      });
     });
 
     describe('GET /fleet/enrollment_api_keys/{id}', async () => {
@@ -51,6 +68,20 @@ export default function (providerContext: FtrProviderContext) {
 
         expect(apiResponse.item).to.have.keys('id', 'api_key_id', 'name');
       });
+
+      it('should return 200 if the user has correct permissions', async () => {
+        await supertestWithoutAuth
+          .get(`/api/fleet/enrollment_api_keys/${ENROLLMENT_KEY_ID}`)
+          .auth(testUsers.setup.username, testUsers.setup.password)
+          .expect(200);
+      });
+
+      it('should return 403 if the user does not have correct permissions', async () => {
+        await supertestWithoutAuth
+          .get(`/api/fleet/enrollment_api_keys/${ENROLLMENT_KEY_ID}`)
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .expect(403);
+      });
     });
 
     describe('DELETE /fleet/enrollment_api_keys/{id}', async () => {
@@ -79,6 +110,14 @@ export default function (providerContext: FtrProviderContext) {
         expect(apiKeys).length(1);
         expect(apiKeys[0].invalidated).eql(true);
       });
+
+      it('should return 403 if the user does not have correct permissions', async () => {
+        await supertestWithoutAuth
+          .delete(`/api/fleet/enrollment_api_keys/${keyId}`)
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .set('kbn-xsrf', 'xxx')
+          .expect(403);
+      });
     });
 
     describe('POST /fleet/enrollment_api_keys', () => {
@@ -116,6 +155,17 @@ export default function (providerContext: FtrProviderContext) {
         expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'policy_id');
       });
 
+      it('should return 403 if the user does not have correct permissions', async () => {
+        await supertestWithoutAuth
+          .post(`/api/fleet/enrollment_api_keys`)
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            policy_id: 'policy1',
+          })
+          .expect(403);
+      });
+
       it('should allow to create an enrollment api key with agent policy and unique name', async () => {
         const { body: noSpacesRes } = await supertest
           .post(`/api/fleet/enrollment_api_keys`)
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
index a51ac1c9803be..e3815150c0b66 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
@@ -46,10 +46,17 @@ export default function (providerContext: FtrProviderContext) {
       it('should return 400 if no packages are requested for upgrade', async function () {
         await supertest.post(`/api/fleet/epm/packages/_bulk`).set('kbn-xsrf', 'xxxx').expect(400);
       });
-      it('should return 403 if read only user requests upgrade', async function () {
+      it('should return 403 if user without integrations all requests upgrade', async function () {
         await supertestWithoutAuth
           .post(`/api/fleet/epm/packages/_bulk`)
-          .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+          .auth(testUsers.fleet_all_int_read.username, testUsers.fleet_all_int_read.password)
+          .set('kbn-xsrf', 'xxxx')
+          .expect(403);
+      });
+      it('should return 403 if user without fleet access requests upgrade', async function () {
+        await supertestWithoutAuth
+          .post(`/api/fleet/epm/packages/_bulk`)
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
           .set('kbn-xsrf', 'xxxx')
           .expect(403);
       });
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 6e988c6f0d0f7..076cc6bba4efc 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/delete.ts
@@ -56,10 +56,18 @@ export default function (providerContext: FtrProviderContext) {
         .expect(200);
     });
 
-    it('should return 403 for read-only users', async () => {
+    it('should return 403 for users without integrations all permissions', async () => {
       await supertestWithoutAuth
         .delete(`/api/fleet/epm/packages/${requiredPackage}/${pkgVersion}`)
-        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .auth(testUsers.fleet_all_int_read.username, testUsers.fleet_all_int_read.password)
+        .set('kbn-xsrf', 'xxxx')
+        .expect(403);
+    });
+
+    it('should return 403 for users without fleet all permissions', async () => {
+      await supertestWithoutAuth
+        .delete(`/api/fleet/epm/packages/${requiredPackage}/${pkgVersion}`)
+        .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
         .set('kbn-xsrf', 'xxxx')
         .expect(403);
     });
diff --git a/x-pack/test/fleet_api_integration/apis/epm/file.ts b/x-pack/test/fleet_api_integration/apis/epm/file.ts
index 7dec9456bf5f1..2bd8161873789 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/file.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/file.ts
@@ -10,11 +10,13 @@ import path from 'path';
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { warnAndSkipTest } from '../../helpers';
+import { testUsers } from '../test_users';
 
 export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
   const supertest = getService('supertest');
   const dockerServers = getService('dockerServers');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   const server = dockerServers.get('registry');
   describe('EPM - package file', () => {
@@ -85,6 +87,32 @@ export default function ({ getService }: FtrProviderContext) {
           warnAndSkipTest(this, log);
         }
       });
+
+      it('should return 200 if the user has only integrations access', async function () {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+
+      it('should return 200 if the user has only fleet access', async function () {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
+          .auth(testUsers.fleet_all_only.username, testUsers.fleet_all_only.password)
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+
+      it('should return 403 if the user does not have correct permissions', async function () {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
+          .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
+          .set('kbn-xsrf', 'xxx')
+          .expect(403);
+      });
     });
     describe('it gets files from an uploaded package', () => {
       before(async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/get.ts b/x-pack/test/fleet_api_integration/apis/epm/get.ts
index c605adc44233a..891bf7019eda3 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/get.ts
@@ -96,10 +96,22 @@ export default function (providerContext: FtrProviderContext) {
       await supertest.get('/api/fleet/epm/packages/endpoint/0.1.0.1.2.3').expect(400);
     });
 
-    it('allows user with only read permission to access', async () => {
+    it('allows user with only fleet permission to access', async () => {
       await supertestWithoutAuth
         .get(`/api/fleet/epm/packages/${testPkgName}/${testPkgVersion}`)
-        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .auth(testUsers.fleet_all_only.username, testUsers.fleet_all_only.password)
+        .expect(200);
+    });
+    it('allows user with only integrations permission to access', async () => {
+      await supertestWithoutAuth
+        .get(`/api/fleet/epm/packages/${testPkgName}/${testPkgVersion}`)
+        .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+        .expect(200);
+    });
+    it('allows user with integrations read permission to access', async () => {
+      await supertestWithoutAuth
+        .get(`/api/fleet/epm/packages/${testPkgName}/${testPkgVersion}`)
+        .auth(testUsers.fleet_all_int_read.username, testUsers.fleet_all_int_read.password)
         .expect(200);
     });
 
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
index 83ff7611ded8e..97f0bce458791 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -184,7 +184,18 @@ export default function (providerContext: FtrProviderContext) {
       const buf = fs.readFileSync(testPkgArchiveTgz);
       await supertestWithoutAuth
         .post(`/api/fleet/epm/packages`)
-        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .auth(testUsers.fleet_all_int_read.username, testUsers.fleet_all_int_read.password)
+        .set('kbn-xsrf', 'xxxx')
+        .type('application/gzip')
+        .send(buf)
+        .expect(403);
+    });
+
+    it('should not allow non superusers', async () => {
+      const buf = fs.readFileSync(testPkgArchiveTgz);
+      await supertestWithoutAuth
+        .post(`/api/fleet/epm/packages`)
+        .auth(testUsers.fleet_all_int_all.username, testUsers.fleet_all_int_all.password)
         .set('kbn-xsrf', 'xxxx')
         .type('application/gzip')
         .send(buf)
diff --git a/x-pack/test/fleet_api_integration/apis/epm/list.ts b/x-pack/test/fleet_api_integration/apis/epm/list.ts
index 836582d0609c4..51f003a7192d5 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/list.ts
@@ -57,12 +57,30 @@ export default function (providerContext: FtrProviderContext) {
         expect(listResponse.items.sort()).to.eql(['endpoint'].sort());
       });
 
-      it('allows user with only read permission to access', async () => {
+      it('allows user with only fleet permission to access', async () => {
         await supertestWithoutAuth
           .get('/api/fleet/epm/packages')
-          .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+          .auth(testUsers.fleet_all_only.username, testUsers.fleet_all_only.password)
           .expect(200);
       });
+      it('allows user with only integrations permission to access', async () => {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages')
+          .auth(testUsers.integr_all_only.username, testUsers.integr_all_only.password)
+          .expect(200);
+      });
+      it('allows user with integrations read permission to access', async () => {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages')
+          .auth(testUsers.fleet_all_int_read.username, testUsers.fleet_all_int_read.password)
+          .expect(200);
+      });
+      it('does not allow user with the correct permissions', async () => {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages')
+          .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
+          .expect(403);
+      });
     });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/test_users.ts b/x-pack/test/fleet_api_integration/apis/test_users.ts
index a1df6d3a31b71..d27ae1c4c29ae 100644
--- a/x-pack/test/fleet_api_integration/apis/test_users.ts
+++ b/x-pack/test/fleet_api_integration/apis/test_users.ts
@@ -10,6 +10,28 @@ import type { SecurityService } from '../../../../test/common/services/security/
 export const testUsers: {
   [rollName: string]: { username: string; password: string; permissions?: any };
 } = {
+  fleet_all_int_all: {
+    permissions: {
+      feature: {
+        fleetv2: ['all'],
+        fleet: ['all'],
+      },
+      spaces: ['*'],
+    },
+    username: 'fleet_all_int_all',
+    password: 'changeme',
+  },
+  setup: {
+    permissions: {
+      feature: {
+        fleetv2: ['all', 'setup'],
+        fleet: ['all'],
+      },
+      spaces: ['*'],
+    },
+    username: 'setup',
+    password: 'changeme',
+  },
   fleet_no_access: {
     permissions: {
       feature: {
@@ -20,24 +42,35 @@ export const testUsers: {
     username: 'fleet_no_access',
     password: 'changeme',
   },
-  fleet_read_only: {
+  fleet_all_only: {
+    permissions: {
+      feature: {
+        fleetv2: ['all'],
+      },
+      spaces: ['*'],
+    },
+    username: 'fleet_all_only',
+    password: 'changeme',
+  },
+  fleet_all_int_read: {
     permissions: {
       feature: {
+        fleetv2: ['all'],
         fleet: ['read'],
       },
       spaces: ['*'],
     },
-    username: 'fleet_read_only',
+    username: 'fleet_all_int_read',
     password: 'changeme',
   },
-  fleet_all: {
+  integr_all_only: {
     permissions: {
       feature: {
         fleet: ['all'],
       },
       spaces: ['*'],
     },
-    username: 'fleet_all',
+    username: 'integr_all',
     password: 'changeme',
   },
 };

From 4c3f8652ee510902aef5144b1d99f083a595627c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Thu, 10 Feb 2022 14:56:10 +0100
Subject: [PATCH 55/85] Bump Backport to 7.0.0 (#125188)

---
 package.json |  2 +-
 yarn.lock    | 92 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index d0f659ffec9f7..d663320636d65 100644
--- a/package.json
+++ b/package.json
@@ -732,7 +732,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-plugin-styled-components": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "backport": "6.1.5",
+    "backport": "7.0.0",
     "callsites": "^3.1.0",
     "chai": "3.5.0",
     "chance": "1.0.18",
diff --git a/yarn.lock b/yarn.lock
index 7b29962a36107..68f16c8508975 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9120,6 +9120,11 @@ async@^3.1.0, async@^3.2.0:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
+async@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -9224,6 +9229,13 @@ axios@^0.24.0:
   dependencies:
     follow-redirects "^1.14.4"
 
+axios@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+  dependencies:
+    follow-redirects "^1.14.7"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -9521,16 +9533,18 @@ bach@^1.0.0:
     async-settle "^1.0.0"
     now-and-later "^2.0.0"
 
-backport@6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/backport/-/backport-6.1.5.tgz#2e8da121cd7ac89a51003f33fdd7febaa0a34202"
-  integrity sha512-fEn50S9P8mU3odGYZXNaj4LMTpio+zB2Vwq92wlu6u/fOQmkGvSxklp78NoAwSi8UBC3+vPa7G5zFp1uFLD6jg==
+backport@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/backport/-/backport-7.0.0.tgz#4eadfd5e7b7e0ae7b6d0fa951d51e7631cb4e320"
+  integrity sha512-jg+kGNyZTGrUdtY+YMJozw+yW3bALbB/VIpn5tChsiWEEd+H5c5/fCRo7BA7J9z1fEbnpW2oSpcrxpmkJlANWw==
   dependencies:
     "@octokit/rest" "^18.12.0"
-    axios "^0.24.0"
+    axios "^0.25.0"
     dedent "^0.7.0"
     del "^6.0.0"
+    dotenv "^16.0.0"
     find-up "^5.0.0"
+    graphql-tag "^2.12.6"
     inquirer "^8.2.0"
     lodash "^4.17.21"
     make-dir "^3.1.0"
@@ -9539,8 +9553,9 @@ backport@6.1.5:
     strip-json-comments "^3.1.1"
     terminal-link "^2.1.1"
     utility-types "^3.10.0"
-    winston "^3.3.3"
+    winston "^3.5.1"
     yargs "^17.3.1"
+    yargs-parser "^21.0.0"
 
 bail@^1.0.0:
   version "1.0.2"
@@ -13393,6 +13408,11 @@ dotenv-webpack@^1.8.0:
   dependencies:
     dotenv-defaults "^1.0.2"
 
+dotenv@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.0.tgz#c619001253be89ebb638d027b609c75c26e47411"
+  integrity sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==
+
 dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
@@ -15321,6 +15341,11 @@ follow-redirects@^1.14.4:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
   integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
 
+follow-redirects@^1.14.7:
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
+
 font-awesome@4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
@@ -16212,6 +16237,13 @@ graphlib@^2.1.8:
   dependencies:
     lodash "^4.17.15"
 
+graphql-tag@^2.12.6:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
 grid-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"
@@ -20047,6 +20079,17 @@ logform@^2.2.0:
     ms "^2.1.1"
     triple-beam "^1.3.0"
 
+logform@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.2.tgz#68babe6a74ab09a1fd15a9b1e6cbc7713d41cb5b"
+  integrity sha512-V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA==
+  dependencies:
+    colors "1.4.0"
+    fecha "^4.2.0"
+    ms "^2.1.1"
+    safe-stable-stringify "^1.1.0"
+    triple-beam "^1.3.0"
+
 loglevel@^1.6.8:
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
@@ -26098,6 +26141,16 @@ safe-squel@^5.12.5:
   dependencies:
     sql-escape-string "^1.1.0"
 
+safe-stable-stringify@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a"
+  integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==
+
+safe-stable-stringify@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73"
+  integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -28789,7 +28842,7 @@ tsd@^0.13.1:
     read-pkg-up "^7.0.0"
     update-notifier "^4.1.0"
 
-tslib@2.3.1, tslib@^2.3.0, tslib@~2.3.1:
+tslib@2.3.1, tslib@^2.1.0, tslib@^2.3.0, tslib@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -30749,6 +30802,15 @@ winston-transport@^4.4.0:
     readable-stream "^2.3.7"
     triple-beam "^1.2.0"
 
+winston-transport@^4.4.2:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa"
+  integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==
+  dependencies:
+    logform "^2.3.2"
+    readable-stream "^3.6.0"
+    triple-beam "^1.3.0"
+
 winston@^3.0.0, winston@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170"
@@ -30764,6 +30826,22 @@ winston@^3.0.0, winston@^3.3.3:
     triple-beam "^1.3.0"
     winston-transport "^4.4.0"
 
+winston@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.5.1.tgz#b25cc899d015836dbf8c583dec8c4c4483a0da2e"
+  integrity sha512-tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA==
+  dependencies:
+    "@dabh/diagnostics" "^2.0.2"
+    async "^3.2.3"
+    is-stream "^2.0.0"
+    logform "^2.3.2"
+    one-time "^1.0.0"
+    readable-stream "^3.4.0"
+    safe-stable-stringify "^2.3.1"
+    stack-trace "0.0.x"
+    triple-beam "^1.3.0"
+    winston-transport "^4.4.2"
+
 wkt-parser@^1.2.4:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.2.tgz#deeff04a21edc5b170a60da418e9ed1d1ab0e219"

From 35f51bb96bb819993be69d12a7d6cdc6124a3965 Mon Sep 17 00:00:00 2001
From: Gil Raphaelli <gil@elastic.co>
Date: Thu, 10 Feb 2022 08:57:33 -0500
Subject: [PATCH 56/85] sync docs with new defaults for apm
 searchAggregatedTransactions setting (#125165)

---
 docs/settings/apm-settings.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index 27ea7f4dc7cd0..7441621f441f9 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -74,7 +74,7 @@ Changing these settings may disable features of the APM App.
   | Index name where Observability annotations are stored. Defaults to `observability-annotations`.
 
 | `xpack.apm.searchAggregatedTransactions` {ess-icon}
-  | experimental[] Enables Transaction histogram metrics. Defaults to `never` and aggregated transactions are not used. When set to `auto`, the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required.
+  | Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used.
     See {apm-guide-ref}/transaction-metrics.html[Configure transaction metrics] for more information.
 
 | `xpack.apm.metricsInterval` {ess-icon}

From 1a0e4a50d5d57b2ebaff4070bcc2e34906e92020 Mon Sep 17 00:00:00 2001
From: Pete Hampton <pjhampton@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:04:55 +0000
Subject: [PATCH 57/85] count err status codes in security telemetry (#125120)

---
 .../security_solution/server/lib/telemetry/sender.ts      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
index 07c5ea408cbdf..4079d3eb9cc8e 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
@@ -318,6 +318,14 @@ export class TelemetryEventsSender implements ITelemetryEventsSender {
       this.logger.debug(`Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`);
     } catch (err) {
       this.logger.debug(`Error sending events: ${err}`);
+      const errorStatus = err?.response?.status;
+      if (errorStatus !== undefined && errorStatus !== null) {
+        this.telemetryUsageCounter?.incrementCounter({
+          counterName: createUsageCounterLabel(usageLabelPrefix.concat(['payloads', channel])),
+          counterType: errorStatus.toString(),
+          incrementBy: 1,
+        });
+      }
       this.telemetryUsageCounter?.incrementCounter({
         counterName: createUsageCounterLabel(usageLabelPrefix.concat(['payloads', channel])),
         counterType: 'docs_lost',

From aff7c15e70ed0218fbd60ac20c693da1650042fe Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 15:33:07 +0100
Subject: [PATCH 58/85] [Vega] Hide outdated inspector data in vega (#125051)

---
 .../public/vega_inspector/vega_adapter.ts     | 15 +++++++++-
 .../vega_inspector/vega_data_inspector.tsx    | 29 +++++++++++++++++--
 .../vega/public/vega_view/vega_base_view.js   |  6 ++--
 .../vega/public/vega_visualization.ts         |  1 +
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts b/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
index def7fefd55173..59be51ca9c439 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { Observable, ReplaySubject, fromEventPattern, merge, timer } from 'rxjs';
+import { Observable, ReplaySubject, fromEventPattern, merge, timer, BehaviorSubject } from 'rxjs';
 import { map, switchMap, filter, debounce } from 'rxjs/operators';
 import type { View, Spec } from 'vega';
 import type { Assign } from '@kbn/utility-types';
@@ -81,6 +81,7 @@ const serializeColumns = (item: Record<string, unknown>, columns: string[]) => {
 
 export class VegaAdapter {
   private debugValuesSubject = new ReplaySubject<DebugValues>();
+  private error = new BehaviorSubject<string | undefined>(undefined);
 
   bindInspectValues(debugValues: DebugValues) {
     this.debugValuesSubject.next(debugValues);
@@ -159,4 +160,16 @@ export class VegaAdapter {
       map((debugValues) => JSON.stringify(debugValues.spec, null, 2))
     );
   }
+
+  getErrorObservable() {
+    return this.error.asObservable();
+  }
+
+  setError(error: string) {
+    this.error.next(error);
+  }
+
+  clearError() {
+    this.error.next(undefined);
+  }
 }
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
index 75618df307150..91f159c86af98 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
@@ -8,8 +8,8 @@
 
 import './vega_data_inspector.scss';
 
-import React from 'react';
-import { EuiTabbedContent } from '@elastic/eui';
+import React, { useState, useEffect } from 'react';
+import { EuiTabbedContent, EuiCallOut } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 import { VegaInspectorAdapters } from './vega_inspector';
@@ -31,6 +31,31 @@ const specLabel = i18n.translate('visTypeVega.inspector.specLabel', {
 });
 
 const VegaDataInspector = ({ adapters }: VegaDataInspectorProps) => {
+  const [error, setError] = useState<string | undefined>();
+
+  useEffect(() => {
+    const subscription = adapters.vega.getErrorObservable().subscribe((data) => {
+      setError(data);
+    });
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [adapters.vega]);
+
+  if (error) {
+    return (
+      <EuiCallOut
+        title={i18n.translate('visTypeVega.inspector.errorHeading', {
+          defaultMessage: `Vega didn't render successfully`,
+        })}
+        color="danger"
+        iconType="alert"
+      >
+        <p>{error}</p>
+      </EuiCallOut>
+    );
+  }
+
   const tabs = [
     {
       id: 'data-viewer--id',
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
index 23856950e3405..25cfcdb4dde04 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
@@ -106,7 +106,7 @@ export class VegaBaseView {
       }
 
       if (this._parser.error) {
-        this._addMessage('err', this._parser.error);
+        this.onError(this._parser.error);
         return;
       }
 
@@ -235,7 +235,9 @@ export class VegaBaseView {
   }
 
   onError() {
-    this._addMessage('err', Utils.formatErrorToStr(...arguments));
+    const error = Utils.formatErrorToStr(...arguments);
+    this._addMessage('err', error);
+    this._parser.searchAPI.inspectorAdapters?.vega.setError(error);
   }
 
   onWarn() {
diff --git a/src/plugins/vis_types/vega/public/vega_visualization.ts b/src/plugins/vis_types/vega/public/vega_visualization.ts
index 2ab55a0358f4d..f9a18067e6886 100644
--- a/src/plugins/vis_types/vega/public/vega_visualization.ts
+++ b/src/plugins/vis_types/vega/public/vega_visualization.ts
@@ -64,6 +64,7 @@ export const createVegaVisualization = (
 
     async _render(vegaParser: VegaParser) {
       if (vegaParser) {
+        vegaParser.searchAPI.inspectorAdapters?.vega.clearError();
         // New data received, rebuild the graph
         if (this.vegaView) {
           await this.vegaView.destroy();

From 178e7a7e4c98e00b6ad0fbea99d25e88490590f3 Mon Sep 17 00:00:00 2001
From: Andrew Tate <andrew.tate@elastic.co>
Date: Thu, 10 Feb 2022 08:45:21 -0600
Subject: [PATCH 59/85] [TSVB] add rison helper and URL encoding for drilldown
 urls (#124185)

---
 .gitignore                                    |  1 +
 docs/user/dashboard/tsvb.asciidoc             | 24 +++++++++
 .../components/lib/replace_vars.ts            | 52 ++++++++++++++++++-
 .../components/vis_types/table/vis.js         |  2 +-
 .../components/vis_types/top_n/vis.js         |  2 +-
 .../vis_types/timeseries/tsconfig.json        |  1 +
 6 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18302cebd1641..818d3a472d52c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@ npm-debug.log*
 .ci/bash_standard_lib.sh
 .gradle
 .vagrant
+.envrc
 
 ## @cypress/snapshot from apm plugin
 /snapshots.js
diff --git a/docs/user/dashboard/tsvb.asciidoc b/docs/user/dashboard/tsvb.asciidoc
index a1bad870dde46..a097e34b20911 100644
--- a/docs/user/dashboard/tsvb.asciidoc
+++ b/docs/user/dashboard/tsvb.asciidoc
@@ -191,6 +191,30 @@ For example `dashboards#/view/f193ca90-c9f4-11eb-b038-dd3270053a27`.
 . In the toolbar, click *Save as*, then make sure *Store time with dashboard* is deselected. 
 ====
 
+[discrete]
+[[how-do-i-base-drilldowns-on-data]]
+.*How do I base drilldown URLs on my data?*
+[%collapsible]
+====
+
+You can build drilldown URLs dynamically with your visualization data.
+
+Do this by adding the `{{key}}` placeholder to your URL
+
+For example `https://example.org/{{key}}`
+
+This instructs TSVB to substitute the value from your visualization wherever it sees `{{key}}`.
+
+If your data contain reserved or invalid URL characters such as "#" or "&", you should apply a transform to URL-encode the key like this `{{encodeURIComponent key}}`. If you are dynamically constructing a drilldown to another location in Kibana (for example, clicking a table row takes to you a value-scoped saved search), you will likely want to Rison-encode your key as it may contain invalid Rison characters. (https://github.com/Nanonid/rison#rison---compact-data-in-uris[Rison] is the serialization format many parts of Kibana use to store information in their URL.)
+
+For example: `discover#/view/0ac50180-82d9-11ec-9f4a-55de56b00cc0?_a=(filters:!((query:(match_phrase:(foo.keyword:{{rison key}})))))`
+
+If both conditions apply, you can cover all cases by applying both transforms: `{{encodeURIComponent (rison key)}}`.
+
+Technical note: TSVB uses https://handlebarsjs.com/[Handlebars] to perform these interpolations. `rison` and `encodeURIComponent` are custom Handlebars helpers provided by Kibana.
+
+====
+
 [discrete]
 [[why-is-my-tsvb-visualiztion-missing-data]]
 .*Why is my TSVB visualization missing data?*
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/replace_vars.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/replace_vars.ts
index 2862fe933bfb7..db152932fdbe5 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/replace_vars.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/replace_vars.ts
@@ -6,11 +6,55 @@
  * Side Public License, v 1.
  */
 
-import handlebars from 'handlebars';
+import { encode, RisonValue } from 'rison-node';
+import {
+  create as createHandlebars,
+  compile as compileHandlebars,
+  HelperDelegate,
+  HelperOptions,
+} from 'handlebars';
 import { i18n } from '@kbn/i18n';
 import { emptyLabel } from '../../../../common/empty_label';
 
-type CompileOptions = Parameters<typeof handlebars.compile>[1];
+type CompileOptions = Parameters<typeof compileHandlebars>[1];
+
+const handlebars = createHandlebars();
+
+function createSerializationHelper(
+  fnName: string,
+  serializeFn: (value: unknown) => string
+): HelperDelegate {
+  return (...args) => {
+    const { hash } = args.slice(-1)[0] as HelperOptions;
+    const hasHash = Object.keys(hash).length > 0;
+    const hasValues = args.length > 1;
+    if (hasHash && hasValues) {
+      throw new Error(`[${fnName}]: both value list and hash are not supported`);
+    }
+    if (hasHash) {
+      if (Object.values(hash).some((v) => typeof v === 'undefined'))
+        throw new Error(`[${fnName}]: unknown variable`);
+      return serializeFn(hash);
+    } else {
+      const values = args.slice(0, -1) as unknown[];
+      if (values.some((value) => typeof value === 'undefined'))
+        throw new Error(`[${fnName}]: unknown variable`);
+      if (values.length === 0) throw new Error(`[${fnName}]: unknown variable`);
+      if (values.length === 1) return serializeFn(values[0]);
+      return serializeFn(values);
+    }
+  };
+}
+
+handlebars.registerHelper(
+  'rison',
+  createSerializationHelper('rison', (v) => encode(v as RisonValue))
+);
+
+handlebars.registerHelper('encodeURIComponent', (component: unknown) => {
+  const str = String(component);
+  return encodeURIComponent(str);
+});
 
 export function replaceVars(
   str: string,
@@ -24,6 +68,10 @@ export function replaceVars(
     const template = handlebars.compile(str.split(emptyLabel).join(`[${emptyLabel}]`), {
       strict: true,
       knownHelpersOnly: true,
+      knownHelpers: {
+        rison: true,
+        encodeURIComponent: true,
+      },
       ...compileOptions,
     });
     const string = template({
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
index 8f3d44c1ea2d6..3e828a1b833bf 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
@@ -88,7 +88,7 @@ class TableVis extends Component {
     }
 
     if (model.drilldown_url) {
-      const url = replaceVars(model.drilldown_url, {}, { key: row.key });
+      const url = replaceVars(model.drilldown_url, {}, { key: row.key }, { noEscape: true });
       const handleDrilldownUrlClick = this.createDrilldownUrlClickHandler(url);
       rowDisplay = (
         <a
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/top_n/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/top_n/vis.js
index 20caa14ea8cb6..30a9588b03df6 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/top_n/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/top_n/vis.js
@@ -86,7 +86,7 @@ function TopNVisualization(props) {
 
   if (model.drilldown_url) {
     params.onClick = (item) => {
-      const url = replaceVars(model.drilldown_url, {}, { key: item.label });
+      const url = replaceVars(model.drilldown_url, {}, { key: item.label }, { noEscape: true });
       const validatedUrl = coreStart.http.externalUrl.validateUrl(url);
       if (validatedUrl) {
         setAccessDeniedDrilldownUrl(null);
diff --git a/src/plugins/vis_types/timeseries/tsconfig.json b/src/plugins/vis_types/timeseries/tsconfig.json
index 2d12f987bd1db..4462beae8c7be 100644
--- a/src/plugins/vis_types/timeseries/tsconfig.json
+++ b/src/plugins/vis_types/timeseries/tsconfig.json
@@ -10,6 +10,7 @@
     "common/**/*",
     "public/**/*",
     "server/**/*",
+    "../../../../typings/**/*",
     "*.ts"
   ],
   "references": [

From 5977b83900bc72f8ca83e4a7f5bcb713dfdd45c7 Mon Sep 17 00:00:00 2001
From: Kellen <9484709+goodroot@users.noreply.github.com>
Date: Thu, 10 Feb 2022 07:09:52 -0800
Subject: [PATCH 60/85] Removes builder

---
 .github/workflows/dev-doc-builder.yml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 .github/workflows/dev-doc-builder.yml

diff --git a/.github/workflows/dev-doc-builder.yml b/.github/workflows/dev-doc-builder.yml
deleted file mode 100644
index bbc8745854e48..0000000000000
--- a/.github/workflows/dev-doc-builder.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Dev docs
-on:
-  pull_request_target:
-    paths:
-      - '**.mdx'
-      - '**.docnav.json'
-      - '**.docapi.json'
-      - '**.devdocs.json'
-      - '**.jpg'
-      - '**.jpeg'
-      - '**.png'
-      - '**.gif'
-    types: [closed, opened, synchronize, reopened]
-
-jobs:
-  internal-docs:
-    uses: elastic/workflows/.github/workflows/dev-docs-builder.yml@main
-    secrets:
-      VERCEL_GITHUB_TOKEN: ${{ secrets.VERCEL_GITHUB_TOKEN }}
-      VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
-      VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
-      VERCEL_PROJECT_ID_DOCS_DEV: ${{ secrets.VERCEL_PROJECT_ID_DOCS_DEV }}

From 8ee9765190e399e40735f2ec9c3b654f36f6dd95 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Thu, 10 Feb 2022 18:14:56 +0300
Subject: [PATCH 61/85] [Timelion] Remove unused /api/timelion/validate/es
 route (#125231)

---
 .../vis_types/timelion/server/plugin.ts       |  2 -
 .../timelion/server/routes/validate_es.ts     | 71 -------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 src/plugins/vis_types/timelion/server/routes/validate_es.ts

diff --git a/src/plugins/vis_types/timelion/server/plugin.ts b/src/plugins/vis_types/timelion/server/plugin.ts
index b44aad5575b19..37308e337ef46 100644
--- a/src/plugins/vis_types/timelion/server/plugin.ts
+++ b/src/plugins/vis_types/timelion/server/plugin.ts
@@ -17,7 +17,6 @@ import { CoreSetup, PluginInitializerContext, Plugin } from '../../../../../src/
 import { configSchema } from '../config';
 import loadFunctions from './lib/load_functions';
 import { functionsRoute } from './routes/functions';
-import { validateEsRoute } from './routes/validate_es';
 import { runRoute } from './routes/run';
 import { ConfigManager } from './lib/config_manager';
 import { getUiSettings } from './ui_settings';
@@ -66,7 +65,6 @@ export class TimelionPlugin implements Plugin<void, void, TimelionPluginStartDep
 
     functionsRoute(router, deps);
     runRoute(router, deps);
-    validateEsRoute(router);
 
     core.uiSettings.register(getUiSettings(config));
   }
diff --git a/src/plugins/vis_types/timelion/server/routes/validate_es.ts b/src/plugins/vis_types/timelion/server/routes/validate_es.ts
deleted file mode 100644
index 1e894e09c6e1b..0000000000000
--- a/src/plugins/vis_types/timelion/server/routes/validate_es.ts
+++ /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 _ from 'lodash';
-import { IRouter } from 'kibana/server';
-import type { DataRequestHandlerContext } from '../../../../data/server';
-
-export function validateEsRoute(router: IRouter<DataRequestHandlerContext>) {
-  router.get(
-    {
-      path: '/api/timelion/validate/es',
-      validate: false,
-    },
-    async function (context, request, response) {
-      const uiSettings = await context.core.uiSettings.client.getAll();
-
-      const timefield = uiSettings['timelion:es.timefield'];
-
-      const body = {
-        params: {
-          index: uiSettings['es.default_index'],
-          body: {
-            aggs: {
-              maxAgg: {
-                max: {
-                  field: timefield,
-                },
-              },
-              minAgg: {
-                min: {
-                  field: timefield,
-                },
-              },
-            },
-            size: 0,
-          },
-        },
-      };
-
-      let resp;
-      try {
-        resp = (await context.search!.search(body, {}).toPromise()).rawResponse;
-      } catch (errResp) {
-        resp = errResp;
-      }
-
-      if (_.has(resp, 'aggregations.maxAgg.value') && _.has(resp, 'aggregations.minAgg.value')) {
-        return response.ok({
-          body: {
-            ok: true,
-            field: timefield,
-            min: _.get(resp, 'aggregations.minAgg.value'),
-            max: _.get(resp, 'aggregations.maxAgg.value'),
-          },
-        });
-      }
-
-      return response.ok({
-        body: {
-          ok: false,
-          resp,
-        },
-      });
-    }
-  );
-}

From e29847431d2fc204ab282a9464be14867187c083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Thu, 10 Feb 2022 16:53:50 +0100
Subject: [PATCH 62/85] [Unified observability] Use the new `dataViews` service
 in the observability plugin (#124952)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/observability/kibana.json      |  1 +
 .../exploratory_view/embeddable/index.tsx     |  2 +-
 .../hooks/use_app_index_pattern.tsx           |  6 ++--
 .../shared/exploratory_view/rtl_helpers.tsx   |  2 ++
 .../containers/alerts_page/alerts_page.tsx    |  2 +-
 x-pack/plugins/observability/public/plugin.ts |  2 ++
 .../observability_data_views.test.ts          | 32 +++++++++----------
 .../observability_data_views.ts               | 23 +++++++------
 8 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
index 1887764f6f72d..650d437a229ff 100644
--- a/x-pack/plugins/observability/kibana.json
+++ b/x-pack/plugins/observability/kibana.json
@@ -23,6 +23,7 @@
     "alerting",
     "cases",
     "data",
+    "dataViews",
     "features",
     "inspector",
     "ruleRegistry",
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
index 7b0e2d10c0d3b..4b68e9d5f6fa3 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
@@ -43,7 +43,7 @@ export function getExploratoryViewEmbeddable(
 
         setLoading(true);
         try {
-          const obsvIndexP = new ObservabilityDataViews(plugins.data);
+          const obsvIndexP = new ObservabilityDataViews(plugins.dataViews);
           const indPattern = await obsvIndexP.getDataView(
             dataType,
             dataTypesIndexPatterns?.[dataType]
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
index c865d8e6dca5e..2688812f76c9a 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
@@ -44,7 +44,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) {
   const [hasAppData, setHasAppData] = useState<HasAppDataState>({} as HasAppDataState);
 
   const {
-    services: { data },
+    services: { dataViews },
   } = useKibana<ObservabilityPublicPluginsStart>();
 
   const { indexPatterns: indexPatternsList } = useExploratoryView();
@@ -83,7 +83,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) {
           setHasAppData((prevState) => ({ ...prevState, [dataType]: hasDataT }));
 
           if (hasDataT && indices) {
-            const obsvIndexP = new ObservabilityDataViews(data);
+            const obsvIndexP = new ObservabilityDataViews(dataViews);
             const indPattern = await obsvIndexP.getDataView(dataType, indices);
 
             setIndexPatterns((prevState) => ({ ...prevState, [dataType]: indPattern }));
@@ -100,7 +100,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) {
         }
       }
     },
-    [data, hasAppData, indexPatternsList, loading]
+    [dataViews, hasAppData, indexPatternsList, loading]
   );
 
   return (
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
index 55e90db755eaf..84a52bd0d7e22 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
@@ -49,6 +49,7 @@ import { IndexPattern, IndexPatternsContract } from '../../../../../../../src/pl
 import { AppDataType, SeriesUrl, UrlFilter } from './types';
 import { createStubIndexPattern } from '../../../../../../../src/plugins/data/common/stubs';
 import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { dataViewPluginMocks } from '../../../../../../../src/plugins/data_views/public/mocks';
 import { ListItem } from '../../../hooks/use_values_list';
 import { TRANSACTION_DURATION } from './configurations/constants/elasticsearch_fieldnames';
 import { casesPluginMock } from '../../../../../cases/public/mocks';
@@ -133,6 +134,7 @@ export const mockCore: () => Partial<CoreStart & ObservabilityPublicPluginsStart
     },
     lens: lensPluginMock.createStartContract(),
     data: dataPluginMock.createStartContract(),
+    dataViews: dataViewPluginMocks.createStartContract(),
     cases: casesPluginMock.createStartContract(),
   };
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
index dc7eab6b0ca40..a8e78410e13c5 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
@@ -165,7 +165,7 @@ function AlertsPage() {
       {
         id: 'dynamic-observability-alerts-table-index-pattern',
         title: indexNames.join(','),
-        fields: await plugins.data.indexPatterns.getFieldsForWildcard({
+        fields: await plugins.dataViews.getFieldsForWildcard({
           pattern: indexNames.join(','),
           allowNoIndex: true,
         }),
diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
index 36a7600a58f25..38f300af9aa1e 100644
--- a/x-pack/plugins/observability/public/plugin.ts
+++ b/x-pack/plugins/observability/public/plugin.ts
@@ -24,6 +24,7 @@ import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
 } from '../../../../src/plugins/data/public';
+import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
 import type { DiscoverStart } from '../../../../src/plugins/discover/public';
 import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import type {
@@ -60,6 +61,7 @@ export interface ObservabilityPublicPluginsStart {
   home?: HomePublicPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   lens: LensPublicStart;
   discover: DiscoverStart;
 }
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
index 78899e9cabca0..0a24f35a498cc 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
@@ -68,49 +68,49 @@ const fieldFormats = {
 };
 
 describe('ObservabilityIndexPatterns', function () {
-  const { data } = mockCore();
-  data!.indexPatterns.get = jest.fn().mockReturnValue({ title: 'index-*' });
-  data!.indexPatterns.createAndSave = jest.fn().mockReturnValue({ id: dataViewList.ux });
-  data!.indexPatterns.updateSavedObject = jest.fn();
+  const { dataViews } = mockCore();
+  dataViews!.get = jest.fn().mockReturnValue({ title: 'index-*' });
+  dataViews!.createAndSave = jest.fn().mockReturnValue({ id: dataViewList.ux });
+  dataViews!.updateSavedObject = jest.fn();
 
   it('should return index pattern for app', async function () {
-    const obsv = new ObservabilityDataViews(data!);
+    const obsv = new ObservabilityDataViews(dataViews!);
 
     const indexP = await obsv.getDataView('ux', 'heartbeat-8*,synthetics-*');
 
     expect(indexP).toEqual({ id: 'rum_static_index_pattern_id' });
 
-    expect(data?.indexPatterns.get).toHaveBeenCalledWith(
+    expect(dataViews?.get).toHaveBeenCalledWith(
       'rum_static_index_pattern_id_heartbeat_8_synthetics_'
     );
-    expect(data?.indexPatterns.get).toHaveBeenCalledTimes(1);
+    expect(dataViews?.get).toHaveBeenCalledTimes(1);
   });
 
   it('should creates missing index pattern', async function () {
-    data!.indexPatterns.get = jest.fn().mockImplementation(() => {
+    dataViews!.get = jest.fn().mockImplementation(() => {
       throw new SavedObjectNotFound('index_pattern');
     });
 
-    data!.indexPatterns.createAndSave = jest.fn().mockReturnValue({ id: dataViewList.ux });
+    dataViews!.createAndSave = jest.fn().mockReturnValue({ id: dataViewList.ux });
 
-    const obsv = new ObservabilityDataViews(data!);
+    const obsv = new ObservabilityDataViews(dataViews!);
 
     const indexP = await obsv.getDataView('ux', 'trace-*,apm-*');
 
     expect(indexP).toEqual({ id: dataViewList.ux });
 
-    expect(data?.indexPatterns.createAndSave).toHaveBeenCalledWith({
+    expect(dataViews?.createAndSave).toHaveBeenCalledWith({
       fieldFormats,
       id: 'rum_static_index_pattern_id_trace_apm_',
       timeFieldName: '@timestamp',
       title: '(rum-data-view)*,trace-*,apm-*',
     });
 
-    expect(data?.indexPatterns.createAndSave).toHaveBeenCalledTimes(1);
+    expect(dataViews?.createAndSave).toHaveBeenCalledTimes(1);
   });
 
   it('should return getFieldFormats', function () {
-    const obsv = new ObservabilityDataViews(data!);
+    const obsv = new ObservabilityDataViews(dataViews!);
 
     expect(obsv.getFieldFormats('ux')).toEqual(fieldFormats);
   });
@@ -118,12 +118,12 @@ describe('ObservabilityIndexPatterns', function () {
   it('should validate field formats', async function () {
     mockIndexPattern.getFormatterForField = jest.fn().mockReturnValue({ params: () => {} });
 
-    const obsv = new ObservabilityDataViews(data!);
+    const obsv = new ObservabilityDataViews(dataViews!);
 
     await obsv.validateFieldFormats('ux', mockIndexPattern);
 
-    expect(data?.indexPatterns.updateSavedObject).toHaveBeenCalledTimes(1);
-    expect(data?.indexPatterns.updateSavedObject).toHaveBeenCalledWith(
+    expect(dataViews?.updateSavedObject).toHaveBeenCalledTimes(1);
+    expect(dataViews?.updateSavedObject).toHaveBeenCalledWith(
       expect.objectContaining({ fieldFormatMap: fieldFormats })
     );
   });
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
index eb66894772dfd..8a74482bb14ca 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
@@ -7,8 +7,11 @@
 
 import type { FieldFormat as IFieldFormat } from 'src/plugins/field_formats/common';
 import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import type { DataView, DataViewSpec } from '../../../../../../src/plugins/data/common';
+import type {
+  DataViewsPublicPluginStart,
+  DataView,
+  DataViewSpec,
+} from '../../../../../../src/plugins/data_views/public';
 import { rumFieldFormats } from '../../components/shared/exploratory_view/configurations/rum/field_formats';
 import { syntheticsFieldFormats } from '../../components/shared/exploratory_view/configurations/synthetics/field_formats';
 import {
@@ -77,19 +80,19 @@ export function isParamsSame(param1: IFieldFormat['_params'], param2: FieldForma
 }
 
 export class ObservabilityDataViews {
-  data?: DataPublicPluginStart;
+  dataViews?: DataViewsPublicPluginStart;
 
-  constructor(data: DataPublicPluginStart) {
-    this.data = data;
+  constructor(dataViews: DataViewsPublicPluginStart) {
+    this.dataViews = dataViews;
   }
 
   async createDataView(app: AppDataType, indices: string) {
-    if (!this.data) {
+    if (!this.dataViews) {
       throw new Error('data is not defined');
     }
 
     const appIndicesPattern = getAppIndicesWithPattern(app, indices);
-    return await this.data.dataViews.createAndSave({
+    return await this.dataViews.createAndSave({
       title: appIndicesPattern,
       id: getAppDataViewId(app, indices),
       timeFieldName: '@timestamp',
@@ -113,7 +116,7 @@ export class ObservabilityDataViews {
         }
       });
       if (isParamsDifferent) {
-        await this.data?.dataViews.updateSavedObject(dataView);
+        await this.dataViews?.updateSavedObject(dataView);
       }
     }
   }
@@ -142,7 +145,7 @@ export class ObservabilityDataViews {
   }
 
   async getDataView(app: AppDataType, indices?: string): Promise<DataView | undefined> {
-    if (!this.data) {
+    if (!this.dataViews) {
       throw new Error('data is not defined');
     }
     let appIndices = indices;
@@ -155,7 +158,7 @@ export class ObservabilityDataViews {
         const dataViewId = getAppDataViewId(app, appIndices);
         const dataViewTitle = getAppIndicesWithPattern(app, appIndices);
         // we will get the data view by id
-        const dataView = await this.data?.indexPatterns.get(dataViewId);
+        const dataView = await this.dataViews?.get(dataViewId);
 
         // and make sure title matches, otherwise, we will need to create it
         if (dataView.title !== dataViewTitle) {

From 7994f83dc5056d4ea6dc1dc36f1c2627f35fe56d Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 17:04:38 +0100
Subject: [PATCH 63/85] fix agg filter for sibling pipeline aggs (#125227)

---
 .../search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts b/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
index da110c1abb7e9..f8c903b8cfe42 100644
--- a/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
+++ b/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
@@ -30,7 +30,7 @@ const metricAggFilter: string[] = [
   '!filtered_metric',
   '!single_percentile',
 ];
-const bucketAggFilter: string[] = [];
+const bucketAggFilter: string[] = ['!filter', '!sampler', '!diversified_sampler', '!multi_terms'];
 
 export const siblingPipelineType = i18n.translate(
   'data.search.aggs.metrics.siblingPipelineAggregationsSubtypeTitle',

From 2da2c4a10e84bc34c7bdae4a0cb911f3c07e98e1 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Thu, 10 Feb 2022 17:16:04 +0100
Subject: [PATCH 64/85] [ML] Fix ML Overview page flaky test  (#124983)

* wait for page loading indicator

* unskip tests

* fix loading indicator
---
 .../trained_models/nodes_overview/allocated_models.tsx       | 2 +-
 .../application/trained_models/nodes_overview/nodes_list.tsx | 3 ++-
 x-pack/test/functional/apps/ml/permissions/full_ml_access.ts | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
index 7b3faecbd7a13..4fb77c02779f9 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
@@ -164,7 +164,7 @@ export const AllocatedModels: FC<AllocatedModelsProps> = ({
         'data-test-subj': `mlAllocatedModelTableRow row-${item.model_id}`,
       })}
       onTableChange={() => {}}
-      data-test-subj={'mlNodesTable'}
+      data-test-subj={'mlNodesAllocatedModels'}
     />
   );
 };
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
index bf29dffc5b852..b9f151d7bbd02 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
@@ -51,7 +51,7 @@ export const NodesList: FC<NodesListProps> = ({ compactView = false }) => {
   const { displayErrorToast } = useToastNotificationService();
   const bytesFormatter = useFieldFormatter(FIELD_FORMAT_IDS.BYTES);
   const [items, setItems] = useState<NodeItem[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<Record<string, JSX.Element>>(
     {}
   );
@@ -82,6 +82,7 @@ export const NodesList: FC<NodesListProps> = ({ compactView = false }) => {
           defaultMessage: 'Nodes fetch failed',
         })
       );
+      setIsLoading(false);
     }
   }, [itemIdToExpandedRowMap]);
 
diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
index e41f1491f98af..467bfc370e8e2 100644
--- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
+++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
@@ -21,8 +21,7 @@ export default function ({ getService }: FtrProviderContext) {
     { user: USER.ML_POWERUSER_SPACES, discoverAvailable: false },
   ];
 
-  // Failing: See https://github.com/elastic/kibana/issues/124938
-  describe.skip('for user with full ML access', function () {
+  describe('for user with full ML access', function () {
     this.tags(['skipFirefox', 'mlqa']);
 
     describe('with no data loaded', function () {
@@ -198,6 +197,8 @@ export default function ({ getService }: FtrProviderContext) {
             await ml.navigation.navigateToMl();
             await ml.navigation.navigateToOverview();
 
+            await ml.commonUI.waitForDatePickerIndicatorLoaded();
+
             await ml.testExecution.logTestStep('should display ML Nodes panel');
             await ml.mlNodesPanel.assertNodeOverviewPanel();
 

From b97769729365211a770bdef357b657055c895c82 Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Thu, 10 Feb 2022 10:34:22 -0600
Subject: [PATCH 65/85] [ML] Fix permission check for 'View examples' link from
 Anomaly detection explorer page (#125090)

* Add check for view examples

* Fix EuiContextMenuPanel stale

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../components/anomalies_table/links_menu.tsx | 66 ++++++++++++-------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
index 00ed14081c9be..1cc63a2688bf5 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
@@ -71,31 +71,30 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
 
   useEffect(() => {
     let unmounted = false;
+    const discoverLocator = share.url.locators.get('DISCOVER_APP_LOCATOR');
 
-    const generateDiscoverUrl = async () => {
-      const discoverLocator = share.url.locators.get('DISCOVER_APP_LOCATOR');
-
-      if (!discoverLocator) {
-        const discoverLocatorMissing = i18n.translate(
-          'xpack.ml.anomaliesTable.linksMenu.discoverLocatorMissingErrorMessage',
-          {
-            defaultMessage: 'No locator for Discover detected',
-          }
-        );
+    if (!discoverLocator) {
+      const discoverLocatorMissing = i18n.translate(
+        'xpack.ml.anomaliesTable.linksMenu.discoverLocatorMissingErrorMessage',
+        {
+          defaultMessage: 'No locator for Discover detected',
+        }
+      );
 
+      if (!unmounted) {
         setDiscoverUrlError(discoverLocatorMissing);
-
-        return;
       }
+      return;
+    }
 
+    const getDataViewId = async () => {
       const job = mlJobService.getJob(props.anomaly.jobId);
-
       const index = job.datafeed_config.indices[0];
-      const interval = props.interval;
+
       const dataViewId = await getDataViewIdFromName(index);
 
       // If data view doesn't exist for some reasons
-      if (!dataViewId) {
+      if (!dataViewId && !unmounted) {
         const autoGeneratedDiscoverLinkError = i18n.translate(
           'xpack.ml.anomaliesTable.linksMenu.autoGeneratedDiscoverLinkErrorMessage',
           {
@@ -106,6 +105,13 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
 
         setDiscoverUrlError(autoGeneratedDiscoverLinkError);
       }
+      return dataViewId;
+    };
+
+    const generateDiscoverUrl = async () => {
+      const interval = props.interval;
+
+      const dataViewId = await getDataViewId();
       const record = props.anomaly.source;
 
       const earliestMoment = moment(record.timestamp).startOf(interval);
@@ -163,6 +169,8 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
 
     if (!isCategorizationAnomalyRecord) {
       generateDiscoverUrl();
+    } else {
+      getDataViewId();
     }
 
     return () => {
@@ -400,7 +408,10 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
           // index configured in the datafeed. If a Kibana data view has not been created
           // for this index, then the user will see a warning message on the Discover tab advising
           // them that no matching data view has been configured.
-          const dataViewId = (await getDataViewIdFromName(index)) ?? index;
+          const dataViewId = await getDataViewIdFromName(index);
+
+          // We should not redirect to Discover if data view doesn't exist
+          if (!dataViewId) return;
 
           let query = null;
           // Build query using categorization regex (if keyword type) or terms (if text type).
@@ -569,7 +580,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
       );
     }
 
-    if (isCategorizationAnomalyRecord) {
+    if (application.capabilities.discover?.show && isCategorizationAnomalyRecord) {
       items.push(
         <EuiContextMenuItem
           key="view_examples"
@@ -579,11 +590,21 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
             viewExamples();
           }}
           data-test-subj="mlAnomaliesListRowActionViewExamplesButton"
+          disabled={discoverUrlError !== undefined}
         >
-          <FormattedMessage
-            id="xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel"
-            defaultMessage="View examples"
-          />
+          {discoverUrlError !== undefined ? (
+            <EuiToolTip content={discoverUrlError}>
+              <FormattedMessage
+                id="xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel"
+                defaultMessage="View examples"
+              />
+            </EuiToolTip>
+          ) : (
+            <FormattedMessage
+              id="xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel"
+              defaultMessage="View examples"
+            />
+          )}
         </EuiContextMenuItem>
       );
     }
@@ -609,6 +630,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
     return items;
   }, [
     openInDiscoverUrl,
+    discoverUrlError,
     viewExamples,
     viewSeries,
     canConfigureRules,
@@ -617,7 +639,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
 
   return (
     <EuiContextMenuPanel
-      hasFocus={!!openInDiscoverUrl}
+      hasFocus={discoverUrlError !== undefined || !!openInDiscoverUrl}
       items={contextMenuItems}
       data-test-subj="mlAnomaliesListRowActionsMenu"
     />

From ea9255342e56c6c8e957c24509f449ee4323fb88 Mon Sep 17 00:00:00 2001
From: "Christiane (Tina) Heiligers" <christiane.heiligers@elastic.co>
Date: Thu, 10 Feb 2022 10:43:30 -0700
Subject: [PATCH 66/85] Disabled import button while no file is attached
 (#125180)

---
 .../__snapshots__/flyout.test.tsx.snap        |  1 +
 .../objects_table/components/flyout.test.tsx  | 46 +++++++++++++++++++
 .../objects_table/components/flyout.tsx       | 12 ++++-
 .../apps/management/_import_objects.ts        |  5 ++
 .../management/saved_objects_page.ts          |  9 ++++
 5 files changed, 71 insertions(+), 2 deletions(-)

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 c816bbe65d4f1..d71c79398acae 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
@@ -378,6 +378,7 @@ exports[`Flyout should render import step 1`] = `
         <EuiButton
           data-test-subj="importSavedObjectsImportBtn"
           fill={true}
+          isDisabled={true}
           isLoading={false}
           onClick={[Function]}
           size="s"
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
index 04d4556548720..62a1c6357df05 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
@@ -92,6 +92,52 @@ describe('Flyout', () => {
     expect(component.state('file')).toBe(undefined);
   });
 
+  it('should only allow import once a file is selected', async () => {
+    const component = shallowRender(defaultProps);
+
+    // Ensure all promises resolve
+    await Promise.resolve();
+    // Ensure state changes are reflected
+    component.update();
+
+    expect(component.state('file')).toBe(undefined);
+    const importButton = await component.find(
+      'EuiButton[data-test-subj="importSavedObjectsImportBtn"]'
+    );
+    expect(importButton.prop('isDisabled')).toBe(true);
+    component.find('EuiFilePicker').simulate('change', [mockFile]);
+
+    // Ensure state changes are reflected
+    component.update();
+    const enabledImportButton = await component.find(
+      'EuiButton[data-test-subj="importSavedObjectsImportBtn"]'
+    );
+    expect(enabledImportButton.prop('isDisabled')).toBe(false);
+  });
+
+  it('should show "missing_file" error on import if import button is bypassed and no file is selected', async () => {
+    const component = shallowRender(defaultProps);
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    // Go through the import flow
+    await component.instance().import();
+    component.update();
+    // Ensure all promises resolve
+    await Promise.resolve();
+
+    expect(component.state('error')).toBe('missing_file');
+    expect(component.state('status')).toBe('error');
+
+    const callOutText = await component
+      .find('p[data-test-subj="importSavedObjectsErrorText"]')
+      .text();
+    expect(callOutText).toBe('missing_file');
+  });
+
   describe('conflicts', () => {
     beforeEach(() => {
       importFileMock.mockImplementation(() => ({
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 ca23452e875ec..7b363109a6f3b 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
@@ -146,11 +146,18 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
   import = async () => {
     const { http } = this.props;
     const { file, importMode } = this.state;
+    if (file === undefined) {
+      this.setState({
+        status: 'error',
+        error: 'missing_file',
+      });
+      return;
+    }
     this.setState({ status: 'loading', error: undefined });
 
     // Import the file
     try {
-      const response = await importFile(http, file!, importMode);
+      const response = await importFile(http, file, importMode);
       this.setState(processImportResponse(response), () => {
         // Resolve import errors right away if there's no index patterns to match
         // This will ask about overwriting each object, etc
@@ -486,7 +493,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
   }
 
   renderFooter() {
-    const { status } = this.state;
+    const { status, file } = this.state;
     const { done, close } = this.props;
 
     let confirmButton;
@@ -521,6 +528,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
           onClick={this.import}
           size="s"
           fill
+          isDisabled={file === undefined}
           isLoading={status === 'loading'}
           data-test-subj="importSavedObjectsImportBtn"
         >
diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index 81350b3542c44..23122312059c7 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -207,6 +207,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         const isSavedObjectImported = objects.includes('saved object imported with index pattern');
         expect(isSavedObjectImported).to.be(true);
       });
+
+      it('should not allow import without a file added', async function () {
+        const importActionDisabled = await PageObjects.savedObjects.importDisabled();
+        expect(importActionDisabled).to.eql('true');
+      });
     });
   });
 }
diff --git a/test/functional/page_objects/management/saved_objects_page.ts b/test/functional/page_objects/management/saved_objects_page.ts
index 87d5537d53ca3..655b84f2cf8e7 100644
--- a/test/functional/page_objects/management/saved_objects_page.ts
+++ b/test/functional/page_objects/management/saved_objects_page.ts
@@ -58,6 +58,15 @@ export class SavedObjectsPageObject extends FtrService {
     await this.header.waitUntilLoadingHasFinished();
   }
 
+  async importDisabled() {
+    this.log.debug(`tryImport`);
+    this.log.debug(`Finding import action`);
+    await this.testSubjects.click('importObjects');
+    this.log.debug(`Finding import button`);
+    const importButton = await this.testSubjects.find('importSavedObjectsImportBtn');
+    return await importButton.getAttribute('disabled');
+  }
+
   async checkImportSucceeded() {
     await this.testSubjects.existOrFail('importSavedObjectsSuccess', { timeout: 20000 });
   }

From ec7f2f3d8cd75d2d87396f68e175af33e0d4bfeb Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 18:59:15 +0100
Subject: [PATCH 67/85] click slower in timepicker (#125264)

---
 test/functional/page_objects/time_picker.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
index 4b73df26c48de..37933a91a9d70 100644
--- a/test/functional/page_objects/time_picker.ts
+++ b/test/functional/page_objects/time_picker.ts
@@ -29,6 +29,7 @@ export class TimePickerPageObject extends FtrService {
   private readonly retry = this.ctx.getService('retry');
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly header = this.ctx.getPageObject('header');
+  private readonly common = this.ctx.getPageObject('common');
   private readonly kibanaServer = this.ctx.getService('kibanaServer');
 
   private readonly quickSelectTimeMenuToggle = this.ctx.getService('menuToggle').create({
@@ -245,6 +246,9 @@ export class TimePickerPageObject extends FtrService {
     await this.testSubjects.click('superDatePickerAbsoluteTab');
     const end = await this.testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
 
+    // Wait until closing popover again to avoid https://github.com/elastic/eui/issues/5619
+    await this.common.sleep(2000);
+
     // get from time
     await this.testSubjects.click('superDatePickerstartDatePopoverButton');
     await this.waitPanelIsGone(panel);

From cbca869e8f60026b2707d1b3b76fe222fd2df27f Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 18:59:39 +0100
Subject: [PATCH 68/85] retry tab change (#125260)

---
 .../page_objects/visual_builder_page.ts       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 23f32768c0375..4054656028b6e 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -450,19 +450,27 @@ export class VisualBuilderPageObject extends FtrService {
     return await tableView.getVisibleText();
   }
 
+  private async switchTab(visType: string, tab: string) {
+    const testSubj = `${visType}Editor${tab}Btn`;
+    await this.retry.try(async () => {
+      await this.testSubjects.click(testSubj);
+      await this.header.waitUntilLoadingHasFinished();
+      if (!(await (await this.testSubjects.find(testSubj)).elementHasClass('euiTab-isSelected'))) {
+        throw new Error('tab not active');
+      }
+    });
+  }
+
   public async clickPanelOptions(tabName: string) {
-    await this.testSubjects.click(`${tabName}EditorPanelOptionsBtn`);
-    await this.header.waitUntilLoadingHasFinished();
+    await this.switchTab(tabName, 'PanelOptions');
   }
 
   public async clickDataTab(tabName: string) {
-    await this.testSubjects.click(`${tabName}EditorDataBtn`);
-    await this.header.waitUntilLoadingHasFinished();
+    await this.switchTab(tabName, 'Data');
   }
 
   public async clickAnnotationsTab() {
-    await this.testSubjects.click('timeSeriesEditorAnnotationsBtn');
-    await this.header.waitUntilLoadingHasFinished();
+    await this.switchTab('timeSeries', 'Annotations');
   }
 
   public async clickAnnotationsAddDataSourceButton() {

From bc01e77423519e5ea820ac9ff387d76343109cb0 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Thu, 10 Feb 2022 12:21:48 -0600
Subject: [PATCH 69/85] [DOCS] Adds 123550 known issue to rc1 release notes
 (#124987)

* [DOCS] Adds 123550 known issue to rc1 release notes

* Extra docs

* Whoops

* Add docs link to changelog

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Update docs/management/saved-objects/saved-object-ids.asciidoc

Co-authored-by: Larry Gregory <lgregorydev@gmail.com>

* Updates location and copy

* Small tweaks

* Review feedback

Co-authored-by: Joe Portner <joseph.portner@elastic.co>
Co-authored-by: Larry Gregory <lgregorydev@gmail.com>
---
 docs/CHANGELOG.asciidoc                       | 30 ++++++-
 .../advanced/sharing-saved-objects.asciidoc   |  8 +-
 .../managing-saved-objects.asciidoc           |  2 +
 .../saved-objects/saved-object-ids.asciidoc   | 87 +++++++++++++++++++
 4 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 docs/management/saved-objects/saved-object-ids.asciidoc

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 720f9a29431d1..47ebcd573edc2 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -76,6 +76,34 @@ To review the deprecations in previous versions, refer to the following:
 
 <<deprecations-8.0.0-rc1,8.0.0-rc1>> | <<deprecations-8.0.0-alpha1,8.0.0-alpha1>>
 
+[float]
+[[known-issue-8.0.0]]
+=== Known issue
+
+[discrete]
+[[known-issue-123550]]
+.Importing and copying saved objects causes weak links to break
+[%collapsible]
+====
+*Details* +
+{kib} supports weak links in some saved objects. For example, a dashboard may include a Markdown panel that contains a relative URL to
+another dashboard. Weak links are defined by free text, _not_ the saved object's relationships, and can break if **both** of the following
+conditions are true:
+
+* You are importing saved objects into multiple spaces, _OR_ you are copying saved objects into another space
+* Before you upgraded to 8.0.0, the saved objects did not already exist in the destinations
+
+In 8.0.0 and later, weak links break because <<saved-object-ids-impact-when-using-import-and-copy,saved object IDs can change during import or copy>>.
+This applies to both the UI and the API.
+This issue will be fixed 8.0.1 and 8.1.0. For more information, refer to {kibana-issue}123550[#123550].
+
+*Impact* +
+Saved objects in 7.x that are migrated during upgrade are **not** impacted.
+Only _new_ saved objects that are imported or copied _multiple times_ (causing object IDs to change) are impacted.
+If you are impacted, you can re-import or re-copy your saved objects after the fix is
+implemented to preserve the weak links.
+====
+
 [float]
 [[features-8.0.0]]
 === Features
@@ -151,7 +179,7 @@ To review the breaking changes in previous versions, refer to the following:
 
 <<breaking-changes-8.0.0-rc1,8.0.0-rc1>> | <<breaking-changes-8.0.0-beta1,8.0.0-beta1>> | <<breaking-changes-8.0.0-alpha2,8.0.0-alpha2>> | 
 <<breaking-changes-8.0.0-alpha1,8.0.0-alpha1>>
- 
+
 [float]
 [[features-8.0.0-rc2]]
 === Features
diff --git a/docs/developer/advanced/sharing-saved-objects.asciidoc b/docs/developer/advanced/sharing-saved-objects.asciidoc
index 9a009e6ad49b7..beff7cc007b6d 100644
--- a/docs/developer/advanced/sharing-saved-objects.asciidoc
+++ b/docs/developer/advanced/sharing-saved-objects.asciidoc
@@ -405,8 +405,8 @@ necessary. However, such handling of secondary objects is not considered critica
 ==== 4. What is a "legacy URL alias"?
 
 As depicted above, when an object is converted to become share-capable, if it exists in a non-Default space, its ID gets changed. To
-preserve its old ID, we also create a special object called a _legacy URL alias_ ("alias" for short); this alias retains the target object's
-old ID (_sourceId_), and it contains a pointer to the target object's new ID (_targetId_).
+preserve its old ID, we also create a special object called a <<legacy-url-aliases,_legacy URL alias_>> ("alias" for short); this alias
+retains the target object's old ID (_sourceId_), and it contains a pointer to the target object's new ID (_targetId_).
 
 Aliases are meant to be mostly invisible to end-users by design. There is no UI to manage them directly. Our vision is that aliases will be
 used as a stop-gap to help us through the 8.0 upgrade process, but we will nudge users away from relying on aliases so we can eventually
@@ -473,3 +473,7 @@ change any other data flows to use `resolve()`.
 External plugins (those not shipped with {kib}) can use this guide to convert any isolated objects to become share-capable or fully
 shareable! If you are an external plugin developer, the steps are the same, but you don't need to worry about getting anything done before a
 specific release. The only thing you need to know is that your plugin cannot convert your objects until the 8.0 release.
+
+==== 8. How will users be impacted?
+
+Refer to <<saved-object-ids,Saved Object IDs>> documentation for more details how users should expect to be impacted.
diff --git a/docs/management/managing-saved-objects.asciidoc b/docs/management/managing-saved-objects.asciidoc
index b9859575051af..3901d178e1461 100644
--- a/docs/management/managing-saved-objects.asciidoc
+++ b/docs/management/managing-saved-objects.asciidoc
@@ -126,3 +126,5 @@ WARNING: Validation is not performed for object properties. Submitting an invali
 change will render the object unusable. A more failsafe approach is to use
 *Discover* or *Dashboard* to create new objects instead of
 directly editing an existing one.
+
+include::saved-objects/saved-object-ids.asciidoc[]
diff --git a/docs/management/saved-objects/saved-object-ids.asciidoc b/docs/management/saved-objects/saved-object-ids.asciidoc
new file mode 100644
index 0000000000000..a09f91ee361cd
--- /dev/null
+++ b/docs/management/saved-objects/saved-object-ids.asciidoc
@@ -0,0 +1,87 @@
+[[saved-object-ids]]
+=== Saved Object IDs
+
+In the past, many saved object types could have the same ID in different <<xpack-spaces,spaces>>. For example, if you copied dashboard "123"
+from the one space to another space, the second dashboard would also have an ID of "123". While the saved object ID is not something
+that users would interact with directly, many aspects of {kib} rely on it, notably URLs. If you have a "deep link" URL to a saved dashboard,
+that URL includes the saved object ID.
+
+**Starting in the 8.0 release**, {kib} requires most saved objects to have _globally unique_ IDs. This is a change that we needed to make to
+support sharing saved objects to multiple spaces. Most saved objects cannot be shared to multiple spaces _yet_, but we needed to start
+enforcing globally unique object IDs first.
+
+We have made several enhancements to minimize the impact, and this document describes what you need to know about the changes and
+how it will affect you.
+
+[[saved-object-ids-impact-upon-upgrading]]
+==== Impact upon upgrading to 8.x
+
+Every time you upgrade {kib}, <<saved-object-migrations,saved objects are migrated to a new format>>. When you
+first upgrade from 7.x to 8.x, this migration process will start enforcing globally unique saved object IDs.
+
+In practical terms, **any old saved objects that exist in a custom space will have their IDs changed to a new UUID**, while saved objects in
+the Default space will be unchanged. This is how we can ensure that every saved object ID is unique. For example: if you had dashboard "123"
+in the Default space and dashboard "123" in Another space, after the upgrade you would have dashboard "123" in the Default space and
+dashboard "456" in Another space.
+
+[[saved-object-ids-impact-when-using]]
+==== Impact when using 8.x
+
+After you upgrade, or if you set up a new {kib} instance using 8.x, there are a few more things that behave differently.
+
+[[saved-object-ids-impact-when-using-legacy-urls]]
+===== Accessing saved objects using old URLs
+
+When you upgrade {kib} and saved object IDs change, the "deep link" URLs to access those saved objects will also change. To reduce the impact,
+each existing URL is preserved with a special <<legacy-url-aliases,legacy URL alias>>. This means that if you use a bookmark for
+a saved object ID that was changed, you'll be redirected to the new URL for that saved object.
+
+[[saved-object-ids-impact-when-using-import-and-copy]]
+===== Importing and copying saved objects
+
+When you <<managing-saved-objects-copy-to-space,copy a saved object to another space>>, {kib} effectively
+<<managing-saved-objects-export-objects,exports it and imports it into that space>>. In this way, copying a saved object has always behaved
+like an import. In this document when we say "import", it applies to both features.
+
+Historically, whether you imported or copied a saved object, {kib} would create _at most_ one copy of a saved object in that space. If you
+imported the saved object multiple times, {kib} would overwrite the existing object, because it used the same ID. Since saved object IDs are
+now globally unique, {kib} maintains this functionality by tracking each saved object's _origin_. When you import an object in 8.x, {kib}
+uses either the saved object ID _or_ the origin to determine its destination.
+
+If you import a saved object using the "Check for existing objects" option -- whether it was exported from 7.x or 8.x -- {kib} will
+take the following steps:
+
+1. If {kib} finds a matching saved object with the exact same ID in the target space, that will be the import destination -- you can **overwrite** that
+destination or **skip** it.
+
+2. Otherwise, if {kib} finds a matching saved object with a _different_ ID that has the same origin, that will be the import destination
+-- again, you can **overwrite** that destination or **skip** it.
+
+3. Otherwise, if a saved object with the exact same ID exists in a _different_ space, then {kib} will generate a random ID for the import
+destination, preserving the saved object's origin.
+
+4. Otherwise, {kib} creates the saved object with the given ID.
+
+For example, you have a saved object in an `export.ndjson` file, and you set up a brand new {kib} instance. You attempt to import the saved
+object using the "Check for existing objects" and "Automatically overwrite conflicts" options. The first time you import the saved object,
+{kib} will create a new object with the same ID (step 4 above). If you import it again, {kib} will find that object and overwrite it (step 1
+above). If you then create a _different_ space and import it there, {kib} will create a new object with a random ID (step 3 above). Finally,
+if you import it into the second space again, {kib} will find the second object with a matching origin and overwrite it (step 2 above).
+
+WARNING: When you import a saved object and it is created with a different ID, if 1. it contains weak links to other saved objects (such as
+a dashboard with a Markdown URL to navigate to another dashboard) and 2. the object's ID has changed (step 3 above), those weak links will
+be broken. For more information, refer to <<known-issue-123550,the known issue in the changelog>>.
+
+[[saved-object-ids-impact-when-using-apis]]
+===== Using the saved objects APIs
+
+If you are using the saved objects APIs directly, you should be aware of these changes:
+
+* When using the <<saved-objects-api-create,create>> or <<saved-objects-api-bulk-create,bulk create>> API, you may encounter
+  <<saved-objects-api-bulk-create-conflict-errors,conflict errors>> that **cannot** be overridden using the `overwrite: true`
+  option. This can occur if there is already a saved object with this ID in a _different_ space, or if there is a legacy URL alias for this
+  ID in the same space.
+* When using the <<saved-objects-api-import,import>> or <<spaces-api-copy-saved-objects,copy to space>> API, objects can potentially be
+  created with a different ID as described above.
+* When using the <<saved-objects-api-delete,delete>> API, if the saved object exists in multiple spaces, it can only be deleted by using the
+  <<saved-objects-api-delete-query-params,`force` option>>.

From 71ab6de626de8c522f8ddf57c5c7686f31a4d2ec Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Thu, 10 Feb 2022 12:59:10 -0600
Subject: [PATCH 70/85] [cloud][chat] Apply z-index; provide button to hide
 (#124581)

* [cloud][chat] Apply z-index; provide button to hide

* Address feedback, cleanup

* Addressing feedback

* Adding focus selector

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/components/chat/chat.stories.tsx   |  64 ++++++-
 .../cloud/public/components/chat/chat.tsx     | 160 ++++++++----------
 .../public/components/chat/use_chat_config.ts | 116 +++++++++++++
 3 files changed, 248 insertions(+), 92 deletions(-)
 create mode 100644 x-pack/plugins/cloud/public/components/chat/use_chat_config.ts

diff --git a/x-pack/plugins/cloud/public/components/chat/chat.stories.tsx b/x-pack/plugins/cloud/public/components/chat/chat.stories.tsx
index 668017e134e75..0f58e51365ec4 100644
--- a/x-pack/plugins/cloud/public/components/chat/chat.stories.tsx
+++ b/x-pack/plugins/cloud/public/components/chat/chat.stories.tsx
@@ -5,7 +5,15 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
+import {
+  EuiButton,
+  EuiGlobalToastList,
+  EuiGlobalToastListProps,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+import { forceReRender } from '@storybook/react';
 
 import { Chat } from './chat';
 
@@ -15,6 +23,58 @@ export default {
   parameters: {},
 };
 
+const Toaster = () => {
+  const [toasts, setToasts] = useState<EuiGlobalToastListProps['toasts']>([]);
+
+  return (
+    <>
+      <EuiButton
+        onClick={() =>
+          setToasts([
+            {
+              id: 'toast',
+              title: 'Download complete!',
+              color: 'success',
+              text: <p>Thanks for your patience!</p>,
+            },
+          ])
+        }
+      >
+        Show Toast
+      </EuiButton>
+      <EuiGlobalToastList
+        toasts={toasts}
+        toastLifeTimeMs={3000}
+        dismissToast={() => {
+          setToasts([]);
+        }}
+      />
+    </>
+  );
+};
+
 export const Component = () => {
-  return <Chat />;
+  const [isHidden, setIsHidden] = useState(false);
+
+  return (
+    <>
+      <EuiFlexGroup gutterSize="s">
+        <EuiFlexItem grow={false}>
+          <Toaster />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton
+            onClick={() => {
+              setIsHidden(false);
+              forceReRender();
+            }}
+            disabled={!isHidden}
+          >
+            Reset
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <Chat onHide={() => setIsHidden(true)} />
+    </>
+  );
 };
diff --git a/x-pack/plugins/cloud/public/components/chat/chat.tsx b/x-pack/plugins/cloud/public/components/chat/chat.tsx
index 99b53f553e75f..189ec747bcae7 100644
--- a/x-pack/plugins/cloud/public/components/chat/chat.tsx
+++ b/x-pack/plugins/cloud/public/components/chat/chat.tsx
@@ -5,107 +5,87 @@
  * 2.0.
  */
 
-import React, { useEffect, useRef, useState, CSSProperties } from 'react';
+import React, { useRef, useState } from 'react';
 import { css } from '@emotion/react';
-import { useChat } from '../../services';
-import { getChatContext } from './get_chat_context';
 
-type UseChatType =
-  | { enabled: false }
-  | {
-      enabled: true;
-      src: string;
-      ref: React.MutableRefObject<HTMLIFrameElement | null>;
-      style: CSSProperties;
-      isReady: boolean;
-    };
+import { i18n } from '@kbn/i18n';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { euiThemeVars } from '@kbn/ui-theme';
 
-const MESSAGE_READY = 'driftIframeReady';
-const MESSAGE_RESIZE = 'driftIframeResize';
-const MESSAGE_SET_CONTEXT = 'driftSetContext';
+import { useChatConfig } from './use_chat_config';
 
-const useChatConfig = (): UseChatType => {
-  const ref = useRef<HTMLIFrameElement>(null);
-  const chat = useChat();
-  const [style, setStyle] = useState<CSSProperties>({});
-  const [isReady, setIsReady] = useState(false);
+export interface Props {
+  /** Handler invoked when chat is hidden by someone. */
+  onHide?: () => void;
+  /** Handler invoked when the chat widget signals it is ready. */
+  onReady?: () => void;
+  /** Handler invoked when the chat widget signals to be resized. */
+  onResize?: () => void;
+}
 
-  useEffect(() => {
-    const handleMessage = (event: MessageEvent): void => {
-      const { current: chatIframe } = ref;
-
-      if (
-        !chat.enabled ||
-        !chatIframe?.contentWindow ||
-        event.source !== chatIframe?.contentWindow
-      ) {
-        return;
-      }
-
-      const context = getChatContext();
-      const { data: message } = event;
-      const { user: userConfig } = chat;
-      const { id, email, jwt } = userConfig;
-
-      switch (message.type) {
-        case MESSAGE_READY: {
-          const user = {
-            id,
-            attributes: {
-              email,
-            },
-            jwt,
-          };
-
-          chatIframe.contentWindow.postMessage(
-            {
-              type: MESSAGE_SET_CONTEXT,
-              data: { context, user },
-            },
-            '*'
-          );
-
-          setIsReady(true);
-
-          break;
-        }
-
-        case MESSAGE_RESIZE: {
-          const styles = message.data.styles || ({} as CSSProperties);
-          setStyle({ ...style, ...styles });
-          break;
-        }
-
-        default:
-          break;
-      }
-    };
-
-    window.addEventListener('message', handleMessage);
-
-    return () => window.removeEventListener('message', handleMessage);
-  }, [chat, style]);
+/**
+ * A component that will display a trigger that will allow the user to chat with a human operator,
+ * when the service is enabled; otherwise, it renders nothing.
+ */
+export const Chat = ({ onHide = () => {}, onReady, onResize }: Props) => {
+  const config = useChatConfig({ onReady, onResize });
+  const ref = useRef<HTMLDivElement>(null);
+  const [isClosed, setIsClosed] = useState(false);
 
-  if (chat.enabled) {
-    return { enabled: true, src: chat.chatURL, ref, style, isReady };
+  if (!config.enabled || isClosed) {
+    return null;
   }
 
-  return { enabled: false };
-};
-
-export const Chat = () => {
-  const config = useChatConfig();
+  const { isReady, style } = config;
+  const { bottom, height, right } = style;
 
-  if (!config.enabled) {
-    return null;
-  }
+  const buttonCSS = css`
+    bottom: calc(${bottom} + ${height});
+    position: fixed;
+    right: calc(${right} + ${euiThemeVars.euiSizeXS});
+    visibility: hidden;
+  `;
 
-  const iframeStyle = css`
+  const button = (
+    <EuiButtonEmpty
+      css={buttonCSS}
+      data-test-subj="cloud-chat-hide"
+      name="cloudChatHide"
+      onClick={() => {
+        setIsClosed(true);
+        onHide();
+      }}
+      size="xs"
+    >
+      {i18n.translate('xpack.cloud.chat.hideChatButtonLabel', {
+        defaultMessage: 'Hide chat',
+      })}
+    </EuiButtonEmpty>
+  );
+
+  const containerCSS = css`
+    bottom: ${euiThemeVars.euiSizeXL};
     position: fixed;
-    botton: 30px;
-    right: 30px;
-    visibility: ${config.isReady ? 'visible' : 'hidden'};
+    right: ${euiThemeVars.euiSizeXL};
+    visibility: ${isReady ? 'visible' : 'hidden'};
+    z-index: ${euiThemeVars.euiZMaskBelowHeader - 1};
+
+    &:focus [name='cloudChatHide'],
+    &:hover [name='cloudChatHide'] {
+      visibility: visible;
+    }
   `;
 
-  return <iframe css={iframeStyle} data-test-subj="floatingChatTrigger" title="chat" {...config} />;
+  return (
+    <div css={containerCSS} ref={ref} data-test-subj="cloud-chat">
+      {button}
+      <iframe
+        data-test-subj="cloud-chat-frame"
+        title={i18n.translate('xpack.cloud.chat.chatFrameTitle', {
+          defaultMessage: 'Chat',
+        })}
+        {...config}
+      />
+    </div>
+  );
 };
diff --git a/x-pack/plugins/cloud/public/components/chat/use_chat_config.ts b/x-pack/plugins/cloud/public/components/chat/use_chat_config.ts
new file mode 100644
index 0000000000000..1130e52f068d9
--- /dev/null
+++ b/x-pack/plugins/cloud/public/components/chat/use_chat_config.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 React, { useEffect, useRef, useState, CSSProperties } from 'react';
+import { useChat } from '../../services';
+import { getChatContext } from './get_chat_context';
+import { Props as ChatProps } from './chat';
+
+type UseChatType =
+  | { enabled: false }
+  | {
+      enabled: true;
+      src: string;
+      ref: React.MutableRefObject<HTMLIFrameElement | null>;
+      style: CSSProperties;
+      isReady: boolean;
+    };
+
+const MESSAGE_WIDGET_READY = 'driftWidgetReady';
+const MESSAGE_IFRAME_READY = 'driftIframeReady';
+const MESSAGE_RESIZE = 'driftIframeResize';
+const MESSAGE_SET_CONTEXT = 'driftSetContext';
+
+type ChatConfigParams = Exclude<ChatProps, 'onHide'>;
+
+/**
+ * Hook which handles positioning and communication with the chat widget.
+ */
+export const useChatConfig = ({
+  onReady = () => {},
+  onResize = () => {},
+}: ChatConfigParams): UseChatType => {
+  const ref = useRef<HTMLIFrameElement>(null);
+  const chat = useChat();
+  const [style, setStyle] = useState<CSSProperties>({});
+  const [isReady, setIsReady] = useState(false);
+
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent): void => {
+      const { current: chatIframe } = ref;
+
+      if (
+        !chat.enabled ||
+        !chatIframe?.contentWindow ||
+        event.source !== chatIframe?.contentWindow
+      ) {
+        return;
+      }
+
+      const context = getChatContext();
+      const { data: message } = event;
+      const { user: userConfig } = chat;
+      const { id, email, jwt } = userConfig;
+
+      switch (message.type) {
+        // The IFRAME is ready to receive messages.
+        case MESSAGE_IFRAME_READY: {
+          const user = {
+            id,
+            attributes: {
+              email,
+            },
+            jwt,
+          };
+
+          chatIframe.contentWindow.postMessage(
+            {
+              type: MESSAGE_SET_CONTEXT,
+              data: { context, user },
+            },
+            '*'
+          );
+
+          break;
+        }
+
+        // Drift is attempting to resize the IFRAME based on interactions with
+        // its interface.
+        case MESSAGE_RESIZE: {
+          const styles = message.data.styles || ({} as CSSProperties);
+          setStyle({ ...style, ...styles });
+
+          // While it might appear we should set this when we receive MESSAGE_WIDGET_READY,
+          // we need to wait for the iframe to be resized the first time before it's considered
+          // *visibly* ready.
+          if (!isReady) {
+            setIsReady(true);
+            onReady();
+          }
+
+          onResize();
+          break;
+        }
+
+        // The chat widget is ready.
+        case MESSAGE_WIDGET_READY:
+        default:
+          break;
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => window.removeEventListener('message', handleMessage);
+  }, [chat, style, onReady, onResize, isReady]);
+
+  if (chat.enabled) {
+    return { enabled: true, src: chat.chatURL, ref, style, isReady };
+  }
+
+  return { enabled: false };
+};

From 0cdc636b5d07fc61adddaaa12b2370d389ebc38f Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 20:12:24 +0100
Subject: [PATCH 71/85] [Lens] Navigation prompt API (#123539)

* expose vis registration

* add example app

* remove file

* fix and stabilize

* tsconfig fix

* fix type problems

* wire it up

* handle migrations

* fix problems

* fix tests

* fix types and add tests

* fix types of example

* fix merge problems

* code review

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../.eslintrc.json                            |   5 +
 .../README.md                                 |   5 +
 .../kibana.json                               |  23 ++
 .../package.json                              |  14 +
 .../public/image.png                          | Bin 0 -> 26243 bytes
 .../public/index.ts                           |  10 +
 .../public/plugin.ts                          | 171 ++++++++++++
 .../tsconfig.json                             |  22 ++
 .../public/image.png                          | Bin 0 -> 64212 bytes
 .../public/plugin.ts                          |   6 +-
 .../lens/public/app_plugin/app.test.tsx       |  82 ++++++
 x-pack/plugins/lens/public/app_plugin/app.tsx |   4 +
 .../lens/public/app_plugin/lens_top_nav.tsx   | 246 ++++++++++--------
 .../lens/public/app_plugin/mounter.tsx        |  12 +-
 .../plugins/lens/public/app_plugin/types.ts   |  12 +-
 x-pack/plugins/lens/public/plugin.ts          |  23 +-
 x-pack/plugins/lens/public/types.ts           |  16 ++
 17 files changed, 537 insertions(+), 114 deletions(-)
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/.eslintrc.json
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/README.md
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/kibana.json
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/package.json
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/public/image.png
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/public/index.ts
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
 create mode 100644 x-pack/examples/third_party_lens_navigation_prompt/tsconfig.json
 create mode 100644 x-pack/examples/third_party_vis_lens_example/public/image.png

diff --git a/x-pack/examples/third_party_lens_navigation_prompt/.eslintrc.json b/x-pack/examples/third_party_lens_navigation_prompt/.eslintrc.json
new file mode 100644
index 0000000000000..2aab6c2d9093b
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "@typescript-eslint/consistent-type-definitions": 0
+  }
+}
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/README.md b/x-pack/examples/third_party_lens_navigation_prompt/README.md
new file mode 100644
index 0000000000000..bec763006b30f
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/README.md
@@ -0,0 +1,5 @@
+# Third party Lens top nav menu entry
+
+To run this example plugin, use the command `yarn start --run-examples`.
+
+This example shows how to register a custom top nav menu entry in Lens which has access to the current Lens state. The primary use case for this is to provide custom actions based on the current configuration.
\ No newline at end of file
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/kibana.json b/x-pack/examples/third_party_lens_navigation_prompt/kibana.json
new file mode 100644
index 0000000000000..ff4f15faf2465
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/kibana.json
@@ -0,0 +1,23 @@
+{
+  "id": "thirdPartyLensNavigationPrompt",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["third_party_lens_navigation_prompt"],
+  "server": false,
+  "ui": true,
+  "requiredPlugins": [
+    "lens",
+    "discover",
+    "data",
+    "dataViews",
+    "embeddable",
+    "developerExamples"
+  ],
+  "optionalPlugins": [],
+  "requiredBundles": [
+  ],
+  "owner": {
+    "name": "Vis Editors",
+    "githubTeam": "kibana-vis-editors"
+  }
+}
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/package.json b/x-pack/examples/third_party_lens_navigation_prompt/package.json
new file mode 100644
index 0000000000000..3991a72e7f473
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "third_party_lens_navigation_prompt",
+  "version": "1.0.0",
+  "main": "target/examples/third_party_lens_navigation_prompt",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "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/x-pack/examples/third_party_lens_navigation_prompt/public/image.png b/x-pack/examples/third_party_lens_navigation_prompt/public/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d56695cc82fee82a0a4fba141ceae7b74ebdfa1
GIT binary patch
literal 26243
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
B`OW|U

literal 0
HcmV?d00001

diff --git a/x-pack/examples/third_party_lens_navigation_prompt/public/index.ts b/x-pack/examples/third_party_lens_navigation_prompt/public/index.ts
new file mode 100644
index 0000000000000..afe76682f6123
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/public/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EmbeddedLensExamplePlugin } from './plugin';
+
+export const plugin = () => new EmbeddedLensExamplePlugin();
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
new file mode 100644
index 0000000000000..e683305d1fca8
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
@@ -0,0 +1,171 @@
+/*
+ * 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 { DiscoverSetup } from 'src/plugins/discover/public';
+import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
+import { DataViewsPublicPluginStart, DataView } from '../../../../src/plugins/data_views/public';
+import {
+  DateHistogramIndexPatternColumn,
+  IndexPatternPersistedState,
+  LensPublicSetup,
+  LensPublicStart,
+} from '../../../plugins/lens/public';
+import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plugins/lens/public';
+import image from './image.png';
+
+export interface SetupDependencies {
+  developerExamples: DeveloperExamplesSetup;
+  lens: LensPublicSetup;
+  discover: DiscoverSetup;
+}
+
+export interface StartDependencies {
+  dataViews: DataViewsPublicPluginStart;
+  data: DataPublicPluginStart;
+  lens: LensPublicStart;
+}
+
+function getLensAttributes(defaultDataView: DataView): TypedLensByValueInput['attributes'] {
+  const dataLayer: PersistedIndexPatternLayer = {
+    columnOrder: ['col1', 'col2'],
+    columns: {
+      col1: {
+        dataType: 'date',
+        isBucketed: true,
+        label: '@timestamp',
+        operationType: 'date_histogram',
+        params: { interval: 'auto' },
+        scale: 'interval',
+        sourceField: defaultDataView.timeFieldName!,
+      } as DateHistogramIndexPatternColumn,
+      col2: {
+        dataType: 'number',
+        isBucketed: false,
+        label: 'Average',
+        operationType: 'average',
+        scale: 'ratio',
+        sourceField: defaultDataView.fields.find(
+          (field) => field.aggregatable && field.type === 'number'
+        )!.name,
+      },
+    },
+  };
+
+  return {
+    visualizationType: 'lnsDatatable',
+    title: 'Prefilled from example app',
+    references: [
+      {
+        id: defaultDataView.id!,
+        name: 'indexpattern-datasource-current-indexpattern',
+        type: 'index-pattern',
+      },
+      {
+        id: defaultDataView.id!,
+        name: 'indexpattern-datasource-layer-layer1',
+        type: 'index-pattern',
+      },
+    ],
+    state: {
+      datasourceStates: {
+        indexpattern: {
+          layers: {
+            layer1: dataLayer,
+          },
+        },
+      },
+      filters: [],
+      query: { language: 'kuery', query: '' },
+      visualization: {
+        columns: [{ columnId: 'col1' }, { columnId: 'col2' }],
+        layerId: 'layer1',
+        layerType: 'data',
+      },
+    },
+  };
+}
+
+export class EmbeddedLensExamplePlugin
+  implements Plugin<void, void, SetupDependencies, StartDependencies>
+{
+  public setup(
+    core: CoreSetup<StartDependencies>,
+    { developerExamples, lens, discover }: SetupDependencies
+  ) {
+    core.application.register({
+      id: 'third_party_lens_navigation_prompt',
+      title: 'Third party Lens navigation prompt',
+      navLinkStatus: AppNavLinkStatus.hidden,
+      mount: (params) => {
+        (async () => {
+          const [, { lens: lensStart, dataViews }] = await core.getStartServices();
+          const defaultDataView = await dataViews.getDefault();
+          lensStart.navigateToPrefilledEditor({
+            id: '',
+            timeRange: {
+              from: 'now-5d',
+              to: 'now',
+            },
+            attributes: getLensAttributes(defaultDataView!),
+          });
+        })();
+        return () => {};
+      },
+    });
+
+    developerExamples.register({
+      appId: 'third_party_lens_navigation_prompt',
+      title: 'Third party Lens navigation prompt',
+      description:
+        'Add custom menu entries to the Lens editor, like the "Go to discover" link in this example.',
+      image,
+      links: [
+        {
+          label: 'README',
+          href: 'https://github.com/elastic/kibana/tree/main/x-pack/examples/third_party_lens_navigation_prompt',
+          iconType: 'logoGithub',
+          size: 's',
+          target: '_blank',
+        },
+      ],
+    });
+
+    if (!discover.locator) return;
+    lens.registerTopNavMenuEntryGenerator(({ datasourceStates, query, filters }) => {
+      if (!datasourceStates.indexpattern.state) return;
+
+      return {
+        label: 'Go to discover',
+        iconType: 'discoverApp',
+        run: async () => {
+          const [, { data }] = await core.getStartServices();
+          const firstLayer = Object.values(
+            (datasourceStates.indexpattern.state as IndexPatternPersistedState).layers
+          )[0] as PersistedIndexPatternLayer & { indexPatternId: string };
+          discover.locator!.navigate({
+            indexPatternId: firstLayer.indexPatternId,
+            timeRange: data.query.timefilter.timefilter.getTime(),
+            filters,
+            query,
+            columns: firstLayer.columnOrder
+              .map((columnId) => {
+                const column = firstLayer.columns[columnId];
+                if ('sourceField' in column) return column.sourceField;
+              })
+              .filter(Boolean) as string[],
+          });
+        },
+      };
+    });
+  }
+
+  public start() {}
+
+  public stop() {}
+}
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/tsconfig.json b/x-pack/examples/third_party_lens_navigation_prompt/tsconfig.json
new file mode 100644
index 0000000000000..d1f0f1f152e96
--- /dev/null
+++ b/x-pack/examples/third_party_lens_navigation_prompt/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types"
+  },
+  "include": [
+    "index.ts",
+    "public/**/*",
+    "../../../typings/**/*"
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../../../src/plugins/expressions/tsconfig.json" },
+    { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
+    { "path": "../../../src/plugins/data_views/tsconfig.json" },
+    { "path": "../../../src/plugins/field_formats/tsconfig.json" },
+    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
+    { "path": "../../plugins/lens/tsconfig.json" },
+    { "path": "../../../examples/developer_examples/tsconfig.json" },
+  ]
+}
diff --git a/x-pack/examples/third_party_vis_lens_example/public/image.png b/x-pack/examples/third_party_vis_lens_example/public/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..a38f46a5d20f9d4ab3098185ad62fe6dc816c5db
GIT binary patch
literal 64212
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

literal 0
HcmV?d00001

diff --git a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
index f185f0ee28efb..9b34972f12b00 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
+++ b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
@@ -15,6 +15,7 @@ import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plug
 import { getRotatingNumberRenderer, rotatingNumberFunction } from './expression';
 import { getRotatingNumberVisualization } from './visualization';
 import { RotatingNumberState } from '../common/types';
+import image from './image.png';
 
 export interface SetupDependencies {
   developerExamples: DeveloperExamplesSetup;
@@ -38,7 +39,7 @@ function getLensAttributes(defaultDataView: DataView): TypedLensByValueInput['at
         label: 'Count of records',
         operationType: 'count',
         scale: 'ratio',
-        sourceField: 'Records',
+        sourceField: '___records___',
       },
     },
   };
@@ -111,10 +112,11 @@ export class EmbeddedLensExamplePlugin
       appId: 'third_party_lens_vis_example',
       title: 'Third party Lens visualization',
       description: 'Add custom visualization types to the Lens editor',
+      image,
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/main/x-pack/examples/third_party_lens_vis_example',
+          href: 'https://github.com/elastic/kibana/tree/main/x-pack/examples/third_party_vis_lens_example',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index 9cf22b2a8fc84..8b868539d325f 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -81,6 +81,7 @@ describe('Lens App', () => {
       setHeaderActionMenu: jest.fn(),
       datasourceMap,
       visualizationMap,
+      topNavMenuEntryGenerators: [],
     };
   }
 
@@ -167,6 +168,87 @@ describe('Lens App', () => {
     expect(services.data.query.filterManager.getFilters).not.toHaveBeenCalled();
   });
 
+  describe('extra nav menu entries', () => {
+    it('shows custom menu entry', async () => {
+      const runFn = jest.fn();
+      const { instance, services } = await mountWith({
+        props: {
+          ...makeDefaultProps(),
+          topNavMenuEntryGenerators: [
+            () => ({
+              label: 'My entry',
+              run: runFn,
+            }),
+          ],
+        },
+      });
+
+      const extraEntry = instance.find(services.navigation.ui.TopNavMenu).prop('config')[0];
+      expect(extraEntry.label).toEqual('My entry');
+      expect(extraEntry.run).toBe(runFn);
+    });
+
+    it('passes current state, filter, query timerange and initial context into getter', async () => {
+      const getterFn = jest.fn();
+      const preloadedState = {
+        visualization: {
+          activeId: 'lensXY',
+          state: {
+            visState: true,
+          },
+        },
+        activeDatasourceId: 'testDatasource',
+        datasourceStates: {
+          testDatasource: {
+            isLoading: false,
+            state: { datasourceState: true },
+          },
+        },
+        query: {
+          language: 'kuery',
+          query: 'A: B',
+        },
+        filters: [
+          {
+            meta: {
+              key: 'abc',
+            },
+          },
+        ],
+      };
+      await mountWith({
+        props: {
+          ...makeDefaultProps(),
+          topNavMenuEntryGenerators: [getterFn],
+          initialContext: {
+            fieldName: 'a',
+            indexPatternId: '1',
+          },
+        },
+        preloadedState,
+      });
+
+      expect(getterFn).toHaveBeenCalledWith(
+        expect.objectContaining({
+          initialContext: {
+            fieldName: 'a',
+            indexPatternId: '1',
+          },
+          visualizationState: preloadedState.visualization.state,
+          visualizationId: preloadedState.visualization.activeId,
+          query: preloadedState.query,
+          filters: preloadedState.filters,
+          datasourceStates: {
+            testDatasource: {
+              isLoading: false,
+              state: preloadedState.datasourceStates.testDatasource.state,
+            },
+          },
+        })
+      );
+    });
+  });
+
   describe('breadcrumbs', () => {
     const breadcrumbDocSavedObjectId = defaultSavedObjectId;
     const breadcrumbDoc = {
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index 45517298b0432..44552c12d680d 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -55,6 +55,8 @@ export function App({
   setHeaderActionMenu,
   datasourceMap,
   visualizationMap,
+  topNavMenuEntryGenerators,
+  initialContext,
 }: LensAppProps) {
   const lensAppServices = useKibana<LensAppServices>().services;
 
@@ -311,6 +313,8 @@ export function App({
           datasourceMap={datasourceMap}
           title={persistedDoc?.title}
           lensInspector={lensInspector}
+          topNavMenuEntryGenerators={topNavMenuEntryGenerators}
+          initialContext={initialContext}
         />
 
         {getLegacyUrlConflictCallout()}
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index 9045080f83b26..90e924134d27b 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -151,6 +151,8 @@ export const LensTopNavMenu = ({
   redirectToOrigin,
   datasourceMap,
   title,
+  topNavMenuEntryGenerators,
+  initialContext,
 }: LensTopNavMenuProps) => {
   const {
     data,
@@ -179,6 +181,8 @@ export const LensTopNavMenu = ({
     savedQuery,
     activeDatasourceId,
     datasourceStates,
+    visualization,
+    filters,
   } = useLensSelector((state) => state.lens);
   const allLoaded = Object.values(datasourceStates).every(({ isLoading }) => isLoading === false);
 
@@ -238,121 +242,147 @@ export const LensTopNavMenu = ({
   const unsavedTitle = i18n.translate('xpack.lens.app.unsavedFilename', {
     defaultMessage: 'unsaved',
   });
-  const topNavConfig = useMemo(
-    () =>
-      getLensTopNavConfig({
-        showSaveAndReturn: Boolean(
-          isLinkedToOriginatingApp &&
-            // Temporarily required until the 'by value' paradigm is default.
-            (dashboardFeatureFlag.allowByValueEmbeddables || Boolean(initialInput))
-        ),
-        enableExportToCSV: Boolean(isSaveable && activeData && Object.keys(activeData).length),
-        isByValueMode: getIsByValueMode(),
-        allowByValue: dashboardFeatureFlag.allowByValueEmbeddables,
-        showCancel: Boolean(isLinkedToOriginatingApp),
-        savingToLibraryPermitted,
-        savingToDashboardPermitted,
-        tooltips: {
-          showExportWarning: () => {
-            if (activeData) {
-              const datatables = Object.values(activeData);
-              const formulaDetected = datatables.some((datatable) => {
-                return tableHasFormulas(datatable.columns, datatable.rows);
+  const additionalMenuEntries = useMemo(() => {
+    if (!visualization.activeId) return undefined;
+    const visualizationId = visualization.activeId;
+    const entries = topNavMenuEntryGenerators.flatMap((menuEntryGenerator) => {
+      const menuEntry = menuEntryGenerator({
+        datasourceStates,
+        visualizationId,
+        visualizationState: visualization.state,
+        query,
+        filters,
+        initialContext,
+      });
+      return menuEntry ? [menuEntry] : [];
+    });
+    if (entries.length > 0) {
+      return entries;
+    }
+  }, [
+    datasourceStates,
+    topNavMenuEntryGenerators,
+    visualization.activeId,
+    visualization.state,
+    query,
+    filters,
+    initialContext,
+  ]);
+  const topNavConfig = useMemo(() => {
+    const baseMenuEntries = getLensTopNavConfig({
+      showSaveAndReturn: Boolean(
+        isLinkedToOriginatingApp &&
+          // Temporarily required until the 'by value' paradigm is default.
+          (dashboardFeatureFlag.allowByValueEmbeddables || Boolean(initialInput))
+      ),
+      enableExportToCSV: Boolean(isSaveable && activeData && Object.keys(activeData).length),
+      isByValueMode: getIsByValueMode(),
+      allowByValue: dashboardFeatureFlag.allowByValueEmbeddables,
+      showCancel: Boolean(isLinkedToOriginatingApp),
+      savingToLibraryPermitted,
+      savingToDashboardPermitted,
+      tooltips: {
+        showExportWarning: () => {
+          if (activeData) {
+            const datatables = Object.values(activeData);
+            const formulaDetected = datatables.some((datatable) => {
+              return tableHasFormulas(datatable.columns, datatable.rows);
+            });
+            if (formulaDetected) {
+              return i18n.translate('xpack.lens.app.downloadButtonFormulasWarning', {
+                defaultMessage:
+                  'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
               });
-              if (formulaDetected) {
-                return i18n.translate('xpack.lens.app.downloadButtonFormulasWarning', {
-                  defaultMessage:
-                    'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
-                });
-              }
             }
-            return undefined;
-          },
+          }
+          return undefined;
         },
-        actions: {
-          inspect: () => lensInspector.inspect({ title }),
-          exportToCSV: () => {
-            if (!activeData) {
-              return;
-            }
-            const datatables = Object.values(activeData);
-            const content = datatables.reduce<Record<string, { content: string; type: string }>>(
-              (memo, datatable, i) => {
-                // skip empty datatables
-                if (datatable) {
-                  const postFix = datatables.length > 1 ? `-${i + 1}` : '';
+      },
+      actions: {
+        inspect: () => lensInspector.inspect({ title }),
+        exportToCSV: () => {
+          if (!activeData) {
+            return;
+          }
+          const datatables = Object.values(activeData);
+          const content = datatables.reduce<Record<string, { content: string; type: string }>>(
+            (memo, datatable, i) => {
+              // skip empty datatables
+              if (datatable) {
+                const postFix = datatables.length > 1 ? `-${i + 1}` : '';
 
-                  memo[`${title || unsavedTitle}${postFix}.csv`] = {
-                    content: exporters.datatableToCSV(datatable, {
-                      csvSeparator: uiSettings.get('csv:separator', ','),
-                      quoteValues: uiSettings.get('csv:quoteValues', true),
-                      formatFactory: fieldFormats.deserialize,
-                      escapeFormulaValues: false,
-                    }),
-                    type: exporters.CSV_MIME_TYPE,
-                  };
-                }
-                return memo;
+                memo[`${title || unsavedTitle}${postFix}.csv`] = {
+                  content: exporters.datatableToCSV(datatable, {
+                    csvSeparator: uiSettings.get('csv:separator', ','),
+                    quoteValues: uiSettings.get('csv:quoteValues', true),
+                    formatFactory: fieldFormats.deserialize,
+                    escapeFormulaValues: false,
+                  }),
+                  type: exporters.CSV_MIME_TYPE,
+                };
+              }
+              return memo;
+            },
+            {}
+          );
+          if (content) {
+            downloadMultipleAs(content);
+          }
+        },
+        saveAndReturn: () => {
+          if (savingToDashboardPermitted) {
+            // disabling the validation on app leave because the document has been saved.
+            onAppLeave((actions) => {
+              return actions.default();
+            });
+            runSave(
+              {
+                newTitle: title || '',
+                newCopyOnSave: false,
+                isTitleDuplicateConfirmed: false,
+                returnToOrigin: true,
               },
-              {}
+              {
+                saveToLibrary:
+                  (initialInput && attributeService.inputIsRefType(initialInput)) ?? false,
+              }
             );
-            if (content) {
-              downloadMultipleAs(content);
-            }
-          },
-          saveAndReturn: () => {
-            if (savingToDashboardPermitted) {
-              // disabling the validation on app leave because the document has been saved.
-              onAppLeave((actions) => {
-                return actions.default();
-              });
-              runSave(
-                {
-                  newTitle: title || '',
-                  newCopyOnSave: false,
-                  isTitleDuplicateConfirmed: false,
-                  returnToOrigin: true,
-                },
-                {
-                  saveToLibrary:
-                    (initialInput && attributeService.inputIsRefType(initialInput)) ?? false,
-                }
-              );
-            }
-          },
-          showSaveModal: () => {
-            if (savingToDashboardPermitted || savingToLibraryPermitted) {
-              setIsSaveModalVisible(true);
-            }
-          },
-          cancel: () => {
-            if (redirectToOrigin) {
-              redirectToOrigin();
-            }
-          },
+          }
         },
-      }),
-    [
-      activeData,
-      attributeService,
-      dashboardFeatureFlag.allowByValueEmbeddables,
-      fieldFormats.deserialize,
-      getIsByValueMode,
-      initialInput,
-      isLinkedToOriginatingApp,
-      isSaveable,
-      title,
-      onAppLeave,
-      redirectToOrigin,
-      runSave,
-      savingToDashboardPermitted,
-      savingToLibraryPermitted,
-      setIsSaveModalVisible,
-      uiSettings,
-      unsavedTitle,
-      lensInspector,
-    ]
-  );
+        showSaveModal: () => {
+          if (savingToDashboardPermitted || savingToLibraryPermitted) {
+            setIsSaveModalVisible(true);
+          }
+        },
+        cancel: () => {
+          if (redirectToOrigin) {
+            redirectToOrigin();
+          }
+        },
+      },
+    });
+    return [...(additionalMenuEntries || []), ...baseMenuEntries];
+  }, [
+    activeData,
+    attributeService,
+    dashboardFeatureFlag.allowByValueEmbeddables,
+    fieldFormats.deserialize,
+    getIsByValueMode,
+    initialInput,
+    isLinkedToOriginatingApp,
+    isSaveable,
+    title,
+    onAppLeave,
+    redirectToOrigin,
+    runSave,
+    savingToDashboardPermitted,
+    savingToLibraryPermitted,
+    setIsSaveModalVisible,
+    uiSettings,
+    unsavedTitle,
+    lensInspector,
+    additionalMenuEntries,
+  ]);
 
   const onQuerySubmitWrapped = useCallback(
     (payload) => {
diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
index ff45c996cce98..e529c3ece055f 100644
--- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -19,7 +19,7 @@ import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { LensReportManager, setReportManager, trackUiEvent } from '../lens_ui_telemetry';
 
 import { App } from './app';
-import { EditorFrameStart } from '../types';
+import { EditorFrameStart, LensTopNavMenuEntryGenerator } from '../types';
 import { addHelpMenuToAppChrome } from '../help_menu_util';
 import { LensPluginStartDependencies } from '../plugin';
 import { LENS_EMBEDDABLE_TYPE, LENS_EDIT_BY_VALUE, APP_ID } from '../../common';
@@ -103,9 +103,15 @@ export async function mountApp(
     createEditorFrame: EditorFrameStart['createInstance'];
     attributeService: LensAttributeService;
     getPresentationUtilContext: () => FC;
+    topNavMenuEntryGenerators: LensTopNavMenuEntryGenerator[];
   }
 ) {
-  const { createEditorFrame, attributeService, getPresentationUtilContext } = mountProps;
+  const {
+    createEditorFrame,
+    attributeService,
+    getPresentationUtilContext,
+    topNavMenuEntryGenerators,
+  } = mountProps;
   const [coreStart, startDependencies] = await core.getStartServices();
   const instance = await createEditorFrame();
   const historyLocationState = params.history.location.state as HistoryLocationState;
@@ -223,6 +229,8 @@ export async function mountApp(
             history={props.history}
             datasourceMap={datasourceMap}
             visualizationMap={visualizationMap}
+            topNavMenuEntryGenerators={topNavMenuEntryGenerators}
+            initialContext={initialContext}
           />
         </Provider>
       );
diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
index a5cd8bfef71f3..3181df8b3256d 100644
--- a/x-pack/plugins/lens/public/app_plugin/types.ts
+++ b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -35,7 +35,12 @@ import type {
   EmbeddableEditorState,
   EmbeddableStateTransfer,
 } from '../../../../../src/plugins/embeddable/public';
-import type { DatasourceMap, EditorFrameInstance, VisualizationMap } from '../types';
+import type {
+  DatasourceMap,
+  EditorFrameInstance,
+  LensTopNavMenuEntryGenerator,
+  VisualizationMap,
+} from '../types';
 import type { PresentationUtilPluginStart } from '../../../../../src/plugins/presentation_util/public';
 import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/public';
 import type { LensInspector } from '../lens_inspector_service';
@@ -60,6 +65,9 @@ export interface LensAppProps {
   incomingState?: EmbeddableEditorState;
   datasourceMap: DatasourceMap;
   visualizationMap: VisualizationMap;
+
+  topNavMenuEntryGenerators: LensTopNavMenuEntryGenerator[];
+  initialContext?: VisualizeFieldContext;
 }
 
 export type RunSave = (
@@ -89,6 +97,8 @@ export interface LensTopNavMenuProps {
   datasourceMap: DatasourceMap;
   title?: string;
   lensInspector: LensInspector;
+  topNavMenuEntryGenerators: LensTopNavMenuEntryGenerator[];
+  initialContext?: VisualizeFieldContext;
 }
 
 export interface HistoryLocationState {
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index 8370d093a5b62..bba54c85a67c6 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -70,7 +70,12 @@ import {
 } from '../../../../src/plugins/ui_actions/public';
 import { APP_ID, getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../common/constants';
 import type { FormatFactory } from '../common/types';
-import type { Visualization, VisualizationType, EditorFrameSetup } from './types';
+import type {
+  Visualization,
+  VisualizationType,
+  EditorFrameSetup,
+  LensTopNavMenuEntryGenerator,
+} from './types';
 import { getLensAliasConfig } from './vis_type_alias';
 import { visualizeFieldAction } from './trigger_actions/visualize_field_actions';
 
@@ -132,6 +137,17 @@ export interface LensPublicSetup {
   registerVisualization: <T>(
     visualization: Visualization<T> | (() => Promise<Visualization<T>>)
   ) => void;
+  /**
+   * Register a generic menu entry shown in the top nav
+   * See `x-pack/examples/3rd_party_lens_navigation_prompt` for exemplary usage.
+   *
+   * This API might undergo breaking changes even in minor versions.
+   *
+   * @experimental
+   */
+  registerTopNavMenuEntryGenerator: (
+    navigationPromptGenerator: LensTopNavMenuEntryGenerator
+  ) => void;
 }
 
 export interface LensPublicStart {
@@ -198,6 +214,7 @@ export class LensPlugin {
   private pieVisualization: PieVisualizationType | undefined;
   private heatmapVisualization: HeatmapVisualizationType | undefined;
   private gaugeVisualization: GaugeVisualizationType | undefined;
+  private topNavMenuEntries: LensTopNavMenuEntryGenerator[] = [];
 
   private stopReportManager?: () => void;
 
@@ -301,6 +318,7 @@ export class LensPlugin {
           createEditorFrame: frameStart.createInstance,
           attributeService: getLensAttributeService(coreStart, deps),
           getPresentationUtilContext,
+          topNavMenuEntryGenerators: this.topNavMenuEntries,
         });
       },
     });
@@ -330,6 +348,9 @@ export class LensPlugin {
           this.queuedVisualizations.push(vis);
         }
       },
+      registerTopNavMenuEntryGenerator: (menuEntryGenerator: LensTopNavMenuEntryGenerator) => {
+        this.topNavMenuEntries.push(menuEntryGenerator);
+      },
     };
   }
 
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 91009dffe2081..fd5eb473c42d7 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -8,6 +8,7 @@
 import type { IconType } from '@elastic/eui/src/components/icon/icon';
 import type { CoreSetup, SavedObjectReference } from 'kibana/public';
 import type { PaletteOutput } from 'src/plugins/charts/public';
+import type { TopNavMenuData } from 'src/plugins/navigation/public';
 import type { MutableRefObject } from 'react';
 import { Filter } from '@kbn/es-query';
 import type {
@@ -877,3 +878,18 @@ export interface SharingSavedObjectProps {
   aliasTargetId?: string;
   sourceId?: string;
 }
+
+/**
+ * Configuration of a top nav entry which can be shown for specific scenarios given a certain combination of active datasource and visualization id.
+ * This function gets passed the currently active visualization id and state as well as the current datasource states.
+ *
+ * If it returns a top nav menu entry, it is rendered along with the native Lens menu entries
+ */
+export type LensTopNavMenuEntryGenerator = (props: {
+  visualizationId: string;
+  datasourceStates: Record<string, { state: unknown }>;
+  visualizationState: unknown;
+  query: Query;
+  filters: Filter[];
+  initialContext?: VisualizeFieldContext;
+}) => undefined | TopNavMenuData;

From 2c7d96bd9285f00ebb8e76fa5171887d10f368b1 Mon Sep 17 00:00:00 2001
From: Pete Harverson <pete@elastic.co>
Date: Thu, 10 Feb 2022 20:30:01 +0000
Subject: [PATCH 72/85] [ML] Adds anomaly detectors forecast API test (#125214)

* [ML] Adds anomaly detectors forecast API test

* [ML] Add check that forecast results exist
---
 .../anomaly_detectors/forecast_with_spaces.ts | 101 ++++++++++++++++++
 .../apis/ml/anomaly_detectors/index.ts        |   1 +
 x-pack/test/functional/services/ml/api.ts     |  41 +++++++
 3 files changed, 143 insertions(+)
 create mode 100644 x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts

diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
new file mode 100644
index 0000000000000..19bb3c7a95c55
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
@@ -0,0 +1,101 @@
+/*
+ * 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 { USER } from '../../../../functional/services/ml/security_common';
+import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+  const spacesService = getService('spaces');
+
+  const forecastJobId = 'fq_single_forecast';
+  const forecastJobDatafeedId = `datafeed-${forecastJobId}`;
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+
+  async function runForecast(
+    jobId: string,
+    space: string,
+    duration: string | number,
+    user: USER,
+    expectedStatusCode: number
+  ) {
+    const { body } = await supertest
+      .post(`${space ? `/s/${space}` : ''}/api/ml/anomaly_detectors/${jobId}/_forecast`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS)
+      .send({ duration })
+      .expect(expectedStatusCode);
+
+    return body;
+  }
+
+  describe('POST anomaly_detectors _forecast with spaces', function () {
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+
+      const jobConfig = ml.commonConfig.getADFqSingleMetricJobConfig(forecastJobId);
+      const datafeedConfig = ml.commonConfig.getADFqDatafeedConfig(forecastJobId);
+
+      await ml.api.createAnomalyDetectionJob(jobConfig, idSpace1);
+      await ml.api.createDatafeed(datafeedConfig, idSpace1);
+    });
+
+    after(async () => {
+      await ml.api.closeAnomalyDetectionJob(forecastJobId);
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
+    });
+
+    it('should not forecast for a job that has not been opened', async () => {
+      await runForecast(forecastJobId, idSpace1, '1d', USER.ML_POWERUSER, 409);
+    });
+
+    it('should not forecast for a job that has not been run', async () => {
+      await ml.api.openAnomalyDetectionJob(forecastJobId);
+      await runForecast(forecastJobId, idSpace1, '1d', USER.ML_POWERUSER, 400);
+    });
+
+    it('should not forecast for a job with an invalid job ID', async () => {
+      await runForecast(`${forecastJobId}_invalid`, idSpace1, '1d', USER.ML_POWERUSER, 404);
+    });
+
+    it('should run forecast for open job with valid job ID', async () => {
+      await ml.api.startDatafeed(forecastJobDatafeedId, { start: '0', end: `${Date.now()}` });
+      await ml.api.waitForDatafeedState(forecastJobDatafeedId, DATAFEED_STATE.STOPPED);
+      await ml.api.waitForJobState(forecastJobId, JOB_STATE.CLOSED);
+      await ml.api.openAnomalyDetectionJob(forecastJobId);
+      await runForecast(forecastJobId, idSpace1, '1d', USER.ML_POWERUSER, 200);
+      await ml.testExecution.logTestStep(
+        `forecast results should exist for job '${forecastJobId}'`
+      );
+      await ml.api.assertForecastResultsExist(forecastJobId);
+    });
+
+    it('should not run forecast for open job with invalid duration', async () => {
+      await runForecast(forecastJobId, idSpace1, 3600000, USER.ML_POWERUSER, 400);
+    });
+
+    it('should not run forecast for open job with valid job ID as ML Viewer', async () => {
+      await runForecast(forecastJobId, idSpace1, '1d', USER.ML_VIEWER, 403);
+    });
+
+    it('should not run forecast for open job with valid job ID in wrong space', async () => {
+      await runForecast(forecastJobId, idSpace2, '1d', USER.ML_POWERUSER, 404);
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts
index 101273405f121..3f854f6649fda 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts
@@ -17,5 +17,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./close_with_spaces'));
     loadTestFile(require.resolve('./delete_with_spaces'));
     loadTestFile(require.resolve('./create_with_spaces'));
+    loadTestFile(require.resolve('./forecast_with_spaces'));
   });
 }
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index 58f0b6d678cc2..8d9ba26961940 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -126,6 +126,47 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       );
     },
 
+    async hasForecastResults(jobId: string): Promise<boolean> {
+      const body = await es.search({
+        index: '.ml-anomalies-*',
+        body: {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                {
+                  match: {
+                    job_id: jobId,
+                  },
+                },
+                {
+                  match: {
+                    result_type: 'model_forecast',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      });
+
+      return body.hits.hits.length > 0;
+    },
+
+    async assertForecastResultsExist(jobId: string) {
+      await retry.waitForWithTimeout(
+        `forecast results for job ${jobId} to exist`,
+        30 * 1000,
+        async () => {
+          if ((await this.hasForecastResults(jobId)) === true) {
+            return true;
+          } else {
+            throw new Error(`expected forecast results for job '${jobId}' to exist`);
+          }
+        }
+      );
+    },
+
     async createIndex(
       indices: string,
       mappings?: Record<string, estypes.MappingTypeMapping> | estypes.MappingTypeMapping

From 31328ff51d78287f91170f92dee532991a47d18d Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 10 Feb 2022 21:38:55 +0100
Subject: [PATCH 73/85] fix flaky test (#125256)

---
 .../plugins/lens/public/state_management/load_initial.test.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/state_management/load_initial.test.tsx b/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
index 1015838e11674..31053349157e3 100644
--- a/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
+++ b/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
@@ -152,7 +152,7 @@ describe('Initializing the store', () => {
     it('starts new searchSessionId', async () => {
       const { store } = await makeLensStore({ preloadedState });
       await act(async () => {
-        await store.dispatch(loadInitial(defaultProps));
+        await store.dispatch(loadInitial({ ...defaultProps, initialInput: undefined }));
       });
       expect(store.getState()).toEqual({
         lens: expect.objectContaining({

From f3b01b675153c6a34e8a024667b8e19c0dad5323 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Thu, 10 Feb 2022 21:43:05 +0100
Subject: [PATCH 74/85] Improve docs for unknown saved object types  (#125253)

* Revert "Revert "Docs for preventing migrations failing for unknown saved object types""

This reverts commit 580d61d990784522f707b9411ec6ecd554511fc2.

* Fix links and versions for note to use UA

* Migration docs: remove content related to 6.x versions

* Upgrade docs, remove content for upgrading from v4/v5

* Link to 7.17 upgrade assistant

* Apply suggestions from code review

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>

* Update docs/setup/upgrade/upgrade-migrations.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>
---
 .../setup/upgrade/upgrade-migrations.asciidoc | 30 +++++++++++++++----
 docs/setup/upgrade/upgrade-standard.asciidoc  | 10 ++-----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index 059ae47d2e476..f75251089bf55 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -4,8 +4,8 @@
 
 Each time you upgrade {kib}, an upgrade migration is performed to ensure that all <<managing-saved-objects,saved objects>> are compatible with the new version.
 
-NOTE: To help you prepare for the upgrade to 7.0.0, 6.7.0 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[*Upgrade Assistant*]. 
-To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
+NOTE: To help you prepare for the upgrade to 8.0.0, 7.17.0 includes an https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[*Upgrade Assistant*]. 
+To access the assistant, go to *Stack Management > Upgrade Assistant*.
 
 WARNING: {kib} 7.12.0 and later uses a new migration process and index naming scheme. Before you upgrade, read the documentation for your version of {kib}.
 
@@ -32,7 +32,6 @@ adds a write block to the outdated index. Table 1 lists the saved objects indice
 [options="header"]
 |=======================
 |Upgrading from version | Outdated index (alias)
-| 6.0.0 through 6.4.x    | `.kibana`
 
 `.kibana_task_manager_7.12.0_001` (`.kibana_task_manager` alias)
 | 6.5.0 through 7.3.x    | `.kibana_N` (`.kibana` alias)
@@ -58,6 +57,28 @@ complete the upgrade migration before bringing up the remaining instances.
 ==== Preventing migration failures
 Review the common causes of {kib} upgrade failures and how to prevent them.
 
+[float]
+====== Documents found for unknown saved object types
+Migrations will fail if saved objects belong to an unknown
+saved object type. Unknown saved objects are typically caused by
+to the {es} index, or by disabling a plugin that had previously
+created a saved object.
+
+We recommend using the https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[Upgrade Assistant] 
+to discover and remedy any unknown saved object types. {kib} version 7.17.0 deployments containing unknown saved
+object types will also log the following warning message:
+
+[source,sh]
+--------------------------------------------
+CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
+--------------------------------------------
+
+If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
+[source,sh]
+--------------------------------------------
+Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the ".kibana_7.17.0_001" index.
+--------------------------------------------
+
 [float]
 ===== timeout_exception or receive_timeout_transport_exception
 There is a known issue in 7.12.0 for users who tried the {fleet} beta.
@@ -122,9 +143,6 @@ Matching index templates that specify `settings.refresh_interval` or `mappings`
 
 To make sure the index templates won't apply to new `.kibana*` indices, narrow down the {data-sources} of any user-defined index templates.
 
-NOTE: In {kib} 6.5.0 and earlier, {kib} creates a `kibana_index_template:.kibana` index template
-and uses a `.kibana` index pattern. You do not need to change or remove the index template.
-
 [float]
 ===== An unhealthy {es} cluster
 Problems with your {es} cluster can prevent {kib} upgrades from succeeding. Ensure that your cluster has:
diff --git a/docs/setup/upgrade/upgrade-standard.asciidoc b/docs/setup/upgrade/upgrade-standard.asciidoc
index b01759b4f3511..6854ead7531a8 100644
--- a/docs/setup/upgrade/upgrade-standard.asciidoc
+++ b/docs/setup/upgrade/upgrade-standard.asciidoc
@@ -1,8 +1,8 @@
 [[upgrade-standard]]
 === Standard upgrade
 
-NOTE: 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant]
-to help you prepare for your upgrade to 7.0. To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
+NOTE: 7.17 includes an https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[Upgrade Assistant]
+to help you prepare for your upgrade to 8.0. To access the assistant, go to *Stack Management > Upgrade Assistant*.
 
 [IMPORTANT]
 ===========================================
@@ -29,12 +29,6 @@ Different versions of {kib} running against the same {es} index, such as during
 . Use `rpm` or `dpkg` to install the new package. All files should be placed in
   their proper locations and config files should not be overwritten.
 +
-[NOTE]
---
-{kib} 4.x used a different config location than 5.0+, so if you're upgrading
-from 4.x, you will need to copy the configurations from your old config
-(`/opt/kibana/config/kibana.yml`) to your new config
-(`/etc/kibana/kibana.yml`).
 
 Make sure you remove or update any configurations
 that are indicated in the <<breaking-changes-8.0.0,breaking changes>> documentation

From 21e26a421a781278726a82044a3e7c5687d7adc1 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Thu, 10 Feb 2022 21:52:34 +0100
Subject: [PATCH 75/85] Use updated deepLinks when using `navigateToApp` with
 `deepLinkId` (#125238)

* Use updated deepLinks when using `navigateToApp` with `deepLinkId`

* add integration test
---
 .../application/application_service.tsx       | 25 ++++++------
 .../application_service.test.tsx              | 39 ++++++++++++++++++-
 .../application/integration_tests/utils.tsx   |  3 --
 src/core/public/application/types.ts          |  1 -
 .../application/ui/app_container.test.tsx     |  3 --
 5 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 9f5470a2d248e..3010a781b4e9e 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -67,8 +67,9 @@ const getAppUrl = (mounters: Map<string, Mounter>, appId: string, path: string =
   return appendAppPath(appBasePath, path);
 };
 
-const getAppDeepLinkPath = (mounters: Map<string, Mounter>, appId: string, deepLinkId: string) => {
-  return mounters.get(appId)?.deepLinkPaths[deepLinkId];
+const getAppDeepLinkPath = (app: App<any>, appId: string, deepLinkId: string) => {
+  const flattenedLinks = flattenDeepLinks(app.deepLinks);
+  return flattenedLinks[deepLinkId];
 };
 
 const allApplicationsFilter = '__ALL__';
@@ -182,7 +183,6 @@ export class ApplicationService {
         this.mounters.set(app.id, {
           appRoute: app.appRoute!,
           appBasePath: basePath.prepend(app.appRoute!),
-          deepLinkPaths: toDeepLinkPaths(app.deepLinks),
           exactRoute: app.exactRoute ?? false,
           mount: wrapMount(plugin, app),
           unmountBeforeMounting: false,
@@ -242,15 +242,17 @@ export class ApplicationService {
         ? true
         : await this.shouldNavigate(overlays, appId);
 
+      const targetApp = applications$.value.get(appId);
+
       if (shouldNavigate) {
-        if (deepLinkId) {
-          const deepLinkPath = getAppDeepLinkPath(availableMounters, appId, deepLinkId);
+        if (deepLinkId && targetApp) {
+          const deepLinkPath = getAppDeepLinkPath(targetApp, appId, deepLinkId);
           if (deepLinkPath) {
             path = appendAppPath(deepLinkPath, path);
           }
         }
         if (path === undefined) {
-          path = applications$.value.get(appId)?.defaultPath;
+          path = targetApp?.defaultPath;
         }
         if (openInNewTab) {
           this.openInNewTab!(getAppUrl(availableMounters, appId, path));
@@ -290,8 +292,9 @@ export class ApplicationService {
           deepLinkId,
         }: { path?: string; absolute?: boolean; deepLinkId?: string } = {}
       ) => {
-        if (deepLinkId) {
-          const deepLinkPath = getAppDeepLinkPath(availableMounters, appId, deepLinkId);
+        const targetApp = applications$.value.get(appId);
+        if (deepLinkId && targetApp) {
+          const deepLinkPath = getAppDeepLinkPath(targetApp, appId, deepLinkId);
           if (deepLinkPath) {
             path = appendAppPath(deepLinkPath, path);
           }
@@ -439,12 +442,12 @@ const populateDeepLinkDefaults = (deepLinks?: AppDeepLink[]): AppDeepLink[] => {
   }));
 };
 
-const toDeepLinkPaths = (deepLinks?: AppDeepLink[]): Mounter['deepLinkPaths'] => {
+const flattenDeepLinks = (deepLinks?: AppDeepLink[]): Record<string, string> => {
   if (!deepLinks) {
     return {};
   }
-  return deepLinks.reduce((deepLinkPaths: Mounter['deepLinkPaths'], deepLink) => {
+  return deepLinks.reduce((deepLinkPaths: Record<string, string>, deepLink) => {
     if (deepLink.path) deepLinkPaths[deepLink.id] = deepLink.path;
-    return { ...deepLinkPaths, ...toDeepLinkPaths(deepLink.deepLinks) };
+    return { ...deepLinkPaths, ...flattenDeepLinks(deepLink.deepLinks) };
   }, {});
 };
diff --git a/src/core/public/application/integration_tests/application_service.test.tsx b/src/core/public/application/integration_tests/application_service.test.tsx
index 59ef1346ef323..dda029c66f4c3 100644
--- a/src/core/public/application/integration_tests/application_service.test.tsx
+++ b/src/core/public/application/integration_tests/application_service.test.tsx
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { act } from 'react-dom/test-utils';
 import { createMemoryHistory, MemoryHistory } from 'history';
@@ -16,7 +17,7 @@ import { httpServiceMock } from '../../http/http_service.mock';
 import { MockLifecycle } from '../test_types';
 import { overlayServiceMock } from '../../overlays/overlay_service.mock';
 import { themeServiceMock } from '../../theme/theme_service.mock';
-import { AppMountParameters } from '../types';
+import { AppMountParameters, AppUpdater } from '../types';
 import { Observable } from 'rxjs';
 import { MountPoint } from 'kibana/public';
 
@@ -134,6 +135,42 @@ describe('ApplicationService', () => {
 
         expect(history.entries.map((entry) => entry.pathname)).toEqual(['/', '/app/app1/bar']);
       });
+
+      it('handles updated deepLinks', async () => {
+        const { register } = service.setup(setupDeps);
+
+        const updater$ = new BehaviorSubject<AppUpdater>(() => ({}));
+
+        register(Symbol(), {
+          id: 'app1',
+          title: 'App1',
+          deepLinks: [],
+          updater$,
+          mount: async ({}: AppMountParameters) => {
+            return () => undefined;
+          },
+        });
+
+        const { navigateToApp } = await service.start(startDeps);
+
+        updater$.next(() => ({
+          deepLinks: [
+            {
+              id: 'deepLink',
+              title: 'Some deep link',
+              path: '/deep-link',
+            },
+          ],
+        }));
+
+        await navigateToApp('app1', { deepLinkId: 'deepLink' });
+
+        expect(history.entries.map((entry) => entry.pathname)).toEqual([
+          '/',
+          '/app/app1/deep-link',
+        ]);
+      });
+      ////
     });
   });
 
diff --git a/src/core/public/application/integration_tests/utils.tsx b/src/core/public/application/integration_tests/utils.tsx
index 7ebc12deccd02..9c1969d9f39c7 100644
--- a/src/core/public/application/integration_tests/utils.tsx
+++ b/src/core/public/application/integration_tests/utils.tsx
@@ -40,14 +40,12 @@ export const createAppMounter = ({
   appId,
   html = `<div>App ${appId}</div>`,
   appRoute = `/app/${appId}`,
-  deepLinkPaths = {},
   exactRoute = false,
   extraMountHook,
 }: {
   appId: string;
   html?: string;
   appRoute?: string;
-  deepLinkPaths?: Record<string, string>;
   exactRoute?: boolean;
   extraMountHook?: (params: AppMountParameters) => void;
 }): MockedMounterTuple => {
@@ -58,7 +56,6 @@ export const createAppMounter = ({
       mounter: {
         appRoute,
         appBasePath: appRoute,
-        deepLinkPaths,
         exactRoute,
         mount: jest.fn(async (params: AppMountParameters) => {
           const { appBasePath: basename, element } = params;
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 9c3294086efcc..187cee8d0a29a 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -636,7 +636,6 @@ export interface AppLeaveActionFactory {
 export interface Mounter {
   appRoute: string;
   appBasePath: string;
-  deepLinkPaths: Record<string, string>;
   mount: AppMount;
   exactRoute: boolean;
   unmountBeforeMounting?: boolean;
diff --git a/src/core/public/application/ui/app_container.test.tsx b/src/core/public/application/ui/app_container.test.tsx
index 4434f6c1751e0..5512b4a120714 100644
--- a/src/core/public/application/ui/app_container.test.tsx
+++ b/src/core/public/application/ui/app_container.test.tsx
@@ -51,7 +51,6 @@ describe('AppContainer', () => {
     appRoute: '/some-route',
     unmountBeforeMounting: false,
     exactRoute: false,
-    deepLinkPaths: {},
     mount: async ({ element }: AppMountParameters) => {
       await promise;
       const container = document.createElement('div');
@@ -67,7 +66,6 @@ describe('AppContainer', () => {
       appRoute: '/some-route',
       unmountBeforeMounting: false,
       exactRoute: false,
-      deepLinkPaths: {},
       mount: jest.fn().mockImplementation(({ element }) => {
         const container = document.createElement('div');
         container.innerHTML = 'some-content';
@@ -190,7 +188,6 @@ describe('AppContainer', () => {
     const mounter = {
       appBasePath: '/base-path/some-route',
       appRoute: '/some-route',
-      deepLinkPaths: {},
       unmountBeforeMounting: false,
       exactRoute: false,
       mount: async ({ element }: AppMountParameters) => {

From 49f8b2eff6535af25b29fbc808de4dad2622df75 Mon Sep 17 00:00:00 2001
From: Kevin Logan <56395104+kevinlog@users.noreply.github.com>
Date: Thu, 10 Feb 2022 17:55:18 -0500
Subject: [PATCH 76/85] [Security Solution] Addition advanced policy options
 for 8.1 (#125230)

* [Security Solution] Addition advanced policy options for 8.1

* Update x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts

Co-authored-by: Gabriel Landau <42078554+gabriellandau@users.noreply.github.com>

* Update x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts

Co-authored-by: Gabriel Landau <42078554+gabriellandau@users.noreply.github.com>

* lint

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Gabriel Landau <42078554+gabriellandau@users.noreply.github.com>
---
 .../pages/policy/models/advanced_policy_schema.ts     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
index aada4195290df..128bca807381c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
@@ -862,4 +862,15 @@ export const AdvancedPolicySchema: AdvancedPolicySchemaType[] = [
       }
     ),
   },
+  {
+    key: 'windows.advanced.memory_protection.shellcode_trampoline_detection',
+    first_supported_version: '8.1',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_trampoline_detection',
+      {
+        defaultMessage:
+          'Enable trampoline-based shellcode injection detection as a part of memory protection. Default: true',
+      }
+    ),
+  },
 ];

From e63eeb65be15c7656e3bfc8df1c5b67fb5d7c96c Mon Sep 17 00:00:00 2001
From: Dominique Clarke <dominique.clarke@elastic.co>
Date: Thu, 10 Feb 2022 18:28:54 -0500
Subject: [PATCH 77/85] uptime - adjust synthetics service sync errors behavior
 (#125169)

---
 .../action_bar/action_bar.tsx                 | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
index 314347331b5b3..4d0d20d548673 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
@@ -110,20 +110,22 @@ export const ActionBar = ({ monitor, isValid, onSave, onTestNow, testRun }: Acti
                   },
                 })}
               </p>
-              <p>
-                {status
-                  ? i18n.translate('xpack.uptime.monitorManagement.service.error.status', {
-                      defaultMessage: 'Status: {status}. ',
-                      values: { status: responseStatus },
-                    })
-                  : null}
-                {reason
-                  ? i18n.translate('xpack.uptime.monitorManagement.service.error.reason', {
-                      defaultMessage: 'Reason: {reason}.',
-                      values: { reason },
-                    })
-                  : null}
-              </p>
+              {responseStatus || reason ? (
+                <p>
+                  {responseStatus
+                    ? i18n.translate('xpack.uptime.monitorManagement.service.error.status', {
+                        defaultMessage: 'Status: {status}. ',
+                        values: { status: responseStatus },
+                      })
+                    : null}
+                  {reason
+                    ? i18n.translate('xpack.uptime.monitorManagement.service.error.reason', {
+                        defaultMessage: 'Reason: {reason}.',
+                        values: { reason },
+                      })
+                    : null}
+                </p>
+              ) : null}
             </>
           ),
           toastLifeTimeMs: 30000,

From 7a1bf74e3e875c2311515fa1c6553386420e0ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Fri, 11 Feb 2022 00:43:42 +0100
Subject: [PATCH 78/85] Bump backport 7.0.1 (#125252)

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d663320636d65..ffa470bf5f11e 100644
--- a/package.json
+++ b/package.json
@@ -732,7 +732,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-plugin-styled-components": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "backport": "7.0.0",
+    "backport": "7.0.1",
     "callsites": "^3.1.0",
     "chai": "3.5.0",
     "chance": "1.0.18",
diff --git a/yarn.lock b/yarn.lock
index 68f16c8508975..b6cf7f9df3cd6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9533,10 +9533,10 @@ bach@^1.0.0:
     async-settle "^1.0.0"
     now-and-later "^2.0.0"
 
-backport@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/backport/-/backport-7.0.0.tgz#4eadfd5e7b7e0ae7b6d0fa951d51e7631cb4e320"
-  integrity sha512-jg+kGNyZTGrUdtY+YMJozw+yW3bALbB/VIpn5tChsiWEEd+H5c5/fCRo7BA7J9z1fEbnpW2oSpcrxpmkJlANWw==
+backport@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/backport/-/backport-7.0.1.tgz#021f70db76b89699b2c7b826cb3040e9c1d991c9"
+  integrity sha512-f/7+NDzLFd307c85Tz60cfBzoRd4HlFlNOm3MYFynQwI4igMmKd4J9bFxLgc3KdToaVWDmZ37Gx9nRkYgMfUkA==
   dependencies:
     "@octokit/rest" "^18.12.0"
     axios "^0.25.0"
@@ -9544,6 +9544,7 @@ backport@7.0.0:
     del "^6.0.0"
     dotenv "^16.0.0"
     find-up "^5.0.0"
+    graphql "^16.3.0"
     graphql-tag "^2.12.6"
     inquirer "^8.2.0"
     lodash "^4.17.21"
@@ -16244,6 +16245,11 @@ graphql-tag@^2.12.6:
   dependencies:
     tslib "^2.1.0"
 
+graphql@^16.3.0:
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.3.0.tgz#a91e24d10babf9e60c706919bb182b53ccdffc05"
+  integrity sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==
+
 grid-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"

From a13dafc7dde4105c4aa269c23badab159868e1fc Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Thu, 10 Feb 2022 15:46:58 -0800
Subject: [PATCH 79/85] [DOCS] Updates the Upgrade docs (#125288)

* [DOCS] Adds redirect for Standard Upgrade doc

* [DOCS] Updates Upgrade docs

* [DOCS] Incorporates review comments

* [DOCS] Adds info on saved objects

* [DOCS] Fixes broken link

* [DOCS] Fixes placement of section on unknown saved objects

* [DOCS] Removes duplicate topic
---
 .../architecture/core/index.asciidoc          |   6 -
 .../logging-configuration-migration.asciidoc} |   0
 docs/developer/architecture/index.asciidoc    |   2 +
 docs/redirects.asciidoc                       |  10 +-
 docs/setup/upgrade.asciidoc                   |  57 ++++-
 .../resolving-migration-failures.asciidoc     | 125 ++++++++++
 .../setup/upgrade/rollback-migration.asciidoc |  41 ++++
 .../upgrade/saved-objects-migration.asciidoc  |  39 +++
 .../setup/upgrade/upgrade-migrations.asciidoc | 228 ------------------
 9 files changed, 261 insertions(+), 247 deletions(-)
 rename docs/{setup/upgrade/logging-configuration-changes.asciidoc => developer/architecture/core/logging-configuration-migration.asciidoc} (100%)
 create mode 100644 docs/setup/upgrade/resolving-migration-failures.asciidoc
 create mode 100644 docs/setup/upgrade/rollback-migration.asciidoc
 create mode 100644 docs/setup/upgrade/saved-objects-migration.asciidoc
 delete mode 100644 docs/setup/upgrade/upgrade-migrations.asciidoc

diff --git a/docs/developer/architecture/core/index.asciidoc b/docs/developer/architecture/core/index.asciidoc
index 53720a593d3f2..6c70205c3590d 100644
--- a/docs/developer/architecture/core/index.asciidoc
+++ b/docs/developer/architecture/core/index.asciidoc
@@ -36,9 +36,3 @@ The services that core provides are:
 * <<logging-service, Logging service>>
 * <<saved-objects-service, Saved Objects service>>
 * <<ui-settings-service, UI settings service>>
-
-
-
-
-
-
diff --git a/docs/setup/upgrade/logging-configuration-changes.asciidoc b/docs/developer/architecture/core/logging-configuration-migration.asciidoc
similarity index 100%
rename from docs/setup/upgrade/logging-configuration-changes.asciidoc
rename to docs/developer/architecture/core/logging-configuration-migration.asciidoc
diff --git a/docs/developer/architecture/index.asciidoc b/docs/developer/architecture/index.asciidoc
index 774292f513f03..90a0972d65f2f 100644
--- a/docs/developer/architecture/index.asciidoc
+++ b/docs/developer/architecture/index.asciidoc
@@ -40,6 +40,8 @@ include::core/http-service.asciidoc[leveloffset=+1]
 
 include::core/logging-service.asciidoc[leveloffset=+1]
 
+include::core/logging-configuration-migration.asciidoc[leveloffset=+1]
+
 include::core/saved-objects-service.asciidoc[leveloffset=+1]
 
 include::core/uisettings-service.asciidoc[leveloffset=+1]
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 6a34076f10988..2c9d48813781a 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -386,16 +386,16 @@ This content has moved. Refer to <<managing-data-views>>.
 
 This content has moved. Refer to <<kibana-role-management>>.
 
-[role="exclude",id="logging-configuration-changes"]
-== Logging configuration changes
-
-This content has moved. Refer to <<logging-config-changes>>.
-
 [role="exclude",id="upgrade-migrations"]
 == Upgrade migrations
 
 This content has moved. Refer to <<saved-object-migrations>>.
 
+[role="exclude",id="upgrade-standard"]
+== Standard Upgrade
+
+This content has moved. Refer to {stack-ref}/upgrading-kibana.html[Upgrade Kibana].
+
 [role="exclude",id="upgrade-assistant"]
 == Upgrade Assistant
 
diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index 98713e75d24f6..3069d78cc692e 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -1,31 +1,72 @@
 [[upgrade]]
 == Upgrade {kib}
 
-To upgrade from 7.16.0 or earlier to {version}, 
+To upgrade from 7.16.0 or earlier to {version},
 **you must first upgrade to {prev-major-last}**, which enables you to use the *Upgrade Assistant* to
 {stack-ref}/upgrading-elastic-stack.html#prepare-to-upgrade[prepare for the upgrade].
-Before you upgrade, you must resolve all critical issues identified by the *Upgrade Assistant*. 
+Before you upgrade, you must resolve all critical issues identified by the *Upgrade Assistant*.
 
-Rolling upgrades are unsupported in {kib}. To upgrade,  
+Rolling upgrades are unsupported in {kib}. To upgrade,
 you must shut down all {kib} instances, install the new software, and restart {kib}.
 Upgrading while older {kib} instances are running can cause data loss or upgrade failures.
 
 [WARNING]
 ====
-When required, {kib} automatically migrates <<saved-object-migrations, saved objects>>. 
+When required, {kib} automatically migrates <<saved-object-migrations, saved objects>>.
 In case of an upgrade failure, you can roll back to an
 earlier version of {kib}. To roll back, you **must** have a
 {ref}/snapshot-restore.html[backup snapshot] that includes the `kibana` feature
 state. By default, snapshots include the `kibana` feature state.
 ====
 
-For more information about upgrading, 
+For more information about upgrading,
 refer to {stack-ref}/upgrading-elastic-stack.html[Upgrading to Elastic {version}.]
 
-IMPORTANT: You can upgrade to pre-release versions for testing, 
+IMPORTANT: You can upgrade to pre-release versions for testing,
 but upgrading from a pre-release to the General Available version is unsupported.
 You should use pre-release versions only for testing in a temporary environment.
 
-include::upgrade/upgrade-migrations.asciidoc[leveloffset=-1]
+[float]
+=== Upgrading multiple {kib} instances
+When upgrading several {kib} instances connected to the same {es} cluster,
+ensure that all outdated instances are shut down before starting the upgrade.
 
-include::upgrade/logging-configuration-changes.asciidoc[]
+Rolling upgrades are unsupported in {kib}. However, when outdated instances are shut down, you can start all upgraded instances in parallel,
+which allows all instances to participate in the upgrade migration in parallel.
+
+For large deployments with more than 10 {kib} instances, and more than 10,000 saved objects,
+you can reduce the upgrade downtime by bringing up a single {kib} instance and waiting for it to
+complete the upgrade migration before bringing up the remaining instances.
+
+[float]
+[[preventing-migration-failures]]
+=== Preparing for migration
+
+There are extra steps you can follow to ensure you are ready for migration.
+
+[float]
+==== Ensure your {es} cluster is healthy
+Problems with your {es} cluster can prevent {kib} upgrades from succeeding. Ensure that your cluster has:
+
+ * Enough free disk space, at least twice the amount of storage taken up by the `.kibana` and `.kibana_task_manager` indices
+ * Sufficient heap size
+ * A "green" cluster status
+
+[float]
+==== Ensure that all {kib} instances are the same
+When you perform an upgrade migration of different {kib} versions, the migration can fail.
+Ensure that all {kib} instances are running the same version, configuration, and plugins.
+
+[float]
+==== Back up your data
+Be sure to have a {ref}/snapshot-restore.html[snapshot] of all your data before attempting a migration.
+If something goes wrong during migration, you can restore from the snapshot and try again.
+
+Review the <<resolve-migrations-failures,common causes of {kib} upgrade failures>> and how to prevent them.
+
+
+include::upgrade/saved-objects-migration.asciidoc[]
+
+include::upgrade/resolving-migration-failures.asciidoc[]
+
+include::upgrade/rollback-migration.asciidoc[]
diff --git a/docs/setup/upgrade/resolving-migration-failures.asciidoc b/docs/setup/upgrade/resolving-migration-failures.asciidoc
new file mode 100644
index 0000000000000..454dfe948fe4e
--- /dev/null
+++ b/docs/setup/upgrade/resolving-migration-failures.asciidoc
@@ -0,0 +1,125 @@
+[[resolve-migrations-failures]]
+=== Resolve migration failures
+
+Migrating {kib} primarily involves migrating saved object documents to be compatible
+with the new version.
+
+[float]
+==== Resolve saved object migration failures
+
+If {kib} unexpectedly terminates while migrating a saved object index, {kib} automatically attempts to
+perform the migration again when the process restarts. Do not delete any saved objects indices to
+to fix a failed migration. Unlike previous versions, {kib} 7.12.0 and
+later does not require deleting indices to release a failed migration lock.
+
+If upgrade migrations fail repeatedly, refer to
+<<preventing-migration-failures, preparing for migration>>.
+When you address the root cause for the migration failure,
+{kib} automatically retries the migration.
+If you're unable to resolve a failed migration, contact Support.
+
+
+[float]
+[[upgrade-migrations-old-indices]]
+==== Handle old `.kibana_N` indices
+
+After the migrations complete, multiple {kib} indices are created in {es}: (`.kibana_1`, `.kibana_2`, `.kibana_7.12.0` etc).
+{kib} only uses the index that the `.kibana` and `.kibana_task_manager` aliases point to.
+The other {kib} indices can be safely deleted, but are left around as a matter of historical record, and to facilitate rolling {kib} back to a previous version.
+
+[float]
+==== Handle known issues with {fleet} beta
+If you see a`timeout_exception` or `receive_timeout_transport_exception` error,
+it might be from a known known issue in 7.12.0 if you tried the {fleet} beta.
+Upgrade migrations fail because of a large number of documents in the `.kibana` index,
+which causes {kib} to log errors such as:
+
+[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]
+--------------------------------------------
+
+For instructions on how to mitigate the known issue, refer to https://github.com/elastic/kibana/issues/95321[the GitHub issue].
+
+
+[float]
+==== Handle corrupt saved objects
+To find and remedy problems caused by corrupt documents, we highly recommend testing your {kib} upgrade in a development cluster,
+especially when there are custom integrations that create saved objects in your environment.
+
+Saved objects that are corrupted through manual editing or integrations cause migration
+failures with a log message, such as `Unable to migrate the corrupt Saved Object document ...`.
+For a successful upgrade migration, you must fix or delete corrupt documents.
+
+For example, you receive the following error message:
+
+[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.
+--------------------------------------------
+
+To delete the documents that cause migrations to fail, take the following steps:
+
+. 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}.
++
+The dashboard with the `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` ID that belongs to the `marketing_space` space **is no longer available**.
+
+[float]
+[[unknown-saved-object-types]]
+==== Handle documents for unknown saved objects
+Migrations will fail if saved objects belong to an unknown
+saved object type. Unknown saved objects are typically caused by
+to the {es} index, or by disabling a plugin that had previously
+created a saved object.
+
+We recommend using the {kibana-ref-all}/7.17/upgrade-assistant.html[Upgrade Assistant] 
+to discover and remedy any unknown saved object types. {kib} version 7.17.0 deployments containing unknown saved
+object types will also log the following warning message:
+
+[source,sh]
+--------------------------------------------
+CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
+--------------------------------------------
+
+If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
+
+[source,sh]
+--------------------------------------------
+Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the ".kibana_7.17.0_001" index.
+--------------------------------------------
+
+[float]
+==== Handle incompatible settings or mappings
+Matching index templates that specify `settings.refresh_interval` or
+`mappings` are known to interfere with {kib} upgrades.
+This can happen when index templates are defined manually.
+
+To make sure the index templates won't apply to new `.kibana*` indices, narrow down the {data-sources} of any user-defined index templates.
+
+[float]
+==== Handle incompatible `xpack.tasks.index` configuration setting
+In {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks`
+with the configuration setting `xpack.tasks.index: ".tasks"`,
+upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuration
+setting prevents upgrade migrations from starting.
diff --git a/docs/setup/upgrade/rollback-migration.asciidoc b/docs/setup/upgrade/rollback-migration.asciidoc
new file mode 100644
index 0000000000000..1b87d0f335b8c
--- /dev/null
+++ b/docs/setup/upgrade/rollback-migration.asciidoc
@@ -0,0 +1,41 @@
+[[upgrade-migrations-rolling-back]]
+=== Roll back to a previous version of {kib}
+
+If you've followed <<preventing-migration-failures, preparing for migration>>
+and <<resolve-migrations-failures, resolving migration failures>>, and
+{kib} is still unable to successfully upgrade, rollback {kib} until
+you're able to identify and fix the root cause.
+
+WARNING: Before you roll back {kib}, ensure that the version you want to roll back to is compatible with
+your {es} cluster. If the version you want to roll back to is not compatible, you must also rollback {es}.
+Any changes made after an upgrade are lost when you roll back to a previous version.
+
+To roll back after a failed upgrade migration, you must also rollback the saved object indices to be compatible with the previous {kib} version.
+
+[float]
+==== Roll back by restoring a backup snapshot
+
+. Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state.
+   By default, snapshots include the `kibana` feature state.
+. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
+. To delete all saved object indices, use `DELETE /.kibana*`.
+. {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state from the snapshot.
+. Start all {kib} instances on the older version you want to rollback to.
+
+[float]
+==== (Not recommended) Roll back without a backup snapshot
+
+. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
+. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. By default, snapshots include the `kibana` feature state.
+. Delete the version-specific indices created by the failed upgrade migration.
++
+For example, to rollback from a failed upgrade
+to v7.12.0, use `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`.
+. Inspect the output of `GET /_cat/aliases`.
++
+If the `.kibana` or `.kibana_task_manager` aliases are missing, you must create them manually.
+Find the latest index from the output of `GET /_cat/indices` and create the missing alias to point to the latest index.
+For example, if the `.kibana` alias is missing, and the latest index is `.kibana_3`, create a new alias using `POST /.kibana_3/_aliases/.kibana`.
+. To remove the write block from the roll back indices, use
+`PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`
+. Start {kib} on the older version you want to rollback to.
diff --git a/docs/setup/upgrade/saved-objects-migration.asciidoc b/docs/setup/upgrade/saved-objects-migration.asciidoc
new file mode 100644
index 0000000000000..cc4406f8cdd1f
--- /dev/null
+++ b/docs/setup/upgrade/saved-objects-migration.asciidoc
@@ -0,0 +1,39 @@
+[[saved-object-migrations]]
+=== Migrate saved objects
+
+Each time you upgrade {kib}, an upgrade migration is performed to ensure that all <<managing-saved-objects,saved objects>> are compatible with the new version.
+
+NOTE: To help you prepare for the upgrade to 8.0.0, 7.17.0 includes an https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[*Upgrade Assistant*].
+To access the assistant, go to *Stack Management > Upgrade Assistant*.
+
+WARNING: {kib} 7.12.0 and later uses a new migration process and index naming scheme. Before you upgrade, read the documentation for your version of {kib}.
+
+WARNING: The following instructions assumes {kib} is using the default index names. If the `kibana.index` or `xpack.tasks.index` configuration settings are different from the default, adapt the instructions accordingly.
+
+[float]
+[[upgrade-migrations-process]]
+==== How saved objects migrations work
+
+Saved objects are stored in two indices:
+
+* `.kibana_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_7.12.0_001`.
+* `.kibana_task_manager_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_task_manager_7.12.0_001`.
+
+The index aliases `.kibana` and `.kibana_task_manager` always point to
+the most up-to-date saved object indices.
+
+When you start a new {kib} installation, an upgrade migration is performed before starting plugins or serving HTTP traffic.
+Before you upgrade, shut down old nodes to prevent losing acknowledged writes.
+To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later
+adds a write block to the outdated index. Table 1 lists the saved objects indices used by previous {kib} versions.
+
+.Saved object indices and aliases per {kib} version
+[options="header"]
+|=======================
+|Upgrading from version | Outdated index (alias)
+| 6.5.0 through 7.3.x    | `.kibana_N` (`.kibana` alias)
+| 7.4.0 through 7.11.x
+| `.kibana_N` (`.kibana` alias)
+
+`.kibana_task_manager_N` (`.kibana_task_manager` alias)
+|=======================
diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
deleted file mode 100644
index f75251089bf55..0000000000000
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ /dev/null
@@ -1,228 +0,0 @@
-[float]
-[[saved-object-migrations]]
-=== Saved object migrations
-
-Each time you upgrade {kib}, an upgrade migration is performed to ensure that all <<managing-saved-objects,saved objects>> are compatible with the new version.
-
-NOTE: To help you prepare for the upgrade to 8.0.0, 7.17.0 includes an https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[*Upgrade Assistant*]. 
-To access the assistant, go to *Stack Management > Upgrade Assistant*.
-
-WARNING: {kib} 7.12.0 and later uses a new migration process and index naming scheme. Before you upgrade, read the documentation for your version of {kib}.
-
-WARNING: The following instructions assumes {kib} is using the default index names. If the `kibana.index` or `xpack.tasks.index` configuration settings are different from the default, adapt the instructions accordingly.
-
-[float]
-[[upgrade-migrations-process]]
-==== Background
-
-Saved objects are stored in two indices:
-
-* `.kibana_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_7.12.0_001`.
-* `.kibana_task_manager_{kibana_version}_001`, e.g. for {kib} 7.12.0 `.kibana_task_manager_7.12.0_001`.
-
-The index aliases `.kibana` and `.kibana_task_manager` always point to
-the most up-to-date saved object indices.
-
-When you start a new {kib} installation, an upgrade migration is performed before starting plugins or serving HTTP traffic.
-Before you upgrade, shut down old nodes to prevent losing acknowledged writes.
-To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later
-adds a write block to the outdated index. Table 1 lists the saved objects indices used by previous {kib} versions.
-
-.Saved object indices and aliases per {kib} version
-[options="header"]
-|=======================
-|Upgrading from version | Outdated index (alias)
-
-`.kibana_task_manager_7.12.0_001` (`.kibana_task_manager` alias)
-| 6.5.0 through 7.3.x    | `.kibana_N` (`.kibana` alias)
-| 7.4.0 through 7.11.x
-| `.kibana_N` (`.kibana` alias)
-
-`.kibana_task_manager_N` (`.kibana_task_manager` alias)
-|=======================
-
-==== Upgrading multiple {kib} instances
-When upgrading several {kib} instances connected to the same {es} cluster,
-ensure that all outdated instances are shut down before starting the upgrade.
-
-Rolling upgrades are unsupported in {kib}. However, when outdated instances are shut down, you can start all upgraded instances in parallel, 
-which allows all instances to participate in the upgrade migration in parallel.
-
-For large deployments with more than 10 {kib} instances, and more than 10,000 saved objects,
-you can reduce the upgrade downtime by bringing up a single {kib} instance and waiting for it to
-complete the upgrade migration before bringing up the remaining instances.
-
-[float]
-[[preventing-migration-failures]]
-==== Preventing migration failures
-Review the common causes of {kib} upgrade failures and how to prevent them.
-
-[float]
-====== Documents found for unknown saved object types
-Migrations will fail if saved objects belong to an unknown
-saved object type. Unknown saved objects are typically caused by
-to the {es} index, or by disabling a plugin that had previously
-created a saved object.
-
-We recommend using the https://www.elastic.co/guide/en/kibana/7.17/upgrade-assistant.html[Upgrade Assistant] 
-to discover and remedy any unknown saved object types. {kib} version 7.17.0 deployments containing unknown saved
-object types will also log the following warning message:
-
-[source,sh]
---------------------------------------------
-CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
---------------------------------------------
-
-If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
-[source,sh]
---------------------------------------------
-Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the ".kibana_7.17.0_001" index.
---------------------------------------------
-
-[float]
-===== timeout_exception or receive_timeout_transport_exception
-There is a known issue in 7.12.0 for users who tried the {fleet} beta.
-Upgrade migrations fail because of a large number of documents in the `.kibana` index, which causes {kib} to log errors such as:
-
-
-[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]
---------------------------------------------
-
-For instructions on how to mitigate the known issue, refer to https://github.com/elastic/kibana/issues/95321[the GitHub issue].
-
-[float]
-===== Corrupt saved objects
-To find and remedy problems caused by corrupt documents, we highly recommend testing your {kib} upgrade in a development cluster, 
-especially when there are custom integrations that create saved objects in your environment.
-
-Saved objects that are corrupted through manual editing or integrations cause migration
-failures with a log message, such as `Unable to migrate the corrupt Saved Object document ...`.
-For a successful upgrade migration, you must fix or delete corrupt documents.
-
-For example, you receive the following error message:
-
-[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.
---------------------------------------------
-
-To delete the documents that cause migrations to fail, take the following steps:
-
-. 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}.
-+
-The dashboard with the `e3c5fc71-ac71-4805-bcab-2bcc9cc93275` ID that belongs to the `marketing_space` space **is no longer available**.
-
-Be sure you have a snapshot before you delete the corrupt document. If you are unable to restore from a snapshot, it is recommended to also delete the `temp` and `target` indices the migration creates before you restart {kib} and retry the snapshot restore.
-
-[float]
-===== User defined index templates that cause new `.kibana*` indices to have incompatible settings or mappings
-Matching index templates that specify `settings.refresh_interval` or `mappings` are known to interfere with {kib} upgrades.
-
-To make sure the index templates won't apply to new `.kibana*` indices, narrow down the {data-sources} of any user-defined index templates.
-
-[float]
-===== An unhealthy {es} cluster
-Problems with your {es} cluster can prevent {kib} upgrades from succeeding. Ensure that your cluster has:
-
- * Enough free disk space, at least twice the amount of storage taken up by the `.kibana` and `.kibana_task_manager` indices
- * Sufficient heap size
- * A "green" cluster status
-
-[float]
-===== Different versions of {kib} connected to the same {es} index
-When you perform an upgrade migration of different {kib} versions, the migration can fail.
-Ensure that all {kib} instances are running the same version, configuration, and plugins.
-
-[float]
-===== Incompatible `xpack.tasks.index` configuration setting
-In {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks` with the configuration setting `xpack.tasks.index: ".tasks"`,
-upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuration setting prevents upgrade migrations from starting.
-
-[float]
-[[resolve-migrations-failures]]
-==== Resolving migration failures
-
-If {kib} unexpectedly terminates while migrating a saved object index, {kib} automatically attempts to
-perform the migration again when the process restarts. Do not delete any saved objects indices to
-to fix a failed migration. Unlike previous versions, {kib} 7.12.0 and
-later does not require deleting indices to release a failed migration lock.
-
-If upgrade migrations fail repeatedly, refer to
-<<preventing-migration-failures, preventing migration failures>>.
-When you address the root cause for the migration failure,
-{kib} automatically retries the migration.
-If you're unable to resolve a failed migration, contact Support.
-
-[float]
-[[upgrade-migrations-rolling-back]]
-==== Rolling back to a previous version of {kib}
-
-If you've followed <<preventing-migration-failures, preventing migration failures>>
-and <<resolve-migrations-failures, resolving migration failures>>, and
-{kib} is still unable to successfully upgrade, rollback {kib} until
-you're able to identify and fix the root cause.
-
-WARNING: Before you roll back {kib}, ensure that the version you want to roll back to is compatible with
-your {es} cluster. If the version you want to roll back to is not compatible, you must also rollback {es}.
-Any changes made after an upgrade are lost when you roll back to a previous version.
-
-To roll back after a failed upgrade migration, you must also rollback the saved object indices to be compatible with the previous {kib} version.
-
-[float]
-===== Roll back by restoring a backup snapshot
-
-. Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state.
-   By default, snapshots include the `kibana` feature state.
-. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
-. To delete all saved object indices, use `DELETE /.kibana*`.
-. {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state from the snapshot.
-. Start all {kib} instances on the older version you want to rollback to.
-
-[float]
-===== (Not recommended) Roll back without a backup snapshot
-
-. To make sure no {kib} instances are performing an upgrade migration, shut down all {kib} instances.
-. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state. By default, snapshots include the `kibana` feature state.
-. Delete the version-specific indices created by the failed upgrade migration.
-+
-For example, to rollback from a failed upgrade
-to v7.12.0, use `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`.
-. Inspect the output of `GET /_cat/aliases`.
-+
-If the `.kibana` or `.kibana_task_manager` aliases are missing, you must create them manually.
-Find the latest index from the output of `GET /_cat/indices` and create the missing alias to point to the latest index.
-For example, if the `.kibana` alias is missing, and the latest index is `.kibana_3`, create a new alias using `POST /.kibana_3/_aliases/.kibana`.
-. To remove the write block from the roll back indices, use
-`PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`
-. Start {kib} on the older version you want to rollback to.
-
-[float]
-[[upgrade-migrations-old-indices]]
-==== Handling old `.kibana_N` indices
-
-After the migrations complete, multiple {kib} indices are created in {es}: (`.kibana_1`, `.kibana_2`, `.kibana_7.12.0` etc).
-{kib} only uses the index that the `.kibana` and `.kibana_task_manager` aliases point to.
-The other {kib} indices can be safely deleted, but are left around as a matter of historical record, and to facilitate rolling {kib} back to a previous version.

From 643e4392b0d6b76319c0d2b5e2a5707d6aead583 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Thu, 10 Feb 2022 16:11:09 -0800
Subject: [PATCH 80/85] [kbn-pm] Add trailing newline in package.json (#125320)

---
 package.json                                   | 2 +-
 packages/kbn-pm/dist/index.js                  | 2 +-
 packages/kbn-pm/src/utils/sort_package_json.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ffa470bf5f11e..f7e49c48660fe 100644
--- a/package.json
+++ b/package.json
@@ -906,4 +906,4 @@
     "yargs": "^15.4.1",
     "zlib": "^1.0.5"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index d0fe0f269f6fa..a4b6f4938ddcd 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -51510,7 +51510,7 @@ async function sortPackageJson(kbn) {
   await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(packageJsonPath, JSON.stringify(sort_package_json__WEBPACK_IMPORTED_MODULE_1___default()(JSON.parse(packageJson), {
     // top level keys in the order they were written when this was implemented
     sortOrder: ['name', 'description', 'keywords', 'private', 'version', 'branch', 'types', 'tsdocMetadata', 'build', 'homepage', 'bugs', 'kibana', 'author', 'scripts', 'repository', 'engines', 'resolutions']
-  }), null, 2));
+  }), null, 2) + '\n');
 }
 
 /***/ }),
diff --git a/packages/kbn-pm/src/utils/sort_package_json.ts b/packages/kbn-pm/src/utils/sort_package_json.ts
index 0abab6f0f89b4..b4df5355744f1 100644
--- a/packages/kbn-pm/src/utils/sort_package_json.ts
+++ b/packages/kbn-pm/src/utils/sort_package_json.ts
@@ -42,6 +42,6 @@ export async function sortPackageJson(kbn: Kibana) {
       }),
       null,
       2
-    )
+    ) + '\n'
   );
 }

From dec594b303061787f31cbf6170bf30a363ecf14b Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Fri, 11 Feb 2022 07:49:42 +0100
Subject: [PATCH 81/85] retry test (#125284)

---
 x-pack/test/functional/page_objects/lens_page.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index d859a17ec9982..61b0cd10750b2 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -574,11 +574,13 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       const lastIndex = (
         await find.allByCssSelector('[data-test-subj^="indexPattern-dimension-field"]')
       ).length;
-      await testSubjects.click('indexPattern-terms-add-field');
-      // count the number of defined terms
-      const target = await testSubjects.find(`indexPattern-dimension-field-${lastIndex}`);
-      await comboBox.openOptionsList(target);
-      await comboBox.setElement(target, field);
+      await retry.try(async () => {
+        await testSubjects.click('indexPattern-terms-add-field');
+        // count the number of defined terms
+        const target = await testSubjects.find(`indexPattern-dimension-field-${lastIndex}`, 1000);
+        await comboBox.openOptionsList(target);
+        await comboBox.setElement(target, field);
+      });
     },
 
     async checkTermsAreNotAvailableToAgg(fields: string[]) {

From dd0749a30cae84577928bfe67c33e126a4aa4d39 Mon Sep 17 00:00:00 2001
From: Faisal Kanout <faisal.kanout@elastic.co>
Date: Fri, 11 Feb 2022 10:27:32 +0300
Subject: [PATCH 82/85] [RAC][LOGS] Add reason message as a rule variable. 
 (#124978)

* Move types to the common folder and refactor code

* Add reason message as rule variable

* Revert "Move types to the common folder and refactor code"

This reverts commit 11692e7e1a9c56a64abb5824f540f26e0973cd38.

* Fix tests

* Fix tests

* Fix processGroupByRatioResults reason message

* Fix tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../log_threshold_executor.test.ts            |  5 ++
 .../log_threshold/log_threshold_executor.ts   | 77 ++++++++-----------
 .../register_log_threshold_rule_type.ts       |  8 ++
 3 files changed, 45 insertions(+), 45 deletions(-)

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 8f0809f581ad0..ba02fb96b0d68 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
@@ -436,6 +436,7 @@ describe('Log threshold executor', () => {
               group: null,
               matchingDocuments: 10,
               isRatio: false,
+              reason: '10 log entries in the last 5 mins. Alert when > 5.',
             },
           },
         ]);
@@ -501,6 +502,8 @@ describe('Log threshold executor', () => {
               group: 'i-am-a-host-name-1, i-am-a-dataset-1',
               matchingDocuments: 10,
               isRatio: false,
+              reason:
+                '10 log entries in the last 5 mins for i-am-a-host-name-1, i-am-a-dataset-1. Alert when > 5.',
             },
           },
         ]);
@@ -516,6 +519,8 @@ describe('Log threshold executor', () => {
               group: 'i-am-a-host-name-3, i-am-a-dataset-3',
               matchingDocuments: 20,
               isRatio: false,
+              reason:
+                '20 log entries in the last 5 mins for i-am-a-host-name-3, i-am-a-dataset-3. Alert when > 5.',
             },
           },
         ]);
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 5eedaac5f020a..f817b68b919ba 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
@@ -250,20 +250,15 @@ export const processUngroupedResults = (
 ) => {
   const { count, criteria, timeSize, timeUnit } = params;
   const documentCount = results.hits.total.value;
-
+  const reasonMessage = getReasonMessageForUngroupedCountAlert(
+    documentCount,
+    count.value,
+    count.comparator,
+    timeSize,
+    timeUnit
+  );
   if (checkValueAgainstComparatorMap[count.comparator](documentCount, count.value)) {
-    const alert = alertFactory(
-      UNGROUPED_FACTORY_KEY,
-      getReasonMessageForUngroupedCountAlert(
-        documentCount,
-        count.value,
-        count.comparator,
-        timeSize,
-        timeUnit
-      ),
-      documentCount,
-      count.value
-    );
+    const alert = alertFactory(UNGROUPED_FACTORY_KEY, reasonMessage, documentCount, count.value);
     alertUpdater(alert, AlertStates.ALERT, [
       {
         actionGroup: FIRED_ACTIONS.id,
@@ -272,6 +267,7 @@ export const processUngroupedResults = (
           conditions: createConditionsMessageForCriteria(criteria),
           group: null,
           isRatio: false,
+          reason: reasonMessage,
         },
       },
     ]);
@@ -292,18 +288,14 @@ export const processUngroupedRatioResults = (
   const ratio = getRatio(numeratorCount, denominatorCount);
 
   if (ratio !== undefined && checkValueAgainstComparatorMap[count.comparator](ratio, count.value)) {
-    const alert = alertFactory(
-      UNGROUPED_FACTORY_KEY,
-      getReasonMessageForUngroupedRatioAlert(
-        ratio,
-        count.value,
-        count.comparator,
-        timeSize,
-        timeUnit
-      ),
+    const reasonMessage = getReasonMessageForUngroupedRatioAlert(
       ratio,
-      count.value
+      count.value,
+      count.comparator,
+      timeSize,
+      timeUnit
     );
+    const alert = alertFactory(UNGROUPED_FACTORY_KEY, reasonMessage, ratio, count.value);
     alertUpdater(alert, AlertStates.ALERT, [
       {
         actionGroup: FIRED_ACTIONS.id,
@@ -313,6 +305,7 @@ export const processUngroupedRatioResults = (
           denominatorConditions: createConditionsMessageForCriteria(getDenominator(criteria)),
           group: null,
           isRatio: true,
+          reason: reasonMessage,
         },
       },
     ]);
@@ -372,19 +365,15 @@ export const processGroupByResults = (
     const documentCount = group.documentCount;
 
     if (checkValueAgainstComparatorMap[count.comparator](documentCount, count.value)) {
-      const alert = alertFactory(
-        group.name,
-        getReasonMessageForGroupedCountAlert(
-          documentCount,
-          count.value,
-          count.comparator,
-          group.name,
-          timeSize,
-          timeUnit
-        ),
+      const reasonMessage = getReasonMessageForGroupedCountAlert(
         documentCount,
-        count.value
+        count.value,
+        count.comparator,
+        group.name,
+        timeSize,
+        timeUnit
       );
+      const alert = alertFactory(group.name, reasonMessage, documentCount, count.value);
       alertUpdater(alert, AlertStates.ALERT, [
         {
           actionGroup: FIRED_ACTIONS.id,
@@ -393,6 +382,7 @@ export const processGroupByResults = (
             conditions: createConditionsMessageForCriteria(criteria),
             group: group.name,
             isRatio: false,
+            reason: reasonMessage,
           },
         },
       ]);
@@ -425,19 +415,15 @@ export const processGroupByRatioResults = (
       ratio !== undefined &&
       checkValueAgainstComparatorMap[count.comparator](ratio, count.value)
     ) {
-      const alert = alertFactory(
-        numeratorGroup.name,
-        getReasonMessageForGroupedRatioAlert(
-          ratio,
-          count.value,
-          count.comparator,
-          numeratorGroup.name,
-          timeSize,
-          timeUnit
-        ),
+      const reasonMessage = getReasonMessageForGroupedRatioAlert(
         ratio,
-        count.value
+        count.value,
+        count.comparator,
+        numeratorGroup.name,
+        timeSize,
+        timeUnit
       );
+      const alert = alertFactory(numeratorGroup.name, reasonMessage, ratio, count.value);
       alertUpdater(alert, AlertStates.ALERT, [
         {
           actionGroup: FIRED_ACTIONS.id,
@@ -447,6 +433,7 @@ export const processGroupByRatioResults = (
             denominatorConditions: createConditionsMessageForCriteria(getDenominator(criteria)),
             group: numeratorGroup.name,
             isRatio: true,
+            reason: reasonMessage,
           },
         },
       ]);
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
index 9a2902bfb8cd4..d5f2fd17cf3be 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
@@ -71,6 +71,13 @@ const denominatorConditionsActionVariableDescription = i18n.translate(
   }
 );
 
+const alertReasonMessageActionVariableDescription = i18n.translate(
+  'xpack.infra.logs.alerting.threshold.alertReasonMessageActionVariableDescription',
+  {
+    defaultMessage: 'A concise description of the reason for the alert',
+  }
+);
+
 export async function registerLogThresholdRuleType(
   alertingPlugin: PluginSetupContract,
   libs: InfraBackendLibs
@@ -104,6 +111,7 @@ export async function registerLogThresholdRuleType(
         { name: 'group', description: groupByActionVariableDescription },
         // Ratio alerts
         { name: 'isRatio', description: isRatioActionVariableDescription },
+        { name: 'reason', description: alertReasonMessageActionVariableDescription },
         { name: 'ratio', description: ratioActionVariableDescription },
         { name: 'numeratorConditions', description: numeratorConditionsActionVariableDescription },
         {

From 63dffb1d7978f662884c26675b07f53330f98cdd Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Fri, 11 Feb 2022 09:31:21 +0100
Subject: [PATCH 83/85] [Observability overview] Fix overview page duplicate
 requests (#125204)

---
 .../pages/overview/old_overview_page.tsx      | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
index a6af0d9182215..b14628b2ae041 100644
--- a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiPanel, EuiHorizontalRule } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTrackPageview } from '../..';
 import { EmptySections } from '../../components/app/empty_sections';
 import { ObservabilityHeaderMenu } from '../../components/app/header';
@@ -59,6 +59,20 @@ export function OverviewPage({ routeParams }: Props) {
 
   const { hasDataMap, hasAnyData, isAllRequestsComplete } = useHasData();
 
+  const bucketSize = calculateBucketSize({
+    start: absoluteTime.start,
+    end: absoluteTime.end,
+  });
+
+  const bucketSizeValue = useMemo(() => {
+    if (bucketSize?.bucketSize) {
+      return {
+        bucketSize: bucketSize.bucketSize,
+        intervalString: bucketSize.intervalString,
+      };
+    }
+  }, [bucketSize?.bucketSize, bucketSize?.intervalString]);
+
   if (hasAnyData === undefined) {
     return <LoadingObservability />;
   }
@@ -73,11 +87,6 @@ export function OverviewPage({ routeParams }: Props) {
 
   const { refreshInterval = 10000, refreshPaused = true } = routeParams.query;
 
-  const bucketSize = calculateBucketSize({
-    start: absoluteTime.start,
-    end: absoluteTime.end,
-  });
-
   return (
     <ObservabilityPageTemplate
       noDataConfig={noDataConfig}
@@ -114,7 +123,7 @@ export function OverviewPage({ routeParams }: Props) {
             </EuiFlexItem>
             <EuiFlexItem>
               {/* Data sections */}
-              {hasAnyData && <DataSections bucketSize={bucketSize} />}
+              {hasAnyData && <DataSections bucketSize={bucketSizeValue} />}
               <EmptySections />
             </EuiFlexItem>
             <EuiSpacer size="s" />

From 0766f1803c087e7d07314e06afdba0b604c5d000 Mon Sep 17 00:00:00 2001
From: Dominique Clarke <dominique.clarke@elastic.co>
Date: Fri, 11 Feb 2022 03:33:03 -0500
Subject: [PATCH 84/85] [Uptime] Convert ui monitor management combobox to
 checkboxes (#124917)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../e2e/page_objects/monitor_management.tsx   |  3 +-
 .../plugins/uptime/e2e/page_objects/utils.tsx |  4 ++
 .../monitor_config/locations.test.tsx         | 45 +-----------
 .../monitor_config/locations.tsx              | 72 ++++++++-----------
 4 files changed, 38 insertions(+), 86 deletions(-)

diff --git a/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx b/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
index fd877708f2bce..384242bc9af70 100644
--- a/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
+++ b/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
@@ -96,9 +96,8 @@ export function monitorManagementPageProvider({
     },
 
     async selectLocations({ locations }: { locations: string[] }) {
-      await this.clickByTestSubj('syntheticsServiceLocationsComboBox');
       for (let i = 0; i < locations.length; i++) {
-        await page.click(`text=${locations[i]}`);
+        await page.check(`text=${locations[i]}`);
       }
     },
 
diff --git a/x-pack/plugins/uptime/e2e/page_objects/utils.tsx b/x-pack/plugins/uptime/e2e/page_objects/utils.tsx
index 072d4497e856d..024609e2f69ef 100644
--- a/x-pack/plugins/uptime/e2e/page_objects/utils.tsx
+++ b/x-pack/plugins/uptime/e2e/page_objects/utils.tsx
@@ -38,6 +38,10 @@ export function utilsPageProvider({ page }: { page: Page }) {
       await page.selectOption(`[data-test-subj=${dataTestSubj}]`, value);
     },
 
+    async checkByTestSubj(dataTestSubj: string, value: string) {
+      await page.check(`[data-test-subj=${dataTestSubj}]`);
+    },
+
     async clickByTestSubj(dataTestSubj: string) {
       await page.click(`[data-test-subj=${dataTestSubj}]`);
     },
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx
index 11caf092c93c7..ccc3e7b619c68 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx
@@ -8,8 +8,7 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render } from '../../../lib/helper/rtl_helpers';
-import { ServiceLocations, LOCATIONS_LABEL } from './locations';
-import userEvent from '@testing-library/user-event';
+import { ServiceLocations } from './locations';
 
 describe('<ActionBar />', () => {
   const setLocations = jest.fn();
@@ -52,47 +51,7 @@ describe('<ActionBar />', () => {
       { state }
     );
 
-    expect(screen.getByText(LOCATIONS_LABEL)).toBeInTheDocument();
-    expect(screen.queryByText('US Central')).not.toBeInTheDocument();
-  });
-
-  it('shows location options when clicked', async () => {
-    render(
-      <ServiceLocations selectedLocations={[]} setLocations={setLocations} isInvalid={false} />,
-      { state }
-    );
-
-    userEvent.click(screen.getByRole('button'));
-
-    expect(screen.getByText('US Central')).toBeInTheDocument();
-  });
-
-  it('prevents bad inputs', async () => {
-    render(
-      <ServiceLocations selectedLocations={[]} setLocations={setLocations} isInvalid={false} />,
-      { state }
-    );
-
-    userEvent.click(screen.getByRole('button'));
-    userEvent.type(screen.getByRole('textbox'), 'fake location');
-
-    expect(screen.getByText("doesn't match any options")).toBeInTheDocument();
-
-    userEvent.keyboard(`{enter}`);
-
-    expect(screen.getByText('"fake location" is not a valid option')).toBeInTheDocument();
-  });
-
-  it('calls setLocations', async () => {
-    render(
-      <ServiceLocations selectedLocations={[]} setLocations={setLocations} isInvalid={false} />,
-      { state }
-    );
-
-    userEvent.click(screen.getByRole('button'));
-    userEvent.click(screen.getByText('US Central'));
-
-    expect(setLocations).toBeCalledWith([location]);
+    expect(screen.queryByText('US Central')).toBeInTheDocument();
   });
 
   it('shows invalid error', async () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx
index 2d261e169299a..1877cc4ade126 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { i18n } from '@kbn/i18n';
-import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow } from '@elastic/eui';
+import { EuiCheckboxGroup, EuiFormRow } from '@elastic/eui';
 import { monitorManagementListSelector } from '../../../state/selectors';
 import { ServiceLocation } from '../../../../common/runtime_types';
 
@@ -20,51 +20,49 @@ interface Props {
 
 export const ServiceLocations = ({ selectedLocations, setLocations, isInvalid }: Props) => {
   const [error, setError] = useState<string | null>(null);
+  const [checkboxIdToSelectedMap, setCheckboxIdToSelectedMap] = useState<Record<string, boolean>>(
+    {}
+  );
   const { locations } = useSelector(monitorManagementListSelector);
 
-  const onLocationChange = (
-    selectedLocationOptions: Array<EuiComboBoxOptionOption<ServiceLocation>>
-  ) => {
-    setLocations(selectedLocationOptions as ServiceLocation[]);
-    setError(null);
-  };
-
-  const onSearchChange = (value: string, hasMatchingOptions?: boolean) => {
-    setError(value.length === 0 || hasMatchingOptions ? null : getInvalidOptionError(value));
-  };
-
-  const onBlur = (event: unknown) => {
-    const inputElement = (event as FocusEvent)?.target as HTMLInputElement;
-    if (inputElement) {
-      const { value } = inputElement;
-      setError(value.length === 0 ? null : getInvalidOptionError(value));
+  const onLocationChange = (optionId: string) => {
+    const isSelected = !checkboxIdToSelectedMap[optionId];
+    const location = locations.find((loc) => loc.id === optionId);
+    if (isSelected) {
+      setLocations((prevLocations) => (location ? [...prevLocations, location] : prevLocations));
+    } else {
+      setLocations((prevLocations) => [...prevLocations].filter((loc) => loc.id !== optionId));
     }
+    setError(null);
   };
 
   const errorMessage = error ?? (isInvalid ? VALIDATION_ERROR : null);
 
+  useEffect(() => {
+    const newCheckboxIdToSelectedMap = selectedLocations.reduce<Record<string, boolean>>(
+      (acc, location) => {
+        acc[location.id] = true;
+        return acc;
+      },
+      {}
+    );
+    setCheckboxIdToSelectedMap(newCheckboxIdToSelectedMap);
+  }, [selectedLocations]);
+
   return (
     <EuiFormRow label={LOCATIONS_LABEL} error={errorMessage} isInvalid={errorMessage !== null}>
-      <EuiComboBox
-        placeholder={PLACEHOLDER_LABEL}
-        options={locations}
-        selectedOptions={selectedLocations}
-        onChange={onLocationChange}
-        onSearchChange={onSearchChange}
-        onBlur={onBlur}
-        data-test-subj="syntheticsServiceLocationsComboBox"
+      <EuiCheckboxGroup
+        options={locations.map((location) => ({
+          ...location,
+          'data-test-subj': `syntheticsServiceLocation--${location.id}`,
+        }))}
+        idToSelectedMap={checkboxIdToSelectedMap}
+        onChange={(id) => onLocationChange(id)}
       />
     </EuiFormRow>
   );
 };
 
-const PLACEHOLDER_LABEL = i18n.translate(
-  'xpack.uptime.monitorManagement.serviceLocationsPlaceholderLabel',
-  {
-    defaultMessage: 'Select one or more locations to run your monitor.',
-  }
-);
-
 const VALIDATION_ERROR = i18n.translate(
   'xpack.uptime.monitorManagement.serviceLocationsValidationError',
   {
@@ -72,14 +70,6 @@ const VALIDATION_ERROR = i18n.translate(
   }
 );
 
-const getInvalidOptionError = (value: string) =>
-  i18n.translate('xpack.uptime.monitorManagement.serviceLocationsOptionError', {
-    defaultMessage: '"{value}" is not a valid option',
-    values: {
-      value,
-    },
-  });
-
 export const LOCATIONS_LABEL = i18n.translate(
   'xpack.uptime.monitorManagement.monitorLocationsLabel',
   {

From 453e22e3185d7b9c887a2e36ce4f07de7fe94e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Alvarez=20Pi=C3=B1eiro?=
 <95703246+emilioalvap@users.noreply.github.com>
Date: Fri, 11 Feb 2022 09:45:23 +0100
Subject: [PATCH 85/85] [Uptime] Fix flaky monitor details tests (#124700)

* Rewrite flaky tests to e2e pipeline, add data initialization helpers, add monitor details page object
---
 .../plugins/uptime/e2e/helpers/make_checks.ts | 182 ++++++++++++++++++
 .../plugins/uptime/e2e/helpers/make_ping.ts   | 126 ++++++++++++
 x-pack/plugins/uptime/e2e/helpers/make_tls.ts |  68 +++++++
 .../e2e/journeys/data_view_permissions.ts     |   3 +-
 x-pack/plugins/uptime/e2e/journeys/index.ts   |   1 +
 .../e2e/journeys/monitor_details/index.ts     |  10 +
 .../monitor_details/monitor_alerts.journey.ts |  94 +++++++++
 .../monitor_details.journey.ts                |  60 ++++++
 .../monitor_details/ping_redirects.journey.ts |  73 +++++++
 .../journeys/monitor_management.journey.ts    |   3 +
 .../uptime/e2e/journeys/uptime.journey.ts     |   6 +-
 x-pack/plugins/uptime/e2e/journeys/utils.ts   |   8 +
 .../e2e/page_objects/monitor_details.tsx      | 129 +++++++++++++
 .../e2e/page_objects/monitor_management.tsx   |   7 +-
 x-pack/plugins/uptime/e2e/playwright_start.ts |  22 +--
 .../components/monitor/ml/manage_ml_job.tsx   |   2 +-
 x-pack/test/functional/apps/uptime/index.ts   |   5 -
 x-pack/test/functional/apps/uptime/monitor.ts |  60 ------
 .../functional/apps/uptime/ping_redirects.ts  |  76 --------
 .../apps/uptime/anomaly_alert.ts              | 134 -------------
 .../apps/uptime/index.ts                      |   1 -
 21 files changed, 765 insertions(+), 305 deletions(-)
 create mode 100644 x-pack/plugins/uptime/e2e/helpers/make_checks.ts
 create mode 100644 x-pack/plugins/uptime/e2e/helpers/make_ping.ts
 create mode 100644 x-pack/plugins/uptime/e2e/helpers/make_tls.ts
 create mode 100644 x-pack/plugins/uptime/e2e/journeys/monitor_details/index.ts
 create mode 100644 x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts
 create mode 100644 x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.ts
 create mode 100644 x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts
 create mode 100644 x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx
 delete mode 100644 x-pack/test/functional/apps/uptime/monitor.ts
 delete mode 100644 x-pack/test/functional/apps/uptime/ping_redirects.ts
 delete mode 100644 x-pack/test/functional_with_es_ssl/apps/uptime/anomaly_alert.ts

diff --git a/x-pack/plugins/uptime/e2e/helpers/make_checks.ts b/x-pack/plugins/uptime/e2e/helpers/make_checks.ts
new file mode 100644
index 0000000000000..b9e913524cb1f
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/helpers/make_checks.ts
@@ -0,0 +1,182 @@
+/*
+ * 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 uuid from 'uuid';
+import { merge, flattenDeep } from 'lodash';
+import type { Client } from '@elastic/elasticsearch';
+import { makePing } from './make_ping';
+import { TlsProps } from './make_tls';
+
+interface CheckProps {
+  es: Client;
+  monitorId?: string;
+  numIps?: number;
+  fields?: { [key: string]: any };
+  mogrify?: (doc: any) => any;
+  refresh?: boolean;
+  tls?: boolean | TlsProps;
+  isFleetManaged?: boolean;
+}
+
+const getRandomMonitorId = () => {
+  return 'monitor-' + Math.random().toString(36).substring(7);
+};
+export const makeCheck = async ({
+  es,
+  monitorId = getRandomMonitorId(),
+  numIps = 1,
+  fields = {},
+  mogrify = (d) => d,
+  refresh = true,
+  tls = false,
+  isFleetManaged = false,
+}: CheckProps): Promise<{ monitorId: string; docs: any }> => {
+  const cgFields = {
+    monitor: {
+      check_group: uuid.v4(),
+    },
+  };
+
+  const docs = [];
+  const summary = {
+    up: 0,
+    down: 0,
+  };
+  for (let i = 0; i < numIps; i++) {
+    const pingFields = merge(fields, cgFields, {
+      monitor: {
+        ip: `127.0.0.${i}`,
+      },
+    });
+    if (i === numIps - 1) {
+      pingFields.summary = summary;
+    }
+    const doc = await makePing(
+      es,
+      monitorId,
+      pingFields,
+      mogrify,
+      false,
+      tls as any,
+      isFleetManaged
+    );
+    docs.push(doc);
+    // @ts-ignore
+    summary[doc.monitor.status]++;
+  }
+
+  if (refresh) {
+    await es.indices.refresh();
+  }
+
+  return { monitorId, docs };
+};
+
+export const makeChecks = async (
+  es: Client,
+  monitorId: string,
+  numChecks: number = 1,
+  numIps: number = 1,
+  every: number = 10000, // number of millis between checks
+  fields: { [key: string]: any } = {},
+  mogrify: (doc: any) => any = (d) => d,
+  refresh: boolean = true,
+  isFleetManaged: boolean = false
+) => {
+  const checks = [];
+  const oldestTime = new Date().getTime() - numChecks * every;
+  let newestTime = oldestTime;
+  for (let li = 0; li < numChecks; li++) {
+    const checkDate = new Date(newestTime + every);
+    newestTime = checkDate.getTime() + every;
+    fields = merge(fields, {
+      '@timestamp': checkDate.toISOString(),
+      monitor: {
+        timespan: {
+          gte: checkDate.toISOString(),
+          lt: new Date(newestTime).toISOString(),
+        },
+      },
+    });
+    const { docs } = await makeCheck({
+      es,
+      monitorId,
+      numIps,
+      fields,
+      mogrify,
+      refresh: false,
+      isFleetManaged,
+    });
+    checks.push(docs);
+  }
+
+  if (refresh) {
+    await es.indices.refresh();
+  }
+
+  return checks;
+};
+
+export const makeChecksWithStatus = async (
+  es: Client,
+  monitorId: string,
+  numChecks: number,
+  numIps: number,
+  every: number,
+  fields: { [key: string]: any } = {},
+  status: 'up' | 'down',
+  mogrify: (doc: any) => any = (d) => d,
+  refresh: boolean = true,
+  isFleetManaged: boolean = false
+) => {
+  const oppositeStatus = status === 'up' ? 'down' : 'up';
+
+  return await makeChecks(
+    es,
+    monitorId,
+    numChecks,
+    numIps,
+    every,
+    fields,
+    (d) => {
+      d.monitor.status = status;
+      if (d.summary) {
+        d.summary[status] += d.summary[oppositeStatus];
+        d.summary[oppositeStatus] = 0;
+      }
+
+      return mogrify(d);
+    },
+    refresh,
+    isFleetManaged
+  );
+};
+
+// Helper for processing a list of checks to find the time picker bounds.
+export const getChecksDateRange = (checks: any[]) => {
+  // Flatten 2d arrays
+  const flattened = flattenDeep(checks);
+
+  let startTime = 1 / 0;
+  let endTime = -1 / 0;
+  flattened.forEach((c) => {
+    const ts = Date.parse(c['@timestamp']);
+
+    if (ts < startTime) {
+      startTime = ts;
+    }
+
+    if (ts > endTime) {
+      endTime = ts;
+    }
+  });
+
+  return {
+    start: new Date(startTime).toISOString(),
+    end: new Date(endTime).toISOString(),
+  };
+};
diff --git a/x-pack/plugins/uptime/e2e/helpers/make_ping.ts b/x-pack/plugins/uptime/e2e/helpers/make_ping.ts
new file mode 100644
index 0000000000000..c93d6f437268d
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/helpers/make_ping.ts
@@ -0,0 +1,126 @@
+/*
+ * 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 uuid from 'uuid';
+import { merge } from 'lodash';
+import type { Client } from '@elastic/elasticsearch';
+import { makeTls, TlsProps } from './make_tls';
+
+const DEFAULT_INDEX_NAME = 'heartbeat-8-full-test';
+const DATA_STREAM_INDEX_NAME = 'synthetics-http-default';
+
+export const makePing = async (
+  es: Client,
+  monitorId: string,
+  fields: { [key: string]: any },
+  mogrify: (doc: any) => any,
+  refresh: boolean = true,
+  tls: boolean | TlsProps = false,
+  isFleetManaged: boolean | undefined = false
+) => {
+  const timestamp = new Date();
+  const baseDoc: any = {
+    tcp: {
+      rtt: {
+        connect: {
+          us: 14687,
+        },
+      },
+    },
+    observer: {
+      geo: {
+        name: 'mpls',
+        location: '37.926868, -78.024902',
+      },
+      hostname: 'avc-x1e',
+    },
+    agent: {
+      hostname: 'avc-x1e',
+      id: '10730a1a-4cb7-45ce-8524-80c4820476ab',
+      type: 'heartbeat',
+      ephemeral_id: '0d9a8dc6-f604-49e3-86a0-d8f9d6f2cbad',
+      version: '8.0.0',
+    },
+    '@timestamp': timestamp.toISOString(),
+    resolve: {
+      rtt: {
+        us: 350,
+      },
+      ip: '127.0.0.1',
+    },
+    ecs: {
+      version: '1.1.0',
+    },
+    host: {
+      name: 'avc-x1e',
+    },
+    http: {
+      rtt: {
+        response_header: {
+          us: 19349,
+        },
+        total: {
+          us: 48954,
+        },
+        write_request: {
+          us: 33,
+        },
+        content: {
+          us: 51,
+        },
+        validate: {
+          us: 19400,
+        },
+      },
+      response: {
+        status_code: 200,
+        body: {
+          bytes: 3,
+          hash: '27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf',
+        },
+      },
+    },
+    monitor: {
+      duration: {
+        us: 49347,
+      },
+      ip: '127.0.0.1',
+      id: monitorId,
+      check_group: uuid.v4(),
+      type: 'http',
+      status: 'up',
+      timespan: {
+        gte: timestamp.toISOString(),
+        lt: new Date(timestamp.getTime() + 5000).toISOString,
+      },
+    },
+    event: {
+      dataset: 'uptime',
+    },
+    url: {
+      path: '/pattern',
+      scheme: 'http',
+      port: 5678,
+      domain: 'localhost',
+      query: 'r=200x5,500x1',
+      full: 'http://localhost:5678/pattern?r=200x5,500x1',
+    },
+  };
+
+  if (tls) {
+    baseDoc.tls = makeTls(tls as any);
+  }
+
+  const doc = mogrify(merge(baseDoc, fields));
+
+  await es.index({
+    index: isFleetManaged ? DATA_STREAM_INDEX_NAME : DEFAULT_INDEX_NAME,
+    refresh,
+    body: doc,
+  });
+  return doc;
+};
diff --git a/x-pack/plugins/uptime/e2e/helpers/make_tls.ts b/x-pack/plugins/uptime/e2e/helpers/make_tls.ts
new file mode 100644
index 0000000000000..e654a2754e51d
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/helpers/make_tls.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 moment from 'moment';
+import crypto from 'crypto';
+
+export interface TlsProps {
+  valid?: boolean;
+  commonName?: string;
+  expiry?: string;
+  sha256?: string;
+}
+
+type Props = TlsProps & boolean;
+
+// Note This is just a mock sha256 value, this doesn't actually generate actually sha 256 val
+export const getSha256 = () => {
+  return crypto.randomBytes(64).toString('hex').toUpperCase();
+};
+
+export const makeTls = ({ valid = true, commonName = '*.elastic.co', expiry, sha256 }: Props) => {
+  const expiryDate =
+    expiry ??
+    moment()
+      .add(valid ? 2 : -2, 'months')
+      .toISOString();
+
+  return {
+    version: '1.3',
+    cipher: 'TLS-AES-128-GCM-SHA256',
+    certificate_not_valid_before: '2020-03-01T00:00:00.000Z',
+    certificate_not_valid_after: expiryDate,
+    server: {
+      x509: {
+        not_before: '2020-03-01T00:00:00.000Z',
+        not_after: expiryDate,
+        issuer: {
+          distinguished_name:
+            'CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US',
+          common_name: 'DigiCert SHA2 High Assurance Server CA',
+        },
+        subject: {
+          common_name: commonName,
+          distinguished_name: 'CN=*.facebook.com,O=Facebook Inc.,L=Menlo Park,ST=California,C=US',
+        },
+        serial_number: '10043199409725537507026285099403602396',
+        signature_algorithm: 'SHA256-RSA',
+        public_key_algorithm: 'ECDSA',
+        public_key_curve: 'P-256',
+      },
+      hash: {
+        sha256: sha256 ?? '1a48f1db13c3bd1482ba1073441e74a1bb1308dc445c88749e0dc4f1889a88a4',
+        sha1: '23291c758d925b9f4bb3584de3763317e94c6ce9',
+      },
+    },
+    established: true,
+    rtt: {
+      handshake: {
+        us: 33103,
+      },
+    },
+    version_protocol: 'tls',
+  };
+};
diff --git a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts b/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
index cf50e0d6b58ae..5d8d2a1a5d848 100644
--- a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
@@ -6,8 +6,7 @@
  */
 
 import { journey, step, expect, before } from '@elastic/synthetics';
-import { loginToKibana, waitForLoadingToFinish } from './utils';
-import { byTestId } from './uptime.journey';
+import { byTestId, loginToKibana, waitForLoadingToFinish } from './utils';
 import { callKibana } from '../../../apm/scripts/create_apm_users_and_roles/helpers/call_kibana';
 
 journey('DataViewPermissions', async ({ page, params }) => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/index.ts b/x-pack/plugins/uptime/e2e/journeys/index.ts
index fe8a4960eac12..ae3450a992256 100644
--- a/x-pack/plugins/uptime/e2e/journeys/index.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/index.ts
@@ -12,3 +12,4 @@ export * from './alerts';
 export * from './read_only_user';
 export * from './monitor_name.journey';
 export * from './monitor_management.journey';
+export * from './monitor_details';
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/index.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_details/index.ts
new file mode 100644
index 0000000000000..51b782f118c2a
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_details/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './monitor_details.journey';
+export * from './monitor_alerts.journey';
+export * from './ping_redirects.journey';
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts
new file mode 100644
index 0000000000000..c44dbc187bd53
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts
@@ -0,0 +1,94 @@
+/*
+ * 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 { journey, step, expect, before, Page } from '@elastic/synthetics';
+import { noop } from 'lodash';
+import { monitorDetailsPageProvider } from '../../page_objects/monitor_details';
+import { byTestId, delay } from '../utils';
+
+const dateRangeStart = '2019-09-10T12:40:08.078Z';
+const dateRangeEnd = '2019-09-11T19:40:08.078Z';
+const monitorId = '0000-intermittent';
+
+const alertId = 'uptime-anomaly-alert';
+const alertThreshold = 'major';
+
+journey('MonitorAlerts', async ({ page, params }: { page: Page; params: any }) => {
+  const monitorDetails = monitorDetailsPageProvider({ page, kibanaUrl: params.kibanaUrl });
+
+  before(async () => {
+    await monitorDetails.waitForLoadingToFinish();
+  });
+
+  step('go to overview', async () => {
+    await monitorDetails.navigateToOverviewPage({ dateRangeEnd, dateRangeStart });
+  });
+
+  step('login to Kibana', async () => {
+    await monitorDetails.loginToKibana();
+  });
+
+  step('go to monitor details', async () => {
+    await monitorDetails.navigateToMonitorDetails(monitorId);
+    await monitorDetails.waitForLoadingToFinish();
+  });
+
+  step('clean previous data if available', async () => {
+    // Should only happen locally
+    await monitorDetails.disableAnomalyDetectionAlert().catch(noop);
+    await monitorDetails.disableAnomalyDetection().catch(noop);
+  });
+
+  step('open anomaly detection flyout', async () => {
+    await monitorDetails.waitAndRefresh(5000);
+    await monitorDetails.enableAnomalyDetection();
+    await monitorDetails.ensureAnomalyDetectionFlyoutIsOpen();
+  });
+
+  step('can create job', async () => {
+    const canCreateJob = await monitorDetails.canCreateJob();
+    const missingLicense = await page
+      .waitForSelector('uptimeMLLicenseInfo', { timeout: 10000 })
+      .then(() => true)
+      .catch(() => false);
+    expect(canCreateJob).toBeTruthy();
+    expect(missingLicense).toBeFalsy();
+  });
+
+  step('creates ML job', async () => {
+    await page.click(byTestId('uptimeMLCreateJobBtn'));
+    await page.waitForSelector(byTestId('uptimeMLJobSuccessfullyCreated'), { timeout: 30000 });
+    await page.click(byTestId('toastCloseButton'));
+  });
+
+  step('close anomaly detection flyout', async () => {
+    await page.click(byTestId('cancelSaveAlertButton'));
+  });
+
+  step('open anomaly detection alert', async () => {
+    await monitorDetails.waitAndRefresh(3000);
+    await monitorDetails.openAnomalyDetectionMenu();
+    await page.click(byTestId('uptimeEnableAnomalyAlertBtn'));
+  });
+
+  step('update anomaly detection alert', async () => {
+    await monitorDetails.updateAlert({ id: alertId, threshold: alertThreshold });
+  });
+
+  step('save anomaly detection alert', async () => {
+    await page.click(byTestId('saveAlertButton'));
+    await page.click(byTestId('confirmModalConfirmButton'));
+    await page.waitForSelector(`text=Created rule "${alertId}"`);
+  });
+
+  step('disable anomaly detection alert', async () => {
+    await monitorDetails.waitAndRefresh(5000);
+    await monitorDetails.disableAnomalyDetectionAlert();
+    await delay(1000); // Menu has delay when closing
+    await monitorDetails.disableAnomalyDetection();
+  });
+});
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.ts
new file mode 100644
index 0000000000000..2965c1acf2c2b
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.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 { journey, step, before, Page } from '@elastic/synthetics';
+import { monitorDetailsPageProvider } from '../../page_objects/monitor_details';
+import { byTestId } from '../utils';
+
+const dateRangeStart = '2019-09-10T12:40:08.078Z';
+const dateRangeEnd = '2019-09-11T19:40:08.078Z';
+const monitorId = '0000-intermittent';
+
+journey('MonitorDetails', async ({ page, params }: { page: Page; params: any }) => {
+  const monitorDetails = monitorDetailsPageProvider({ page, kibanaUrl: params.kibanaUrl });
+
+  before(async () => {
+    await monitorDetails.waitForLoadingToFinish();
+  });
+
+  step('go to overview', async () => {
+    await monitorDetails.navigateToOverviewPage({ dateRangeEnd, dateRangeStart });
+  });
+
+  step('login to Kibana', async () => {
+    await monitorDetails.loginToKibana();
+  });
+
+  step('go to monitor details', async () => {
+    await monitorDetails.navigateToMonitorDetails(monitorId);
+    await monitorDetails.waitForLoadingToFinish();
+  });
+
+  step('should select the ping list location filter', async () => {
+    await monitorDetails.selectFilterItem('Location', 'mpls');
+  });
+
+  step('should set the status filter', async () => {
+    await monitorDetails.setStatusFilterUp();
+  });
+
+  step('displays ping data as expected', async () => {
+    await Promise.all(
+      [
+        'XZtoHm0B0I9WX_CznN-6',
+        '7ZtoHm0B0I9WX_CzJ96M',
+        'pptnHm0B0I9WX_Czst5X',
+        'I5tnHm0B0I9WX_CzPd46',
+        'y5tmHm0B0I9WX_Czx93x',
+        'XZtmHm0B0I9WX_CzUt3H',
+        '-JtlHm0B0I9WX_Cz3dyX',
+        'k5tlHm0B0I9WX_CzaNxm',
+        'NZtkHm0B0I9WX_Cz89w9',
+        'zJtkHm0B0I9WX_CzftsN',
+      ].map((id) => page.waitForSelector(byTestId(`"xpack.uptime.pingList.ping-${id}"`)))
+    );
+  });
+});
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts
new file mode 100644
index 0000000000000..ffbc322d7e779
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts
@@ -0,0 +1,73 @@
+/*
+ * 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 { journey, step, expect, before, Page } from '@elastic/synthetics';
+import { makeChecksWithStatus } from '../../helpers/make_checks';
+import { monitorDetailsPageProvider } from '../../page_objects/monitor_details';
+import { byTestId, delay } from '../utils';
+
+journey('MonitorPingRedirects', async ({ page, params }: { page: Page; params: any }) => {
+  const monitorDetails = monitorDetailsPageProvider({ page, kibanaUrl: params.kibanaUrl });
+  const testMonitor = {
+    id: '0000-intermittent',
+    start: 'now-15m',
+    end: 'now',
+    redirects: ['http://localhost:3000/first', 'https://www.washingtonpost.com/'],
+  };
+
+  before(async () => {
+    await monitorDetails.waitForLoadingToFinish();
+    await makeChecksWithStatus(
+      params.getService('es'),
+      testMonitor.id,
+      5,
+      2,
+      10000,
+      {
+        http: {
+          rtt: { total: { us: 157784 } },
+          response: {
+            status_code: 200,
+            redirects: testMonitor.redirects,
+            body: {
+              bytes: 642102,
+              hash: '597a8cfb33ff8e09bff16283306553c3895282aaf5386e1843d466d44979e28a',
+            },
+          },
+        },
+      },
+      'up'
+    );
+    await delay(5000);
+  });
+
+  step('go to monitor-management', async () => {
+    await monitorDetails.navigateToOverviewPage({
+      dateRangeEnd: testMonitor.end,
+      dateRangeStart: testMonitor.start,
+    });
+  });
+
+  step('login to Kibana', async () => {
+    await monitorDetails.loginToKibana();
+  });
+
+  step('go to monitor details', async () => {
+    await monitorDetails.navigateToMonitorDetails(testMonitor.id);
+  });
+
+  step('displays redirect info in detail panel', async () => {
+    await monitorDetails.waitForLoadingToFinish();
+    expect(await monitorDetails.getMonitorRedirects()).toEqual(`${testMonitor.redirects.length}`);
+  });
+
+  step('displays redirects in ping list expand row', async () => {
+    await monitorDetails.expandPingDetails();
+    await monitorDetails.waitForLoadingToFinish();
+    await page.waitForSelector(byTestId('uptimeMonitorPingListRedirectInfo'));
+  });
+});
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts
index 0286f7e898add..d2decba3e9a99 100644
--- a/x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts
@@ -8,6 +8,7 @@
 import { journey, step, expect, before, after, Page } from '@elastic/synthetics';
 import { monitorManagementPageProvider } from '../page_objects/monitor_management';
 import { DataStream } from '../../common/runtime_types/monitor_management';
+import { byTestId } from './utils';
 
 const basicMonitorDetails = {
   location: 'US Central',
@@ -197,6 +198,8 @@ journey('Monitor Management breadcrumbs', async ({ page, params }: { page: Page;
 
   step('edit http monitor and check breadcrumb', async () => {
     await uptime.editMonitor();
+    // breadcrumb is available before edit page is loaded, make sure its edit view
+    await page.waitForSelector(byTestId('monitorManagementMonitorName'));
     const breadcrumbs = await page.$$('[data-test-subj=breadcrumb]');
     expect(await breadcrumbs[1].textContent()).toEqual('Monitor management');
     const lastBreadcrumb = await (await uptime.findByTestSubj('"breadcrumb last"')).textContent();
diff --git a/x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts b/x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts
index 1c3f82c517b82..7a256e1157272 100644
--- a/x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts
@@ -6,11 +6,7 @@
  */
 
 import { journey, step, before } from '@elastic/synthetics';
-import { waitForLoadingToFinish } from './utils';
-
-export const byTestId = (testId: string) => {
-  return `[data-test-subj=${testId}]`;
-};
+import { byTestId, waitForLoadingToFinish } from './utils';
 
 journey('uptime', ({ page, params }) => {
   before(async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/utils.ts b/x-pack/plugins/uptime/e2e/journeys/utils.ts
index 8dbc2699a438f..a042d37a99375 100644
--- a/x-pack/plugins/uptime/e2e/journeys/utils.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/utils.ts
@@ -44,3 +44,11 @@ export const assertText = async ({ page, text }: { page: Page; text: string }) =
 export const assertNotText = async ({ page, text }: { page: Page; text: string }) => {
   expect(await page.$(`text=${text}`)).toBeFalsy();
 };
+
+export const getQuerystring = (params: object) => {
+  return Object.entries(params)
+    .map(([key, value]) => encodeURIComponent(key) + '=' + encodeURIComponent(value))
+    .join('&');
+};
+
+export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx b/x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx
new file mode 100644
index 0000000000000..efadc26a383c0
--- /dev/null
+++ b/x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx
@@ -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 { Page } from '@elastic/synthetics';
+import { byTestId, delay } from '../journeys/utils';
+import { monitorManagementPageProvider } from './monitor_management';
+
+interface AlertType {
+  id: string;
+  threshold: string;
+}
+
+export function monitorDetailsPageProvider({ page, kibanaUrl }: { page: Page; kibanaUrl: string }) {
+  return {
+    ...monitorManagementPageProvider({ page, kibanaUrl }),
+
+    async navigateToMonitorDetails(monitorId: string) {
+      await page.click(byTestId(`monitor-page-link-${monitorId}`));
+    },
+
+    async selectFilterItem(filterType: string, itemArg: string | string[]) {
+      const itemList = Array.isArray(itemArg) ? itemArg : [itemArg];
+      await page.click(`[aria-label="expands filter group for ${filterType} filter"]`);
+      await this.clickFilterItems(itemList);
+      return this.applyFilterItems(filterType);
+    },
+
+    async clickFilterItems(itemList: string[]) {
+      for (const title of itemList) {
+        await page.click(`li[title="${title}"]`);
+      }
+    },
+
+    async applyFilterItems(filterType: string) {
+      await page.click(`[aria-label="Apply the selected filters for ${filterType}"]`);
+    },
+
+    async setStatusFilterUp() {
+      await page.click('[data-test-subj="xpack.uptime.filterBar.filterStatusUp"]');
+    },
+
+    async setStatusFilterDown() {
+      await page.click('[data-test-subj="xpack.uptime.filterBar.filterStatusDown"]');
+    },
+
+    async refreshFromES() {
+      await this.byTestId('superDatePickerApplyTimeButton');
+    },
+
+    async enableAnomalyDetection() {
+      await page.click(byTestId('uptimeEnableAnomalyBtn'));
+    },
+
+    async getMonitorRedirects() {
+      return await page.textContent(byTestId('uptimeMonitorRedirectInfo'));
+    },
+
+    async expandPingDetails() {
+      await page.click(byTestId('uptimePingListExpandBtn'));
+    },
+
+    async ensureAnomalyDetectionFlyoutIsOpen() {
+      await page.waitForSelector(byTestId('uptimeMLFlyout'));
+    },
+
+    async isMLMenuVisible() {
+      return await page.isVisible(byTestId('uptimeManageMLContextMenu'), {
+        timeout: 3000,
+      });
+    },
+
+    async canCreateJob(): Promise<boolean> {
+      await this.ensureAnomalyDetectionFlyoutIsOpen();
+      const createJobBtn = await page.$(byTestId('uptimeMLCreateJobBtn'));
+      return await createJobBtn!.isEnabled();
+    },
+
+    async openAnomalyDetectionMenu() {
+      const visible = await this.isMLMenuVisible();
+      if (visible === false) {
+        await page.click(byTestId('uptimeManageMLJobBtn'), { timeout: 5000 });
+      }
+    },
+
+    async closeAnomalyDetectionMenu() {
+      if ((await this.isMLMenuVisible()) === true) {
+        await page.click(byTestId('uptimeManageMLJobBtn'), { timeout: 5000 });
+      }
+    },
+
+    async waitAndRefresh(timeout?: number) {
+      await delay(timeout ?? 1000);
+      await this.refreshFromES();
+      await this.waitForLoadingToFinish();
+    },
+
+    async updateAlert({ id, threshold }: AlertType) {
+      await this.fillByTestSubj('alertNameInput', id);
+      await this.selectAlertThreshold(threshold);
+    },
+
+    async selectAlertThreshold(threshold: string) {
+      await this.clickByTestSubj('uptimeAnomalySeverity');
+      await this.clickByTestSubj('anomalySeveritySelect');
+      await page.click(`text=${threshold}`);
+    },
+
+    async disableAnomalyDetection() {
+      await this.openAnomalyDetectionMenu();
+      await page.click(byTestId('uptimeDeleteMLJobBtn'), { timeout: 10000 });
+      await page.click(byTestId('confirmModalConfirmButton'));
+      await page.waitForSelector('text=Job deleted');
+      await this.closeAnomalyDetectionMenu();
+    },
+
+    async disableAnomalyDetectionAlert() {
+      await this.openAnomalyDetectionMenu();
+      await page.click(byTestId('uptimeManageAnomalyAlertBtn'), { timeout: 10000 });
+      await page.click(byTestId('uptimeDisableAnomalyAlertBtn'));
+      await page.click(byTestId('confirmModalConfirmButton'));
+      await page.waitForSelector('text=Rule successfully disabled!');
+      await this.closeAnomalyDetectionMenu();
+    },
+  };
+}
diff --git a/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx b/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
index 384242bc9af70..ab21a372681f3 100644
--- a/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
+++ b/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
@@ -7,6 +7,7 @@
 
 import { Page } from '@elastic/synthetics';
 import { DataStream } from '../../common/runtime_types/monitor_management';
+import { getQuerystring } from '../journeys/utils';
 import { loginPageProvider } from './login';
 import { utilsPageProvider } from './utils';
 
@@ -46,8 +47,8 @@ export function monitorManagementPageProvider({
       });
     },
 
-    async navigateToOverviewPage() {
-      await page.goto(overview, {
+    async navigateToOverviewPage(options?: object) {
+      await page.goto(`${overview}${options ? `?${getQuerystring(options)}` : ''}`, {
         waitUntil: 'networkidle',
       });
     },
@@ -62,7 +63,7 @@ export function monitorManagementPageProvider({
     },
 
     async editMonitor() {
-      await this.clickByTestSubj('monitorManagementEditMonitor');
+      await page.click(this.byTestId('monitorManagementEditMonitor'), { delay: 800 });
     },
 
     async findMonitorConfiguration(monitorConfig: Record<string, string>) {
diff --git a/x-pack/plugins/uptime/e2e/playwright_start.ts b/x-pack/plugins/uptime/e2e/playwright_start.ts
index cb616be66b7c9..9108412405602 100644
--- a/x-pack/plugins/uptime/e2e/playwright_start.ts
+++ b/x-pack/plugins/uptime/e2e/playwright_start.ts
@@ -15,26 +15,12 @@ import './journeys';
 import { createApmAndObsUsersAndRoles } from '../../apm/scripts/create_apm_users_and_roles/create_apm_users_and_roles';
 import { importMonitors } from './tasks/import_monitors';
 
-const listOfJourneys = [
-  'uptime',
-  'StepsDuration',
-  'TlsFlyoutInAlertingApp',
-  'StatusFlyoutInAlertingApp',
-  'DefaultEmailSettings',
-  'MonitorManagement-http',
-  'MonitorManagement-tcp',
-  'MonitorManagement-icmp',
-  'MonitorManagement-browser',
-  'MonitorManagement breadcrumbs',
-  'Monitor Management read only user',
-] as const;
-
 export function playwrightRunTests({ headless, match }: { headless: boolean; match?: string }) {
   return async ({ getService }: any) => {
-    const result = await playwrightStart(getService, headless, match);
+    const results = await playwrightStart(getService, headless, match);
 
-    listOfJourneys.forEach((journey) => {
-      if (result?.[journey] && result[journey].status !== 'succeeded') {
+    Object.entries(results).forEach(([_journey, result]) => {
+      if (result.status !== 'succeeded') {
         throw new Error('Tests failed');
       }
     });
@@ -66,7 +52,7 @@ async function playwrightStart(getService: any, headless = true, match?: string)
   });
 
   const res = await playwrightRun({
-    params: { kibanaUrl },
+    params: { kibanaUrl, getService },
     playwrightOptions: { headless, chromiumSandbox: false, timeout: 60 * 1000 },
     match: match === 'undefined' ? '' : match,
   });
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
index df0abcb88180b..1176ea5e6a5c3 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
@@ -75,7 +75,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
   const button = (
     <EuiButton
       data-test-subj={hasMLJob ? 'uptimeManageMLJobBtn' : 'uptimeEnableAnomalyBtn'}
-      onClick={hasMLJob ? () => setIsPopOverOpen(true) : onEnableJob}
+      onClick={hasMLJob ? () => setIsPopOverOpen(!isPopOverOpen) : onEnableJob}
       disabled={hasMLJob && !canDeleteMLJob}
       isLoading={showLoading}
       size="s"
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index d36f8124599fe..6ecf87f88b8be 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -61,10 +61,6 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
       loadTestFile(require.resolve('./certificates'));
     });
 
-    describe('with generated data but no data reset', () => {
-      loadTestFile(require.resolve('./ping_redirects'));
-    });
-
     describe('with real-world data', () => {
       before(async () => {
         await esArchiver.unload(ARCHIVE);
@@ -75,7 +71,6 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
       after(async () => await esArchiver.unload(ARCHIVE));
 
       loadTestFile(require.resolve('./overview'));
-      loadTestFile(require.resolve('./monitor'));
       loadTestFile(require.resolve('./ml_anomaly'));
       loadTestFile(require.resolve('./feature_controls'));
     });
diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts
deleted file mode 100644
index de88bd12a00fb..0000000000000
--- a/x-pack/test/functional/apps/uptime/monitor.ts
+++ /dev/null
@@ -1,60 +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 { FtrProviderContext } from '../../ftr_provider_context';
-
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  const esArchiver = getService('esArchiver');
-  const uptimeService = getService('uptime');
-  const { uptime } = getPageObjects(['uptime']);
-  const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
-
-  describe('monitor page', function () {
-    this.tags(['skipFirefox']);
-    const dateStart = 'Sep 10, 2019 @ 12:40:08.078';
-    const dateEnd = 'Sep 11, 2019 @ 19:40:08.078';
-    const monitorId = '0000-intermittent';
-
-    before(async () => {
-      await esArchiver.loadIfNeeded(archive);
-      await uptimeService.navigation.goToUptime();
-    });
-
-    after(async () => {
-      await esArchiver.unload(archive);
-    });
-
-    describe('navigation to monitor page', () => {
-      before(async () => {
-        await uptime.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId);
-      });
-
-      it('should select the ping list location filter', async () => {
-        await uptimeService.common.selectFilterItem('Location', 'mpls');
-      });
-
-      it('should set the status filter', async () => {
-        await uptimeService.common.setStatusFilterUp();
-      });
-
-      it('displays ping data as expected', async () => {
-        await uptime.checkPingListInteractions([
-          'XZtoHm0B0I9WX_CznN-6',
-          '7ZtoHm0B0I9WX_CzJ96M',
-          'pptnHm0B0I9WX_Czst5X',
-          'I5tnHm0B0I9WX_CzPd46',
-          'y5tmHm0B0I9WX_Czx93x',
-          'XZtmHm0B0I9WX_CzUt3H',
-          '-JtlHm0B0I9WX_Cz3dyX',
-          'k5tlHm0B0I9WX_CzaNxm',
-          'NZtkHm0B0I9WX_Cz89w9',
-          'zJtkHm0B0I9WX_CzftsN',
-        ]);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/functional/apps/uptime/ping_redirects.ts b/x-pack/test/functional/apps/uptime/ping_redirects.ts
deleted file mode 100644
index 06352d37ada28..0000000000000
--- a/x-pack/test/functional/apps/uptime/ping_redirects.ts
+++ /dev/null
@@ -1,76 +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 { makeChecksWithStatus } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  const { uptime: uptimePage, header } = getPageObjects(['uptime', 'header']);
-  const uptime = getService('uptime');
-  const esArchiver = getService('esArchiver');
-
-  const archive = 'x-pack/test/functional/es_archives/uptime/blank';
-
-  const monitor = () => uptime.monitor;
-
-  // FLAKY: https://github.com/elastic/kibana/issues/118476
-  describe.skip('Ping redirects', () => {
-    const start = '~ 15 minutes ago';
-    const end = 'now';
-
-    const MONITOR_ID = 'redirect-testing-id';
-
-    before(async () => {
-      await esArchiver.loadIfNeeded(archive);
-    });
-
-    after('unload', async () => {
-      await esArchiver.unload(archive);
-    });
-
-    beforeEach(async () => {
-      await makeChecksWithStatus(
-        getService('es'),
-        MONITOR_ID,
-        5,
-        2,
-        10000,
-        {
-          http: {
-            rtt: { total: { us: 157784 } },
-            response: {
-              status_code: 200,
-              redirects: ['http://localhost:3000/first', 'https://www.washingtonpost.com/'],
-              body: {
-                bytes: 642102,
-                hash: '597a8cfb33ff8e09bff16283306553c3895282aaf5386e1843d466d44979e28a',
-              },
-            },
-          },
-        },
-        'up'
-      );
-      await delay(1000);
-    });
-
-    it('loads and goes to details page', async () => {
-      await uptime.navigation.goToUptime();
-      await uptimePage.loadDataAndGoToMonitorPage(start, end, MONITOR_ID);
-    });
-
-    it('display redirect info in detail panel', async () => {
-      await header.waitUntilLoadingHasFinished();
-      await monitor().hasRedirectInfo();
-    });
-
-    it('displays redirects in ping list expand row', async () => {
-      await monitor().hasRedirectInfoInPingList();
-    });
-  });
-};
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/anomaly_alert.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/anomaly_alert.ts
deleted file mode 100644
index 6f65c620b527c..0000000000000
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/anomaly_alert.ts
+++ /dev/null
@@ -1,134 +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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  // FLAKY: https://github.com/elastic/kibana/issues/111667
-  describe.skip('uptime anomaly alert', () => {
-    const pageObjects = getPageObjects(['common', 'uptime']);
-    const supertest = getService('supertest');
-    const retry = getService('retry');
-
-    const monitorId = '0000-intermittent';
-
-    const uptime = getService('uptime');
-
-    const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
-    const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
-    let alerts: any;
-    const alertId = 'uptime-anomaly-alert';
-
-    before(async () => {
-      alerts = getService('uptime').alerts;
-
-      await uptime.navigation.goToUptime();
-
-      await uptime.navigation.loadDataAndGoToMonitorPage(
-        DEFAULT_DATE_START,
-        DEFAULT_DATE_END,
-        monitorId
-      );
-    });
-
-    it('can delete existing job', async () => {
-      if (await uptime.ml.alreadyHasJob()) {
-        await uptime.ml.openMLManageMenu();
-        await uptime.ml.deleteMLJob();
-        await uptime.navigation.refreshApp();
-      }
-    });
-
-    it('can open ml flyout', async () => {
-      await uptime.ml.openMLFlyout();
-    });
-
-    it('has permission to  create job', async () => {
-      expect(uptime.ml.canCreateJob()).to.eql(true);
-      expect(uptime.ml.hasNoLicenseInfo()).to.eql(false);
-    });
-
-    it('can create job successfully', async () => {
-      await uptime.ml.createMLJob();
-      await pageObjects.common.closeToast();
-      await uptime.ml.cancelAlertFlyout();
-    });
-
-    it('can open ML Manage Menu', async () => {
-      await uptime.ml.openMLManageMenu();
-    });
-
-    it('can open anomaly alert flyout', async () => {
-      await uptime.ml.openAlertFlyout();
-    });
-
-    it('can set alert name', async () => {
-      await alerts.setAlertName(alertId);
-    });
-
-    it('can set alert tags', async () => {
-      await alerts.setAlertTags(['uptime', 'anomaly-alert']);
-    });
-
-    it('can change anomaly alert threshold', async () => {
-      await uptime.ml.changeAlertThreshold('major');
-    });
-
-    it('can save alert', async () => {
-      await alerts.clickSaveAlertButton();
-      await alerts.clickSaveAlertsConfirmButton();
-      await pageObjects.common.closeToast();
-    });
-
-    it('has created a valid alert with expected parameters', async () => {
-      let alert: any;
-      await retry.tryForTime(15000, async () => {
-        const apiResponse = await supertest.get(`/api/alerts/_find?search=${alertId}`);
-        const alertsFromThisTest = apiResponse.body.data.filter(
-          ({ name }: { name: string }) => name === alertId
-        );
-        expect(alertsFromThisTest).to.have.length(1);
-        alert = alertsFromThisTest[0];
-      });
-
-      // Ensure the parameters and other stateful data
-      // on the alert match up with the values we provided
-      // for our test helper to input into the flyout.
-      const { actions, alertTypeId, consumer, id, params, tags } = alert;
-      try {
-        expect(actions).to.eql([]);
-        expect(alertTypeId).to.eql('xpack.uptime.alerts.durationAnomaly');
-        expect(consumer).to.eql('uptime');
-        expect(tags).to.eql(['uptime', 'anomaly-alert']);
-        expect(params.monitorId).to.eql(monitorId);
-        expect(params.severity).to.eql(50);
-      } finally {
-        await supertest.delete(`/api/alerts/alert/${id}`).set('kbn-xsrf', 'true').expect(204);
-      }
-    });
-
-    it('change button to disable anomaly alert', async () => {
-      await uptime.ml.openMLManageMenu();
-      expect(uptime.ml.manageAnomalyAlertIsVisible()).to.eql(true);
-    });
-
-    it('can delete job successfully', async () => {
-      await uptime.ml.deleteMLJob();
-    });
-
-    it('verifies that alert is also deleted', async () => {
-      await retry.tryForTime(15000, async () => {
-        const apiResponse = await supertest.get(`/api/alerts/_find?search=${alertId}`);
-        const alertsFromThisTest = apiResponse.body.data.filter(
-          ({ name }: { name: string }) => name === alertId
-        );
-        expect(alertsFromThisTest).to.have.length(0);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
index 222dcd22d6f86..d2078267bde85 100644
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
@@ -24,7 +24,6 @@ export default ({ getService, loadTestFile }: FtrProviderContext) => {
       after(async () => await esArchiver.unload(ARCHIVE));
 
       loadTestFile(require.resolve('./alert_flyout'));
-      loadTestFile(require.resolve('./anomaly_alert'));
       loadTestFile(require.resolve('./simple_down_alert'));
     });
   });