Skip to content

[Security Solution] UI copy for Upgrade rules confirmation modal #213981

Merged
maximpn merged 1 commit intoelastic:mainfrom
maximpn:bulk-upgrade-rules-modal-ui-copy
Mar 13, 2025
Merged

[Security Solution] UI copy for Upgrade rules confirmation modal #213981
maximpn merged 1 commit intoelastic:mainfrom
maximpn:bulk-upgrade-rules-modal-ui-copy

Conversation

@maximpn
Copy link
Contributor

@maximpn maximpn commented Mar 11, 2025

Summary

Updates texts according to the suggested UI copy (source doc).

Screenshots

Update All rules:
image

Single rule with solvable conflicts:
image

Multiple rules with solvable conflicts:
image

Mix of conflict-free rules and rules with solvable conflicts:
image
image

Mix of conflict-free rules and rules with non-solvable conflicts:
image

Only rules with conflicts:
image
image

Mix of rules selected to update:
image

@maximpn maximpn added release_note:skip Skip the PR/issue when compiling release notes impact:medium Addressing this issue will have a medium level of impact on the quality/strength of our product. v9.0.0 Team:Detections and Resp Security Detection Response Team Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. Team:Detection Rule Management Security Detection Rule Management Team ui-copy Review of UI copy with docs team is recommended Feature:Prebuilt Detection Rules Security Solution Prebuilt Detection Rules area backport:version Backport to applied version labels v9.1.0 v8.19.0 labels Mar 11, 2025
@maximpn maximpn self-assigned this Mar 11, 2025
@maximpn maximpn marked this pull request as ready for review March 11, 2025 17:22
@maximpn maximpn requested a review from a team as a code owner March 11, 2025 17:22
@maximpn maximpn requested a review from nikitaindik March 11, 2025 17:22
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-detections-response (Team:Detections and Resp)

@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@elasticmachine
Copy link
Contributor

Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management)

@maximpn maximpn changed the title [Security Solution] Upgrade rules confirmation modal UI copy [Security Solution] UI copy for Upgrade rules confirmation modal Mar 11, 2025
@nikitaindik
Copy link
Contributor

Scherm­afbeelding 2025-03-11 om 18 59 53

Maybe it's just me, but imo it's not clear what will happen once I click Update rules.

In this case I have 1048 rules, of which:

  • 1020 are conflict-free
  • 27 have unresolved conflicts
  • 1 has auto-resolved conflicts

Clicking "Update rules" will update rules without conflicts + rules with auto-resolved conflicts. Should we be more explicit about it in the description? Maybe something like:

Click Update rules without conflicts to update the 1020 conflict-free rules.
Click Update rules to update the 1020 conflict-free rules and 1 rule with auto-resolved conflict.

@nastasha-solomon wdyt?

<FormattedMessage
id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.onlyNonSolvableConflicts"
defaultMessage="{numOfRulesStrong} selected {numOfRules, plural, =1 {rule has} other {rules have}} unresolved conflicts. Please review and update them individually via the flyout."
defaultMessage="{numOfRulesStrong} selected {numOfRules, plural, =1 {rule has} other {rules have}} unresolved conflicts. Rules with unresolved conflicts can’t be bulk-updated. You must manually fix their conflicts before updating them."
Copy link
Contributor

@nikitaindik nikitaindik Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be its conflicts if it's a single rule or is their conflicts applicable to both single and plural? @nastasha-solomon

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and in other places where this sentence is used

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The former (its conflicts) is more accurate if you're describing a single rule with an unresolved conflict.

Copy link
Contributor

@nikitaindik nikitaindik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maximpn @nastasha-solomon I have reviewed the changes and left a couple of minor remarks. Please take a look and update the copy if it makes sense to you.

I also tested the changes locally and can confirm that all the combinations of rules with different conflict states show appropriate modals under Enterprise/Complete license. 👍 Under the Basic/Essentials license rules are updated to target without showing modals to user.

Approving.

@nastasha-solomon
Copy link
Contributor

