mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
# Backport This will backport the following commits from `main` to `8.16`: - [[Entity Analytics] [Entity Store] Show errors on entity store enablement (#198263)](https://github.com/elastic/kibana/pull/198263) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Tiago Vila Verde","email":"tiago.vilaverde@elastic.co"},"sourceCommit":{"committedDate":"2024-10-31T03:44:43Z","message":"[Entity Analytics] [Entity Store] Show errors on entity store enablement (#198263)\n\n## Summary\r\n\r\nThis PR adds user feedback for errors that happen when enabling the\r\nentity store.\r\nAny errors during the async setup of store resources will show up as\r\ntoasts, whist initial INIT request failures will appear as an error\r\ncallout.\r\n\r\n\r\n\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"4538481be0c7f519fe716cca611b2ebfa5f89351","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Theme: entity_analytics","Team:Entity Analytics","v8.16.0","backport:version","v8.17.0"],"title":"[Entity Analytics] [Entity Store] Show errors on entity store enablement","number":198263,"url":"https://github.com/elastic/kibana/pull/198263","mergeCommit":{"message":"[Entity Analytics] [Entity Store] Show errors on entity store enablement (#198263)\n\n## Summary\r\n\r\nThis PR adds user feedback for errors that happen when enabling the\r\nentity store.\r\nAny errors during the async setup of store resources will show up as\r\ntoasts, whist initial INIT request failures will appear as an error\r\ncallout.\r\n\r\n\r\n\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"4538481be0c7f519fe716cca611b2ebfa5f89351"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198263","number":198263,"mergeCommit":{"message":"[Entity Analytics] [Entity Store] Show errors on entity store enablement (#198263)\n\n## Summary\r\n\r\nThis PR adds user feedback for errors that happen when enabling the\r\nentity store.\r\nAny errors during the async setup of store resources will show up as\r\ntoasts, whist initial INIT request failures will appear as an error\r\ncallout.\r\n\r\n\r\n\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"4538481be0c7f519fe716cca611b2ebfa5f89351"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Tiago Vila Verde <tiago.vilaverde@elastic.co>
This commit is contained in:
parent
60b297fa98
commit
e3b5c87704
13 changed files with 111 additions and 12 deletions
|
@ -24473,6 +24473,8 @@ components:
|
|||
Security_Entity_Analytics_API_EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -24473,6 +24473,8 @@ components:
|
|||
Security_Entity_Analytics_API_EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -39370,6 +39370,8 @@ components:
|
|||
Security_Entity_Analytics_API_EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -39370,6 +39370,8 @@ components:
|
|||
Security_Entity_Analytics_API_EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -36,6 +36,7 @@ export const EngineDescriptor = z.object({
|
|||
status: EngineStatus,
|
||||
filter: z.string().optional(),
|
||||
fieldHistoryLength: z.number().int(),
|
||||
error: z.object({}).optional(),
|
||||
});
|
||||
|
||||
export type InspectQuery = z.infer<typeof InspectQuery>;
|
||||
|
|
|
@ -30,6 +30,8 @@ components:
|
|||
type: string
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
error:
|
||||
type: object
|
||||
|
||||
EngineStatus:
|
||||
type: string
|
||||
|
|
|
@ -770,6 +770,8 @@ components:
|
|||
EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -770,6 +770,8 @@ components:
|
|||
EngineDescriptor:
|
||||
type: object
|
||||
properties:
|
||||
error:
|
||||
type: object
|
||||
fieldHistoryLength:
|
||||
type: integer
|
||||
filter:
|
||||
|
|
|
@ -15,6 +15,7 @@ import {
|
|||
EuiLoadingLogo,
|
||||
EuiPanel,
|
||||
EuiImage,
|
||||
EuiCallOut,
|
||||
} from '@elastic/eui';
|
||||
|
||||
import { FormattedMessage } from '@kbn/i18n-react';
|
||||
|
@ -50,9 +51,25 @@ const EntityStoreDashboardPanelsComponent = () => {
|
|||
const entityStore = useEntityEngineStatus();
|
||||
const riskEngineStatus = useRiskEngineStatus();
|
||||
|
||||
const { enable: enableStore } = useEntityStoreEnablement();
|
||||
const { enable: enableStore, query } = useEntityStoreEnablement();
|
||||
|
||||
const { mutate: initRiskEngine } = useInitRiskEngineMutation();
|
||||
|
||||
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 });
|
||||
if (enable.riskScore) {
|
||||
|
@ -74,6 +91,26 @@ const EntityStoreDashboardPanelsComponent = () => {
|
|||
}
|
||||
};
|
||||
|
||||
if (query.error) {
|
||||
return (
|
||||
<>
|
||||
<EuiCallOut
|
||||
title={
|
||||
<FormattedMessage
|
||||
id="xpack.securitySolution.entityAnalytics.entityStore.enablement.errors.queryErrorTitle"
|
||||
defaultMessage={'There was a problem initializing the entity store'}
|
||||
/>
|
||||
}
|
||||
color="danger"
|
||||
iconType="error"
|
||||
>
|
||||
<p>{(query.error as { body: { message: string } }).body.message}</p>
|
||||
</EuiCallOut>
|
||||
{callouts}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
if (entityStore.status === 'loading') {
|
||||
return (
|
||||
<EuiPanel hasBorder>
|
||||
|
@ -110,6 +147,29 @@ const EntityStoreDashboardPanelsComponent = () => {
|
|||
|
||||
return (
|
||||
<EuiFlexGroup direction="column" data-test-subj="entityStorePanelsGroup">
|
||||
{entityStore.status === 'error' && isRiskScoreAvailable && (
|
||||
<>
|
||||
{callouts}
|
||||
<EuiFlexItem>
|
||||
<EntityAnalyticsRiskScores riskEntity={RiskScoreEntity.user} />
|
||||
</EuiFlexItem>
|
||||
<EuiFlexItem>
|
||||
<EntityAnalyticsRiskScores riskEntity={RiskScoreEntity.host} />
|
||||
</EuiFlexItem>
|
||||
</>
|
||||
)}
|
||||
{entityStore.status === 'error' && !isRiskScoreAvailable && (
|
||||
<>
|
||||
{callouts}
|
||||
<EuiFlexItem>
|
||||
<EnableEntityStore
|
||||
onEnable={() => setModalState({ visible: true })}
|
||||
loadingRiskEngine={riskEngineInitializing}
|
||||
enablements="riskScore"
|
||||
/>
|
||||
</EuiFlexItem>
|
||||
</>
|
||||
)}
|
||||
{entityStore.status === 'enabled' && isRiskScoreAvailable && (
|
||||
<>
|
||||
<EuiFlexItem>
|
||||
|
|
|
@ -17,6 +17,10 @@ interface Options {
|
|||
polling?: UseQueryOptions<ListEntityEnginesResponse>['refetchInterval'];
|
||||
}
|
||||
|
||||
interface EngineError {
|
||||
message: string;
|
||||
}
|
||||
|
||||
export const useEntityEngineStatus = (opts: Options = {}) => {
|
||||
// QUESTION: Maybe we should have an `EnablementStatus` API route for this?
|
||||
const { listEntityEngines } = useEntityStoreRoutes();
|
||||
|
@ -33,6 +37,10 @@ export const useEntityEngineStatus = (opts: Options = {}) => {
|
|||
return 'not_installed';
|
||||
}
|
||||
|
||||
if (data?.engines?.some((engine) => engine.status === 'error')) {
|
||||
return 'error';
|
||||
}
|
||||
|
||||
if (data?.engines?.every((engine) => engine.status === 'stopped')) {
|
||||
return 'stopped';
|
||||
}
|
||||
|
@ -52,7 +60,12 @@ export const useEntityEngineStatus = (opts: Options = {}) => {
|
|||
return 'enabled';
|
||||
})();
|
||||
|
||||
const errors = (data?.engines
|
||||
?.filter((engine) => engine.status === 'error')
|
||||
.map((engine) => engine.error) ?? []) as EngineError[];
|
||||
|
||||
return {
|
||||
status,
|
||||
errors,
|
||||
};
|
||||
};
|
||||
|
|
|
@ -41,7 +41,7 @@ export const useEntityStoreEnablement = () => {
|
|||
});
|
||||
|
||||
const { initEntityStore } = useEntityStoreRoutes();
|
||||
const { refetch: initialize } = useQuery({
|
||||
const { refetch: initialize, ...query } = useQuery({
|
||||
queryKey: [ENTITY_STORE_ENABLEMENT_INIT],
|
||||
queryFn: async () =>
|
||||
initEntityStore('user').then((usr) => initEntityStore('host').then((host) => [usr, host])),
|
||||
|
@ -52,10 +52,10 @@ export const useEntityStoreEnablement = () => {
|
|||
telemetry?.reportEntityStoreInit({
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
initialize().then(() => setPolling(true));
|
||||
return initialize().then(() => setPolling(true));
|
||||
}, [initialize, telemetry]);
|
||||
|
||||
return { enable };
|
||||
return { enable, query };
|
||||
};
|
||||
|
||||
export const INIT_ENTITY_ENGINE_STATUS_KEY = ['POST', 'INIT_ENTITY_ENGINE'];
|
||||
|
|
|
@ -279,7 +279,14 @@ export class EntityStoreDataClient {
|
|||
error: err.message,
|
||||
});
|
||||
|
||||
await this.engineClient.update(entityType, ENGINE_STATUS.ERROR);
|
||||
await this.engineClient.update(entityType, {
|
||||
status: ENGINE_STATUS.ERROR,
|
||||
error: {
|
||||
message: err.message,
|
||||
stack: err.stack,
|
||||
action: 'init',
|
||||
},
|
||||
});
|
||||
|
||||
await this.delete(entityType, taskManager, { deleteData: true, deleteEngine: false });
|
||||
}
|
||||
|
@ -318,7 +325,7 @@ export class EntityStoreDataClient {
|
|||
const fullEntityDefinition = await this.getExistingEntityDefinition(entityType);
|
||||
await this.entityClient.startEntityDefinition(fullEntityDefinition);
|
||||
|
||||
return this.engineClient.update(entityType, ENGINE_STATUS.STARTED);
|
||||
return this.engineClient.updateStatus(entityType, ENGINE_STATUS.STARTED);
|
||||
}
|
||||
|
||||
public async stop(entityType: EntityType) {
|
||||
|
@ -338,7 +345,7 @@ export class EntityStoreDataClient {
|
|||
const fullEntityDefinition = await this.getExistingEntityDefinition(entityType);
|
||||
await this.entityClient.stopEntityDefinition(fullEntityDefinition);
|
||||
|
||||
return this.engineClient.update(entityType, ENGINE_STATUS.STOPPED);
|
||||
return this.engineClient.updateStatus(entityType, ENGINE_STATUS.STOPPED);
|
||||
}
|
||||
|
||||
public async get(entityType: EntityType) {
|
||||
|
@ -511,7 +518,7 @@ export class EntityStoreDataClient {
|
|||
}
|
||||
|
||||
// Update savedObject status
|
||||
await this.engineClient.update(engine.type, ENGINE_STATUS.UPDATING);
|
||||
await this.engineClient.updateStatus(engine.type, ENGINE_STATUS.UPDATING);
|
||||
|
||||
try {
|
||||
// Update entity manager definition
|
||||
|
@ -524,12 +531,12 @@ export class EntityStoreDataClient {
|
|||
});
|
||||
|
||||
// Restore the savedObject status and set the new index pattern
|
||||
await this.engineClient.update(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.update(engine.type, originalStatus);
|
||||
await this.engineClient.updateStatus(engine.type, originalStatus);
|
||||
|
||||
throw error;
|
||||
}
|
||||
|
|
|
@ -78,17 +78,21 @@ export class EngineDescriptorClient {
|
|||
return attributes;
|
||||
}
|
||||
|
||||
async update(entityType: EntityType, status: EngineStatus) {
|
||||
async update(entityType: EntityType, engine: Partial<EngineDescriptor>) {
|
||||
const id = this.getSavedObjectId(entityType);
|
||||
const { attributes } = await this.deps.soClient.update<EngineDescriptor>(
|
||||
entityEngineDescriptorTypeName,
|
||||
id,
|
||||
{ status },
|
||||
engine,
|
||||
{ refresh: 'wait_for' }
|
||||
);
|
||||
return attributes;
|
||||
}
|
||||
|
||||
async updateStatus(entityType: EntityType, status: EngineStatus) {
|
||||
return this.update(entityType, { status });
|
||||
}
|
||||
|
||||
async find(entityType: EntityType): Promise<SavedObjectsFindResponse<EngineDescriptor>> {
|
||||
return this.deps.soClient.find<EngineDescriptor>({
|
||||
type: entityEngineDescriptorTypeName,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue