review

elastic · Sep 6, 2024 · 113841b · 113841b
1 parent fe4b833
commit 113841b
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 170 deletions.
diff --git a/...ck/plugins/observability_solution/entity_manager/server/lib/entities/delete_transforms.ts b/...ck/plugins/observability_solution/entity_manager/server/lib/entities/delete_transforms.ts
@@ -14,14 +14,16 @@ import {
   generateLatestTransformId,
 } from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
+import { isBackfillEnabled } from './helpers/is_backfill_enabled';
 
-export async function deleteHistoryTransform(
+export async function deleteTransforms(
   esClient: ElasticsearchClient,
   definition: EntityDefinition,
   logger: Logger
 ) {
   try {
     const historyTransformId = generateHistoryTransformId(definition);
+    const latestTransformId = generateLatestTransformId(definition);
     await retryTransientEsErrors(
       () =>
         esClient.transform.deleteTransform(
@@ -30,40 +32,17 @@ export async function deleteHistoryTransform(
         ),
       { logger }
     );
-  } catch (e) {
-    logger.error(`Cannot delete history transform [${definition.id}]: ${e}`);
-    throw e;
-  }
-}
-
-export async function deleteHistoryBackfillTransform(
-  esClient: ElasticsearchClient,
-  definition: EntityDefinition,
-  logger: Logger
-) {
-  try {
-    const historyBackfillTransformId = generateHistoryBackfillTransformId(definition);
-    await retryTransientEsErrors(
-      () =>
-        esClient.transform.deleteTransform(
-          { transform_id: historyBackfillTransformId, force: true },
-          { ignore: [404] }
-        ),
-      { logger }
-    );
-  } catch (e) {
-    logger.error(`Cannot delete history backfill transform [${definition.id}]: ${e}`);
-    throw e;
-  }
-}
-
-export async function deleteLatestTransform(
-  esClient: ElasticsearchClient,
-  definition: EntityDefinition,
-  logger: Logger
-) {
-  try {
-    const latestTransformId = generateLatestTransformId(definition);
+    if (isBackfillEnabled(definition)) {
+      const historyBackfillTransformId = generateHistoryBackfillTransformId(definition);
+      await retryTransientEsErrors(
+        () =>
+          esClient.transform.deleteTransform(
+            { transform_id: historyBackfillTransformId, force: true },
+            { ignore: [404] }
+          ),
+        { logger }
+      );
+    }
     await retryTransientEsErrors(
       () =>
         esClient.transform.deleteTransform(
@@ -73,7 +52,7 @@ export async function deleteLatestTransform(
       { logger }
     );
   } catch (e) {
-    logger.error(`Cannot delete latest transform [${definition.id}]`);
+    logger.error(`Cannot delete history transform [${definition.id}]: ${e}`);
     throw e;
   }
 }
diff --git a/...ns/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts b/...ns/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts
@@ -41,16 +41,8 @@ import { EntityIdConflict } from './errors/entity_id_conflict_error';
 import { EntityDefinitionNotFound } from './errors/entity_not_found';
 import { EntityDefinitionWithState } from './types';
 import { mergeEntityDefinitionUpdate } from './helpers/merge_definition_update';
-import {
-  stopHistoryBackfillTransform,
-  stopHistoryTransform,
-  stopLatestTransform,
-} from './stop_transforms';
-import {
-  deleteHistoryBackfillTransform,
-  deleteHistoryTransform,
-  deleteLatestTransform,
-} from './delete_transforms';
+import { stopTransforms } from './stop_transforms';
+import { deleteTransforms } from './delete_transforms';
 
 export interface InstallDefinitionParams {
   esClient: ElasticsearchClient;
@@ -307,19 +299,6 @@ const stopAndDeleteTransforms = async (
   definition: EntityDefinition,
   logger: Logger
 ) => {
-  await Promise.all([
-    stopHistoryTransform(esClient, definition, logger),
-    isBackfillEnabled(definition)
-      ? stopHistoryBackfillTransform(esClient, definition, logger)
-      : Promise.resolve(),
-    stopLatestTransform(esClient, definition, logger),
-  ]);
-
-  await Promise.all([
-    deleteHistoryTransform(esClient, definition, logger),
-    isBackfillEnabled(definition)
-      ? deleteHistoryBackfillTransform(esClient, definition, logger)
-      : Promise.resolve(),
-    deleteLatestTransform(esClient, definition, logger),
-  ]);
+  await stopTransforms(esClient, definition, logger);
+  await deleteTransforms(esClient, definition, logger);
 };
diff --git a/...er/server/lib/entities/start_transform.ts → ...r/server/lib/entities/start_transforms.ts b/...er/server/lib/entities/start_transform.ts → ...r/server/lib/entities/start_transforms.ts
@@ -15,7 +15,7 @@ import {
 import { retryTransientEsErrors } from './helpers/retry';
 import { isBackfillEnabled } from './helpers/is_backfill_enabled';
 
-export async function startTransform(
+export async function startTransforms(
   esClient: ElasticsearchClient,
   definition: EntityDefinition,
   logger: Logger

diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_transforms.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_transforms.ts
@@ -15,55 +15,41 @@ import {
 } from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
 
-export async function stopHistoryTransform(
+import { isBackfillEnabled } from './helpers/is_backfill_enabled';
+
+export async function stopTransforms(
   esClient: ElasticsearchClient,
   definition: EntityDefinition,
   logger: Logger
 ) {
   try {
     const historyTransformId = generateHistoryTransformId(definition);
-    await retryTransientEsErrors(
-      () =>
-        esClient.transform.stopTransform(
-          { transform_id: historyTransformId, wait_for_completion: true, force: true },
-          { ignore: [409, 404] }
-        ),
-      { logger }
-    );
-  } catch (e) {
-    logger.error(`Cannot stop history transform [${definition.id}]: ${e}`);
-    throw e;
-  }
-}
+    const latestTransformId = generateLatestTransformId(definition);
 
-export async function stopHistoryBackfillTransform(
-  esClient: ElasticsearchClient,
-  definition: EntityDefinition,
-  logger: Logger
-) {
-  try {
-    const historyBackfillTransformId = generateHistoryBackfillTransformId(definition);
     await retryTransientEsErrors(
       () =>
         esClient.transform.stopTransform(
-          { transform_id: historyBackfillTransformId, wait_for_completion: true, force: true },
+          { transform_id: historyTransformId, wait_for_completion: true, force: true },
           { ignore: [409, 404] }
         ),
       { logger }
     );
-  } catch (e) {
-    logger.error(`Cannot stop history backfill transform [${definition.id}]: ${e}`);
-    throw e;
-  }
-}
 
-export async function stopLatestTransform(
-  esClient: ElasticsearchClient,
-  definition: EntityDefinition,
-  logger: Logger
-) {
-  try {
-    const latestTransformId = generateLatestTransformId(definition);
+    if (isBackfillEnabled(definition)) {
+      const historyBackfillTransformId = generateHistoryBackfillTransformId(definition);
+      await retryTransientEsErrors(
+        () =>
+          esClient.transform.stopTransform(
+            {
+              transform_id: historyBackfillTransformId,
+              wait_for_completion: true,
+              force: true,
+            },
+            { ignore: [409, 404] }
+          ),
+        { logger }
+      );
+    }
     await retryTransientEsErrors(
       () =>
         esClient.transform.stopTransform(
@@ -73,7 +59,7 @@ export async function stopLatestTransform(
       { logger }
     );
   } catch (e) {
-    logger.error(`Cannot stop latest transform [${definition.id}]`);
+    logger.error(`Cannot stop entity transforms [${definition.id}]: ${e}`);
     throw e;
   }
 }
diff --git a/.../observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts b/.../observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts
@@ -14,24 +14,15 @@ import { deleteIndices } from './delete_index';
 import { deleteHistoryIngestPipeline, deleteLatestIngestPipeline } from './delete_ingest_pipeline';
 import { findEntityDefinitions } from './find_entity_definition';
 
-import { isBackfillEnabled } from './helpers/is_backfill_enabled';
 import {
   generateHistoryIndexTemplateId,
   generateLatestIndexTemplateId,
 } from './helpers/generate_component_id';
 import { deleteTemplate } from '../manage_index_templates';
 
-import {
-  stopHistoryTransform,
-  stopLatestTransform,
-  stopHistoryBackfillTransform,
-} from './stop_transforms';
+import { stopTransforms } from './stop_transforms';
 
-import {
-  deleteHistoryTransform,
-  deleteLatestTransform,
-  deleteHistoryBackfillTransform,
-} from './delete_transforms';
+import { deleteTransforms } from './delete_transforms';
 
 export async function uninstallEntityDefinition({
   definition,
@@ -46,20 +37,8 @@ export async function uninstallEntityDefinition({
   logger: Logger;
   deleteData?: boolean;
 }) {
-  await Promise.all([
-    stopHistoryTransform(esClient, definition, logger),
-    stopLatestTransform(esClient, definition, logger),
-    isBackfillEnabled(definition)
-      ? stopHistoryBackfillTransform(esClient, definition, logger)
-      : Promise.resolve(),
-  ]);
-  await Promise.all([
-    deleteHistoryTransform(esClient, definition, logger),
-    deleteLatestTransform(esClient, definition, logger),
-    isBackfillEnabled(definition)
-      ? deleteHistoryBackfillTransform(esClient, definition, logger)
-      : Promise.resolve(),
-  ]);
+  await stopTransforms(esClient, definition, logger);
+  await deleteTransforms(esClient, definition, logger);
 
   await Promise.all([
     deleteHistoryIngestPipeline(esClient, definition, logger),

diff --git a/...ns/observability_solution/entity_manager/server/lib/entities/upgrade_entity_definition.ts b/...ns/observability_solution/entity_manager/server/lib/entities/upgrade_entity_definition.ts
@@ -7,7 +7,7 @@
 
 import { EntityDefinition } from '@kbn/entities-schema';
 import { installBuiltInEntityDefinitions } from './install_entity_definition';
-import { startTransform } from './start_transform';
+import { startTransforms } from './start_transforms';
 import { EntityManagerServerSetup } from '../../types';
 import { checkIfEntityDiscoveryAPIKeyIsValid, readEntityDiscoveryAPIKey } from '../auth';
 import { getClientsFromAPIKey } from '../utils';
@@ -46,7 +46,7 @@ export async function upgradeBuiltInEntityDefinitions({
   });
 
   await Promise.all(
-    upgradedDefinitions.map((definition) => startTransform(esClient, definition, logger))
+    upgradedDefinitions.map((definition) => startTransforms(esClient, definition, logger))
   );
 
   return { success: true, definitions: upgradedDefinitions };

diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entity_client.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entity_client.ts
@@ -10,18 +10,12 @@ import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import { Logger } from '@kbn/logging';
 import { installEntityDefinition } from './entities/install_entity_definition';
-import { startTransform } from './entities/start_transform';
+import { startTransforms } from './entities/start_transforms';
 import { findEntityDefinitions } from './entities/find_entity_definition';
 import { uninstallEntityDefinition } from './entities/uninstall_entity_definition';
 import { EntityDefinitionNotFound } from './entities/errors/entity_not_found';
 
-import {
-  stopHistoryTransform,
-  stopLatestTransform,
-  stopHistoryBackfillTransform,
-} from './entities/stop_transforms';
-
-import { isBackfillEnabled } from './entities/helpers/is_backfill_enabled';
+import { stopTransforms } from './entities/stop_transforms';
 
 export class EntityClient {
   constructor(
@@ -47,7 +41,7 @@ export class EntityClient {
     });
 
     if (!installOnly) {
-      await startTransform(this.options.esClient, definition, this.options.logger);
+      await startTransforms(this.options.esClient, definition, this.options.logger);
     }
 
     return installedDefinition;
@@ -87,17 +81,11 @@ export class EntityClient {
     return { definitions };
   }
 
-  async startTransforms(definition: EntityDefinition) {
-    return startTransform(this.options.esClient, definition, this.options.logger);
+  async startEntityDefinition(definition: EntityDefinition) {
+    return startTransforms(this.options.esClient, definition, this.options.logger);
   }
 
-  async stopTransforms(definition: EntityDefinition) {
-    return Promise.all([
-      stopHistoryTransform(this.options.esClient, definition, this.options.logger),
-      stopLatestTransform(this.options.esClient, definition, this.options.logger),
-      isBackfillEnabled(definition)
-        ? stopHistoryBackfillTransform(this.options.esClient, definition, this.options.logger)
-        : Promise.resolve(),
-    ]);
+  async stopEntityDefinition(definition: EntityDefinition) {
+    return stopTransforms(this.options.esClient, definition, this.options.logger);
   }
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts
@@ -24,7 +24,7 @@ import { builtInDefinitions } from '../../lib/entities/built_in';
 import { installBuiltInEntityDefinitions } from '../../lib/entities/install_entity_definition';
 import { ERROR_API_KEY_SERVICE_DISABLED } from '../../../common/errors';
 import { EntityDiscoveryApiKeyType } from '../../saved_objects';
-import { startTransform } from '../../lib/entities/start_transform';
+import { startTransforms } from '../../lib/entities/start_transforms';
 
 /**
  * @openapi
@@ -134,7 +134,7 @@ export function enableEntityDiscoveryRoute<T extends RequestHandlerContext>({
         if (!req.query.installOnly) {
           await Promise.all(
             installedDefinitions.map((installedDefinition) =>
-              startTransform(esClient, installedDefinition, logger)
+              startTransforms(esClient, installedDefinition, logger)
             )
           );
         }