From dad50fbba9b03774340e43646feb8830c8b8fb8b Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Thu, 11 Jan 2024 12:34:53 +0000 Subject: [PATCH] Service Accounts: Add deprecation message for apikeys (#80354) * add: deprecation message for apikeys * refactor: more strong language for service accounts --- docs/sources/administration/api-keys/index.md | 4 ++++ docs/sources/administration/service-accounts/index.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md index 6ea11889724..bc4a5b6cd0d 100644 --- a/docs/sources/administration/api-keys/index.md +++ b/docs/sources/administration/api-keys/index.md @@ -17,6 +17,10 @@ weight: 700 # API keys +{{% admonition type="note" %}} +Deprecated: [Service accounts]({{< relref "../service-accounts/" >}}) have replaced API keys as the primary way to authenticate applications that interact with Grafana. +{{% /admonition %}} + An API key is a randomly generated string that external systems use to interact with Grafana HTTP APIs. When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources. diff --git a/docs/sources/administration/service-accounts/index.md b/docs/sources/administration/service-accounts/index.md index b22b4b440d2..4c3e71f63f3 100644 --- a/docs/sources/administration/service-accounts/index.md +++ b/docs/sources/administration/service-accounts/index.md @@ -22,7 +22,7 @@ weight: 800 You can use a service account to run automated workloads in Grafana, such as dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications, such as Terraform, with the Grafana API. {{% admonition type="note" %}} -Service accounts will eventually replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana. +Service accounts replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana. {{% /admonition %}} A common use case for creating a service account is to perform operations on automated or triggered tasks. You can use service accounts to: