review

elastic · Oct 30, 2024 · 29b6fea · 29b6fea
1 parent 7276d9b
commit 29b6fea
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 58 deletions.
diff --git a/..._solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx b/..._solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx
@@ -55,17 +55,20 @@ const EntityStoreDashboardPanelsComponent = () => {
 
   const { mutate: initRiskEngine } = useInitRiskEngineMutation();
 
-  const callouts = entityStore.errors
-    .filter((_, i) => !hiddenToasts.includes(i))
-    .map((err, i) => (
-      <EuiCallOut
-        title={'An error occurred during entity store resource initialization'}
-        color="danger"
-        iconType="error"
-      >
-        <p>{err?.message}</p>
-      </EuiCallOut>
-    ));
+  const callouts = entityStore.errors.map((err, i) => (
+    <EuiCallOut
+      title={
+        <FormattedMessage
+          id="xpack.securitySolution.entityAnalytics.entityStore.enablement.errors.title"
+          defaultMessage={'An error occurred during entity store resource initialization'}
+        />
+      }
+      color="danger"
+      iconType="error"
+    >
+      <p>{err?.message}</p>
+    </EuiCallOut>
+  ));
 
   const enableEntityStore = (enable: Enablements) => () => {
     setModalState({ visible: false });
@@ -91,7 +94,12 @@ const EntityStoreDashboardPanelsComponent = () => {
     return (
       <>
         <EuiCallOut
-          title={'There was a problem initializing the entity store'}
+          title={
+            <FormattedMessage
+              id="xpack.securitySolution.entityAnalytics.entityStore.enablement.errors.queryErrorTitle"
+              defaultMessage={'There was a problem initializing the entity store'}
+            />
+          }
           color="danger"
           iconType="error"
         >

diff --git a/...ns/security_solution/server/lib/entity_analytics/entity_store/entity_store_data_client.ts b/...ns/security_solution/server/lib/entity_analytics/entity_store/entity_store_data_client.ts
@@ -196,12 +196,6 @@ export class EntityStoreDataClient {
       // clean up any existing entity store
       await this.delete(entityType, taskManager, { deleteData: false, deleteEngine: false });
 
-      await new Promise((resolve, reject) =>
-        setTimeout(() => {
-          reject(new Error('timeout test error'));
-        }, 2000)
-      );
-
       // set up the entity manager definition
       await this.entityClient.createEntityDefinition({
         definition: {
@@ -326,7 +320,7 @@ export class EntityStoreDataClient {
     const fullEntityDefinition = await this.getExistingEntityDefinition(entityType);
     await this.entityClient.startEntityDefinition(fullEntityDefinition);
 
-    return this.engineClient.setStatus(entityType, ENGINE_STATUS.STARTED);
+    return this.engineClient.updateStatus(entityType, ENGINE_STATUS.STARTED);
   }
 
   public async stop(entityType: EntityType) {
@@ -346,7 +340,7 @@ export class EntityStoreDataClient {
     const fullEntityDefinition = await this.getExistingEntityDefinition(entityType);
     await this.entityClient.stopEntityDefinition(fullEntityDefinition);
 
-    return this.engineClient.setStatus(entityType, ENGINE_STATUS.STOPPED);
+    return this.engineClient.updateStatus(entityType, ENGINE_STATUS.STOPPED);
   }
 
   public async get(entityType: EntityType) {
@@ -513,7 +507,7 @@ export class EntityStoreDataClient {
         }
 
         // Update savedObject status
-        await this.engineClient.setStatus(engine.type, ENGINE_STATUS.UPDATING);
+        await this.engineClient.updateStatus(engine.type, ENGINE_STATUS.UPDATING);
 
         try {
           // Update entity manager definition
@@ -526,12 +520,12 @@ export class EntityStoreDataClient {
           });
 
           // Restore the savedObject status and set the new index pattern
-          await this.engineClient.setStatus(engine.type, originalStatus);
+          await this.engineClient.updateStatus(engine.type, originalStatus);
 
           return { type: engine.type, changes: { indexPatterns } };
         } catch (error) {
           // Rollback the engine initial status when the update fails
-          await this.engineClient.setStatus(engine.type, originalStatus);
+          await this.engineClient.updateStatus(engine.type, originalStatus);
 
           throw error;
         }

diff --git a/...urity_solution/server/lib/entity_analytics/entity_store/saved_object/engine_descriptor.ts b/...urity_solution/server/lib/entity_analytics/entity_store/saved_object/engine_descriptor.ts
@@ -89,15 +89,8 @@ export class EngineDescriptorClient {
     return attributes;
   }
 
-  async setStatus(entityType: EntityType, status: EngineStatus) {
-    const id = this.getSavedObjectId(entityType);
-    const { attributes } = await this.deps.soClient.update<EngineDescriptor>(
-      entityEngineDescriptorTypeName,
-      id,
-      { status },
-      { refresh: 'wait_for' }
-    );
-    return attributes;
+  async updateStatus(entityType: EntityType, status: EngineStatus) {
+    return this.update(entityType, { status });
   }
 
   async find(entityType: EntityType): Promise<SavedObjectsFindResponse<EngineDescriptor>> {

diff --git a/..._solution/server/lib/entity_analytics/entity_store/saved_object/engine_descriptor_type.ts b/..._solution/server/lib/entity_analytics/entity_store/saved_object/engine_descriptor_type.ts
@@ -30,9 +30,6 @@ export const entityEngineDescriptorTypeMappings: SavedObjectsType['mappings'] =
       type: 'integer',
       index: false,
     },
-    error: {
-      type: 'object',
-    },
   },
 };
 
@@ -58,33 +55,11 @@ const version1: SavedObjectsModelVersion = {
   ],
 };
 
-const version2: SavedObjectsModelVersion = {
-  changes: [
-    {
-      type: 'mappings_addition',
-      addedMappings: {
-        error: { type: 'object' },
-      },
-    },
-    {
-      type: 'data_backfill',
-      backfillFn: (document) => {
-        return {
-          attributes: {
-            ...document.attributes,
-            error: null,
-          },
-        };
-      },
-    },
-  ],
-};
-
 export const entityEngineDescriptorType: SavedObjectsType = {
   name: entityEngineDescriptorTypeName,
   indexPattern: SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
   hidden: false,
   namespaceType: 'multiple-isolated',
   mappings: entityEngineDescriptorTypeMappings,
-  modelVersions: { 1: version1, 2: version2 },
+  modelVersions: { 1: version1 },
 };