Skip to content

Commit

Permalink
Add alerting high availability
Browse files Browse the repository at this point in the history
  • Loading branch information
PovilasV1 committed Aug 17, 2023
1 parent c5cf65f commit 9107617
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
12 changes: 8 additions & 4 deletions documentation/grafana_config_unified_alerting.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | | |
10 changes: 10 additions & 0 deletions resources/config_unified_alerting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9107617

Please sign in to comment.