From c392a492aef1c98979e3e93a99b989c83c29ef68 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 28 Jun 2019 16:32:42 +0200 Subject: [PATCH] Docs: Add v6.3 version notes and encryption format information (#17825) Adds version note for alert rule tags. Adds version note for graph data links. Adds information about secret_key and encryption format in use Fixes #17815 Fixes #17803 --- docs/sources/alerting/notifications.md | 2 ++ docs/sources/features/panels/graph.md | 2 ++ docs/sources/installation/configuration.md | 2 +- docs/sources/installation/upgrading.md | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/sources/alerting/notifications.md b/docs/sources/alerting/notifications.md index 40b830c8d54..06158768870 100644 --- a/docs/sources/alerting/notifications.md +++ b/docs/sources/alerting/notifications.md @@ -199,6 +199,8 @@ Notification services which need public image access are marked as 'external onl # Use alert rule tags in notifications {#alert-rule-tags} +> Only available in Grafana v6.3+. + Grafana can include a list of tags (key/value) in the notification. It's called alert rule tags to contrast with tags parsed from timeseries. It currently supports only the Prometheus Alertmanager notifier. diff --git a/docs/sources/features/panels/graph.md b/docs/sources/features/panels/graph.md index 95a07da6cc2..97a9c7c9e0e 100644 --- a/docs/sources/features/panels/graph.md +++ b/docs/sources/features/panels/graph.md @@ -37,6 +37,8 @@ Repeat a panel for each value of a variable. Repeating panels are described in ### Data link +> Only available in Grafana v6.3+. + Data link in graph settings allows adding dynamic links to the visualization. Those links can link to either other dashboard or to an external URL. {{< docs-imagebox img="/img/docs/data_link.png" max-width= "800px" >}} diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 755b4615a50..d3a87a979d5 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -304,7 +304,7 @@ The number of days the keep me logged in / remember me cookie lasts. ### secret_key -Used for signing some datasource settings like secrets and passwords. Cannot be changed without requiring an update +Used for signing some datasource settings like secrets and passwords, the encryption format used is AES-256 in CFB mode. Cannot be changed without requiring an update to datasource settings to re-encode them. ### disable_gravatar diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index 22195cb9df5..e605b9bcadf 100644 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -154,7 +154,7 @@ The default cookie name for storing the auth token is `grafana_session`. you can ### Ensure encryption of datasource secrets -Datasources store passwords and basic auth passwords in secureJsonData encrypted by default. Existing datasource +Datasources store passwords and basic auth passwords in secureJsonData encrypted (AES-256 in CFB mode) 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: