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

[Security Solution][Notes] - copy changes for note and timeline + move the unassociated note advanced setting under the Security Solution section #197312

Merged
merged 3 commits into from
Oct 22, 2024

Conversation

PhilippeOberti
Copy link
Contributor

@PhilippeOberti PhilippeOberti commented Oct 22, 2024

Summary

This PR tackles 2 small tasks:

  • move the unassociated advanced settings introduced in this PR under the Security Solution category instead of General
  • make some copy changes on the notes functionality, mainly the following (copy changes document)
    • make sure we don't use a capital N for the word note
    • make sure that we use a capital T for the word timeline
    • change some of the no message and callout texts
    • prioritize using attach instead of associate

All changes have been done with @nastasha-solomon.

#193495

Checklist

@PhilippeOberti PhilippeOberti added backport release_note:skip Skip the PR/issue when compiling release notes v9.0.0 Team:Threat Hunting:Investigations Security Solution Investigations Team v8.16.0 labels Oct 22, 2024
@PhilippeOberti PhilippeOberti requested review from a team as code owners October 22, 2024 17:38
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-threat-hunting-investigations (Team:Threat Hunting:Investigations)

Copy link
Contributor

@tomsonpl tomsonpl left a comment

Choose a reason for hiding this comment

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

Defend Workflows code changes LGTM 👍

…e the unassociated note advanced setting under the Security Solution section
Copy link
Contributor

@nastasha-solomon nastasha-solomon left a comment

Choose a reason for hiding this comment

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

Left a few super minor edits. Otherwise, lgtm and thanks for making these changes!

@PhilippeOberti PhilippeOberti enabled auto-merge (squash) October 22, 2024 21:38
@PhilippeOberti PhilippeOberti merged commit 800e392 into elastic:main Oct 22, 2024
44 checks passed
@PhilippeOberti PhilippeOberti deleted the notes_copy_changes branch October 22, 2024 23:20
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.x

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

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #62 / Rule execution logic API Detection Engine - Execution logic @ess @serverless Indicator match type rules, alert suppression Code execution path: events count is greater than threats count should NOT suppress and update an alert if the alert is closed

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 20.7MB 20.7MB -481.0B

History

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 22, 2024
…e the unassociated note advanced setting under the Security Solution section (elastic#197312)

## Summary

This PR tackles 2 small tasks:
- move the unassociated advanced settings introduced in [this
PR](elastic#194947) under the `Security
Solution` category instead of `General`
- make some copy changes on the notes functionality, mainly the
following ([copy changes
document](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))
  - make sure we don't use a capital `N` for the word `note`
  - make sure that we use a capital `T` for the word `timeline`
  - change some of the no message and callout texts
  - prioritize using `attach` instead of `associate`

All changes have been done with @nastasha-solomon.

elastic#193495
(cherry picked from commit 800e392)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 22, 2024
…e the unassociated note advanced setting under the Security Solution section (elastic#197312)

## Summary

This PR tackles 2 small tasks:
- move the unassociated advanced settings introduced in [this
PR](elastic#194947) under the `Security
Solution` category instead of `General`
- make some copy changes on the notes functionality, mainly the
following ([copy changes
document](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))
  - make sure we don't use a capital `N` for the word `note`
  - make sure that we use a capital `T` for the word `timeline`
  - change some of the no message and callout texts
  - prioritize using `attach` instead of `associate`

All changes have been done with @nastasha-solomon.

elastic#193495
(cherry picked from commit 800e392)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.16
8.x

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 Oct 23, 2024
…e + move the unassociated note advanced setting under the Security Solution section (#197312) (#197350)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[Security Solution][Notes] - copy changes for note and timeline +
move the unassociated note advanced setting under the Security Solution
section (#197312)](#197312)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Philippe
Oberti","email":"philippe.oberti@elastic.co"},"sourceCommit":{"committedDate":"2024-10-22T23:20:10Z","message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","Team:Threat
Hunting:Investigations","v8.16.0"],"title":"[Security Solution][Notes] -
copy changes for note and timeline + move the unassociated note advanced
setting under the Security Solution
section","number":197312,"url":"https://github.com/elastic/kibana/pull/197312","mergeCommit":{"message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197312","number":197312,"mergeCommit":{"message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Philippe Oberti <philippe.oberti@elastic.co>
kibanamachine added a commit that referenced this pull request Oct 23, 2024
… + move the unassociated note advanced setting under the Security Solution section (#197312) (#197351)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution][Notes] - copy changes for note and timeline +
move the unassociated note advanced setting under the Security Solution
section (#197312)](#197312)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Philippe
Oberti","email":"philippe.oberti@elastic.co"},"sourceCommit":{"committedDate":"2024-10-22T23:20:10Z","message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","Team:Threat
Hunting:Investigations","v8.16.0"],"title":"[Security Solution][Notes] -
copy changes for note and timeline + move the unassociated note advanced
setting under the Security Solution
section","number":197312,"url":"https://github.com/elastic/kibana/pull/197312","mergeCommit":{"message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197312","number":197312,"mergeCommit":{"message":"[Security
Solution][Notes] - copy changes for note and timeline + move the
unassociated note advanced setting under the Security Solution section
(#197312)\n\n## Summary\r\n\r\nThis PR tackles 2 small tasks:\r\n- move
the unassociated advanced settings introduced in
[this\r\nPR](#194947) under the
`Security\r\nSolution` category instead of `General`\r\n- make some copy
changes on the notes functionality, mainly the\r\nfollowing ([copy
changes\r\ndocument](https://docs.google.com/document/d/10blyxRfkMIR8gk4cw6nFzajA-L63iUzQaxQXHauL8LM/edit#heading=h.mlyibn1i5q84))\r\n
- make sure we don't use a capital `N` for the word `note`\r\n - make
sure that we use a capital `T` for the word `timeline`\r\n - change some
of the no message and callout texts\r\n - prioritize using `attach`
instead of `associate`\r\n\r\nAll changes have been done with
@nastasha-solomon.\r\n\r\nhttps://github.com//issues/193495","sha":"800e39224eed1335519d00e62e423af241495be9"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Philippe Oberti <philippe.oberti@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_note:skip Skip the PR/issue when compiling release notes Team:Threat Hunting:Investigations Security Solution Investigations Team v8.16.0 v8.17.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants