From 0af09cd0815bfe16e9ea9ce3c2e1ce40775a4455 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 29 Apr 2022 10:07:50 -0400 Subject: [PATCH] Service accounts: doc fixes (#48518) (#48539) * some doc fixes * Update docs/sources/administration/service-accounts/add-service-account-token.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/administration/service-accounts/add-service-account-token.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update create-service-account.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> (cherry picked from commit d828dc090484f0efc317e6e4af42e98ca7745453) Co-authored-by: Ieva --- .../service-accounts/add-service-account-token.md | 7 +++---- .../service-accounts/create-service-account.md | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/sources/administration/service-accounts/add-service-account-token.md b/docs/sources/administration/service-accounts/add-service-account-token.md index 49aaeb2153d..2b2ce9f8a3d 100644 --- a/docs/sources/administration/service-accounts/add-service-account-token.md +++ b/docs/sources/administration/service-accounts/add-service-account-token.md @@ -15,12 +15,11 @@ You can create a service account token using the Grafana UI or via the API. For ## Before you begin - Ensure you have added the `serviceAccounts` feature toggle to Grafana. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#">}}). -- Ensure you have permission to create and edit service accounts. For more information about user roles, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}). -- [Create a service account in Grafana]({{< relref "./create-service-account.md#">}}). +- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}). -**To add a token to a service account:** +## To add a token to a service account -1. Sign in to Grafana and hover your cursor over the organization icon in the sidebar. +1. Sign in to Grafana, then hover your cursor over **Configuration** (the gear icon) in the sidebar. 1. Click **Service accounts**. 1. Click the service account to which you want to add a token. 1. Click **Add token**. diff --git a/docs/sources/administration/service-accounts/create-service-account.md b/docs/sources/administration/service-accounts/create-service-account.md index 0d2a7a1b2b1..e2232a7fa6d 100644 --- a/docs/sources/administration/service-accounts/create-service-account.md +++ b/docs/sources/administration/service-accounts/create-service-account.md @@ -16,9 +16,9 @@ For more information about creating service accounts via the API, refer to [Crea ## Before you begin - Ensure you have added the feature toggle for service accounts `serviceAccounts`. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#">}}). -- Ensure you have permission to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}). +- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}). -**To create a service account:** +## To create a service account 1. Sign in to Grafana and hover your cursor over the organization icon in the sidebar. 1. Click **Service accounts**.