[8.x] [Security Solution][Detection Engine] removes feature flag for …

…logged requests for preview (#195569) (#195821) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution][Detection Engine] removes feature flag for logged requests for preview (#195569)](#195569)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Vitalii Dmyterko <[email protected]>
elastic · Oct 10, 2024 · 19509fd · 19509fd
1 parent 749217d
commit 19509fd
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 44 deletions.
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -138,11 +138,6 @@ export const allowedExperimentalValues = Object.freeze({
    */
   esqlRulesDisabled: false,
 
-  /**
-   * enables logging requests during rule preview
-   */
-  loggingRequestsEnabled: false,
-
   /**
    * Enables Protection Updates tab in the Endpoint Policy Details page
    */

diff --git a/..._solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.test.tsx b/..._solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.test.tsx
@@ -23,7 +23,6 @@ import {
   stepDefineDefaultValue,
 } from '../../../../detections/pages/detection_engine/rules/utils';
 import { usePreviewInvocationCount } from './use_preview_invocation_count';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 
 jest.mock('../../../../common/lib/kibana');
 jest.mock('./use_preview_route');
@@ -40,7 +39,6 @@ jest.mock('../../../../common/hooks/use_experimental_features', () => ({
   useIsExperimentalFeatureEnabled: jest.fn(),
 }));
 
-const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
 // rule types that do not support logged requests
 const doNotSupportLoggedRequests: Type[] = [
   'threshold',
@@ -114,8 +112,6 @@ describe('PreviewQuery', () => {
     });
 
     (usePreviewInvocationCount as jest.Mock).mockReturnValue({ invocationCount: 500 });
-
-    useIsExperimentalFeatureEnabledMock.mockReturnValue(true);
   });
 
   afterEach(() => {
@@ -172,23 +168,6 @@ describe('PreviewQuery', () => {
     });
   });
 
-  supportLoggedRequests.forEach((ruleType) => {
-    test(`does not render "Show Elasticsearch requests" for ${ruleType} rule type when feature is disabled`, () => {
-      useIsExperimentalFeatureEnabledMock.mockReturnValue(false);
-
-      render(
-        <TestProviders>
-          <RulePreview
-            {...defaultProps}
-            defineRuleData={{ ...defaultProps.defineRuleData, ruleType }}
-          />
-        </TestProviders>
-      );
-
-      expect(screen.queryByTestId('show-elasticsearch-requests')).toBeNull();
-    });
-  });
-
   doNotSupportLoggedRequests.forEach((ruleType) => {
     test(`does not render "Show Elasticsearch requests" for ${ruleType} rule type`, () => {
       render(

diff --git a/...urity_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx b/...urity_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx
@@ -40,7 +40,6 @@ import type {
   TimeframePreviewOptions,
 } from '../../../../detections/pages/detection_engine/rules/types';
 import { usePreviewInvocationCount } from './use_preview_invocation_count';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 
 export const REASONABLE_INVOCATION_COUNT = 200;
 
@@ -90,8 +89,6 @@ const RulePreviewComponent: React.FC<RulePreviewProps> = ({
   const { indexPattern, ruleType } = defineRuleData;
   const { spaces } = useKibana().services;
 
-  const isLoggingRequestsFeatureEnabled = useIsExperimentalFeatureEnabled('loggingRequestsEnabled');
-
   const [spaceId, setSpaceId] = useState('');
   useEffect(() => {
     if (spaces) {
@@ -282,8 +279,7 @@ const RulePreviewComponent: React.FC<RulePreviewProps> = ({
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFormRow>
-      {isLoggingRequestsFeatureEnabled &&
-      RULE_TYPES_SUPPORTING_LOGGED_REQUESTS.includes(ruleType) ? (
+      {RULE_TYPES_SUPPORTING_LOGGED_REQUESTS.includes(ruleType) ? (
         <EuiFormRow>
           <EuiFlexGroup alignItems="center" gutterSize="s" responsive>
             <EuiFlexItem grow>

diff --git a/x-pack/test/security_solution_api_integration/config/ess/config.base.ts b/x-pack/test/security_solution_api_integration/config/ess/config.base.ts
@@ -82,7 +82,6 @@ export function createTestConfig(options: CreateTestConfigOptions, testFiles?: s
           '--xpack.ruleRegistry.unsafe.legacyMultiTenancy.enabled=true',
           `--xpack.securitySolution.enableExperimental=${JSON.stringify([
             'previewTelemetryUrlEnabled',
-            'loggingRequestsEnabled',
             'riskScoringPersistence',
             'riskScoringRoutesEnabled',
           ])}`,

diff --git a/...tion_engine/rule_execution_logic/trial_license_complete_tier/configs/serverless.config.ts b/...tion_engine/rule_execution_logic/trial_license_complete_tier/configs/serverless.config.ts
@@ -17,6 +17,5 @@ export default createTestConfig({
       'testing_ignored.constant',
       '/testing_regex*/',
     ])}`, // See tests within the file "ignore_fields.ts" which use these values in "alertIgnoreFields"
-    `--xpack.securitySolution.enableExperimental=${JSON.stringify(['loggingRequestsEnabled'])}`,
   ],
 });
diff --git a/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts b/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts
@@ -1190,8 +1190,7 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
-    // skipped on MKI since feature flags are not supported there
-    describe('@skipInServerlessMKI preview logged requests', () => {
+    describe('preview logged requests', () => {
       it('should not return requests property when not enabled', async () => {
         const { logs } = await previewRule({
           supertest,

diff --git a/...detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts b/...detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts
@@ -1409,8 +1409,7 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
-    // skipped on MKI since feature flags are not supported there
-    describe('@skipInServerlessMKI preview logged requests', () => {
+    describe('preview logged requests', () => {
       let rule: EsqlRuleCreateProps;
       let id: string;
       beforeEach(async () => {

diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts
@@ -44,7 +44,6 @@ 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(['loggingRequestsEnabled'])}`,
         // mock cloud to enable the guided onboarding tour in e2e tests
         '--xpack.cloud.id=test',
         `--home.disableWelcomeScreen=true`,

diff --git a/..._solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/preview.cy.ts b/..._solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/preview.cy.ts
@@ -33,11 +33,6 @@ describe(
   'Detection rules, preview',
   {
     tags: ['@ess', '@serverless'],
-    env: {
-      kbnServerArgs: [
-        `--xpack.securitySolution.enableExperimental=${JSON.stringify(['loggingRequestsEnabled'])}`,
-      ],
-    },
   },
   () => {
     beforeEach(() => {

diff --git a/x-pack/test/security_solution_cypress/serverless_config.ts b/x-pack/test/security_solution_cypress/serverless_config.ts
@@ -34,7 +34,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
           { product_line: 'endpoint', product_tier: 'complete' },
           { product_line: 'cloud', product_tier: 'complete' },
         ])}`,
-        `--xpack.securitySolution.enableExperimental=${JSON.stringify(['loggingRequestsEnabled'])}`,
         '--csp.strict=false',
         '--csp.warnLegacyBrowsers=false',
       ],