ruler: Make alertmanager client and all related config per-tenant configurable #10816
+1,001
−114
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ound by double suppressing docs
alexweav
force-pushed
the
alexweav/tenant-notifier-config
branch
from
398822f to
4a278d0
Compare
|
💻 Deploy preview available: https://deploy-preview-mimir-10816-zb444pucvq-vp.a.run.app/docs/mimir/latest/ |
tacole02
approved these changes
Mar 7, 2025
| @@ -64,6 +64,7 @@ | |||
| * [ENHANCEMENT] All: Add `cortex_client_request_invalid_cluster_validation_labels_total` metrics, that is used by Mimir's gRPC clients to track invalid cluster validations. #10767 | |||
| * [ENHANCEMENT] Ingester client: Add support to configure cluster validation for ingester clients. Failed cluster validations are tracked by `cortex_client_request_invalid_cluster_validation_labels_total` with label `client=ingester`. #10767 | |||
| * [ENHANCEMENT] Add experimental metric `cortex_distributor_dropped_native_histograms_total` to measure native histograms silently dropped when native histograms are disabled for a tenant. #10760 | |||
| * [ENHANCEMENT] Add tenant configuration block `ruler_alertmanager_client_config` which allows the Ruler's Alertmanager client options to be specified on a per-tenant basis. #10816 | |||
There was a problem hiding this comment.
Suggested change
| * [ENHANCEMENT] Add tenant configuration block `ruler_alertmanager_client_config` which allows the Ruler's Alertmanager client options to be specified on a per-tenant basis. #10816 | |
| * [ENHANCEMENT] Add tenant configuration block `ruler_alertmanager_client_config`, which allows you to specify the ruler's Alertmanager client options on a per-tenant basis. #10816 |
| @@ -3881,6 +3881,84 @@ The `limits` block configures default and per-tenant limits imposed by component | |||
| # CLI flag: -ruler.max-independent-rule-evaluation-concurrency-per-tenant | |||
| [ruler_max_independent_rule_evaluation_concurrency_per_tenant: <int> | default = 4] | |||
|
|
|||
| # Per-tenant alertmanager client configuration. If not supplied, the tenant's | |||
| # notifications will be sent to the ruler-wide default. | |||
There was a problem hiding this comment.
Suggested change
| # notifications will be sent to the ruler-wide default. | |
| # notifications are sent to the ruler-wide default. |
| @@ -3881,6 +3881,84 @@ The `limits` block configures default and per-tenant limits imposed by component | |||
| # CLI flag: -ruler.max-independent-rule-evaluation-concurrency-per-tenant | |||
| [ruler_max_independent_rule_evaluation_concurrency_per_tenant: <int> | default = 4] | |||
|
|
|||
| # Per-tenant alertmanager client configuration. If not supplied, the tenant's | |||
There was a problem hiding this comment.
Suggested change
| # Per-tenant alertmanager client configuration. If not supplied, the tenant's | |
| # Per-tenant Alertmanager client configuration. If not supplied, the tenant's |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
This PR adds a new per-tenant configuration block that allows the alertmanager URL and all related client options to be changed on a per-tenant basis. This allows different ruler tenants to send alerts to different alertmanagers.
There are a few deployment topologies where this might be desirable:
The new config is a sub-block of the tenant overrides. An example might look like:
If a tenant does not supply any tenant-specific config, it falls back to the global ruler-level configurations given by the existing parameters.
Note: This PR is part 1 of the change that proposes and applies the configuration. It does not yet implement hot-reload for this config block; you need to restart the ruler for changes to this config to take effect. I will support hot-reload, I just decided to post it in a separate PR to keep the diff reviewable.
Which issue(s) this PR fixes or relates to
n/a
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.