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

Jump to bottom

Changed alertmanager config to use the new storage config #308

Merged
merged 1 commit into from
May 17, 2021
Merged

Changed alertmanager config to use the new storage config #308

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* [CHANGE] Replaced the deprecated CLI flag `-limits.per-user-override-config` (removed in Cortex 1.9) with `-runtime-config.file`. #304
* [CHANGE] Ruler: changed ruler config to use the new storage config. #306
* [CHANGE] Ruler: enabled API response compression. #306
* [CHANGE] Alertmanager: changed alertmanager config to use the new storage config. #307
* [FEATURE] Added "Cortex / Rollout progress" dashboard. #289 #290
* [FEATURE] Added support for using query-scheduler component, which moves the queue out of query-frontend, and allows scaling up of query-frontend component. #295
* [ENHANCEMENT] Added `newCompactorStatefulSet()` function to create a custom statefulset for the compactor. #287
Expand Down
24 changes: 9 additions & 15 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,15 @@
},

ruler_enabled: false,
ruler_client_type: error 'you must specify a storage backend type for the ruler (azure, configdb, gcs, s3, local)',
// TODO: Generic client generating functions would be nice.
ruler_s3_bucket_name: $._config.s3_bucket_name,
ruler_client_type: error 'you must specify a storage backend type for the ruler (azure, gcs, s3, local)',
ruler_s3_bucket_name: error 'you must specify the ruler S3 bucket name',
ruler_gcs_bucket_name: error 'must specify a GCS bucket name',

rulerClientConfig:
{
'ruler-storage.backend': $._config.ruler_client_type,
} +
{
configdb: {
configs_api_url: 'config.%s.svc.cluster.local' % $._config.namespace,
},
gcs: {
'ruler-storage.gcs.bucket-name': $._config.ruler_gcs_bucket_name,
},
Expand All @@ -284,26 +280,24 @@
fallback_config: {},
},

alertmanager_client_type: error 'you must specify a storage backend type for the alertmanager (azure, configdb, gcs, s3, local)',
alertmanager_s3_bucket_name: $._config.s3_bucket_name,
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',

alertmanagerStorageClientConfig:
{
'alertmanager.storage.type': $._config.alertmanager_client_type,
'alertmanager-storage.backend': $._config.alertmanager_client_type,
} +
{
configdb: {
configs_api_url: 'config.%s.svc.cluster.local' % $._config.namespace,
},
gcs: {
'alertmanager.storage.gcs.bucketname': $._config.alertmanager_gcs_bucket_name,
'alertmanager-storage.gcs.bucket-name': $._config.alertmanager_gcs_bucket_name,
},
s3: {
'alertmanager.storage.s3.url': 'https://%s/%s' % [$._config.aws_region, $._config.alertmanager_s3_bucket_name],
'alertmanager-storage.s3.region': $._config.aws_region,
'alertmanager-storage.s3.bucket-name': $._config.alertmanager_s3_bucket_name,
},
'local': {
'alertmanager.storage.local.directory': $._config.alertmanager_local_directory,
'alertmanager-storage.local.path': $._config.alertmanager_local_directory,
},
}[$._config.alertmanager_client_type],

Expand Down