Move to EA (elastic#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
tonyghiani · Nov 9, 2023 · 55d94c7 · 55d94c7
1 parent b86e741
commit 55d94c7
Show file tree

Hide file tree

Showing 65 changed files with 67 additions and 67 deletions.
diff --git 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
@@ -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/...s/security_solution/public/entity_analytics/api/hooks/use_disable_risk_engine_mutation.ts b/...s/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/...ns/security_solution/public/entity_analytics/api/hooks/use_enable_risk_engine_mutation.ts b/...ns/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/...gins/security_solution/public/entity_analytics/api/hooks/use_init_risk_engine_mutation.ts b/...gins/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/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/...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/...calculate_and_persist_risk_scores.mock.ts → ...calculate_and_persist_risk_scores.mock.ts b/...calculate_and_persist_risk_scores.mock.ts → ...calculate_and_persist_risk_scores.mock.ts
diff --git a/...calculate_and_persist_risk_scores.test.ts → ...calculate_and_persist_risk_scores.test.ts b/...calculate_and_persist_risk_scores.test.ts → ...calculate_and_persist_risk_scores.test.ts
diff --git a/...gine/calculate_and_persist_risk_scores.ts → ...gine/calculate_and_persist_risk_scores.ts b/...gine/calculate_and_persist_risk_scores.ts → ...gine/calculate_and_persist_risk_scores.ts
diff --git a/...risk_engine/calculate_risk_scores.mock.ts → ...risk_engine/calculate_risk_scores.mock.ts b/...risk_engine/calculate_risk_scores.mock.ts → ...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/...risk_engine/calculate_risk_scores.test.ts → ...risk_engine/calculate_risk_scores.test.ts b/...risk_engine/calculate_risk_scores.test.ts → ...risk_engine/calculate_risk_scores.test.ts
diff --git a/.../lib/risk_engine/calculate_risk_scores.ts → ...tics/risk_engine/calculate_risk_scores.ts b/.../lib/risk_engine/calculate_risk_scores.ts → ...tics/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/.../server/lib/risk_engine/configurations.ts → ...y_analytics/risk_engine/configurations.ts b/.../server/lib/risk_engine/configurations.ts → ...y_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/...risk_engine/get_risk_inputs_index.mock.ts → ...risk_engine/get_risk_inputs_index.mock.ts b/...risk_engine/get_risk_inputs_index.mock.ts → ...risk_engine/get_risk_inputs_index.mock.ts
diff --git a/...risk_engine/get_risk_inputs_index.test.ts → ...risk_engine/get_risk_inputs_index.test.ts b/...risk_engine/get_risk_inputs_index.test.ts → ...risk_engine/get_risk_inputs_index.test.ts
diff --git a/.../lib/risk_engine/get_risk_inputs_index.ts → ...tics/risk_engine/get_risk_inputs_index.ts b/.../lib/risk_engine/get_risk_inputs_index.ts → ...tics/risk_engine/get_risk_inputs_index.ts
diff --git a/...on/server/lib/risk_engine/helpers.test.ts → ...ity_analytics/risk_engine/helpers.test.ts b/...on/server/lib/risk_engine/helpers.test.ts → ...ity_analytics/risk_engine/helpers.test.ts
diff --git a/...olution/server/lib/risk_engine/helpers.ts → ...b/entity_analytics/risk_engine/helpers.ts b/...olution/server/lib/risk_engine/helpers.ts → ...b/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/...sk_engine/risk_engine_data_client.mock.ts → ...sk_engine/risk_engine_data_client.mock.ts b/...sk_engine/risk_engine_data_client.mock.ts → ...sk_engine/risk_engine_data_client.mock.ts
diff --git a/...sk_engine/risk_engine_data_client.test.ts → ...sk_engine/risk_engine_data_client.test.ts b/...sk_engine/risk_engine_data_client.test.ts → ...sk_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/...ib/risk_engine/risk_engine_data_client.ts → ...cs/risk_engine/risk_engine_data_client.ts b/...ib/risk_engine/risk_engine_data_client.ts → ...cs/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/...sk_engine/risk_engine_data_writer.test.ts → ...sk_engine/risk_engine_data_writer.test.ts b/...sk_engine/risk_engine_data_writer.test.ts → ...sk_engine/risk_engine_data_writer.test.ts
diff --git a/...ib/risk_engine/risk_engine_data_writer.ts → ...cs/risk_engine/risk_engine_data_writer.ts b/...ib/risk_engine/risk_engine_data_writer.ts → ...cs/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/...ib/risk_engine/risk_score_service.mock.ts → ...cs/risk_engine/risk_score_service.mock.ts b/...ib/risk_engine/risk_score_service.mock.ts → ...cs/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> = {}): RiskScore => ({
   '@timestamp': '2023-02-15T00:15:19.231Z',

diff --git a/...ver/lib/risk_engine/risk_score_service.ts → ...alytics/risk_engine/risk_score_service.ts b/...ver/lib/risk_engine/risk_score_service.ts → ...alytics/risk_engine/risk_score_service.ts
diff --git a/...rver/lib/risk_engine/risk_weights.test.ts → ...nalytics/risk_engine/risk_weights.test.ts b/...rver/lib/risk_engine/risk_weights.test.ts → ...nalytics/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/...on/server/lib/risk_engine/risk_weights.ts → ...ity_analytics/risk_engine/risk_weights.ts b/...on/server/lib/risk_engine/risk_weights.ts → ...ity_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/...on/server/lib/risk_engine/routes/index.ts → ...ity_analytics/risk_engine/routes/index.ts b/...on/server/lib/risk_engine/routes/index.ts → ...ity_analytics/risk_engine/routes/index.ts
diff --git a/.../routes/risk_engine_disable_route.test.ts → .../routes/risk_engine_disable_route.test.ts b/.../routes/risk_engine_disable_route.test.ts → .../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/...ngine/routes/risk_engine_disable_route.ts → ...ngine/routes/risk_engine_disable_route.ts b/...ngine/routes/risk_engine_disable_route.ts → ...ngine/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/...e/routes/risk_engine_enable_route.test.ts → ...e/routes/risk_engine_enable_route.test.ts b/...e/routes/risk_engine_enable_route.test.ts → ...e/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/...engine/routes/risk_engine_enable_route.ts → ...engine/routes/risk_engine_enable_route.ts b/...engine/routes/risk_engine_enable_route.ts → ...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/...k_engine/routes/risk_engine_init_route.ts → ...k_engine/routes/risk_engine_init_route.ts b/...k_engine/routes/risk_engine_init_route.ts → ...k_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/...engine/routes/risk_engine_status_route.ts → ...engine/routes/risk_engine_status_route.ts b/...engine/routes/risk_engine_status_route.ts → ...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/...utes/risk_score_calculation_route.test.ts → ...utes/risk_score_calculation_route.test.ts b/...utes/risk_score_calculation_route.test.ts → ...utes/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/...ne/routes/risk_score_calculation_route.ts → ...ne/routes/risk_score_calculation_route.ts b/...ne/routes/risk_score_calculation_route.ts → ...ne/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/...e/routes/risk_score_preview_route.test.ts → ...e/routes/risk_score_preview_route.test.ts b/...e/routes/risk_score_preview_route.test.ts → ...e/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/...engine/routes/risk_score_preview_route.ts → ...engine/routes/risk_score_preview_route.ts b/...engine/routes/risk_score_preview_route.ts → ...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/...er/lib/risk_engine/routes/translations.ts → ...lytics/risk_engine/routes/translations.ts b/...er/lib/risk_engine/routes/translations.ts → ...lytics/risk_engine/routes/translations.ts
diff --git a/...ver/lib/risk_engine/saved_object/index.ts → ...alytics/risk_engine/saved_object/index.ts b/...ver/lib/risk_engine/saved_object/index.ts → ...alytics/risk_engine/saved_object/index.ts
diff --git a/..._object/risk_engine_configuration_type.ts → ..._object/risk_engine_configuration_type.ts b/..._object/risk_engine_configuration_type.ts → ..._object/risk_engine_configuration_type.ts
diff --git a/...ib/risk_engine/schema/risk_score_apis.yml → ...cs/risk_engine/schema/risk_score_apis.yml b/...ib/risk_engine/schema/risk_score_apis.yml → ...cs/risk_engine/schema/risk_score_apis.yml
diff --git a/...server/lib/risk_engine/tasks/constants.ts → ..._analytics/risk_engine/tasks/constants.ts b/...server/lib/risk_engine/tasks/constants.ts → ..._analytics/risk_engine/tasks/constants.ts
diff --git a/...ver/lib/risk_engine/tasks/helpers.test.ts → ...alytics/risk_engine/tasks/helpers.test.ts b/...ver/lib/risk_engine/tasks/helpers.test.ts → ...alytics/risk_engine/tasks/helpers.test.ts
diff --git a/...n/server/lib/risk_engine/tasks/helpers.ts → ...ty_analytics/risk_engine/tasks/helpers.ts b/...n/server/lib/risk_engine/tasks/helpers.ts → ...ty_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/...ion/server/lib/risk_engine/tasks/index.ts → ...tity_analytics/risk_engine/tasks/index.ts b/...ion/server/lib/risk_engine/tasks/index.ts → ...tity_analytics/risk_engine/tasks/index.ts
diff --git a/...sk_engine/tasks/risk_scoring_task.mock.ts → ...sk_engine/tasks/risk_scoring_task.mock.ts b/...sk_engine/tasks/risk_scoring_task.mock.ts → ...sk_engine/tasks/risk_scoring_task.mock.ts
diff --git a/...sk_engine/tasks/risk_scoring_task.test.ts → ...sk_engine/tasks/risk_scoring_task.test.ts b/...sk_engine/tasks/risk_scoring_task.test.ts → ...sk_engine/tasks/risk_scoring_task.test.ts
diff --git a/...ib/risk_engine/tasks/risk_scoring_task.ts → ...cs/risk_engine/tasks/risk_scoring_task.ts b/...ib/risk_engine/tasks/risk_scoring_task.ts → ...cs/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/...ion/server/lib/risk_engine/tasks/state.ts → ...tity_analytics/risk_engine/tasks/state.ts b/...ion/server/lib/risk_engine/tasks/state.ts → ...tity_analytics/risk_engine/tasks/state.ts
diff --git a/..._solution/server/lib/risk_engine/types.ts → ...lib/entity_analytics/risk_engine/types.ts b/..._solution/server/lib/risk_engine/types.ts → ...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/...ib/risk_engine/utils/create_datastream.ts → ...cs/risk_engine/utils/create_datastream.ts b/...ib/risk_engine/utils/create_datastream.ts → ...cs/risk_engine/utils/create_datastream.ts
diff --git a/...ver/lib/risk_engine/utils/create_index.ts → ...alytics/risk_engine/utils/create_index.ts b/...ver/lib/risk_engine/utils/create_index.ts → ...alytics/risk_engine/utils/create_index.ts
diff --git a/...e/utils/retry_transient_es_errors.test.ts → ...e/utils/retry_transient_es_errors.test.ts b/...e/utils/retry_transient_es_errors.test.ts → ...e/utils/retry_transient_es_errors.test.ts
diff --git a/...engine/utils/retry_transient_es_errors.ts → ...engine/utils/retry_transient_es_errors.ts b/...engine/utils/retry_transient_es_errors.ts → ...engine/utils/retry_transient_es_errors.ts
diff --git a/...ngine/utils/saved_object_configuration.ts → ...ngine/utils/saved_object_configuration.ts b/...ngine/utils/saved_object_configuration.ts → ...ngine/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/.../lib/risk_engine/utils/transforms.test.ts → ...tics/risk_engine/utils/transforms.test.ts b/.../lib/risk_engine/utils/transforms.test.ts → ...tics/risk_engine/utils/transforms.test.ts
diff --git a/...erver/lib/risk_engine/utils/transforms.ts → ...analytics/risk_engine/utils/transforms.ts b/...erver/lib/risk_engine/utils/transforms.ts → ...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
@@ -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
@@ -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(