From 9107617108f7e1aff159b602f86cc5d462ec9f9e Mon Sep 17 00:00:00 2001 From: Povilas Vaitkus Date: Thu, 17 Aug 2023 11:54:20 +0300 Subject: [PATCH] Add alerting high availability --- CHANGELOG.md | 2 ++ documentation/grafana_config_unified_alerting.md | 12 ++++++++---- resources/config_unified_alerting.rb | 10 ++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0f007a..506459d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of grafana. ## Unreleased + - Add alerting high availability to unified_alerting ([Grafana Docs](https://grafana.com/docs/grafana/latest/alerting/set-up/configure-high-availability)) + ## 10.5.1 - *2023-07-24* - Fix `config_external_image_storage` config path override ([Grafana Docs](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#external_image_storage)) diff --git a/documentation/grafana_config_unified_alerting.md b/documentation/grafana_config_unified_alerting.md index 864706e5..1c555e9b 100644 --- a/documentation/grafana_config_unified_alerting.md +++ b/documentation/grafana_config_unified_alerting.md @@ -12,7 +12,11 @@ ## Properties -| Name | Name? | Type | Default | Description | Allowed Values | -| ------------------------------------ | ----- | ----------- | ------- | ----------- | -------------- | -| `enabled` | | true, false | | | | -| `admin_config_poll_interval_seconds` | | Integer | | | | +| Name | Name? | Type | Default | Description | Allowed Values | +| ------------------------------------ | ----- | ----------- | -------------- | ----------- | -------------- | +| `enabled` | | true, false | | | | +| `admin_config_poll_interval_seconds` | | Integer | | | | +| `ha_listen_address` | | String | "0.0.0.0:9094" | | | +| `ha_peers` | | String | | | | +| `ha_advertise_address` | | String | | | | +| `ha_peer_timeout` | | String | "15s | | | diff --git a/resources/config_unified_alerting.rb b/resources/config_unified_alerting.rb index 2996cb65..2c20179e 100644 --- a/resources/config_unified_alerting.rb +++ b/resources/config_unified_alerting.rb @@ -25,6 +25,16 @@ property :admin_config_poll_interval_seconds, Integer +property :ha_listen_address, String, + default: '0.0.0.0:9094' + +property :ha_peers, String + +property :ha_advertise_address, String + +property :ha_peer_timeout, String, + default: '15s' + def resource_config_path_override %w(unified_alerting) end