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.

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

cortex: Define Azure object storage ruler args #416

Merged
merged 2 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
6 changes: 5 additions & 1 deletion cortex/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,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': '%(cluster)s-%(namespace)s-ruler' % $._config,
'ruler-storage.azure.account-name': '$(BLOCKS_STORAGE_AZURE_ACCOUNT_NAME)',
'ruler-storage.azure.account-key': '$(BLOCKS_STORAGE_AZURE_ACCOUNT_KEY)',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should all be configurable. Not autogenerated (and what's BLOCKS_STORAGE_AZURE_ACCOUNT_NAME?):

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pracucci OK, looking into it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my understanding, when you say "should be configurable", do you mean that they should exist as fields in the _config object?

The values BLOCKS_STORAGE_AZURE.* look like Kubernetes environment variables but I'm not sure how they are getting to the Pod spec. Is there something special in Azure or is this tbd?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've pushed a revision parameterizing the fields instead.

},
'local': {
'ruler-storage.local.directory': $._config.ruler_local_directory,
},
Expand Down