From 25bb117c36a241d44bbe61e8d15a98eb53279f3d Mon Sep 17 00:00:00 2001 From: voidquark Date: Fri, 7 Jun 2024 15:47:55 +0200 Subject: [PATCH] fix grafana alerting based on version --- roles/grafana/defaults/main.yml | 7 ++++++- roles/grafana/templates/grafana.ini.j2 | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/roles/grafana/defaults/main.yml b/roles/grafana/defaults/main.yml index 64319f37..958fc4c0 100644 --- a/roles/grafana/defaults/main.yml +++ b/roles/grafana/defaults/main.yml @@ -175,7 +175,12 @@ grafana_smtp: {} # password: # from_address: -# Enable grafana alerting mechanism +# Enable grafana unified alerting mechanism for grafana v11+ +grafana_unified_alerting: + enabled: true + +# REMOVED FROM Grafana v11+ +# Enable grafana alerting mechanism for grafana v10 and below grafana_alerting: execute_alerts: true # error_or_timeout: 'alerting' diff --git a/roles/grafana/templates/grafana.ini.j2 b/roles/grafana/templates/grafana.ini.j2 index 2392c86e..0abcbdf3 100644 --- a/roles/grafana/templates/grafana.ini.j2 +++ b/roles/grafana/templates/grafana.ini.j2 @@ -113,6 +113,19 @@ versions_to_keep = 20 enabled = true path = {{ grafana_data_dir }}/dashboards +{% if grafana_version == 'latest' or grafana_version.split('.')[0]|int >= 11 %} +# Unified Alerting +[unified_alerting] +{% if grafana_unified_alerting != {} %} +{% for k,v in grafana_unified_alerting.items() %} +{{ k }} = {{ v }} +{% endfor %} +{% else %} +enabled = false +{% endif %} +{% endif %} + +{% if grafana_version != 'latest' and grafana_version.split('.')[0]|int < 11 %} # Alerting [alerting] {% if grafana_alerting != {} %} @@ -125,6 +138,7 @@ enabled = true {% else %} enabled = false {% endif %} +{% endif %} # SMTP and email config {% if grafana_smtp != {} %}