[8.x] [Security Solution] Rule Updates in bulk with conflicts (#196776)…

… (#199649) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] Rule Updates in bulk with conflicts (#196776)](#196776)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Juan Pablo Djeredjian <[email protected]>
elastic · Nov 11, 2024 · dc44d7c · dc44d7c
1 parent 8dfe8f5
commit dc44d7c
Show file tree

Hide file tree

Showing 23 changed files with 555 additions and 162 deletions.
diff --git a/...compatibility_callout/affected_job_ids.ts → ...mmon/machine_learning/affected_job_ids.ts b/...compatibility_callout/affected_job_ids.ts → ...mmon/machine_learning/affected_job_ids.ts
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/api/api.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management/api/api.ts
@@ -16,6 +16,7 @@ import type { ActionResult } from '@kbn/actions-plugin/server';
 import { convertRulesFilterToKQL } from '../../../../common/detection_engine/rule_management/rule_filtering';
 import type {
   UpgradeSpecificRulesRequest,
+  PickVersionValues,
   PerformRuleUpgradeResponseBody,
   InstallSpecificRulesRequest,
   PerformRuleInstallationResponseBody,
@@ -678,26 +679,17 @@ export const performInstallSpecificRules = async (
     }),
   });
 
-export const performUpgradeAllRules = async (): Promise<PerformRuleUpgradeResponseBody> =>
-  KibanaServices.get().http.fetch(PERFORM_RULE_UPGRADE_URL, {
-    method: 'POST',
-    version: '1',
-    body: JSON.stringify({
-      mode: 'ALL_RULES',
-      pick_version: 'TARGET',
-    }),
-  });
-
 export const performUpgradeSpecificRules = async (
-  rules: UpgradeSpecificRulesRequest['rules']
+  rules: UpgradeSpecificRulesRequest['rules'],
+  pickVersion: PickVersionValues
 ): Promise<PerformRuleUpgradeResponseBody> =>
   KibanaServices.get().http.fetch(PERFORM_RULE_UPGRADE_URL, {
     method: 'POST',
     version: '1',
     body: JSON.stringify({
       mode: 'SPECIFIC_RULES',
       rules,
-      pick_version: 'TARGET', // Setting fixed 'TARGET' temporarily for Milestone 2
+      pick_version: pickVersion,
     }),
   });
 

diff --git a/...engine/rule_management/api/hooks/prebuilt_rules/use_perform_all_rules_upgrade_mutation.ts b/...engine/rule_management/api/hooks/prebuilt_rules/use_perform_all_rules_upgrade_mutation.ts
diff --git a/...e/rule_management/api/hooks/prebuilt_rules/use_perform_specific_rules_upgrade_mutation.ts b/...e/rule_management/api/hooks/prebuilt_rules/use_perform_specific_rules_upgrade_mutation.ts
@@ -8,6 +8,7 @@ import type { UseMutationOptions } from '@tanstack/react-query';
 import { useMutation } from '@tanstack/react-query';
 import type {
   PerformRuleUpgradeResponseBody,
+  PickVersionValues,
   UpgradeSpecificRulesRequest,
 } from '../../../../../../common/api/detection_engine/prebuilt_rules';
 import { PERFORM_RULE_UPGRADE_URL } from '../../../../../../common/api/detection_engine/prebuilt_rules/urls';
