Merge branch 'main' into legend-actions-aria

elastic · Feb 21, 2023 · 6a5aefc · 6a5aefc
2 parents e5aa9ff + 38f26e7
commit 6a5aefc
Show file tree

Hide file tree

Showing 62 changed files with 1,955 additions and 1,193 deletions.
diff --git a/fleet_packages.json b/fleet_packages.json
@@ -20,7 +20,7 @@
 [
   {
     "name": "apm",
-    "version": "8.8.0-preview-1675842740",
+    "version": "8.8.0-preview-1676887316",
     "forceAlignStackVersion": true
   },
   {

diff --git a/package.json b/package.json
@@ -1247,7 +1247,7 @@
     "@types/redux-logger": "^3.0.8",
     "@types/resolve": "^1.20.1",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
-    "@types/selenium-webdriver": "^4.1.10",
+    "@types/selenium-webdriver": "^4.1.11",
     "@types/semver": "^7",
     "@types/set-value": "^2.0.0",
     "@types/sharp": "^0.30.4",

diff --git a/...s/core/logging/core-logging-server-internal/src/__snapshots__/logging_system.test.ts.snap b/...s/core/logging/core-logging-server-internal/src/__snapshots__/logging_system.test.ts.snap
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -473,6 +473,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       createAlerts: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/create-alerts.html`,
       syntheticsCommandReference: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetics-configuration.html#synthetics-configuration-playwright-options`,
       syntheticsProjectMonitors: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetic-run-tests.html#synthetic-monitor-choose-project`,
+      syntheticsMigrateFromIntegration: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetics-migrate-from-integration.html`,
     },
     alerting: {
       guide: `${KIBANA_DOCS}create-and-manage-rules.html`,

diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
@@ -355,6 +355,7 @@ export interface DocLinks {
     createAlerts: string;
     syntheticsCommandReference: string;
     syntheticsProjectMonitors: string;
+    syntheticsMigrateFromIntegration: string;
   }>;
   readonly alerting: Readonly<{
     guide: string;

diff --git a/packages/kbn-ecs/generated/ecs.ts b/packages/kbn-ecs/generated/ecs.ts
@@ -14,5 +14,5 @@ export interface EcsEcs {
    * ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.
    * When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.
    */
-  version: '8.6.0';
+  version: '8.6.1';
 }
diff --git a/packages/kbn-ecs/generated/ecs_flat.ts b/packages/kbn-ecs/generated/ecs_flat.ts
@@ -13765,14 +13765,27 @@ export const EcsFlat = {
     short: 'Date/time indicator was last reported.',
     type: 'date',
   },
-  'threat.enrichments.indicator.marking.tlp.version': {
+  'threat.enrichments.indicator.marking.tlp': {
+    dashed_name: 'threat-enrichments-indicator-marking-tlp',
+    description: 'Traffic Light Protocol sharing markings.',
+    example: 'CLEAR',
+    expected_values: ['WHITE', 'CLEAR', 'GREEN', 'AMBER', 'AMBER+STRICT', 'RED'],
+    flat_name: 'threat.enrichments.indicator.marking.tlp',
+    ignore_above: 1024,
+    level: 'extended',
+    name: 'enrichments.indicator.marking.tlp',
+    normalize: [],
+    short: 'Indicator TLP marking',
+    type: 'keyword',
+  },
+  'threat.enrichments.indicator.marking.tlp_version': {
     dashed_name: 'threat-enrichments-indicator-marking-tlp-version',
     description: 'Traffic Light Protocol version.',
     example: 2,
-    flat_name: 'threat.enrichments.indicator.marking.tlp.version',
+    flat_name: 'threat.enrichments.indicator.marking.tlp_version',
     ignore_above: 1024,
     level: 'extended',
-    name: 'enrichments.indicator.marking.tlp.version',
+    name: 'enrichments.indicator.marking.tlp_version',
     normalize: [],
     short: 'Indicator TLP version',
     type: 'keyword',
@@ -16202,6 +16215,18 @@ export const EcsFlat = {
     short: 'Indicator TLP marking',
     type: 'keyword',
   },
+  'threat.indicator.marking.tlp_version': {
+    dashed_name: 'threat-indicator-marking-tlp-version',
+    description: 'Traffic Light Protocol version.',
+    example: 2,
+    flat_name: 'threat.indicator.marking.tlp_version',
+    ignore_above: 1024,
+    level: 'extended',
+    name: 'indicator.marking.tlp_version',
+    normalize: [],
+    short: 'Indicator TLP version',
+    type: 'keyword',
+  },
   'threat.indicator.modified_at': {
     dashed_name: 'threat-indicator-modified-at',
     description:
@@ -17129,18 +17154,6 @@ export const EcsFlat = {
     short: 'Threat subtechnique URL reference.',
     type: 'keyword',
   },
-  'threat.threat.indicator.marking.tlp.version': {
-    dashed_name: 'threat-threat-indicator-marking-tlp-version',
-    description: 'Traffic Light Protocol version.',
-    example: 2,
-    flat_name: 'threat.threat.indicator.marking.tlp.version',
-    ignore_above: 1024,
-    level: 'extended',
-    name: 'threat.indicator.marking.tlp.version',
-    normalize: [],
-    short: 'Indicator TLP version',
-    type: 'keyword',
-  },
   'tls.cipher': {
     dashed_name: 'tls-cipher',
     description: 'String indicating the cipher used during the current connection.',

diff --git a/packages/kbn-ecs/generated/ecs_nested.ts b/packages/kbn-ecs/generated/ecs_nested.ts
@@ -15969,14 +15969,27 @@ export const EcsNested = {
         short: 'Date/time indicator was last reported.',
         type: 'date',
       },
-      'threat.enrichments.indicator.marking.tlp.version': {
+      'threat.enrichments.indicator.marking.tlp': {
+        dashed_name: 'threat-enrichments-indicator-marking-tlp',
+        description: 'Traffic Light Protocol sharing markings.',
+        example: 'CLEAR',
+        expected_values: ['WHITE', 'CLEAR', 'GREEN', 'AMBER', 'AMBER+STRICT', 'RED'],
+        flat_name: 'threat.enrichments.indicator.marking.tlp',
+        ignore_above: 1024,
+        level: 'extended',
+        name: 'enrichments.indicator.marking.tlp',
+        normalize: [],
+        short: 'Indicator TLP marking',
+        type: 'keyword',
+      },
+      'threat.enrichments.indicator.marking.tlp_version': {
         dashed_name: 'threat-enrichments-indicator-marking-tlp-version',
         description: 'Traffic Light Protocol version.',
         example: 2,
-        flat_name: 'threat.enrichments.indicator.marking.tlp.version',
+        flat_name: 'threat.enrichments.indicator.marking.tlp_version',
         ignore_above: 1024,
         level: 'extended',
-        name: 'enrichments.indicator.marking.tlp.version',
+        name: 'enrichments.indicator.marking.tlp_version',
         normalize: [],
         short: 'Indicator TLP version',
         type: 'keyword',
@@ -18414,6 +18427,18 @@ export const EcsNested = {
         short: 'Indicator TLP marking',
         type: 'keyword',
       },
+      'threat.indicator.marking.tlp_version': {
+        dashed_name: 'threat-indicator-marking-tlp-version',
+        description: 'Traffic Light Protocol version.',
+        example: 2,
+        flat_name: 'threat.indicator.marking.tlp_version',
+        ignore_above: 1024,
+        level: 'extended',
+        name: 'indicator.marking.tlp_version',
+        normalize: [],
+        short: 'Indicator TLP version',
+        type: 'keyword',
+      },
       'threat.indicator.modified_at': {
         dashed_name: 'threat-indicator-modified-at',
         description:
@@ -19344,18 +19369,6 @@ export const EcsNested = {
         short: 'Threat subtechnique URL reference.',
         type: 'keyword',
       },
-      'threat.threat.indicator.marking.tlp.version': {
-        dashed_name: 'threat-threat-indicator-marking-tlp-version',
-        description: 'Traffic Light Protocol version.',
-        example: 2,
-        flat_name: 'threat.threat.indicator.marking.tlp.version',
-        ignore_above: 1024,
-        level: 'extended',
-        name: 'threat.indicator.marking.tlp.version',
-        normalize: [],
-        short: 'Indicator TLP version',
-        type: 'keyword',
-      },
     },
     group: 2,
     name: 'threat',

diff --git a/packages/kbn-ecs/generated/index.ts b/packages/kbn-ecs/generated/index.ts
@@ -57,7 +57,7 @@ import { EcsVlan } from './vlan';
 import { EcsVulnerability } from './vulnerability';
 import { EcsX509 } from './x509';
 
-export const EcsVersion = '8.6.0' as const;
+export const EcsVersion = '8.6.1' as const;
 
 /**
  * Exporting raw schema files for easy programmatic use

diff --git a/packages/kbn-ecs/generated/threat.ts b/packages/kbn-ecs/generated/threat.ts
@@ -554,6 +554,10 @@ export interface EcsThreat {
        * Traffic Light Protocol sharing markings.
        */
       tlp?: string;
+      /**
+       * Traffic Light Protocol version.
+       */
+      tlp_version?: string;
     };
 
     /**
@@ -875,17 +879,4 @@ export interface EcsThreat {
       reference?: string[];
     };
   };
-
-  threat?: {
-    indicator?: {
-      marking?: {
-        tlp?: {
-          /**
-           * Traffic Light Protocol version.
-           */
-          version?: string;
-        };
-      };
-    };
-  };
 }
diff --git a/x-pack/plugins/apm/public/components/routing/app_root/index.tsx b/x-pack/plugins/apm/public/components/routing/app_root/index.tsx
@@ -41,6 +41,7 @@ import { ApmErrorBoundary } from '../apm_error_boundary';
 import { apmRouter } from '../apm_route_config';
 import { RedirectDependenciesToDependenciesInventory } from './redirect_dependencies_to_dependencies_inventory';
 import { TrackPageview } from '../track_pageview';
+import { UpdateExecutionContextOnRouteChange } from './update_execution_context_on_route_change';
 
 const storage = new Storage(localStorage);
 
@@ -73,24 +74,26 @@ export function ApmAppRoot({
                       <RedirectWithDefaultDateRange>
                         <RedirectWithOffset>
                           <TrackPageview>
-                            <BreadcrumbsContextProvider>
-                              <UrlParamsProvider>
-                                <LicenseProvider>
-                                  <AnomalyDetectionJobsContextProvider>
-                                    <InspectorContextProvider>
-                                      <ApmThemeProvider>
-                                        <MountApmHeaderActionMenu />
+                            <UpdateExecutionContextOnRouteChange>
+                              <BreadcrumbsContextProvider>
+                                <UrlParamsProvider>
+                                  <LicenseProvider>
+                                    <AnomalyDetectionJobsContextProvider>
+                                      <InspectorContextProvider>
+                                        <ApmThemeProvider>
+                                          <MountApmHeaderActionMenu />
 
-                                        <Route
-                                          component={ScrollToTopOnPathChange}
-                                        />
-                                        <RouteRenderer />
-                                      </ApmThemeProvider>
-                                    </InspectorContextProvider>
-                                  </AnomalyDetectionJobsContextProvider>
-                                </LicenseProvider>
-                              </UrlParamsProvider>
-                            </BreadcrumbsContextProvider>
+                                          <Route
+                                            component={ScrollToTopOnPathChange}
+                                          />
+                                          <RouteRenderer />
+                                        </ApmThemeProvider>
+                                      </InspectorContextProvider>
+                                    </AnomalyDetectionJobsContextProvider>
+                                  </LicenseProvider>
+                                </UrlParamsProvider>
+                              </BreadcrumbsContextProvider>
+                            </UpdateExecutionContextOnRouteChange>
                           </TrackPageview>
                         </RedirectWithOffset>
                       </RedirectWithDefaultDateRange>

diff --git a/...lugins/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts b/...lugins/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts
@@ -0,0 +1,28 @@
+/*
+ * 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 { useExecutionContext } from '@kbn/kibana-react-plugin/public';
+import { useMatchRoutes } from '@kbn/typed-react-router-config';
+import { last } from 'lodash';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+
+export function UpdateExecutionContextOnRouteChange({
+  children,
+}: {
+  children: React.ReactElement;
+}) {
+  const { core } = useApmPluginContext();
+  const lastMatch = last(useMatchRoutes());
+
+  useExecutionContext(core.executionContext, {
+    type: 'application',
+    name: 'apm',
+    page: lastMatch?.match?.path,
+  });
+
+  return children;
+}
diff --git a/...prise_search_content/components/search_index/connector/connector_configuration_config.tsx b/...prise_search_content/components/search_index/connector/connector_configuration_config.tsx
@@ -45,7 +45,7 @@ export const ConnectorConfigurationConfig: React.FC = ({ children }) => {
           displayList.length > 0 && (
             <EuiFlexGroup direction="column">
               <EuiFlexItem>
-                <EuiDescriptionList listItems={displayList} />
+                <EuiDescriptionList listItems={displayList} className="eui-textBreakWord" />
               </EuiFlexItem>
               <EuiFlexItem>
                 <EuiFlexGroup>

diff --git a/...se_search_content/components/search_index/connector/select_connector/select_connector.tsx b/...se_search_content/components/search_index/connector/select_connector/select_connector.tsx
@@ -125,9 +125,10 @@ export const SelectConnector: React.FC = () => {
           <EuiSpacer size="s" />
           <EuiFlexGroup direction="row">
             {NATIVE_CONNECTORS.map((nativeConnector) => (
-              <EuiFlexItem>
+              <EuiFlexItem key={nativeConnector.name}>
                 <ConnectorCheckable
-                  {...nativeConnector}
+                  name={nativeConnector.name}
+                  serviceType={nativeConnector.serviceType}
                   onChange={() => setSelectedConnector(nativeConnector)}
                   documentationUrl={nativeConnector.docsUrl}
                   checked={nativeConnector === selectedNativeConnector}

diff --git a/x-pack/plugins/infra/docs/state_machines/README.md b/x-pack/plugins/infra/docs/state_machines/README.md
@@ -6,3 +6,4 @@ implementation patterns:
 
 - [Patterns for designing XState state machines](./xstate_machine_patterns.md)
 - [Patterns for using XState with React](./xstate_react_patterns.md)
+- [Patterns for working with URLs and URL precedence](./xstate_url_patterns_and_precedence.md)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ implementation patterns:

		- [Patterns for designing XState state machines](./xstate_machine_patterns.md)
		- [Patterns for using XState with React](./xstate_react_patterns.md)
		- [Patterns for working with URLs and URL precedence](./xstate_url_patterns_and_precedence.md)