Hey, @maximpn - I provided some suggestions and notes below. Hope they're helpful and thanks for all of your work on this!

Update All rules:

I liked @nikitaindik's suggestion here and have a few additional suggestions to tighten the message:

Exclude rules with conflicts?

X of the X selected rules have conflicts. To safely update the X rules with auto-resolved conflicts, we recommend addressing the conflicts from the rule update flyout. The X rules with unresolved conflicts cannot be bulk-updated until you manually fix them.

Click Update rules without conflicts to update the X conflict-free rules.
Click Update rules to update the X conflict-free rules and X rules with auto-resolved conflicts.

Single rule with solvable conflicts:

Looks good!

Multiple rules with solvable conflicts:

Looks good!

Mix of conflict-free rules and rules with solvable conflicts:

The second sentence and last sentence are related, so it'd be good to place them closer together. The ordering and numbers seems a little disjointed as well. Here's a slightly re-organized version:

Exclude rules with conflicts?

X of the X selected rules have auto-resolved conflicts. To safely update them, we recommend addressing the conflicts from the rule update flyout.

Click Update rules without conflicts to update the X conflict-free rules.
Click Update rules to update the X conflict-free rules and X rules with auto-resolved conflicts.

Mix of conflict-free rules and rules with non-solvable conflicts:

X of the X selected rules have unresolved conflicts, which cannot be bulk-updated until you manually fix them.

Click Update rules without conflicts to update the X conflict-free rules.

Only rules with conflicts:

I need more information on the example screenshots. They look similar to the screenshots for "Multiple rules with solvable conflicts".

Mix of rules selected to update:

Exclude rules with conflicts?

X of the X selected rules have conflicts. To safely update the X rules with auto-resolved conflicts, we recommend addressing the conflicts from the rule update flyout. The X rules with unresolved conflicts cannot be bulk-updated until you manually fix them.

Click Update rules without conflicts to update the X conflict-free rules.
Click Update rules to update the X conflict-free rules and X rules with auto-resolved conflicts.

@maximpn
Copy link
Contributor Author

maximpn commented Mar 12, 2025

@nastasha-solomon,

I've updated texts according to your suggestions. Could you have a look?

Update All rules:

image

Single rule with solvable conflicts:

Looks good!

Stayed unchanged.

image

Multiple rules with solvable conflicts:

Looks good!

Stayed unchanged.

image

Only rules with conflicts:

I need more information on the example screenshots. They look similar to the screenshots for "Multiple rules with solvable conflicts".

In this case user selects only rules with conflicts. Compared to "Multiple rules with solvable conflicts" there are both conflict types (auto-resolved and unresolved conflicts) in the selected rules.

image

Mix of conflict-free rules and rules with solvable conflicts:

image image

Mix of conflict-free rules and rules with non-solvable conflicts:

image image

Mix of rules selected to update:

image

@maximpn maximpn force-pushed the bulk-upgrade-rules-modal-ui-copy branch from b53e760 to d14c674 Compare March 12, 2025 14:25
@maximpn maximpn force-pushed the bulk-upgrade-rules-modal-ui-copy branch from d14c674 to b09ccdc Compare March 12, 2025 15:30
@banderror
Copy link
Contributor

banderror commented Mar 12, 2025

@maximpn @nastasha-solomon @nikitaindik

The most recent copies look great and I'm totally fine with merging the PR as is. Just a few suggestions to think about:

  • The modal can look quite differently depending on what rules are selected. This requires quite a bit of code to be written and maintained just to render the modal properly. Maybe we could try to come up with a modal template that would have less variation. For example, first we list all the numbers, then we explain that rules with unresolved conflicts can't be bulk upgraded, then we explain that it's risky to upgrade rules with auto-resolved conflicts and we don't recommend this, etc. If there are no rules with unresolved conflicts, we just fill the corresponding placeholders in the modal template with an empty space. Same for auto-resolved conflicts and non-conflicting rules. I hope this can make the look-and-feel of the modal consistent and the code implementing it will be simpler.
  • I would like the modal to really stress out that it's risky to bulk upgrade rules with auto-resolved conflicts and we don't recommend this. Currently, this warning is lost among all the other text. This is the most important message in this whole modal and the primary reason why we show it in the first place. How can we make this warning more visible?

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 8.9MB 8.9MB +1.7KB

