Skip to content

Commit

Permalink
Merge pull request #416 from grafana/chore/azure-ruler
Browse files Browse the repository at this point in the history
cortex: Define Azure object storage ruler args
  • Loading branch information
pracucci authored Nov 15, 2021
2 parents fc50bc0 + afb7bc8 commit 6941468
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
* [ENHANCEMENT] Add ability to override `datasource` for generated dashboards. #407
* [ENHANCEMENT] Use alertmanager jobname for alertmanager dashboard panels #411
* [ENHANCEMENT] Added `CortexDistributorReachingInflightPushRequestLimit` alert. #408
* [ENHANCEMENT] Define Azure object storage ruler args. #416
* [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
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@
ruler_enabled: false,
ruler_client_type: error 'you must specify a storage backend type for the ruler (azure, gcs, s3, local)',
ruler_storage_bucket_name: error 'must specify the ruler storage bucket name',
ruler_storage_azure_account_name: error 'must specify the ruler storage Azure account name',
ruler_storage_azure_account_key: error 'must specify the ruler storage Azure account key',

rulerClientConfig:
{
Expand All @@ -258,7 +260,11 @@
'ruler-storage.s3.region': $._config.aws_region,
'ruler-storage.s3.bucket-name': $._config.ruler_storage_bucket_name,
},
azure: {},
azure: {
'ruler-storage.azure.container-name': $._config.ruler_storage_bucket_name,
'ruler-storage.azure.account-name': $._config.ruler_storage_azure_account_name,
'ruler-storage.azure.account-key': $._config.ruler_storage_azure_account_key,
},
'local': {
'ruler-storage.local.directory': $._config.ruler_local_directory,
},
Expand Down

0 comments on commit 6941468

Please sign in to comment.