From 9497303ef6d0e37bed2be5967b71011787e5e536 Mon Sep 17 00:00:00 2001 From: gotjosh Date: Wed, 25 Aug 2021 17:08:02 +0100 Subject: [PATCH 1/3] Alertmanager: Allow storage configuration to support Azure The alertmanager configuration did not have support for Azure. Let's add it. --- CHANGELOG.md | 1 + cortex/config.libsonnet | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40b51d48..62bbec29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ * `CortexAlertmanagerReplicationFailing` * `CortexAlertmanagerPersistStateFailing` * `CortexAlertmanagerInitialSyncFailed` +* [ENHANCEMENT] Add support for Azure storage in Alertmanager configuration. #380 * [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 diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 57fb7a2d..8a350734 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -282,13 +282,20 @@ 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, }, From ab3749b563fae70b61fb0f8e09e1dbb4fc1f532f Mon Sep 17 00:00:00 2001 From: gotjosh Date: Wed, 25 Aug 2021 17:11:44 +0100 Subject: [PATCH 2/3] Amend the changelog PR number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62bbec29..c14acd42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,7 +51,7 @@ * `CortexAlertmanagerReplicationFailing` * `CortexAlertmanagerPersistStateFailing` * `CortexAlertmanagerInitialSyncFailed` -* [ENHANCEMENT] Add support for Azure storage in Alertmanager configuration. #380 +* [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 From b0d1efef4db9c4a2857894fec9cc7394da2b2f11 Mon Sep 17 00:00:00 2001 From: gotjosh Date: Wed, 25 Aug 2021 17:13:26 +0100 Subject: [PATCH 3/3] remove new line --- cortex/config.libsonnet | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 8a350734..488e11fe 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -285,13 +285,12 @@ 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: { + 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,