From 238add18abae8d28f020914bb5d1c3ec860935e1 Mon Sep 17 00:00:00 2001 From: Igor Beliakov <46579601+weisdd@users.noreply.github.com> Date: Mon, 8 Feb 2021 22:46:07 +0300 Subject: [PATCH] Docs: Update configuration.md (login_maximum_inactive_lifetime_duration, login_maximum_lifetime_duration) (#31000) Grafana [v7.2.0-beta2](https://github.com/grafana/grafana/releases/tag/v7.2.0-beta2) brought support for `login_maximum_inactive_lifetime_duration` and `login_maximum_lifetime_duration` to replace the older way of specifying the same flavor of timeouts (`login_maximum_inactive_lifetime_days` and `login_maximum_lifetime_days`). Unfortunately, this improvement did not make it to `configuration.md`. The suggested changes reflect the current state of `conf/defaults.ini`. --- docs/sources/administration/configuration.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md index 7a34e562946..8a4b20a25e0 100644 --- a/docs/sources/administration/configuration.md +++ b/docs/sources/administration/configuration.md @@ -654,13 +654,15 @@ Grafana provides many ways to authenticate users. Refer to the Grafana [Authenti The cookie name for storing the auth token. Default is `grafana_session`. -### login_maximum_inactive_lifetime_days +### login_maximum_inactive_lifetime_duration -The lifetime (days) an authenticated user can be inactive before being required to log in at next visit. Default is 7 days. +The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). +This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation (token_rotation_interval_minutes). -### login_maximum_lifetime_days +### login_maximum_lifetime_duration -The maximum lifetime (days) an authenticated user can be logged in before being required to login. Default is 30 days. +The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d). +This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). ### token_rotation_interval_minutes