Disable checking for conflicts when copying saved objects

docs/api/spaces-management/copy_saved_objects.asciidoc

@@ -51,9 +51,17 @@ You can request to overwrite any objects that already exist in the target space
   (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target
   spaces. The default value is `false`.
 
+`createNewCopies`::
+  (Optional, boolean) Creates new copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
+  errors are avoided. The default value is `true`.
++
+NOTE: This cannot be used with the `overwrite` option.
+
 `overwrite`::
   (Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id`
   exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
++
+NOTE: This cannot be used with the `createNewCopies` option.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-response-body]]
@@ -128,8 +136,7 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true,
-  "createNewcopies": true
+  "includeReferences": true
 }
 ----
 // KIBANA
@@ -193,7 +200,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA
@@ -254,7 +262,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing", "sales"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA
@@ -405,7 +414,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA

docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc

@@ -45,6 +45,10 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
 `includeReferences`::
   (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
 
+`createNewCopies`::
+  (Optional, boolean) Creates new copies of the saved objects, regenerates each object ID, and resets the origin. When enabled during the
+  initial copy, also enable when resolving copy errors. The default value is `true`.
+
 `retries`::
   (Required, object) The retry operations to attempt, which can specify how to resolve different types of errors. Object keys represent the
   target space IDs.
@@ -148,6 +152,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
     "id": "my-dashboard"
   }],
   "includeReferences": true,
+  "createNewCopies": false,
   "retries": {
     "sales": [
       {
@@ -246,6 +251,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
     "id": "my-dashboard"
   }],
   "includeReferences": true,
+  "createNewCopies": false,
   "retries": {
     "marketing": [
       {

src/core/server/core_usage_data/core_usage_data_service.test.ts

@@ -30,6 +30,7 @@ import { config as RawLoggingConfig } from '../logging/logging_config';
 import { config as RawKibanaConfig } from '../kibana_config';
 import { savedObjectsConfig as RawSavedObjectsConfig } from '../saved_objects/saved_objects_config';
 import { metricsServiceMock } from '../metrics/metrics_service.mock';
+import { coreUsageStatsServiceMock } from '../core_usage_stats/core_usage_stats_service.mock';
 import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.mock';
 
 import { CoreUsageDataService } from './core_usage_data_service';
@@ -65,9 +66,10 @@ describe('CoreUsageDataService', () => {
 
   describe('start', () => {
     describe('getCoreUsageData', () => {
-      it('returns core metrics for default config', () => {
+      it('returns core metrics for default config', async () => {
         const metrics = metricsServiceMock.createInternalSetupContract();
-        service.setup({ metrics });
+        const coreUsageStats = coreUsageStatsServiceMock.createSetupContract();
+        service.setup({ metrics, coreUsageStats });
         const elasticsearch = elasticsearchServiceMock.createStart();
         elasticsearch.client.asInternalUser.cat.indices.mockResolvedValueOnce({
           body: [
@@ -97,6 +99,7 @@ describe('CoreUsageDataService', () => {
           { name: 'type 2', indexPattern: '.kibana_task_manager' },
         ] as any);
 
+        await coreUsageStats.getClient(); // wait for this to resolve, which happens before this service is started
         const { getCoreUsageData } = service.start({
           savedObjects: savedObjectsServiceMock.createInternalStartContract(typeRegistry),
           elasticsearch,
@@ -243,8 +246,9 @@ describe('CoreUsageDataService', () => {
           observables.push(newObservable);
           return newObservable as Observable<any>;
         });
+        const coreUsageStats = coreUsageStatsServiceMock.createSetupContract();
 
-        service.setup({ metrics });
+        service.setup({ metrics, coreUsageStats });
 
         // Use the stopTimer$ to delay calling stop() until the third frame
         const stopTimer$ = cold('---a|');

src/core/server/core_usage_data/core_usage_data_service.ts

@@ -23,6 +23,7 @@ import { takeUntil } from 'rxjs/operators';
 import { CoreService } from 'src/core/types';
 import { SavedObjectsServiceStart } from 'src/core/server';
 import { CoreContext } from '../core_context';
+import { CoreUsageStatsClient, CoreUsageStatsServiceSetup } from '../core_usage_stats';
 import { ElasticsearchConfigType } from '../elasticsearch/elasticsearch_config';
 import { HttpConfigType } from '../http';
 import { LoggingConfigType } from '../logging';
@@ -35,6 +36,7 @@ import { MetricsServiceSetup, OpsMetrics } from '..';
 
 export interface SetupDeps {
   metrics: MetricsServiceSetup;
+  coreUsageStats: CoreUsageStatsServiceSetup;
 }
 
 export interface StartDeps {
@@ -69,6 +71,7 @@ export class CoreUsageDataService implements CoreService<void, CoreUsageDataStar
   private stop$: Subject<void>;
   private opsMetrics?: OpsMetrics;
   private kibanaConfig?: KibanaConfigType;
+  private coreUsageStatsClient?: CoreUsageStatsClient;
 
   constructor(core: CoreContext) {
     this.configService = core.configService;
@@ -130,8 +133,15 @@ export class CoreUsageDataService implements CoreService<void, CoreUsageDataStar
       throw new Error('Unable to read config values. Ensure that setup() has completed.');
     }
 
+    if (!this.coreUsageStatsClient) {
+      throw new Error(
+        'Core usage stats client is not initialized. Ensure that setup() has completed.'
+      );
+    }
+
     const es = this.elasticsearchConfig;
     const soUsageData = await this.getSavedObjectIndicesUsageData(savedObjects, elasticsearch);
+    const coreUsageStatsData = await this.coreUsageStatsClient.getUsageStats();
 
     const http = this.httpConfig;
     return {
@@ -225,15 +235,18 @@ export class CoreUsageDataService implements CoreService<void, CoreUsageDataStar
       services: {
         savedObjects: soUsageData,
       },
+      ...coreUsageStatsData,
     };
   }
 
-  setup({ metrics }: SetupDeps) {
+  setup({ metrics, coreUsageStats }: SetupDeps) {
     metrics
       .getOpsMetrics$()
       .pipe(takeUntil(this.stop$))
       .subscribe((opsMetrics) => (this.opsMetrics = opsMetrics));
 
+    this.coreUsageStatsClient = coreUsageStats.getClient();
+
     this.configService
       .atPath<ElasticsearchConfigType>('elasticsearch')
       .pipe(takeUntil(this.stop$))

src/core/server/core_usage_data/types.ts

@@ -17,11 +17,13 @@
  * under the License.
  */
 
+import { CoreUsageStats } from '../core_usage_stats';
+
 /**
  * Type describing Core's usage data payload
  * @internal
  */
-export interface CoreUsageData {
+export interface CoreUsageData extends CoreUsageStats {
   config: CoreConfigUsageData;
   services: CoreServicesUsageData;
   environment: CoreEnvironmentUsageData;

src/core/server/core_usage_stats/constants.ts

@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/** @internal */
+export const CORE_USAGE_STATS_TYPE = 'core-usage-stats';
+
+/** @internal */
+export const CORE_USAGE_STATS_ID = 'core-usage-stats';

src/core/server/core_usage_stats/core_usage_stats.ts

@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsType } from '../saved_objects';
+import { CORE_USAGE_STATS_TYPE } from './constants';
+
+/** @internal */
+export const coreUsageStatsType: SavedObjectsType = {
+  name: CORE_USAGE_STATS_TYPE,
+  hidden: true,
+  namespaceType: 'agnostic',
+  mappings: {
+    dynamic: false, // we aren't querying or aggregating over this data, so we don't need to specify any fields
+    properties: {},
+  },
+};

src/core/server/core_usage_stats/core_usage_stats_client.mock.ts

@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreUsageStatsClient } from '.';
+
+const createUsageStatsClientMock = () =>
+  (({
+    getUsageStats: jest.fn().mockResolvedValue({}),
+    incrementSavedObjectsImport: jest.fn().mockResolvedValue(null),
+    incrementSavedObjectsResolveImportErrors: jest.fn().mockResolvedValue(null),
+    incrementSavedObjectsExport: jest.fn().mockResolvedValue(null),
+  } as unknown) as jest.Mocked<CoreUsageStatsClient>);
+
+export const coreUsageStatsClientMock = {
+  create: createUsageStatsClientMock,
+};