Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ export const useSecuritySolutionNavigation = () => {

const disabledNavTabs = [
...(!useIsExperimentalFeatureEnabled('kubernetesEnabled') ? ['kubernetes'] : []),
...(!useIsExperimentalFeatureEnabled('threatIntelligenceEnabled')
? ['threat-intelligence']
: []),
];
const enabledNavTabs: GenericNavRecord = omit(disabledNavTabs, navTabs);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`],
};
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand All @@ -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 = {
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/security_solution_cypress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
],
},
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/threat_intelligence_cypress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
],
},
Expand Down