public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs: Permissions updates (#31843)

Browse Source 
* moved restricting access content to a separate topic

* changed topic name

* Update organization_roles.md

* update link

* content updates
This commit is contained in:
Diana Payton
2021-03-11 09:52:48 -05:00
committed by GitHub
parent a7e243db8a
commit 93ead2a50c
10 changed files with 118 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/manage-users/_index.md
+1 -1
View File
@@ -36,7 +36,7 @@ Organization Admins can:
## Teams
Teams are groups of users within the same organization. Teams allow you to grant permissions for a group of users. They are most often used to manage [permissions for folders and dashboards]({{< relref "../permissions/dashboard_folder_permissions.md" >}}). Enterprise users can use them to apply [data source permissions]({{< relref "../enterprise/datasource_permissions.md" >}}).
Teams are groups of users within the same organization. Teams allow you to grant permissions for a group of users. They are most often used to manage [permissions for folders and dashboards]({{< relref "../permissions/dashboard-folder-permissions.md" >}}). Enterprise users can use them to apply [data source permissions]({{< relref "../enterprise/datasource_permissions.md" >}}).
Teams are mostly managed by Organization Admins. However, if the Grafana server setting [editors_can_admin]({{< relref "../administration/configuration.md#editors_can_admin" >}}) is applied, then users who are assigned the Team Admin role can also manage teams in their organization and users assigned to their teams.
docs/sources/manage-users/server-admin/server-admin-manage-users.md
+2 -2
View File
@@ -8,7 +8,7 @@ aliases =["/docs/grafana/latest/manage-users/add-or-remove-user/","/docs/grafana
This topic explains user management tasks performed by Grafana Server Admins.
In order to perform any of these tasks, you must be logged in to Grafana on an account with Grafana Server Admin permissions. For more information about Grafana Admin permissions, refer to [Grafana Server Admin role]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}})
In order to perform any of these tasks, you must be logged in to Grafana on an account with Grafana Server Admin permissions. For more information about Grafana Admin permissions, refer to [Grafana Server Admin role]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}}).
> **Note:** The Grafana Server Admin role does not exist in Grafana Cloud. Grafana Cloud users cannot perform tasks listed in this section.
@@ -27,7 +27,7 @@ Grafana displays all user accounts on the server, listed in alphabetical order b
- **Server Admin status -** If the user account has **Grafana Admin** option set, then a shield icon is displayed.
- **Account status -** If the account is disabled, then the **Disabled** label is displayed.
![Server Admin user list](/img/docs/manage-users/server-user-list-7-3.png "title")
![Server Admin user list](/img/docs/manage-users/server-user-list-7-3.png)
## View user account details