Skip to content

[Security Solution] Hide conflict badges when rule customization is not enabled#214365

Merged
nikitaindik merged 1 commit intoelastic:mainfrom
nikitaindik:hide-conflict-badges-in-upgrade-table-on-basic
Mar 13, 2025
Merged

[Security Solution] Hide conflict badges when rule customization is not enabled#214365
nikitaindik merged 1 commit intoelastic:mainfrom
nikitaindik:hide-conflict-badges-in-upgrade-table-on-basic

Conversation

@nikitaindik
Copy link
Contributor

@nikitaindik nikitaindik commented Mar 13, 2025

Resolves: #214301

Summary

This PR removes conflict badges from the Rule Updates table for users with license that is insufficient for prebuilt rule customization.

Before (on Basic license)
Scherm­afbeelding 2025-03-13 om 13 44 07

After (on Basic license)
Scherm­afbeelding 2025-03-13 om 13 39 01

Since users on Basic license can't customize rules, it doesn't make sense to show these badges - they are not actionable anyways.

Users will still see a callout mentioning that their modifications will be erased if they open a flyout for a customized rule.

Scherm­afbeelding 2025-03-13 om 13 41 21

@nikitaindik nikitaindik added release_note:skip Skip the PR/issue when compiling release notes v9.0.0 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 Feature:Prebuilt Detection Rules Security Solution Prebuilt Detection Rules area backport:version Backport to applied version labels v8.18.0 v9.1.0 v8.19.0 labels Mar 13, 2025
@nikitaindik nikitaindik self-assigned this Mar 13, 2025
@nikitaindik nikitaindik requested a review from a team as a code owner March 13, 2025 12:50
@nikitaindik nikitaindik requested a review from xcrzx March 13, 2025 12:50
@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management)

Copy link
Contributor

@xcrzx xcrzx left a comment

Choose a reason for hiding this comment

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

Didn't test it locally as the change is very trivial. LGTM 👍

@nikitaindik nikitaindik enabled auto-merge (squash) March 13, 2025 13:07
Copy link
Contributor

@maximpn maximpn left a comment

Choose a reason for hiding this comment

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

LGTM

@nikitaindik nikitaindik merged commit 9f2e07f into elastic:main Mar 13, 2025
30 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.18, 8.x, 9.0

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

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

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 8.9MB 8.9MB +10.0B

cc @nikitaindik

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…ot enabled (elastic#214365)

**Resolves: elastic#214301

## Summary

This PR removes conflict badges from the Rule Updates table for users
with license that is insufficient for prebuilt rule customization.

**Before (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 44 07"
src="https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786"
/>

**After (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 39 01"
src="https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227"
/>

Since users on Basic license can't customize rules, it doesn't make
sense to show these badges - they are not actionable anyways.

Users will still see a callout mentioning that their modifications will
be erased if they open a flyout for a customized rule.

<img width="953" alt="Scherm­afbeelding 2025-03-13 om 13 41 21"
src="https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6"
/>

(cherry picked from commit 9f2e07f)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…ot enabled (elastic#214365)

**Resolves: elastic#214301

## Summary

This PR removes conflict badges from the Rule Updates table for users
with license that is insufficient for prebuilt rule customization.

**Before (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 44 07"
src="https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786"
/>

**After (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 39 01"
src="https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227"
/>

Since users on Basic license can't customize rules, it doesn't make
sense to show these badges - they are not actionable anyways.

Users will still see a callout mentioning that their modifications will
be erased if they open a flyout for a customized rule.

<img width="953" alt="Scherm­afbeelding 2025-03-13 om 13 41 21"
src="https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6"
/>

(cherry picked from commit 9f2e07f)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 13, 2025
…ot enabled (elastic#214365)

**Resolves: elastic#214301

## Summary

This PR removes conflict badges from the Rule Updates table for users
with license that is insufficient for prebuilt rule customization.

**Before (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 44 07"
src="https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786"
/>

**After (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 39 01"
src="https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227"
/>

Since users on Basic license can't customize rules, it doesn't make
sense to show these badges - they are not actionable anyways.

Users will still see a callout mentioning that their modifications will
be erased if they open a flyout for a customized rule.

<img width="953" alt="Scherm­afbeelding 2025-03-13 om 13 41 21"
src="https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6"
/>

(cherry picked from commit 9f2e07f)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.18
8.x
9.0

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
…n is not enabled (#214365) (#214410)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[Security Solution] Hide conflict badges when rule customization is
not enabled (#214365)](#214365)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Nikita
Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:52:48Z","message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","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] Hide conflict badges when rule customization is not
enabled","number":214365,"url":"https://github.com/elastic/kibana/pull/214365","mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},"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/214365","number":214365,"mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 13, 2025
…on is not enabled (#214365) (#214407)

# Backport

This will backport the following commits from `main` to `8.18`:
- [[Security Solution] Hide conflict badges when rule customization is
not enabled (#214365)](#214365)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Nikita
Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:52:48Z","message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","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] Hide conflict badges when rule customization is not
enabled","number":214365,"url":"https://github.com/elastic/kibana/pull/214365","mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},"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/214365","number":214365,"mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 13, 2025
…n is not enabled (#214365) (#214408)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution] Hide conflict badges when rule customization is
not enabled (#214365)](#214365)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Nikita
Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:52:48Z","message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","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] Hide conflict badges when rule customization is not
enabled","number":214365,"url":"https://github.com/elastic/kibana/pull/214365","mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},"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/214365","number":214365,"mergeCommit":{"message":"[Security
Solution] Hide conflict badges when rule customization is not enabled
(#214365)\n\n**Resolves:
https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis
PR removes conflict badges from the Rule Updates table for users\nwith
license that is insufficient for prebuilt rule
customization.\n\n**Before (on Basic license)**\n<img width=\"1014\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 44
07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After
(on Basic license)**\n<img width=\"1014\" alt=\"Scherm­afbeelding
2025-03-13 om 13 39
01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince
users on Basic license can't customize rules, it doesn't make\nsense to
show these badges - they are not actionable anyways.\n\nUsers will still
see a callout mentioning that their modifications will\nbe erased if
they open a flyout for a customized rule.\n\n<img width=\"953\"
alt=\"Scherm­afbeelding 2025-03-13 om 13 41
21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Mar 22, 2025
…ot enabled (elastic#214365)

**Resolves: elastic#214301

## Summary

This PR removes conflict badges from the Rule Updates table for users
with license that is insufficient for prebuilt rule customization.

**Before (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 44 07"
src="https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786"
/>


**After (on Basic license)**
<img width="1014" alt="Scherm­afbeelding 2025-03-13 om 13 39 01"
src="https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227"
/>

Since users on Basic license can't customize rules, it doesn't make
sense to show these badges - they are not actionable anyways.

Users will still see a callout mentioning that their modifications will
be erased if they open a flyout for a customized rule.

<img width="953" alt="Scherm­afbeelding 2025-03-13 om 13 41 21"
src="https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6"
/>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels Feature:Prebuilt Detection Rules Security Solution Prebuilt Detection Rules area 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.18.0 v8.19.0 v9.0.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Security Solution] Conflict badges are shown under Platinum license / Essentials tier

5 participants