[Security Solution] Avoid showing rules update confirmation modal on basic license#214340
Merged
maximpn merged 1 commit intoelastic:mainfrom Mar 13, 2025
Conversation
maximpn
added
bug
Contributor
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
Contributor
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
Contributor
|
Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management) |
nikitaindik
approved these changes
Mar 13, 2025
Contributor
nikitaindik
left a comment
nikitaindik
left a comment
There was a problem hiding this comment.
Thanks for the PR, @maximpn! I have reviewed and tested it locally.
I confirmed that the modal doesn’t appear on Basic, so it doesn’t interfere with the "Upgrade all" flow.
One edge case I noticed is when a user has ML rules — such as leftovers from a previous Trial or Enterprise license. In this case, these rules aren’t upgraded, and the user only sees a generic message that doesn’t explain why some rules weren’t upgraded. We might want to improve this in the future.
Without ML rules all rules can be upgraded.
Contributor
|
Starting backport for target branches: 8.18, 8.x, 9.0 https://github.com/elastic/kibana/actions/runs/13836193490 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 13, 2025
…basic license (elastic#214340) **Resolves:** elastic#214302 ## Summary This PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed. ## Details Users may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`. The fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license. There is a [ticket](elastic#214338) to address this issue in the API endpoint. (cherry picked from commit d782b71)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 13, 2025
…basic license (elastic#214340) **Resolves:** elastic#214302 ## Summary This PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed. ## Details Users may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`. The fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license. There is a [ticket](elastic#214338) to address this issue in the API endpoint. (cherry picked from commit d782b71)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 13, 2025
…basic license (elastic#214340) **Resolves:** elastic#214302 ## Summary This PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed. ## Details Users may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`. The fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license. There is a [ticket](elastic#214338) to address this issue in the API endpoint. (cherry picked from commit d782b71)
Contributor
💚 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
Mar 13, 2025
…dal on basic license (#214340) (#214383) # Backport This will backport the following commits from `main` to `8.18`: - [[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)](#214340) <!--- 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-13T13:47:30Z","message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.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","v9.1.0","v8.19.0"],"title":"[Security Solution] Avoid showing rules update confirmation modal on basic license","number":214340,"url":"https://github.com/elastic/kibana/pull/214340","mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},"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/214340","number":214340,"mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},{"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 on basic license (#214340) (#214384) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)](#214340) <!--- 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-13T13:47:30Z","message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.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","v9.1.0","v8.19.0"],"title":"[Security Solution] Avoid showing rules update confirmation modal on basic license","number":214340,"url":"https://github.com/elastic/kibana/pull/214340","mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},"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/214340","number":214340,"mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},{"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 on basic license (#214340) (#214385) # Backport This will backport the following commits from `main` to `9.0`: - [[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)](#214340) <!--- 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-13T13:47:30Z","message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.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","v9.1.0","v8.19.0"],"title":"[Security Solution] Avoid showing rules update confirmation modal on basic license","number":214340,"url":"https://github.com/elastic/kibana/pull/214340","mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},"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/214340","number":214340,"mergeCommit":{"message":"[Security Solution] Avoid showing rules update confirmation modal on basic license (#214340)\n\n**Resolves:** https://github.com/elastic/kibana/issues/214302\n\n## Summary\n\nThis PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.\n\n## Details\n\nUsers may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`.\n\nThe fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.\n\nThere is a [ticket](#214338) to address this issue in the API endpoint.","sha":"d782b7163785acd3e1bd26a70c9a93454611b9c4"}},{"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
…basic license (elastic#214340) **Resolves:** elastic#214302 ## Summary This PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed. ## Details Users may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from `upgrade/_perform` which doesn't respect `pick_version`. It's expected rule upgrade goes smoothly when `pick_version` is one of `BASE`, `CURRENT` or `TARGET`. The fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license. There is a [ticket](elastic#214338) to address this issue in the API endpoint.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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: #214302
Summary
This PR prevents showing rule upgrade confirmation modal on lower licenses where prebuilt rules customization is not allowed.
Details
Users may see a rules upgrade confirmation modal when trying to upgrade prebuilt rules even if prebuilt rules customization is disabled due to insufficient license. It happens due to improper response from
upgrade/_performwhich doesn't respectpick_version. It's expected rule upgrade goes smoothly whenpick_versionis one ofBASE,CURRENTorTARGET.The fix makes sure dry run request isn't fired and a prebuilt rules upgrade confirmation modal isn't shown when running with insufficient for prebuilt rules customization license.
There is a ticket to address this issue in the API endpoint.