Merge remote-tracking branch 'upstream/master' into 69441-context-rea…

…son-port

# Conflicts:
#	x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
#	x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts

docs/glossary.asciidoc

@@ -45,7 +45,7 @@ See {kibana-ref}/alerting-getting-started.html[Alerts and Actions].
 [[glossary-annotation]] annotation ::
 // tag::annotation-def[]
 A way to augment a data display with descriptive domain knowledge.
-// end::alerts-annotation-def[]
+// end::annotation-def[]
 
 
 [[glossary-app]] app ::
@@ -90,7 +90,7 @@ See {kibana-ref}/canvas.html[Canvas].
 // end::canvas-def[]
 
 [[glossary-canvas-language]] Canvas expression language::
-// tag::ccanvas-language-def[]
+// tag::canvas-language-def[]
 A pipeline-based expression language for manipulating and visualizing data.
 Includes dozens of functions and other capabilities, such as table transforms,
 type casting, and sub-expressions. Supports TinyMath functions for complex math calculations.
@@ -354,11 +354,11 @@ Timestamped data such as logs, metrics, and events that is indexed on an ongoing
 
 
 [[glossary-TSVB-data]] TSVB ::
-// tag::TSVB-def[]
+// tag::tsvb-def[]
 A time series data visualizer that allows you to combine an
 infinite number of aggregations to display complex data.
 See {kibana-ref}/TSVB.html[TSVB].
-// end::TSVB-def[]
+// end::tsvb-def[]
 
 
 [float]

src/plugins/usage_collection/public/index.ts

@@ -21,7 +21,7 @@ import { PluginInitializerContext } from '../../../core/public';
 import { UsageCollectionPlugin } from './plugin';
 
 export { METRIC_TYPE } from '@kbn/analytics';
-export { UsageCollectionSetup } from './plugin';
+export { UsageCollectionSetup, UsageCollectionStart } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new UsageCollectionPlugin(initializerContext);

x-pack/plugins/apm/public/services/rest/observability_dashboard.ts

@@ -6,9 +6,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { sum } from 'lodash';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FetchDataParams } from '../../../../observability/public/data_handler';
-import { ApmFetchDataResponse } from '../../../../observability/public/typings/fetch_data_response';
+import {
+  ApmFetchDataResponse,
+  FetchDataParams,
+} from '../../../../observability/public';
 import { callApmApi } from './createCallApmApi';
 import { Theme } from '../../utils/get_theme';
 

x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts

@@ -147,13 +147,14 @@ async function init() {
 }
 
 async function isSecurityEnabled() {
-  interface XPackInfo {
-    features: { security?: { allow_rbac: boolean } };
+  try {
+    await callKibana({
+      url: `/internal/security/me`,
+    });
+    return true;
+  } catch (err) {
+    return false;
   }
-  const { features } = await callKibana<XPackInfo>({
-    url: `/api/xpack/v1/info`,
-  });
-  return features.security?.allow_rbac;
 }
 
 async function callKibana<T>(options: AxiosRequestConfig): Promise<T> {

x-pack/plugins/apm/server/lib/observability_dashboard/get_transaction_coordinates.ts

@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { rangeFilter } from '../../../common/utils/range_filter';
-import { Coordinates } from '../../../../observability/public/typings/fetch_data_response';
+import { Coordinates } from '../../../../observability/public';
 import { PROCESSOR_EVENT } from '../../../common/elasticsearch_fieldnames';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { ProcessorEvent } from '../../../common/processor_event';

x-pack/plugins/canvas/canvas_plugin_src/plugin.ts

@@ -24,7 +24,6 @@ import { modelSpecs } from './uis/models';
 import { initializeViews } from './uis/views';
 import { initializeArgs } from './uis/arguments';
 import { tagSpecs } from './uis/tags';
-import { templateSpecs } from './templates';
 
 interface SetupDeps {
   canvas: CanvasSetup;
@@ -59,7 +58,6 @@ export class CanvasSrcPlugin implements Plugin<void, void, SetupDeps, StartDeps>
     plugins.canvas.addViewUIs(initializeViews(core, plugins));
     plugins.canvas.addArgumentUIs(initializeArgs(core, plugins));
     plugins.canvas.addTagUIs(tagSpecs);
-    plugins.canvas.addTemplates(templateSpecs);
     plugins.canvas.addTransformUIs(transformSpecs);
   }