[Fleet] Update fleet_package.json + bump endpoint version to 8.4.0 (#138742) (#138968)

* Update fleet_package.json + bump endpoint version

* Bump endpoint to 8.4.1

* Bump docker images

* Update docker image in Fleet FTR tests

* Try using production docker image

* Try using v2 docker image globally

* Re-enable bundled package test + exclude APM from verification

* Remove comment about failing test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit ff0edb4195)

# Conflicts:
#	x-pack/test/functional/config.base.js

fleet_packages.json

@@ -1,15 +1,14 @@
 /*
 
-  Packages in this file are considered "bundled" and are installed as part of Fleet's setup process. Each entry points to a valid version name
-  avaiable in the Elastic Package Registry service, and must include a sha-512 checksum of the `.zip` archive for the given package.
+  Packages listed in this file are "bundled" with Kibana's built distributable, and are available
+  on disk rather than only in the configured package registry service. This allows Kibana to install
+  "stack-aligned" packages or those that are installed by default in an airgapped or offline environment.
 
-  You may opt in to using the "snapshot" environment of the EPR service by passing the `--use-epr-snapshot-registry` flag to `yarn build`. This will
-  cause the package archive download to pull from the "spapshot" environment instead of the "production" environment. Be aware that not all packages
-  exist in the snapshot environment, so you may have errors when fetching package versions. It's recommended to alter this file to contain _only_ the
-  packages you're testing when using the snapshot environment.
+  Packages will be fetched from https://epr-snapshot.elastic.co by default. This can be overridden
+  via the `--epr-registry=production` command line argument when building Kibana. Fetching from the
+  snapshot registry allows Kibana to bundle packages that have yet to be published to production in
+  order to prepare build candidates for the next release.
 
-  These files don't include any kind of checksum, but they should eventually include a package signature as introduced in https://github.com/elastic/elastic-package/issues/583
-  in order to verify package integrity.
 */
 
 [
@@ -23,7 +22,7 @@
   },
   {
     "name": "endpoint",
-    "version": "8.3.0"
+    "version": "8.4.1"
   },
   {
     "name": "fleet_server",

x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts

@@ -18,7 +18,7 @@ import pRetry from 'p-retry';
 const BEFORE_SETUP_TIMEOUT = 30 * 60 * 1000; // 30 minutes;
 
 const DOCKER_START_TIMEOUT = 5 * 60 * 1000; // 5 minutes
-const DOCKER_IMAGE = `docker.elastic.co/package-registry/distribution:c9f9a83da2c00118d5451cc69c680ade74494d4e`;
+const DOCKER_IMAGE = `docker.elastic.co/package-registry/distribution:production-v2-experimental`;
 
 function firstWithTimeout(source$: Rx.Observable<any>, errorMsg: string, ms = 30 * 1000) {
   return Rx.race(

x-pack/plugins/fleet/server/integration_tests/validate_bundled_packages.test.ts

@@ -37,23 +37,32 @@ describe('validate bundled packages', () => {
   }
 
   async function setupPackageObjects() {
+    // APM is a special case package in that it's "bundled release" is not available
+    // on the v2 registry image, because v2 currently only contains production packages.
+    // We bundle APM from snapshot, but that bundled version isn't available in the docker
+    // image that's running EPR during FTR runs, so to avoid nasty test failures we don't
+    // verify APM here.
+    const EXCLUDED_PACKAGES = ['apm'];
+
     const bundledPackages = await getBundledPackageEntries();
 
     const packageObjects = await Promise.all(
-      bundledPackages.map(async (bundledPackage) => {
-        const registryPackage = await Registry.getRegistryPackage(
-          bundledPackage.name,
-          bundledPackage.version
-        );
+      bundledPackages
+        .filter((pkg) => !EXCLUDED_PACKAGES.includes(pkg.name))
+        .map(async (bundledPackage) => {
+          const registryPackage = await Registry.getRegistryPackage(
+            bundledPackage.name,
+            bundledPackage.version
+          );
 
-        const packageArchive = await Registry.fetchArchiveBuffer({
-          pkgName: bundledPackage.name,
-          pkgVersion: bundledPackage.version,
-          shouldVerify: false,
-        });
+          const packageArchive = await Registry.fetchArchiveBuffer({
+            pkgName: bundledPackage.name,
+            pkgVersion: bundledPackage.version,
+            shouldVerify: false,
+          });
 
-        return { registryPackage, packageArchive };
-      })
+          return { registryPackage, packageArchive };
+        })
     );
 
     return packageObjects;

x-pack/test/fleet_api_integration/config.ts

@@ -19,7 +19,7 @@ const getFullPath = (relativePath: string) => path.join(path.dirname(__filename)
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  'docker.elastic.co/package-registry/distribution:production-v2-experimental-1658837582506';
+  'docker.elastic.co/package-registry/distribution:production-v2-experimental';
 
 export const BUNDLED_PACKAGE_DIR = '/tmp/fleet_bundled_packages';
 

x-pack/test/functional/config.base.js

@@ -15,7 +15,7 @@ import { pageObjects } from './page_objects';
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  'docker.elastic.co/package-registry/distribution:c9f9a83da2c00118d5451cc69c680ade74494d4e';
+  'docker.elastic.co/package-registry/distribution:production-v2-experimental';
 
 // the default export of config files must be a config provider
 // that returns an object with the projects config values