diff --git a/CHANGELOG.md b/CHANGELOG.md index f169a09cc30..92934e03ee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ * [ENHANCEMENT] Ingester: improve performance of reading the WAL. #9508 * [ENHANCEMENT] Query-scheduler: improve the errors and traces emitted by query-schedulers when communicating with queriers. #9519 * [ENHANCEMENT] Compactor: uploaded blocks cannot be bigger than max configured compactor time range, and cannot cross the boundary for given time range. #9524 +* [ENHANCEMENT] The distributor now validates that received label values only contain allowed characters. #9185 * [BUGFIX] Fix issue where functions such as `rate()` over native histograms could return incorrect values if a float stale marker was present in the selected range. #9508 * [BUGFIX] Fix issue where negation of native histograms (eg. `-some_native_histogram_series`) did nothing. #9508 * [BUGFIX] Fix issue where `metric might not be a counter, name does not end in _total/_sum/_count/_bucket` annotation would be emitted even if `rate` or `increase` did not have enough samples to compute a result. #9508 diff --git a/docs/sources/mimir/manage/mimir-runbooks/_index.md b/docs/sources/mimir/manage/mimir-runbooks/_index.md index 22e70b8c713..37fcd2a8ef5 100644 --- a/docs/sources/mimir/manage/mimir-runbooks/_index.md +++ b/docs/sources/mimir/manage/mimir-runbooks/_index.md @@ -1745,6 +1745,15 @@ A label name name can only contain characters as defined by Prometheus’ [Metri Invalid series are skipped during the ingestion, and valid series within the same request are ingested. {{< /admonition >}} +### err-mimir-label-value-invalid + +This non-critical error occurs when Mimir receives a write request that contains a series with a label that has an invalid value. +A label value can only contain unicode characters as defined by Prometheus’ [Metric names and labels](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels). + +{{< admonition type="note" >}} +Invalid series are skipped during the ingestion, and valid series within the same request are ingested. +{{< /admonition >}} + ### err-mimir-label-name-too-long This non-critical error occurs when Mimir receives a write request that contains a series with a label name whose length exceeds the configured limit. diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go index 59d9161147b..c10a29c21d8 100644 --- a/pkg/distributor/distributor.go +++ b/pkg/distributor/distributor.go @@ -198,9 +198,9 @@ type Config struct { // for testing and for extending the ingester by adding calls to the client IngesterClientFactory ring_client.PoolFactory `yaml:"-"` - // when true the distributor does not validate the label name, Mimir doesn't directly use + // when true the distributor does not validate the label name and value, Mimir doesn't directly use // this (and should never use it) but this feature is used by other projects built on top of it - SkipLabelNameValidation bool `yaml:"-"` + SkipLabelValidation bool `yaml:"-"` // This config is dynamically injected because it is defined in the querier config. ShuffleShardingLookbackPeriod time.Duration `yaml:"-"` @@ -713,8 +713,8 @@ func (d *Distributor) checkSample(ctx context.Context, userID, cluster, replica // May alter timeseries data in-place. // The returned error may retain the series labels. // It uses the passed nowt time to observe the delay of sample timestamps. -func (d *Distributor) validateSeries(nowt time.Time, ts *mimirpb.PreallocTimeseries, userID, group string, skipLabelNameValidation bool, minExemplarTS, maxExemplarTS int64) error { - if err := validateLabels(d.sampleValidationMetrics, d.limits, userID, group, ts.Labels, skipLabelNameValidation); err != nil { +func (d *Distributor) validateSeries(nowt time.Time, ts *mimirpb.PreallocTimeseries, userID, group string, skipLabelValidation bool, minExemplarTS, maxExemplarTS int64) error { + if err := validateLabels(d.sampleValidationMetrics, d.limits, userID, group, ts.Labels, skipLabelValidation); err != nil { return err } @@ -1050,9 +1050,9 @@ func (d *Distributor) prePushValidationMiddleware(next PushFunc) PushFunc { d.labelsHistogram.Observe(float64(len(ts.Labels))) - skipLabelNameValidation := d.cfg.SkipLabelNameValidation || req.GetSkipLabelNameValidation() + skipLabelValidation := d.cfg.SkipLabelValidation || req.GetSkipLabelValidation() // Note that validateSeries may drop some data in ts. - validationErr := d.validateSeries(now, &req.Timeseries[tsIdx], userID, group, skipLabelNameValidation, minExemplarTS, maxExemplarTS) + validationErr := d.validateSeries(now, &req.Timeseries[tsIdx], userID, group, skipLabelValidation, minExemplarTS, maxExemplarTS) // Errors in validation are considered non-fatal, as one series in a request may contain // invalid data but all the remaining series could be perfectly valid. diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go index e71fbf24762..b70eee6e1fb 100644 --- a/pkg/distributor/distributor_test.go +++ b/pkg/distributor/distributor_test.go @@ -1271,11 +1271,11 @@ func TestDistributor_Push_LabelNameValidation(t *testing.T) { numDistributors: 1, shuffleShardSize: 0, configure: func(config *Config) { - config.SkipLabelNameValidation = tc.skipLabelNameValidationCfg + config.SkipLabelValidation = tc.skipLabelNameValidationCfg }, }) req := mockWriteRequest(tc.inputLabels, 42, 100000) - req.SkipLabelNameValidation = tc.skipLabelNameValidationReq + req.SkipLabelValidation = tc.skipLabelNameValidationReq _, err := ds[0].Push(ctx, req) if tc.errExpected { fromError, _ := grpcutil.ErrorToStatus(err) diff --git a/pkg/distributor/otel_test.go b/pkg/distributor/otel_test.go index ed995be1881..0e5ed178451 100644 --- a/pkg/distributor/otel_test.go +++ b/pkg/distributor/otel_test.go @@ -446,7 +446,7 @@ func TestHandler_otlpDroppedMetricsPanic(t *testing.T) { request, err := pushReq.WriteRequest() assert.NoError(t, err) assert.Len(t, request.Timeseries, 3) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) pushReq.CleanUp() return nil }, nil, nil, log.NewNopLogger(), true) @@ -493,7 +493,7 @@ func TestHandler_otlpDroppedMetricsPanic2(t *testing.T) { t.Cleanup(pushReq.CleanUp) require.NoError(t, err) assert.Len(t, request.Timeseries, 1) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) return nil }, nil, nil, log.NewNopLogger(), true) handler.ServeHTTP(resp, req) @@ -519,7 +519,7 @@ func TestHandler_otlpDroppedMetricsPanic2(t *testing.T) { t.Cleanup(pushReq.CleanUp) require.NoError(t, err) assert.Len(t, request.Timeseries, 9) // 6 buckets (including +Inf) + 2 sum/count + 2 from the first case - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) return nil }, nil, nil, log.NewNopLogger(), true) handler.ServeHTTP(resp, req) diff --git a/pkg/distributor/push.go b/pkg/distributor/push.go index 4816954c0af..7a5ad9ad25d 100644 --- a/pkg/distributor/push.go +++ b/pkg/distributor/push.go @@ -172,9 +172,9 @@ func handler( } if allowSkipLabelNameValidation { - req.SkipLabelNameValidation = req.SkipLabelNameValidation && r.Header.Get(SkipLabelNameValidationHeader) == "true" + req.SkipLabelValidation = req.SkipLabelValidation && r.Header.Get(SkipLabelNameValidationHeader) == "true" } else { - req.SkipLabelNameValidation = false + req.SkipLabelValidation = false } cleanup := func() { diff --git a/pkg/distributor/push_test.go b/pkg/distributor/push_test.go index 099008b6a2a..29c2161272f 100644 --- a/pkg/distributor/push_test.go +++ b/pkg/distributor/push_test.go @@ -144,7 +144,7 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { expectedStatusCode int }{ { - name: "config flag set to false means SkipLabelNameValidation is false", + name: "config flag set to false means SkipLabelValidation is false", allowSkipLabelNameValidation: false, req: createRequest(t, createMimirWriteRequestProtobufWithNonSupportedLabelNames(t, false)), verifyReqHandler: func(_ context.Context, pushReq *Request) error { @@ -154,7 +154,7 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { assert.Equal(t, "a-label", request.Timeseries[0].Labels[0].Name) assert.Equal(t, "value", request.Timeseries[0].Labels[0].Value) assert.Equal(t, mimirpb.RULE, request.Source) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) pushReq.CleanUp() return nil }, @@ -162,7 +162,7 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { expectedStatusCode: http.StatusOK, }, { - name: "config flag set to false means SkipLabelNameValidation is always false even if write requests sets it to true", + name: "config flag set to false means SkipLabelValidation is always false even if write requests sets it to true", allowSkipLabelNameValidation: false, req: createRequest(t, createMimirWriteRequestProtobufWithNonSupportedLabelNames(t, true)), verifyReqHandler: func(_ context.Context, pushReq *Request) error { @@ -173,14 +173,14 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { assert.Equal(t, "a-label", request.Timeseries[0].Labels[0].Name) assert.Equal(t, "value", request.Timeseries[0].Labels[0].Value) assert.Equal(t, mimirpb.RULE, request.Source) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) return nil }, includeAllowSkiplabelNameValidationHeader: true, expectedStatusCode: http.StatusOK, }, { - name: "config flag set to true but write request set to false means SkipLabelNameValidation is false", + name: "config flag set to true but write request set to false means SkipLabelValidation is false", allowSkipLabelNameValidation: true, req: createRequest(t, createMimirWriteRequestProtobufWithNonSupportedLabelNames(t, false)), verifyReqHandler: func(_ context.Context, pushReq *Request) error { @@ -190,14 +190,14 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { assert.Equal(t, "a-label", request.Timeseries[0].Labels[0].Name) assert.Equal(t, "value", request.Timeseries[0].Labels[0].Value) assert.Equal(t, mimirpb.RULE, request.Source) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) pushReq.CleanUp() return nil }, expectedStatusCode: http.StatusOK, }, { - name: "config flag set to true and write request set to true means SkipLabelNameValidation is true", + name: "config flag set to true and write request set to true means SkipLabelValidation is true", allowSkipLabelNameValidation: true, req: createRequest(t, createMimirWriteRequestProtobufWithNonSupportedLabelNames(t, true)), verifyReqHandler: func(_ context.Context, pushReq *Request) error { @@ -207,14 +207,14 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { assert.Equal(t, "a-label", request.Timeseries[0].Labels[0].Name) assert.Equal(t, "value", request.Timeseries[0].Labels[0].Value) assert.Equal(t, mimirpb.RULE, request.Source) - assert.True(t, request.SkipLabelNameValidation) + assert.True(t, request.SkipLabelValidation) pushReq.CleanUp() return nil }, expectedStatusCode: http.StatusOK, }, { - name: "config flag set to true and write request set to true but header not sent means SkipLabelNameValidation is false", + name: "config flag set to true and write request set to true but header not sent means SkipLabelValidation is false", allowSkipLabelNameValidation: true, req: createRequest(t, createMimirWriteRequestProtobufWithNonSupportedLabelNames(t, true)), verifyReqHandler: func(_ context.Context, pushReq *Request) error { @@ -224,7 +224,7 @@ func TestHandler_EnsureSkipLabelNameValidationBehaviour(t *testing.T) { assert.Equal(t, "a-label", request.Timeseries[0].Labels[0].Name) assert.Equal(t, "value", request.Timeseries[0].Labels[0].Value) assert.Equal(t, mimirpb.RULE, request.Source) - assert.False(t, request.SkipLabelNameValidation) + assert.False(t, request.SkipLabelValidation) pushReq.CleanUp() return nil }, @@ -390,7 +390,7 @@ func verifyWritePushFunc(t *testing.T, expectSource mimirpb.WriteRequest_SourceE require.Equal(t, "__name__", request.Timeseries[0].Labels[0].Name) require.Equal(t, "foo", request.Timeseries[0].Labels[0].Value) require.Equal(t, expectSource, request.Source) - require.False(t, request.SkipLabelNameValidation) + require.False(t, request.SkipLabelValidation) return nil } } @@ -456,9 +456,9 @@ func createMimirWriteRequestProtobuf(t *testing.T, skipLabelNameValidation bool) }, } input := mimirpb.WriteRequest{ - Timeseries: []mimirpb.PreallocTimeseries{ts}, - Source: mimirpb.RULE, - SkipLabelNameValidation: skipLabelNameValidation, + Timeseries: []mimirpb.PreallocTimeseries{ts}, + Source: mimirpb.RULE, + SkipLabelValidation: skipLabelNameValidation, } inoutBytes, err := input.Marshal() require.NoError(t, err) @@ -478,9 +478,9 @@ func createMimirWriteRequestProtobufWithNonSupportedLabelNames(t *testing.T, ski }, } input := mimirpb.WriteRequest{ - Timeseries: []mimirpb.PreallocTimeseries{ts}, - Source: mimirpb.RULE, - SkipLabelNameValidation: skipLabelNameValidation, + Timeseries: []mimirpb.PreallocTimeseries{ts}, + Source: mimirpb.RULE, + SkipLabelValidation: skipLabelNameValidation, } inoutBytes, err := input.Marshal() require.NoError(t, err) diff --git a/pkg/distributor/validate.go b/pkg/distributor/validate.go index db15559c70d..8e51207d83d 100644 --- a/pkg/distributor/validate.go +++ b/pkg/distributor/validate.go @@ -34,6 +34,7 @@ var ( reasonInvalidMetricName = globalerror.InvalidMetricName.LabelValue() reasonMaxLabelNamesPerSeries = globalerror.MaxLabelNamesPerSeries.LabelValue() reasonInvalidLabel = globalerror.SeriesInvalidLabel.LabelValue() + reasonInvalidLabelValue = globalerror.SeriesInvalidLabelValue.LabelValue() reasonLabelNameTooLong = globalerror.SeriesLabelNameTooLong.LabelValue() reasonLabelValueTooLong = globalerror.SeriesLabelValueTooLong.LabelValue() reasonMaxNativeHistogramBuckets = globalerror.MaxNativeHistogramBuckets.LabelValue() @@ -70,9 +71,10 @@ var ( "received a series whose label value length exceeds the limit, label: '%s', value: '%.200s' (truncated) series: '%.200s'", validation.MaxLabelValueLengthFlag, ) - invalidLabelMsgFormat = globalerror.SeriesInvalidLabel.Message("received a series with an invalid label: '%.200s' series: '%.200s'") - duplicateLabelMsgFormat = globalerror.SeriesWithDuplicateLabelNames.Message("received a series with duplicate label name, label: '%.200s' series: '%.200s'") - tooManyLabelsMsgFormat = globalerror.MaxLabelNamesPerSeries.MessageWithPerTenantLimitConfig( + invalidLabelMsgFormat = globalerror.SeriesInvalidLabel.Message("received a series with an invalid label: '%.200s' series: '%.200s'") + invalidLabelValueMsgFormat = globalerror.SeriesInvalidLabelValue.Message("received a series with invalid value in label '%.200s': '%.200s' series: '%.200s'") + duplicateLabelMsgFormat = globalerror.SeriesWithDuplicateLabelNames.Message("received a series with duplicate label name, label: '%.200s' series: '%.200s'") + tooManyLabelsMsgFormat = globalerror.MaxLabelNamesPerSeries.MessageWithPerTenantLimitConfig( "received a series whose number of labels exceeds the limit (actual: %d, limit: %d) series: '%.200s%s'", validation.MaxLabelNamesPerSeriesFlag, ) @@ -125,6 +127,7 @@ type sampleValidationMetrics struct { invalidMetricName *prometheus.CounterVec maxLabelNamesPerSeries *prometheus.CounterVec invalidLabel *prometheus.CounterVec + invalidLabelValue *prometheus.CounterVec labelNameTooLong *prometheus.CounterVec labelValueTooLong *prometheus.CounterVec maxNativeHistogramBuckets *prometheus.CounterVec @@ -140,6 +143,7 @@ func (m *sampleValidationMetrics) deleteUserMetrics(userID string) { m.invalidMetricName.DeletePartialMatch(filter) m.maxLabelNamesPerSeries.DeletePartialMatch(filter) m.invalidLabel.DeletePartialMatch(filter) + m.invalidLabelValue.DeletePartialMatch(filter) m.labelNameTooLong.DeletePartialMatch(filter) m.labelValueTooLong.DeletePartialMatch(filter) m.maxNativeHistogramBuckets.DeletePartialMatch(filter) @@ -154,6 +158,7 @@ func (m *sampleValidationMetrics) deleteUserMetricsForGroup(userID, group string m.invalidMetricName.DeleteLabelValues(userID, group) m.maxLabelNamesPerSeries.DeleteLabelValues(userID, group) m.invalidLabel.DeleteLabelValues(userID, group) + m.invalidLabelValue.DeleteLabelValues(userID, group) m.labelNameTooLong.DeleteLabelValues(userID, group) m.labelValueTooLong.DeleteLabelValues(userID, group) m.maxNativeHistogramBuckets.DeleteLabelValues(userID, group) @@ -169,6 +174,7 @@ func newSampleValidationMetrics(r prometheus.Registerer) *sampleValidationMetric invalidMetricName: validation.DiscardedSamplesCounter(r, reasonInvalidMetricName), maxLabelNamesPerSeries: validation.DiscardedSamplesCounter(r, reasonMaxLabelNamesPerSeries), invalidLabel: validation.DiscardedSamplesCounter(r, reasonInvalidLabel), + invalidLabelValue: validation.DiscardedSamplesCounter(r, reasonInvalidLabelValue), labelNameTooLong: validation.DiscardedSamplesCounter(r, reasonLabelNameTooLong), labelValueTooLong: validation.DiscardedSamplesCounter(r, reasonLabelValueTooLong), maxNativeHistogramBuckets: validation.DiscardedSamplesCounter(r, reasonMaxNativeHistogramBuckets), @@ -368,7 +374,7 @@ func removeNonASCIIChars(in string) (out string) { // validateLabels returns an err if the labels are invalid. // The returned error may retain the provided series labels. -func validateLabels(m *sampleValidationMetrics, cfg labelValidationConfig, userID, group string, ls []mimirpb.LabelAdapter, skipLabelNameValidation bool) error { +func validateLabels(m *sampleValidationMetrics, cfg labelValidationConfig, userID, group string, ls []mimirpb.LabelAdapter, skipLabelValidation bool) error { unsafeMetricName, err := extract.UnsafeMetricNameFromLabelAdapters(ls) if err != nil { m.missingMetricName.WithLabelValues(userID, group).Inc() @@ -391,12 +397,15 @@ func validateLabels(m *sampleValidationMetrics, cfg labelValidationConfig, userI maxLabelValueLength := cfg.MaxLabelValueLength(userID) lastLabelName := "" for _, l := range ls { - if !skipLabelNameValidation && !model.LabelName(l.Name).IsValid() { + if !skipLabelValidation && !model.LabelName(l.Name).IsValid() { m.invalidLabel.WithLabelValues(userID, group).Inc() return fmt.Errorf(invalidLabelMsgFormat, l.Name, mimirpb.FromLabelAdaptersToString(ls)) } else if len(l.Name) > maxLabelNameLength { m.labelNameTooLong.WithLabelValues(userID, group).Inc() return fmt.Errorf(labelNameTooLongMsgFormat, l.Name, mimirpb.FromLabelAdaptersToString(ls)) + } else if !skipLabelValidation && !model.LabelValue(l.Value).IsValid() { + m.invalidLabelValue.WithLabelValues(userID, group).Inc() + return fmt.Errorf(invalidLabelValueMsgFormat, l.Name, l.Value, mimirpb.FromLabelAdaptersToString(ls)) } else if len(l.Value) > maxLabelValueLength { m.labelValueTooLong.WithLabelValues(userID, group).Inc() return fmt.Errorf(labelValueTooLongMsgFormat, l.Name, l.Value, mimirpb.FromLabelAdaptersToString(ls)) diff --git a/pkg/distributor/validate_test.go b/pkg/distributor/validate_test.go index 2ee061ded13..b545e6401a7 100644 --- a/pkg/distributor/validate_test.go +++ b/pkg/distributor/validate_test.go @@ -153,6 +153,30 @@ func TestValidateLabels(t *testing.T) { true, nil, }, + { + map[model.LabelName]model.LabelValue{model.MetricNameLabel: "foo", "label1": "你好"}, + false, + nil, + }, + { + map[model.LabelName]model.LabelValue{model.MetricNameLabel: "foo", "label1": "abc\xfe\xfddef"}, + false, + fmt.Errorf( + invalidLabelValueMsgFormat, + "label1", "abc\xfe\xfddef", + mimirpb.FromLabelAdaptersToString( + []mimirpb.LabelAdapter{ + {Name: model.MetricNameLabel, Value: "foo"}, + {Name: "label1", Value: "abc\xfe\xfddef"}, + }, + ), + ), + }, + { + map[model.LabelName]model.LabelValue{model.MetricNameLabel: "foo", "label1": "abc\xfe\xfddef"}, + true, + nil, + }, } { err := validateLabels(s, cfg, userID, "custom label", mimirpb.FromMetricsToLabelAdapters(c.metric), c.skipLabelNameValidation) assert.Equal(t, c.err, err, "wrong error") @@ -166,11 +190,11 @@ func TestValidateLabels(t *testing.T) { # TYPE cortex_discarded_samples_total counter cortex_discarded_samples_total{group="custom label",reason="label_invalid",user="testUser"} 1 cortex_discarded_samples_total{group="custom label",reason="label_name_too_long",user="testUser"} 1 + cortex_discarded_samples_total{group="custom label",reason="label_value_invalid",user="testUser"} 1 cortex_discarded_samples_total{group="custom label",reason="label_value_too_long",user="testUser"} 1 cortex_discarded_samples_total{group="custom label",reason="max_label_names_per_series",user="testUser"} 1 cortex_discarded_samples_total{group="custom label",reason="metric_name_invalid",user="testUser"} 2 cortex_discarded_samples_total{group="custom label",reason="missing_metric_name",user="testUser"} 1 - cortex_discarded_samples_total{group="custom label",reason="random reason",user="different user"} 1 `), "cortex_discarded_samples_total")) diff --git a/pkg/mimirpb/custom_test.go b/pkg/mimirpb/custom_test.go index cd2dcc9a4b2..491b8358fdf 100644 --- a/pkg/mimirpb/custom_test.go +++ b/pkg/mimirpb/custom_test.go @@ -78,8 +78,8 @@ func TestWriteRequest_IsEmpty(t *testing.T) { t.Run("should return true if a WriteRequest has no Timeseries and Metadata", func(t *testing.T) { req := &WriteRequest{ - Source: API, - SkipLabelNameValidation: true, + Source: API, + SkipLabelValidation: true, } assert.True(t, req.IsEmpty()) diff --git a/pkg/mimirpb/mimir.pb.go b/pkg/mimirpb/mimir.pb.go index 8e2109f8aef..89fee4d71ea 100644 --- a/pkg/mimirpb/mimir.pb.go +++ b/pkg/mimirpb/mimir.pb.go @@ -239,8 +239,8 @@ type WriteRequest struct { Timeseries []PreallocTimeseries `protobuf:"bytes,1,rep,name=timeseries,proto3,customtype=PreallocTimeseries" json:"timeseries"` Source WriteRequest_SourceEnum `protobuf:"varint,2,opt,name=Source,proto3,enum=cortexpb.WriteRequest_SourceEnum" json:"Source,omitempty"` Metadata []*MetricMetadata `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty"` - // Skip validation of label names. - SkipLabelNameValidation bool `protobuf:"varint,1000,opt,name=skip_label_name_validation,json=skipLabelNameValidation,proto3" json:"skip_label_name_validation,omitempty"` + // Skip validation of label names and values. + SkipLabelValidation bool `protobuf:"varint,1000,opt,name=skip_label_validation,json=skipLabelValidation,proto3" json:"skip_label_validation,omitempty"` // Skip unmarshaling of exemplars. skipUnmarshalingExemplars bool @@ -292,9 +292,9 @@ func (m *WriteRequest) GetMetadata() []*MetricMetadata { return nil } -func (m *WriteRequest) GetSkipLabelNameValidation() bool { +func (m *WriteRequest) GetSkipLabelValidation() bool { if m != nil { - return m.SkipLabelNameValidation + return m.SkipLabelValidation } return false } @@ -1916,133 +1916,133 @@ func init() { func init() { proto.RegisterFile("mimir.proto", fileDescriptor_86d4d7485f544059) } var fileDescriptor_86d4d7485f544059 = []byte{ - // 2014 bytes of a gzipped FileDescriptorProto + // 2008 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0x17, 0x25, 0xea, 0x83, 0xcf, 0x92, 0x3d, 0x99, 0xa4, 0x5e, 0xad, 0xb1, 0x91, 0x1d, 0x2e, - 0xba, 0x75, 0x83, 0xd6, 0x29, 0x76, 0xdb, 0x2c, 0x36, 0x48, 0xd1, 0x52, 0x12, 0x13, 0xcb, 0x91, + 0x15, 0x17, 0x25, 0xea, 0x83, 0xcf, 0x92, 0x3d, 0x99, 0x64, 0x5d, 0xad, 0xb1, 0x2b, 0x3b, 0x5c, + 0x74, 0xeb, 0x06, 0xad, 0x53, 0x6c, 0xda, 0x2c, 0x36, 0x48, 0xd1, 0x52, 0x12, 0x13, 0xcb, 0x91, 0x28, 0xef, 0x90, 0x72, 0x9a, 0x5e, 0x08, 0x5a, 0x1e, 0xdb, 0xc4, 0x8a, 0xa2, 0x4a, 0x52, 0xd9, - 0xb8, 0xa7, 0x5e, 0x5a, 0x14, 0x3d, 0xf5, 0xd2, 0x4b, 0xd1, 0x5b, 0x2f, 0x05, 0x7a, 0xef, 0xdf, - 0x10, 0xa0, 0x97, 0x1c, 0xb7, 0x3d, 0x04, 0x8d, 0x73, 0xd9, 0xe3, 0xa2, 0xe8, 0xa9, 0xa7, 0x62, - 0x66, 0xf8, 0x21, 0xca, 0x76, 0x9b, 0xb6, 0xb9, 0xf1, 0xbd, 0xf7, 0x9b, 0xc7, 0xdf, 0xbc, 0x79, - 0xef, 0xf1, 0x0d, 0x61, 0xc5, 0x73, 0x3d, 0x37, 0xd8, 0x99, 0x05, 0x7e, 0xe4, 0xe3, 0xda, 0xd8, - 0x0f, 0x22, 0xfa, 0x6c, 0x76, 0xb8, 0xf1, 0xed, 0x13, 0x37, 0x3a, 0x9d, 0x1f, 0xee, 0x8c, 0x7d, - 0xef, 0xce, 0x89, 0x7f, 0xe2, 0xdf, 0xe1, 0x80, 0xc3, 0xf9, 0x31, 0x97, 0xb8, 0xc0, 0x9f, 0xc4, - 0x42, 0xf5, 0x4f, 0x45, 0xa8, 0x3f, 0x0e, 0xdc, 0x88, 0x12, 0xfa, 0x93, 0x39, 0x0d, 0x23, 0xbc, - 0x0f, 0x10, 0xb9, 0x1e, 0x0d, 0x69, 0xe0, 0xd2, 0xb0, 0x29, 0x6d, 0x95, 0xb6, 0x57, 0x3e, 0xbc, - 0xb1, 0x93, 0xb8, 0xdf, 0xb1, 0x5c, 0x8f, 0x9a, 0xdc, 0xd6, 0xde, 0x78, 0xfe, 0x72, 0xb3, 0xf0, - 0xd7, 0x97, 0x9b, 0x78, 0x3f, 0xa0, 0xce, 0x64, 0xe2, 0x8f, 0xad, 0x74, 0x1d, 0x59, 0xf0, 0x81, - 0x3f, 0x81, 0x8a, 0xe9, 0xcf, 0x83, 0x31, 0x6d, 0x16, 0xb7, 0xa4, 0xed, 0xd5, 0x0f, 0x6f, 0x65, - 0xde, 0x16, 0xdf, 0xbc, 0x23, 0x40, 0xfa, 0x74, 0xee, 0x91, 0x78, 0x01, 0xbe, 0x07, 0x35, 0x8f, - 0x46, 0xce, 0x91, 0x13, 0x39, 0xcd, 0x12, 0xa7, 0xd2, 0xcc, 0x16, 0x0f, 0x68, 0x14, 0xb8, 0xe3, - 0x41, 0x6c, 0x6f, 0xcb, 0xcf, 0x5f, 0x6e, 0x4a, 0x24, 0xc5, 0xe3, 0xfb, 0xb0, 0x11, 0x7e, 0xe6, - 0xce, 0xec, 0x89, 0x73, 0x48, 0x27, 0xf6, 0xd4, 0xf1, 0xa8, 0xfd, 0xd4, 0x99, 0xb8, 0x47, 0x4e, - 0xe4, 0xfa, 0xd3, 0xe6, 0x97, 0xd5, 0x2d, 0x69, 0xbb, 0x46, 0xde, 0x61, 0x90, 0x3e, 0x43, 0x18, - 0x8e, 0x47, 0x0f, 0x52, 0xbb, 0xba, 0x09, 0x90, 0xf1, 0xc1, 0x55, 0x28, 0x69, 0xfb, 0x3d, 0x54, - 0xc0, 0x35, 0x90, 0xc9, 0xa8, 0xaf, 0x23, 0x49, 0x5d, 0x83, 0x46, 0xcc, 0x3e, 0x9c, 0xf9, 0xd3, - 0x90, 0xaa, 0xf7, 0xa0, 0xae, 0x07, 0x81, 0x1f, 0x74, 0x69, 0xe4, 0xb8, 0x93, 0x10, 0xdf, 0x86, - 0x72, 0xc7, 0x99, 0x87, 0xb4, 0x29, 0xf1, 0x5d, 0x2f, 0xc4, 0x90, 0xc3, 0xb8, 0x8d, 0x08, 0x88, - 0xfa, 0x0f, 0x09, 0x20, 0x8b, 0x2c, 0xd6, 0xa0, 0xc2, 0x59, 0x27, 0xf1, 0xbf, 0x9e, 0xad, 0xe5, - 0x5c, 0xf7, 0x1d, 0x37, 0x68, 0xdf, 0x88, 0xc3, 0x5f, 0xe7, 0x2a, 0xed, 0xc8, 0x99, 0x45, 0x34, - 0x20, 0xf1, 0x42, 0xfc, 0x1d, 0xa8, 0x86, 0x8e, 0x37, 0x9b, 0xd0, 0xb0, 0x59, 0xe4, 0x3e, 0x50, - 0xe6, 0xc3, 0xe4, 0x06, 0x1e, 0xb0, 0x02, 0x49, 0x60, 0xf8, 0x2e, 0x28, 0xf4, 0x19, 0xf5, 0x66, - 0x13, 0x27, 0x08, 0xe3, 0x60, 0xe3, 0x05, 0xce, 0xb1, 0x29, 0x5e, 0x95, 0x41, 0xf1, 0x27, 0x00, - 0xa7, 0x6e, 0x18, 0xf9, 0x27, 0x81, 0xe3, 0x85, 0x4d, 0x79, 0x99, 0xf0, 0x6e, 0x62, 0x8b, 0x57, - 0x2e, 0x80, 0xd5, 0xef, 0x81, 0x92, 0xee, 0x07, 0x63, 0x90, 0xd9, 0x21, 0xf1, 0x70, 0xd5, 0x09, - 0x7f, 0xc6, 0x37, 0xa0, 0xfc, 0xd4, 0x99, 0xcc, 0x45, 0xe6, 0xd4, 0x89, 0x10, 0x54, 0x0d, 0x2a, - 0x62, 0x0b, 0xf8, 0x16, 0xd4, 0x79, 0xa2, 0x45, 0x8e, 0x37, 0xb3, 0xbd, 0x90, 0xc3, 0x4a, 0x64, - 0x25, 0xd5, 0x0d, 0xc2, 0xcc, 0x05, 0xf3, 0x2b, 0x25, 0x2e, 0x7e, 0x5b, 0x84, 0xd5, 0x7c, 0xfe, - 0xe0, 0x8f, 0x41, 0x8e, 0xce, 0x66, 0xc9, 0x71, 0xbd, 0x7f, 0x55, 0x9e, 0xc5, 0xa2, 0x75, 0x36, - 0xa3, 0x84, 0x2f, 0xc0, 0xdf, 0x02, 0xec, 0x71, 0x9d, 0x7d, 0xec, 0x78, 0xee, 0xe4, 0x8c, 0xe7, - 0x1a, 0xa7, 0xa2, 0x10, 0x24, 0x2c, 0x0f, 0xb8, 0x81, 0xa5, 0x18, 0xdb, 0xe6, 0x29, 0x9d, 0xcc, - 0x9a, 0x32, 0xb7, 0xf3, 0x67, 0xa6, 0x9b, 0x4f, 0xdd, 0xa8, 0x59, 0x16, 0x3a, 0xf6, 0xac, 0x9e, - 0x01, 0x64, 0x6f, 0xc2, 0x2b, 0x50, 0x1d, 0x19, 0x8f, 0x8c, 0xe1, 0x63, 0x03, 0x15, 0x98, 0xd0, - 0x19, 0x8e, 0x0c, 0x4b, 0x27, 0x48, 0xc2, 0x0a, 0x94, 0x1f, 0x6a, 0xa3, 0x87, 0x3a, 0x2a, 0xe2, - 0x06, 0x28, 0xbb, 0x3d, 0xd3, 0x1a, 0x3e, 0x24, 0xda, 0x00, 0x95, 0x30, 0x86, 0x55, 0x6e, 0xc9, - 0x74, 0x32, 0x5b, 0x6a, 0x8e, 0x06, 0x03, 0x8d, 0x3c, 0x41, 0x65, 0x96, 0xcc, 0x3d, 0xe3, 0xc1, - 0x10, 0x55, 0x70, 0x1d, 0x6a, 0xa6, 0xa5, 0x59, 0xba, 0xa9, 0x5b, 0xa8, 0xaa, 0x3e, 0x82, 0x8a, - 0x78, 0xf5, 0x5b, 0x48, 0x44, 0xf5, 0x17, 0x12, 0xd4, 0x92, 0xe4, 0x79, 0x1b, 0x89, 0x9d, 0x4b, - 0x89, 0xe4, 0x3c, 0x2f, 0x24, 0x42, 0xe9, 0x42, 0x22, 0xa8, 0x7f, 0x2e, 0x83, 0x92, 0x26, 0x23, - 0xbe, 0x09, 0xca, 0xd8, 0x9f, 0x4f, 0x23, 0xdb, 0x9d, 0x46, 0xfc, 0xc8, 0xe5, 0xdd, 0x02, 0xa9, - 0x71, 0x55, 0x6f, 0x1a, 0xe1, 0x5b, 0xb0, 0x22, 0xcc, 0xc7, 0x13, 0xdf, 0x89, 0xc4, 0xbb, 0x76, - 0x0b, 0x04, 0xb8, 0xf2, 0x01, 0xd3, 0x61, 0x04, 0xa5, 0x70, 0xee, 0xf1, 0x37, 0x49, 0x84, 0x3d, - 0xe2, 0x75, 0xa8, 0x84, 0xe3, 0x53, 0xea, 0x39, 0xfc, 0x70, 0xaf, 0x91, 0x58, 0xc2, 0x5f, 0x87, - 0xd5, 0x9f, 0xd2, 0xc0, 0xb7, 0xa3, 0xd3, 0x80, 0x86, 0xa7, 0xfe, 0xe4, 0x88, 0x1f, 0xb4, 0x44, - 0x1a, 0x4c, 0x6b, 0x25, 0x4a, 0xfc, 0x41, 0x0c, 0xcb, 0x78, 0x55, 0x38, 0x2f, 0x89, 0xd4, 0x99, - 0xbe, 0x93, 0x70, 0xbb, 0x0d, 0x68, 0x01, 0x27, 0x08, 0x56, 0x39, 0x41, 0x89, 0xac, 0xa6, 0x48, - 0x41, 0x52, 0x83, 0xd5, 0x29, 0x3d, 0x71, 0x22, 0xf7, 0x29, 0xb5, 0xc3, 0x99, 0x33, 0x0d, 0x9b, - 0xb5, 0xe5, 0x8e, 0xde, 0x9e, 0x8f, 0x3f, 0xa3, 0x91, 0x39, 0x73, 0xa6, 0x71, 0x85, 0x36, 0x92, - 0x15, 0x4c, 0x17, 0xe2, 0x6f, 0xc0, 0x5a, 0xea, 0xe2, 0x88, 0x4e, 0x22, 0x27, 0x6c, 0x2a, 0x5b, - 0xa5, 0x6d, 0x4c, 0x52, 0xcf, 0x5d, 0xae, 0xcd, 0x01, 0x39, 0xb7, 0xb0, 0x09, 0x5b, 0xa5, 0x6d, - 0x29, 0x03, 0x72, 0x62, 0xac, 0xbd, 0xad, 0xce, 0xfc, 0xd0, 0x5d, 0x20, 0xb5, 0xf2, 0x9f, 0x49, - 0x25, 0x2b, 0x52, 0x52, 0xa9, 0x8b, 0x98, 0x54, 0x5d, 0x90, 0x4a, 0xd4, 0x19, 0xa9, 0x14, 0x18, - 0x93, 0x6a, 0x08, 0x52, 0x89, 0x3a, 0x26, 0x75, 0x1f, 0x20, 0xa0, 0x21, 0x8d, 0xec, 0x53, 0x16, - 0xf9, 0x55, 0xde, 0x04, 0x6e, 0x5e, 0xd2, 0xc6, 0x76, 0x08, 0x43, 0xed, 0xba, 0xd3, 0x88, 0x28, - 0x41, 0xf2, 0x88, 0xdf, 0x03, 0x25, 0xcd, 0xb5, 0xe6, 0x1a, 0x4f, 0xbe, 0x4c, 0xa1, 0xde, 0x03, - 0x25, 0x5d, 0x95, 0x2f, 0xe5, 0x2a, 0x94, 0x9e, 0xe8, 0x26, 0x92, 0x70, 0x05, 0x8a, 0xc6, 0x10, - 0x15, 0xb3, 0x72, 0x2e, 0x6d, 0xc8, 0xbf, 0xfc, 0x7d, 0x4b, 0x6a, 0x57, 0xa1, 0xcc, 0x79, 0xb7, - 0xeb, 0x00, 0xd9, 0xb1, 0xab, 0x7f, 0x97, 0x61, 0x95, 0x1f, 0x71, 0x96, 0xd2, 0x21, 0x60, 0x6e, - 0xa3, 0x81, 0xbd, 0xb4, 0x93, 0x46, 0x5b, 0xff, 0xe7, 0xcb, 0x4d, 0x6d, 0x61, 0x32, 0x98, 0x05, - 0xbe, 0x47, 0xa3, 0x53, 0x3a, 0x0f, 0x17, 0x1f, 0x3d, 0xff, 0x88, 0x4e, 0xee, 0xa4, 0x0d, 0x7a, - 0xa7, 0x23, 0xdc, 0x65, 0x3b, 0x46, 0xe3, 0x25, 0xcd, 0xff, 0x9b, 0xf3, 0x37, 0x17, 0x37, 0x25, - 0xb2, 0x98, 0x28, 0x69, 0x0e, 0xb3, 0x62, 0x17, 0x96, 0xb8, 0xd8, 0xb9, 0x70, 0x49, 0xe5, 0xbd, - 0x85, 0x8c, 0x7a, 0x0b, 0x95, 0xf2, 0x4d, 0x40, 0x29, 0x8b, 0x43, 0x8e, 0x4d, 0x92, 0x2d, 0xcd, - 0x41, 0xe1, 0x82, 0x43, 0xd3, 0xb7, 0x25, 0x50, 0x51, 0x2c, 0x69, 0x0d, 0x25, 0xd0, 0xf7, 0xa1, - 0x31, 0x9e, 0x87, 0x91, 0xef, 0xd9, 0xbc, 0xd5, 0x85, 0x4d, 0xc4, 0x71, 0x75, 0xa1, 0x3c, 0xe0, - 0xba, 0x3d, 0xb9, 0x26, 0xa1, 0xe2, 0x9e, 0x5c, 0xab, 0xa0, 0xea, 0x9e, 0x5c, 0x53, 0x10, 0xec, - 0xc9, 0xb5, 0x3a, 0x6a, 0xec, 0xc9, 0xb5, 0x35, 0x84, 0x48, 0xd6, 0xea, 0xc8, 0x52, 0x8b, 0x21, - 0xcb, 0xb5, 0x4d, 0x96, 0xeb, 0x6a, 0x31, 0x8f, 0xef, 0x03, 0x64, 0x31, 0x60, 0x47, 0xef, 0x1f, - 0x1f, 0x87, 0x54, 0xf4, 0xcf, 0x6b, 0x24, 0x96, 0x98, 0x7e, 0x42, 0xa7, 0x27, 0xd1, 0x29, 0x3f, - 0xb5, 0x06, 0x89, 0x25, 0x75, 0x0e, 0x38, 0x9f, 0xb1, 0xfc, 0xb3, 0xff, 0x06, 0x9f, 0xf0, 0xfb, - 0xa0, 0xa4, 0x39, 0xc9, 0xdf, 0x95, 0x1b, 0x03, 0xf3, 0x3e, 0xe3, 0x31, 0x30, 0x5b, 0xa0, 0x4e, - 0x61, 0x4d, 0x4c, 0x0b, 0x59, 0xa5, 0xa4, 0x69, 0x25, 0x5d, 0x92, 0x56, 0xc5, 0x2c, 0xad, 0x3e, - 0x82, 0x6a, 0x72, 0x38, 0x62, 0x20, 0x7a, 0xf7, 0xb2, 0xb9, 0x86, 0x23, 0x48, 0x82, 0x54, 0x43, - 0x58, 0x5b, 0xb2, 0xe1, 0x16, 0xc0, 0xa1, 0x3f, 0x9f, 0x1e, 0x39, 0xf1, 0x4c, 0x2d, 0x6d, 0x97, - 0xc9, 0x82, 0x86, 0xf1, 0x99, 0xf8, 0x9f, 0xd3, 0x20, 0x49, 0x73, 0x2e, 0x30, 0xed, 0x7c, 0x36, - 0xa3, 0x41, 0x9c, 0xe8, 0x42, 0xc8, 0xb8, 0xcb, 0x0b, 0xdc, 0xd5, 0x09, 0x5c, 0x5f, 0xda, 0x24, - 0x0f, 0x6e, 0xae, 0x2d, 0x15, 0x97, 0xda, 0x12, 0xfe, 0xf8, 0x62, 0x5c, 0xdf, 0x5d, 0x9e, 0x12, - 0x53, 0x7f, 0x8b, 0x21, 0xfd, 0x8b, 0x0c, 0x8d, 0x4f, 0xe7, 0x34, 0x38, 0x4b, 0x86, 0x5f, 0x7c, - 0x17, 0x2a, 0x61, 0xe4, 0x44, 0xf3, 0x30, 0x1e, 0x9f, 0x5a, 0x99, 0x9f, 0x1c, 0x70, 0xc7, 0xe4, - 0x28, 0x12, 0xa3, 0xf1, 0x0f, 0x01, 0x28, 0x9b, 0x86, 0x6d, 0x3e, 0x7a, 0x5d, 0xb8, 0x1f, 0xe4, - 0xd7, 0xf2, 0xb9, 0x99, 0x0f, 0x5e, 0x0a, 0x4d, 0x1e, 0x59, 0x3c, 0xb8, 0xc0, 0xa3, 0xa4, 0x10, - 0x21, 0xe0, 0x1d, 0xc6, 0x27, 0x70, 0xa7, 0x27, 0x3c, 0x4c, 0xb9, 0x2a, 0x36, 0xb9, 0xbe, 0xeb, - 0x44, 0xce, 0x6e, 0x81, 0xc4, 0x28, 0x86, 0x7f, 0x4a, 0xc7, 0x91, 0x1f, 0xf0, 0x36, 0x95, 0xc3, - 0x1f, 0x70, 0x7d, 0x82, 0x17, 0x28, 0xee, 0x7f, 0xec, 0x4c, 0x9c, 0x80, 0x7f, 0xa3, 0xf3, 0xfe, - 0xb9, 0x3e, 0xf5, 0xcf, 0x25, 0x86, 0xf7, 0x9c, 0x28, 0x70, 0x9f, 0xf1, 0x1e, 0x97, 0xc3, 0x0f, - 0xb8, 0x3e, 0xc1, 0x0b, 0x14, 0xde, 0x80, 0xda, 0xe7, 0x4e, 0x30, 0x75, 0xa7, 0x27, 0xa2, 0x0f, - 0x29, 0x24, 0x95, 0xd9, 0x8e, 0xdd, 0xe9, 0xb1, 0x2f, 0x3e, 0xc3, 0x0a, 0x11, 0x82, 0xfa, 0x01, - 0x54, 0x44, 0x6c, 0xd9, 0x27, 0x44, 0x27, 0x64, 0x48, 0xc4, 0xa4, 0x68, 0x8e, 0x3a, 0x1d, 0xdd, - 0x34, 0x91, 0x24, 0xbe, 0x27, 0xea, 0x6f, 0x24, 0x50, 0xd2, 0x40, 0xb2, 0x11, 0xd0, 0x18, 0x1a, - 0xba, 0x80, 0x5a, 0xbd, 0x81, 0x3e, 0x1c, 0x59, 0x48, 0x62, 0xf3, 0x60, 0x47, 0x33, 0x3a, 0x7a, - 0x5f, 0xef, 0x8a, 0xb9, 0x52, 0xff, 0x91, 0xde, 0x19, 0x59, 0xbd, 0xa1, 0x81, 0x4a, 0xcc, 0xd8, - 0xd6, 0xba, 0x76, 0x57, 0xb3, 0x34, 0x24, 0x33, 0xa9, 0xc7, 0x46, 0x51, 0x43, 0xeb, 0xa3, 0x32, - 0x5e, 0x83, 0x95, 0x91, 0xa1, 0x1d, 0x68, 0xbd, 0xbe, 0xd6, 0xee, 0xeb, 0xa8, 0xc2, 0xd6, 0x1a, - 0x43, 0xcb, 0x7e, 0x30, 0x1c, 0x19, 0x5d, 0x54, 0x65, 0x33, 0x29, 0x13, 0xb5, 0x4e, 0x47, 0xdf, - 0xb7, 0x38, 0xa4, 0x16, 0x7f, 0xe7, 0x2a, 0x20, 0xb3, 0xf1, 0x5a, 0xd5, 0x01, 0xb2, 0x13, 0xca, - 0x4f, 0xef, 0xca, 0x55, 0xd3, 0xde, 0xc5, 0x9e, 0xa1, 0xfe, 0x5c, 0x02, 0xc8, 0x4e, 0x0e, 0xdf, - 0xcd, 0xae, 0x43, 0x62, 0xf2, 0x5c, 0x5f, 0x3e, 0xe0, 0xcb, 0x2f, 0x45, 0x3f, 0xc8, 0x5d, 0x6e, - 0x8a, 0xcb, 0x4d, 0x40, 0x2c, 0xfd, 0x77, 0x57, 0x1c, 0x1b, 0xea, 0x8b, 0xfe, 0x59, 0x73, 0x14, - 0x57, 0x02, 0xce, 0x43, 0x21, 0xb1, 0xf4, 0xbf, 0x8f, 0xb5, 0xbf, 0x92, 0x60, 0x6d, 0x89, 0xc6, - 0x95, 0x2f, 0xc9, 0x35, 0xd2, 0xe2, 0x1b, 0x34, 0xd2, 0xc2, 0x42, 0xd5, 0xbf, 0x09, 0x19, 0x76, - 0x78, 0x69, 0xfa, 0x5f, 0x7e, 0xf5, 0x7a, 0x93, 0xc3, 0x6b, 0x03, 0x64, 0x55, 0x81, 0xbf, 0x0b, - 0x95, 0xdc, 0xdf, 0x88, 0xf5, 0xe5, 0xda, 0x89, 0xff, 0x47, 0x08, 0xc2, 0x31, 0x56, 0xfd, 0x9d, - 0x04, 0xf5, 0x45, 0xf3, 0x95, 0x41, 0xf9, 0xef, 0x6f, 0xca, 0xed, 0x5c, 0x52, 0x88, 0x2f, 0xc3, - 0x7b, 0x57, 0xc5, 0x91, 0x5f, 0x69, 0x2e, 0xe4, 0xc5, 0xed, 0x3f, 0x16, 0x01, 0xb2, 0xff, 0x00, - 0xf8, 0x1a, 0x34, 0xe2, 0xa1, 0xd0, 0xee, 0x68, 0x23, 0x93, 0x15, 0xe4, 0x06, 0xac, 0x13, 0x7d, - 0xbf, 0xdf, 0xeb, 0x68, 0xa6, 0xdd, 0xed, 0x75, 0x6d, 0x56, 0x37, 0x03, 0xcd, 0xea, 0xec, 0x22, - 0x09, 0x7f, 0x0d, 0xae, 0x59, 0xc3, 0xa1, 0x3d, 0xd0, 0x8c, 0x27, 0x76, 0xa7, 0x3f, 0x32, 0x2d, - 0x9d, 0x98, 0xa8, 0x98, 0xab, 0xcc, 0x12, 0x73, 0xd0, 0x33, 0x1e, 0xea, 0x26, 0x2b, 0x5b, 0x9b, - 0x68, 0x96, 0x6e, 0xf7, 0x7b, 0x83, 0x9e, 0xa5, 0x77, 0x91, 0x8c, 0x9b, 0x70, 0x83, 0xe8, 0x9f, - 0x8e, 0x74, 0xd3, 0xca, 0x5b, 0xca, 0xac, 0x42, 0x7b, 0x86, 0x69, 0xb1, 0xea, 0x17, 0x5a, 0x54, - 0xc1, 0xef, 0xc0, 0x75, 0x53, 0x27, 0x07, 0xbd, 0x8e, 0x6e, 0x2f, 0x56, 0x77, 0x15, 0xdf, 0x00, - 0x64, 0x99, 0xdd, 0x76, 0x4e, 0x5b, 0x63, 0x34, 0x18, 0xbb, 0xf6, 0xc8, 0x7c, 0x82, 0x14, 0xf6, - 0xaa, 0x4e, 0x8f, 0x74, 0x46, 0x3d, 0xcb, 0x6e, 0x13, 0x5d, 0x7b, 0xa4, 0x13, 0x7b, 0xb8, 0xaf, - 0x1b, 0x08, 0xf0, 0x3a, 0xe0, 0x81, 0x6e, 0xed, 0x0e, 0xc5, 0xde, 0xb4, 0x7e, 0x7f, 0xf8, 0x58, - 0xef, 0xa2, 0x15, 0x8c, 0xa0, 0x6e, 0xe9, 0x86, 0x66, 0x58, 0x31, 0x81, 0x7a, 0xfb, 0xfb, 0x2f, - 0x5e, 0xb5, 0x0a, 0x5f, 0xbc, 0x6a, 0x15, 0xbe, 0x7a, 0xd5, 0x92, 0x7e, 0x76, 0xde, 0x92, 0xfe, - 0x70, 0xde, 0x92, 0x9e, 0x9f, 0xb7, 0xa4, 0x17, 0xe7, 0x2d, 0xe9, 0x6f, 0xe7, 0x2d, 0xe9, 0xcb, - 0xf3, 0x56, 0xe1, 0xab, 0xf3, 0x96, 0xf4, 0xeb, 0xd7, 0xad, 0xc2, 0x8b, 0xd7, 0xad, 0xc2, 0x17, - 0xaf, 0x5b, 0x85, 0x1f, 0x57, 0xf9, 0x1f, 0xb2, 0xd9, 0xe1, 0x61, 0x85, 0xff, 0xeb, 0xfa, 0xe8, - 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x11, 0x1f, 0x8b, 0x33, 0x13, 0x00, 0x00, + 0xb8, 0xa7, 0x5e, 0x5a, 0x14, 0x3d, 0xf5, 0xd2, 0x4b, 0xd1, 0x5b, 0x2f, 0x05, 0x8a, 0xfe, 0x1f, + 0x01, 0x7a, 0xc9, 0x71, 0xdb, 0x43, 0xd0, 0x38, 0x97, 0x3d, 0x2e, 0x8a, 0x9e, 0x7a, 0x2a, 0x66, + 0x86, 0x1f, 0xa2, 0x6c, 0xb7, 0x69, 0x9b, 0x1b, 0xdf, 0x7b, 0xbf, 0x79, 0xfc, 0xcd, 0x9b, 0xf7, + 0x1e, 0xdf, 0x10, 0x56, 0x3c, 0xd7, 0x73, 0x83, 0x9d, 0x59, 0xe0, 0x47, 0x3e, 0xae, 0x8d, 0xfd, + 0x20, 0xa2, 0xcf, 0x66, 0x87, 0x1b, 0xdf, 0x3e, 0x71, 0xa3, 0xd3, 0xf9, 0xe1, 0xce, 0xd8, 0xf7, + 0x6e, 0x9f, 0xf8, 0x27, 0xfe, 0x6d, 0x0e, 0x38, 0x9c, 0x1f, 0x73, 0x89, 0x0b, 0xfc, 0x49, 0x2c, + 0x54, 0xff, 0x54, 0x84, 0xfa, 0xe3, 0xc0, 0x8d, 0x28, 0xa1, 0x3f, 0x99, 0xd3, 0x30, 0xc2, 0xfb, + 0x00, 0x91, 0xeb, 0xd1, 0x90, 0x06, 0x2e, 0x0d, 0x9b, 0xd2, 0x56, 0x69, 0x7b, 0xe5, 0xa3, 0x1b, + 0x3b, 0x89, 0xfb, 0x1d, 0xcb, 0xf5, 0xa8, 0xc9, 0x6d, 0xed, 0x8d, 0xe7, 0x2f, 0x37, 0x0b, 0x7f, + 0x7d, 0xb9, 0x89, 0xf7, 0x03, 0xea, 0x4c, 0x26, 0xfe, 0xd8, 0x4a, 0xd7, 0x91, 0x05, 0x1f, 0xf8, + 0x13, 0xa8, 0x98, 0xfe, 0x3c, 0x18, 0xd3, 0x66, 0x71, 0x4b, 0xda, 0x5e, 0xfd, 0xe8, 0x66, 0xe6, + 0x6d, 0xf1, 0xcd, 0x3b, 0x02, 0xa4, 0x4f, 0xe7, 0x1e, 0x89, 0x17, 0xe0, 0x7b, 0x50, 0xf3, 0x68, + 0xe4, 0x1c, 0x39, 0x91, 0xd3, 0x2c, 0x71, 0x2a, 0xcd, 0x6c, 0xf1, 0x80, 0x46, 0x81, 0x3b, 0x1e, + 0xc4, 0xf6, 0xb6, 0xfc, 0xfc, 0xe5, 0xa6, 0x44, 0x52, 0x3c, 0xbe, 0x03, 0xef, 0x84, 0x9f, 0xb9, + 0x33, 0x7b, 0xe2, 0x1c, 0xd2, 0x89, 0xfd, 0xd4, 0x99, 0xb8, 0x47, 0x4e, 0xe4, 0xfa, 0xd3, 0xe6, + 0x97, 0xd5, 0x2d, 0x69, 0xbb, 0x46, 0xae, 0x33, 0x6b, 0x9f, 0x19, 0x0f, 0x52, 0x9b, 0xba, 0x09, + 0x90, 0xd1, 0xc0, 0x55, 0x28, 0x69, 0xfb, 0x3d, 0x54, 0xc0, 0x35, 0x90, 0xc9, 0xa8, 0xaf, 0x23, + 0x49, 0x5d, 0x83, 0x46, 0x4c, 0x3a, 0x9c, 0xf9, 0xd3, 0x90, 0xaa, 0xf7, 0xa0, 0xae, 0x07, 0x81, + 0x1f, 0x74, 0x69, 0xe4, 0xb8, 0x93, 0x10, 0xdf, 0x82, 0x72, 0xc7, 0x99, 0x87, 0xb4, 0x29, 0xf1, + 0xcd, 0x2e, 0x84, 0x8e, 0xc3, 0xb8, 0x8d, 0x08, 0x88, 0xfa, 0x0f, 0x09, 0x20, 0x0b, 0x28, 0xd6, + 0xa0, 0xc2, 0xc9, 0x26, 0x61, 0xbf, 0x9e, 0xad, 0xe5, 0x3c, 0xf7, 0x1d, 0x37, 0x68, 0xdf, 0x88, + 0xa3, 0x5e, 0xe7, 0x2a, 0xed, 0xc8, 0x99, 0x45, 0x34, 0x20, 0xf1, 0x42, 0xfc, 0x1d, 0xa8, 0x86, + 0x8e, 0x37, 0x9b, 0xd0, 0xb0, 0x59, 0xe4, 0x3e, 0x50, 0xe6, 0xc3, 0xe4, 0x06, 0x1e, 0xa7, 0x02, + 0x49, 0x60, 0xf8, 0x2e, 0x28, 0xf4, 0x19, 0xf5, 0x66, 0x13, 0x27, 0x08, 0xe3, 0x18, 0xe3, 0x05, + 0xce, 0xb1, 0x29, 0x5e, 0x95, 0x41, 0xf1, 0x27, 0x00, 0xa7, 0x6e, 0x18, 0xf9, 0x27, 0x81, 0xe3, + 0x85, 0x4d, 0x79, 0x99, 0xf0, 0x6e, 0x62, 0x8b, 0x57, 0x2e, 0x80, 0xd5, 0xef, 0x81, 0x92, 0xee, + 0x07, 0x63, 0x90, 0xa7, 0x8e, 0x27, 0xc2, 0x55, 0x27, 0xfc, 0x19, 0xdf, 0x80, 0xf2, 0x53, 0x67, + 0x32, 0x17, 0x09, 0x53, 0x27, 0x42, 0x50, 0x35, 0xa8, 0x88, 0x2d, 0xe0, 0x9b, 0x50, 0xe7, 0xf9, + 0x15, 0x39, 0xde, 0xcc, 0xf6, 0x42, 0x0e, 0x2b, 0x91, 0x95, 0x54, 0x37, 0x08, 0x33, 0x17, 0xcc, + 0xaf, 0x94, 0xb8, 0xf8, 0x6d, 0x11, 0x56, 0xf3, 0x69, 0x83, 0x3f, 0x06, 0x39, 0x3a, 0x9b, 0x25, + 0xc7, 0xf5, 0xc1, 0x55, 0xe9, 0x15, 0x8b, 0xd6, 0xd9, 0x8c, 0x12, 0xbe, 0x00, 0x7f, 0x0b, 0xb0, + 0xc7, 0x75, 0xf6, 0xb1, 0xe3, 0xb9, 0x93, 0x33, 0x9b, 0x6f, 0x83, 0x51, 0x51, 0x08, 0x12, 0x96, + 0x07, 0xdc, 0x60, 0xb0, 0x2d, 0x61, 0x90, 0x4f, 0xe9, 0x64, 0xd6, 0x94, 0xb9, 0x9d, 0x3f, 0x33, + 0xdd, 0x7c, 0xea, 0x46, 0xcd, 0xb2, 0xd0, 0xb1, 0x67, 0xf5, 0x0c, 0x20, 0x7b, 0x13, 0x5e, 0x81, + 0xea, 0xc8, 0x78, 0x64, 0x0c, 0x1f, 0x1b, 0xa8, 0xc0, 0x84, 0xce, 0x70, 0x64, 0x58, 0x3a, 0x41, + 0x12, 0x56, 0xa0, 0xfc, 0x50, 0x1b, 0x3d, 0xd4, 0x51, 0x11, 0x37, 0x40, 0xd9, 0xed, 0x99, 0xd6, + 0xf0, 0x21, 0xd1, 0x06, 0xa8, 0x84, 0x31, 0xac, 0x72, 0x4b, 0xa6, 0x93, 0xd9, 0x52, 0x73, 0x34, + 0x18, 0x68, 0xe4, 0x09, 0x2a, 0xb3, 0x64, 0xee, 0x19, 0x0f, 0x86, 0xa8, 0x82, 0xeb, 0x50, 0x33, + 0x2d, 0xcd, 0xd2, 0x4d, 0xdd, 0x42, 0x55, 0xf5, 0x11, 0x54, 0xc4, 0xab, 0xdf, 0x42, 0x22, 0xaa, + 0xbf, 0x90, 0xa0, 0x96, 0x24, 0xcf, 0xdb, 0x48, 0xec, 0x5c, 0x4a, 0x24, 0xe7, 0x79, 0x21, 0x11, + 0x4a, 0x17, 0x12, 0x41, 0xfd, 0x73, 0x19, 0x94, 0x34, 0x19, 0xf1, 0xfb, 0xa0, 0x8c, 0xfd, 0xf9, + 0x34, 0xb2, 0xdd, 0x69, 0xc4, 0x8f, 0x5c, 0xde, 0x2d, 0x90, 0x1a, 0x57, 0xf5, 0xa6, 0x11, 0xbe, + 0x09, 0x2b, 0xc2, 0x7c, 0x3c, 0xf1, 0x9d, 0x48, 0xbc, 0x6b, 0xb7, 0x40, 0x80, 0x2b, 0x1f, 0x30, + 0x1d, 0x46, 0x50, 0x0a, 0xe7, 0x1e, 0x7f, 0x93, 0x44, 0xd8, 0x23, 0x5e, 0x87, 0x4a, 0x38, 0x3e, + 0xa5, 0x9e, 0xc3, 0x0f, 0xf7, 0x1a, 0x89, 0x25, 0xfc, 0x75, 0x58, 0xfd, 0x29, 0x0d, 0x7c, 0x3b, + 0x3a, 0x0d, 0x68, 0x78, 0xea, 0x4f, 0x8e, 0xf8, 0x41, 0x4b, 0xa4, 0xc1, 0xb4, 0x56, 0xa2, 0xc4, + 0x1f, 0xc6, 0xb0, 0x8c, 0x57, 0x85, 0xf3, 0x92, 0x48, 0x9d, 0xe9, 0x3b, 0x09, 0xb7, 0x5b, 0x80, + 0x16, 0x70, 0x82, 0x60, 0x95, 0x13, 0x94, 0xc8, 0x6a, 0x8a, 0x14, 0x24, 0x35, 0x58, 0x9d, 0xd2, + 0x13, 0x27, 0x72, 0x9f, 0x52, 0x3b, 0x9c, 0x39, 0xd3, 0xb0, 0x59, 0x5b, 0x6e, 0xe4, 0xed, 0xf9, + 0xf8, 0x33, 0x1a, 0x99, 0x33, 0x67, 0x1a, 0x57, 0x68, 0x23, 0x59, 0xc1, 0x74, 0x21, 0xfe, 0x06, + 0xac, 0xa5, 0x2e, 0x8e, 0xe8, 0x24, 0x72, 0xc2, 0xa6, 0xb2, 0x55, 0xda, 0xc6, 0x24, 0xf5, 0xdc, + 0xe5, 0xda, 0x1c, 0x90, 0x73, 0x0b, 0x9b, 0xb0, 0x55, 0xda, 0x96, 0x32, 0x20, 0x27, 0xc6, 0xda, + 0xdb, 0xea, 0xcc, 0x0f, 0xdd, 0x05, 0x52, 0x2b, 0xff, 0x99, 0x54, 0xb2, 0x22, 0x25, 0x95, 0xba, + 0x88, 0x49, 0xd5, 0x05, 0xa9, 0x44, 0x9d, 0x91, 0x4a, 0x81, 0x31, 0xa9, 0x86, 0x20, 0x95, 0xa8, + 0x63, 0x52, 0xf7, 0x01, 0x02, 0x1a, 0xd2, 0xc8, 0x3e, 0x65, 0x91, 0x5f, 0xe5, 0x4d, 0xe0, 0xfd, + 0x4b, 0xda, 0xd8, 0x0e, 0x61, 0xa8, 0x5d, 0x77, 0x1a, 0x11, 0x25, 0x48, 0x1e, 0xf1, 0x7b, 0xa0, + 0xa4, 0xb9, 0xd6, 0x5c, 0xe3, 0xc9, 0x97, 0x29, 0xd4, 0x7b, 0xa0, 0xa4, 0xab, 0xf2, 0xa5, 0x5c, + 0x85, 0xd2, 0x13, 0xdd, 0x44, 0x12, 0xae, 0x40, 0xd1, 0x18, 0xa2, 0x62, 0x56, 0xce, 0xa5, 0x0d, + 0xf9, 0x97, 0xbf, 0x6f, 0x49, 0xed, 0x2a, 0x94, 0x39, 0xef, 0x76, 0x1d, 0x20, 0x3b, 0x76, 0xf5, + 0xef, 0x32, 0xac, 0xf2, 0x23, 0xce, 0x52, 0x3a, 0x04, 0xcc, 0x6d, 0x34, 0xb0, 0x97, 0x76, 0xd2, + 0x68, 0xeb, 0xff, 0x7c, 0xb9, 0xa9, 0x2d, 0x0c, 0x04, 0xb3, 0xc0, 0xf7, 0x68, 0x74, 0x4a, 0xe7, + 0xe1, 0xe2, 0xa3, 0xe7, 0x1f, 0xd1, 0xc9, 0xed, 0xb4, 0x41, 0xef, 0x74, 0x84, 0xbb, 0x6c, 0xc7, + 0x68, 0xbc, 0xa4, 0xf9, 0x7f, 0x73, 0xfe, 0xfd, 0xc5, 0x4d, 0x89, 0x2c, 0x26, 0x4a, 0x9a, 0xc3, + 0xac, 0xd8, 0x85, 0x25, 0x2e, 0x76, 0x2e, 0x5c, 0x52, 0x79, 0x6f, 0x21, 0xa3, 0xde, 0x42, 0xa5, + 0x7c, 0x13, 0x50, 0xca, 0xe2, 0x90, 0x63, 0x93, 0x64, 0x4b, 0x73, 0x50, 0xb8, 0xe0, 0xd0, 0xf4, + 0x6d, 0x09, 0x54, 0x14, 0x4b, 0x5a, 0x43, 0x09, 0xf4, 0x03, 0x68, 0x8c, 0xe7, 0x61, 0xe4, 0x7b, + 0x36, 0x6f, 0x75, 0x61, 0x13, 0x71, 0x5c, 0x5d, 0x28, 0x0f, 0xb8, 0x6e, 0x4f, 0xae, 0x49, 0xa8, + 0xb8, 0x27, 0xd7, 0x2a, 0xa8, 0xba, 0x27, 0xd7, 0x14, 0x04, 0x7b, 0x72, 0xad, 0x8e, 0x1a, 0x7b, + 0x72, 0x6d, 0x0d, 0x21, 0x92, 0xb5, 0x3a, 0xb2, 0xd4, 0x62, 0xc8, 0x72, 0x6d, 0x93, 0xe5, 0xba, + 0x5a, 0xcc, 0xe3, 0xfb, 0x00, 0x59, 0x0c, 0xd8, 0xd1, 0xfb, 0xc7, 0xc7, 0x21, 0x15, 0xfd, 0xf3, + 0x1a, 0x89, 0x25, 0xa6, 0x9f, 0xd0, 0xe9, 0x49, 0x74, 0xca, 0x4f, 0xad, 0x41, 0x62, 0x49, 0x9d, + 0x03, 0xce, 0x67, 0x2c, 0xff, 0xec, 0xbf, 0xc1, 0x27, 0xfc, 0x3e, 0x28, 0x69, 0x4e, 0xf2, 0x77, + 0xe5, 0xa6, 0xbf, 0xbc, 0xcf, 0x78, 0xfa, 0xcb, 0x16, 0xa8, 0x53, 0x58, 0x13, 0xd3, 0x42, 0x56, + 0x29, 0x69, 0x5a, 0x49, 0x97, 0xa4, 0x55, 0x31, 0x4b, 0xab, 0x3b, 0x50, 0x4d, 0x0e, 0x47, 0x0c, + 0x44, 0xef, 0x5e, 0x36, 0xd7, 0x70, 0x04, 0x49, 0x90, 0x6a, 0x08, 0x6b, 0x4b, 0x36, 0xdc, 0x02, + 0x38, 0xf4, 0xe7, 0xd3, 0x23, 0x27, 0x1e, 0xa5, 0xa5, 0xed, 0x32, 0x59, 0xd0, 0x30, 0x3e, 0x13, + 0xff, 0x73, 0x1a, 0x24, 0x69, 0xce, 0x05, 0xa6, 0x9d, 0xcf, 0x66, 0x34, 0x88, 0x13, 0x5d, 0x08, + 0x19, 0x77, 0x79, 0x81, 0xbb, 0x3a, 0x81, 0xeb, 0x4b, 0x9b, 0xe4, 0xc1, 0xcd, 0xb5, 0xa5, 0xe2, + 0x52, 0x5b, 0xc2, 0x1f, 0x5f, 0x8c, 0xeb, 0xbb, 0xcb, 0x53, 0x62, 0xea, 0x6f, 0x31, 0xa4, 0x7f, + 0x91, 0xa1, 0xf1, 0xe9, 0x9c, 0x06, 0x67, 0xc9, 0xf0, 0x8b, 0xef, 0x42, 0x25, 0x8c, 0x9c, 0x68, + 0x1e, 0xc6, 0xe3, 0x53, 0x2b, 0xf3, 0x93, 0x03, 0xee, 0x98, 0x1c, 0x45, 0x62, 0x34, 0xfe, 0x21, + 0x00, 0x65, 0xd3, 0xb0, 0xcd, 0x47, 0xaf, 0x0b, 0xd7, 0x82, 0xfc, 0x5a, 0x3e, 0x37, 0xf3, 0xc1, + 0x4b, 0xa1, 0xc9, 0x23, 0x8b, 0x07, 0x17, 0x78, 0x94, 0x14, 0x22, 0x04, 0xbc, 0xc3, 0xf8, 0x04, + 0xee, 0xf4, 0x84, 0x87, 0x29, 0x57, 0xc5, 0x26, 0xd7, 0x77, 0x9d, 0xc8, 0xd9, 0x2d, 0x90, 0x18, + 0xc5, 0xf0, 0x4f, 0xe9, 0x38, 0xf2, 0x03, 0xde, 0xa6, 0x72, 0xf8, 0x03, 0xae, 0x4f, 0xf0, 0x02, + 0xc5, 0xfd, 0x8f, 0x9d, 0x89, 0x13, 0xf0, 0x6f, 0x74, 0xde, 0x3f, 0xd7, 0xa7, 0xfe, 0xb9, 0xc4, + 0xf0, 0x9e, 0x13, 0x05, 0xee, 0x33, 0xde, 0xe3, 0x72, 0xf8, 0x01, 0xd7, 0x27, 0x78, 0x81, 0xc2, + 0x1b, 0x50, 0xfb, 0xdc, 0x09, 0xa6, 0xee, 0xf4, 0x44, 0xf4, 0x21, 0x85, 0xa4, 0x32, 0xdb, 0xb1, + 0x3b, 0x3d, 0xf6, 0xc5, 0x67, 0x58, 0x21, 0x42, 0x50, 0x3f, 0x84, 0x8a, 0x88, 0x2d, 0xfb, 0x84, + 0xe8, 0x84, 0x0c, 0x89, 0x98, 0x14, 0xcd, 0x51, 0xa7, 0xa3, 0x9b, 0x26, 0x92, 0xc4, 0xf7, 0x44, + 0xfd, 0x8d, 0x04, 0x4a, 0x1a, 0x48, 0x36, 0x02, 0x1a, 0x43, 0x43, 0x17, 0x50, 0xab, 0x37, 0xd0, + 0x87, 0x23, 0x0b, 0x49, 0x6c, 0x1e, 0xec, 0x68, 0x46, 0x47, 0xef, 0xeb, 0x5d, 0x31, 0x57, 0xea, + 0x3f, 0xd2, 0x3b, 0x23, 0xab, 0x37, 0x34, 0x50, 0x89, 0x19, 0xdb, 0x5a, 0xd7, 0xee, 0x6a, 0x96, + 0x86, 0x64, 0x26, 0xf5, 0xd8, 0x28, 0x6a, 0x68, 0x7d, 0x54, 0xc6, 0x6b, 0xb0, 0x32, 0x32, 0xb4, + 0x03, 0xad, 0xd7, 0xd7, 0xda, 0x7d, 0x1d, 0x55, 0xd8, 0x5a, 0x63, 0x68, 0xd9, 0x0f, 0x86, 0x23, + 0xa3, 0x8b, 0xaa, 0x6c, 0x26, 0x65, 0xa2, 0xd6, 0xe9, 0xe8, 0xfb, 0x16, 0x87, 0xd4, 0xe2, 0xef, + 0x5c, 0x05, 0x64, 0x36, 0x5e, 0xab, 0x3a, 0x40, 0x76, 0x42, 0xf9, 0xe9, 0x5d, 0xb9, 0x6a, 0xda, + 0xbb, 0xd8, 0x33, 0xd4, 0x9f, 0x4b, 0x00, 0xd9, 0xc9, 0xe1, 0xbb, 0xd9, 0x75, 0x48, 0x4c, 0x9e, + 0xeb, 0xcb, 0x07, 0x7c, 0xf9, 0xa5, 0xe8, 0x07, 0xb9, 0xcb, 0x4d, 0x71, 0xb9, 0x09, 0x88, 0xa5, + 0xff, 0xee, 0x8a, 0x63, 0x43, 0x7d, 0xd1, 0x3f, 0x6b, 0x8e, 0xe2, 0x4a, 0xc0, 0x79, 0x28, 0x24, + 0x96, 0xfe, 0xf7, 0xb1, 0xf6, 0x57, 0x12, 0xac, 0x2d, 0xd1, 0xb8, 0xf2, 0x25, 0xb9, 0x46, 0x5a, + 0x7c, 0x83, 0x46, 0x5a, 0x58, 0xa8, 0xfa, 0x37, 0x21, 0xc3, 0x0e, 0x2f, 0x4d, 0xff, 0xcb, 0xaf, + 0x5e, 0x6f, 0x72, 0x78, 0x6d, 0x80, 0xac, 0x2a, 0xf0, 0x77, 0xa1, 0x92, 0xfb, 0x09, 0xb1, 0xbe, + 0x5c, 0x3b, 0xf1, 0x6f, 0x08, 0x41, 0x38, 0xc6, 0xaa, 0xbf, 0x93, 0xa0, 0xbe, 0x68, 0xbe, 0x32, + 0x28, 0xff, 0xfd, 0x4d, 0xb9, 0x9d, 0x4b, 0x0a, 0xf1, 0x65, 0x78, 0xef, 0xaa, 0x38, 0xf2, 0x2b, + 0xcd, 0x85, 0xbc, 0xb8, 0xf5, 0xc7, 0x22, 0x40, 0xf6, 0x1f, 0x00, 0x5f, 0x83, 0x46, 0x3c, 0x14, + 0xda, 0x1d, 0x6d, 0x64, 0xb2, 0x82, 0xdc, 0x80, 0x75, 0xa2, 0xef, 0xf7, 0x7b, 0x1d, 0xcd, 0xb4, + 0xbb, 0xbd, 0xae, 0xcd, 0xea, 0x66, 0xa0, 0x59, 0x9d, 0x5d, 0x24, 0xe1, 0x77, 0xe0, 0x9a, 0x35, + 0x1c, 0xda, 0x03, 0xcd, 0x78, 0x62, 0x77, 0xfa, 0x23, 0xd3, 0xd2, 0x89, 0x89, 0x8a, 0xb9, 0xca, + 0x2c, 0x31, 0x07, 0x3d, 0xe3, 0xa1, 0x6e, 0xb2, 0xb2, 0xb5, 0x89, 0x66, 0xe9, 0x76, 0xbf, 0x37, + 0xe8, 0x59, 0x7a, 0x17, 0xc9, 0xb8, 0x09, 0x37, 0x88, 0xfe, 0xe9, 0x48, 0x37, 0xad, 0xbc, 0xa5, + 0xcc, 0x2a, 0xb4, 0x67, 0x98, 0x16, 0xab, 0x7e, 0xa1, 0x45, 0x15, 0xfc, 0x35, 0xb8, 0x6e, 0xea, + 0xe4, 0xa0, 0xd7, 0xd1, 0xed, 0xc5, 0xea, 0xae, 0xe2, 0x1b, 0x80, 0x2c, 0xb3, 0xdb, 0xce, 0x69, + 0x6b, 0x8c, 0x06, 0x63, 0xd7, 0x1e, 0x99, 0x4f, 0x90, 0xc2, 0x5e, 0xd5, 0xe9, 0x91, 0xce, 0xa8, + 0x67, 0xd9, 0x6d, 0xa2, 0x6b, 0x8f, 0x74, 0x62, 0x0f, 0xf7, 0x75, 0x03, 0x01, 0x5e, 0x07, 0x3c, + 0xd0, 0xad, 0xdd, 0xa1, 0xd8, 0x9b, 0xd6, 0xef, 0x0f, 0x1f, 0xeb, 0x5d, 0xb4, 0x82, 0x11, 0xd4, + 0x2d, 0xdd, 0xd0, 0x0c, 0x2b, 0x26, 0x50, 0x6f, 0x7f, 0xff, 0xc5, 0xab, 0x56, 0xe1, 0x8b, 0x57, + 0xad, 0xc2, 0x57, 0xaf, 0x5a, 0xd2, 0xcf, 0xce, 0x5b, 0xd2, 0x1f, 0xce, 0x5b, 0xd2, 0xf3, 0xf3, + 0x96, 0xf4, 0xe2, 0xbc, 0x25, 0xfd, 0xed, 0xbc, 0x25, 0x7d, 0x79, 0xde, 0x2a, 0x7c, 0x75, 0xde, + 0x92, 0x7e, 0xfd, 0xba, 0x55, 0x78, 0xf1, 0xba, 0x55, 0xf8, 0xe2, 0x75, 0xab, 0xf0, 0xe3, 0x2a, + 0xff, 0x31, 0x36, 0x3b, 0x3c, 0xac, 0xf0, 0x5f, 0x5c, 0x77, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, + 0xc8, 0xf0, 0x66, 0xfb, 0x2a, 0x13, 0x00, 0x00, } func (x ErrorCause) String() string { @@ -2125,7 +2125,7 @@ func (this *WriteRequest) Equal(that interface{}) bool { return false } } - if this.SkipLabelNameValidation != that1.SkipLabelNameValidation { + if this.SkipLabelValidation != that1.SkipLabelValidation { return false } return true @@ -3202,7 +3202,7 @@ func (this *WriteRequest) GoString() string { if this.Metadata != nil { s = append(s, "Metadata: "+fmt.Sprintf("%#v", this.Metadata)+",\n") } - s = append(s, "SkipLabelNameValidation: "+fmt.Sprintf("%#v", this.SkipLabelNameValidation)+",\n") + s = append(s, "SkipLabelValidation: "+fmt.Sprintf("%#v", this.SkipLabelValidation)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -3665,9 +3665,9 @@ func (m *WriteRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.SkipLabelNameValidation { + if m.SkipLabelValidation { i-- - if m.SkipLabelNameValidation { + if m.SkipLabelValidation { dAtA[i] = 1 } else { dAtA[i] = 0 @@ -5059,7 +5059,7 @@ func (m *WriteRequest) Size() (n int) { n += 1 + l + sovMimir(uint64(l)) } } - if m.SkipLabelNameValidation { + if m.SkipLabelValidation { n += 3 } return n @@ -5682,7 +5682,7 @@ func (this *WriteRequest) String() string { `Timeseries:` + fmt.Sprintf("%v", this.Timeseries) + `,`, `Source:` + fmt.Sprintf("%v", this.Source) + `,`, `Metadata:` + repeatedStringForMetadata + `,`, - `SkipLabelNameValidation:` + fmt.Sprintf("%v", this.SkipLabelNameValidation) + `,`, + `SkipLabelValidation:` + fmt.Sprintf("%v", this.SkipLabelValidation) + `,`, `}`, }, "") return s @@ -6242,7 +6242,7 @@ func (m *WriteRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 1000: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SkipLabelNameValidation", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SkipLabelValidation", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -6259,7 +6259,7 @@ func (m *WriteRequest) Unmarshal(dAtA []byte) error { break } } - m.SkipLabelNameValidation = bool(v != 0) + m.SkipLabelValidation = bool(v != 0) default: iNdEx = preIndex skippy, err := skipMimir(dAtA[iNdEx:]) diff --git a/pkg/mimirpb/mimir.pb.go.expdiff b/pkg/mimirpb/mimir.pb.go.expdiff index bedf903e20b..8d0982e5c43 100644 --- a/pkg/mimirpb/mimir.pb.go.expdiff +++ b/pkg/mimirpb/mimir.pb.go.expdiff @@ -4,8 +4,8 @@ index 8e2109f8ae..1ec0a3ecf9 100644 +++ b/pkg/mimirpb/mimir.pb.go @@ -241,9 +241,6 @@ type WriteRequest struct { Metadata []*MetricMetadata `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty"` - // Skip validation of label names. - SkipLabelNameValidation bool `protobuf:"varint,1000,opt,name=skip_label_name_validation,json=skipLabelNameValidation,proto3" json:"skip_label_name_validation,omitempty"` + // Skip validation of label names and values. + SkipLabelValidation bool `protobuf:"varint,1000,opt,name=skip_label_validation,json=skipLabelValidation,proto3" json:"skip_label_validation,omitempty"` - - // Skip unmarshaling of exemplars. - skipUnmarshalingExemplars bool diff --git a/pkg/mimirpb/mimir.proto b/pkg/mimirpb/mimir.proto index 6a2ec4bd611..bd498791e0a 100644 --- a/pkg/mimirpb/mimir.proto +++ b/pkg/mimirpb/mimir.proto @@ -28,8 +28,8 @@ message WriteRequest { // Mimir-specific fields, using intentionally high field numbers to avoid conflicts with upstream Prometheus. - // Skip validation of label names. - bool skip_label_name_validation = 1000; + // Skip validation of label names and values. + bool skip_label_validation = 1000; } message WriteResponse {} diff --git a/pkg/mimirpb/split.go b/pkg/mimirpb/split.go index 49d5c703fc4..07ac1138d3f 100644 --- a/pkg/mimirpb/split.go +++ b/pkg/mimirpb/split.go @@ -42,8 +42,8 @@ func splitTimeseriesByMaxMarshalSize(req *WriteRequest, reqSize, maxSize int) [] newPartialReq := func() (*WriteRequest, int) { r := &WriteRequest{ - Source: req.Source, - SkipLabelNameValidation: req.SkipLabelNameValidation, + Source: req.Source, + SkipLabelValidation: req.SkipLabelValidation, } return r, r.Size() @@ -106,8 +106,8 @@ func splitMetadataByMaxMarshalSize(req *WriteRequest, reqSize, maxSize int) []*W newPartialReq := func() (*WriteRequest, int) { r := &WriteRequest{ - Source: req.Source, - SkipLabelNameValidation: req.SkipLabelNameValidation, + Source: req.Source, + SkipLabelValidation: req.SkipLabelValidation, } return r, r.Size() } diff --git a/pkg/mimirpb/split_test.go b/pkg/mimirpb/split_test.go index a3e68eda948..18f36d2f685 100644 --- a/pkg/mimirpb/split_test.go +++ b/pkg/mimirpb/split_test.go @@ -16,8 +16,8 @@ import ( func TestSplitWriteRequestByMaxMarshalSize(t *testing.T) { req := &WriteRequest{ - Source: RULE, - SkipLabelNameValidation: true, + Source: RULE, + SkipLabelValidation: true, Timeseries: []PreallocTimeseries{ {TimeSeries: &TimeSeries{ Labels: FromLabelsToLabelAdapters(labels.FromStrings(labels.MetricName, "series_1", "pod", "test-application-123456")), @@ -39,7 +39,7 @@ func TestSplitWriteRequestByMaxMarshalSize(t *testing.T) { // Pre-requisite check: WriteRequest fields are set to non-zero values. require.NotZero(t, req.Source) - require.NotZero(t, req.SkipLabelNameValidation) + require.NotZero(t, req.SkipLabelValidation) require.NotZero(t, req.Timeseries) require.NotZero(t, req.Metadata) @@ -55,21 +55,21 @@ func TestSplitWriteRequestByMaxMarshalSize(t *testing.T) { partials := SplitWriteRequestByMaxMarshalSize(req, req.Size(), limit) assert.Equal(t, []*WriteRequest{ { - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: []PreallocTimeseries{req.Timeseries[0]}, + Source: RULE, + SkipLabelValidation: true, + Timeseries: []PreallocTimeseries{req.Timeseries[0]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: []PreallocTimeseries{req.Timeseries[1]}, + Source: RULE, + SkipLabelValidation: true, + Timeseries: []PreallocTimeseries{req.Timeseries[1]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Metadata: []*MetricMetadata{req.Metadata[0], req.Metadata[1]}, + Source: RULE, + SkipLabelValidation: true, + Metadata: []*MetricMetadata{req.Metadata[0], req.Metadata[1]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Metadata: []*MetricMetadata{req.Metadata[2]}, + Source: RULE, + SkipLabelValidation: true, + Metadata: []*MetricMetadata{req.Metadata[2]}, }, }, partials) @@ -84,25 +84,25 @@ func TestSplitWriteRequestByMaxMarshalSize(t *testing.T) { partials := SplitWriteRequestByMaxMarshalSize(req, req.Size(), limit) assert.Equal(t, []*WriteRequest{ { - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: []PreallocTimeseries{req.Timeseries[0]}, + Source: RULE, + SkipLabelValidation: true, + Timeseries: []PreallocTimeseries{req.Timeseries[0]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: []PreallocTimeseries{req.Timeseries[1]}, + Source: RULE, + SkipLabelValidation: true, + Timeseries: []PreallocTimeseries{req.Timeseries[1]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Metadata: []*MetricMetadata{req.Metadata[0]}, + Source: RULE, + SkipLabelValidation: true, + Metadata: []*MetricMetadata{req.Metadata[0]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Metadata: []*MetricMetadata{req.Metadata[1]}, + Source: RULE, + SkipLabelValidation: true, + Metadata: []*MetricMetadata{req.Metadata[1]}, }, { - Source: RULE, - SkipLabelNameValidation: true, - Metadata: []*MetricMetadata{req.Metadata[2]}, + Source: RULE, + SkipLabelValidation: true, + Metadata: []*MetricMetadata{req.Metadata[2]}, }, }, partials) @@ -135,10 +135,10 @@ func TestSplitWriteRequestByMaxMarshalSize_Fuzzy(t *testing.T) { // Ensure the merge of all partial requests is equal to the original one. merged := &WriteRequest{ - Timeseries: []PreallocTimeseries{}, - Source: partials[0].Source, - Metadata: []*MetricMetadata{}, - SkipLabelNameValidation: partials[0].SkipLabelNameValidation, + Timeseries: []PreallocTimeseries{}, + Source: partials[0].Source, + Metadata: []*MetricMetadata{}, + SkipLabelValidation: partials[0].SkipLabelValidation, } for _, partial := range partials { @@ -166,7 +166,7 @@ func TestSplitWriteRequestByMaxMarshalSize_WriteRequestHasChanged(t *testing.T) // If the fields of WriteRequest have changed, then you will probably need to modify // the SplitWriteRequestByMaxMarshalSize() implementation accordingly! - assert.ElementsMatch(t, []string{"Timeseries", "Source", "Metadata", "SkipLabelNameValidation", "skipUnmarshalingExemplars"}, fieldNames) + assert.ElementsMatch(t, []string{"Timeseries", "Source", "Metadata", "SkipLabelValidation", "skipUnmarshalingExemplars"}, fieldNames) } func BenchmarkSplitWriteRequestByMaxMarshalSize(b *testing.B) { @@ -330,9 +330,9 @@ func generateWriteRequest(numSeries, numLabelsPerSeries, numSamplesPerSeries, nu } return &WriteRequest{ - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: timeseries, - Metadata: metadata, + Source: RULE, + SkipLabelValidation: true, + Timeseries: timeseries, + Metadata: metadata, } } diff --git a/pkg/mimirpb/timeseries.go b/pkg/mimirpb/timeseries.go index 093358009e2..7c2fce85cde 100644 --- a/pkg/mimirpb/timeseries.go +++ b/pkg/mimirpb/timeseries.go @@ -715,10 +715,10 @@ func (p *WriteRequest) ForIndexes(indexes []int, initialMetadataIndex int) *Writ } return &WriteRequest{ - Timeseries: timeseries, - Metadata: metadata, - Source: p.Source, - SkipLabelNameValidation: p.SkipLabelNameValidation, + Timeseries: timeseries, + Metadata: metadata, + Source: p.Source, + SkipLabelValidation: p.SkipLabelValidation, } } diff --git a/pkg/storage/ingest/writer_test.go b/pkg/storage/ingest/writer_test.go index 40f7f4b0b76..1cd9a00810f 100644 --- a/pkg/storage/ingest/writer_test.go +++ b/pkg/storage/ingest/writer_test.go @@ -868,8 +868,8 @@ func TestWriter_WriteSync_HighConcurrencyOnKafkaClientBufferFull(t *testing.T) { func TestMarshalWriteRequestToRecords(t *testing.T) { req := &mimirpb.WriteRequest{ - Source: mimirpb.RULE, - SkipLabelNameValidation: true, + Source: mimirpb.RULE, + SkipLabelValidation: true, Timeseries: []mimirpb.PreallocTimeseries{ mockPreallocTimeseries("series_1"), mockPreallocTimeseries("series_2"), @@ -884,7 +884,7 @@ func TestMarshalWriteRequestToRecords(t *testing.T) { // Pre-requisite check: WriteRequest fields are set to non-zero values. require.NotZero(t, req.Source) - require.NotZero(t, req.SkipLabelNameValidation) + require.NotZero(t, req.SkipLabelValidation) require.NotZero(t, req.Timeseries) require.NotZero(t, req.Metadata) @@ -924,21 +924,21 @@ func TestMarshalWriteRequestToRecords(t *testing.T) { assert.Equal(t, []*mimirpb.WriteRequest{ { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[0], req.Timeseries[1]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[0], req.Timeseries[1]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[2]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[2]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Metadata: []*mimirpb.MetricMetadata{req.Metadata[0], req.Metadata[1]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Metadata: []*mimirpb.MetricMetadata{req.Metadata[0], req.Metadata[1]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Metadata: []*mimirpb.MetricMetadata{req.Metadata[2]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Metadata: []*mimirpb.MetricMetadata{req.Metadata[2]}, }, }, partials) }) @@ -964,29 +964,29 @@ func TestMarshalWriteRequestToRecords(t *testing.T) { assert.Equal(t, []*mimirpb.WriteRequest{ { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[0]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[0]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[1]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[1]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[2]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Timeseries: []mimirpb.PreallocTimeseries{req.Timeseries[2]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Metadata: []*mimirpb.MetricMetadata{req.Metadata[0]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Metadata: []*mimirpb.MetricMetadata{req.Metadata[0]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Metadata: []*mimirpb.MetricMetadata{req.Metadata[1]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Metadata: []*mimirpb.MetricMetadata{req.Metadata[1]}, }, { - Source: mimirpb.RULE, - SkipLabelNameValidation: true, - Metadata: []*mimirpb.MetricMetadata{req.Metadata[2]}, + Source: mimirpb.RULE, + SkipLabelValidation: true, + Metadata: []*mimirpb.MetricMetadata{req.Metadata[2]}, }, }, partials) }) diff --git a/pkg/util/globalerror/user.go b/pkg/util/globalerror/user.go index 6985ee0fea5..ac2ec555420 100644 --- a/pkg/util/globalerror/user.go +++ b/pkg/util/globalerror/user.go @@ -21,6 +21,7 @@ const ( NotReducibleNativeHistogram ID = "not-reducible-native-histogram" InvalidSchemaNativeHistogram ID = "invalid-native-histogram-schema" SeriesInvalidLabel ID = "label-invalid" + SeriesInvalidLabelValue ID = "label-value-invalid" SeriesLabelNameTooLong ID = "label-name-too-long" SeriesLabelValueTooLong ID = "label-value-too-long" SeriesWithDuplicateLabelNames ID = "duplicate-label-names"