@@ -26,6 +27,7 @@ export const PERFORM_SPECIFIC_RULES_UPGRADE_KEY = [
 ];
 
 export const usePerformSpecificRulesUpgradeMutation = (
+  pickVersion: PickVersionValues,
   options?: UseMutationOptions<
     PerformRuleUpgradeResponseBody,
     Error,
@@ -43,7 +45,7 @@ export const usePerformSpecificRulesUpgradeMutation = (
 
   return useMutation<PerformRuleUpgradeResponseBody, Error, UpgradeSpecificRulesRequest['rules']>(
     (rulesToUpgrade: UpgradeSpecificRulesRequest['rules']) => {
-      return performUpgradeSpecificRules(rulesToUpgrade);
+      return performUpgradeSpecificRules(rulesToUpgrade, pickVersion);
     },
     {
       ...options,

diff --git a/.../public/detection_engine/rule_management/logic/prebuilt_rules/use_perform_rule_upgrade.ts b/.../public/detection_engine/rule_management/logic/prebuilt_rules/use_perform_rule_upgrade.ts
@@ -4,29 +4,20 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { PickVersionValues } from '../../../../../common/api/detection_engine';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
-import { usePerformAllRulesUpgradeMutation } from '../../api/hooks/prebuilt_rules/use_perform_all_rules_upgrade_mutation';
 import { usePerformSpecificRulesUpgradeMutation } from '../../api/hooks/prebuilt_rules/use_perform_specific_rules_upgrade_mutation';
 
 import * as i18n from './translations';
 
-export const usePerformUpgradeAllRules = () => {
-  const { addError, addSuccess } = useAppToasts();
-
-  return usePerformAllRulesUpgradeMutation({
-    onError: (err) => {
-      addError(err, { title: i18n.RULE_UPGRADE_FAILED });
-    },
-    onSuccess: (result) => {
-      addSuccess(getSuccessToastMessage(result));
-    },
-  });
-};
-
-export const usePerformUpgradeSpecificRules = () => {
+export const usePerformUpgradeSpecificRules = ({
+  pickVersion,
+}: {
+  pickVersion: PickVersionValues;
+}) => {
   const { addError, addSuccess } = useAppToasts();
 
-  return usePerformSpecificRulesUpgradeMutation({
+  return usePerformSpecificRulesUpgradeMutation(pickVersion, {
     onError: (err) => {
       addError(err, { title: i18n.RULE_UPGRADE_FAILED });
     },

diff --git a/...nts/modals/ml_job_upgrade_modal/index.tsx → ...ble/modals/ml_job_upgrade_modal/index.tsx b/...nts/modals/ml_job_upgrade_modal/index.tsx → ...ble/modals/ml_job_upgrade_modal/index.tsx
diff --git a/...als/ml_job_upgrade_modal/translations.tsx → ...als/ml_job_upgrade_modal/translations.tsx b/...als/ml_job_upgrade_modal/translations.tsx → ...als/ml_job_upgrade_modal/translations.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { MlJobCompatibilityLink } from '../../../../common/components/links_to_docs';
+import { MlJobCompatibilityLink } from '../../../../../../../common/components/links_to_docs';
 
 export const ML_JOB_UPGRADE_MODAL_TITLE = i18n.translate(
   'xpack.securitySolution.detectionEngine.mlJobUpgradeModal.messageTitle',

diff --git a/...ponents/rules_table/upgrade_prebuilt_rules_table/modals/upgrade_conflicts_modal/index.tsx b/...ponents/rules_table/upgrade_prebuilt_rules_table/modals/upgrade_conflicts_modal/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiConfirmModal, EuiText } from '@elastic/eui';
+import React, { memo } from 'react';
+import * as i18n from './translations';
+
+export interface UpgradeConflictsModalProps {
+  onCancel: (
+    event?: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLButtonElement>
+  ) => void;
+  onConfirm?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+}
+
+const UpgradeConflictsModalComponent = ({ onCancel, onConfirm }: UpgradeConflictsModalProps) => {
+  return (
+    <EuiConfirmModal
+      title={i18n.UPGRADE_CONFLICTS_MODAL_TITLE}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      cancelButtonText={i18n.UPGRADE_CONFLICTS_MODAL_CANCEL}
+      confirmButtonText={i18n.UPGRADE_CONFLICTS_MODAL_CONFIRM}
+      buttonColor="primary"
+      defaultFocusedButton="confirm"
+      data-test-subj="upgradeConflictsModal"
+    >
+      <EuiText>{i18n.UPGRADE_CONFLICTS_MODAL_BODY}</EuiText>
+    </EuiConfirmModal>
+  );
+};
+
+export const UpgradeConflictsModal = memo(UpgradeConflictsModalComponent);
diff --git a/.../rules_table/upgrade_prebuilt_rules_table/modals/upgrade_conflicts_modal/translations.tsx b/.../rules_table/upgrade_prebuilt_rules_table/modals/upgrade_conflicts_modal/translations.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const UPGRADE_CONFLICTS_MODAL_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeConflictsModal.messageTitle',
+  {
+    defaultMessage: 'Update rules without conflicts?',
+  }
+);
+
+export const UPGRADE_CONFLICTS_MODAL_CANCEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeConflictsModal.cancelTitle',
+  {
+    defaultMessage: 'Cancel',
+  }
+);
+
+export const UPGRADE_CONFLICTS_MODAL_CONFIRM = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeConflictsModal.confirmTitle',
+  {
+    defaultMessage: 'Update rules without conflicts',
+  }
+);
+
+export const UPGRADE_CONFLICTS_MODAL_BODY = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeConflictsModal.affectedJobsTitle',
+  {
+    defaultMessage:
+      "Some of the selected rules have conflicts and, for that reason, won't be updated. Resolve the conflicts to properly update the rules.",
+  }
+);
diff --git a/...ne/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/translations.ts b/...ne/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/translations.ts
@@ -24,6 +24,27 @@ export const UPDATE_SELECTED_RULES = (numberOfSelectedRules: number) => {
   );
 };
 
+export const BULK_UPDATE_BUTTON_TOOLTIP_NO_PERMISSIONS = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.upgradeRules.bulkButtons.noPermissions',
+  {
+    defaultMessage: "You don't have permissions to update rules",
+  }
+);
+
+export const BULK_UPDATE_ALL_RULES_BUTTON_TOOLTIP_CONFLICTS = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.upgradeRules.bulkButtons.allRules.conflicts',
+  {
+    defaultMessage: 'All rules have conflicts. Update them individually.',
+  }
+);
+
+export const BULK_UPDATE_SELECTED_RULES_BUTTON_TOOLTIP_CONFLICTS = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.upgradeRules.bulkButtons.selectedRules.conflicts',
+  {
+    defaultMessage: 'All selected rules have conflicts. Update them individually.',
+  }
+);
+
 export const SEARCH_PLACEHOLDER = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.upgradeRules.searchBarPlaceholder',
   {
@@ -37,6 +58,12 @@ export const UPDATE_BUTTON_LABEL = i18n.translate(
     defaultMessage: 'Update',
   }
 );
+export const UPDATE_ERROR = i18n.translate(
+  'xpack.securitySolution.detectionEngine.ruleDetails.updateError',
+  {
+    defaultMessage: 'Update error',
+  }
+);
 
 export const UPDATE_FLYOUT_PER_FIELD_TOOLTIP_DESCRIPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.ruleDetails.perFieldTooltip',