From f4a8240d0d4dcb156ca73806419a77228e4c7c4d Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 23 Apr 2019 16:53:28 +0200 Subject: [PATCH] docs: fix upgrade instructions --- docs/sources/installation/upgrading.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index 74de4ae8873..6d9974216bc 100644 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -123,18 +123,7 @@ If you're using systemd and have a large amount of annotations consider temporar If you have text panels with script tags they will no longer work due to a new setting that per default disallow unsanitized HTML. Read more [here](/installation/configuration/#disable-sanitize-html) about this new setting. -## Upgrading to v6.2 - -Datasources store passwords and basic auth passwords in secureJsonData encrypted by default. Existing datasource -will keep working with unencrypted passwords. If you want to migrate to encrypted storage for your existing datasources -you can do that by: -- For datasources created through UI, you need to go to datasource config, re enter the password or basic auth -password and save the datasource. -- For datasources created by provisioning, you need to update your config file and use secureJsonData.password or -secureJsonData.basicAuthPassword field. See [provisioning docs](/administration/provisioning) for example of current -configuration. - -## Authentication and security +### Authentication and security If your using Grafana's builtin, LDAP (without Auth Proxy) or OAuth authentication all users will be required to login upon the next visit after the upgrade. @@ -159,3 +148,15 @@ login_maximum_lifetime_days = 1 ``` The default cookie name for storing the auth token is `grafana_session`. you can configure this with `login_cookie_name` in `[auth]` settings. + + +## Upgrading to v6.2 + +Datasources store passwords and basic auth passwords in secureJsonData encrypted by default. Existing datasource +will keep working with unencrypted passwords. If you want to migrate to encrypted storage for your existing datasources +you can do that by: +- For datasources created through UI, you need to go to datasource config, re enter the password or basic auth +password and save the datasource. +- For datasources created by provisioning, you need to update your config file and use secureJsonData.password or +secureJsonData.basicAuthPassword field. See [provisioning docs](/administration/provisioning) for example of current +configuration.