Merge branch 'tech-debt/rename_examples' of github.com:clintandrewhall/kibana into tech-debt/rename_examples

Author: clintandrewhall

src/plugins/discover/public/application/angular/context/api/utils/date_conversion.ts

@@ -31,15 +31,6 @@ export function extractNanos(timeFieldValue: string = ''): string {
   return fractionSeconds.length !== 9 ? fractionSeconds.padEnd(9, '0') : fractionSeconds;
 }
 
-/**
- * extract the nanoseconds as string of a given ISO formatted timestamp
- */
-export function convertIsoToNanosAsStr(isoValue: string): string {
-  const nanos = extractNanos(isoValue);
-  const millis = convertIsoToMillis(isoValue);
-  return `${millis}${nanos.substr(3, 6)}`;
-}
-
 /**
  * convert an iso formatted string to number of milliseconds since
  * 1970-01-01T00:00:00.000Z

src/plugins/discover/public/application/angular/context/api/utils/get_es_query_search_after.ts

@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { convertIsoToNanosAsStr } from './date_conversion';
 import { SurrDocType, EsHitRecordList, EsHitRecord } from '../context';
 
 export type EsQuerySearchAfter = [string | number, string | number];
@@ -38,15 +37,10 @@ export function getEsQuerySearchAfter(
     // already surrounding docs -> first or last record  is used
     const afterTimeRecIdx = type === 'successors' && documents.length ? documents.length - 1 : 0;
     const afterTimeDoc = documents[afterTimeRecIdx];
-    const afterTimeValue = nanoSeconds
-      ? convertIsoToNanosAsStr(afterTimeDoc.fields[timeFieldName][0])
-      : afterTimeDoc.sort[0];
+    const afterTimeValue = nanoSeconds ? afterTimeDoc._source[timeFieldName] : afterTimeDoc.sort[0];
     return [afterTimeValue, afterTimeDoc.sort[1]];
   }
   // if data_nanos adapt timestamp value for sorting, since numeric value was rounded by browser
   // ES search_after also works when number is provided as string
-  return [
-    nanoSeconds ? convertIsoToNanosAsStr(anchor.fields[timeFieldName][0]) : anchor.sort[0],
-    anchor.sort[1],
-  ];
+  return [nanoSeconds ? anchor._source[timeFieldName] : anchor.sort[0], anchor.sort[1]];
 }

test/functional/apps/context/_date_nanos.js

@@ -30,8 +30,7 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['common', 'context', 'timePicker', 'discover']);
   const esArchiver = getService('esArchiver');
 
-  // FLAKY/FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/58815
-  describe.skip('context view for date_nanos', () => {
+  describe('context view for date_nanos', () => {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']);
       await esArchiver.loadIfNeeded('date_nanos');

test/functional/apps/context/_date_nanos_custom_timestamp.js

@@ -30,10 +30,7 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['common', 'context', 'timePicker', 'discover']);
   const esArchiver = getService('esArchiver');
 
-  // skipped due to a recent change in ES that caused search_after queries with data containing
-  // custom timestamp formats like in the testdata to fail
-  // https://github.com/elastic/kibana/issues/58815
-  describe.skip('context view for date_nanos with custom timestamp', () => {
+  describe('context view for date_nanos with custom timestamp', () => {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_custom']);
       await esArchiver.loadIfNeeded('date_nanos_custom');

test/functional/page_objects/discover_page.ts

@@ -17,11 +17,9 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function DiscoverPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const find = getService('find');
@@ -51,19 +49,25 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     public async saveSearch(searchName: string) {
-      log.debug('saveSearch');
       await this.clickSaveSearchButton();
-      await testSubjects.setValue('savedObjectTitle', searchName);
+      // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
+      await retry.waitFor(
+        `saved search title is set to ${searchName} and save button is clickable`,
+        async () => {
+          const saveButton = await testSubjects.find('confirmSaveSavedObjectButton');
+          await testSubjects.setValue('savedObjectTitle', searchName);
+          return (await saveButton.getAttribute('disabled')) !== 'true';
+        }
+      );
       await testSubjects.click('confirmSaveSavedObjectButton');
       await header.waitUntilLoadingHasFinished();
       // LeeDr - this additional checking for the saved search name was an attempt
       // to cause this method to wait for the reloading of the page to complete so
       // that the next action wouldn't have to retry.  But it doesn't really solve
       // that issue.  But it does typically take about 3 retries to
       // complete with the expected searchName.
-      await retry.try(async () => {
-        const name = await this.getCurrentQueryName();
-        expect(name).to.be(searchName);
+      await retry.waitFor(`saved search was persisted with name ${searchName}`, async () => {
+        return (await this.getCurrentQueryName()) === searchName;
       });
     }
 
@@ -96,11 +100,11 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
 
       // We need this try loop here because previous actions in Discover like
       // saving a search cause reloading of the page and the "Open" menu item goes stale.
-      await retry.try(async () => {
+      await retry.waitFor('saved search panel is opened', async () => {
         await this.clickLoadSavedSearchButton();
         await header.waitUntilLoadingHasFinished();
         isOpen = await testSubjects.exists('loadSearchForm');
-        expect(isOpen).to.be(true);
+        return isOpen === true;
       });
     }
 

x-pack/plugins/apm/common/processor_event.ts

@@ -8,4 +8,18 @@ export enum ProcessorEvent {
   transaction = 'transaction',
   error = 'error',
   metric = 'metric',
+  span = 'span',
+  onboarding = 'onboarding',
+  sourcemap = 'sourcemap',
 }
+/**
+ * Processor events that are searchable in the UI via the query bar.
+ *
+ * Some client-sideroutes will define 1 or more processor events that
+ * will be used to fetch the dynamic index pattern for the query bar.
+ */
+
+export type UIProcessorEvent =
+  | ProcessorEvent.transaction
+  | ProcessorEvent.error
+  | ProcessorEvent.metric;

x-pack/plugins/apm/common/projections.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export enum Projection {
+  services = 'services',
+  transactionGroups = 'transactionGroups',
+  traces = 'traces',
+  transactions = 'transactions',
+  metrics = 'metrics',
+  errorGroups = 'errorGroups',
+  serviceNodes = 'serviceNodes',
+  rumOverview = 'rumOverview',
+}

x-pack/plugins/apm/common/projections/services.ts

@@ -14,7 +14,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { useFetcher } from '../../../hooks/useFetcher';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { callApmApi } from '../../../services/rest/createCallApmApi';
@@ -79,7 +79,7 @@ function ErrorGroupOverview() {
       params: {
         serviceName,
       },
-      projection: PROJECTION.ERROR_GROUPS,
+      projection: Projection.errorGroups,
     };
 
     return config;

x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx

@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 import { useTrackPageview } from '../../../../../observability/public';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { RumDashboard } from './RumDashboard';
 import { ServiceNameFilter } from '../../shared/LocalUIFilters/ServiceNameFilter';
 import { useUrlParams } from '../../../hooks/useUrlParams';
@@ -28,7 +28,7 @@ export function RumOverview() {
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
       filterNames: ['transactionUrl', 'location', 'device', 'os', 'browser'],
-      projection: PROJECTION.RUM_OVERVIEW,
+      projection: Projection.rumOverview,
     };
 
     return config;