[TIP] Remove feature flag for Threat Intelligence plugin (#141117)

(cherry picked from commit a352c76)
elastic · Sep 26, 2022 · 6c46097 · 6c46097
1 parent b7f4447
commit 6c46097
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 18 deletions.
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -20,7 +20,6 @@ export const allowedExperimentalValues = Object.freeze({
   pendingActionResponsesWithAck: true,
   policyListEnabled: true,
   policyResponseInFleetEnabled: true,
-  threatIntelligenceEnabled: false,
 
   /**
    * This is used for enabling the end-to-end tests for the security_solution telemetry.

diff --git a/...y_solution/public/common/components/navigation/use_security_solution_navigation/index.tsx b/...y_solution/public/common/components/navigation/use_security_solution_navigation/index.tsx
@@ -31,9 +31,6 @@ export const useSecuritySolutionNavigation = () => {
 
   const disabledNavTabs = [
     ...(!useIsExperimentalFeatureEnabled('kubernetesEnabled') ? ['kubernetes'] : []),
-    ...(!useIsExperimentalFeatureEnabled('threatIntelligenceEnabled')
-      ? ['threat-intelligence']
-      : []),
   ];
   const enabledNavTabs: GenericNavRecord = omit(disabledNavTabs, navTabs);
 

diff --git a/x-pack/plugins/security_solution/public/threat_intelligence/links.ts b/x-pack/plugins/security_solution/public/threat_intelligence/links.ts
@@ -17,7 +17,6 @@ import type { LinkItem } from '../common/links';
  */
 export const indicatorsLinks: LinkItem = {
   ...getSecuritySolutionLink<SecurityPageName>('indicators'),
-  experimentalKey: 'threatIntelligenceEnabled',
   globalNavPosition: 7,
   capabilities: [`${SERVER_APP_ID}.show`],
 };
diff --git a/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx b/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx
@@ -6,7 +6,6 @@
  */
 
 import React, { memo } from 'react';
-import { Redirect } from 'react-router-dom';
 import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import type { SecuritySolutionPluginContext } from '@kbn/threat-intelligence-plugin/public';
 import { THREAT_INTELLIGENCE_BASE_PATH } from '@kbn/threat-intelligence-plugin/public';
@@ -17,7 +16,6 @@ import { getStore } from '../common/store';
 import { useKibana } from '../common/lib/kibana';
 import { FiltersGlobal } from '../common/components/filters_global';
 import { SpyRoute } from '../common/utils/route/spy_routes';
-import { useIsExperimentalFeatureEnabled } from '../common/hooks/use_experimental_features';
 import { licenseService } from '../common/hooks/use_license';
 import { SecurityPageName } from '../app/types';
 import type { SecuritySubPluginRoutes } from '../app/types';
@@ -30,11 +28,6 @@ const ThreatIntelligence = memo(() => {
 
   const sourcererDataView = useSourcererDataView();
 
-  const enabled = useIsExperimentalFeatureEnabled('threatIntelligenceEnabled');
-  if (!enabled) {
-    return <Redirect to="/" />;
-  }
-
   const securitySolutionStore = getStore() as Store;
 
   const securitySolutionContext: SecuritySolutionPluginContext = {

diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts
@@ -49,9 +49,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         // See https://github.com/elastic/kibana/pull/125396 for details
         '--xpack.alerting.rules.minimumScheduleInterval.value=1s',
         '--xpack.ruleRegistry.unsafe.legacyMultiTenancy.enabled=true',
-        `--xpack.securitySolution.enableExperimental=${JSON.stringify([
-          'threatIntelligenceEnabled',
-        ])}`,
+        `--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
         `--home.disableWelcomeScreen=true`,
       ],
     },

diff --git a/x-pack/test/threat_intelligence_cypress/config.ts b/x-pack/test/threat_intelligence_cypress/config.ts
@@ -48,9 +48,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         // See https://github.com/elastic/kibana/pull/125396 for details
         '--xpack.alerting.rules.minimumScheduleInterval.value=1s',
         '--xpack.ruleRegistry.unsafe.legacyMultiTenancy.enabled=true',
-        `--xpack.securitySolution.enableExperimental=${JSON.stringify([
-          'threatIntelligenceEnabled',
-        ])}`,
+        `--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
         `--home.disableWelcomeScreen=true`,
       ],
     },