Merge branch 'master' into ftr/remove-retry-usage-in-testSubjects

.github/CODEOWNERS

@@ -164,7 +164,6 @@
 
 # Pulse
 /packages/kbn-analytics/ @elastic/pulse
-/src/legacy/core_plugins/ui_metric/ @elastic/pulse
 /src/plugins/kibana_usage_collection/ @elastic/pulse
 /src/plugins/newsfeed/ @elastic/pulse
 /src/plugins/telemetry/ @elastic/pulse

src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts

@@ -299,6 +299,13 @@ export class IndexPattern implements IIndexPattern {
   }
 
   async popularizeField(fieldName: string, unit = 1) {
+    /**
+     * This function is just used by Discover and it's high likely to be removed in the near future
+     * It doesn't use the save function to skip the error message that's displayed when
+     * a user adds several columns in a higher frequency that the changes can be persisted to ES
+     * resulting in 409 errors
+     */
+    if (!this.id) return;
     const field = this.fields.getByName(fieldName);
     if (!field) {
       return;
@@ -308,7 +315,15 @@ export class IndexPattern implements IIndexPattern {
       return;
     }
     field.count = count;
-    await this.save();
+
+    try {
+      const res = await this.savedObjectsClient.update(type, this.id, this.prepBody(), {
+        version: this.version,
+      });
+      this.version = res._version;
+    } catch (e) {
+      // no need for an error message here
+    }
   }
 
   getNonScriptedFields() {

x-pack/plugins/apm/public/application/index.tsx

@@ -24,7 +24,7 @@ import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
 import { APMIndicesPermission } from '../components/app/APMIndicesPermission';
 import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
 import { routes } from '../components/app/Main/route_config';
-import { history } from '../utils/history';
+import { history, resetHistory } from '../utils/history';
 import { ConfigSchema } from '..';
 import 'react-vis/dist/style.css';
 
@@ -111,6 +111,7 @@ export const renderApp = (
   { element }: AppMountParameters,
   config: ConfigSchema
 ) => {
+  resetHistory();
   ReactDOM.render(
     <ApmAppRoot
       core={core}
@@ -120,5 +121,7 @@ export const renderApp = (
     />,
     element
   );
-  return () => ReactDOM.unmountComponentAtNode(element);
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
 };

x-pack/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/sections.ts

@@ -16,11 +16,15 @@ import {
   AGENT,
   URL,
   USER,
-  CUSTOM_ERROR
+  CUSTOM_ERROR,
+  TRACE,
+  TRANSACTION
 } from '../sections';
 
 export const ERROR_METADATA_SECTIONS: Section[] = [
   { ...LABELS, required: true },
+  TRACE,
+  TRANSACTION,
   ERROR,
   HTTP,
   HOST,

x-pack/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts

@@ -17,9 +17,9 @@ import {
 
 export const SPAN_METADATA_SECTIONS: Section[] = [
   LABELS,
-  SPAN,
-  TRANSACTION,
   TRACE,
+  TRANSACTION,
+  SPAN,
   SERVICE,
   MESSAGE_SPAN,
   AGENT

x-pack/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts

@@ -20,11 +20,13 @@ import {
   USER,
   USER_AGENT,
   CUSTOM_TRANSACTION,
-  MESSAGE_TRANSACTION
+  MESSAGE_TRANSACTION,
+  TRACE
 } from '../sections';
 
 export const TRANSACTION_METADATA_SECTIONS: Section[] = [
   { ...LABELS, required: true },
+  TRACE,
   TRANSACTION,
   HTTP,
   HOST,

x-pack/plugins/apm/public/components/shared/MetadataTable/sections.ts

@@ -118,7 +118,8 @@ export const TRACE: Section = {
   key: 'trace',
   label: i18n.translate('xpack.apm.metadataTable.section.traceLabel', {
     defaultMessage: 'Trace'
-  })
+  }),
+  properties: ['id']
 };
 
 export const ERROR: Section = {

x-pack/plugins/apm/public/utils/history.ts

@@ -8,6 +8,10 @@ import { createHashHistory } from 'history';
 
 // Make history singleton available across APM project
 // TODO: Explore using React context or hook instead?
-const history = createHashHistory();
+let history = createHashHistory();
+
+export const resetHistory = () => {
+  history = createHashHistory();
+};
 
 export { history };

x-pack/plugins/apm/server/routes/services.ts

@@ -7,7 +7,6 @@
 import * as t from 'io-ts';
 import Boom from 'boom';
 import { unique } from 'lodash';
-import { ScopedAnnotationsClient } from '../../../observability/server';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAgentName } from '../lib/services/get_service_agent_name';
 import { getServices } from '../lib/services/get_services';
@@ -95,13 +94,10 @@ export const serviceAnnotationsRoute = createRoute(() => ({
     const { serviceName } = context.params.path;
     const { environment } = context.params.query;
 
-    let annotationsClient: ScopedAnnotationsClient | undefined;
-
-    if (context.plugins.observability) {
-      annotationsClient = await context.plugins.observability.getScopedAnnotationsClient(
-        request
-      );
-    }
+    const annotationsClient = await context.plugins.observability?.getScopedAnnotationsClient(
+      context,
+      request
+    );
 
     return getServiceAnnotations({
       setup,
@@ -143,6 +139,7 @@ export const serviceAnnotationsCreateRoute = createRoute(() => ({
   },
   handler: async ({ request, context }) => {
     const annotationsClient = await context.plugins.observability?.getScopedAnnotationsClient(
+      context,
       request
     );
 

x-pack/plugins/ingest_manager/common/types/models/epm.ts

@@ -276,6 +276,9 @@ export interface IndexTemplate {
     mappings: object;
     aliases: object;
   };
+  data_stream: {
+    timestamp_field: string;
+  };
 }
 
 export interface TemplateRef {

x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts

@@ -294,6 +294,9 @@ function getBaseTemplate(
       // To be filled with the aliases that we need
       aliases: {},
     },
+    data_stream: {
+      timestamp_field: '@timestamp',
+    },
   };
 }
 

x-pack/plugins/observability/kibana.json

@@ -6,6 +6,9 @@
     "xpack",
     "observability"
   ],
+  "optionalPlugins": [
+    "licensing"
+  ],
   "ui": true,
   "server": true
 }

x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts

@@ -3,7 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { CoreSetup, PluginInitializerContext, KibanaRequest } from 'kibana/server';
+import {
+  CoreSetup,
+  PluginInitializerContext,
+  KibanaRequest,
+  RequestHandlerContext,
+} from 'kibana/server';
 import { PromiseReturnType } from '../../../typings/common';
 import { createAnnotationsClient } from './create_annotations_client';
 import { registerAnnotationAPIs } from './register_annotation_apis';
@@ -31,11 +36,12 @@ export async function bootstrapAnnotations({ index, core, context }: Params) {
   });
 
   return {
-    getScopedAnnotationsClient: (request: KibanaRequest) => {
+    getScopedAnnotationsClient: (requestContext: RequestHandlerContext, request: KibanaRequest) => {
       return createAnnotationsClient({
         index,
         apiCaller: core.elasticsearch.dataClient.asScoped(request).callAsCurrentUser,
         logger,
+        license: requestContext.licensing?.license,
       });
     },
   };

x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts

@@ -7,6 +7,8 @@
 import { APICaller, Logger } from 'kibana/server';
 import * as t from 'io-ts';
 import { Client } from 'elasticsearch';
+import Boom from 'boom';
+import { ILicense } from '../../../../licensing/server';
 import {
   createAnnotationRt,
   deleteAnnotationRt,
@@ -40,8 +42,9 @@ export function createAnnotationsClient(params: {
   index: string;
   apiCaller: APICaller;
   logger: Logger;
+  license?: ILicense;
 }) {
-  const { index, apiCaller, logger } = params;
+  const { index, apiCaller, logger, license } = params;
 
   const initIndex = () =>
     createOrUpdateIndex({
@@ -51,48 +54,59 @@ export function createAnnotationsClient(params: {
       logger,
     });
 
+  function ensureGoldLicense<T extends (...args: any[]) => any>(fn: T): T {
+    return ((...args) => {
+      if (!license?.hasAtLeast('gold')) {
+        throw Boom.forbidden('Annotations require at least a gold license or a trial license.');
+      }
+      return fn(...args);
+    }) as T;
+  }
+
   return {
     get index() {
       return index;
     },
-    create: async (
-      createParams: CreateParams
-    ): Promise<{ _id: string; _index: string; _source: Annotation }> => {
-      const indexExists = await apiCaller('indices.exists', {
-        index,
-      });
+    create: ensureGoldLicense(
+      async (
+        createParams: CreateParams
+      ): Promise<{ _id: string; _index: string; _source: Annotation }> => {
+        const indexExists = await apiCaller('indices.exists', {
+          index,
+        });
 
-      if (!indexExists) {
-        await initIndex();
-      }
+        if (!indexExists) {
+          await initIndex();
+        }
 
-      const annotation = {
-        ...createParams,
-        event: {
-          created: new Date().toISOString(),
-        },
-      };
+        const annotation = {
+          ...createParams,
+          event: {
+            created: new Date().toISOString(),
+          },
+        };
 
-      const response = (await apiCaller('index', {
-        index,
-        body: annotation,
-        refresh: 'wait_for',
-      })) as IndexDocumentResponse;
+        const response = (await apiCaller('index', {
+          index,
+          body: annotation,
+          refresh: 'wait_for',
+        })) as IndexDocumentResponse;
 
-      return apiCaller('get', {
-        index,
-        id: response._id,
-      });
-    },
-    getById: async (getByIdParams: GetByIdParams) => {
+        return apiCaller('get', {
+          index,
+          id: response._id,
+        });
+      }
+    ),
+    getById: ensureGoldLicense(async (getByIdParams: GetByIdParams) => {
       const { id } = getByIdParams;
 
       return apiCaller('get', {
         id,
         index,
       });
-    },
-    delete: async (deleteParams: DeleteParams) => {
+    }),
+    delete: ensureGoldLicense(async (deleteParams: DeleteParams) => {
       const { id } = deleteParams;
 
       const response = (await apiCaller('delete', {
@@ -101,6 +115,6 @@ export function createAnnotationsClient(params: {
         refresh: 'wait_for',
       })) as PromiseReturnType<Client['delete']>;
       return response;
-    },
+    }),
   };
 }