Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alertmanager: Allow storage configuration to support Azure #381

Merged
merged 3 commits into from
Aug 25, 2021
Merged

Alertmanager: Allow storage configuration to support Azure #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9497303
Alertmanager: Allow storage configuration to support Azure
gotjosh Aug 25, 2021
ab3749b
Amend the changelog PR number
gotjosh Aug 25, 2021
b0d1efe
remove new line
gotjosh Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
* `CortexAlertmanagerReplicationFailing`
* `CortexAlertmanagerPersistStateFailing`
* `CortexAlertmanagerInitialSyncFailed`
* [ENHANCEMENT] Add support for Azure storage in Alertmanager configuration. #381
* [BUGFIX] Fixed `CortexIngesterHasNotShippedBlocks` alert false positive in case an ingester instance had ingested samples in the past, then no traffic was received for a long period and then it started receiving samples again. #308
* [BUGFIX] Alertmanager: fixed `--alertmanager.cluster.peers` CLI flag passed to alertmanager when HA is enabled. #329
* [BUGFIX] Fixed `CortexInconsistentRuntimeConfig` metric. #335
Expand Down
8 changes: 7 additions & 1 deletion cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,19 @@

alertmanager_client_type: error 'you must specify a storage backend type for the alertmanager (azure, gcs, s3, local)',
alertmanager_s3_bucket_name: error 'you must specify the alertmanager S3 bucket name',
alertmanager_gcs_bucket_name: error 'must specify a GCS bucket name',
alertmanager_gcs_bucket_name: error 'you must specify a GCS bucket name',
alertmanager_azure_container_name: error 'you must specify an Azure container name',

alertmanagerStorageClientConfig:
{
'alertmanager-storage.backend': $._config.alertmanager_client_type,
} +
{
azure: {
'alertmanager-storage.azure.account-key': $._config.alertmanager_azure_account_key,
'alertmanager-storage.azure.account-name': $._config.alertmanager_azure_account_name,
'alertmanager-storage.azure.container-name': $._config.alertmanager_azure_container_name,
},
gcs: {
'alertmanager-storage.gcs.bucket-name': $._config.alertmanager_gcs_bucket_name,
},
Expand Down