apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AccessControl: rename data source id read action (#39966)

Browse Source
pull/39990/head
Gabriel MABILLE 4 years ago committed by GitHub
parent 2098bcab9b
commit 4160429b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      docs/sources/enterprise/access-control/fine-grained-access-control-references.md
  2. 2
      docs/sources/enterprise/access-control/permissions.md
  3. 2
      docs/sources/http_api/data_source.md
  4. 4
      pkg/api/roles.go

2
docs/sources/enterprise/access-control/fine-grained-access-control-references.md
Unescape View File

@ -29,7 +29,7 @@ The reference information that follows complements conceptual information about
| `fixed:settings:admin:edit` | All permissions from `fixed:settings:admin:read` and<br>`settings:write` | Update settings |
| `fixed:datasources:editor:read` | `datasources:explore` | Allows to access the **Explore** tab |
| `fixed:datasources:admin` | `datasources:read`<br>`datasources:create`<br>`datasources:write`<br>`datasources:delete` | Allows to create, read, update, delete data sources. |
| `fixed:datasources:id:viewer` | `datasources:id:read` | Allows to read data source IDs. |
| `fixed:datasources:id:viewer` | `datasources.id:read` | Allows to read data source IDs. |
| `fixed:datasources:permissions:admin` | `datasources.permissions:create`<br> `datasources.permissions:read`<br> `datasources.permissions:delete`<br>`datasources.permissions:toggle` | Allows to create, read, delete, enable, or disable data source permissions |
## Default built-in role assignments

2
docs/sources/enterprise/access-control/permissions.md
Unescape View File

@ -68,7 +68,7 @@ The following list contains fine-grained access control actions.
| `server.stats:read` | n/a | Read server stats |
| `datasources:explore` | n/a | Enable access to the **Explore** tab. |
| `datasources:read` | n/a<br>`datasources:*`<br>`datasources:id:*`<br>`datasources:uid:*`<br>`datasources:name:*` | List data sources. |
| `datasources:id:read` | `datasources:*`<br>`datasources:name:*` | Read data source IDs. |
| `datasources.id:read` | `datasources:*`<br>`datasources:name:*` | Read data source IDs. |
| `datasources:create` | n/a | Create data sources. |
| `datasources:write` | `datasources:*`<br>`datasources:id:*` | Update data sources. |
| `datasources:delete` | `datasources:id:*`<br>`datasources:uid:*`<br>`datasources:name:*` | Delete data sources. |

2
docs/sources/http_api/data_source.md
Unescape View File

@ -244,7 +244,7 @@ See note in the [introduction]({{< ref "#data-source-api" >}}) for an explanatio
| Action | Scope |
| ------------------- | ---------------------------------------------------------------------------------------------- |
| datasources:id:read | datasources:\*<br>datasources:name:\*<br>datasources:name:test_datasource (single data source) |
| datasources.id:read | datasources:\*<br>datasources:name:\*<br>datasources:name:test_datasource (single data source) |
### Examples

4
pkg/api/roles.go
Unescape View File

@ -13,7 +13,7 @@ const (
ActionDatasourcesCreate = "datasources:create"
ActionDatasourcesWrite = "datasources:write"
ActionDatasourcesDelete = "datasources:delete"
ActionDatasourcesIDRead = "datasources:id:read"
ActionDatasourcesIDRead = "datasources.id:read"
)
// API related scopes
@ -74,7 +74,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
},
{
Role: accesscontrol.RoleDTO{
Version: 1,
Version: 2,
Name: "fixed:datasources:id:viewer",
Description: "Gives access to read datasources ID",
Permissions: []accesscontrol.Permission{

Write Preview
Loading…
Cancel
Save