Merge branch 'master' of github.com:elastic/kibana into fix/determine-correct-merge-base

Author: spalger

docs/settings/apm-settings.asciidoc

@@ -43,29 +43,29 @@ Changing these settings may disable features of the APM App.
 | `xpack.apm.enabled`
   | Set to `false` to disable the APM app. Defaults to `true`.
 
-| `xpack.apm.ui.enabled`
+| `xpack.apm.ui.enabled` {ess-icon}
   | Set to `false` to hide the APM app from the menu. Defaults to `true`.
 
 | `xpack.apm.ui.transactionGroupBucketSize`
   | Number of top transaction groups displayed in the APM app. Defaults to `100`.
 
-| `xpack.apm.ui.maxTraceItems`
+| `xpack.apm.ui.maxTraceItems` {ess-icon}
   | Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
 
-| `apm_oss.indexPattern`
+| `apm_oss.indexPattern` {ess-icon}
   | The index pattern used for integrations with Machine Learning and Query Bar.
   It must match all apm indices. Defaults to `apm-*`.
 
-| `apm_oss.errorIndices`
+| `apm_oss.errorIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `apm-*`.
 
 | `apm_oss.onboardingIndices`
   | Matcher for all onboarding indices. Defaults to `apm-*`.
 
-| `apm_oss.spanIndices`
+| `apm_oss.spanIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `apm-*`.
 
-| `apm_oss.transactionIndices`
+| `apm_oss.transactionIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `apm-*`.
 
 | `apm_oss.metricsIndices`

test/functional/page_objects/home_page.ts

@@ -53,8 +53,7 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont
 
     async removeSampleDataSet(id: string) {
       // looks like overkill but we're hitting flaky cases where we click but it doesn't remove
-      await testSubjects.isDisplayed(`removeSampleDataSet${id}`);
-      await testSubjects.isEnabled(`removeSampleDataSet${id}`);
+      await testSubjects.waitForEnabled(`removeSampleDataSet${id}`);
       await testSubjects.click(`removeSampleDataSet${id}`);
       await this._waitForSampleDataLoadingAction(id);
     }

test/functional/services/common/test_subjects.ts

@@ -97,12 +97,10 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     }
 
     public async append(selector: string, text: string): Promise<void> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.append(${selector}, ${text})`);
-        const input = await this.find(selector);
-        await input.click();
-        await input.type(text);
-      });
+      log.debug(`TestSubjects.append(${selector}, ${text})`);
+      const input = await this.find(selector);
+      await input.click();
+      await input.type(text);
     }
 
     public async clickWhenNotDisabled(
@@ -119,12 +117,10 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     }
 
     public async doubleClick(selector: string, timeout: number = FIND_TIME): Promise<void> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.doubleClick(${selector})`);
-        const element = await this.find(selector, timeout);
-        await element.moveMouseTo();
-        await element.doubleClick();
-      });
+      log.debug(`TestSubjects.doubleClick(${selector})`);
+      const element = await this.find(selector, timeout);
+      await element.moveMouseTo();
+      await element.doubleClick();
     }
 
     async descendantExists(selector: string, parentElement: WebElementWrapper): Promise<boolean> {
@@ -210,27 +206,21 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     }
 
     public async isEnabled(selector: string): Promise<boolean> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.isEnabled(${selector})`);
-        const element = await this.find(selector);
-        return await element.isEnabled();
-      });
+      log.debug(`TestSubjects.isEnabled(${selector})`);
+      const element = await this.find(selector);
+      return await element.isEnabled();
     }
 
     public async isDisplayed(selector: string): Promise<boolean> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.isDisplayed(${selector})`);
-        const element = await this.find(selector);
-        return await element.isDisplayed();
-      });
+      log.debug(`TestSubjects.isDisplayed(${selector})`);
+      const element = await this.find(selector);
+      return await element.isDisplayed();
     }
 
     public async isSelected(selector: string): Promise<boolean> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.isSelected(${selector})`);