History

cc @maximpn

@maximpn maximpn merged commit aa3d5eb into elastic:main Mar 13, 2025
9 checks passed
@maximpn maximpn deleted the bulk-upgrade-rules-modal-ui-copy branch March 13, 2025 18:36
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.18, 8.x, 9.0

https://github.com/elastic/kibana/actions/runs/13842146815

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…stic#213981)

## Summary

Updates texts according to the suggested UI copy ([source doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).

## Screenshots

Update All rules:
<img width="1722" alt="image" src="https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a" />

Single rule with solvable conflicts:
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd" />

Multiple rules with solvable conflicts:
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9" />

Mix of conflict-free rules and rules with solvable conflicts:
<img width="1716" alt="image" src="https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10" />
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3" />

Mix of conflict-free rules and rules with non-solvable conflicts:
<img width="1723" alt="image" src="https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4" />

Only rules with conflicts:
<img width="1720" alt="image" src="https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423" />
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5" />

Mix of rules selected to update:
<img width="1717" alt="image" src="https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5" />

(cherry picked from commit aa3d5eb)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…stic#213981)

## Summary

Updates texts according to the suggested UI copy ([source doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).

## Screenshots

Update All rules:
<img width="1722" alt="image" src="https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a" />

Single rule with solvable conflicts:
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd" />

Multiple rules with solvable conflicts:
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9" />

Mix of conflict-free rules and rules with solvable conflicts:
<img width="1716" alt="image" src="https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10" />
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3" />

Mix of conflict-free rules and rules with non-solvable conflicts:
<img width="1723" alt="image" src="https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4" />

Only rules with conflicts:
<img width="1720" alt="image" src="https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423" />
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5" />

Mix of rules selected to update:
<img width="1717" alt="image" src="https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5" />

(cherry picked from commit aa3d5eb)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…stic#213981)

## Summary

Updates texts according to the suggested UI copy ([source doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).

## Screenshots

Update All rules:
<img width="1722" alt="image" src="https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a" />

Single rule with solvable conflicts:
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd" />

Multiple rules with solvable conflicts:
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9" />

Mix of conflict-free rules and rules with solvable conflicts:
<img width="1716" alt="image" src="https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10" />
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3" />

Mix of conflict-free rules and rules with non-solvable conflicts:
<img width="1723" alt="image" src="https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4" />

Only rules with conflicts:
<img width="1720" alt="image" src="https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423" />
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5" />

Mix of rules selected to update:
<img width="1717" alt="image" src="https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5" />

(cherry picked from commit aa3d5eb)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.18
8.x
9.0

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Mar 13, 2025
#213981) (#214463)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution] UI copy for Upgrade rules confirmation modal
(#213981)](#213981)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Maxim
Palenov","email":"maxim.palenov@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T18:36:35Z","message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","impact:medium","v9.0.0","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection Rule
Management","ui-copy","Feature:Prebuilt Detection
Rules","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"[Security
Solution] UI copy for Upgrade rules confirmation modal
","number":213981,"url":"https://github.com/elastic/kibana/pull/213981","mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/213981","number":213981,"mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 13, 2025
…al (#213981) (#214462)

# Backport

This will backport the following commits from `main` to `8.18`:
- [[Security Solution] UI copy for Upgrade rules confirmation modal
(#213981)](#213981)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Maxim
Palenov","email":"maxim.palenov@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T18:36:35Z","message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","impact:medium","v9.0.0","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection Rule
Management","ui-copy","Feature:Prebuilt Detection
Rules","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"[Security
Solution] UI copy for Upgrade rules confirmation modal
","number":213981,"url":"https://github.com/elastic/kibana/pull/213981","mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/213981","number":213981,"mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 14, 2025
#213981) (#214464)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[Security Solution] UI copy for Upgrade rules confirmation modal
(#213981)](#213981)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Maxim
Palenov","email":"maxim.palenov@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T18:36:35Z","message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","impact:medium","v9.0.0","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection Rule
Management","ui-copy","Feature:Prebuilt Detection
Rules","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"[Security
Solution] UI copy for Upgrade rules confirmation modal
","number":213981,"url":"https://github.com/elastic/kibana/pull/213981","mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/213981","number":213981,"mergeCommit":{"message":"[Security
Solution] UI copy for Upgrade rules confirmation modal (#213981)\n\n##
Summary\n\nUpdates texts according to the suggested UI copy ([source
doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).\n\n##
Screenshots\n\nUpdate All rules:\n<img width=\"1722\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a\"
/>\n\nSingle rule with solvable conflicts:\n<img width=\"1714\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd\"
/>\n\nMultiple rules with solvable conflicts:\n<img width=\"1718\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9\"
/>\n\nMix of conflict-free rules and rules with solvable
conflicts:\n<img width=\"1716\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10\"
/>\n<img width=\"1714\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3\"
/>\n\nMix of conflict-free rules and rules with non-solvable
conflicts:\n<img width=\"1723\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4\"
/>\n\nOnly rules with conflicts:\n<img width=\"1720\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423\"
/>\n<img width=\"1718\" alt=\"image\"
src=\"https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5\"
/>\n\nMix of rules selected to update:\n<img width=\"1717\"
alt=\"image\"
src=\"https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5\"
/>","sha":"aa3d5eb3737f4885783fa1a9e51f89e422f4f4b2"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Mar 22, 2025
…stic#213981)

## Summary

Updates texts according to the suggested UI copy ([source doc](https://docs.google.com/document/d/1qjSxs1aDHJ8AKj5xR4erPdNumLy9Jqu3AlL9oGXnfxo/edit?tab=t.0)).

## Screenshots

Update All rules:
<img width="1722" alt="image" src="https://github.com/user-attachments/assets/424d4812-6a29-4205-ab5d-df2b2024507a" />

Single rule with solvable conflicts:
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/916a264f-44ba-45de-99cb-15e337ead2bd" />

Multiple rules with solvable conflicts:
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/6b7684f6-978b-4511-9b8a-ccde049730b9" />

Mix of conflict-free rules and rules with solvable conflicts:
<img width="1716" alt="image" src="https://github.com/user-attachments/assets/cd2325a6-0dec-48b1-a2af-6185acf16b10" />
<img width="1714" alt="image" src="https://github.com/user-attachments/assets/ecb74497-ddbb-4407-8dfd-6902642dd9c3" />

Mix of conflict-free rules and rules with non-solvable conflicts:
<img width="1723" alt="image" src="https://github.com/user-attachments/assets/0b980dd4-4109-4b63-859f-c95cc31dd7b4" />

Only rules with conflicts:
<img width="1720" alt="image" src="https://github.com/user-attachments/assets/f66cee4e-e648-4eb5-902a-db0a4bd3a423" />
<img width="1718" alt="image" src="https://github.com/user-attachments/assets/9d42e5d9-6a62-4c60-8aea-bb5376b2d2c5" />

Mix of rules selected to update:
<img width="1717" alt="image" src="https://github.com/user-attachments/assets/e882cbd1-203d-499f-b51f-37691405a3a5" />
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels Feature:Prebuilt Detection Rules Security Solution Prebuilt Detection Rules area impact:medium Addressing this issue will have a medium level of impact on the quality/strength of our product. release_note:skip Skip the PR/issue when compiling release notes Team:Detection Rule Management Security Detection Rule Management Team Team:Detections and Resp Security Detection Response Team Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. ui-copy Review of UI copy with docs team is recommended v8.18.0 v8.19.0 v9.0.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants