Added limit for size of configuration file that tenant can upload to Alertmanager. #4201
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
…Alertmanager. Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
pracucci
approved these changes
May 24, 2021
pkg/util/validation/limits.go
Outdated
| @@ -173,6 +174,7 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) { | |||
| l.NotificationRateLimitPerIntegration = NotificationRateLimitMap{} | |||
| } | |||
| f.Var(&l.NotificationRateLimitPerIntegration, "alertmanager.notification-rate-limit-per-integration", "Per-integration notification rate limits. Value is a map, where each key is integration name and value is a rate-limit (float). On command line, this map is given in JSON format. Rate limit has the same meaning as -alertmanager.notification-rate-limit, but only applies for specific integration. Allowed integration names: "+strings.Join(allowedIntegrationNames, ", ")+".") | |||
| f.IntVar(&l.AlertmanagerMaxConfigSize, "alertmanager.max-config-size", 0, "Maximum size of configuration file for Alertmanager that tenant can upload via Alertmanager API. 0 = no limit.") | |||
There was a problem hiding this comment.
[nit] I'm wondering if, to make it even more clear, we should mention it's in bytes. We can do it in the CLI flag description but I'm also wondering if we should add a -bytes suffix to the config like we have for other configs.
There was a problem hiding this comment.
Sounds good. I will update it.
pkg/alertmanager/api.go
Outdated
| if err != nil { | ||
| level.Error(logger).Log("msg", errReadingConfiguration, "err", err.Error()) | ||
| http.Error(w, fmt.Sprintf("%s: %s", errReadingConfiguration, err.Error()), http.StatusBadRequest) | ||
| return | ||
| } | ||
|
|
||
| if maxConfigSize > 0 && len(payload) > maxConfigSize { | ||
| msg := fmt.Sprintf(errConfigurationTooBig, maxConfigSize) | ||
| level.Error(logger).Log("msg", msg) |
There was a problem hiding this comment.
This is not an actionable error on Cortex side, so I wouldn't use the error level. I would use Warn instead.
Signed-off-by: Peter Štibraný <[email protected]>
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 introduces new limit in Alertmanager: limit for size of configuration file that tenant can upload.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]