-        const element = await this.find(selector);
-        return await element.isSelected();
-      });
+      log.debug(`TestSubjects.isSelected(${selector})`);
+      const element = await this.find(selector);
+      return await element.isSelected();
     }
 
     public async isSelectedAll(selectorAll: string): Promise<boolean[]> {
@@ -241,11 +231,9 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     }
 
     public async getVisibleText(selector: string): Promise<string> {
-      return await retry.try(async () => {
-        log.debug(`TestSubjects.getVisibleText(${selector})`);
-        const element = await this.find(selector);
-        return await element.getVisibleText();
-      });
+      log.debug(`TestSubjects.getVisibleText(${selector})`);
+      const element = await this.find(selector);
+      return await element.getVisibleText();
     }
 
     async getVisibleTextAll(selectorAll: string): Promise<string[]> {
@@ -298,6 +286,13 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
       await find.waitForElementHidden(element, timeout);
     }
 
+    public async waitForEnabled(selector: string, timeout: number = TRY_TIME): Promise<void> {
+      await retry.tryForTime(timeout, async () => {
+        const element = await this.find(selector);
+        return (await element.isDisplayed()) && (await element.isEnabled());
+      });
+    }
+
     public getCssSelector(selector: string): string {
       return testSubjSelector(selector);
     }

x-pack/legacy/plugins/reporting/common/get_absolute_url.ts

@@ -5,7 +5,13 @@
  */
 
 import url from 'url';
-import { AbsoluteURLFactoryOptions } from '../types';
+
+interface AbsoluteURLFactoryOptions {
+  defaultBasePath: string;
+  protocol: string;
+  hostname: string;
+  port: string | number;
+}
 
 export const getAbsoluteUrlFactory = ({
   protocol,

x-pack/legacy/plugins/reporting/export_types/common/constants.ts

@@ -4,9 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const LayoutTypes = {
-  PRESERVE_LAYOUT: 'preserve_layout',
-  PRINT: 'print',
-};
-
 export const DEFAULT_PAGELOAD_SELECTOR = '.application';

x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts

@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { cryptoFactory } from '../../../server/lib/crypto';
-import { Logger } from '../../../types';
+import { cryptoFactory, LevelLogger } from '../../../server/lib';
 import { decryptJobHeaders } from './decrypt_job_headers';
 
 const encryptHeaders = async (encryptionKey: string, headers: Record<string, string>) => {
@@ -23,7 +22,7 @@ describe('headers', () => {
         },
         logger: ({
           error: jest.fn(),
-        } as unknown) as Logger,
+        } as unknown) as LevelLogger,
       });
     await expect(getDecryptedHeaders()).rejects.toMatchInlineSnapshot(
       `[Error: Failed to decrypt report job data. Please ensure that xpack.reporting.encryptionKey is set and re-generate this report. Error: Invalid IV length]`
@@ -44,7 +43,7 @@ describe('headers', () => {
         type: 'csv',
         headers: encryptedHeaders,
       },
-      logger: {} as Logger,
+      logger: {} as LevelLogger,
     });
     expect(decryptedHeaders).toEqual(headers);
   });

x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts

@@ -5,8 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { cryptoFactory } from '../../../server/lib/crypto';
-import { Logger } from '../../../types';
+import { cryptoFactory, LevelLogger } from '../../../server/lib';
 
 interface HasEncryptedHeaders {
   headers?: string;
@@ -23,7 +22,7 @@ export const decryptJobHeaders = async <
 }: {
   encryptionKey?: string;
   job: JobDocPayloadType;
-  logger: Logger;
+  logger: LevelLogger;
 }): Promise<Record<string, string>> => {
   try {
     if (typeof job.headers !== 'string') {

x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts

@@ -5,9 +5,9 @@
  */
 
 import sinon from 'sinon';
+import { ReportingConfig, ReportingCore } from '../../../server';
+import { JobDocPayload } from '../../../server/types';
 import { createMockReportingCore } from '../../../test_helpers';
-import { ReportingConfig, ReportingCore } from '../../../server/types';
-import { JobDocPayload } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './index';
 

x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts

@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ReportingConfig } from '../../../server/types';
-import { ConditionalHeaders } from '../../../types';
+import { ReportingConfig } from '../../../server';
+import { ConditionalHeaders } from '../../../server/types';
 
 export const getConditionalHeaders = <JobDocPayloadType>({
   config,

x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts

@@ -5,8 +5,8 @@
  */
 
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
-import { ReportingConfig, ReportingCore } from '../../../server/types';
-import { ConditionalHeaders } from '../../../types';
+import { ReportingConfig, ReportingCore } from '../../../server';
+import { ConditionalHeaders } from '../../../server/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({