From 6c619bd0ef47fa8367afb413b3dbe063c705fcb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:59:06 +0000 Subject: [PATCH] chore(updater): bump pkg/dist/*.yml (2023-09-26) (#63) --- pkg/dist/service_types.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/dist/service_types.yml b/pkg/dist/service_types.yml index 938f232..0c46847 100644 --- a/pkg/dist/service_types.yml +++ b/pkg/dist/service_types.yml @@ -925,7 +925,7 @@ grafana: user_error: Must consist of lower-case alpha-numeric characters or dashes max_items: 1 alerting_enabled: - title: Enable or disable Grafana alerting functionality + title: Enable or disable Grafana legacy alerting functionality. This should not be enabled with unified_alerting_enabled. type: boolean example: true alerting_error_or_timeout: @@ -1530,6 +1530,10 @@ grafana: description: Use static public IP addresses type: boolean example: true + unified_alerting_enabled: + title: 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. + type: boolean + example: true user_auto_assign_org: title: Auto-assign new users on signup to main organization. Defaults to false type: boolean