From 7a744a746b4ae344b57ef40f6935a22343c6764c Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 31 May 2024 11:50:44 -0400 Subject: [PATCH] Alerting: Update docs with rule read RBAC changes (#88565) * Remove ref to `datasources:query` for rule read * Remove more refs to `datasources:query` * Run prettier --- .../alerting/set-up/configure-rbac/_index.md | 2 +- .../configure-rbac/access-roles/index.md | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docs/sources/alerting/set-up/configure-rbac/_index.md b/docs/sources/alerting/set-up/configure-rbac/_index.md index 4591f6ebf95..93e2f25ab3d 100644 --- a/docs/sources/alerting/set-up/configure-rbac/_index.md +++ b/docs/sources/alerting/set-up/configure-rbac/_index.md @@ -42,7 +42,7 @@ Grafana Alerting has the following permissions. | `alert.rules.external:write` | `datasources:*`
`datasources:uid:*` | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki). | | `alert.rules:create` | `folders:*`
`folders:uid:*` | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. | | `alert.rules:delete` | `folders:*`
`folders:uid:*` | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. | -| `alert.rules:read` | `folders:*`
`folders:uid:*` | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. | +| `alert.rules:read` | `folders:*`
`folders:uid:*` | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder. | | `alert.rules:write` | `folders:*`
`folders:uid:*` | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. | | `alert.silences:create` | `folders:*`
`folders:uid:*` | Create rule-specific silences in a folder and its subfolders. | | `alert.silences:read` | `folders:*`
`folders:uid:*` | Read general and rule-specific silences in a folder and its subfolders. | diff --git a/docs/sources/alerting/set-up/configure-rbac/access-roles/index.md b/docs/sources/alerting/set-up/configure-rbac/access-roles/index.md index 5e82b38534d..c841f96f5a6 100644 --- a/docs/sources/alerting/set-up/configure-rbac/access-roles/index.md +++ b/docs/sources/alerting/set-up/configure-rbac/access-roles/index.md @@ -67,7 +67,7 @@ For more information on creating custom roles, refer to [Create custom roles](ht The following examples give you an idea of how you can combine permissions for Grafana Alerting. -A custom role for read access to alert rules that uses data source DS1 and DS2 in folder F: +A custom role for read access to alert rules in folder F: ``` @@ -77,14 +77,6 @@ PUT access-control/roles "displayName": "Alert rule reader in folder F", "description": "Read access to rules in folder F that use DS1 and DS2", "permissions": [ - { - "action": "datasources:query", - "scope": "datasources:uid:UID_DS1" - }, - { - "action": "datasources:query", - "scope": "datasources:uid:UID_DS2" - }, { "action": "alert.rules:read", "scope": "folders:uid:UID_F" @@ -108,14 +100,6 @@ PUT access-control/roles "displayName": "Alert rules editor in folder F", "description": "Edit access to rules in folder F that use DS1 and DS2", "permissions": [ - { - "action": "datasources:query", - "scope": "datasources:uid:UID_DS1" - }, - { - "action": "datasources:query", - "scope": "datasources:uid:UID_DS2" - }, { "action": "alert.rules:read", "scope": "folders:uid:UID_F"