Skip to content

Commit

Permalink
[8.9] [Security Solution] [Exceptions] Amend `Rule Exception's Commen…
Browse files Browse the repository at this point in the history
…t` text (#161092) (#161242)

# Backport

This will backport the following commits from `main` to `8.9`:
- [[Security Solution] [Exceptions] Amend `Rule Exception's Comment`
text (#161092)](#161092)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Wafaa
Nasr","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-07-05T10:44:03Z","message":"[Security
Solution] [Exceptions] Amend `Rule Exception's Comment` text
(#161092)\n\n## Summary\r\n\r\n- Addresses Docs team
comment\r\nhttps://github.com//pull/159908#discussion_r1247964658","sha":"16528cf28994b30642262a018c89c5217c28f884","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","v8.9.0","Team:Detection
Engine","v8.10.0"],"number":161092,"url":"https://github.com/elastic/kibana/pull/161092","mergeCommit":{"message":"[Security
Solution] [Exceptions] Amend `Rule Exception's Comment` text
(#161092)\n\n## Summary\r\n\r\n- Addresses Docs team
comment\r\nhttps://github.com//pull/159908#discussion_r1247964658","sha":"16528cf28994b30642262a018c89c5217c28f884"}},"sourceBranch":"main","suggestedTargetBranches":["8.9"],"targetPullRequestStates":[{"branch":"8.9","label":"v8.9.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/161092","number":161092,"mergeCommit":{"message":"[Security
Solution] [Exceptions] Amend `Rule Exception's Comment` text
(#161092)\n\n## Summary\r\n\r\n- Addresses Docs team
comment\r\nhttps://github.com//pull/159908#discussion_r1247964658","sha":"16528cf28994b30642262a018c89c5217c28f884"}}]}]
BACKPORT-->

Co-authored-by: Wafaa Nasr <[email protected]>
  • Loading branch information
kibanamachine and WafaaNasr authored Jul 5, 2023
1 parent 8a83825 commit 72db88f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ describe('Rule Exceptions workflows from Alert', () => {
*/
validateExceptionCommentCountAndText(
1,
'Exception conditions are pre-filled with relevant data from alert with "id"'
'Exception conditions are pre-filled with relevant data from an alert with the alert id (_id):'
);

addExceptionFlyoutItemName(ITEM_NAME);
Expand Down Expand Up @@ -207,7 +207,7 @@ describe('Rule Exceptions workflows from Alert', () => {
*/
validateExceptionCommentCountAndText(
1,
'Exception conditions are pre-filled with relevant data from alert with "id"'
'Exception conditions are pre-filled with relevant data from an alert with the alert id (_id):'
);

addExceptionFlyoutItemName(ITEM_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ export const ADD_RULE_EXCEPTION_FROM_ALERT_COMMENT = (alertId: string) =>
{
values: { alertId },
defaultMessage:
'Exception conditions are pre-filled with relevant data from alert with "id" {alertId}.',
'Exception conditions are pre-filled with relevant data from an alert with the alert id (_id): {alertId}.',
}
);

0 comments on commit 72db88f

Please sign in to comment.