Merge branch '7.16' into backport/7.16/pr-115495

docs/apm/getting-started.asciidoc

@@ -41,11 +41,7 @@ Notice something awry? Select a service or trace and dive deeper with:
 * <<metrics>>
 
 TIP: Want to learn more about the Elastic APM ecosystem?
-<<<<<<< HEAD
-See the {apm-overview-ref-v}/overview.html[APM Overview].
-=======
 See the {apm-guide-ref}/apm-overview.html[APM Overview].
->>>>>>> 2daadc0d74d (docs: update links to APM docs (#115664))
 
 include::services.asciidoc[]
 

docs/setup/settings.asciidoc

@@ -497,9 +497,6 @@ override this parameter to use their own Tile Map Service. For example:
  | `migrations.maxBatchSizeBytes:`
  | Defines the maximum payload size for indexing batches of upgraded saved objects to avoid migrations failing due to a 413 Request Entity Too Large response from Elasticsearch. This value should be lower than or equal to your Elasticsearch cluster's `http.max_content_length` configuration option. *Default: `100mb`*
 
-| `migrations.enableV2:`
- | experimental[]. Enables the new Saved Objects migration algorithm. For information about the migration algorithm, refer to <<upgrade-migrations>>. When `migrations v2` is stable, the setting will be removed in an upcoming release without any further notice. Setting the value to `false` causes {kib} to use the legacy migration algorithm, which shipped in 7.11 and earlier versions. *Default: `true`*
-
 | `migrations.retryAttempts:`
  | The number of times migrations retry temporary failures, such as a network timeout, 503 status code, or `snapshot_in_progress_exception`. When upgrade migrations frequently fail after exhausting all retry attempts with a message such as `Unable to complete the [...] step after 15 attempts, terminating.`, increase the setting value. *Default: `15`*
 

src/core/server/saved_objects/deprecations/unknown_object_types.test.ts

@@ -13,7 +13,6 @@ import { deleteUnknownTypeObjects, getUnknownTypesDeprecations } from './unknown
 import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { elasticsearchClientMock } from '../../elasticsearch/client/mocks';
 import type { KibanaConfigType } from '../../kibana_config';
-import type { SavedObjectConfig } from '../saved_objects_config';
 import { SavedObjectsType } from 'kibana/server';
 
 const createSearchResponse = (count: number): estypes.SearchResponse => {
@@ -32,7 +31,6 @@ describe('unknown saved object types deprecation', () => {
   let typeRegistry: ReturnType<typeof typeRegistryMock.create>;
   let esClient: ReturnType<typeof elasticsearchClientMock.createScopedClusterClient>;
   let kibanaConfig: KibanaConfigType;
-  let savedObjectsConfig: SavedObjectConfig;
 
   beforeEach(() => {
     typeRegistry = typeRegistryMock.create();
@@ -48,12 +46,6 @@ describe('unknown saved object types deprecation', () => {
       index: '.kibana',
       enabled: true,
     };
-
-    savedObjectsConfig = {
-      migration: {
-        enableV2: true,
-      },
-    } as SavedObjectConfig;
   });
 
   afterEach(() => {
@@ -69,7 +61,6 @@ describe('unknown saved object types deprecation', () => {
 
     it('calls `esClient.asInternalUser.search` with the correct parameters', async () => {
       await getUnknownTypesDeprecations({
-        savedObjectsConfig,
         esClient,
         typeRegistry,
         kibanaConfig,
@@ -96,7 +87,6 @@ describe('unknown saved object types deprecation', () => {
       );
 
       const deprecations = await getUnknownTypesDeprecations({
-        savedObjectsConfig,
         esClient,
         typeRegistry,
         kibanaConfig,
@@ -112,7 +102,6 @@ describe('unknown saved object types deprecation', () => {
       );
 
       const deprecations = await getUnknownTypesDeprecations({
-        savedObjectsConfig,
         esClient,
         typeRegistry,
         kibanaConfig,
@@ -141,7 +130,6 @@ describe('unknown saved object types deprecation', () => {
   describe('deleteUnknownTypeObjects', () => {
     it('calls `esClient.asInternalUser.search` with the correct parameters', async () => {
       await deleteUnknownTypeObjects({
-        savedObjectsConfig,
         esClient,
         typeRegistry,
         kibanaConfig,

src/core/server/saved_objects/deprecations/unknown_object_types.ts

@@ -13,14 +13,12 @@ import { IScopedClusterClient } from '../../elasticsearch';
 import { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { SavedObjectsRawDocSource } from '../serialization';
 import type { KibanaConfigType } from '../../kibana_config';
-import type { SavedObjectConfig } from '../saved_objects_config';
 import { getIndexForType } from '../service/lib';
 
 interface UnknownTypesDeprecationOptions {
   typeRegistry: ISavedObjectTypeRegistry;
   esClient: IScopedClusterClient;
   kibanaConfig: KibanaConfigType;
-  savedObjectsConfig: SavedObjectConfig;
   kibanaVersion: string;
 }
 
@@ -32,11 +30,9 @@ const getTargetIndices = ({
   typeRegistry,
   kibanaVersion,
   kibanaConfig,
-  savedObjectsConfig,
 }: {
   types: string[];
   typeRegistry: ISavedObjectTypeRegistry;
-  savedObjectsConfig: SavedObjectConfig;
   kibanaConfig: KibanaConfigType;
   kibanaVersion: string;
 }) => {
@@ -46,7 +42,6 @@ const getTargetIndices = ({
         getIndexForType({
           type,
           typeRegistry,
-          migV2Enabled: savedObjectsConfig.migration.enableV2,
           kibanaVersion,
           defaultIndex: kibanaConfig.index,
         })
@@ -69,7 +64,6 @@ const getUnknownSavedObjects = async ({
   typeRegistry,
   esClient,
   kibanaConfig,
-  savedObjectsConfig,
   kibanaVersion,
 }: UnknownTypesDeprecationOptions) => {
   const knownTypes = getKnownTypes(typeRegistry);
@@ -78,7 +72,6 @@ const getUnknownSavedObjects = async ({
     typeRegistry,
     kibanaConfig,
     kibanaVersion,
-    savedObjectsConfig,
   });
   const query = getUnknownTypesQuery(knownTypes);
 
@@ -141,15 +134,13 @@ interface DeleteUnknownTypesOptions {
   typeRegistry: ISavedObjectTypeRegistry;
   esClient: IScopedClusterClient;
   kibanaConfig: KibanaConfigType;
-  savedObjectsConfig: SavedObjectConfig;
   kibanaVersion: string;
 }
 
 export const deleteUnknownTypeObjects = async ({
   esClient,
   typeRegistry,
   kibanaConfig,
-  savedObjectsConfig,
   kibanaVersion,
 }: DeleteUnknownTypesOptions) => {
   const knownTypes = getKnownTypes(typeRegistry);
@@ -158,7 +149,6 @@ export const deleteUnknownTypeObjects = async ({
     typeRegistry,
     kibanaConfig,
     kibanaVersion,
-    savedObjectsConfig,
   });
   const query = getUnknownTypesQuery(knownTypes);
 

src/core/server/saved_objects/migrations/kibana/kibana_migrator.mock.ts

@@ -42,8 +42,6 @@ const createMigrator = (
       scrollDuration: '15m',
       pollInterval: 1500,
       skip: false,
-      // TODO migrationsV2: remove/deprecate once we remove migrations v1
-      enableV2: false,
       retryAttempts: 10,
     },
     runMigrations: jest.fn(),