diff --git a/_meta/beat.yml b/_meta/beat.yml index 65384b58a7d..7363d568b8b 100644 --- a/_meta/beat.yml +++ b/_meta/beat.yml @@ -107,7 +107,6 @@ apm-server: # Enable API key authorization by setting enabled to true. By default API key support is disabled. # Agents include a valid API key in the following format: Authorization: ApiKey . # The key must be the base64 encoded representation of the API key's "id:key". - # This is an experimental feature, use with care. #api_key: #enabled: false diff --git a/apm-server.docker.yml b/apm-server.docker.yml index 3ab4b5cfbe7..d131f087a8b 100644 --- a/apm-server.docker.yml +++ b/apm-server.docker.yml @@ -107,7 +107,6 @@ apm-server: # Enable API key authorization by setting enabled to true. By default API key support is disabled. # Agents include a valid API key in the following format: Authorization: ApiKey . # The key must be the base64 encoded representation of the API key's "id:key". - # This is an experimental feature, use with care. #api_key: #enabled: false diff --git a/apm-server.yml b/apm-server.yml index 82dfc720259..e7bb6c3a6ff 100644 --- a/apm-server.yml +++ b/apm-server.yml @@ -107,7 +107,6 @@ apm-server: # Enable API key authorization by setting enabled to true. By default API key support is disabled. # Agents include a valid API key in the following format: Authorization: ApiKey . # The key must be the base64 encoded representation of the API key's "id:key". - # This is an experimental feature, use with care. #api_key: #enabled: false diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index b993871590a..4690ae719cc 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -37,6 +37,7 @@ https://github.com/elastic/apm-server/compare/7.12\...master[View commits] * Add `session.id` and `session.sequence` fields for RUM session tracking {pull}5056[5056] * Support for ingesting `user.domain` {pull}5067[5067] * Add `"application": "apm"` metadata to API Keys created with `apm-server apikey create` {pull}5090[5090] +* API Key auth is no longer considered experimental {pull}5091[5091] [float] ==== Deprecated diff --git a/docs/secure-communication-agents.asciidoc b/docs/secure-communication-agents.asciidoc index 2799af93b87..3115a418f63 100644 --- a/docs/secure-communication-agents.asciidoc +++ b/docs/secure-communication-agents.asciidoc @@ -30,8 +30,6 @@ include::./ssl-input.asciidoc[] [[api-key]] === API keys -experimental::[] - You can configure API keys to authorize requests to the APM Server. NOTE: API keys are sent as plain-text,