[Security Solution] Fix Threat Match rules inability to upgrade #203366
+3
−79
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maximpn
added
bug
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
|
Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management) |
💚 Build Succeeded
Metrics [docs]Module Count
Async chunks
History
cc @maximpn |
|
Starting backport for target branches: 8.x https://github.com/elastic/kibana/actions/runs/12251915649 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Dec 10, 2024
…tic#203366) **Resolves:** elastic#203365 ## Summary This PR fixes a bug preventing Threat Match rules from being upgraded. ## Details It's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged `threat_query` field with `threat_query`. ## Screen recording (with the fix) https://github.com/user-attachments/assets/9f0375fb-d39d-4b4b-a084-96ea265f306f (cherry picked from commit b9addc2)
💚 All backports created successfully
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
Dec 10, 2024
…#203366) (#203519) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] Fix Threat Match rules inability to upgrade (#203366)](#203366) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Maxim Palenov","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-10T08:09:31Z","message":"[Security Solution] Fix Threat Match rules inability to upgrade (#203366)\n\n**Resolves:** https://github.com/elastic/kibana/issues/203365\r\n\r\n## Summary\r\n\r\nThis PR fixes a bug preventing Threat Match rules from being upgraded.\r\n\r\n## Details\r\n\r\nIt's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged `threat_query` field with `threat_query`.\r\n\r\n## Screen recording (with the fix)\r\n\r\nhttps://github.com/user-attachments/assets/9f0375fb-d39d-4b4b-a084-96ea265f306f","sha":"b9addc2f23d676ae2bcb8c979dece80fb0a88554","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","impact:high","v9.0.0","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","Feature:Prebuilt Detection Rules","backport:version","v8.18.0"],"title":"[Security Solution] Fix Threat Match rules inability to upgrade","number":203366,"url":"https://github.com/elastic/kibana/pull/203366","mergeCommit":{"message":"[Security Solution] Fix Threat Match rules inability to upgrade (#203366)\n\n**Resolves:** https://github.com/elastic/kibana/issues/203365\r\n\r\n## Summary\r\n\r\nThis PR fixes a bug preventing Threat Match rules from being upgraded.\r\n\r\n## Details\r\n\r\nIt's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged `threat_query` field with `threat_query`.\r\n\r\n## Screen recording (with the fix)\r\n\r\nhttps://github.com/user-attachments/assets/9f0375fb-d39d-4b4b-a084-96ea265f306f","sha":"b9addc2f23d676ae2bcb8c979dece80fb0a88554"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203366","number":203366,"mergeCommit":{"message":"[Security Solution] Fix Threat Match rules inability to upgrade (#203366)\n\n**Resolves:** https://github.com/elastic/kibana/issues/203365\r\n\r\n## Summary\r\n\r\nThis PR fixes a bug preventing Threat Match rules from being upgraded.\r\n\r\n## Details\r\n\r\nIt's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged `threat_query` field with `threat_query`.\r\n\r\n## Screen recording (with the fix)\r\n\r\nhttps://github.com/user-attachments/assets/9f0375fb-d39d-4b4b-a084-96ea265f306f","sha":"b9addc2f23d676ae2bcb8c979dece80fb0a88554"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Maxim Palenov <[email protected]>
CAWilson94
pushed a commit
to CAWilson94/kibana
that referenced
this pull request
Dec 12, 2024
…tic#203366) **Resolves:** elastic#203365 ## Summary This PR fixes a bug preventing Threat Match rules from being upgraded. ## Details It's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged `threat_query` field with `threat_query`. ## Screen recording (with the fix) https://github.com/user-attachments/assets/9f0375fb-d39d-4b4b-a084-96ea265f306f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #203365
Summary
This PR fixes a bug preventing Threat Match rules from being upgraded.
Details
It's expected that users can upgrade Elastic prebuilt rules without any customizations in any possible way (in flyout, rules upgrade table, bulk actions). This operation was blocked due to wrong Threat Match fields conversions to Diffable rule. This PR fixes rule type specific fiels conversions and merged
threat_queryfield withthreat_query.Screen recording (with the fix)
Screen.Recording.2024-12-09.at.08.40.53.mov