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] Add a migration to unmute custom Security Solution rules #156593

Merged
merged 5 commits into from
May 4, 2023

Conversation

maximpn
Copy link
Contributor

@maximpn maximpn commented May 3, 2023

Addresses: #156352

Summary

This PR adds a migration to unmute all Security Solution's custom rules while migrating to Kibana 8.8. As we added support for rule snoozing in 8.8 https://github.com/elastic/security-team/issues/5308 users are able to manage muting of rule notifications. Prior 8.8 Security Solution's custom rules were muted under the hood if there is no actions.

@maximpn maximpn added release_note:skip Skip the PR/issue when compiling release notes 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 backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) v8.8.0 labels May 3, 2023
@maximpn maximpn self-assigned this May 3, 2023
@maximpn maximpn requested a review from spong May 3, 2023 16:55
@maximpn maximpn marked this pull request as ready for review May 3, 2023 16:56
@maximpn maximpn requested a review from a team as a code owner May 3, 2023 16:56
@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

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

@pmuellr
Copy link
Member

pmuellr commented May 3, 2023

This needs a jest test in https://github.com/elastic/kibana/blob/main/x-pack/plugins/alerting/server/saved_objects/migrations/index.test.ts

Ideally, we could also add a function test, but they tend to be hairy, and this seems like a pretty simple migration. But could you take a look? Will help with any future regressions ... https://github.com/elastic/kibana/blob/main/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/migrations.ts

Copy link
Member

@spong spong left a comment

Choose a reason for hiding this comment

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

Checked out, tested locally, and upon upgrade rules are no longer being automatically snoozed. I agree w/ @pmuellr that we should add a jest test here as well, and maybe functional test if possible, but other than that LGTM 👍 🍨

Test steps:

  • Checked out 8.7.2, installed prebuilt rules and created a couple custom rules
  • Terminated ES & Kibana processes
  • Checkout out this branch, restarted ES, then Kibana
  • Verified rules were enabled and no snooze was active.

@banderror banderror added the bug Fixes for quality problems that affect the customer experience label May 4, 2023
@maximpn maximpn force-pushed the add-unmute-rules-migration branch from 91ea31e to 2ca6d24 Compare May 4, 2023 11:06
@maximpn
Copy link
Contributor Author

maximpn commented May 4, 2023

@pmuellr thank you for the review, I've added unit and functional tests as you requested.

@maximpn maximpn force-pushed the add-unmute-rules-migration branch from 0055c0a to 5c55432 Compare May 4, 2023 17:10
Copy link
Member

@pmuellr pmuellr left a comment

Choose a reason for hiding this comment

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

LGTM

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
securitySolution 398 401 +3
total +5

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
securitySolution 478 481 +3
total +5

History

  • 💚 Build #125487 succeeded 0055c0a730bb933a15356fa2dd4acb6fa71c7f44
  • 💚 Build #125257 succeeded 91ea31e0b824cc0d02471dfd583472f43c0677ed

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @maximpn

@maximpn maximpn merged commit fc107d0 into elastic:main May 4, 2023
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 4, 2023
…n rules (elastic#156593)

**Addresses:** elastic#156352

## Summary

This PR adds a migration to unmute all Security Solution's custom rules while migrating to Kibana `8.8`. As we added support for rule snoozing in `8.8` elastic/security-team#5308 users are able to manage muting of rule notifications. Prior `8.8` Security Solution's custom rules were muted under the hood if there is no actions.

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

💚 All backports created successfully

Status Branch Result
8.8

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 May 4, 2023
…olution rules (#156593) (#156728)

# Backport

This will backport the following commits from `main` to `8.8`:
- [[Security Solution] Add a migration to unmute custom Security
Solution rules (#156593)](#156593)

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

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

<!--BACKPORT [{"author":{"name":"Maxim
Palenov","email":"maxim.palenov@elastic.co"},"sourceCommit":{"committedDate":"2023-05-04T19:11:35Z","message":"[Security
Solution] Add a migration to unmute custom Security Solution rules
(#156593)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/156352\r\n\r\n##
Summary\r\n\r\nThis PR adds a migration to unmute all Security
Solution's custom rules while migrating to Kibana `8.8`. As we added
support for rule snoozing in `8.8`
elastic/security-team#5308 users are able to
manage muting of rule notifications. Prior `8.8` Security Solution's
custom rules were muted under the hood if there is no
actions.","sha":"fc107d0e5b36e7bc49f4230f2a85d50d16050323","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection
Rules","backport:prev-minor","v8.8.0","v8.9.0"],"number":156593,"url":"https://github.com/elastic/kibana/pull/156593","mergeCommit":{"message":"[Security
Solution] Add a migration to unmute custom Security Solution rules
(#156593)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/156352\r\n\r\n##
Summary\r\n\r\nThis PR adds a migration to unmute all Security
Solution's custom rules while migrating to Kibana `8.8`. As we added
support for rule snoozing in `8.8`
elastic/security-team#5308 users are able to
manage muting of rule notifications. Prior `8.8` Security Solution's
custom rules were muted under the hood if there is no
actions.","sha":"fc107d0e5b36e7bc49f4230f2a85d50d16050323"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/156593","number":156593,"mergeCommit":{"message":"[Security
Solution] Add a migration to unmute custom Security Solution rules
(#156593)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/156352\r\n\r\n##
Summary\r\n\r\nThis PR adds a migration to unmute all Security
Solution's custom rules while migrating to Kibana `8.8`. As we added
support for rule snoozing in `8.8`
elastic/security-team#5308 users are able to
manage muting of rule notifications. Prior `8.8` Security Solution's
custom rules were muted under the hood if there is no
actions.","sha":"fc107d0e5b36e7bc49f4230f2a85d50d16050323"}}]}]
BACKPORT-->

Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
@maximpn maximpn deleted the add-unmute-rules-migration branch May 5, 2023 07:53
jloleysens added a commit that referenced this pull request May 5, 2023
* main: (153 commits)
  [Security Solution] {{state.signals_count}} Object not working (#156472) (#156707)
  [Synthetics] refresh data on visualization scrubbing (#156777)
  [RAM] Docs for slack improvements (#153885)
  [RAM] Alert search bar only KQL (#155947)
  [ML] Functional tests - stabilize export job tests (#156586)
  [Saved Search] Update saved search schema to allow empty `sort` arrays (#156769)
  [ML] Rename `curated` model type to `elastic` (#156684)
  [Discover] Enable sharing for text based languages (#156652)
  [api-docs] 2023-05-05 Daily api_docs build (#156781)
  Upgrade EUI to v77.2.2 (#155208)
  [RAM][Maintenance Window][8.8]Fix window maintenance workflow (#156427)
  [DOCS] Case file attachments (#156459)
  [D4C] additional error handling for 'block' action added + policy editor UI fixes (#156629)
  [Enterprise Search] refactor(SearchApplications): rename telemetry ids (#156733)
  [Enterprise Search] Add telemetry to ELSER deployment buttons + error (#156545)
  [Security Solution] fixes Data Quality dashboard errors when a `basePath` is configured (#156233)
  [Logs onboarding] StepsFooter outside of main panel (#156686)
  [Security Solution] Add a migration to unmute custom Security Solution rules (#156593)
  [Enterprise Search][Behavioral Analytics] Update formulas (#156704)
  Add API Events to Endpoint Security Advanced Policy (#156718)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) bug Fixes for quality problems that affect the customer experience 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. v8.8.0 v8.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants