From 451fdd4cda30ac9ae6b3a3fc98514f4d48b77077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20Toulet?= <35176601+AgnesToulet@users.noreply.github.com> Date: Mon, 8 Mar 2021 09:15:34 +0100 Subject: [PATCH] Docs: update license restrictions doc (#31508) * Docs: update license restrictions doc * wording and examples/clarification * Update docs/sources/enterprise/license-expiration.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update docs/sources/enterprise/license-restrictions.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update license-restrictions.md * Licensing doc: a user -> you * Apply suggestions from code review Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Docs: apply PR feedback Co-authored-by: Mitch Seaman Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> --- docs/sources/enterprise/license-expiration.md | 6 ++++++ docs/sources/enterprise/license-restrictions.md | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/sources/enterprise/license-expiration.md b/docs/sources/enterprise/license-expiration.md index e37fb71c4bd..65b312479c5 100644 --- a/docs/sources/enterprise/license-expiration.md +++ b/docs/sources/enterprise/license-expiration.md @@ -70,3 +70,9 @@ Vault integration is not affected by an expired license. ### Auditing Auditing is not affected by an expired license. + +### License restrictions + +The concurrent session limit remains active for seven days after the expiration date, after which it will be turned off. + +The active users limit is turned off immediately. diff --git a/docs/sources/enterprise/license-restrictions.md b/docs/sources/enterprise/license-restrictions.md index ab8ce97ab84..9ed86721076 100644 --- a/docs/sources/enterprise/license-restrictions.md +++ b/docs/sources/enterprise/license-restrictions.md @@ -11,6 +11,10 @@ Enterprise licenses are limited by the number of active users, a license expirat ## User limits +Users are limited by the number of active users and the number of concurrent sessions for a given account. + +### Active users limit + Grafana licenses allow for a certain number of active users per instance. An active user is any user that has signed in to Grafana within the past 30 days. In the context of licensing, each user is classified as either a viewer or an editor: @@ -23,9 +27,13 @@ In the context of licensing, each user is classified as either a viewer or an ed Restrictions are applied separately for viewers and editors. -When the number of maximum active viewers or editors is reached, Grafana displays a warning banner. +When the number of maximum active viewers or editors is reached, only they can sign in. New users or non-active users cannot sign in. -Sometimes it is useful to log in to an account from multiple locations concurrently. With Grafana Enterprise 7.5 and up, accounts are limited to three concurrent sessions. +### Concurrent sessions limit + +Sometimes it is useful to sign in to an account from multiple locations simultaneously. As of Grafana Enterprise 7.5+, accounts are limited to the number of concurrent sessions authorized in each license, which is typically three. A new session is created when a user signs in to Grafana from a new device, a different browser, or an incognito window. If a user signs in to Grafana from another tab or window within the same browser, then only one session is used. + +Given a limit of three sessions, the longest inactive session is signed out of when a fourth person signs in to the same account. ## Expiration date