Skip to content

Commit 6941468

Browse files
authored
Merge pull request grafana#416 from grafana/chore/azure-ruler
cortex: Define Azure object storage ruler args
2 parents fc50bc0 + afb7bc8 commit 6941468

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
* [ENHANCEMENT] Add ability to override `datasource` for generated dashboards. #407
7979
* [ENHANCEMENT] Use alertmanager jobname for alertmanager dashboard panels #411
8080
* [ENHANCEMENT] Added `CortexDistributorReachingInflightPushRequestLimit` alert. #408
81+
* [ENHANCEMENT] Define Azure object storage ruler args. #416
8182
* [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
8283
* [BUGFIX] Alertmanager: fixed `--alertmanager.cluster.peers` CLI flag passed to alertmanager when HA is enabled. #329
8384
* [BUGFIX] Fixed `CortexInconsistentRuntimeConfig` metric. #335

cortex/config.libsonnet

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@
245245
ruler_enabled: false,
246246
ruler_client_type: error 'you must specify a storage backend type for the ruler (azure, gcs, s3, local)',
247247
ruler_storage_bucket_name: error 'must specify the ruler storage bucket name',
248+
ruler_storage_azure_account_name: error 'must specify the ruler storage Azure account name',
249+
ruler_storage_azure_account_key: error 'must specify the ruler storage Azure account key',
248250

249251
rulerClientConfig:
250252
{
@@ -258,7 +260,11 @@
258260
'ruler-storage.s3.region': $._config.aws_region,
259261
'ruler-storage.s3.bucket-name': $._config.ruler_storage_bucket_name,
260262
},
261-
azure: {},
263+
azure: {
264+
'ruler-storage.azure.container-name': $._config.ruler_storage_bucket_name,
265+
'ruler-storage.azure.account-name': $._config.ruler_storage_azure_account_name,
266+
'ruler-storage.azure.account-key': $._config.ruler_storage_azure_account_key,
267+
},
262268
'local': {
263269
'ruler-storage.local.directory': $._config.ruler_local_directory,
264270
},

0 commit comments

Comments
 (0)