Skip to content

Commit 25e0428

Browse files
committed
util/validation: set relabel config validation scheme
1 parent 10538e5 commit 25e0428

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pkg/util/validation/limits.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,8 @@ func (l *Limits) validate() error {
561561
if cfg == nil {
562562
return errors.New("invalid metric_relabel_configs")
563563
}
564+
// TODO: when we make validation scheme configurable, set
565+
// cfg.MetricNameValidationScheme to match that value.
564566
}
565567

566568
if l.MaxEstimatedChunksPerQueryMultiplier < 1 && l.MaxEstimatedChunksPerQueryMultiplier != 0 {
@@ -1056,7 +1058,12 @@ func (o *Overrides) CompactorBlockUploadMaxBlockSizeBytes(userID string) int64 {
10561058

10571059
// MetricRelabelConfigs returns the metric relabel configs for a given user.
10581060
func (o *Overrides) MetricRelabelConfigs(userID string) []*relabel.Config {
1059-
return o.getOverridesForUser(userID).MetricRelabelConfigs
1061+
relabelConfigs := o.getOverridesForUser(userID).MetricRelabelConfigs
1062+
validationScheme := o.ValidationScheme(userID)
1063+
for i := range relabelConfigs {
1064+
relabelConfigs[i].MetricNameValidationScheme = validationScheme
1065+
}
1066+
return relabelConfigs
10601067
}
10611068

10621069
func (o *Overrides) MetricRelabelingEnabled(userID string) bool {

0 commit comments

Comments
 (0)