Merge branch 'master' into reporting-common-types

docs/developer/advanced/sharing-saved-objects.asciidoc

@@ -235,9 +235,7 @@ export class MyPlugin implements Plugin<{}, {}, {}, PluginStartDeps> {
 if (spacesApi && resolveResult.outcome === 'aliasMatch') {
   // We found this object by a legacy URL alias from its old ID; redirect the user to the page with its new ID, preserving any URL hash
   const newObjectId = resolveResult.alias_target_id!; // This is always defined if outcome === 'aliasMatch'
-  const newPath = http.basePath.prepend(
-    `path/to/this/page/${newObjectId}${window.location.hash}`
-  );
+  const newPath = `/this/page/${newObjectId}${window.location.hash}`; // Use the *local* path within this app (do not include the "/app/appId" prefix)
   await spacesApi.ui.redirectLegacyUrl(newPath, OBJECT_NOUN);
   return;
 }
@@ -255,9 +253,7 @@ const getLegacyUrlConflictCallout = () => {
     // callout with a warning for the user, and provide a way for them to navigate to the other object.
     const currentObjectId = savedObject.id;
     const otherObjectId = resolveResult.alias_target_id!; // This is always defined if outcome === 'conflict'
-    const otherObjectPath = http.basePath.prepend(
-      `path/to/this/page/${otherObjectId}${window.location.hash}`
-    );
+    const otherObjectPath = `/this/page/${otherObjectId}${window.location.hash}`; // Use the *local* path within this app (do not include the "/app/appId" prefix)
     return (
       <>
         {spacesApi.ui.components.getLegacyUrlConflict({
@@ -391,6 +387,13 @@ These should be handled on a case-by-case basis at the plugin owner's discretion
 * Any "secondary" objects on the page may handle the outcomes differently. If the secondary object ID is not important (for example, it just
   functions as a page anchor), it may make more sense to ignore the different outcomes. If the secondary object _is_ important but it is not
   directly represented in the UI, it may make more sense to throw a descriptive error when a `'conflict'` outcome is encountered.
+  - Embeddables should use `spacesApi.ui.components.getEmbeddableLegacyUrlConflict` to render conflict errors:
++
+image::images/sharing-saved-objects-faq-multiple-deep-link-objects-1.png["Sharing Saved Objects embeddable legacy URL conflict"]
+Viewing details shows the user how to disable the alias and fix the problem using the
+<<spaces-api-disable-legacy-url-aliases,_disable_legacy_url_aliases API>>:
++
+image::images/sharing-saved-objects-faq-multiple-deep-link-objects-2.png["Sharing Saved Objects embeddable legacy URL conflict (showing details)"]
   - If the secondary object is resolved by an external service (such as the index pattern service), the service should simply make the full
   outcome available to consumers.
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -235,6 +235,7 @@ readonly links: {
             datastreamsNamingScheme: string;
             upgradeElasticAgent: string;
             upgradeElasticAgent712lower: string;
+            learnMoreBlog: string;
         }>;
         readonly ecs: {
             readonly guide: string;

package.json

@@ -117,8 +117,8 @@
     "@hapi/boom": "^9.1.4",
     "@hapi/cookie": "^11.0.2",
     "@hapi/h2o2": "^9.1.0",
-    "@hapi/hapi": "^20.2.0",
-    "@hapi/hoek": "^9.2.0",
+    "@hapi/hapi": "^20.2.1",
+    "@hapi/hoek": "^9.2.1",
     "@hapi/inert": "^6.0.4",
     "@hapi/wreck": "^17.1.0",
     "@kbn/ace": "link:bazel-bin/packages/kbn-ace",

packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts

@@ -13,6 +13,8 @@ import Path from 'path';
 import crypto from 'crypto';
 import execa from 'execa';
 import Axios from 'axios';
+// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
+import httpAdapter from 'axios/lib/adapters/http';
 
 import { ToolingLog } from '../tooling_log';
 import { parseConfig, Config } from './ci_stats_config';
@@ -225,6 +227,7 @@ export class CiStatsReporter {
           baseURL: BASE_URL,
           headers,
           data: body,
+          adapter: httpAdapter,
         });
 
         return true;

packages/kbn-pm/dist/index.js

@@ -8965,6 +8965,8 @@ var _execa = _interopRequireDefault(__webpack_require__(134));
 
 var _axios = _interopRequireDefault(__webpack_require__(177));
 
+var _http = _interopRequireDefault(__webpack_require__(199));
+
 var _ci_stats_config = __webpack_require__(218);
 
 /*
@@ -8974,6 +8976,7 @@ var _ci_stats_config = __webpack_require__(218);
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
 const BASE_URL = 'https://ci-stats.kibana.dev';
 
 class CiStatsReporter {
@@ -9173,7 +9176,8 @@ class CiStatsReporter {
           url: path,
           baseURL: BASE_URL,
           headers,
-          data: body
+          data: body,
+          adapter: _http.default
         });
         return true;
       } catch (error) {

src/core/public/doc_links/doc_links_service.ts

@@ -476,6 +476,7 @@ export class DocLinksService {
           datastreamsNamingScheme: `${FLEET_DOCS}data-streams.html#data-streams-naming-scheme`,
           upgradeElasticAgent: `${FLEET_DOCS}upgrade-elastic-agent.html`,
           upgradeElasticAgent712lower: `${FLEET_DOCS}upgrade-elastic-agent.html#upgrade-7.12-lower`,
+          learnMoreBlog: `${ELASTIC_WEBSITE_URL}blog/elastic-agent-and-fleet-make-it-easier-to-integrate-your-systems-with-elastic`,
         },
         ecs: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/ecs/current/index.html`,
@@ -730,6 +731,7 @@ export interface DocLinksStart {
       datastreamsNamingScheme: string;
       upgradeElasticAgent: string;
       upgradeElasticAgent712lower: string;
+      learnMoreBlog: string;
     }>;
     readonly ecs: {
       readonly guide: string;

src/core/public/public.api.md

@@ -704,6 +704,7 @@ export interface DocLinksStart {
             datastreamsNamingScheme: string;
             upgradeElasticAgent: string;
             upgradeElasticAgent712lower: string;
+            learnMoreBlog: string;
         }>;
         readonly ecs: {
             readonly guide: string;

src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts

@@ -515,7 +515,6 @@ export const useField = <T, FormType = FormData, I = T>(
         if (resetValue) {
           hasBeenReset.current = true;
           const newValue = deserializeValue(updatedDefaultValue ?? defaultValue);
-          // updateStateIfMounted('value', newValue);
           setValue(newValue);
           return newValue;
         }

vars/tasks.groovy

@@ -146,14 +146,13 @@ def functionalXpack(Map params = [:]) {
       }
     }
 
-    //temporarily disable apm e2e test since it's breaking due to a version upgrade.
-    // whenChanged([
-    //   'x-pack/plugins/apm/',
-    // ]) {
-    //   if (githubPr.isPr()) {
-    //     task(kibanaPipeline.functionalTestProcess('xpack-APMCypress', './test/scripts/jenkins_apm_cypress.sh'))
-    //   }
-    // }
+    whenChanged([
+      'x-pack/plugins/apm/',
+    ]) {
+      if (githubPr.isPr()) {
+        task(kibanaPipeline.functionalTestProcess('xpack-APMCypress', './test/scripts/jenkins_apm_cypress.sh'))
+      }
+    }
 
     whenChanged([
       'x-pack/plugins/uptime/',