[TIP] Enables TI plugin with kibana.yml feature flag (elastic#137838) (…

…elastic#138373) - show/hide navbar entries in both old and new navigation per feature flag value - load plugin per feature flag value - flag: xpack.securitySolution.enableExperimental: ['threatIntelligenceEnabled'] elastic/security-team#4505 (cherry picked from commit ff28e68) Co-authored-by: Philippe Oberti <[email protected]>
kibanamachine · Aug 9, 2022 · 31726b1 · 31726b1
1 parent 62ed40b
commit 31726b1
Show file tree

Hide file tree

Showing 8 changed files with 26 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
@@ -22,9 +22,10 @@ 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.
+   * This is used for enabling the end-to-end tests for the security_solution telemetry.
    * We disable the telemetry since we don't have specific roles or permissions around it and
    * we don't want people to be able to violate security by getting access to whole documents
    * around telemetry they should not.

diff --git a/.../components/navigation/use_security_solution_navigation/__snapshots__/index.test.tsx.snap b/.../components/navigation/use_security_solution_navigation/__snapshots__/index.test.tsx.snap
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,6 +31,9 @@ export const useSecuritySolutionNavigation = () => {
 
   const disabledNavTabs = [
     ...(!useIsExperimentalFeatureEnabled('kubernetesEnabled') ? ['kubernetes'] : []),
+    ...(!useIsExperimentalFeatureEnabled('threatIntelligenceEnabled')
+      ? ['threat-intelligence']
+      : []),
   ];
   const enabledNavTabs: GenericNavRecord = omit(disabledNavTabs, navTabs);
 

diff --git a/...ic/common/components/navigation/use_security_solution_navigation/use_navigation_items.tsx b/...ic/common/components/navigation/use_security_solution_navigation/use_navigation_items.tsx
@@ -113,7 +113,9 @@ function usePrimaryNavigationItemsToDisplay(navTabs: Record<string, NavTab>) {
                 ...(navTabs[SecurityPageName.users] != null
                   ? [navTabs[SecurityPageName.users]]
                   : []),
-                navTabs[SecurityPageName.threatIntelligence],
+                ...(navTabs[SecurityPageName.threatIntelligence] != null
+                  ? [navTabs[SecurityPageName.threatIntelligence]]
+                  : []),
               ],
             },
             {

diff --git a/x-pack/plugins/security_solution/public/threat_intelligence/links.ts b/x-pack/plugins/security_solution/public/threat_intelligence/links.ts
@@ -15,6 +15,7 @@ export const links: LinkItem = {
   id: SecurityPageName.threatIntelligence,
   title: THREAT_INTELLIGENCE,
   path: THREAT_INTELLIGENCE_PATH,
+  experimentalKey: 'threatIntelligenceEnabled',
   landingImage: threatIntelligencePageImg,
   description: i18n.translate('xpack.securitySolution.appLinks.threatIntelligence.description', {
     defaultMessage:

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,20 +6,29 @@
  */
 
 import React from 'react';
+import { Redirect } from 'react-router-dom';
 import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { ThreatIntelligencePage } from './pages/threat_intelligence';
 import { SecurityPageName, THREAT_INTELLIGENCE_PATH } from '../../common/constants';
 import type { SecuritySubPluginRoutes } from '../app/types';
+import { useIsExperimentalFeatureEnabled } from '../common/hooks/use_experimental_features';
 
-const ThreatIntelligenceRoutes = () => (
-  <TrackApplicationView viewId={SecurityPageName.threatIntelligence}>
-    <ThreatIntelligencePage />
-  </TrackApplicationView>
-);
+const ThreatIntelligenceRoutes = () => {
+  const enabled = useIsExperimentalFeatureEnabled('threatIntelligenceEnabled');
+  if (!enabled) {
+    return <Redirect to="/" />;
+  }
+
+  return (
+    <TrackApplicationView viewId={SecurityPageName.threatIntelligence}>
+      <ThreatIntelligencePage />
+    </TrackApplicationView>
+  );
+};
 
 export const routes: SecuritySubPluginRoutes = [
   {
     path: THREAT_INTELLIGENCE_PATH,
-    render: ThreatIntelligenceRoutes,
+    component: ThreatIntelligenceRoutes,
   },
 ];
diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts
@@ -52,6 +52,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
           'riskyHostsEnabled',
           'riskyUsersEnabled',
           'insightsRelatedAlertsByProcessAncestry',
+          'threatIntelligenceEnabled',
         ])}`,
         `--home.disableWelcomeScreen=true`,
       ],

diff --git a/x-pack/test/threat_intelligence_cypress/config.ts b/x-pack/test/threat_intelligence_cypress/config.ts
@@ -51,6 +51,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--xpack.securitySolution.enableExperimental=${JSON.stringify([
           'riskyHostsEnabled',
           'riskyUsersEnabled',
+          'threatIntelligenceEnabled',
         ])}`,
         `--home.disableWelcomeScreen=true`,
       ],