diff --git a/docs/sources/administration/user-management/manage-dashboard-permissions/_index.md b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md similarity index 98% rename from docs/sources/administration/user-management/manage-dashboard-permissions/_index.md rename to docs/sources/administration/user-management/manage-dashboard-permissions/index.md index 62cbe4a9ce8..6e9a258844a 100644 --- a/docs/sources/administration/user-management/manage-dashboard-permissions/_index.md +++ b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/ - /docs/grafana/latest/permissions/dashboard_folder_permissions/ + - /docs/grafana/latest/administration/user-management/manage-dashboard-permissions/ title: Manage dashboard permissions weight: 500 --- diff --git a/docs/sources/administration/user-management/manage-org-users/_index.md b/docs/sources/administration/user-management/manage-org-users/index.md similarity index 99% rename from docs/sources/administration/user-management/manage-org-users/_index.md rename to docs/sources/administration/user-management/manage-org-users/index.md index 0f7a02a78c8..349cbbb8b2e 100644 --- a/docs/sources/administration/user-management/manage-org-users/_index.md +++ b/docs/sources/administration/user-management/manage-org-users/index.md @@ -7,6 +7,7 @@ aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/ - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/ - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/ + - /docs/grafana/latest/administration/user-management/manage-org-users/ title: Manage users in an organization weight: 400 --- diff --git a/docs/sources/administration/user-management/server-user-management/_index.md b/docs/sources/administration/user-management/server-user-management/_index.md index 545986eb8ee..c75da586f05 100644 --- a/docs/sources/administration/user-management/server-user-management/_index.md +++ b/docs/sources/administration/user-management/server-user-management/_index.md @@ -8,6 +8,7 @@ aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/ - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/ - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/ + - /docs/grafana/latest/administration/user-management/server-user-management/ title: Server user management weight: 100 --- diff --git a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org.md b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md similarity index 71% rename from docs/sources/administration/user-management/server-user-management/add-remove-user-to-org.md rename to docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md index 4d696000490..094c1119522 100644 --- a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org.md +++ b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/ - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/ + - /docs/grafana/latest/administration/user-management/server-user-management/add-remove-user-to-org/ title: Add or remove a user in an organization description: Describes how a Grafana server administrator can add or remove users in an organization weight: 30 @@ -9,7 +10,7 @@ weight: 30 # Add or remove a user in an organization -Server administrators can add and remove users in organizations. To do this as an organization administrator, see [Manage users in an organization]({{< relref "../manage-org-users/" >}}). +Server administrators can add and remove users in organizations. To do this as an organization administrator, see [Manage users in an organization]({{< relref "../../manage-org-users/" >}}). ## Add a user to an organization @@ -19,7 +20,7 @@ You are required to specify an Admin role for each organization. The first user ### Before you begin -- [Create an organization]({{< relref "../../organization-management/#create-an-organization" >}}) +- [Create an organization]({{< relref "../../../organization-management/#create-an-organization" >}}) - [Add a user]({{< relref "./#add-a-user" >}}) to Grafana - Ensure you have [Grafana server administrator privileges]({{< relref "./assign-remove-server-admin-privileges" >}}) @@ -31,13 +32,13 @@ You are required to specify an Admin role for each organization. The first user 1. In the **Organizations** section, click **Add user to organization**. 1. Select an organization and a role. - For more information about user permissions, refer to [Organization roles]({{< relref "../../roles-and-permissions#organization-roles" >}}). + For more information about user permissions, refer to [Organization roles]({{< relref "../../../roles-and-permissions#organization-roles" >}}). 1. Click **Add to organization**. The next time the user signs in, they will be able to navigate to their new organization using the Switch Organizations option in the user profile menu. -> **Note:** If you have [organization administrator]({{< relref "../../roles-and-permissions#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions#grafana-server-administrators" >}}) permissions, you can still [invite a user to join an organization]({{< relref "../manage-org-users#invite-a-user-to-join-an-organization" >}}). +> **Note:** If you have [organization administrator]({{< relref "../../../roles-and-permissions#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../../roles-and-permissions#grafana-server-administrators" >}}) permissions, you can still [invite a user to join an organization]({{< relref "../../manage-org-users#invite-a-user-to-join-an-organization" >}}). ## Remove a user from an organization @@ -55,4 +56,4 @@ Remove a user from an organization when they no longer require access to the das 1. In the **Organization** section, click **Remove from organization** next to the organization from which you want to remove the user. 1. Click **Confirm removal**. -> **Note:** If you have [organization administrator]({{< relref "../../roles-and-permissions#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions#grafana-server-administrators" >}}) permissions, you can still [remove a user from an organization]({{< relref "../manage-org-users#remove-a-user-from-an-organization" >}}) in the Users section of organization configuration. +> **Note:** If you have [organization administrator]({{< relref "../../../roles-and-permissions#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../../roles-and-permissions#grafana-server-administrators" >}}) permissions, you can still [remove a user from an organization]({{< relref "../../manage-org-users#remove-a-user-from-an-organization" >}}) in the Users section of organization configuration. diff --git a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges.md b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md similarity index 87% rename from docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges.md rename to docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md index 9067126b319..575e4a61ddd 100644 --- a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges.md +++ b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md @@ -1,6 +1,7 @@ --- aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/ + - /docs/grafana/latest/administration/user-management/server-user-management/assign-remove-server-admin-privileges/ title: Assign or remove Grafana server administrator privileges description: Describes how to assign and remove Grafana administrator privileges from a server user. weight: 20 @@ -8,7 +9,7 @@ weight: 20 # Assign or remove Grafana server administrator privileges -Grafana server administrators are responsible for creating users, organizations, and managing permissions. For more information about the server administration role, refer to [Grafana server administrators]({{< relref "../../roles-and-permissions#grafana-server-administrators" >}}). +Grafana server administrators are responsible for creating users, organizations, and managing permissions. For more information about the server administration role, refer to [Grafana server administrators]({{< relref "../../../roles-and-permissions#grafana-server-administrators" >}}). > **Note:** Server administrators are "super-admins" with full permissions to create, read, update, and delete all resources and users in all organizations, as well as update global settings such as licenses. Only grant this permission to trusted users. diff --git a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions.md b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md similarity index 83% rename from docs/sources/administration/user-management/server-user-management/change-user-org-permissions.md rename to docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md index d1de1eec2d5..9f2bb23ee3f 100644 --- a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions.md +++ b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md @@ -1,13 +1,14 @@ --- aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/ + - /docs/grafana/latest/administration/user-management/server-user-management/change-user-org-permissions/ title: Change a user's organization permissions weight: 50 --- # Change a user's organization permissions -Update organization permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../../roles-and-permissions/#organization-roles" >}}). +Update organization permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../../../roles-and-permissions/#organization-roles" >}}). ## Before you begin diff --git a/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions.md b/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md similarity index 81% rename from docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions.md rename to docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md index 9d653b3924f..6abe237dcac 100644 --- a/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions.md +++ b/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md @@ -1,6 +1,7 @@ --- aliases: - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/ + - /docs/grafana/latest/administration/user-management/server-user-management/grant-editor-admin-permissions/ title: Grant editors administrator permissions weight: 60 --- @@ -13,8 +14,8 @@ This setting can be used to enable self-organizing teams to administer their own When `editors_can_admin` is enabled: -- Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../manage-dashboard-permissions/" >}}). -- Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Team management]({{< relref "../../team-management/" >}}). +- Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../../manage-dashboard-permissions/" >}}). +- Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Team management]({{< relref "../../../team-management/" >}}). > **Note**: If you use Grafana Enterprise and customize users' permissions using RBAC, the RBAC permissions override the functionality enabled by the `editors_can_admin` flag. @@ -26,7 +27,7 @@ When `editors_can_admin` is enabled: 1. Log in to the Grafana server and open the Grafana configuration file. - For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../setup-grafana/configure-grafana/" >}}). + For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../../setup-grafana/configure-grafana/" >}}). 1. Locate the `editors_can_admin` parameter. 1. Set the `editors_can_admin` value to `true`. diff --git a/docs/sources/administration/user-management/user-preferences/_index.md b/docs/sources/administration/user-management/user-preferences/index.md similarity index 98% rename from docs/sources/administration/user-management/user-preferences/_index.md rename to docs/sources/administration/user-management/user-preferences/index.md index b85a6b976f5..3f4cc1e0189 100644 --- a/docs/sources/administration/user-management/user-preferences/_index.md +++ b/docs/sources/administration/user-management/user-preferences/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/administration/change-your-password/ - /docs/grafana/latest/administration/manage-user-preferences/ + - /docs/grafana/latest/administration/user-management/user-preferences/ description: Learn how to update your user preferences and switch organizations keywords: - password