Flipped Security Entity Store flag to being a "disable" flag, meaning…

… the feature is enabled by default. Also disabled in Serverless.
elastic · Oct 10, 2024 · de2bb10 · de2bb10
1 parent d273c07
commit de2bb10
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
@@ -105,3 +105,8 @@ xpack.ml.compatibleModuleType: 'security'
 
 # Disable the embedded Dev Console
 console.ui.embeddedEnabled: false
+
+# Experimental Security Solution features
+
+# This feature is disabled in Serverless until fully performance tested within a Serverless environment
+xpack.securitySolution.enableExperimental: ['entityStoreDisabled']
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -246,9 +246,10 @@ export const allowedExperimentalValues = Object.freeze({
   dataIngestionHubEnabled: false,
 
   /**
-   * Enables the new Entity Store engine routes
+   * Disables Security's Entity Store engine routes. The Entity Store feature is available by default, but
+   * can be disabled if necessary in a given environment.
    */
-  entityStoreEnabled: false,
+  entityStoreDisabled: false,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;

diff --git a/...ck/plugins/security_solution/public/entity_analytics/pages/entity_analytics_dashboard.tsx b/...ck/plugins/security_solution/public/entity_analytics/pages/entity_analytics_dashboard.tsx
@@ -32,7 +32,7 @@ const EntityAnalyticsComponent = () => {
   const { indicesExist, loading: isSourcererLoading, sourcererDataView } = useSourcererDataView();
   const isRiskScoreModuleLicenseAvailable = useHasSecurityCapability('entity-analytics');
 
-  const isEntityStoreEnabled = useIsExperimentalFeatureEnabled('entityStoreEnabled');
+  const isEntityStoreDisabled = useIsExperimentalFeatureEnabled('entityStoreDisabled');
 
   return (
     <>
@@ -71,7 +71,7 @@ const EntityAnalyticsComponent = () => {
                   <EntityAnalyticsAnomalies />
                 </EuiFlexItem>
 
-                {isEntityStoreEnabled ? (
+                {!isEntityStoreDisabled ? (
                   <EuiFlexItem>
                     <EntitiesList />
                   </EuiFlexItem>

diff --git a/...plugins/security_solution/server/lib/entity_analytics/register_entity_analytics_routes.ts b/...plugins/security_solution/server/lib/entity_analytics/register_entity_analytics_routes.ts
@@ -15,7 +15,7 @@ export const registerEntityAnalyticsRoutes = (routeDeps: EntityAnalyticsRoutesDe
   registerAssetCriticalityRoutes(routeDeps);
   registerRiskScoreRoutes(routeDeps);
   registerRiskEngineRoutes(routeDeps);
-  if (routeDeps.config.experimentalFeatures.entityStoreEnabled) {
+  if (!routeDeps.config.experimentalFeatures.entityStoreDisabled) {
     registerEntityStoreRoutes(routeDeps);
   }
 };
diff --git a/...st_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts b/...st_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
@@ -15,10 +15,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     ...functionalConfig.getAll(),
     kbnTestServer: {
       ...functionalConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...functionalConfig.get('kbnTestServer.serverArgs'),
-        `--xpack.securitySolution.enableExperimental=${JSON.stringify(['entityStoreEnabled'])}`,
-      ],
+      serverArgs: [...functionalConfig.get('kbnTestServer.serverArgs')],
     },
     testFiles: [require.resolve('..')],
     junit: {

diff --git a/...es/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts b/...es/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
@@ -9,7 +9,6 @@ import { createTestConfig } from '../../../../../config/serverless/config.base';
 
 export default createTestConfig({
   kbnTestServerArgs: [
-    `--xpack.securitySolution.enableExperimental=${JSON.stringify(['entityStoreEnabled'])}`,
     `--xpack.securitySolutionServerless.productTypes=${JSON.stringify([
       { product_line: 'security', product_tier: 'complete' },
       { product_line: 'endpoint', product_tier: 'complete' },