From 55d94c772a18282b989fe2fa6d8ded9340826982 Mon Sep 17 00:00:00 2001 From: Khristinin Nikita Date: Thu, 9 Nov 2023 12:04:34 +0100 Subject: [PATCH] Move to EA (#170824) ## Summary This PR is simply moving the `risk_engine` folder into the `entity_analytics` folder, to be able better consolidate future architecture modules like `asset_criticality` and potential others --- .github/CODEOWNERS | 2 +- .../security_solution/public/entity_analytics/api/api.ts | 2 +- .../api/hooks/use_disable_risk_engine_mutation.ts | 2 +- .../api/hooks/use_enable_risk_engine_mutation.ts | 2 +- .../api/hooks/use_init_risk_engine_mutation.ts | 2 +- .../detection_engine/routes/__mocks__/request_context.ts | 2 +- .../risk_engine/calculate_and_persist_risk_scores.mock.ts | 0 .../risk_engine/calculate_and_persist_risk_scores.test.ts | 0 .../risk_engine/calculate_and_persist_risk_scores.ts | 0 .../risk_engine/calculate_risk_scores.mock.ts | 2 +- .../risk_engine/calculate_risk_scores.test.ts | 0 .../risk_engine/calculate_risk_scores.ts | 6 +++--- .../{ => entity_analytics}/risk_engine/configurations.ts | 4 ++-- .../risk_engine/get_risk_inputs_index.mock.ts | 0 .../risk_engine/get_risk_inputs_index.test.ts | 0 .../risk_engine/get_risk_inputs_index.ts | 0 .../{ => entity_analytics}/risk_engine/helpers.test.ts | 0 .../lib/{ => entity_analytics}/risk_engine/helpers.ts | 2 +- .../risk_engine/risk_engine_data_client.mock.ts | 0 .../risk_engine/risk_engine_data_client.test.ts | 2 +- .../risk_engine/risk_engine_data_client.ts | 6 +++--- .../risk_engine/risk_engine_data_writer.test.ts | 0 .../risk_engine/risk_engine_data_writer.ts | 2 +- .../risk_engine/risk_score_service.mock.ts | 2 +- .../risk_engine/risk_score_service.ts | 0 .../risk_engine/risk_weights.test.ts | 2 +- .../{ => entity_analytics}/risk_engine/risk_weights.ts | 4 ++-- .../{ => entity_analytics}/risk_engine/routes/index.ts | 0 .../risk_engine/routes/risk_engine_disable_route.test.ts | 4 ++-- .../risk_engine/routes/risk_engine_disable_route.ts | 6 +++--- .../risk_engine/routes/risk_engine_enable_route.test.ts | 4 ++-- .../risk_engine/routes/risk_engine_enable_route.ts | 6 +++--- .../risk_engine/routes/risk_engine_init_route.ts | 6 +++--- .../risk_engine/routes/risk_engine_status_route.ts | 4 ++-- .../routes/risk_score_calculation_route.test.ts | 4 ++-- .../risk_engine/routes/risk_score_calculation_route.ts | 8 ++++---- .../risk_engine/routes/risk_score_preview_route.test.ts | 6 +++--- .../risk_engine/routes/risk_score_preview_route.ts | 8 ++++---- .../risk_engine/routes/translations.ts | 0 .../risk_engine/saved_object/index.ts | 0 .../saved_object/risk_engine_configuration_type.ts | 0 .../risk_engine/schema/risk_score_apis.yml | 0 .../{ => entity_analytics}/risk_engine/tasks/constants.ts | 0 .../risk_engine/tasks/helpers.test.ts | 0 .../{ => entity_analytics}/risk_engine/tasks/helpers.ts | 2 +- .../lib/{ => entity_analytics}/risk_engine/tasks/index.ts | 0 .../risk_engine/tasks/risk_scoring_task.mock.ts | 0 .../risk_engine/tasks/risk_scoring_task.test.ts | 0 .../risk_engine/tasks/risk_scoring_task.ts | 8 ++++---- .../lib/{ => entity_analytics}/risk_engine/tasks/state.ts | 0 .../lib/{ => entity_analytics}/risk_engine/types.ts | 2 +- .../risk_engine/utils/create_datastream.ts | 0 .../risk_engine/utils/create_index.ts | 0 .../risk_engine/utils/retry_transient_es_errors.test.ts | 0 .../risk_engine/utils/retry_transient_es_errors.ts | 0 .../risk_engine/utils/saved_object_configuration.ts | 2 +- .../risk_engine/utils/transforms.test.ts | 0 .../risk_engine/utils/transforms.ts | 4 ++-- x-pack/plugins/security_solution/server/plugin.ts | 2 +- .../security_solution/server/request_context_factory.ts | 2 +- x-pack/plugins/security_solution/server/routes/index.ts | 4 ++-- x-pack/plugins/security_solution/server/saved_objects.ts | 2 +- x-pack/plugins/security_solution/server/types.ts | 2 +- .../group10/risk_engine/init_and_status_apis.ts | 2 +- .../security_and_spaces/group10/risk_engine/utils.ts | 2 +- 65 files changed, 67 insertions(+), 67 deletions(-) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_and_persist_risk_scores.mock.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_and_persist_risk_scores.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_and_persist_risk_scores.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_risk_scores.mock.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_risk_scores.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/calculate_risk_scores.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/configurations.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/get_risk_inputs_index.mock.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/get_risk_inputs_index.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/get_risk_inputs_index.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/helpers.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/helpers.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_engine_data_client.mock.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_engine_data_client.test.ts (99%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_engine_data_client.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_engine_data_writer.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_engine_data_writer.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_score_service.mock.ts (94%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_score_service.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_weights.test.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/risk_weights.ts (96%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/index.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_disable_route.test.ts (96%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_disable_route.ts (89%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_enable_route.test.ts (96%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_enable_route.ts (89%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_init_route.ts (93%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_engine_status_route.ts (91%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_score_calculation_route.test.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_score_calculation_route.ts (89%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_score_preview_route.test.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/risk_score_preview_route.ts (90%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/routes/translations.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/saved_object/index.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/saved_object/risk_engine_configuration_type.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/schema/risk_score_apis.yml (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/constants.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/helpers.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/helpers.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/index.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/risk_scoring_task.mock.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/risk_scoring_task.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/risk_scoring_task.ts (96%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/tasks/state.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/types.ts (98%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/create_datastream.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/create_index.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/retry_transient_es_errors.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/retry_transient_es_errors.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/saved_object_configuration.ts (97%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/transforms.test.ts (100%) rename x-pack/plugins/security_solution/server/lib/{ => entity_analytics}/risk_engine/utils/transforms.ts (97%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 74ac68c1c0dd63..3e96ce3a0a6163 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1436,7 +1436,7 @@ x-pack/plugins/security_solution/public/entity_analytics @elastic/security-entit x-pack/plugins/security_solution/public/explore/components/risk_score @elastic/security-entity-analytics x-pack/plugins/security_solution/public/overview/pages/entity_analytics.tsx @elastic/security-entity-analytics x-pack/plugins/security_solution/public/overview/components/entity_analytics -x-pack/plugins/security_solution/server/lib/risk_engine @elastic/security-entity-analytics +x-pack/plugins/security_solution/server/lib/entity_analytics @elastic/security-entity-analytics x-pack/plugins/security_solution/server/lib/risk_score @elastic/security-entity-analytics x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine @elastic/security-entity-analytics diff --git a/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts b/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts index cc2b01f75da570..6b92583b1ddde6 100644 --- a/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts +++ b/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts @@ -20,7 +20,7 @@ import type { GetRiskEngineStatusResponse, InitRiskEngineResponse, DisableRiskEngineResponse, -} from '../../../server/lib/risk_engine/types'; +} from '../../../server/lib/entity_analytics/risk_engine/types'; import type { RiskScorePreviewRequestSchema } from '../../../common/risk_engine/risk_score_preview/request_schema'; /** diff --git a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_disable_risk_engine_mutation.ts b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_disable_risk_engine_mutation.ts index 997e93136339ed..68b63300061b61 100644 --- a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_disable_risk_engine_mutation.ts +++ b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_disable_risk_engine_mutation.ts @@ -11,7 +11,7 @@ import { useInvalidateRiskEngineStatusQuery } from './use_risk_engine_status'; import type { EnableRiskEngineResponse, EnableDisableRiskEngineErrorResponse, -} from '../../../../server/lib/risk_engine/types'; +} from '../../../../server/lib/entity_analytics/risk_engine/types'; export const DISABLE_RISK_ENGINE_MUTATION_KEY = ['POST', 'DISABLE_RISK_ENGINE']; diff --git a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_enable_risk_engine_mutation.ts b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_enable_risk_engine_mutation.ts index 3875a79399dccf..40b3f1b4bddb68 100644 --- a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_enable_risk_engine_mutation.ts +++ b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_enable_risk_engine_mutation.ts @@ -11,7 +11,7 @@ import { useInvalidateRiskEngineStatusQuery } from './use_risk_engine_status'; import type { EnableRiskEngineResponse, EnableDisableRiskEngineErrorResponse, -} from '../../../../server/lib/risk_engine/types'; +} from '../../../../server/lib/entity_analytics/risk_engine/types'; export const ENABLE_RISK_ENGINE_MUTATION_KEY = ['POST', 'ENABLE_RISK_ENGINE']; export const useEnableRiskEngineMutation = (options?: UseMutationOptions<{}>) => { diff --git a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_init_risk_engine_mutation.ts b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_init_risk_engine_mutation.ts index d220885148caca..35b1071b62b80f 100644 --- a/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_init_risk_engine_mutation.ts +++ b/x-pack/plugins/security_solution/public/entity_analytics/api/hooks/use_init_risk_engine_mutation.ts @@ -11,7 +11,7 @@ import { useInvalidateRiskEngineStatusQuery } from './use_risk_engine_status'; import type { InitRiskEngineResponse, InitRiskEngineError, -} from '../../../../server/lib/risk_engine/types'; +} from '../../../../server/lib/entity_analytics/risk_engine/types'; export const INIT_RISK_ENGINE_STATUS_KEY = ['POST', 'INIT_RISK_ENGINE']; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts index e68e84acf60292..f65d788945debb 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts @@ -34,7 +34,7 @@ import type { import { getEndpointAuthzInitialStateMock } from '../../../../../common/endpoint/service/authz/mocks'; import type { EndpointAuthz } from '../../../../../common/endpoint/types/authz'; -import { riskEngineDataClientMock } from '../../../risk_engine/risk_engine_data_client.mock'; +import { riskEngineDataClientMock } from '../../../entity_analytics/risk_engine/risk_engine_data_client.mock'; export const createMockClients = () => { const core = coreMock.createRequestHandlerContext(); diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.mock.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.mock.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_and_persist_risk_scores.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_and_persist_risk_scores.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.mock.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.mock.ts index 183a00eb0fe5c3..c81d1336c162b9 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.mock.ts @@ -9,7 +9,7 @@ import { ALERT_RISK_SCORE, ALERT_RULE_NAME, } from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names'; -import { RiskCategories } from '../../../common/risk_engine'; +import { RiskCategories } from '../../../../common/risk_engine'; import type { CalculateRiskScoreAggregations, CalculateScoresResponse, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.ts index a5c22b867b72fc..ecacf950202517 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/calculate_risk_scores.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/calculate_risk_scores.ts @@ -22,9 +22,9 @@ import type { IdentifierType, RiskWeights, RiskScore, -} from '../../../common/risk_engine'; -import { RiskCategories } from '../../../common/risk_engine'; -import { withSecuritySpan } from '../../utils/with_security_span'; +} from '../../../../common/risk_engine'; +import { RiskCategories } from '../../../../common/risk_engine'; +import { withSecuritySpan } from '../../../utils/with_security_span'; import { getAfterKeyForIdentifierType, getFieldForIdentifierAgg } from './helpers'; import { buildCategoryCountDeclarations, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/configurations.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/configurations.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/configurations.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/configurations.ts index 6f9a49bb47bbb6..35547187e4ddc0 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/configurations.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/configurations.ts @@ -5,8 +5,8 @@ * 2.0. */ import type { FieldMap } from '@kbn/alerts-as-data-utils'; -import type { IdentifierType } from '../../../common/risk_engine'; -import { RiskScoreEntity, riskScoreBaseIndexName } from '../../../common/risk_engine'; +import type { IdentifierType } from '../../../../common/risk_engine'; +import { RiskScoreEntity, riskScoreBaseIndexName } from '../../../../common/risk_engine'; import type { IIndexPatternString } from './utils/create_datastream'; const commonRiskFields: FieldMap = { diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.mock.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.mock.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/get_risk_inputs_index.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/get_risk_inputs_index.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/helpers.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/helpers.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/helpers.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/helpers.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/helpers.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/helpers.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/helpers.ts index 90a7b0c54c2754..09836ff94fe2df 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/helpers.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/helpers.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { AfterKey, AfterKeys, IdentifierType } from '../../../common/risk_engine'; +import type { AfterKey, AfterKeys, IdentifierType } from '../../../../common/risk_engine'; import type { CalculateAndPersistScoresResponse } from './types'; export const getFieldForIdentifierAgg = (identifierType: IdentifierType): string => diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.mock.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.mock.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.test.ts similarity index 99% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.test.ts index 8dc2da15c2e185..619952859fc0f2 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.test.ts @@ -67,7 +67,7 @@ jest.mock('./utils/create_datastream', () => ({ createDataStream: jest.fn(), })); -jest.mock('../risk_score/transform/helpers/transforms', () => ({ +jest.mock('../../risk_score/transform/helpers/transforms', () => ({ createAndStartTransform: jest.fn(), })); diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.ts index 269f4b6dad9fd7..ea564ffe2395c5 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_client.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_client.ts @@ -26,13 +26,13 @@ import { import { createDataStream } from './utils/create_datastream'; import type { RiskEngineDataWriter as Writer } from './risk_engine_data_writer'; import { RiskEngineDataWriter } from './risk_engine_data_writer'; -import type { InitRiskEngineResult } from '../../../common/risk_engine'; +import type { InitRiskEngineResult } from '../../../../common/risk_engine'; import { RiskEngineStatus, getRiskScoreLatestIndex, MAX_SPACES_COUNT, RiskScoreEntity, -} from '../../../common/risk_engine'; +} from '../../../../common/risk_engine'; import { getLegacyTransforms, getLatestTransformId, @@ -48,7 +48,7 @@ import { import { getRiskInputsIndex } from './get_risk_inputs_index'; import { removeRiskScoringTask, startRiskScoringTask } from './tasks'; import { createIndex } from './utils/create_index'; -import { bulkDeleteSavedObjects } from '../risk_score/prebuilt_saved_objects/helpers/bulk_delete_saved_objects'; +import { bulkDeleteSavedObjects } from '../../risk_score/prebuilt_saved_objects/helpers/bulk_delete_saved_objects'; interface InitOpts { namespace: string; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_writer.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_writer.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_writer.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_writer.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_writer.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_writer.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_writer.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_writer.ts index a897dd0462f693..8e859449bb32d2 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_engine_data_writer.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_engine_data_writer.ts @@ -7,7 +7,7 @@ import type { BulkOperationContainer } from '@elastic/elasticsearch/lib/api/types'; import type { Logger, ElasticsearchClient } from '@kbn/core/server'; -import type { IdentifierType, RiskScore } from '../../../common/risk_engine'; +import type { IdentifierType, RiskScore } from '../../../../common/risk_engine'; interface WriterBulkResponse { errors: string[]; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_score_service.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_score_service.mock.ts similarity index 94% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_score_service.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_score_service.mock.ts index 54fd66c7d3e971..68b5b55dbda429 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_score_service.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_score_service.mock.ts @@ -6,7 +6,7 @@ */ import type { RiskScoreService } from './risk_score_service'; -import type { RiskScore } from '../../../common/risk_engine'; +import type { RiskScore } from '../../../../common/risk_engine'; const createRiskScoreMock = (overrides: Partial = {}): RiskScore => ({ '@timestamp': '2023-02-15T00:15:19.231Z', diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_score_service.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_score_service.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_score_service.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_score_service.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.test.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.test.ts index 0bc25121771bd6..40b3ee800b1bda 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { RiskWeightTypes, RiskCategories } from '../../../common/risk_engine'; +import { RiskWeightTypes, RiskCategories } from '../../../../common/risk_engine'; import { buildCategoryAssignment, buildCategoryWeights, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.ts similarity index 96% rename from x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.ts index 34ab491b74b048..225887f2dce55c 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/risk_weights.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/risk_weights.ts @@ -12,8 +12,8 @@ import type { RiskCategoryRiskWeight, RiskWeight, RiskWeights, -} from '../../../common/risk_engine'; -import { RiskCategories, RiskWeightTypes } from '../../../common/risk_engine'; +} from '../../../../common/risk_engine'; +import { RiskCategories, RiskWeightTypes } from '../../../../common/risk_engine'; const RISK_CATEGORIES = Object.values(RiskCategories); diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/index.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/index.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/index.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/index.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.test.ts similarity index 96% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.test.ts index 90a2182fee5731..23e58896199a90 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.test.ts @@ -8,12 +8,12 @@ import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks'; import { riskEngineDisableRoute } from './risk_engine_disable_route'; -import { RISK_ENGINE_DISABLE_URL } from '../../../../common/constants'; +import { RISK_ENGINE_DISABLE_URL } from '../../../../../common/constants'; import { serverMock, requestContextMock, requestMock, -} from '../../detection_engine/routes/__mocks__'; +} from '../../../detection_engine/routes/__mocks__'; import { riskEngineDataClientMock } from '../risk_engine_data_client.mock'; describe('risk score disable route', () => { diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.ts similarity index 89% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.ts index 6a2221c4eb2be5..dde7ddbee9e83e 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_disable_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_disable_route.ts @@ -8,10 +8,10 @@ import type { StartServicesAccessor } from '@kbn/core/server'; import { buildSiemResponse } from '@kbn/lists-plugin/server/routes/utils'; import { transformError } from '@kbn/securitysolution-es-utils'; -import { RISK_ENGINE_DISABLE_URL, APP_ID } from '../../../../common/constants'; +import { RISK_ENGINE_DISABLE_URL, APP_ID } from '../../../../../common/constants'; +import type { StartPlugins } from '../../../../plugin'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; import { TASK_MANAGER_UNAVAILABLE_ERROR } from './translations'; -import type { StartPlugins } from '../../../plugin'; -import type { SecuritySolutionPluginRouter } from '../../../types'; export const riskEngineDisableRoute = ( router: SecuritySolutionPluginRouter, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.test.ts similarity index 96% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.test.ts index b64fd3f025c41d..79a6c88c4fadfa 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.test.ts @@ -8,12 +8,12 @@ import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks'; import { riskEngineEnableRoute } from './risk_engine_enable_route'; -import { RISK_ENGINE_ENABLE_URL } from '../../../../common/constants'; +import { RISK_ENGINE_ENABLE_URL } from '../../../../../common/constants'; import { serverMock, requestContextMock, requestMock, -} from '../../detection_engine/routes/__mocks__'; +} from '../../../detection_engine/routes/__mocks__'; import { riskEngineDataClientMock } from '../risk_engine_data_client.mock'; describe('risk score enable route', () => { diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.ts similarity index 89% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.ts index cd8cb05072ff14..bebc8b7236bb8d 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_enable_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_enable_route.ts @@ -8,10 +8,10 @@ import type { StartServicesAccessor } from '@kbn/core/server'; import { buildSiemResponse } from '@kbn/lists-plugin/server/routes/utils'; import { transformError } from '@kbn/securitysolution-es-utils'; -import { RISK_ENGINE_ENABLE_URL, APP_ID } from '../../../../common/constants'; +import { RISK_ENGINE_ENABLE_URL, APP_ID } from '../../../../../common/constants'; import { TASK_MANAGER_UNAVAILABLE_ERROR } from './translations'; -import type { StartPlugins } from '../../../plugin'; -import type { SecuritySolutionPluginRouter } from '../../../types'; +import type { StartPlugins } from '../../../../plugin'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; export const riskEngineEnableRoute = ( router: SecuritySolutionPluginRouter, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_init_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_init_route.ts similarity index 93% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_init_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_init_route.ts index bacd8ba55bcf06..e5b719dfbc42ff 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_init_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_init_route.ts @@ -8,10 +8,10 @@ import type { StartServicesAccessor } from '@kbn/core/server'; import { buildSiemResponse } from '@kbn/lists-plugin/server/routes/utils'; import { transformError } from '@kbn/securitysolution-es-utils'; -import { RISK_ENGINE_INIT_URL, APP_ID } from '../../../../common/constants'; -import type { StartPlugins } from '../../../plugin'; +import { RISK_ENGINE_INIT_URL, APP_ID } from '../../../../../common/constants'; +import type { StartPlugins } from '../../../../plugin'; import { TASK_MANAGER_UNAVAILABLE_ERROR } from './translations'; -import type { SecuritySolutionPluginRouter } from '../../../types'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; export const riskEngineInitRoute = ( router: SecuritySolutionPluginRouter, diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_status_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_status_route.ts similarity index 91% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_status_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_status_route.ts index 4d8c9a1547f68e..a7d649c0d77845 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_engine_status_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_engine_status_route.ts @@ -7,9 +7,9 @@ import { buildSiemResponse } from '@kbn/lists-plugin/server/routes/utils'; import { transformError } from '@kbn/securitysolution-es-utils'; -import { RISK_ENGINE_STATUS_URL, APP_ID } from '../../../../common/constants'; +import { RISK_ENGINE_STATUS_URL, APP_ID } from '../../../../../common/constants'; -import type { SecuritySolutionPluginRouter } from '../../../types'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; export const riskEngineStatusRoute = (router: SecuritySolutionPluginRouter) => { router.versioned diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.test.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.test.ts index 2792727ae74f15..7cf7b5304a01d6 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.test.ts @@ -9,12 +9,12 @@ import { riskScoreCalculationRoute } from './risk_score_calculation_route'; import { loggerMock } from '@kbn/logging-mocks'; -import { RISK_SCORE_CALCULATION_URL } from '../../../../common/constants'; +import { RISK_SCORE_CALCULATION_URL } from '../../../../../common/constants'; import { serverMock, requestContextMock, requestMock, -} from '../../detection_engine/routes/__mocks__'; +} from '../../../detection_engine/routes/__mocks__'; import { riskScoreServiceFactory } from '../risk_score_service'; import { riskScoreServiceMock } from '../risk_score_service.mock'; import { getRiskInputsIndex } from '../get_risk_inputs_index'; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.ts similarity index 89% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.ts index f9ebd131315626..cfbd80afb0d5fe 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_calculation_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_calculation_route.ts @@ -12,10 +12,10 @@ import { APP_ID, DEFAULT_RISK_SCORE_PAGE_SIZE, RISK_SCORE_CALCULATION_URL, -} from '../../../../common/constants'; -import { riskScoreCalculationRequestSchema } from '../../../../common/risk_engine/risk_score_calculation/request_schema'; -import type { SecuritySolutionPluginRouter } from '../../../types'; -import { buildRouteValidation } from '../../../utils/build_validation/route_validation'; +} from '../../../../../common/constants'; +import { riskScoreCalculationRequestSchema } from '../../../../../common/risk_engine/risk_score_calculation/request_schema'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; +import { buildRouteValidation } from '../../../../utils/build_validation/route_validation'; import { riskScoreServiceFactory } from '../risk_score_service'; import { getRiskInputsIndex } from '../get_risk_inputs_index'; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.test.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.test.ts index 72963995594a81..ba87e94c3ccc2f 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.test.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.test.ts @@ -7,13 +7,13 @@ import { loggerMock } from '@kbn/logging-mocks'; -import { RISK_SCORE_PREVIEW_URL } from '../../../../common/constants'; -import { RiskCategories, RiskWeightTypes } from '../../../../common/risk_engine'; +import { RISK_SCORE_PREVIEW_URL } from '../../../../../common/constants'; +import { RiskCategories, RiskWeightTypes } from '../../../../../common/risk_engine'; import { serverMock, requestContextMock, requestMock, -} from '../../detection_engine/routes/__mocks__'; +} from '../../../detection_engine/routes/__mocks__'; import { getRiskInputsIndex } from '../get_risk_inputs_index'; import { riskScoreServiceFactory } from '../risk_score_service'; import { riskScoreServiceMock } from '../risk_score_service.mock'; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.ts similarity index 90% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.ts index e91a2fa1144bb2..05f80c526a927a 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/risk_score_preview_route.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/risk_score_preview_route.ts @@ -13,10 +13,10 @@ import { APP_ID, DEFAULT_RISK_SCORE_PAGE_SIZE, RISK_SCORE_PREVIEW_URL, -} from '../../../../common/constants'; -import { riskScorePreviewRequestSchema } from '../../../../common/risk_engine/risk_score_preview/request_schema'; -import type { SecuritySolutionPluginRouter } from '../../../types'; -import { buildRouteValidation } from '../../../utils/build_validation/route_validation'; +} from '../../../../../common/constants'; +import { riskScorePreviewRequestSchema } from '../../../../../common/risk_engine/risk_score_preview/request_schema'; +import type { SecuritySolutionPluginRouter } from '../../../../types'; +import { buildRouteValidation } from '../../../../utils/build_validation/route_validation'; import { riskScoreServiceFactory } from '../risk_score_service'; import { getRiskInputsIndex } from '../get_risk_inputs_index'; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/routes/translations.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/routes/translations.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/translations.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/saved_object/index.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/saved_object/index.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/saved_object/index.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/saved_object/index.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/saved_object/risk_engine_configuration_type.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/saved_object/risk_engine_configuration_type.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/saved_object/risk_engine_configuration_type.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/saved_object/risk_engine_configuration_type.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/schema/risk_score_apis.yml b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/schema/risk_score_apis.yml similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/schema/risk_score_apis.yml rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/schema/risk_score_apis.yml diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/constants.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/constants.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/constants.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/constants.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/helpers.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/helpers.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/helpers.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/helpers.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/helpers.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/helpers.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/helpers.ts index dfacb8b78f30ad..b2db9b348b55e1 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/helpers.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/helpers.ts @@ -14,7 +14,7 @@ import { } from '@kbn/core/server'; import { addSpaceIdToPath } from '@kbn/spaces-plugin/server'; -import type { Range } from '../../../../common/risk_engine'; +import type { Range } from '../../../../../common/risk_engine'; export const convertDateToISOString = (dateString: string): string => { const date = datemath.parse(dateString); diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/index.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/index.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/index.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/index.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.mock.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.mock.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.mock.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.mock.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.ts similarity index 96% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.ts index b0482b43b5c134..525f2247b63bd4 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/risk_scoring_task.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/risk_scoring_task.ts @@ -18,8 +18,8 @@ import type { TaskManagerStartContract, } from '@kbn/task-manager-plugin/server'; import type { AnalyticsServiceSetup } from '@kbn/core-analytics-server'; -import type { AfterKeys, IdentifierType } from '../../../../common/risk_engine'; -import type { StartPlugins } from '../../../plugin'; +import type { AfterKeys, IdentifierType } from '../../../../../common/risk_engine'; +import type { StartPlugins } from '../../../../plugin'; import { type RiskScoreService, riskScoreServiceFactory } from '../risk_score_service'; import { RiskEngineDataClient } from '../risk_engine_data_client'; import { isRiskScoreCalculationComplete } from '../helpers'; @@ -30,12 +30,12 @@ import { } from './state'; import { INTERVAL, SCOPE, TIMEOUT, TYPE, VERSION } from './constants'; import { buildScopedInternalSavedObjectsClientUnsafe, convertRangeToISO } from './helpers'; -import { RiskScoreEntity } from '../../../../common/risk_engine/types'; +import { RiskScoreEntity } from '../../../../../common/risk_engine/types'; import { RISK_SCORE_EXECUTION_SUCCESS_EVENT, RISK_SCORE_EXECUTION_ERROR_EVENT, RISK_SCORE_EXECUTION_CANCELLATION_EVENT, -} from '../../telemetry/event_based/events'; +} from '../../../telemetry/event_based/events'; const logFactory = (logger: Logger, taskId: string) => diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/tasks/state.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/state.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/tasks/state.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/tasks/state.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/types.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/types.ts similarity index 98% rename from x-pack/plugins/security_solution/server/lib/risk_engine/types.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/types.ts index 4b6da2b65f5536..f5aeaf4f56428a 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/types.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/types.ts @@ -14,7 +14,7 @@ import type { Range, RiskEngineStatus, RiskScore, -} from '../../../common/risk_engine'; +} from '../../../../common/risk_engine'; export interface CalculateScoresParams { afterKeys: AfterKeys; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/create_datastream.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/create_datastream.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_index.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/create_index.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_index.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/create_index.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/retry_transient_es_errors.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/retry_transient_es_errors.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/retry_transient_es_errors.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/retry_transient_es_errors.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/retry_transient_es_errors.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/retry_transient_es_errors.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/retry_transient_es_errors.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/retry_transient_es_errors.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/saved_object_configuration.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/saved_object_configuration.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/saved_object_configuration.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/saved_object_configuration.ts index 8d1562d805e576..e39f2f73e5df26 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/saved_object_configuration.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/saved_object_configuration.ts @@ -6,7 +6,7 @@ */ import type { SavedObject, SavedObjectsClientContract } from '@kbn/core/server'; -import { getAlertsIndex } from '../../../../common/utils/risk_score_modules'; +import { getAlertsIndex } from '../../../../../common/utils/risk_score_modules'; import type { RiskEngineConfiguration } from '../types'; import { riskEngineConfigurationTypeName } from '../saved_object'; diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/transforms.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/transforms.test.ts similarity index 100% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/transforms.test.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/transforms.test.ts diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/transforms.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/transforms.ts similarity index 97% rename from x-pack/plugins/security_solution/server/lib/risk_engine/utils/transforms.ts rename to x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/transforms.ts index d1a544233339e3..b78ea9ccfa6446 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/transforms.ts +++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/utils/transforms.ts @@ -14,11 +14,11 @@ import type { TransformPutTransformRequest, TransformGetTransformStatsTransformStats, } from '@elastic/elasticsearch/lib/api/types'; -import { RiskScoreEntity } from '../../../../common/search_strategy'; +import { RiskScoreEntity } from '../../../../../common/search_strategy'; import { getRiskScorePivotTransformId, getRiskScoreLatestTransformId, -} from '../../../../common/utils/risk_score_modules'; +} from '../../../../../common/utils/risk_score_modules'; export const getLegacyTransforms = async ({ namespace, diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts index adbf06cc1da99d..66f22e0c44bef9 100644 --- a/x-pack/plugins/security_solution/server/plugin.ts +++ b/x-pack/plugins/security_solution/server/plugin.ts @@ -107,7 +107,7 @@ import { } from '../common/endpoint/constants'; import { AppFeaturesService } from './lib/app_features_service/app_features_service'; -import { registerRiskScoringTask } from './lib/risk_engine/tasks/risk_scoring_task'; +import { registerRiskScoringTask } from './lib/entity_analytics/risk_engine/tasks/risk_scoring_task'; import { registerProtectionUpdatesNoteRoutes } from './endpoint/routes/protection_updates_note'; import { latestRiskScoreIndexPattern, allRiskScoreIndexPattern } from '../common/risk_engine'; import { isEndpointPackageV2 } from '../common/endpoint/utils/package_v2'; diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts index be810fd5ae41ea..fde473d2a253e4 100644 --- a/x-pack/plugins/security_solution/server/request_context_factory.ts +++ b/x-pack/plugins/security_solution/server/request_context_factory.ts @@ -25,7 +25,7 @@ import type { import type { Immutable } from '../common/endpoint/types'; import type { EndpointAuthz } from '../common/endpoint/types/authz'; import type { EndpointAppContextService } from './endpoint/endpoint_app_context_services'; -import { RiskEngineDataClient } from './lib/risk_engine/risk_engine_data_client'; +import { RiskEngineDataClient } from './lib/entity_analytics/risk_engine/risk_engine_data_client'; export interface IRequestContextFactory { create( diff --git a/x-pack/plugins/security_solution/server/routes/index.ts b/x-pack/plugins/security_solution/server/routes/index.ts index d3786ea8acb88f..b5b6a5c205e955 100644 --- a/x-pack/plugins/security_solution/server/routes/index.ts +++ b/x-pack/plugins/security_solution/server/routes/index.ts @@ -80,8 +80,8 @@ import { riskEngineInitRoute, riskEngineEnableRoute, riskEngineStatusRoute, -} from '../lib/risk_engine/routes'; -import { riskScoreCalculationRoute } from '../lib/risk_engine/routes/risk_score_calculation_route'; +} from '../lib/entity_analytics/risk_engine/routes'; +import { riskScoreCalculationRoute } from '../lib/entity_analytics/risk_engine/routes/risk_score_calculation_route'; export const initRoutes = ( router: SecuritySolutionPluginRouter, diff --git a/x-pack/plugins/security_solution/server/saved_objects.ts b/x-pack/plugins/security_solution/server/saved_objects.ts index 3f91bcf149ac62..0b1fec56774880 100644 --- a/x-pack/plugins/security_solution/server/saved_objects.ts +++ b/x-pack/plugins/security_solution/server/saved_objects.ts @@ -14,7 +14,7 @@ import { legacyType as legacyRuleActionsType } from './lib/detection_engine/rule import { prebuiltRuleAssetType } from './lib/detection_engine/prebuilt_rules'; import { type as signalsMigrationType } from './lib/detection_engine/migrations/saved_objects'; import { manifestType } from './endpoint/lib/artifacts/saved_object_mappings'; -import { riskEngineConfigurationType } from './lib/risk_engine/saved_object'; +import { riskEngineConfigurationType } from './lib/entity_analytics/risk_engine/saved_object'; const types = [ noteType, diff --git a/x-pack/plugins/security_solution/server/types.ts b/x-pack/plugins/security_solution/server/types.ts index 8326d13ad03a74..c979cc25c172b0 100644 --- a/x-pack/plugins/security_solution/server/types.ts +++ b/x-pack/plugins/security_solution/server/types.ts @@ -29,7 +29,7 @@ import type { import type { FrameworkRequest } from './lib/framework'; import type { EndpointAuthz } from '../common/endpoint/types/authz'; import type { EndpointInternalFleetServicesInterface } from './endpoint/services/fleet'; -import type { RiskEngineDataClient } from './lib/risk_engine/risk_engine_data_client'; +import type { RiskEngineDataClient } from './lib/entity_analytics/risk_engine/risk_engine_data_client'; export { AppClient }; diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts index ecf413fcfed709..fd263716ca5300 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { riskEngineConfigurationTypeName } from '@kbn/security-solution-plugin/server/lib/risk_engine/saved_object'; +import { riskEngineConfigurationTypeName } from '@kbn/security-solution-plugin/server/lib/entity_analytics/risk_engine/saved_object'; import { FtrProviderContext } from '../../../common/ftr_provider_context'; import { legacyTransformIds, diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/utils.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/utils.ts index 3911f55d016317..8a36471b1a6a79 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/utils.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/risk_engine/utils.ts @@ -11,7 +11,7 @@ import SuperTest from 'supertest'; import type { Client } from '@elastic/elasticsearch'; import type { ToolingLog } from '@kbn/tooling-log'; import type { EcsRiskScore, RiskScore } from '@kbn/security-solution-plugin/common/risk_engine'; -import { riskEngineConfigurationTypeName } from '@kbn/security-solution-plugin/server/lib/risk_engine/saved_object'; +import { riskEngineConfigurationTypeName } from '@kbn/security-solution-plugin/server/lib/entity_analytics/risk_engine/saved_object'; import type { KbnClient } from '@kbn/test'; import { RISK_ENGINE_INIT_URL,