diff --git a/includes/config-grafana.rst b/includes/config-grafana.rst index 434cef50cc..2f02766bc8 100644 --- a/includes/config-grafana.rst +++ b/includes/config-grafana.rst @@ -1,9 +1,9 @@ -.. - ``additional_backup_regions`` - ----------------------------- - *array* - **Additional Cloud Regions for Backup Replication** +``additional_backup_regions`` +----------------------------- +*array* + +**Additional Cloud Regions for Backup Replication** @@ -127,6 +127,14 @@ +``oauth_allow_insecure_email_lookup`` +------------------------------------- +*boolean* + +**Enforce user lookup based on email instead of the unique ID provided by the IdP** + + + ``auth_generic_oauth`` ---------------------- *object* @@ -163,6 +171,12 @@ **Authorization URL** +``auto_login`` +~~~~~~~~~~~~~~ +*boolean* + +**Allow users to bypass the login screen and automatically log in** + ``client_id`` ~~~~~~~~~~~~~ *string* @@ -491,7 +505,7 @@ -------------------- *boolean* -**Enable or disable Grafana alerting functionality** +**Enable or disable Grafana legacy alerting functionality. This should not be enabled with unified_alerting_enabled.** @@ -631,3 +645,11 @@ +``unified_alerting_enabled`` +---------------------------- +*boolean* + +**Enable or disable Grafana unified alerting functionality. By default this is enabled and any legacy alerts will be migrated on upgrade to Grafana 9+. To stay on legacy alerting, set unified_alerting_enabled to false and alerting_enabled to true. See https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/ for more details.** + + +