From c8216244a2f3cf7fb50c58d29a50f609e8aab554 Mon Sep 17 00:00:00 2001 From: Velociraptor85 Date: Thu, 29 Jul 2021 19:03:02 +0200 Subject: [PATCH] Update overview.md (#37260) * Update overview.md * Update grafana.md * Update grafana.md --- docs/sources/auth/grafana.md | 10 +++++----- docs/sources/auth/overview.md | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/sources/auth/grafana.md b/docs/sources/auth/grafana.md index 04f9bc7d3ab..d73e233ad8e 100644 --- a/docs/sources/auth/grafana.md +++ b/docs/sources/auth/grafana.md @@ -18,9 +18,9 @@ provider (listed above). There is also options for allowing self sign up. Grafana are using short-lived tokens as a mechanism for verifying authenticated users. These short-lived tokens are rotated each `token_rotation_interval_minutes` for an active authenticated user. -An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_days` time from "now" that Grafana will remember the user. -This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_days` and still being authenticated. - This is true as long as the time since user login is less than `login_maximum_lifetime_days`. +An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_duration` time from "now" that Grafana will remember the user. +This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_duration` and still being authenticated. + This is true as long as the time since user login is less than `login_maximum_lifetime_duration`. #### Remote logout @@ -38,10 +38,10 @@ Example: login_cookie_name = grafana_session # The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days. -login_maximum_inactive_lifetime_days = 7 +login_maximum_inactive_lifetime_duration = 7d # The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days. -login_maximum_lifetime_days = 30 +login_maximum_lifetime_duration = 30d # How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes. token_rotation_interval_minutes = 10 diff --git a/docs/sources/auth/overview.md b/docs/sources/auth/overview.md index daf0f0d3cc8..5c64172fa8c 100644 --- a/docs/sources/auth/overview.md +++ b/docs/sources/auth/overview.md @@ -36,9 +36,9 @@ provider (listed above). There are also options for allowing self sign up. Grafana are using short-lived tokens as a mechanism for verifying authenticated users. These short-lived tokens are rotated each `token_rotation_interval_minutes` for an active authenticated user. -An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_days` time from "now" that Grafana will remember the user. -This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_days` and still being authenticated. - This is true as long as the time since user login is less than `login_maximum_lifetime_days`. +An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_duration` time from "now" that Grafana will remember the user. +This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_duration` and still being authenticated. + This is true as long as the time since user login is less than `login_maximum_lifetime_duration`. #### Remote logout