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

Use v1.15.3 and configure default azure endpoint suffix #29

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Use v1.15.3 and configure default azure endpoint suffix #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## master / unreleased
* [CHANGE] Use cortex v1.15.3
* [CHANGE] Azure storage endpoint suffix is set to `blob.core.windows.net` for backward compatibility

## 1.14.1 / 2023-07-11

* [CHANGE] Use faster disks for compactor
Expand Down
3 changes: 3 additions & 0 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
'blocks-storage.azure.container-name': $._config.blocks_storage_bucket_name,
'blocks-storage.azure.account-name': $._config.blocks_storage_azure_account_name,
'blocks-storage.azure.account-key': $._config.blocks_storage_azure_account_key,
'blocks-storage.azure.endpoint-suffix': 'blob.core.windows.net',
},

blocksStorageConfig:
Expand Down Expand Up @@ -164,6 +165,7 @@
'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,
'ruler-storage.azure.endpoint-suffix': 'blob.core.windows.net',
},
'local': {
'ruler-storage.local.directory': $._config.ruler_local_directory,
Expand Down Expand Up @@ -194,6 +196,7 @@
'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,
'alertmanager-storage.azure.endpoint-suffix': 'blob.core.windows.net',
},
gcs: {
'alertmanager-storage.gcs.bucket-name': $._config.alertmanager_gcs_bucket_name,
Expand Down
6 changes: 3 additions & 3 deletions cortex/images.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
memcachedExporter: 'prom/memcached-exporter:v0.6.0',

// Our services.
cortex: 'cortexproject/cortex:v1.14.1',
cortex: 'cortexproject/cortex:v1.15.3',

alertmanager: self.cortex,
distributor: self.cortex,
Expand All @@ -20,7 +20,7 @@
query_scheduler: self.cortex,

overrides_exporter: self.cortex,
query_tee: 'quay.io/cortexproject/query-tee:v1.14.1',
testExporter: 'cortexproject/test-exporter:v1.14.1',
query_tee: 'quay.io/cortexproject/query-tee:v1.15.3',
testExporter: 'cortexproject/test-exporter:v1.15.3',
},
}