From 50eefdef2a96498fa5085a59b9ac1d56be917714 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Tue, 31 Oct 2023 10:56:39 -0400 Subject: [PATCH] Don't retry data view import --- .../services/epm/kibana/assets/install.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts index 068cc9853d1d3..20a0484c77a4a 100644 --- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts +++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts @@ -140,17 +140,16 @@ export async function installKibanaAssets(options: { return []; } - // Create index patterns separately with `overwrite: false` to prevent blowing away users' runtime fields + // Create index patterns separately with `overwrite: false` to prevent blowing away users' runtime fields. + // These don't get retried on conflict, because we expect that they exist once an integration has been installed. const indexPatternSavedObjects = getIndexPatternSavedObjects() as ArchiveAsset[]; - await retryImportOnConflictError(() => - savedObjectsImporter.import({ - overwrite: false, - readStream: createListStream(indexPatternSavedObjects), - createNewCopies: false, - refresh: false, - managed: true, - }) - ); + await savedObjectsImporter.import({ + overwrite: false, + readStream: createListStream(indexPatternSavedObjects), + createNewCopies: false, + refresh: false, + managed: true, + }); const installedAssets = await installKibanaSavedObjects({ logger,