From b2864d6dfb3c30aa3ba987a5fb63d3bc69392a74 Mon Sep 17 00:00:00 2001 From: Ieva Date: Fri, 14 Jun 2024 15:16:16 +0300 Subject: [PATCH] Docs: add information about `overrideRole` provisioning option to docs (#89181) add information about overrideRole provisioning option to docs --- .../access-control/manage-rbac-roles/index.md | 15 ++++++++------- .../rbac-grafana-provisioning/index.md | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md b/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md index ea376c5b946..f2dc6479783 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md @@ -270,13 +270,14 @@ You cannot modify the `No Basic Role` permissions. 1. Refer to the following table to add attributes and values. - | Attribute | Description | - | --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | - | `name` | The name of the basic role you want to update. You can specify a `uid` instead of a role name. The role `name` or the `uid` are required. | - | `orgId` | Identifies the organization to which the role belongs. `global` can be used instead to specify it's a global role. | - | `version` | Identifies the version of the role, which prevents overwriting newer changes. | - | `from` | List of roles from which to copy permissions. | - | `permissions > state` | The state of the permission. You can set it to `absent` to ensure it exclusion from the copy list. | + | Attribute | Description | + | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | + | `name` | The name of the basic role you want to update. You can specify a `uid` instead of a role name. The role `name` or the `uid` are required. | + | `orgId` | Identifies the organization to which the role belongs. `global` can be used instead to specify it's a global role. | + | `version` | Identifies the version of the role, which prevents overwriting newer changes. | + | `overrideRole` | If set to true, role will be updated regardless of its version in the database. There is no need to specify `version` if `overrideRole` is set to `true`. | + | `from` | List of roles from which to copy permissions. | + | `permissions > state` | The state of the permission. You can set it to `absent` to ensure it exclusion from the copy list. | 1. Reload the provisioning configuration file. diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md index 2d8b535c6a4..593037a02dc 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md @@ -91,7 +91,8 @@ roles: # force deletion revoking all grants of the role. force: true - uid: 'basic_editor' - version: 2 + # always apply the specified changes to the role, regardless of the role version in the data base + overrideRole: true global: true # list of roles to copy permissions from. from: