diff --git a/CHANGELOG.md b/CHANGELOG.md index bfe8e1f25f4..012c93442c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ * [FEATURE] Ruler: Add experimental support for federated rule groups. A rule group listing tenants in its `source_tenants` field is evaluated against those tenants while the resulting series and alerts are written to the tenant owning the rule group. Enabled with `-ruler.enable-federated-rules` (requires `-tenant-federation.enabled`), and restricted to selected tenants with `-ruler.allowed-federated-tenants` and `-ruler.disallowed-federated-tenants`. #7828 * [FEATURE] Distributor: Add experimental OTLP metrics ingestion over gRPC (`opentelemetry.proto.collector.metrics.v1.MetricsService/Export`) on the gRPC server port. Enable it with `-distributor.otlp.grpc-enabled`. The tenant is read from the `X-Scope-OrgID` gRPC metadata, and the request size is limited by `-server.grpc-max-recv-msg-size-bytes`. #7873 -* [ENHANCEMENT] gRPC: When `-auth.enabled=true`, a gRPC request without the `X-Scope-OrgID` metadata is now rejected with the `UNAUTHENTICATED` status code instead of `UNKNOWN`. #7873 * [ENHANCEMENT] Ruler: Add rule information to query parameters sent to the Query Frontend when `-ruler.frontend-address` is configured, so the Query Frontend query stats logs (`-frontend.enabled-ruler-query-stats`) can identify the evaluated rule. In this mode, the Ruler query stats log (`-ruler.query-stats-enabled`) omits the fetched statistics fields, which are always zero. #6539 +* [ENHANCEMENT] gRPC: When `-auth.enabled=true`, a gRPC request without the `X-Scope-OrgID` metadata is now rejected with the `UNAUTHENTICATED` status code instead of `UNKNOWN`. #7873 +* [ENHANCEMENT] Upgrade promql-engine and Thanos to latest. #7889 * [BUGFIX] Update prometheus alertmanager version to v0.34.1 to apply upstream inhibit rule bug fixes. #7877 * [BUGFIX] Tenant Federation: Fix regex tenant federation not working in single binary mode, and failing with `multiple org IDs present` when a matched tenant ID contains regex metacharacters and also matches other tenants as a regex. #7869 * [BUGFIX] Query Frontend: Fix the data selection time window computed for an instant query sent without a `time` parameter. The default evaluation time was passed to `util.ParseTimeParam` in milliseconds, but that helper formats the default and parses it as seconds, so the value overflowed `UnixNano()` and wrapped to a timestamp decades away from `now`. This made the `data_select_min_time` and `data_select_max_time` query stats wrong, and stopped the `time_window` query attribute of query priority and query rejection from matching such queries correctly. #7880 diff --git a/go.mod b/go.mod index 60a69cc33dd..db463ee688f 100644 --- a/go.mod +++ b/go.mod @@ -69,11 +69,11 @@ require ( // Pinned to main: promql-engine has never cut a tag, so a pseudo-version is the only // option. We need thanosengine.Opts.SelectorBatchSize (-querier.selector-batch-size, // #7763) and the logicalplan API that pkg/distributed_execution builds on. - github.com/thanos-io/promql-engine v0.0.0-20260915065525-1b359e941bde + github.com/thanos-io/promql-engine v0.0.0-20261020165614-7157e606efa6 // Pinned to main: promql-engine's api.RemoteEndpoints gained mint/maxt parameters on // Engines(), and thanos/pkg/query implements that interface. The newest tag (v0.42.4, // 146 commits behind main) predates the change, so downgrading breaks the build. - github.com/thanos-io/thanos v0.42.5-0.20260817064418-8908023d563b + github.com/thanos-io/thanos v0.42.5-0.20261008195948-dd67d9cc81c3 github.com/tjhop/slog-gokit v0.2.2 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5 diff --git a/go.sum b/go.sum index 2f14aabe0fb..5ec89d27c79 100644 --- a/go.sum +++ b/go.sum @@ -296,8 +296,8 @@ github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84= github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/efficientgo/core v1.0.0-rc.3 h1:X6CdgycYWDcbYiJr1H1+lQGzx13o7bq3EUkbB9DsSPc= github.com/efficientgo/core v1.0.0-rc.3/go.mod h1:FfGdkzWarkuzOlY04VY+bGfb1lWrjaL6x/GLcQ4vJps= -github.com/efficientgo/e2e v0.14.1-0.20260204162810-8c75b1e33ef9 h1:ubLDovsdOv7n27IV6J+ITPW+VjkbJs/DfAbVqfIFkzQ= -github.com/efficientgo/e2e v0.14.1-0.20260204162810-8c75b1e33ef9/go.mod h1:uQC+38Vj8iASSYXRVkBYXfwUxKiYerKw88G+CH8nsUs= +github.com/efficientgo/e2e v0.14.1-0.20260927140226-a3483d56ac4b h1:TVh1EM/fZodW+VOi+LkW6ptH/PuVdnF2ROW+1NqvtdM= +github.com/efficientgo/e2e v0.14.1-0.20260927140226-a3483d56ac4b/go.mod h1:uQC+38Vj8iASSYXRVkBYXfwUxKiYerKw88G+CH8nsUs= github.com/efficientgo/tools/extkingpin v0.0.0-20230505153745-6b7392939a60 h1:JZLv+76vd7yTN049X7FRbDgvsXrbl7cDaZW12KQdebE= github.com/efficientgo/tools/extkingpin v0.0.0-20230505153745-6b7392939a60/go.mod h1:0rmhYYrjSfDaVnd8ubwq5vRc1epHv00KkiNrvWuxo+s= github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 h1:oP4q0fw+fOSWn3DfFi4EXdT+B+gTtzx8GC9xsc26Znk= @@ -990,10 +990,10 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1 github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM= github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488 h1:khBsQLLRoF1KzXgTlwFZa6mC32bwYUUAu/AeP49V7UM= github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488/go.mod h1:uDHLkMKOGDAnlN75EAz8VrRzob1+VbgYSuUleatWuF0= -github.com/thanos-io/promql-engine v0.0.0-20260915065525-1b359e941bde h1:ynBM1tJjqwE/maQCs/5Rk9Y8Ebizc33PbZKS+FW2DYg= -github.com/thanos-io/promql-engine v0.0.0-20260915065525-1b359e941bde/go.mod h1:uzn40oZHPXvfdP498h+MiRL2fN7RF519gNaV3LyhChc= -github.com/thanos-io/thanos v0.42.5-0.20260817064418-8908023d563b h1:30lUqQ2HfZ2ni0Ogq3TO0kW45K3iEVhinYDkA0npfXw= -github.com/thanos-io/thanos v0.42.5-0.20260817064418-8908023d563b/go.mod h1:zGTlIYCS4Nwn64QbcLQKWAzafbuf370q0UMU5nSraDo= +github.com/thanos-io/promql-engine v0.0.0-20261020165614-7157e606efa6 h1:jEE4chR1eNw8eieXSdWQ4o/Z0OtpgMzH83bF17f5Jdk= +github.com/thanos-io/promql-engine v0.0.0-20261020165614-7157e606efa6/go.mod h1:uzn40oZHPXvfdP498h+MiRL2fN7RF519gNaV3LyhChc= +github.com/thanos-io/thanos v0.42.5-0.20261008195948-dd67d9cc81c3 h1:idn6HjA+bPG4MbQevVmmBkce1uKmgsn5c8wy7+irJ+s= +github.com/thanos-io/thanos v0.42.5-0.20261008195948-dd67d9cc81c3/go.mod h1:4RXnRoz0Bft5oxH3VS0E7g9z7VKPz7Q0KB4EywvwHOw= github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY= github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA= github.com/tjhop/slog-gokit v0.2.2 h1:ev90r/tMq5cx7q6lMuhJ6v7fjsr1bDho7W2BLAFVwtI= diff --git a/pkg/storegateway/chunk_bytes_pool.go b/pkg/storegateway/chunk_bytes_pool.go index 1a0e82d12ce..b691302c9a4 100644 --- a/pkg/storegateway/chunk_bytes_pool.go +++ b/pkg/storegateway/chunk_bytes_pool.go @@ -52,3 +52,11 @@ func (p *chunkBytesPool) Put(b *[]byte) { p.poolByteStats.WithLabelValues("put", "cap").Add(float64(cap(*b))) p.pool.Put(b) } + +func (p *chunkBytesPool) UsedBytes() uint64 { + return p.pool.UsedBytes() +} + +func (p *chunkBytesPool) MaxBytes() uint64 { + return p.pool.MaxBytes() +} diff --git a/vendor/github.com/thanos-io/promql-engine/ringbuffer/extended.go b/vendor/github.com/thanos-io/promql-engine/ringbuffer/extended.go index 38a8925c965..c3475bc07ab 100644 --- a/vendor/github.com/thanos-io/promql-engine/ringbuffer/extended.go +++ b/vendor/github.com/thanos-io/promql-engine/ringbuffer/extended.go @@ -83,7 +83,9 @@ func (r *ExtendedRingBuffer) Push(t int64, v Value) { } if baseline >= 0 { if t >= r.items[baseline].T { + r.sampleCount -= valueSampleCount(r.items[baseline].V) setSample(&r.items[baseline], t, v) + r.sampleCount += valueSampleCount(v) } return } @@ -95,6 +97,7 @@ func (r *ExtendedRingBuffer) Push(t int64, v Value) { copy(r.items[1:], r.items[:len(r.items)-1]) r.items[0] = Sample{} setSample(&r.items[0], t, v) + r.sampleCount += valueSampleCount(v) } func (r *ExtendedRingBuffer) Eval(ctx context.Context, scalarArg float64, scalarArg2 float64) (float64, *histogram.FloatHistogram, bool, warnings.Warnings, error) { diff --git a/vendor/github.com/thanos-io/promql-engine/ringbuffer/generic.go b/vendor/github.com/thanos-io/promql-engine/ringbuffer/generic.go index 806785ae14a..9de781ab2b1 100644 --- a/vendor/github.com/thanos-io/promql-engine/ringbuffer/generic.go +++ b/vendor/github.com/thanos-io/promql-engine/ringbuffer/generic.go @@ -18,6 +18,7 @@ import ( // belongs in that window. type Buffer interface { MaxT() int64 + Empty() bool Push(t int64, v Value) Reset(mint int64, evalt int64) Eval(ctx context.Context, _, _ float64) (float64, *histogram.FloatHistogram, bool, warnings.Warnings, error) @@ -37,9 +38,10 @@ type Sample struct { } type GenericRingBuffer struct { - ctx context.Context - items []Sample - tail []Sample + ctx context.Context + items []Sample + tail []Sample + sampleCount int currentStep int64 currentRangeStart int64 @@ -59,15 +61,7 @@ func New(ctx context.Context, size int, selectRange, offset int64, call Function } func (r *GenericRingBuffer) SampleCount() int { - c := 0 - for _, s := range r.items { - if s.V.H != nil { - c += telemetry.CalculateHistogramSampleCount(s.V.H) - continue - } - c++ - } - return c + return r.sampleCount } // MaxT returns the maximum timestamp of the ring buffer. @@ -79,6 +73,11 @@ func (r *GenericRingBuffer) MaxT() int64 { return r.items[len(r.items)-1].T } +// Empty reports whether any sample is retained for the current range. +func (r *GenericRingBuffer) Empty() bool { + return len(r.items) == 0 +} + // Push considers a sample for the current range. func (r *GenericRingBuffer) Push(t int64, v Value) { if t <= r.currentRangeStart { @@ -96,6 +95,14 @@ func (r *GenericRingBuffer) push(t int64, v Value) { r.items = append(r.items, Sample{}) } setSample(&r.items[n], t, v) + r.sampleCount += valueSampleCount(v) +} + +func valueSampleCount(v Value) int { + if v.H != nil { + return telemetry.CalculateHistogramSampleCount(v.H) + } + return 1 } func setSample(dst *Sample, t int64, v Value) { @@ -117,6 +124,7 @@ func (r *GenericRingBuffer) Reset(mint int64, evalt int64) { r.currentRangeStart = mint if len(r.items) == 0 || r.items[len(r.items)-1].T < mint { r.items = r.items[:0] + r.sampleCount = 0 return } var drop int @@ -126,6 +134,9 @@ func (r *GenericRingBuffer) Reset(mint int64, evalt int64) { } func (r *GenericRingBuffer) drop(drop int) { + for _, sample := range r.items[:drop] { + r.sampleCount -= valueSampleCount(sample.V) + } keep := len(r.items) - drop r.tail = resize(r.tail, drop) copy(r.tail, r.items[:drop]) diff --git a/vendor/github.com/thanos-io/promql-engine/ringbuffer/overtime.go b/vendor/github.com/thanos-io/promql-engine/ringbuffer/overtime.go index 5ab9723fa1b..efb8369cb57 100644 --- a/vendor/github.com/thanos-io/promql-engine/ringbuffer/overtime.go +++ b/vendor/github.com/thanos-io/promql-engine/ringbuffer/overtime.go @@ -129,6 +129,9 @@ func (r *OverTimeBuffer) SampleCount() int { func (r *OverTimeBuffer) MaxT() int64 { return r.lastTimestamp } +// Empty reports whether any sample is retained for the current step range. +func (r *OverTimeBuffer) Empty() bool { return r.firstTimestamps[0] == math.MaxInt64 } + func (r *OverTimeBuffer) Push(t int64, v Value) { if t <= r.stepRanges[0].mint { return diff --git a/vendor/github.com/thanos-io/promql-engine/ringbuffer/rate.go b/vendor/github.com/thanos-io/promql-engine/ringbuffer/rate.go index 520716a337c..fa540189050 100644 --- a/vendor/github.com/thanos-io/promql-engine/ringbuffer/rate.go +++ b/vendor/github.com/thanos-io/promql-engine/ringbuffer/rate.go @@ -92,6 +92,9 @@ func (r *RateBuffer) SampleCount() int { func (r *RateBuffer) MaxT() int64 { return r.lastSample.T } +// Empty reports whether any sample is retained for the current step range. +func (r *RateBuffer) Empty() bool { return r.firstSamples[0].T == math.MaxInt64 } + func (r *RateBuffer) Push(t int64, v Value) { if t <= r.currentMint { return diff --git a/vendor/github.com/thanos-io/promql-engine/storage/prometheus/matrix_selector.go b/vendor/github.com/thanos-io/promql-engine/storage/prometheus/matrix_selector.go index e776c985dea..e056540a68f 100644 --- a/vendor/github.com/thanos-io/promql-engine/storage/prometheus/matrix_selector.go +++ b/vendor/github.com/thanos-io/promql-engine/storage/prometheus/matrix_selector.go @@ -32,10 +32,27 @@ type matrixScanner struct { metricName string signature uint64 - buffer ringbuffer.Buffer - iterator chunkenc.Iterator - rawSeries SignedSeries - lastSample ringbuffer.Sample + buffer ringbuffer.Buffer + iterator chunkenc.Iterator + rawSeries SignedSeries + lastSample ringbuffer.Sample + iteratorDrained bool + exhausted bool +} + +// release drops the per-series state, which must not be read or rebuilt after. +func (m *matrixScanner) release() { + m.buffer = nil + m.iterator = nil +} + +// releaseDrained drops the iterator now and the buffer once its window empties. +func (m *matrixScanner) releaseDrained() { + m.iterator = nil + if m.buffer.Empty() { + m.exhausted = true + m.buffer = nil + } } type matrixSelector struct { @@ -67,6 +84,8 @@ type matrixSelector struct { shard int numShards int + reusableIter chunkenc.Iterator + nonCounterMetric string hasFloats bool } @@ -173,25 +192,32 @@ func (o *matrixSelector) Next(ctx context.Context, buf []model.StepVector) (int, firstSeries := o.currentSeries batchSamplesDelta := 0 - lastInBatch := min(firstSeries+o.seriesBatchSize, int64(len(o.scanners))) - // Initialize iterators lazily per-batch. - // TODO: reuse the iterator created for the previous scanner. - for i := firstSeries; i < lastInBatch; i++ { - if o.scanners[i].iterator == nil { - o.scanners[i].iterator = o.scanners[i].rawSeries.Iterator(nil) - o.scanners[i].buffer = o.newBuffer(ctx) - } - } - for ; o.currentSeries-firstSeries < o.seriesBatchSize && o.currentSeries < int64(len(o.scanners)); o.currentSeries++ { var ( scanner = &o.scanners[o.currentSeries] seriesTs = ts ) - sampleCountBefore := scanner.buffer.SampleCount() + // Initialize iterators lazily per series. An instant query visits each + // series once, so its iterator can be handed to the next one; a range + // query revisits every series and each keeps its own chunk position. + // TODO: reuse the buffer created for the previous scanner. + if scanner.buffer == nil && !scanner.exhausted { + if o.opts.IsInstantQuery() { + o.reusableIter = scanner.rawSeries.Iterator(o.reusableIter) + scanner.iterator = o.reusableIter + } else { + scanner.iterator = scanner.rawSeries.Iterator(nil) + } + scanner.buffer = o.newBuffer(ctx) + } + + var sampleCountBefore int + if !scanner.exhausted { + sampleCountBefore = scanner.buffer.SampleCount() + } - for currStep := 0; currStep < n && seriesTs <= o.maxt; currStep++ { + for currStep := 0; !scanner.exhausted && currStep < n && seriesTs <= o.maxt; currStep++ { maxt := seriesTs - o.offset mint := maxt - o.selectRange @@ -224,13 +250,13 @@ func (o *matrixSelector) Next(ctx context.Context, buf []model.StepVector) (int, seriesTs += o.step } - sampleCountAfter := scanner.buffer.SampleCount() - batchSamplesDelta += sampleCountAfter - sampleCountBefore - if o.opts.IsInstantQuery() { - scanner.buffer.Reset(math.MaxInt64, 0) - scanner.iterator = nil - batchSamplesDelta -= sampleCountAfter + scanner.release() + } else if !scanner.exhausted { + batchSamplesDelta += scanner.buffer.SampleCount() - sampleCountBefore + if scanner.iteratorDrained { + scanner.releaseDrained() + } } if o.shouldCheckSampleLimit(firstSeries) { @@ -379,6 +405,9 @@ func (m *matrixScanner) selectPoints( fh *histogram.FloatHistogram, ) error { m.buffer.Reset(mint, evalt) + if m.iteratorDrained { + return nil + } if m.lastSample.T > maxt { return nil } @@ -419,7 +448,12 @@ func (m *matrixScanner) selectPoints( m.buffer.Push(t, ringbuffer.Value{F: v}) } } - return m.iterator.Err() + // Next returns ValNone on error as well as at the end of the series. + if err := m.iterator.Err(); err != nil { + return err + } + m.iteratorDrained = true + return nil } // emitRingbufferWarnings converts warnings.Warnings flags to proper annotations with metric names. diff --git a/vendor/github.com/thanos-io/promql-engine/storage/prometheus/vector_selector.go b/vendor/github.com/thanos-io/promql-engine/storage/prometheus/vector_selector.go index 2f621a6d073..829f97a9e3c 100644 --- a/vendor/github.com/thanos-io/promql-engine/storage/prometheus/vector_selector.go +++ b/vendor/github.com/thanos-io/promql-engine/storage/prometheus/vector_selector.go @@ -26,6 +26,8 @@ type vectorScanner struct { labels labels.Labels signature uint64 samples *storage.MemoizedSeriesIterator + rawSeries SignedSeries + exhausted bool } type vectorSelector struct { @@ -51,6 +53,9 @@ type vectorSelector struct { shard int numShards int + reusableChunkIter chunkenc.Iterator + reusableMemoized *storage.MemoizedSeriesIterator + selectTimestamp bool opts *query.Options @@ -151,15 +156,30 @@ func (o *vectorSelector) Next(ctx context.Context, buf []model.StepVector) (int, for ; o.currentSeries-fromSeries < o.seriesBatchSize && o.currentSeries < int64(len(o.scanners)); o.currentSeries++ { var ( - series = o.scanners[o.currentSeries] - seriesTs = ts + series = &o.scanners[o.currentSeries] + seriesTs = ts + seriesExhausted = series.exhausted ) - for currStep := 0; currStep < n && seriesTs <= o.maxt; currStep++ { + // Initialize iterators lazily per series. An instant query visits each + // series once, so its iterator and memoized wrapper can be handed to the + // next one; a range query revisits every series and each keeps its own. + if series.samples == nil && !seriesExhausted { + if o.opts.IsInstantQuery() { + o.reusableChunkIter = series.rawSeries.Iterator(o.reusableChunkIter) + // Reset rebinds the wrapper to new iterator. + o.reusableMemoized.Reset(o.reusableChunkIter) + series.samples = o.reusableMemoized + } else { + series.samples = storage.NewMemoizedIterator(series.rawSeries.Iterator(nil), o.lookbackDelta) + } + } + for currStep := 0; !seriesExhausted && currStep < n && seriesTs <= o.maxt; currStep++ { currStepSamples = 0 - t, v, h, ok, err := selectPoint(series.samples, seriesTs, o.lookbackDelta, o.offset) + t, v, h, ok, atEnd, err := selectPoint(series.samples, seriesTs, o.lookbackDelta, o.offset) if err != nil { return 0, err } + seriesExhausted = atEnd if o.selectTimestamp { v = float64(t) / 1000 } @@ -184,6 +204,13 @@ func (o *vectorSelector) Next(ctx context.Context, buf []model.StepVector) (int, return 0, err } } + + if o.opts.IsInstantQuery() { + series.samples = nil + } else if seriesExhausted { + series.exhausted = true + series.samples = nil + } } if o.currentSeries == int64(len(o.scanners)) { @@ -209,7 +236,7 @@ func (o *vectorSelector) loadSeries(ctx context.Context) error { o.scanners[i] = vectorScanner{ labels: s.Labels(), signature: s.Signature, - samples: storage.NewMemoizedIterator(s.Iterator(nil), o.lookbackDelta), + rawSeries: s, } b.Reset(s.Labels()) // if we have pushed down a timestamp function into the scan we need to drop @@ -226,6 +253,11 @@ func (o *vectorSelector) loadSeries(ctx context.Context) error { if o.seriesBatchSize == 0 || numSeries < o.seriesBatchSize { o.seriesBatchSize = numSeries } + + // One memoized wrapper per selector instead of one per series. + if o.opts.IsInstantQuery() { + o.reusableMemoized = storage.NewMemoizedEmptyIterator(o.lookbackDelta) + } }) return err } @@ -257,7 +289,7 @@ func (o *vectorSelector) shouldCheckSampleLimit(fromSeries int64) bool { } // TODO(fpetkovski): Add max samples limit. -func selectPoint(it *storage.MemoizedSeriesIterator, ts, lookbackDelta, offset int64) (int64, float64, *histogram.FloatHistogram, bool, error) { +func selectPoint(it *storage.MemoizedSeriesIterator, ts, lookbackDelta, offset int64) (_ int64, _ float64, _ *histogram.FloatHistogram, ok, exhausted bool, _ error) { refTime := ts - offset var t int64 var v float64 @@ -267,7 +299,7 @@ func selectPoint(it *storage.MemoizedSeriesIterator, ts, lookbackDelta, offset i switch valueType { case chunkenc.ValNone: if it.Err() != nil { - return 0, 0, nil, false, it.Err() + return 0, 0, nil, false, false, it.Err() } case chunkenc.ValFloatHistogram, chunkenc.ValHistogram: t, fh = it.AtFloatHistogram() @@ -277,14 +309,14 @@ func selectPoint(it *storage.MemoizedSeriesIterator, ts, lookbackDelta, offset i panic(errors.Newf("unknown value type %v", valueType)) } if valueType == chunkenc.ValNone || t > refTime { - var ok bool - t, v, fh, ok = it.PeekPrev() - if !ok || t <= refTime-lookbackDelta { - return 0, 0, nil, false, nil + var hasPrev bool + t, v, fh, hasPrev = it.PeekPrev() + if !hasPrev || t <= refTime-lookbackDelta { + return 0, 0, nil, false, valueType == chunkenc.ValNone, nil } } if value.IsStaleNaN(v) || (fh != nil && value.IsStaleNaN(fh.Sum)) { - return 0, 0, nil, false, nil + return 0, 0, nil, false, false, nil } - return t, v, fh, true, nil + return t, v, fh, true, false, nil } diff --git a/vendor/github.com/thanos-io/thanos/pkg/api/query/querypb/query.pb.go b/vendor/github.com/thanos-io/thanos/pkg/api/query/querypb/query.pb.go index 0ceeccc2ffe..59ec61911f5 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/api/query/querypb/query.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/api/query/querypb/query.pb.go @@ -585,65 +585,65 @@ func init() { func init() { proto.RegisterFile("api/query/querypb/query.proto", fileDescriptor_4b2aba43925d729f) } var fileDescriptor_4b2aba43925d729f = []byte{ - // 926 bytes of a gzipped FileDescriptorProto + // 921 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcf, 0x73, 0xdb, 0x44, - 0x14, 0x96, 0x92, 0xd8, 0xb1, 0x9f, 0xfc, 0x43, 0x59, 0x1c, 0xaa, 0x1a, 0x30, 0xc6, 0x4c, 0x07, - 0x93, 0x01, 0xbb, 0xe3, 0x16, 0x6e, 0xcc, 0x80, 0x49, 0x19, 0xc3, 0x94, 0x99, 0x56, 0xf6, 0x89, - 0x8b, 0x66, 0x6d, 0xbf, 0xd8, 0xc2, 0xf2, 0xae, 0xaa, 0x5d, 0x41, 0xd3, 0x2b, 0x33, 0x9c, 0xf9, - 0xb3, 0x72, 0xec, 0x91, 0x13, 0x03, 0xc9, 0xa5, 0x17, 0xfe, 0x07, 0x46, 0x2b, 0xc9, 0x96, 0x32, - 0xa1, 0x24, 0xe4, 0xd6, 0x8b, 0xbd, 0xfb, 0x7d, 0xef, 0xd9, 0x6f, 0xbf, 0x7d, 0xef, 0x9b, 0x85, - 0xf7, 0xa8, 0xef, 0xf6, 0x9f, 0x85, 0x18, 0x9c, 0xc6, 0x9f, 0xfe, 0x34, 0xfe, 0xee, 0xf9, 0x01, - 0x97, 0x9c, 0x14, 0xe5, 0x92, 0x32, 0x2e, 0x9a, 0x8d, 0x05, 0x5f, 0x70, 0x05, 0xf5, 0xa3, 0x55, - 0xcc, 0x36, 0xef, 0x0a, 0xc9, 0x03, 0xec, 0xab, 0x4f, 0x7f, 0xda, 0x97, 0xa7, 0x3e, 0x8a, 0x84, - 0xba, 0x93, 0xa7, 0x02, 0x7f, 0x96, 0x10, 0xed, 0x3c, 0xe1, 0x07, 0x7c, 0x9d, 0x4f, 0xed, 0x4c, - 0x00, 0x9e, 0x46, 0x25, 0x8c, 0x25, 0x95, 0x82, 0x7c, 0x08, 0x55, 0x41, 0xd7, 0xbe, 0x87, 0xc2, - 0x91, 0x5c, 0x52, 0xcf, 0xd2, 0xdb, 0x7a, 0x77, 0xd7, 0xae, 0x24, 0xe0, 0x24, 0xc2, 0xc8, 0x07, - 0x50, 0xf1, 0x91, 0xae, 0x9c, 0x04, 0xb4, 0x76, 0x54, 0x8c, 0x11, 0x61, 0xe3, 0x18, 0xea, 0x7c, - 0x03, 0xf5, 0x89, 0xbb, 0xc6, 0x31, 0x06, 0x2e, 0x8a, 0x21, 0x95, 0xb3, 0x25, 0x79, 0x00, 0x45, - 0xa1, 0xb6, 0x96, 0xde, 0xde, 0xed, 0x1a, 0x83, 0x77, 0xa2, 0x02, 0xd6, 0x28, 0x97, 0x18, 0x0a, - 0x67, 0xc6, 0xfd, 0xd3, 0xde, 0x36, 0xc3, 0x4e, 0x42, 0x3b, 0xbf, 0x14, 0xa0, 0xa2, 0xca, 0xb3, - 0xf1, 0x59, 0x88, 0x42, 0x92, 0x06, 0x14, 0x94, 0x62, 0xaa, 0xb0, 0xb2, 0x1d, 0x6f, 0x48, 0x1f, - 0xca, 0x6a, 0xf1, 0xc4, 0xa3, 0xcc, 0xaa, 0xb5, 0xf5, 0xae, 0x31, 0x38, 0xe8, 0xc5, 0x62, 0xf6, - 0x36, 0x84, 0xbd, 0x8d, 0x89, 0x8e, 0x20, 0xdd, 0x35, 0x3a, 0x02, 0x67, 0x9c, 0xcd, 0x37, 0x47, - 0x90, 0xaa, 0x02, 0x05, 0x91, 0x8f, 0xa0, 0x1e, 0x6d, 0x79, 0x28, 0x37, 0x51, 0xbb, 0x2a, 0xaa, - 0x96, 0xc0, 0x69, 0xe0, 0x43, 0x78, 0x7b, 0x4d, 0x9f, 0x3b, 0x01, 0x0a, 0xee, 0x85, 0xd2, 0xe5, - 0x6c, 0x13, 0xbf, 0xa7, 0xe2, 0x1b, 0x6b, 0xfa, 0xdc, 0xde, 0x90, 0x69, 0xd6, 0x3d, 0xa8, 0x05, - 0xe8, 0x7b, 0xee, 0x8c, 0x3a, 0x1e, 0x9d, 0xa2, 0x27, 0xac, 0x42, 0x7b, 0xb7, 0x5b, 0xb6, 0xab, - 0x09, 0xfa, 0x58, 0x81, 0xe4, 0x2b, 0xa8, 0xaa, 0xcb, 0xfb, 0x3e, 0xd2, 0x10, 0x03, 0x61, 0x15, - 0x95, 0x78, 0x87, 0xe9, 0xe9, 0xc6, 0x59, 0x72, 0xb8, 0x77, 0xf6, 0xc7, 0xfb, 0x9a, 0x9d, 0xcf, - 0x20, 0x6d, 0x30, 0x90, 0xd1, 0xa9, 0x87, 0xc7, 0x38, 0x0f, 0x7d, 0x6b, 0xbf, 0xad, 0x77, 0x4b, - 0x76, 0x16, 0x22, 0x0f, 0xe1, 0x30, 0xde, 0x3e, 0xa1, 0x81, 0x74, 0xa9, 0x67, 0xa3, 0xf0, 0x39, - 0x13, 0x68, 0x95, 0x54, 0xec, 0xd5, 0x24, 0x69, 0x01, 0x88, 0x95, 0xeb, 0x7f, 0xbd, 0x0c, 0xd9, - 0x4a, 0x58, 0xa0, 0x42, 0x33, 0x08, 0xb9, 0x0f, 0x20, 0x96, 0x34, 0x98, 0x3b, 0x2e, 0x3b, 0xe1, - 0x96, 0x91, 0xbf, 0x95, 0x71, 0xc4, 0x7c, 0xcb, 0x4e, 0xb8, 0x5d, 0x16, 0xe9, 0x32, 0x52, 0xd2, - 0xe3, 0x7c, 0x35, 0xa5, 0xb3, 0x95, 0x33, 0x47, 0x4f, 0xd2, 0x8d, 0x92, 0x95, 0x58, 0xc9, 0x94, - 0x3d, 0x8e, 0xc8, 0x54, 0xc9, 0x23, 0x28, 0x22, 0x5b, 0xb8, 0x0c, 0xad, 0x6a, 0x5b, 0xef, 0xd6, - 0x06, 0x24, 0xfd, 0x8f, 0x47, 0x0a, 0x9d, 0x9c, 0xfa, 0x68, 0x27, 0x11, 0xa4, 0x07, 0x6f, 0x05, - 0x49, 0xfd, 0xce, 0x34, 0x12, 0xc8, 0x11, 0xee, 0x0b, 0xb4, 0xea, 0xea, 0xe7, 0x0f, 0x52, 0x4a, - 0x35, 0xec, 0xd8, 0x7d, 0x81, 0xdf, 0xed, 0x95, 0xca, 0x26, 0x74, 0x9e, 0x42, 0x35, 0xa7, 0x33, - 0xf9, 0x12, 0xaa, 0xea, 0xd2, 0x36, 0xb7, 0x12, 0xb7, 0x74, 0x23, 0xfd, 0xe7, 0xc7, 0x19, 0x32, - 0xbd, 0x94, 0x5c, 0x42, 0xe7, 0x95, 0x0e, 0xd5, 0xa4, 0xb1, 0x13, 0x39, 0xdf, 0x85, 0xd2, 0xcf, - 0x34, 0x60, 0x2e, 0x5b, 0x88, 0xb8, 0xb9, 0x47, 0x9a, 0xbd, 0x41, 0xc8, 0x17, 0x00, 0x51, 0xdb, - 0x25, 0x13, 0xb4, 0xa3, 0xc4, 0x7c, 0xdd, 0x04, 0x8d, 0x34, 0x3b, 0x93, 0x40, 0x8e, 0xa0, 0x20, - 0xa2, 0x01, 0x57, 0x2d, 0x6c, 0x6c, 0x25, 0xda, 0x8e, 0xfe, 0x48, 0xb3, 0xe3, 0x10, 0x72, 0x0c, - 0xe6, 0x36, 0x33, 0x56, 0x49, 0x75, 0xb2, 0x31, 0xb8, 0x93, 0xa6, 0x5d, 0x9a, 0xed, 0x91, 0x66, - 0xd7, 0xb7, 0x29, 0x0a, 0x1a, 0x96, 0xa0, 0x18, 0xa0, 0x08, 0x3d, 0xd9, 0xf9, 0x34, 0x33, 0x9c, - 0xa4, 0x01, 0x7b, 0x3f, 0x0a, 0xce, 0xd4, 0x09, 0x2b, 0x23, 0xcd, 0x56, 0xbb, 0x21, 0x40, 0x09, - 0xd9, 0x8c, 0xcf, 0x5d, 0xb6, 0xe8, 0xbc, 0x2a, 0xc0, 0x41, 0xac, 0x0c, 0x65, 0x0b, 0xbc, 0xc1, - 0xdc, 0x9b, 0xd7, 0x98, 0xfb, 0x4f, 0x80, 0x08, 0x49, 0x03, 0xe9, 0x5c, 0x31, 0xfd, 0xa6, 0x62, - 0x26, 0x19, 0x0b, 0xe8, 0x82, 0x89, 0x6c, 0x9e, 0x8f, 0x4d, 0x3c, 0x00, 0xd9, 0x3c, 0x1b, 0xf9, - 0x31, 0x98, 0x2e, 0x93, 0x18, 0xfc, 0x44, 0xbd, 0x4b, 0xd3, 0x5f, 0x4f, 0xf1, 0xd7, 0xf8, 0x4a, - 0xe1, 0x86, 0xbe, 0x52, 0xbc, 0x91, 0xaf, 0xec, 0x5f, 0xcb, 0x57, 0x4a, 0xb7, 0xf5, 0x95, 0xf2, - 0x0d, 0x7c, 0x05, 0xae, 0xef, 0x2b, 0x95, 0xff, 0xf0, 0x95, 0xea, 0xad, 0x7c, 0xa5, 0x76, 0x2d, - 0x5f, 0xa9, 0xff, 0x5f, 0x5f, 0x39, 0xf8, 0x77, 0x5f, 0x31, 0xcc, 0x4a, 0xe7, 0x6f, 0x1d, 0x48, - 0xb6, 0xd5, 0xdf, 0x70, 0x27, 0x38, 0xfa, 0x0c, 0x60, 0xab, 0x1d, 0x31, 0x60, 0x7f, 0x8e, 0x27, - 0x34, 0xf4, 0xa4, 0xa9, 0x91, 0x1a, 0xc0, 0xf6, 0x08, 0xa6, 0x4e, 0x00, 0x92, 0xc7, 0x90, 0xb9, - 0x33, 0xf8, 0x55, 0x87, 0x82, 0x2a, 0x8f, 0x7c, 0x9e, 0x2e, 0x1a, 0xb9, 0xb2, 0x13, 0x93, 0x68, - 0x1e, 0x5e, 0x42, 0x63, 0x3d, 0xef, 0xeb, 0xe4, 0x51, 0xf2, 0xc8, 0x51, 0x3a, 0x93, 0xbb, 0xf9, - 0xb0, 0x8c, 0xcd, 0x34, 0x9b, 0x57, 0x51, 0xe9, 0xcf, 0x0c, 0xef, 0x9d, 0xfd, 0xd5, 0xd2, 0xce, - 0xce, 0x5b, 0xfa, 0xcb, 0xf3, 0x96, 0xfe, 0xe7, 0x79, 0x4b, 0xff, 0xed, 0xa2, 0xa5, 0xbd, 0xbc, - 0x68, 0x69, 0xbf, 0x5f, 0xb4, 0xb4, 0x1f, 0xf6, 0x93, 0x27, 0xdd, 0xb4, 0xa8, 0x5e, 0x56, 0x0f, - 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xdd, 0xe8, 0xcf, 0xee, 0x09, 0x00, 0x00, + 0x14, 0x96, 0x92, 0xd8, 0xb1, 0x9f, 0x7f, 0x29, 0x8b, 0x43, 0x55, 0x03, 0xc6, 0x98, 0xe9, 0x60, + 0x32, 0x60, 0x77, 0xdc, 0xc2, 0x8d, 0x19, 0x30, 0x29, 0x63, 0x98, 0x32, 0xd3, 0xca, 0x3e, 0x71, + 0xd1, 0xac, 0xed, 0x17, 0x5b, 0x58, 0xde, 0x55, 0xb5, 0x2b, 0x68, 0x7a, 0x65, 0x86, 0x33, 0x7f, + 0x56, 0x8e, 0x3d, 0x72, 0x62, 0x20, 0xb9, 0xf4, 0xc2, 0xff, 0xc0, 0x68, 0x25, 0x59, 0x52, 0x26, + 0xd0, 0x84, 0xdc, 0x7a, 0xb1, 0x77, 0xbf, 0xef, 0x3d, 0xe9, 0xed, 0xb7, 0xef, 0x7d, 0x23, 0x78, + 0x8f, 0x7a, 0xce, 0xe0, 0x59, 0x80, 0xfe, 0x69, 0xf4, 0xeb, 0xcd, 0xa2, 0xff, 0xbe, 0xe7, 0x73, + 0xc9, 0x49, 0x51, 0xae, 0x28, 0xe3, 0xa2, 0xd5, 0x5c, 0xf2, 0x25, 0x57, 0xd0, 0x20, 0x5c, 0x45, + 0x6c, 0xeb, 0xae, 0x90, 0xdc, 0xc7, 0x81, 0xfa, 0xf5, 0x66, 0x03, 0x79, 0xea, 0xa1, 0x88, 0xa9, + 0x3b, 0x79, 0xca, 0xf7, 0xe6, 0x31, 0xd1, 0xc9, 0x13, 0x9e, 0xcf, 0x37, 0xf9, 0xd4, 0xee, 0x14, + 0xe0, 0x69, 0x58, 0xc2, 0x44, 0x52, 0x29, 0xc8, 0x87, 0x50, 0x13, 0x74, 0xe3, 0xb9, 0x28, 0x6c, + 0xc9, 0x25, 0x75, 0x4d, 0xbd, 0xa3, 0xf7, 0x76, 0xad, 0x6a, 0x0c, 0x4e, 0x43, 0x8c, 0x7c, 0x00, + 0x55, 0x0f, 0xe9, 0xda, 0x8e, 0x41, 0x73, 0x47, 0xc5, 0x54, 0x42, 0x6c, 0x12, 0x41, 0xdd, 0x6f, + 0xa0, 0x31, 0x75, 0x36, 0x38, 0x41, 0xdf, 0x41, 0x31, 0xa2, 0x72, 0xbe, 0x22, 0x0f, 0xa0, 0x28, + 0xd4, 0xd6, 0xd4, 0x3b, 0xbb, 0xbd, 0xca, 0xf0, 0x9d, 0xb0, 0x80, 0x0d, 0xca, 0x15, 0x06, 0xc2, + 0x9e, 0x73, 0xef, 0xb4, 0x9f, 0x66, 0x58, 0x71, 0x68, 0xf7, 0x97, 0x02, 0x54, 0x55, 0x79, 0x16, + 0x3e, 0x0b, 0x50, 0x48, 0xd2, 0x84, 0x82, 0x52, 0x4c, 0x15, 0x56, 0xb6, 0xa2, 0x0d, 0x19, 0x40, + 0x59, 0x2d, 0x9e, 0xb8, 0x94, 0x99, 0xf5, 0x8e, 0xde, 0xab, 0x0c, 0x0f, 0xfa, 0x91, 0x98, 0xfd, + 0x2d, 0x61, 0xa5, 0x31, 0xe1, 0x11, 0xa4, 0xb3, 0x41, 0x5b, 0xe0, 0x9c, 0xb3, 0xc5, 0xf6, 0x08, + 0x52, 0x55, 0xa0, 0x20, 0xf2, 0x11, 0x34, 0xc2, 0x2d, 0x0f, 0xe4, 0x36, 0x6a, 0x57, 0x45, 0xd5, + 0x63, 0x38, 0x09, 0x7c, 0x08, 0x6f, 0x6f, 0xe8, 0x73, 0xdb, 0x47, 0xc1, 0xdd, 0x40, 0x3a, 0x9c, + 0x6d, 0xe3, 0xf7, 0x54, 0x7c, 0x73, 0x43, 0x9f, 0x5b, 0x5b, 0x32, 0xc9, 0xba, 0x07, 0x75, 0x1f, + 0x3d, 0xd7, 0x99, 0x53, 0xdb, 0xa5, 0x33, 0x74, 0x85, 0x59, 0xe8, 0xec, 0xf6, 0xca, 0x56, 0x2d, + 0x46, 0x1f, 0x2b, 0x90, 0x7c, 0x05, 0x35, 0x75, 0x79, 0xdf, 0x87, 0x1a, 0xa2, 0x2f, 0xcc, 0xa2, + 0x12, 0xef, 0x30, 0x39, 0xdd, 0x24, 0x4b, 0x8e, 0xf6, 0xce, 0xfe, 0x78, 0x5f, 0xb3, 0xf2, 0x19, + 0xa4, 0x03, 0x15, 0x64, 0x74, 0xe6, 0xe2, 0x31, 0x2e, 0x02, 0xcf, 0xdc, 0xef, 0xe8, 0xbd, 0x92, + 0x95, 0x85, 0xc8, 0x43, 0x38, 0x8c, 0xb6, 0x4f, 0xa8, 0x2f, 0x1d, 0xea, 0x5a, 0x28, 0x3c, 0xce, + 0x04, 0x9a, 0x25, 0x15, 0x7b, 0x35, 0x49, 0xda, 0x00, 0x62, 0xed, 0x78, 0x5f, 0xaf, 0x02, 0xb6, + 0x16, 0x26, 0xa8, 0xd0, 0x0c, 0x42, 0xee, 0x03, 0x88, 0x15, 0xf5, 0x17, 0xb6, 0xc3, 0x4e, 0xb8, + 0x59, 0xc9, 0xdf, 0xca, 0x24, 0x64, 0xbe, 0x65, 0x27, 0xdc, 0x2a, 0x8b, 0x64, 0x19, 0x2a, 0xe9, + 0x72, 0xbe, 0x9e, 0xd1, 0xf9, 0xda, 0x5e, 0xa0, 0x2b, 0xe9, 0x56, 0xc9, 0x6a, 0xa4, 0x64, 0xc2, + 0x1e, 0x87, 0x64, 0xa2, 0xe4, 0x11, 0x14, 0x91, 0x2d, 0x1d, 0x86, 0x66, 0xad, 0xa3, 0xf7, 0xea, + 0x43, 0x92, 0xbc, 0xe3, 0x91, 0x42, 0xa7, 0xa7, 0x1e, 0x5a, 0x71, 0x04, 0xe9, 0xc3, 0x5b, 0x7e, + 0x5c, 0xbf, 0x3d, 0x0b, 0x05, 0xb2, 0x85, 0xf3, 0x02, 0xcd, 0x86, 0x7a, 0xfc, 0x41, 0x42, 0xa9, + 0x86, 0x9d, 0x38, 0x2f, 0xf0, 0xbb, 0xbd, 0x52, 0xd9, 0x80, 0xee, 0x53, 0xa8, 0xe5, 0x74, 0x26, + 0x5f, 0x42, 0x4d, 0x5d, 0xda, 0xf6, 0x56, 0xa2, 0x96, 0x6e, 0x26, 0x6f, 0x7e, 0x9c, 0x21, 0x93, + 0x4b, 0xc9, 0x25, 0x74, 0x5f, 0xe9, 0x50, 0x8b, 0x1b, 0x3b, 0x96, 0xf3, 0x5d, 0x28, 0xfd, 0x4c, + 0x7d, 0xe6, 0xb0, 0xa5, 0x88, 0x9a, 0x7b, 0xac, 0x59, 0x5b, 0x84, 0x7c, 0x01, 0x10, 0xb6, 0x5d, + 0x3c, 0x41, 0x3b, 0x1d, 0xfd, 0x35, 0x13, 0x34, 0xd6, 0xac, 0x4c, 0x02, 0x39, 0x82, 0x82, 0x08, + 0x07, 0x5c, 0xb5, 0x70, 0x25, 0x95, 0x28, 0x1d, 0xfd, 0xb1, 0x66, 0x45, 0x21, 0xe4, 0x18, 0x8c, + 0x34, 0x33, 0x52, 0x49, 0x75, 0x72, 0x65, 0x78, 0x27, 0x49, 0xbb, 0x34, 0xdb, 0x63, 0xcd, 0x6a, + 0xa4, 0x29, 0x0a, 0x1a, 0x95, 0xa0, 0xe8, 0xa3, 0x08, 0x5c, 0xd9, 0xfd, 0x34, 0x33, 0x9c, 0xa4, + 0x09, 0x7b, 0x3f, 0x0a, 0xce, 0xd4, 0x09, 0xab, 0x63, 0xcd, 0x52, 0xbb, 0x11, 0x40, 0x09, 0xd9, + 0x9c, 0x2f, 0x1c, 0xb6, 0xec, 0xbe, 0x2a, 0xc0, 0x41, 0xa4, 0x0c, 0x65, 0x4b, 0xbc, 0xc1, 0xdc, + 0x1b, 0xd7, 0x98, 0xfb, 0x4f, 0x80, 0x08, 0x49, 0x7d, 0x69, 0x5f, 0x31, 0xfd, 0x86, 0x62, 0xa6, + 0x19, 0x0b, 0xe8, 0x81, 0x81, 0x6c, 0x91, 0x8f, 0x8d, 0x3d, 0x00, 0xd9, 0x22, 0x1b, 0xf9, 0x31, + 0x18, 0x0e, 0x93, 0xe8, 0xff, 0x44, 0xdd, 0x4b, 0xd3, 0xdf, 0x48, 0xf0, 0xff, 0xf0, 0x95, 0xc2, + 0x0d, 0x7d, 0xa5, 0x78, 0x23, 0x5f, 0xd9, 0xbf, 0x96, 0xaf, 0x94, 0x6e, 0xeb, 0x2b, 0xe5, 0x1b, + 0xf8, 0x0a, 0x5c, 0xdf, 0x57, 0xaa, 0xaf, 0xf1, 0x95, 0xda, 0xad, 0x7c, 0xa5, 0x7e, 0x2d, 0x5f, + 0x69, 0xfc, 0x5f, 0x5f, 0x39, 0xf8, 0x77, 0x5f, 0xa9, 0x18, 0xd5, 0xee, 0xdf, 0x3a, 0x90, 0x6c, + 0xab, 0xbf, 0xe1, 0x4e, 0x70, 0xf4, 0x19, 0x40, 0xaa, 0x1d, 0xa9, 0xc0, 0xfe, 0x02, 0x4f, 0x68, + 0xe0, 0x4a, 0x43, 0x23, 0x75, 0x80, 0xf4, 0x08, 0x86, 0x4e, 0x00, 0xe2, 0x8f, 0x21, 0x63, 0x67, + 0xf8, 0xab, 0x0e, 0x05, 0x55, 0x1e, 0xf9, 0x3c, 0x59, 0x34, 0x73, 0x65, 0xc7, 0x26, 0xd1, 0x3a, + 0xbc, 0x84, 0x46, 0x7a, 0xde, 0xd7, 0xc9, 0x23, 0x80, 0x54, 0x67, 0x72, 0x37, 0x1f, 0x96, 0xb1, + 0x99, 0x56, 0xeb, 0x2a, 0x2a, 0x79, 0xcc, 0xe8, 0xde, 0xd9, 0x5f, 0x6d, 0xed, 0xec, 0xbc, 0xad, + 0xbf, 0x3c, 0x6f, 0xeb, 0x7f, 0x9e, 0xb7, 0xf5, 0xdf, 0x2e, 0xda, 0xda, 0xcb, 0x8b, 0xb6, 0xf6, + 0xfb, 0x45, 0x5b, 0xfb, 0x61, 0x3f, 0xfe, 0xa4, 0x9b, 0x15, 0xd5, 0x97, 0xd5, 0x83, 0x7f, 0x06, + 0x00, 0x8a, 0xdd, 0xe8, 0xcf, 0xee, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/cache/groupcache.go b/vendor/github.com/thanos-io/thanos/pkg/cache/groupcache.go index c68828863fe..54a887ce804 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/cache/groupcache.go +++ b/vendor/github.com/thanos-io/thanos/pkg/cache/groupcache.go @@ -118,8 +118,9 @@ func NewGroupcacheWithConfig(logger log.Logger, reg prometheus.Registerer, conf BasePath: basepath, Transport: &http2.Transport{ AllowHTTP: true, - DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) { - return net.Dial(network, addr) + DialTLSContext: func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error) { + var d net.Dialer + return d.DialContext(ctx, network, addr) }, }, }) diff --git a/vendor/github.com/thanos-io/thanos/pkg/clientconfig/http.go b/vendor/github.com/thanos-io/thanos/pkg/clientconfig/http.go index 93e81905874..db09de6511a 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/clientconfig/http.go +++ b/vendor/github.com/thanos-io/thanos/pkg/clientconfig/http.go @@ -58,6 +58,8 @@ type HTTPClientConfig struct { TLSConfig TLSConfig `yaml:"tls_config"` // TransportConfig for Client transport properties TransportConfig TransportConfig `yaml:"transport_config"` + // HTTPHeaders specify headers to inject in the requests. + HTTPHeaders config_util.Headers `yaml:"http_headers"` // ClientMetrics contains metrics that will be used to instrument // the client that will be created with this config. ClientMetrics *extpromhttp.ClientMetrics `yaml:"-"` @@ -187,6 +189,10 @@ func NewRoundTripperFromConfig(cfg config_util.HTTPClientConfig, transportConfig } rt = config_util.NewBasicAuthRoundTripper(username, password, rt) } + + if cfg.HTTPHeaders != nil { + rt = config_util.NewHeadersRoundTripper(cfg.HTTPHeaders, rt) + } // Return a new configured RoundTripper. return rt, nil } @@ -252,6 +258,8 @@ func NewHTTPClient(cfg HTTPClientConfig, name string) (*http.Client, error) { httpClientConfig.BearerTokenFile = cfg.BearerTokenFile } + httpClientConfig.HTTPHeaders = &cfg.HTTPHeaders + if err := httpClientConfig.Validate(); err != nil { return nil, err } diff --git a/vendor/github.com/thanos-io/thanos/pkg/compact/blocks_cleaner.go b/vendor/github.com/thanos-io/thanos/pkg/compact/blocks_cleaner.go index 041507141c6..22fcc1d6b5f 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/compact/blocks_cleaner.go +++ b/vendor/github.com/thanos-io/thanos/pkg/compact/blocks_cleaner.go @@ -20,6 +20,8 @@ import ( "github.com/thanos-io/thanos/pkg/errutil" ) +const deleteMarkedBlocksConcurrency = 32 + // BlocksCleaner is a struct that deletes blocks from bucket which are marked for deletion. type BlocksCleaner struct { logger log.Logger @@ -45,8 +47,6 @@ func NewBlocksCleaner(logger log.Logger, bkt objstore.Bucket, ignoreDeletionMark // DeleteMarkedBlocks uses ignoreDeletionMarkFilter to gather the blocks that are marked for deletion and deletes those // if older than given deleteDelay. func (s *BlocksCleaner) DeleteMarkedBlocks(ctx context.Context) (map[ulid.ULID]struct{}, error) { - const conc = 32 - level.Info(s.logger).Log("msg", "started cleaning of blocks marked for deletion") var ( @@ -55,10 +55,10 @@ func (s *BlocksCleaner) DeleteMarkedBlocks(ctx context.Context) (map[ulid.ULID]s deletedBlocks = make(map[ulid.ULID]struct{}, 0) deletionMarkMap = s.ignoreDeletionMarkFilter.DeletionMarkBlocks() wg sync.WaitGroup - dm = make(chan *metadata.DeletionMark, conc) + dm = make(chan *metadata.DeletionMark, deleteMarkedBlocksConcurrency) ) - for range conc { + for range deleteMarkedBlocksConcurrency { wg.Go(func() { for deletionMark := range dm { if ctx.Err() != nil { @@ -82,8 +82,13 @@ func (s *BlocksCleaner) DeleteMarkedBlocks(ctx context.Context) (map[ulid.ULID]s }) } +enqueue: for _, deletionMark := range deletionMarkMap { - dm <- deletionMark + select { + case dm <- deletionMark: + case <-ctx.Done(): + break enqueue + } } close(dm) wg.Wait() diff --git a/vendor/github.com/thanos-io/thanos/pkg/dedup/iter.go b/vendor/github.com/thanos-io/thanos/pkg/dedup/iter.go index a8eddfdd023..c88ddb53bc8 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/dedup/iter.go +++ b/vendor/github.com/thanos-io/thanos/pkg/dedup/iter.go @@ -37,7 +37,7 @@ type dedupSeriesSet struct { // isCounter deduces whether a counter metric has been passed. There must be // a better way to deduce this. func isCounter(f string) bool { - return f == "increase" || f == "rate" || f == "irate" || f == "resets" + return f == "increase" || f == "rate" || f == "irate" || f == "resets" || f == "xincrease" || f == "xrate" } // NewOverlapSplit splits overlapping chunks into separate series entry, so existing algorithm can work as usual. @@ -492,7 +492,8 @@ func (it *boundedSeriesIterator) Next() chunkenc.ValueType { // Advance the iterator if we are before the valid interval. if t < it.mint { - if it.Seek(it.mint) == chunkenc.ValNone { + valueType = it.Seek(it.mint) + if valueType == chunkenc.ValNone { return chunkenc.ValNone } t = it.it.AtT() diff --git a/vendor/github.com/thanos-io/thanos/pkg/exemplars/exemplarspb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/exemplars/exemplarspb/rpc.pb.go index 886a140aea9..41030938de4 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/exemplars/exemplarspb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/exemplars/exemplarspb/rpc.pb.go @@ -243,7 +243,7 @@ func init() { func init() { proto.RegisterFile("exemplars/exemplarspb/rpc.proto", fileDescriptor_fd9ad2a40bac3cc9) } var fileDescriptor_fd9ad2a40bac3cc9 = []byte{ - // 465 bytes of a gzipped FileDescriptorProto + // 462 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x86, 0xbd, 0x49, 0x1b, 0xea, 0x49, 0xa9, 0xd2, 0x55, 0x24, 0x9c, 0x48, 0xd8, 0x51, 0x4e, 0x81, 0x43, 0x8c, 0xc2, 0x89, 0x03, 0x17, 0x0b, 0xa4, 0x4a, 0x20, 0x81, 0xb6, 0xb7, 0x72, 0xa8, @@ -272,8 +272,7 @@ var fileDescriptor_fd9ad2a40bac3cc9 = []byte{ 0x27, 0xbb, 0x49, 0xb0, 0xdf, 0x4d, 0x79, 0xb5, 0xda, 0xad, 0x7b, 0x2a, 0x6e, 0x8a, 0x2f, 0x58, 0xf2, 0x6c, 0xfe, 0x2f, 0xf4, 0xe6, 0xcb, 0x90, 0xdd, 0x2c, 0x43, 0xf6, 0x77, 0x19, 0xb2, 0x9f, 0xab, 0xd0, 0xbb, 0x59, 0x85, 0xde, 0x9f, 0x55, 0xe8, 0x5d, 0xd4, 0x77, 0xfe, 0x8a, 0x61, 0xcd, - 0x5e, 0xdf, 0x97, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x15, 0xe4, 0x68, 0x35, 0x03, 0x00, - 0x00, + 0x5e, 0xdf, 0x97, 0xff, 0x07, 0x00, 0x0f, 0x15, 0xe4, 0x68, 0x35, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/exthttp/transport.go b/vendor/github.com/thanos-io/thanos/pkg/exthttp/transport.go index 76d6ee70d46..6599f7d54ad 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/exthttp/transport.go +++ b/vendor/github.com/thanos-io/thanos/pkg/exthttp/transport.go @@ -46,7 +46,6 @@ func DefaultTransport(config HTTPConfig) (*http.Transport, error) { DialContext: (&net.Dialer{ Timeout: 30 * time.Second, KeepAlive: 30 * time.Second, - DualStack: true, }).DialContext, MaxIdleConns: config.MaxIdleConns, diff --git a/vendor/github.com/thanos-io/thanos/pkg/info/infopb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/info/infopb/rpc.pb.go index 41d910a86d2..2fd2f58c877 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/info/infopb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/info/infopb/rpc.pb.go @@ -442,47 +442,47 @@ func init() { func init() { proto.RegisterFile("info/infopb/rpc.proto", fileDescriptor_a1214ec45d2bf952) } var fileDescriptor_a1214ec45d2bf952 = []byte{ - // 633 bytes of a gzipped FileDescriptorProto + // 629 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4d, 0x6f, 0xd3, 0x30, 0x18, 0xc7, 0x9b, 0xbe, 0x2d, 0x7d, 0xba, 0x8d, 0xcd, 0x6c, 0x90, 0x56, 0x28, 0xab, 0xa2, 0x1d, 0x2a, 0x81, 0x1a, 0x51, 0x24, 0x84, 0xe0, 0xc4, 0xc6, 0x24, 0x86, 0x98, 0x34, 0xd2, 0x49, 0x48, 0xbb, 0x44, 0x69, 0xe7, 0x75, 0x41, 0x4d, 0xec, 0xd9, 0xae, 0xd8, 0xbe, 0x05, 0x9f, 0x83, 0x4f, - 0xb2, 0xe3, 0x8e, 0x9c, 0x10, 0x74, 0x5f, 0x04, 0xf9, 0x71, 0xd2, 0x35, 0xb0, 0x5d, 0xb8, 0xb4, - 0x89, 0xff, 0xbf, 0xc7, 0x79, 0x5e, 0xfe, 0x36, 0x6c, 0xc6, 0xe9, 0x29, 0xf3, 0xf5, 0x0f, 0x1f, - 0xfa, 0x82, 0x8f, 0x7a, 0x5c, 0x30, 0xc5, 0x48, 0x53, 0x9d, 0x45, 0x29, 0x93, 0x3d, 0x2d, 0xb4, - 0x5b, 0x52, 0x31, 0x41, 0xfd, 0x49, 0x34, 0xa4, 0x13, 0x3e, 0xf4, 0xd5, 0x25, 0xa7, 0xd2, 0x70, - 0xed, 0x8d, 0x31, 0x1b, 0x33, 0x7c, 0xf4, 0xf5, 0x93, 0x59, 0xf5, 0x56, 0xa0, 0xb9, 0x9f, 0x9e, - 0xb2, 0x80, 0x9e, 0x4f, 0xa9, 0x54, 0xde, 0xac, 0x02, 0xcb, 0xe6, 0x5d, 0x72, 0x96, 0x4a, 0x4a, - 0x5e, 0x02, 0xe0, 0x66, 0xa1, 0xa4, 0x4a, 0x3a, 0x56, 0xa7, 0xd2, 0x6d, 0xf6, 0xd7, 0x7b, 0xd9, - 0x27, 0x8f, 0x3f, 0x6a, 0x69, 0x40, 0xd5, 0x4e, 0xf5, 0xea, 0xe7, 0x56, 0x29, 0x68, 0x4c, 0xb2, - 0x77, 0x49, 0xb6, 0x61, 0x65, 0x97, 0x25, 0x9c, 0xa5, 0x34, 0x55, 0x47, 0x97, 0x9c, 0x3a, 0xe5, - 0x8e, 0xd5, 0x6d, 0x04, 0xc5, 0x45, 0xf2, 0x0c, 0x6a, 0x98, 0xb0, 0x53, 0xe9, 0x58, 0xdd, 0x66, - 0xff, 0x51, 0x6f, 0xa1, 0x96, 0xde, 0x40, 0x2b, 0x98, 0x8c, 0x81, 0x34, 0x2d, 0xa6, 0x13, 0x2a, - 0x9d, 0xea, 0x1d, 0x74, 0xa0, 0x15, 0x43, 0x23, 0x44, 0xde, 0xc3, 0x83, 0x84, 0x2a, 0x11, 0x8f, - 0xc2, 0x84, 0xaa, 0xe8, 0x24, 0x52, 0x91, 0x53, 0xc3, 0xb8, 0xad, 0x42, 0xdc, 0x01, 0x32, 0x07, - 0x19, 0x82, 0x1b, 0xac, 0x26, 0x85, 0x35, 0xd2, 0x87, 0x25, 0x15, 0x89, 0xb1, 0x6e, 0x40, 0x1d, - 0x77, 0x70, 0x0a, 0x3b, 0x1c, 0x19, 0x0d, 0x43, 0x73, 0x90, 0xbc, 0x82, 0x06, 0xbd, 0xa0, 0x09, - 0x9f, 0x44, 0x42, 0x3a, 0x4b, 0x18, 0xd5, 0x2e, 0x44, 0xed, 0xe5, 0x2a, 0xc6, 0xdd, 0xc2, 0xc4, - 0x87, 0xda, 0xf9, 0x94, 0x8a, 0x4b, 0xc7, 0xc6, 0xa8, 0x56, 0x21, 0xea, 0x93, 0x56, 0xde, 0x1e, - 0xee, 0x9b, 0x42, 0x91, 0x23, 0x3e, 0xd4, 0xa5, 0x8a, 0xd4, 0x54, 0x3a, 0x0d, 0x8c, 0x78, 0xfc, - 0x57, 0x17, 0xb5, 0x84, 0x7c, 0x86, 0x79, 0xdf, 0xcb, 0xd0, 0x98, 0x37, 0x97, 0xb4, 0xc0, 0x4e, - 0xe2, 0x34, 0x54, 0x71, 0x42, 0x1d, 0xab, 0x63, 0x75, 0x2b, 0xc1, 0x52, 0x12, 0xa7, 0x47, 0x71, - 0x42, 0x51, 0x8a, 0x2e, 0x8c, 0x54, 0xce, 0xa4, 0xe8, 0x02, 0xa5, 0xa7, 0xb0, 0x2e, 0xa7, 0x9c, - 0x33, 0xa1, 0x64, 0x28, 0xcf, 0x22, 0x71, 0x12, 0xa7, 0x63, 0x9c, 0xa2, 0x1d, 0xac, 0xe5, 0xc2, - 0x20, 0x5b, 0x27, 0x7b, 0xb0, 0x35, 0x87, 0xbf, 0xc6, 0xea, 0x8c, 0x4d, 0x55, 0x28, 0x28, 0x9f, - 0xc4, 0xa3, 0x28, 0x44, 0xcb, 0x48, 0x1c, 0x8d, 0x1d, 0x3c, 0xc9, 0xb1, 0xcf, 0x86, 0x0a, 0x0c, - 0x84, 0x36, 0x93, 0xe4, 0x35, 0x80, 0x92, 0x27, 0xc3, 0x50, 0xd7, 0xa5, 0x47, 0xa1, 0xbd, 0xb8, - 0x59, 0x1c, 0xc5, 0xe0, 0xdd, 0x8e, 0x2e, 0x2a, 0xf7, 0xa3, 0xc6, 0xf5, 0xbb, 0x24, 0xcf, 0x61, - 0x63, 0x9e, 0x02, 0x17, 0xec, 0x0b, 0x1d, 0xa9, 0x98, 0xa5, 0x66, 0x34, 0x76, 0xf0, 0x30, 0xd7, - 0x0e, 0x6f, 0xa5, 0x0f, 0x55, 0xbb, 0xba, 0x56, 0xf3, 0x9a, 0xd0, 0x98, 0x5b, 0xcb, 0xdb, 0x00, - 0xf2, 0xaf, 0x5f, 0xf4, 0x19, 0x5a, 0xf0, 0x80, 0xb7, 0x07, 0x2b, 0x85, 0xe1, 0xfe, 0x5f, 0x87, - 0xbd, 0x55, 0x58, 0x5e, 0x9c, 0xb6, 0xb7, 0x0c, 0x70, 0x3b, 0x4b, 0xef, 0x1c, 0xec, 0xbc, 0x58, - 0x6d, 0x80, 0xac, 0x8b, 0x16, 0x1a, 0xe0, 0xde, 0xf3, 0x99, 0x61, 0x85, 0x84, 0xca, 0xf7, 0x27, - 0x54, 0x29, 0x24, 0xd4, 0xdf, 0x85, 0x2a, 0x7e, 0xee, 0x4d, 0xf6, 0x5f, 0x3c, 0x05, 0x0b, 0xb7, - 0x48, 0xbb, 0x75, 0x87, 0x62, 0xee, 0x93, 0x9d, 0xed, 0xab, 0xdf, 0x6e, 0xe9, 0x6a, 0xe6, 0x5a, - 0xd7, 0x33, 0xd7, 0xfa, 0x35, 0x73, 0xad, 0x6f, 0x37, 0x6e, 0xe9, 0xfa, 0xc6, 0x2d, 0xfd, 0xb8, - 0x71, 0x4b, 0xc7, 0x75, 0x73, 0xbb, 0x0d, 0xeb, 0x78, 0x39, 0xbd, 0xf8, 0x13, 0x00, 0x00, 0xff, - 0xff, 0x41, 0x05, 0x7b, 0x5e, 0xf3, 0x04, 0x00, 0x00, + 0xb2, 0xe3, 0x8e, 0x9c, 0x10, 0x74, 0x5f, 0x04, 0xf9, 0x71, 0xd2, 0x35, 0x30, 0x38, 0x70, 0x69, + 0x13, 0xff, 0x7f, 0x7f, 0xe7, 0x79, 0xb3, 0x61, 0x33, 0x4e, 0x4f, 0x99, 0xaf, 0x7f, 0xf8, 0xd0, + 0x17, 0x7c, 0xd4, 0xe3, 0x82, 0x29, 0x46, 0x9a, 0xea, 0x2c, 0x4a, 0x99, 0xec, 0x69, 0xa1, 0xdd, + 0x92, 0x8a, 0x09, 0xea, 0x4f, 0xa2, 0x21, 0x9d, 0xf0, 0xa1, 0xaf, 0x2e, 0x39, 0x95, 0x86, 0x6b, + 0x6f, 0x8c, 0xd9, 0x98, 0xe1, 0xa3, 0xaf, 0x9f, 0xcc, 0xaa, 0xb7, 0x02, 0xcd, 0xfd, 0xf4, 0x94, + 0x05, 0xf4, 0x7c, 0x4a, 0xa5, 0xf2, 0x66, 0x15, 0x58, 0x36, 0xef, 0x92, 0xb3, 0x54, 0x52, 0xf2, + 0x1c, 0x00, 0x37, 0x0b, 0x25, 0x55, 0xd2, 0xb1, 0x3a, 0x95, 0x6e, 0xb3, 0xbf, 0xde, 0xcb, 0x3e, + 0x79, 0xfc, 0x5e, 0x4b, 0x03, 0xaa, 0x76, 0xaa, 0x57, 0xdf, 0xb7, 0x4a, 0x41, 0x63, 0x92, 0xbd, + 0x4b, 0xb2, 0x0d, 0x2b, 0xbb, 0x2c, 0xe1, 0x2c, 0xa5, 0xa9, 0x3a, 0xba, 0xe4, 0xd4, 0x29, 0x77, + 0xac, 0x6e, 0x23, 0x28, 0x2e, 0x92, 0x27, 0x50, 0xc3, 0x80, 0x9d, 0x4a, 0xc7, 0xea, 0x36, 0xfb, + 0x0f, 0x7a, 0x0b, 0xb9, 0xf4, 0x06, 0x5a, 0xc1, 0x60, 0x0c, 0xa4, 0x69, 0x31, 0x9d, 0x50, 0xe9, + 0x54, 0xef, 0xa0, 0x03, 0xad, 0x18, 0x1a, 0x21, 0xf2, 0x16, 0xee, 0x25, 0x54, 0x89, 0x78, 0x14, + 0x26, 0x54, 0x45, 0x27, 0x91, 0x8a, 0x9c, 0x1a, 0xfa, 0xb6, 0x0a, 0xbe, 0x03, 0x64, 0x0e, 0x32, + 0x04, 0x37, 0x58, 0x4d, 0x0a, 0x6b, 0xa4, 0x0f, 0x4b, 0x2a, 0x12, 0x63, 0x5d, 0x80, 0x3a, 0xee, + 0xe0, 0x14, 0x76, 0x38, 0x32, 0x1a, 0x5a, 0x73, 0x90, 0xbc, 0x80, 0x06, 0xbd, 0xa0, 0x09, 0x9f, + 0x44, 0x42, 0x3a, 0x4b, 0xe8, 0x6a, 0x17, 0x5c, 0x7b, 0xb9, 0x8a, 0xbe, 0x5b, 0x98, 0xf8, 0x50, + 0x3b, 0x9f, 0x52, 0x71, 0xe9, 0xd8, 0xe8, 0x6a, 0x15, 0x5c, 0x1f, 0xb4, 0xf2, 0xfa, 0x70, 0xdf, + 0x24, 0x8a, 0x1c, 0xf1, 0xa1, 0x2e, 0x55, 0xa4, 0xa6, 0xd2, 0x69, 0xa0, 0xe3, 0xe1, 0x6f, 0x55, + 0xd4, 0x12, 0xf2, 0x19, 0xe6, 0x7d, 0x2d, 0x43, 0x63, 0x5e, 0x5c, 0xd2, 0x02, 0x3b, 0x89, 0xd3, + 0x50, 0xc5, 0x09, 0x75, 0xac, 0x8e, 0xd5, 0xad, 0x04, 0x4b, 0x49, 0x9c, 0x1e, 0xc5, 0x09, 0x45, + 0x29, 0xba, 0x30, 0x52, 0x39, 0x93, 0xa2, 0x0b, 0x94, 0x1e, 0xc3, 0xba, 0x9c, 0x72, 0xce, 0x84, + 0x92, 0xa1, 0x3c, 0x8b, 0xc4, 0x49, 0x9c, 0x8e, 0xb1, 0x8b, 0x76, 0xb0, 0x96, 0x0b, 0x83, 0x6c, + 0x9d, 0xec, 0xc1, 0xd6, 0x1c, 0xfe, 0x1c, 0xab, 0x33, 0x36, 0x55, 0xa1, 0xa0, 0x7c, 0x12, 0x8f, + 0xa2, 0x10, 0x47, 0x46, 0x62, 0x6b, 0xec, 0xe0, 0x51, 0x8e, 0x7d, 0x34, 0x54, 0x60, 0x20, 0x1c, + 0x33, 0x49, 0x5e, 0x02, 0x28, 0x79, 0x32, 0x0c, 0x75, 0x5e, 0xba, 0x15, 0x7a, 0x16, 0x37, 0x8b, + 0xad, 0x18, 0xbc, 0xd9, 0xd1, 0x49, 0xe5, 0xf3, 0xa8, 0x71, 0xfd, 0x2e, 0xc9, 0x53, 0xd8, 0x98, + 0x87, 0xc0, 0x05, 0xfb, 0x44, 0x47, 0x2a, 0x66, 0xa9, 0x69, 0x8d, 0x1d, 0xdc, 0xcf, 0xb5, 0xc3, + 0x5b, 0xe9, 0x5d, 0xd5, 0xae, 0xae, 0xd5, 0xbc, 0x26, 0x34, 0xe6, 0xa3, 0xe5, 0x6d, 0x00, 0xf9, + 0x73, 0x5e, 0xf4, 0x19, 0x5a, 0x98, 0x01, 0x6f, 0x0f, 0x56, 0x0a, 0xcd, 0xfd, 0xbf, 0x0a, 0x7b, + 0xab, 0xb0, 0xbc, 0xd8, 0x6d, 0x6f, 0x19, 0xe0, 0xb6, 0x97, 0xde, 0x39, 0xd8, 0x79, 0xb2, 0x7a, + 0x00, 0xb2, 0x2a, 0x5a, 0x1d, 0xeb, 0x5f, 0xe7, 0x33, 0xc3, 0x0a, 0x01, 0x95, 0xff, 0x1e, 0x50, + 0xa5, 0x10, 0x50, 0x7f, 0x17, 0xaa, 0xf8, 0xb9, 0x57, 0xd9, 0x7f, 0xf1, 0x14, 0x2c, 0xdc, 0x22, + 0xed, 0xd6, 0x1d, 0x8a, 0xb9, 0x4f, 0x76, 0xb6, 0xaf, 0x7e, 0xba, 0xa5, 0xab, 0x99, 0x6b, 0x5d, + 0xcf, 0x5c, 0xeb, 0xc7, 0xcc, 0xb5, 0xbe, 0xdc, 0xb8, 0xa5, 0xeb, 0x1b, 0xb7, 0xf4, 0xed, 0xc6, + 0x2d, 0x1d, 0xd7, 0xcd, 0xed, 0x36, 0xac, 0xe3, 0xe5, 0xf4, 0xec, 0xd7, 0x00, 0x41, 0x05, 0x7b, + 0x5e, 0xf3, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/metadata/metadatapb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/metadata/metadatapb/rpc.pb.go index e7b51b665a9..01aad9c54ca 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/metadata/metadatapb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/metadata/metadatapb/rpc.pb.go @@ -278,37 +278,36 @@ func init() { func init() { proto.RegisterFile("metadata/metadatapb/rpc.proto", fileDescriptor_1d9ae5661e0dc3fc) } var fileDescriptor_1d9ae5661e0dc3fc = []byte{ - // 465 bytes of a gzipped FileDescriptorProto + // 461 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xcd, 0x6e, 0x13, 0x31, - 0x10, 0x5e, 0xe7, 0x8f, 0x74, 0x02, 0x15, 0x32, 0x25, 0xa4, 0x0b, 0xdd, 0x44, 0x2b, 0x0e, 0x7b, + 0x10, 0x5e, 0xe7, 0x8f, 0x74, 0x02, 0x15, 0x32, 0x25, 0x6c, 0x17, 0xea, 0x44, 0x2b, 0x0e, 0x7b, 0xca, 0xc2, 0xc2, 0x01, 0x71, 0x41, 0x8a, 0x04, 0xea, 0xa5, 0x12, 0x98, 0x0b, 0x02, 0xa1, 0xe2, - 0x14, 0x2b, 0x5d, 0xb1, 0xd9, 0x35, 0xf6, 0x04, 0x94, 0xb7, 0xe0, 0x19, 0x78, 0x04, 0x9e, 0x22, - 0xc7, 0x1e, 0x39, 0x55, 0x90, 0xdc, 0x78, 0x0a, 0x64, 0x7b, 0xb7, 0x34, 0xb0, 0x5c, 0x46, 0x33, - 0xf3, 0x7d, 0x9e, 0xf9, 0x3c, 0x1e, 0xc3, 0xc1, 0x5c, 0x20, 0x7f, 0xcf, 0x91, 0xc7, 0x95, 0x23, - 0xa7, 0xb1, 0x92, 0x27, 0x63, 0xa9, 0x0a, 0x2c, 0x68, 0x07, 0x4f, 0x79, 0x5e, 0x68, 0x7f, 0x5f, - 0x63, 0xa1, 0x44, 0x6c, 0xad, 0x9c, 0xc6, 0xb8, 0x94, 0x42, 0x3b, 0x8a, 0xbf, 0x37, 0x2b, 0x66, - 0x85, 0x75, 0x63, 0xe3, 0xb9, 0x6c, 0xf8, 0x95, 0xc0, 0xcd, 0x23, 0x81, 0x2a, 0x3d, 0x39, 0x2a, - 0xeb, 0x32, 0xf1, 0x71, 0x21, 0x34, 0xd2, 0x3e, 0x74, 0xe6, 0x16, 0x18, 0x90, 0x11, 0x89, 0x76, - 0x58, 0x19, 0xd1, 0x3d, 0x68, 0x67, 0xe9, 0x3c, 0xc5, 0x41, 0x63, 0x44, 0xa2, 0x36, 0x73, 0x01, - 0x7d, 0x03, 0xfb, 0x92, 0x2b, 0x4c, 0x79, 0x76, 0xac, 0x84, 0x96, 0x45, 0xae, 0xc5, 0xb1, 0x46, - 0xc5, 0x51, 0xcc, 0x96, 0x83, 0xe6, 0x88, 0x44, 0xbb, 0xc9, 0x70, 0xec, 0x44, 0x8e, 0x9f, 0x3b, - 0x22, 0x2b, 0x79, 0x2f, 0x4b, 0x1a, 0xbb, 0x25, 0xeb, 0x81, 0x10, 0xa1, 0xff, 0xb7, 0x46, 0xc7, - 0xa0, 0x0f, 0xa1, 0x5b, 0xcd, 0xc3, 0xca, 0xec, 0x25, 0xfd, 0xaa, 0xcb, 0xf6, 0x89, 0x43, 0x8f, - 0x5d, 0x30, 0xa9, 0x0f, 0x57, 0x3e, 0x73, 0x95, 0xa7, 0xf9, 0xcc, 0x5e, 0x62, 0xe7, 0xd0, 0x63, - 0x55, 0x62, 0xd2, 0x85, 0x8e, 0x12, 0x7a, 0x91, 0x61, 0xf8, 0x8d, 0xc0, 0xee, 0x76, 0x11, 0xfa, - 0x6c, 0xab, 0x5d, 0x33, 0xea, 0x25, 0x77, 0xeb, 0xdb, 0x8d, 0x2b, 0xe7, 0x69, 0x8e, 0x6a, 0x39, - 0x69, 0xad, 0xce, 0x87, 0x97, 0x04, 0xf8, 0xaf, 0xe0, 0xda, 0x16, 0x81, 0x5e, 0x87, 0xe6, 0x07, - 0xb1, 0x2c, 0x27, 0x6d, 0x5c, 0x7a, 0x1f, 0xda, 0x9f, 0x78, 0xb6, 0x10, 0x56, 0x61, 0x2f, 0xb9, - 0x5d, 0xdf, 0xc7, 0x9e, 0x66, 0x8e, 0xf9, 0xb8, 0xf1, 0x88, 0x84, 0x4f, 0xe0, 0x46, 0x0d, 0x83, - 0x46, 0xd0, 0x36, 0xcd, 0xf5, 0xa0, 0x61, 0x55, 0x5f, 0xbd, 0x54, 0x8d, 0x97, 0xea, 0x1c, 0x21, - 0x7c, 0x07, 0x2d, 0x93, 0xa4, 0x77, 0xa0, 0x65, 0xb6, 0xc7, 0x49, 0x9a, 0x74, 0x7f, 0x9d, 0x0f, - 0x6d, 0xcc, 0xac, 0x35, 0xe8, 0xa9, 0xc8, 0xa4, 0x1b, 0x9f, 0x43, 0x4d, 0xcc, 0xac, 0x35, 0xe8, - 0x22, 0x4f, 0xd1, 0xbe, 0x7b, 0x89, 0x9a, 0x98, 0x59, 0x9b, 0xbc, 0x85, 0xee, 0xc5, 0x40, 0x5f, - 0xfc, 0x33, 0xe2, 0x83, 0xfa, 0x8b, 0x96, 0x5b, 0xe9, 0x07, 0xff, 0x83, 0xdd, 0x42, 0xdc, 0x23, - 0x93, 0x68, 0xf5, 0x33, 0xf0, 0x56, 0xeb, 0x80, 0x9c, 0xad, 0x03, 0xf2, 0x63, 0x1d, 0x90, 0x2f, - 0x9b, 0xc0, 0x3b, 0xdb, 0x04, 0xde, 0xf7, 0x4d, 0xe0, 0xbd, 0x86, 0x3f, 0xdf, 0x67, 0xda, 0xb1, - 0x5f, 0xe0, 0xc1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x76, 0xe8, 0xa7, 0x5c, 0x03, 0x00, - 0x00, + 0x14, 0x2b, 0x5d, 0xb1, 0xd9, 0x35, 0xb6, 0x03, 0xca, 0x5b, 0xf0, 0x0c, 0x3c, 0x02, 0x4f, 0x91, + 0x63, 0x8f, 0x9c, 0x2a, 0x48, 0x6e, 0x3c, 0x05, 0xb2, 0xbd, 0xdb, 0x34, 0xb0, 0xbd, 0x8c, 0x66, + 0xfc, 0x7d, 0x9e, 0xef, 0xf3, 0x68, 0x0c, 0x07, 0x33, 0xae, 0xd9, 0x47, 0xa6, 0x59, 0x5c, 0x25, + 0x62, 0x12, 0x4b, 0x71, 0x32, 0x12, 0xb2, 0xd0, 0x05, 0xee, 0xe8, 0x53, 0x96, 0x17, 0x2a, 0xd8, + 0x57, 0xba, 0x90, 0x3c, 0xb6, 0x51, 0x4c, 0x62, 0xbd, 0x10, 0x5c, 0x39, 0x4a, 0xb0, 0x37, 0x2d, + 0xa6, 0x85, 0x4d, 0x63, 0x93, 0xb9, 0xd3, 0xf0, 0x3b, 0x82, 0xdb, 0x47, 0x5c, 0xcb, 0xf4, 0xe4, + 0xa8, 0xec, 0x4b, 0xf9, 0xe7, 0x39, 0x57, 0x1a, 0xf7, 0xa1, 0x33, 0xb3, 0x80, 0x8f, 0x86, 0x28, + 0xda, 0xa1, 0x65, 0x85, 0xf7, 0xa0, 0x9d, 0xa5, 0xb3, 0x54, 0xfb, 0x8d, 0x21, 0x8a, 0xda, 0xd4, + 0x15, 0xf8, 0x1d, 0xec, 0x0b, 0x26, 0x75, 0xca, 0xb2, 0x63, 0xc9, 0x95, 0x28, 0x72, 0xc5, 0x8f, + 0x95, 0x96, 0x4c, 0xf3, 0xe9, 0xc2, 0x6f, 0x0e, 0x51, 0xb4, 0x9b, 0x0c, 0x46, 0xce, 0xe4, 0xe8, + 0xa5, 0x23, 0xd2, 0x92, 0xf7, 0xba, 0xa4, 0xd1, 0x3b, 0xa2, 0x1e, 0x08, 0x35, 0xf4, 0xff, 0xf5, + 0xe8, 0x18, 0xf8, 0x31, 0x74, 0xab, 0x79, 0x58, 0x9b, 0xbd, 0xa4, 0x5f, 0xa9, 0x6c, 0xdf, 0x38, + 0xf4, 0xe8, 0x05, 0x13, 0x07, 0x70, 0xed, 0x2b, 0x93, 0x79, 0x9a, 0x4f, 0xed, 0x23, 0x76, 0x0e, + 0x3d, 0x5a, 0x1d, 0x8c, 0xbb, 0xd0, 0x91, 0x5c, 0xcd, 0x33, 0x1d, 0xfe, 0x40, 0xb0, 0xbb, 0xdd, + 0x04, 0xbf, 0xd8, 0x92, 0x6b, 0x46, 0xbd, 0xe4, 0x7e, 0xbd, 0xdc, 0xa8, 0x4a, 0x9e, 0xe7, 0x5a, + 0x2e, 0xc6, 0xad, 0xe5, 0xf9, 0xe0, 0x92, 0x81, 0xe0, 0x0d, 0xdc, 0xd8, 0x22, 0xe0, 0x9b, 0xd0, + 0xfc, 0xc4, 0x17, 0xe5, 0xa4, 0x4d, 0x8a, 0x1f, 0x42, 0xfb, 0x0b, 0xcb, 0xe6, 0xdc, 0x3a, 0xec, + 0x25, 0x77, 0xeb, 0x75, 0xec, 0x6d, 0xea, 0x98, 0x4f, 0x1b, 0x4f, 0x50, 0xf8, 0x0c, 0x6e, 0xd5, + 0x30, 0x70, 0x04, 0x6d, 0x23, 0xae, 0xfc, 0x86, 0x75, 0x7d, 0xfd, 0x52, 0x37, 0x56, 0xba, 0x73, + 0x84, 0xf0, 0x03, 0xb4, 0xcc, 0x21, 0xbe, 0x07, 0x2d, 0xb3, 0x3d, 0xce, 0xd2, 0xb8, 0xfb, 0xe7, + 0x7c, 0x60, 0x6b, 0x6a, 0xa3, 0x41, 0x4f, 0x79, 0x26, 0xfc, 0xc6, 0x06, 0x35, 0x35, 0xb5, 0xd1, + 0xa0, 0xf3, 0x3c, 0xd5, 0x7e, 0x73, 0x83, 0x9a, 0x9a, 0xda, 0x98, 0xbc, 0x87, 0xee, 0xc5, 0x40, + 0x5f, 0xfd, 0x37, 0xe2, 0x83, 0xfa, 0x87, 0x96, 0x5b, 0x19, 0x90, 0xab, 0x60, 0xb7, 0x10, 0x0f, + 0xd0, 0x38, 0x5a, 0xfe, 0x26, 0xde, 0x72, 0x45, 0xd0, 0xd9, 0x8a, 0xa0, 0x5f, 0x2b, 0x82, 0xbe, + 0xad, 0x89, 0x77, 0xb6, 0x26, 0xde, 0xcf, 0x35, 0xf1, 0xde, 0xc2, 0xe6, 0xfb, 0x4c, 0x3a, 0xf6, + 0x0b, 0x3c, 0xfa, 0x3b, 0x00, 0xfa, 0x76, 0xe8, 0xa7, 0x5c, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/pool/pool.go b/vendor/github.com/thanos-io/thanos/pkg/pool/pool.go index f3481257f2e..6a3d59997d4 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/pool/pool.go +++ b/vendor/github.com/thanos-io/thanos/pkg/pool/pool.go @@ -15,6 +15,10 @@ type Pool[T any] interface { Get(sz int) (*[]T, error) // Put returns a T slice to the right bucket in the pool. Put(b *[]T) + // UsedBytes returns the number of bytes currently in use from the pool. + UsedBytes() uint64 + // MaxBytes returns the maximum number of bytes that can be in use at once, 0 means unlimited. + MaxBytes() uint64 } // NoopPool is pool that always allocated required slice on heap and ignore puts. @@ -27,6 +31,12 @@ func (p NoopPool[T]) Get(sz int) (*[]T, error) { func (p NoopPool[T]) Put(*[]T) {} +// UsedBytes always returns 0 as NoopPool does not track usage. +func (p NoopPool[T]) UsedBytes() uint64 { return 0 } + +// MaxBytes always returns 0 as NoopPool is unlimited. +func (p NoopPool[T]) MaxBytes() uint64 { return 0 } + // BucketedPool is a bucketed pool for variably sized T slices. It can be // configured to not allow more than a maximum number of T items being used at a // given time. Every slice obtained from the pool must be returned. @@ -145,3 +155,8 @@ func (p *BucketedPool[T]) UsedBytes() uint64 { return p.usedTotal } + +// MaxBytes returns the maximum number of bytes that can be in use at once, 0 means unlimited. +func (p *BucketedPool[T]) MaxBytes() uint64 { + return p.maxTotal +} diff --git a/vendor/github.com/thanos-io/thanos/pkg/query/iter.go b/vendor/github.com/thanos-io/thanos/pkg/query/iter.go index e5276ec79bf..ef6cc60a5ee 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/query/iter.go +++ b/vendor/github.com/thanos-io/thanos/pkg/query/iter.go @@ -111,31 +111,27 @@ func (s *chunkSeries) Labels() labels.Labels { func (s *chunkSeries) Iterator(_ chunkenc.Iterator) chunkenc.Iterator { var sit chunkenc.Iterator - its := make([]chunkenc.Iterator, 0, len(s.chunks)) if len(s.aggrs) == 1 { switch s.aggrs[0] { case storepb.Aggr_COUNT: - for _, c := range s.chunks { - its = append(its, getFirstIterator(c.Count, c.Raw)) - } - sit = newChunkSeriesIterator(its) + sit = newLazyChunkSeriesIterator(extractChunks(s.chunks, func(c storepb.AggrChunk) *storepb.Chunk { + return getFirstChunk(c.Count, c.Raw) + })) case storepb.Aggr_SUM: - for _, c := range s.chunks { - its = append(its, getFirstIterator(c.Sum, c.Raw)) - } - sit = newChunkSeriesIterator(its) + sit = newLazyChunkSeriesIterator(extractChunks(s.chunks, func(c storepb.AggrChunk) *storepb.Chunk { + return getFirstChunk(c.Sum, c.Raw) + })) case storepb.Aggr_MIN: - for _, c := range s.chunks { - its = append(its, getFirstIterator(c.Min, c.Raw)) - } - sit = newChunkSeriesIterator(its) + sit = newLazyChunkSeriesIterator(extractChunks(s.chunks, func(c storepb.AggrChunk) *storepb.Chunk { + return getFirstChunk(c.Min, c.Raw) + })) case storepb.Aggr_MAX: - for _, c := range s.chunks { - its = append(its, getFirstIterator(c.Max, c.Raw)) - } - sit = newChunkSeriesIterator(its) + sit = newLazyChunkSeriesIterator(extractChunks(s.chunks, func(c storepb.AggrChunk) *storepb.Chunk { + return getFirstChunk(c.Max, c.Raw) + })) case storepb.Aggr_COUNTER: + its := make([]chunkenc.Iterator, 0, len(s.chunks)) for _, c := range s.chunks { its = append(its, getFirstIterator(c.Counter, c.Raw)) } @@ -155,21 +151,52 @@ func (s *chunkSeries) Iterator(_ chunkenc.Iterator) chunkenc.Iterator { case s.aggrs[0] == storepb.Aggr_SUM && s.aggrs[1] == storepb.Aggr_COUNT, s.aggrs[0] == storepb.Aggr_COUNT && s.aggrs[1] == storepb.Aggr_SUM: + allRaw := true for _, c := range s.chunks { - if c.Raw != nil { - its = append(its, getFirstIterator(c.Raw)) - } else { - sum, cnt := getFirstIterator(c.Sum), getFirstIterator(c.Count) - its = append(its, downsample.NewAverageChunkIterator(cnt, sum)) + if c.Raw == nil { + allRaw = false + break } } - sit = newChunkSeriesIterator(its) + if allRaw { + sit = newLazyChunkSeriesIterator(extractChunks(s.chunks, func(c storepb.AggrChunk) *storepb.Chunk { + return c.Raw + })) + } else { + its := make([]chunkenc.Iterator, 0, len(s.chunks)) + for _, c := range s.chunks { + if c.Raw != nil { + its = append(its, getFirstIterator(c.Raw)) + } else { + sum, cnt := getFirstIterator(c.Sum), getFirstIterator(c.Count) + its = append(its, downsample.NewAverageChunkIterator(cnt, sum)) + } + } + sit = newChunkSeriesIterator(its) + } default: return errSeriesIterator{err: errors.Errorf("unexpected result aggregate type %v", s.aggrs)} } return dedup.NewBoundedSeriesIterator(sit, s.mint, s.maxt) } +func extractChunks(aggrChunks []storepb.AggrChunk, pick func(storepb.AggrChunk) *storepb.Chunk) []*storepb.Chunk { + chunks := make([]*storepb.Chunk, len(aggrChunks)) + for i, c := range aggrChunks { + chunks[i] = pick(c) + } + return chunks +} + +func getFirstChunk(cs ...*storepb.Chunk) *storepb.Chunk { + for _, c := range cs { + if c != nil { + return c + } + } + return nil +} + func getFirstIterator(cs ...*storepb.Chunk) chunkenc.Iterator { for _, c := range cs { if c == nil { @@ -285,6 +312,79 @@ func (it *chunkSeriesIterator) Err() error { return it.cur.Err() } +// lazyChunkSeriesIterator creates chunk iterators lazily with reuse across chunks. +type lazyChunkSeriesIterator struct { + chunks []*storepb.Chunk + i int + cur chunkenc.Iterator + + lastVal chunkenc.ValueType +} + +func newLazyChunkSeriesIterator(chunks []*storepb.Chunk) chunkenc.Iterator { + if len(chunks) == 0 { + return errSeriesIterator{err: errors.New("got empty chunks")} + } + it := &lazyChunkSeriesIterator{chunks: chunks} + it.reset(chunks[0]) + return it +} + +func (it *lazyChunkSeriesIterator) reset(c *storepb.Chunk) { + if c == nil { + it.cur = errSeriesIterator{errors.New("nil chunk")} + return + } + chk, err := chunkenc.FromData(chunkEncoding(c.Type), c.Data) + if err != nil { + it.cur = errSeriesIterator{err} + return + } + it.cur = chk.Iterator(it.cur) +} + +func (it *lazyChunkSeriesIterator) Seek(t int64) chunkenc.ValueType { + for { + ct := it.AtT() + if ct >= t { + return it.lastVal + } + it.lastVal = it.Next() + if it.lastVal == chunkenc.ValNone { + return chunkenc.ValNone + } + } +} + +func (it *lazyChunkSeriesIterator) At() (int64, float64) { return it.cur.At() } +func (it *lazyChunkSeriesIterator) AtHistogram(h *histogram.Histogram) (int64, *histogram.Histogram) { + return it.cur.AtHistogram(h) +} + +func (it *lazyChunkSeriesIterator) AtFloatHistogram(fh *histogram.FloatHistogram) (int64, *histogram.FloatHistogram) { + return it.cur.AtFloatHistogram(fh) +} +func (it *lazyChunkSeriesIterator) AtT() int64 { return it.cur.AtT() } +func (it *lazyChunkSeriesIterator) Err() error { return it.cur.Err() } + +func (it *lazyChunkSeriesIterator) Next() chunkenc.ValueType { + lastT := it.AtT() + + if valueType := it.cur.Next(); valueType != chunkenc.ValNone { + it.lastVal = valueType + return valueType + } + if it.Err() != nil { + return chunkenc.ValNone + } + if it.i >= len(it.chunks)-1 { + return chunkenc.ValNone + } + it.i++ + it.reset(it.chunks[it.i]) + return it.Seek(lastT + 1) +} + type lazySeriesSet struct { create func() (s storage.SeriesSet, ok bool) diff --git a/vendor/github.com/thanos-io/thanos/pkg/rules/rulespb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/rules/rulespb/rpc.pb.go index bf8891cf554..8672b030fe2 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/rules/rulespb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/rules/rulespb/rpc.pb.go @@ -558,77 +558,77 @@ func init() { func init() { proto.RegisterFile("rules/rulespb/rpc.proto", fileDescriptor_91b1d28f30eb5efb) } var fileDescriptor_91b1d28f30eb5efb = []byte{ - // 1111 bytes of a gzipped FileDescriptorProto + // 1106 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6e, 0xdb, 0xc6, - 0x13, 0x16, 0x45, 0x91, 0x12, 0x47, 0x96, 0xa3, 0x6c, 0x62, 0x98, 0xb6, 0x7f, 0x3f, 0xd1, 0x10, + 0x13, 0x16, 0x45, 0x91, 0x12, 0x47, 0x96, 0xa3, 0x6c, 0x12, 0x98, 0x76, 0x7e, 0x3f, 0x51, 0x10, 0xe0, 0xc2, 0x2d, 0x1a, 0xa9, 0x70, 0x90, 0x14, 0x39, 0xb5, 0x96, 0xff, 0xc4, 0x46, 0x0d, 0x25, 0x58, 0xb9, 0x2d, 0x90, 0x1e, 0x54, 0x5a, 0x5e, 0xcb, 0x44, 0x29, 0x92, 0x59, 0xae, 0x5c, 0xf8, 0x2d, 0x72, 0xee, 0x8b, 0x14, 0x7d, 0x03, 0xdf, 0x9a, 0x63, 0x4f, 0x6a, 0x6b, 0xdf, 0x74, 0xe8, 0x33, 0x14, 0x3b, 0x4b, 0x8a, 0xb2, 0x6b, 0xd7, 0x49, 0xeb, 0x5e, 0xb4, 0xbb, 0xdf, 0x7c, 0xb3, - 0x7f, 0x66, 0xbe, 0x19, 0x11, 0xe6, 0xf9, 0xd0, 0x67, 0x71, 0x13, 0x7f, 0xa3, 0x83, 0x26, 0x8f, - 0x7a, 0x8d, 0x88, 0x87, 0x22, 0x24, 0xa6, 0x38, 0x76, 0x83, 0x30, 0x5e, 0x5c, 0x88, 0x45, 0xc8, - 0x59, 0x13, 0x7f, 0xa3, 0x83, 0xa6, 0x38, 0x8d, 0x58, 0xac, 0x28, 0xa9, 0xc9, 0x77, 0x0f, 0x98, - 0x7f, 0xc5, 0xf4, 0xb0, 0x1f, 0xf6, 0x43, 0x9c, 0x36, 0xe5, 0x2c, 0x41, 0x9d, 0x7e, 0x18, 0xf6, - 0x7d, 0xd6, 0xc4, 0xd5, 0xc1, 0xf0, 0xa8, 0x29, 0xbc, 0x01, 0x8b, 0x85, 0x3b, 0x88, 0x14, 0xa1, - 0xfe, 0x53, 0x1e, 0x66, 0xa8, 0xbc, 0x0a, 0x65, 0xaf, 0x87, 0x2c, 0x16, 0xe4, 0x11, 0x14, 0xe4, - 0xb6, 0xb6, 0xb6, 0xac, 0xad, 0xce, 0xae, 0x2d, 0x34, 0xd4, 0xa5, 0x1a, 0xd3, 0x9c, 0xc6, 0xfe, - 0x69, 0xc4, 0x28, 0xd2, 0xc8, 0x37, 0xb0, 0x10, 0xb9, 0x5c, 0x78, 0xae, 0xdf, 0xe5, 0x2c, 0x8e, - 0xc2, 0x20, 0x66, 0xdd, 0x58, 0x70, 0x57, 0xb0, 0xfe, 0xa9, 0x9d, 0xc7, 0x3d, 0x9c, 0x74, 0x8f, - 0x97, 0x8a, 0x48, 0x13, 0x5e, 0x27, 0xa1, 0xd1, 0xf9, 0xe8, 0x7a, 0x03, 0x59, 0x81, 0xd9, 0x81, - 0x2b, 0x7a, 0xc7, 0x8c, 0xcb, 0x3d, 0xbd, 0xa0, 0x6f, 0xeb, 0xcb, 0xfa, 0xaa, 0x45, 0x2b, 0x09, - 0xda, 0x41, 0x90, 0x2c, 0x81, 0x25, 0xa3, 0xd9, 0x0d, 0xdc, 0x01, 0xb3, 0x0b, 0xc8, 0x28, 0x49, - 0xa0, 0xed, 0x0e, 0x18, 0xf9, 0x3f, 0x00, 0x1a, 0xfb, 0x3c, 0x1c, 0x46, 0xb6, 0x81, 0x56, 0xa4, - 0x3f, 0x97, 0x00, 0x21, 0x50, 0x38, 0xf2, 0x7c, 0x66, 0x9b, 0x68, 0xc0, 0x79, 0xfd, 0x03, 0x28, - 0xc8, 0x17, 0x92, 0x22, 0xe8, 0xeb, 0x7b, 0x7b, 0xd5, 0x1c, 0xb1, 0xc0, 0x58, 0xdf, 0xdb, 0xa2, - 0xfb, 0x55, 0x8d, 0x00, 0x98, 0x74, 0x6b, 0xe3, 0x05, 0xdd, 0xac, 0xe6, 0xeb, 0xdf, 0x42, 0x25, - 0x09, 0x8b, 0xba, 0x37, 0xf9, 0x10, 0x0c, 0x75, 0x8c, 0x0c, 0x5e, 0x79, 0xed, 0xfe, 0x74, 0xf0, - 0xf0, 0xb8, 0x9d, 0x1c, 0x55, 0x0c, 0xb2, 0x08, 0xc5, 0xef, 0x5d, 0x1e, 0xc8, 0x37, 0xc9, 0x28, - 0x59, 0x3b, 0x39, 0x9a, 0x02, 0xad, 0x12, 0x98, 0x9c, 0xc5, 0x43, 0x5f, 0xd4, 0x37, 0x00, 0x26, - 0xbe, 0x31, 0x79, 0x02, 0x26, 0x3a, 0xc7, 0xb6, 0xb6, 0xac, 0x5f, 0xbb, 0x7f, 0x0b, 0xc6, 0x23, - 0x27, 0x21, 0xd1, 0x64, 0xac, 0xff, 0xa1, 0x83, 0x35, 0x61, 0x90, 0xff, 0x41, 0x01, 0xe3, 0x24, - 0xaf, 0x68, 0xb5, 0x4a, 0xe3, 0x91, 0x83, 0x6b, 0x8a, 0xbf, 0xd2, 0x8a, 0xe1, 0xc8, 0x67, 0x56, - 0xb9, 0x56, 0x81, 0x21, 0x8f, 0xc0, 0x40, 0xd9, 0x62, 0x1a, 0xca, 0x6b, 0x33, 0xd3, 0xe7, 0xb7, - 0xac, 0xf1, 0xc8, 0x51, 0x66, 0xaa, 0x06, 0xb2, 0x0a, 0x25, 0x2f, 0x10, 0x8c, 0x9f, 0xb8, 0xbe, - 0x5d, 0x58, 0xd6, 0x56, 0xb5, 0xd6, 0xcc, 0x78, 0xe4, 0x4c, 0x30, 0x3a, 0x99, 0x11, 0x0a, 0x4b, - 0xec, 0xc4, 0xf5, 0x87, 0xae, 0xf0, 0xc2, 0xa0, 0x7b, 0x38, 0xe4, 0x6a, 0x12, 0xb3, 0x5e, 0x18, - 0x1c, 0xc6, 0xb6, 0x81, 0xce, 0x64, 0x3c, 0x72, 0x66, 0x33, 0xda, 0xbe, 0x37, 0x60, 0x74, 0x21, - 0x5b, 0x6f, 0x26, 0x5e, 0x1d, 0xe5, 0x44, 0xba, 0x70, 0xcf, 0x77, 0x63, 0xd1, 0xcd, 0x18, 0xb6, - 0x89, 0x69, 0x59, 0x6c, 0xa8, 0xa2, 0x68, 0xa4, 0x45, 0xd1, 0xd8, 0x4f, 0x8b, 0xa2, 0xb5, 0x78, - 0x36, 0x72, 0x72, 0xf2, 0x1c, 0xe9, 0xba, 0x35, 0xf1, 0x7c, 0xf3, 0xab, 0xa3, 0xd1, 0x2b, 0x18, - 0x71, 0xc0, 0xf0, 0xbd, 0x81, 0x27, 0x6c, 0x6b, 0x59, 0x5b, 0xd5, 0xd5, 0xfb, 0x11, 0xa0, 0x6a, - 0x20, 0x27, 0x30, 0x7f, 0x83, 0xe4, 0xed, 0xd2, 0x3b, 0x55, 0x46, 0x6b, 0x69, 0x3c, 0x72, 0x6e, - 0xaa, 0x0e, 0x7a, 0xd3, 0xe6, 0xf5, 0x00, 0x0a, 0x32, 0x23, 0xe4, 0x09, 0x58, 0x9c, 0xf5, 0x42, - 0x7e, 0x28, 0x55, 0xa6, 0x24, 0x39, 0x37, 0x49, 0x59, 0x6a, 0x90, 0xcc, 0x9d, 0x1c, 0xcd, 0x98, - 0x64, 0x05, 0x0c, 0xd7, 0x67, 0x5c, 0xa0, 0x08, 0xca, 0x6b, 0x95, 0xd4, 0x65, 0x5d, 0x82, 0x52, - 0xc1, 0x68, 0x9d, 0x52, 0xe9, 0x8f, 0x3a, 0x54, 0xd0, 0xb8, 0x1b, 0xc4, 0xc2, 0x0d, 0x7a, 0x8c, - 0x3c, 0x03, 0x13, 0x7b, 0x54, 0x7c, 0xb5, 0x12, 0x5e, 0xed, 0x49, 0xb8, 0xc3, 0x44, 0x6b, 0x36, - 0x89, 0x74, 0x42, 0xa4, 0xc9, 0x48, 0x76, 0xa0, 0xec, 0x06, 0x41, 0x28, 0x30, 0xc6, 0x71, 0x72, - 0x87, 0x6b, 0xfc, 0x1f, 0x24, 0xfe, 0xd3, 0x6c, 0x3a, 0xbd, 0x20, 0x8f, 0xc1, 0x88, 0x85, 0x2b, - 0x98, 0xad, 0x63, 0xb0, 0xc9, 0xa5, 0x77, 0x74, 0xa4, 0x45, 0xe5, 0x0c, 0x49, 0x54, 0x0d, 0xa4, - 0x03, 0x96, 0xdb, 0x13, 0xde, 0x09, 0xeb, 0xba, 0x02, 0x45, 0x7b, 0x8b, 0x5e, 0xc6, 0x23, 0x87, - 0x28, 0x87, 0x75, 0xf1, 0x71, 0x38, 0xf0, 0x04, 0x1b, 0x44, 0xe2, 0x14, 0xf5, 0x52, 0x4a, 0x71, - 0xa9, 0x14, 0x29, 0x1b, 0x86, 0x42, 0xb6, 0xd4, 0xa9, 0x08, 0x50, 0x35, 0xfc, 0x9d, 0x52, 0xcc, - 0xff, 0x52, 0x29, 0x3f, 0x1b, 0x60, 0x60, 0x38, 0xb2, 0x60, 0x69, 0xef, 0x11, 0xac, 0xb4, 0x97, - 0xe4, 0xaf, 0xed, 0x25, 0x0e, 0x18, 0xaf, 0x87, 0x8c, 0x9f, 0x62, 0xfc, 0x93, 0x57, 0x23, 0x40, - 0xd5, 0x40, 0x3e, 0x85, 0xea, 0x5f, 0x4a, 0x7d, 0xaa, 0x4f, 0xa4, 0x36, 0x7a, 0xef, 0xf0, 0x4a, - 0x69, 0x67, 0xf2, 0x32, 0xfe, 0xa5, 0xbc, 0xcc, 0x7f, 0x2e, 0xaf, 0x67, 0x60, 0x62, 0x21, 0xc4, - 0x76, 0x11, 0xbb, 0xe1, 0xdc, 0xa5, 0x90, 0xa5, 0xa5, 0xa0, 0x3a, 0xb2, 0x22, 0xd2, 0x64, 0x24, - 0x75, 0x30, 0x8f, 0x99, 0xeb, 0x8b, 0x63, 0xec, 0x03, 0x96, 0xe2, 0x28, 0x84, 0x26, 0x23, 0x79, - 0x0a, 0xa0, 0xda, 0x17, 0xe7, 0x21, 0xc7, 0x16, 0x63, 0xb5, 0xe6, 0xc7, 0x23, 0xe7, 0x01, 0x76, - 0x21, 0x09, 0x66, 0x72, 0xa3, 0xd6, 0x04, 0xbc, 0xad, 0x95, 0xc2, 0x1d, 0xb5, 0xd2, 0xf2, 0x9d, - 0xb6, 0xd2, 0x1d, 0x98, 0xff, 0x8e, 0xb1, 0xa8, 0x7b, 0xe4, 0xc9, 0x3f, 0xf4, 0xee, 0x51, 0xc8, - 0x27, 0x17, 0x9e, 0xc1, 0x0b, 0xdf, 0x1f, 0x8f, 0x9c, 0x8a, 0xa4, 0x6c, 0x23, 0x63, 0x3b, 0xe4, - 0xf4, 0xe1, 0xa5, 0x65, 0x72, 0xd5, 0xfa, 0x0f, 0x3a, 0x54, 0x2e, 0xf5, 0xb6, 0x5b, 0xfe, 0xf0, - 0x26, 0x22, 0xcd, 0xdf, 0x20, 0xd2, 0x4c, 0x6b, 0xfa, 0xfb, 0x6a, 0x2d, 0x4b, 0x73, 0xe1, 0x1d, - 0xd3, 0x6c, 0xdc, 0x55, 0x9a, 0xcd, 0x3b, 0x4a, 0x73, 0xf1, 0x2e, 0xd3, 0xfc, 0xd1, 0xe7, 0x00, - 0x59, 0x3f, 0x21, 0x65, 0x28, 0x7e, 0xd9, 0xfe, 0xa2, 0xfd, 0xe2, 0xeb, 0x76, 0x35, 0x47, 0x66, - 0xa0, 0xb4, 0xdb, 0x5e, 0xdf, 0xd8, 0xdf, 0xfd, 0x6a, 0xab, 0xaa, 0x49, 0xd3, 0xcb, 0xad, 0xf6, - 0xe6, 0x6e, 0xfb, 0x79, 0x35, 0x2f, 0x3f, 0xb9, 0xb6, 0x77, 0xa9, 0x9c, 0xeb, 0x6b, 0x9f, 0x81, - 0x81, 0x9f, 0x5c, 0xe4, 0x69, 0x3a, 0x79, 0x78, 0xdd, 0x17, 0xea, 0xe2, 0xdc, 0x15, 0x54, 0xf5, - 0xbd, 0x4f, 0xb4, 0xd6, 0xca, 0xd9, 0xef, 0xb5, 0xdc, 0xd9, 0x79, 0x4d, 0x7b, 0x7b, 0x5e, 0xd3, - 0x7e, 0x3b, 0xaf, 0x69, 0x6f, 0x2e, 0x6a, 0xb9, 0xb7, 0x17, 0xb5, 0xdc, 0x2f, 0x17, 0xb5, 0xdc, - 0xab, 0x62, 0xf2, 0x55, 0x7e, 0x60, 0xe2, 0x4b, 0x1f, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0xd0, - 0x1f, 0xed, 0xa3, 0xad, 0x0b, 0x00, 0x00, + 0x7f, 0x66, 0xbe, 0x19, 0x11, 0x16, 0xf8, 0xc8, 0x67, 0x71, 0x0b, 0x7f, 0xa3, 0xfd, 0x16, 0x8f, + 0xfa, 0xcd, 0x88, 0x87, 0x22, 0x24, 0xa6, 0x38, 0x72, 0x83, 0x30, 0x5e, 0x5a, 0x8c, 0x45, 0xc8, + 0x59, 0x0b, 0x7f, 0xa3, 0xfd, 0x96, 0x38, 0x89, 0x58, 0xac, 0x28, 0xa9, 0xc9, 0x77, 0xf7, 0x99, + 0x7f, 0xc9, 0x74, 0x7f, 0x10, 0x0e, 0x42, 0x9c, 0xb6, 0xe4, 0x2c, 0x41, 0x9d, 0x41, 0x18, 0x0e, + 0x7c, 0xd6, 0xc2, 0xd5, 0xfe, 0xe8, 0xb0, 0x25, 0xbc, 0x21, 0x8b, 0x85, 0x3b, 0x8c, 0x14, 0xa1, + 0xf1, 0x53, 0x1e, 0xe6, 0xa8, 0xbc, 0x0a, 0x65, 0xaf, 0x47, 0x2c, 0x16, 0xe4, 0x11, 0x14, 0xe4, + 0xb6, 0xb6, 0x56, 0xd7, 0x56, 0xe6, 0x57, 0x17, 0x9b, 0xea, 0x52, 0xcd, 0x59, 0x4e, 0x73, 0xef, + 0x24, 0x62, 0x14, 0x69, 0xe4, 0x1b, 0x58, 0x8c, 0x5c, 0x2e, 0x3c, 0xd7, 0xef, 0x71, 0x16, 0x47, + 0x61, 0x10, 0xb3, 0x5e, 0x2c, 0xb8, 0x2b, 0xd8, 0xe0, 0xc4, 0xce, 0xe3, 0x1e, 0x4e, 0xba, 0xc7, + 0x4b, 0x45, 0xa4, 0x09, 0xaf, 0x9b, 0xd0, 0xe8, 0x42, 0x74, 0xb5, 0x81, 0x2c, 0xc3, 0xfc, 0xd0, + 0x15, 0xfd, 0x23, 0xc6, 0xe5, 0x9e, 0x5e, 0x30, 0xb0, 0xf5, 0xba, 0xbe, 0x62, 0xd1, 0x4a, 0x82, + 0x76, 0x11, 0x24, 0x0f, 0xc1, 0x92, 0xd1, 0xec, 0x05, 0xee, 0x90, 0xd9, 0x05, 0x64, 0x94, 0x24, + 0xd0, 0x71, 0x87, 0x8c, 0xfc, 0x1f, 0x00, 0x8d, 0x03, 0x1e, 0x8e, 0x22, 0xdb, 0x40, 0x2b, 0xd2, + 0x9f, 0x4b, 0x80, 0x10, 0x28, 0x1c, 0x7a, 0x3e, 0xb3, 0x4d, 0x34, 0xe0, 0xbc, 0xf1, 0x01, 0x14, + 0xe4, 0x0b, 0x49, 0x11, 0xf4, 0xb5, 0xdd, 0xdd, 0x6a, 0x8e, 0x58, 0x60, 0xac, 0xed, 0x6e, 0xd2, + 0xbd, 0xaa, 0x46, 0x00, 0x4c, 0xba, 0xb9, 0xfe, 0x82, 0x6e, 0x54, 0xf3, 0x8d, 0x6f, 0xa1, 0x92, + 0x84, 0x45, 0xdd, 0x9b, 0x7c, 0x08, 0x86, 0x3a, 0x46, 0x06, 0xaf, 0xbc, 0x7a, 0x77, 0x36, 0x78, + 0x78, 0xdc, 0x76, 0x8e, 0x2a, 0x06, 0x59, 0x82, 0xe2, 0xf7, 0x2e, 0x0f, 0xe4, 0x9b, 0x64, 0x94, + 0xac, 0xed, 0x1c, 0x4d, 0x81, 0x76, 0x09, 0x4c, 0xce, 0xe2, 0x91, 0x2f, 0x1a, 0xeb, 0x00, 0x53, + 0xdf, 0x98, 0x3c, 0x01, 0x13, 0x9d, 0x63, 0x5b, 0xab, 0xeb, 0x57, 0xee, 0xdf, 0x86, 0xc9, 0xd8, + 0x49, 0x48, 0x34, 0x19, 0x1b, 0x7f, 0xe8, 0x60, 0x4d, 0x19, 0xe4, 0x7f, 0x50, 0xc0, 0x38, 0xc9, + 0x2b, 0x5a, 0xed, 0xd2, 0x64, 0xec, 0xe0, 0x9a, 0xe2, 0xaf, 0xb4, 0x62, 0x38, 0xf2, 0x99, 0x55, + 0xae, 0x55, 0x60, 0xc8, 0x23, 0x30, 0x50, 0xb6, 0x98, 0x86, 0xf2, 0xea, 0xdc, 0xec, 0xf9, 0x6d, + 0x6b, 0x32, 0x76, 0x94, 0x99, 0xaa, 0x81, 0xac, 0x40, 0xc9, 0x0b, 0x04, 0xe3, 0xc7, 0xae, 0x6f, + 0x17, 0xea, 0xda, 0x8a, 0xd6, 0x9e, 0x9b, 0x8c, 0x9d, 0x29, 0x46, 0xa7, 0x33, 0x42, 0xe1, 0x21, + 0x3b, 0x76, 0xfd, 0x91, 0x2b, 0xbc, 0x30, 0xe8, 0x1d, 0x8c, 0xb8, 0x9a, 0xc4, 0xac, 0x1f, 0x06, + 0x07, 0xb1, 0x6d, 0xa0, 0x33, 0x99, 0x8c, 0x9d, 0xf9, 0x8c, 0xb6, 0xe7, 0x0d, 0x19, 0x5d, 0xcc, + 0xd6, 0x1b, 0x89, 0x57, 0x57, 0x39, 0x91, 0x1e, 0xdc, 0xf1, 0xdd, 0x58, 0xf4, 0x32, 0x86, 0x6d, + 0x62, 0x5a, 0x96, 0x9a, 0xaa, 0x28, 0x9a, 0x69, 0x51, 0x34, 0xf7, 0xd2, 0xa2, 0x68, 0x2f, 0x9d, + 0x8e, 0x9d, 0x9c, 0x3c, 0x47, 0xba, 0x6e, 0x4e, 0x3d, 0xdf, 0xfc, 0xea, 0x68, 0xf4, 0x12, 0x46, + 0x1c, 0x30, 0x7c, 0x6f, 0xe8, 0x09, 0xdb, 0xaa, 0x6b, 0x2b, 0xba, 0x7a, 0x3f, 0x02, 0x54, 0x0d, + 0xe4, 0x18, 0x16, 0xae, 0x91, 0xbc, 0x5d, 0x7a, 0xa7, 0xca, 0x68, 0x3f, 0x9c, 0x8c, 0x9d, 0xeb, + 0xaa, 0x83, 0x5e, 0xb7, 0x79, 0x23, 0x80, 0x82, 0xcc, 0x08, 0x79, 0x02, 0x16, 0x67, 0xfd, 0x90, + 0x1f, 0x48, 0x95, 0x29, 0x49, 0x3e, 0x98, 0xa6, 0x2c, 0x35, 0x48, 0xe6, 0x76, 0x8e, 0x66, 0x4c, + 0xb2, 0x0c, 0x86, 0xeb, 0x33, 0x2e, 0x50, 0x04, 0xe5, 0xd5, 0x4a, 0xea, 0xb2, 0x26, 0x41, 0xa9, + 0x60, 0xb4, 0xce, 0xa8, 0xf4, 0x47, 0x1d, 0x2a, 0x68, 0xdc, 0x09, 0x62, 0xe1, 0x06, 0x7d, 0x46, + 0x9e, 0x81, 0x89, 0x3d, 0x2a, 0xbe, 0x5c, 0x09, 0xaf, 0x76, 0x25, 0xdc, 0x65, 0xa2, 0x3d, 0x9f, + 0x44, 0x3a, 0x21, 0xd2, 0x64, 0x24, 0xdb, 0x50, 0x76, 0x83, 0x20, 0x14, 0x18, 0xe3, 0xd8, 0xce, + 0x5f, 0xe7, 0x7f, 0x2f, 0xf1, 0x9f, 0x65, 0xd3, 0xd9, 0x05, 0x79, 0x0c, 0x46, 0x2c, 0x5c, 0xc1, + 0x6c, 0x1d, 0x83, 0x4d, 0x2e, 0xbc, 0xa3, 0x2b, 0x2d, 0x2a, 0x67, 0x48, 0xa2, 0x6a, 0x20, 0x5d, + 0xb0, 0xdc, 0xbe, 0xf0, 0x8e, 0x59, 0xcf, 0x15, 0x76, 0xe1, 0x66, 0xbd, 0x4c, 0xc6, 0x0e, 0x51, + 0x0e, 0x6b, 0xe2, 0xe3, 0x70, 0xe8, 0x09, 0x36, 0x8c, 0xc4, 0x09, 0xea, 0xa5, 0x94, 0xe2, 0x52, + 0x29, 0x52, 0x36, 0x0c, 0x85, 0x6c, 0xa9, 0x53, 0x11, 0xa0, 0x6a, 0xf8, 0x3b, 0xa5, 0x98, 0xff, + 0xa5, 0x52, 0x7e, 0x36, 0xc0, 0xc0, 0x70, 0x64, 0xc1, 0xd2, 0xde, 0x23, 0x58, 0x69, 0x2f, 0xc9, + 0x5f, 0xd9, 0x4b, 0x1c, 0x30, 0x5e, 0x8f, 0x18, 0x3f, 0xb1, 0xf5, 0xec, 0xd5, 0x08, 0x50, 0x35, + 0x90, 0x4f, 0xa1, 0xfa, 0x97, 0x52, 0x9f, 0xe9, 0x13, 0xa9, 0x8d, 0xde, 0x39, 0xb8, 0x54, 0xda, + 0x99, 0xbc, 0x8c, 0x7f, 0x29, 0x2f, 0xf3, 0x9f, 0xcb, 0xeb, 0x19, 0x98, 0x58, 0x08, 0xb1, 0x5d, + 0xac, 0xeb, 0xb3, 0xa5, 0x75, 0xa1, 0x14, 0x54, 0x47, 0x56, 0x44, 0x9a, 0x8c, 0xa4, 0x01, 0xe6, + 0x11, 0x73, 0x7d, 0x71, 0x84, 0x7d, 0xc0, 0x52, 0x1c, 0x85, 0xd0, 0x64, 0x24, 0x4f, 0x01, 0x54, + 0xfb, 0xe2, 0x3c, 0xe4, 0xd8, 0x62, 0xac, 0xf6, 0xc2, 0x64, 0xec, 0xdc, 0xc3, 0x2e, 0x24, 0xc1, + 0x4c, 0x6e, 0xd4, 0x9a, 0x82, 0x37, 0xb5, 0x52, 0xb8, 0xa5, 0x56, 0x5a, 0xbe, 0xd5, 0x56, 0xba, + 0x0d, 0x0b, 0xdf, 0x31, 0x16, 0xf5, 0x0e, 0x3d, 0xf9, 0x87, 0xde, 0x3b, 0x0c, 0xf9, 0xf4, 0xc2, + 0x73, 0x78, 0xe1, 0xbb, 0x93, 0xb1, 0x53, 0x91, 0x94, 0x2d, 0x64, 0x6c, 0x85, 0x9c, 0xde, 0xbf, + 0xb0, 0x4c, 0xae, 0xda, 0xf8, 0x41, 0x87, 0xca, 0x85, 0xde, 0x76, 0xc3, 0x1f, 0xde, 0x54, 0xa4, + 0xf9, 0x6b, 0x44, 0x9a, 0x69, 0x4d, 0x7f, 0x5f, 0xad, 0x65, 0x69, 0x2e, 0xbc, 0x63, 0x9a, 0x8d, + 0xdb, 0x4a, 0xb3, 0x79, 0x4b, 0x69, 0x2e, 0xde, 0x66, 0x9a, 0x3f, 0xfa, 0x1c, 0x20, 0xeb, 0x27, + 0xa4, 0x0c, 0xc5, 0x2f, 0x3b, 0x5f, 0x74, 0x5e, 0x7c, 0xdd, 0xa9, 0xe6, 0xc8, 0x1c, 0x94, 0x76, + 0x3a, 0x6b, 0xeb, 0x7b, 0x3b, 0x5f, 0x6d, 0x56, 0x35, 0x69, 0x7a, 0xb9, 0xd9, 0xd9, 0xd8, 0xe9, + 0x3c, 0xaf, 0xe6, 0xe5, 0x27, 0xd7, 0xd6, 0x0e, 0x95, 0x73, 0x7d, 0xf5, 0x33, 0x30, 0xf0, 0x93, + 0x8b, 0x3c, 0x4d, 0x27, 0xf7, 0xaf, 0xfa, 0x42, 0x5d, 0x7a, 0x70, 0x09, 0x55, 0x7d, 0xef, 0x13, + 0xad, 0xbd, 0x7c, 0xfa, 0x7b, 0x2d, 0x77, 0x7a, 0x56, 0xd3, 0xde, 0x9e, 0xd5, 0xb4, 0xdf, 0xce, + 0x6a, 0xda, 0x9b, 0xf3, 0x5a, 0xee, 0xed, 0x79, 0x2d, 0xf7, 0xcb, 0x79, 0x2d, 0xf7, 0xaa, 0x98, + 0x7c, 0x95, 0xef, 0x9b, 0xf8, 0xd2, 0xc7, 0x7f, 0x0e, 0x00, 0xd0, 0x1f, 0xed, 0xa3, 0xad, 0x0b, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/status/statuspb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/status/statuspb/rpc.pb.go index ee3884fc589..b3ecc1a6f7e 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/status/statuspb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/status/statuspb/rpc.pb.go @@ -331,7 +331,7 @@ func init() { func init() { proto.RegisterFile("status/statuspb/rpc.proto", fileDescriptor_d59a2444f79de84b) } var fileDescriptor_d59a2444f79de84b = []byte{ - // 762 bytes of a gzipped FileDescriptorProto + // 759 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0xcd, 0x4e, 0x1b, 0x49, 0x10, 0xf6, 0xe0, 0x1f, 0xec, 0xb2, 0x30, 0x4b, 0x2f, 0x0b, 0xc6, 0x88, 0x19, 0xcb, 0x2b, 0x21, 0x1f, 0x56, 0xf6, 0xae, 0x57, 0xbb, 0x62, 0xf7, 0x38, 0xbb, 0x89, 0x88, 0x04, 0x11, 0x69, 0xa3, @@ -378,8 +378,8 @@ var fileDescriptor_d59a2444f79de84b = []byte{ 0x72, 0x6d, 0xb5, 0xdf, 0xd1, 0x8b, 0x1f, 0x56, 0xc8, 0xc1, 0xf2, 0x67, 0x9c, 0x6c, 0xec, 0x8a, 0xb9, 0xca, 0xac, 0x97, 0xde, 0xef, 0x86, 0x7d, 0x78, 0xfb, 0xd5, 0x4c, 0xdd, 0xde, 0x9b, 0xc6, 0xdd, 0xbd, 0x69, 0x7c, 0xb9, 0x37, 0x8d, 0xf7, 0x0f, 0x66, 0xea, 0xee, 0xc1, 0x4c, 0x7d, 0x7a, - 0x30, 0x53, 0x17, 0xf9, 0xf1, 0x87, 0xa5, 0x93, 0x53, 0x1f, 0x87, 0x3f, 0xbf, 0x07, 0x00, 0x00, - 0xff, 0xff, 0x44, 0xda, 0x03, 0xcd, 0x72, 0x06, 0x00, 0x00, + 0x30, 0x53, 0x17, 0xf9, 0xf1, 0x87, 0xa5, 0x93, 0x53, 0x1f, 0x87, 0x3f, 0xbf, 0x0f, 0x00, 0x44, + 0xda, 0x03, 0xcd, 0x72, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go b/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go index bcc90f47908..8398f400993 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go @@ -176,9 +176,20 @@ type bucketStoreMetrics struct { chunkFetchDurationSum *prometheus.HistogramVec } -func newBucketStoreMetrics(reg prometheus.Registerer) *bucketStoreMetrics { +func newBucketStoreMetrics(reg prometheus.Registerer, chunkPool pool.Pool[byte]) *bucketStoreMetrics { var m bucketStoreMetrics + if chunkPool != nil { + promauto.With(reg).NewGaugeFunc(prometheus.GaugeOpts{ + Name: "thanos_bucket_store_chunk_pool_used_bytes", + Help: "Number of bytes currently in use from the chunk pool.", + }, func() float64 { return float64(chunkPool.UsedBytes()) }) + promauto.With(reg).NewGaugeFunc(prometheus.GaugeOpts{ + Name: "thanos_bucket_store_chunk_pool_max_bytes", + Help: "Maximum number of bytes the chunk pool allows to be in use, as set by --chunk-pool-size.", + }, func() float64 { return float64(chunkPool.MaxBytes()) }) + } + m.blockLoads = promauto.With(reg).NewCounter(prometheus.CounterOpts{ Name: "thanos_bucket_store_block_loads_total", Help: "Total number of remote block loading attempts.", @@ -686,7 +697,7 @@ func NewBucketStore( // Depend on the options indexReaderPoolMetrics := indexheader.NewReaderPoolMetrics(extprom.WrapRegistererWithPrefix("thanos_bucket_store_", s.reg)) s.indexReaderPool = indexheader.NewReaderPool(s.logger, lazyIndexReaderEnabled, lazyIndexReaderIdleTimeout, indexReaderPoolMetrics, s.indexHeaderLazyDownloadStrategy) - s.metrics = newBucketStoreMetrics(s.reg) // TODO(metalmatze): Might be possible via Option too + s.metrics = newBucketStoreMetrics(s.reg, s.chunkPool) // TODO(metalmatze): Might be possible via Option too if err := s.validate(); err != nil { return nil, errors.Wrap(err, "validate config") @@ -1596,7 +1607,7 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store } queryStatsEnabled = reqHints.EnableQueryStats - reqBlockMatchers, err = storepb.MatchersToPromMatchers(reqHints.BlockMatchers...) + reqBlockMatchers, err = storecache.MatchersToPromMatchersCached(s.matcherCache, reqHints.BlockMatchers...) if err != nil { return status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request hints labels matchers").Error()) } @@ -1849,7 +1860,7 @@ func chunksSize(chks []storepb.AggrChunk) (size int) { // LabelNames implements the storepb.StoreServer interface. func (s *BucketStore) LabelNames(ctx context.Context, req *storepb.LabelNamesRequest) (*storepb.LabelNamesResponse, error) { - reqSeriesMatchers, err := storepb.MatchersToPromMatchers(req.Matchers...) + reqSeriesMatchers, err := storecache.MatchersToPromMatchersCached(s.matcherCache, req.Matchers...) if err != nil { return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request labels matchers").Error()) } @@ -1866,7 +1877,7 @@ func (s *BucketStore) LabelNames(ctx context.Context, req *storepb.LabelNamesReq return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "unmarshal label names request hints").Error()) } - reqBlockMatchers, err = storepb.MatchersToPromMatchers(reqHints.BlockMatchers...) + reqBlockMatchers, err = storecache.MatchersToPromMatchersCached(s.matcherCache, reqHints.BlockMatchers...) if err != nil { return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request hints labels matchers").Error()) } @@ -2065,7 +2076,7 @@ func (b *bucketBlock) FilterExtLabelsMatchers(matchers []*labels.Matcher) ([]*la // LabelValues implements the storepb.StoreServer interface. func (s *BucketStore) LabelValues(ctx context.Context, req *storepb.LabelValuesRequest) (*storepb.LabelValuesResponse, error) { - reqSeriesMatchers, err := storepb.MatchersToPromMatchers(req.Matchers...) + reqSeriesMatchers, err := storecache.MatchersToPromMatchersCached(s.matcherCache, req.Matchers...) if err != nil { return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request labels matchers").Error()) } @@ -2095,7 +2106,7 @@ func (s *BucketStore) LabelValues(ctx context.Context, req *storepb.LabelValuesR return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "unmarshal label values request hints").Error()) } - reqBlockMatchers, err = storepb.MatchersToPromMatchers(reqHints.BlockMatchers...) + reqBlockMatchers, err = storecache.MatchersToPromMatchersCached(s.matcherCache, reqHints.BlockMatchers...) if err != nil { return nil, status.Error(codes.InvalidArgument, errors.Wrap(err, "translate request hints labels matchers").Error()) } diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go index 2098d7489c3..53ab012d046 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go @@ -377,7 +377,7 @@ func init() { func init() { proto.RegisterFile("store/hintspb/hints.proto", fileDescriptor_b82aa23c4c11e83f) } var fileDescriptor_b82aa23c4c11e83f = []byte{ - // 731 bytes of a gzipped FileDescriptorProto + // 728 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x4f, 0xdb, 0x30, 0x1c, 0x6d, 0x28, 0x1f, 0xc5, 0x1d, 0xa1, 0xb8, 0x05, 0x02, 0x87, 0x80, 0x2a, 0x21, 0xb1, 0x09, 0xa5, 0x13, 0xd3, 0x34, 0x6d, 0x3b, 0xf1, 0x21, 0x34, 0x4d, 0x63, 0x12, 0xe9, 0xc4, 0xa4, 0x6d, @@ -401,29 +401,29 @@ var fileDescriptor_b82aa23c4c11e83f = []byte{ 0xda, 0xa7, 0x60, 0x55, 0x37, 0x9f, 0xd4, 0x4e, 0xb4, 0x3f, 0x49, 0xdf, 0x53, 0x2f, 0xce, 0x26, 0x9f, 0xfa, 0x3d, 0xb0, 0x4a, 0xee, 0x13, 0x8b, 0xfd, 0xb7, 0x06, 0x40, 0x71, 0x4a, 0x70, 0x4b, 0x46, 0xa5, 0x48, 0xd2, 0xf8, 0xb1, 0x54, 0x65, 0x1c, 0x7a, 0x22, 0x40, 0xe8, 0x80, 0xe6, 0x00, - 0xa7, 0x21, 0x0e, 0x10, 0xe5, 0x4f, 0x14, 0xea, 0x91, 0x2c, 0x61, 0xfc, 0xf8, 0xab, 0xee, 0x92, - 0x18, 0x89, 0x67, 0xed, 0x20, 0x1f, 0x68, 0xfc, 0x5e, 0x3f, 0x4b, 0xce, 0x15, 0xbf, 0xaa, 0xf3, - 0x0f, 0xf8, 0x44, 0xf0, 0x1f, 0x82, 0xc6, 0x90, 0x50, 0x16, 0x25, 0x21, 0x45, 0x8c, 0x64, 0xbd, - 0x3e, 0x0e, 0xac, 0x69, 0x4e, 0x5e, 0x54, 0xf8, 0x3b, 0x01, 0xc3, 0xe7, 0x60, 0x6d, 0x9c, 0x8a, - 0x68, 0x74, 0x85, 0x11, 0xcd, 0x06, 0xd6, 0x0c, 0xd7, 0xac, 0x8c, 0x69, 0xba, 0xd1, 0x15, 0xee, - 0x66, 0x03, 0xf8, 0x08, 0x2c, 0x69, 0x52, 0x74, 0x86, 0x59, 0xaf, 0x6f, 0xcd, 0x8e, 0x2f, 0x73, - 0x94, 0xc3, 0xa5, 0x44, 0x9c, 0x88, 0x03, 0x6b, 0xae, 0x4c, 0x3d, 0x12, 0x70, 0x29, 0x91, 0xa4, - 0x16, 0x89, 0x6a, 0xe5, 0x44, 0x52, 0xa3, 0x12, 0x3d, 0x06, 0xad, 0xb2, 0x54, 0x6e, 0xd4, 0x3c, - 0x57, 0xc1, 0x92, 0x4a, 0xec, 0xd4, 0x16, 0x30, 0xe5, 0x11, 0xa8, 0x7d, 0x02, 0xe2, 0xc0, 0x04, - 0xaa, 0x76, 0xe9, 0x29, 0x58, 0x2d, 0xd3, 0x8a, 0x44, 0x75, 0xce, 0x6f, 0x95, 0xf8, 0x2a, 0x4f, - 0xe1, 0xae, 0x3a, 0x3f, 0xd0, 0xdd, 0x55, 0xe3, 0xc2, 0xfd, 0x5e, 0xdf, 0x05, 0xdd, 0x7d, 0xac, - 0xed, 0x0e, 0x80, 0xba, 0x4c, 0x76, 0x35, 0xb9, 0xa2, 0xa1, 0x29, 0x46, 0x4d, 0xe5, 0xc3, 0xa3, - 0x9a, 0x2e, 0x8a, 0x2c, 0x02, 0xd5, 0x9a, 0x96, 0x69, 0x45, 0x96, 0x86, 0xc8, 0x52, 0xe2, 0x6b, - 0x4d, 0xa5, 0x4c, 0x35, 0x5d, 0xd2, 0xdd, 0xb5, 0xa6, 0x65, 0x5a, 0xe1, 0x0e, 0x75, 0xf7, 0xfb, - 0x4d, 0x75, 0x99, 0x6c, 0xda, 0x14, 0x4d, 0x35, 0x85, 0x68, 0xfa, 0x0c, 0x58, 0x81, 0xc7, 0x3c, - 0x14, 0x90, 0xcf, 0x49, 0x4c, 0xbc, 0x40, 0x5f, 0xa5, 0xc5, 0x35, 0xcb, 0xf9, 0xfc, 0x70, 0x34, - 0x56, 0xcb, 0x1c, 0x83, 0x46, 0x88, 0x19, 0xf2, 0xe2, 0x18, 0xa9, 0xfb, 0xc9, 0x5a, 0xe6, 0xaf, - 0xe4, 0x35, 0x47, 0x5c, 0x60, 0x8e, 0xba, 0xc0, 0x9c, 0x43, 0x49, 0xd8, 0xaf, 0xe5, 0xaf, 0x85, - 0xef, 0xbf, 0x36, 0x0c, 0xd7, 0x0c, 0x31, 0xdb, 0x8b, 0x63, 0x35, 0x81, 0xaf, 0x81, 0xc9, 0x7f, - 0x9a, 0x85, 0xd9, 0xca, 0xff, 0x9b, 0x2d, 0x70, 0xe9, 0x68, 0xb0, 0x75, 0xfd, 0xc7, 0xae, 0x5c, - 0xdf, 0xda, 0xc6, 0xcd, 0xad, 0x6d, 0xfc, 0xbe, 0xb5, 0x8d, 0x6f, 0x77, 0x76, 0xe5, 0xe6, 0xce, - 0xae, 0xfc, 0xb8, 0xb3, 0x2b, 0x1f, 0xd4, 0xed, 0xeb, 0xcf, 0x72, 0xcb, 0x27, 0xff, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x49, 0xb6, 0x83, 0x90, 0xaa, 0x07, 0x00, 0x00, + 0xa7, 0x21, 0x0e, 0x10, 0xcd, 0x01, 0x8a, 0x7a, 0x24, 0x4b, 0x18, 0x3f, 0xfe, 0xaa, 0xbb, 0x24, + 0x46, 0xe2, 0x59, 0x3b, 0xc8, 0x07, 0x1a, 0xbf, 0xd7, 0xcf, 0x92, 0x73, 0xc5, 0xaf, 0xea, 0xfc, + 0x03, 0x3e, 0x11, 0xfc, 0x87, 0xa0, 0x31, 0x24, 0x94, 0x45, 0x49, 0x48, 0x11, 0x23, 0x59, 0xaf, + 0x8f, 0x03, 0x6b, 0x9a, 0x93, 0x17, 0x15, 0xfe, 0x4e, 0xc0, 0xf0, 0x39, 0x58, 0x1b, 0xa7, 0x22, + 0x1a, 0x5d, 0x61, 0x44, 0xb3, 0x81, 0x35, 0xc3, 0x35, 0x2b, 0x63, 0x9a, 0x6e, 0x74, 0x85, 0xbb, + 0xd9, 0x00, 0x3e, 0x02, 0x4b, 0x9a, 0x14, 0x9d, 0x61, 0xd6, 0xeb, 0x5b, 0xb3, 0xe3, 0xcb, 0x1c, + 0xe5, 0x70, 0x29, 0x11, 0x27, 0xe2, 0xc0, 0x9a, 0x2b, 0x53, 0x8f, 0x30, 0xbb, 0x97, 0x48, 0x52, + 0x8b, 0x44, 0xb5, 0x72, 0x22, 0xa9, 0x51, 0x89, 0x1e, 0x83, 0x56, 0x59, 0x2a, 0x37, 0x6a, 0x9e, + 0xab, 0x60, 0x49, 0x25, 0x76, 0x6a, 0x0b, 0x98, 0xf2, 0x08, 0xd4, 0x3e, 0x01, 0x71, 0x60, 0x02, + 0x55, 0xbb, 0xf4, 0x14, 0xac, 0x96, 0x69, 0x45, 0xa2, 0x3a, 0xe7, 0xb7, 0x4a, 0x7c, 0x95, 0xa7, + 0x70, 0x57, 0x9d, 0x1f, 0xe8, 0xee, 0xaa, 0x71, 0xe1, 0x7e, 0xaf, 0xef, 0x82, 0xee, 0x3e, 0xd6, + 0x76, 0x07, 0x40, 0x5d, 0x26, 0xbb, 0x9a, 0x5c, 0xd1, 0xd0, 0x14, 0xa3, 0xa6, 0xf2, 0xe1, 0x51, + 0x4d, 0x17, 0x45, 0x16, 0x81, 0x6a, 0x4d, 0xcb, 0xb4, 0x22, 0x4b, 0x43, 0x64, 0x29, 0xf1, 0xb5, + 0xa6, 0x52, 0xa6, 0x9a, 0x2e, 0xe9, 0xee, 0x5a, 0xd3, 0x32, 0xad, 0x70, 0x87, 0xba, 0xfb, 0xfd, + 0xa6, 0xba, 0x4c, 0x36, 0x6d, 0x8a, 0xa6, 0x9a, 0x42, 0x34, 0x7d, 0x06, 0xac, 0xc0, 0x63, 0x1e, + 0x0a, 0xc8, 0xe7, 0x24, 0x26, 0x5e, 0xa0, 0xaf, 0xd2, 0xe2, 0x9a, 0xe5, 0x7c, 0x7e, 0x38, 0x1a, + 0xab, 0x65, 0x8e, 0x41, 0x23, 0xc4, 0x0c, 0x79, 0x71, 0x8c, 0xd4, 0xfd, 0x64, 0x2d, 0xf3, 0x57, + 0xf2, 0x9a, 0x23, 0x2e, 0x30, 0x47, 0x5d, 0x60, 0xce, 0xa1, 0x24, 0xec, 0xd7, 0xf2, 0xd7, 0xc2, + 0xf7, 0x5f, 0x1b, 0x86, 0x6b, 0x86, 0x98, 0xed, 0xc5, 0xb1, 0x9a, 0xc0, 0xd7, 0xc0, 0xe4, 0x3f, + 0xcd, 0xc2, 0x6c, 0xe5, 0xff, 0xcd, 0x16, 0xb8, 0x74, 0x34, 0xd8, 0xba, 0xfe, 0x63, 0x57, 0xae, + 0x6f, 0x6d, 0xe3, 0xe6, 0xd6, 0x36, 0x7e, 0xdf, 0xda, 0xc6, 0xb7, 0x3b, 0xbb, 0x72, 0x73, 0x67, + 0x57, 0x7e, 0xdc, 0xd9, 0x95, 0x0f, 0xea, 0xf6, 0xf5, 0x67, 0xb9, 0xe5, 0x93, 0x7f, 0x03, 0x00, + 0x49, 0xb6, 0x83, 0x90, 0xaa, 0x07, 0x00, 0x00, } func (m *SeriesRequestHints) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/labelpb/types.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/labelpb/types.pb.go index 4523766ef81..0c8278bb9f6 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/labelpb/types.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/labelpb/types.pb.go @@ -228,7 +228,7 @@ func init() { func init() { proto.RegisterFile("store/labelpb/types.proto", fileDescriptor_cdcc9e7dae4870e8) } var fileDescriptor_cdcc9e7dae4870e8 = []byte{ - // 299 bytes of a gzipped FileDescriptorProto + // 296 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x31, 0x4b, 0xc3, 0x40, 0x14, 0xc7, 0x73, 0xb5, 0x4d, 0x9b, 0x57, 0xe3, 0x70, 0x74, 0x48, 0x15, 0xae, 0x25, 0x20, 0x14, 0x84, 0x04, 0x15, 0x71, 0x72, 0xc9, 0xe2, 0xe2, 0x74, 0x71, 0xea, 0x22, 0x09, 0x5c, 0xea, 0x90, @@ -246,8 +246,8 @@ var fileDescriptor_cdcc9e7dae4870e8 = []byte{ 0xf3, 0x1f, 0x60, 0x1a, 0x37, 0x45, 0x2a, 0x73, 0xf4, 0xa2, 0x1e, 0x8c, 0x65, 0x96, 0xd5, 0x42, 0x99, 0x3c, 0x2e, 0xff, 0x93, 0xfa, 0x08, 0x4a, 0x8f, 0xa0, 0xc3, 0x29, 0x37, 0x22, 0xba, 0x6c, 0x7f, 0x98, 0xd5, 0x76, 0x8c, 0xec, 0x3a, 0x46, 0xbe, 0x3b, 0x46, 0x3e, 0x7a, 0x66, 0xed, 0x7a, - 0x66, 0x7d, 0xf6, 0xcc, 0x5a, 0x8f, 0x0f, 0x1f, 0x91, 0xda, 0x78, 0xe5, 0xdb, 0xdf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xc5, 0xa5, 0x8e, 0x97, 0xa0, 0x01, 0x00, 0x00, + 0x66, 0x7d, 0xf6, 0xcc, 0x5a, 0x8f, 0x0f, 0x1f, 0x91, 0xda, 0x78, 0xe5, 0xdb, 0xdf, 0x01, 0x00, + 0xc5, 0xa5, 0x8e, 0x97, 0xa0, 0x01, 0x00, 0x00, } func (m *Label) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go index 1e3d194953f..8fd58b2eb21 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go @@ -30,7 +30,12 @@ func newInProcessServer(ctx context.Context, yield func(*SeriesResponse, error) } func (s *inProcessServer) Send(resp *SeriesResponse) error { - s.yield(resp, nil) + if !s.yield(resp, nil) { + if s.ctx.Err() != nil { + return s.ctx.Err() + } + return io.EOF + } return nil } diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/remote.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/remote.pb.go index 6d7538d1bc6..c5d1adfc9ea 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/remote.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/remote.pb.go @@ -400,41 +400,41 @@ func init() { func init() { proto.RegisterFile("store/storepb/prompb/remote.proto", fileDescriptor_b3df75c58e6767bb) } var fileDescriptor_b3df75c58e6767bb = []byte{ - // 535 bytes of a gzipped FileDescriptorProto + // 532 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x9b, 0xb5, 0x5b, 0xab, 0x37, 0xa3, 0x54, 0x1e, 0xb0, 0xaa, 0x40, 0x5a, 0x72, 0x2a, + 0x18, 0xc6, 0x9b, 0xb6, 0x5b, 0xab, 0x37, 0xa5, 0x54, 0x1e, 0xb0, 0xaa, 0x40, 0x5a, 0x72, 0x2a, 0x12, 0x6a, 0xa7, 0x82, 0x90, 0x10, 0xa7, 0x6e, 0x14, 0x8d, 0xb1, 0xf0, 0xc7, 0x2d, 0x02, 0x71, - 0x89, 0xdc, 0xe4, 0xd5, 0x1a, 0xb1, 0xfc, 0x99, 0xed, 0x48, 0xf4, 0xc0, 0x77, 0xe0, 0xcc, 0x27, - 0xda, 0x81, 0xc3, 0x8e, 0x3b, 0x21, 0xd4, 0x7e, 0x11, 0x14, 0x27, 0xa9, 0x32, 0x3a, 0x0e, 0x5c, - 0x22, 0xe7, 0xf1, 0xef, 0x79, 0x6c, 0xbf, 0x7e, 0x0d, 0x0f, 0x84, 0x0c, 0x39, 0xf6, 0xd5, 0x37, - 0x9a, 0xf6, 0x23, 0x1e, 0xfa, 0xd1, 0xb4, 0xcf, 0xd1, 0x0f, 0x25, 0xf6, 0x22, 0x1e, 0xca, 0x90, - 0xdc, 0x4c, 0x44, 0x94, 0x33, 0x8c, 0x85, 0xed, 0x84, 0xd1, 0xbc, 0xd5, 0xb9, 0xd6, 0x23, 0xe7, - 0x11, 0x8a, 0xd4, 0xd2, 0xba, 0x75, 0x12, 0x9e, 0x84, 0x6a, 0xd8, 0x4f, 0x46, 0xa9, 0x6a, 0xfe, - 0xd0, 0x60, 0xfb, 0x23, 0xf7, 0x24, 0x52, 0x3c, 0x8b, 0x51, 0x48, 0x32, 0x04, 0x90, 0x9e, 0x8f, - 0x02, 0xb9, 0x87, 0xa2, 0xa9, 0x75, 0xca, 0x5d, 0x7d, 0x70, 0xb7, 0xf7, 0xd7, 0x72, 0xbd, 0x89, - 0xe7, 0xe3, 0x58, 0x21, 0xfb, 0x95, 0xf3, 0x5f, 0xed, 0x12, 0x2d, 0x98, 0xc8, 0x10, 0x6a, 0x3e, - 0x4a, 0xe6, 0x32, 0xc9, 0x9a, 0x65, 0x15, 0xd0, 0x5e, 0x0b, 0xb0, 0x50, 0x72, 0xcf, 0xb1, 0x32, - 0x2c, 0x0b, 0x59, 0xd9, 0x8e, 0x2a, 0xb5, 0x8d, 0x46, 0xd9, 0xbc, 0xd4, 0x40, 0xa7, 0xc8, 0xdc, - 0x7c, 0x6f, 0x7b, 0x50, 0x3d, 0x8b, 0x8b, 0x1b, 0xbb, 0xb3, 0x96, 0xfb, 0x3e, 0x46, 0x3e, 0xa7, - 0x39, 0x46, 0x18, 0xec, 0x32, 0xc7, 0xc1, 0x48, 0xa2, 0x6b, 0x73, 0x14, 0x51, 0x18, 0x08, 0xb4, - 0x55, 0x55, 0x9a, 0x1b, 0x9d, 0x72, 0xb7, 0x3e, 0x78, 0xb8, 0x96, 0x50, 0x58, 0xb0, 0x47, 0x33, - 0xcb, 0x64, 0x1e, 0x21, 0xbd, 0x9d, 0x27, 0x15, 0x55, 0x61, 0x3e, 0x81, 0xed, 0xa2, 0x40, 0x74, - 0xa8, 0x8e, 0x87, 0xd6, 0xbb, 0xe3, 0xd1, 0xb8, 0x51, 0x22, 0xbb, 0xb0, 0x33, 0x9e, 0xd0, 0xd1, - 0xd0, 0x1a, 0xbd, 0xb0, 0x3f, 0xbd, 0xa5, 0xf6, 0xc1, 0xe1, 0x87, 0x37, 0xaf, 0xc7, 0x0d, 0xcd, - 0x7c, 0x99, 0xb8, 0xd8, 0x2a, 0x8a, 0x3c, 0x85, 0x2a, 0x47, 0x11, 0x9f, 0xca, 0xfc, 0x68, 0xf7, - 0xfe, 0x71, 0x34, 0x05, 0xd1, 0x1c, 0x36, 0x7f, 0x6a, 0xb0, 0xa9, 0x26, 0xc8, 0x23, 0x20, 0x42, - 0x32, 0x2e, 0x6d, 0x75, 0x13, 0x92, 0xf9, 0x91, 0xed, 0x27, 0x61, 0x5a, 0xb7, 0x4c, 0x1b, 0x6a, - 0x66, 0x92, 0x4f, 0x58, 0x82, 0x74, 0xa1, 0x81, 0x81, 0x7b, 0x95, 0xdd, 0x50, 0x6c, 0x1d, 0x03, - 0xb7, 0x48, 0x3e, 0x83, 0x9a, 0xcf, 0xa4, 0x33, 0x43, 0x2e, 0xb2, 0xdb, 0xbc, 0xbf, 0xb6, 0xb5, - 0x63, 0x36, 0xc5, 0x53, 0x2b, 0xa5, 0xe8, 0x0a, 0x27, 0x7b, 0xb0, 0x39, 0xf3, 0x02, 0x29, 0x9a, - 0x95, 0x8e, 0xd6, 0xd5, 0x07, 0xad, 0x6b, 0x6b, 0x7d, 0x98, 0x10, 0x34, 0x05, 0xcd, 0x23, 0xd0, - 0x0b, 0xc7, 0x24, 0xcf, 0xff, 0xb3, 0x19, 0x8b, 0x6d, 0x68, 0x7e, 0x83, 0x9d, 0x83, 0x59, 0x1c, - 0x7c, 0x49, 0x2e, 0xac, 0x50, 0xe9, 0x11, 0xd4, 0x9d, 0x54, 0xb6, 0xaf, 0xe4, 0x1a, 0x6b, 0xb9, - 0x99, 0x3b, 0x8b, 0xbe, 0xe1, 0x14, 0x7f, 0x49, 0x1b, 0xf4, 0xa4, 0xc9, 0xe6, 0xb6, 0x17, 0xb8, - 0xf8, 0x35, 0xab, 0x1d, 0x28, 0xe9, 0x55, 0xa2, 0xec, 0x77, 0xce, 0x17, 0x86, 0x76, 0xb1, 0x30, - 0xb4, 0xdf, 0x0b, 0x43, 0xfb, 0xbe, 0x34, 0x4a, 0x17, 0x4b, 0xa3, 0x74, 0xb9, 0x34, 0x4a, 0x9f, - 0xb7, 0xd2, 0xd7, 0x39, 0xdd, 0x52, 0x4f, 0xf0, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, - 0xa1, 0xf6, 0xc4, 0xf0, 0x03, 0x00, 0x00, + 0x89, 0xd2, 0xe4, 0xd5, 0x1a, 0xb1, 0xfc, 0x99, 0xed, 0x48, 0xf4, 0xc0, 0x77, 0xe0, 0xcc, 0x27, + 0xda, 0x81, 0xc3, 0x8e, 0x3b, 0x21, 0xd4, 0x7e, 0x11, 0x14, 0x27, 0x99, 0x52, 0x32, 0x0e, 0x5c, + 0x22, 0xe7, 0xf1, 0xef, 0x79, 0x6c, 0xbf, 0x7e, 0x0d, 0x0f, 0xb8, 0x08, 0x18, 0x0e, 0xe5, 0x37, + 0x9c, 0x0f, 0x43, 0x16, 0x78, 0xe1, 0x7c, 0xc8, 0xd0, 0x0b, 0x04, 0x0e, 0x42, 0x16, 0x88, 0x80, + 0xdc, 0x8c, 0x45, 0x14, 0x0b, 0x8c, 0xb8, 0x69, 0x07, 0xe1, 0xb2, 0xd3, 0xbb, 0xd6, 0x23, 0x96, + 0x21, 0xf2, 0xc4, 0xd2, 0xb9, 0x75, 0x12, 0x9c, 0x04, 0x72, 0x38, 0x8c, 0x47, 0x89, 0xaa, 0xff, + 0x50, 0xa0, 0xf1, 0x91, 0xb9, 0x02, 0x29, 0x9e, 0x45, 0xc8, 0x05, 0x19, 0x03, 0x08, 0xd7, 0x43, + 0x8e, 0xcc, 0x45, 0xde, 0x56, 0x7a, 0x95, 0xbe, 0x3a, 0xba, 0x3b, 0xf8, 0x6b, 0xb9, 0xc1, 0xcc, + 0xf5, 0x70, 0x2a, 0x91, 0xfd, 0xea, 0xf9, 0xaf, 0x6e, 0x89, 0xe6, 0x4c, 0x64, 0x0c, 0x75, 0x0f, + 0x85, 0xe5, 0x58, 0xc2, 0x6a, 0x57, 0x64, 0x40, 0xb7, 0x10, 0x60, 0xa0, 0x60, 0xae, 0x6d, 0xa4, + 0x58, 0x1a, 0x72, 0x65, 0x3b, 0xaa, 0xd6, 0xcb, 0xad, 0x8a, 0x7e, 0xa9, 0x80, 0x4a, 0xd1, 0x72, + 0xb2, 0xbd, 0xed, 0x41, 0xed, 0x2c, 0xca, 0x6f, 0xec, 0x4e, 0x21, 0xf7, 0x7d, 0x84, 0x6c, 0x49, + 0x33, 0x8c, 0x58, 0xb0, 0x6b, 0xd9, 0x36, 0x86, 0x02, 0x1d, 0x93, 0x21, 0x0f, 0x03, 0x9f, 0xa3, + 0x29, 0xab, 0xd2, 0x2e, 0xf7, 0x2a, 0xfd, 0xe6, 0xe8, 0x61, 0x21, 0x21, 0xb7, 0xe0, 0x80, 0xa6, + 0x96, 0xd9, 0x32, 0x44, 0x7a, 0x3b, 0x4b, 0xca, 0xab, 0x5c, 0x7f, 0x02, 0x8d, 0xbc, 0x40, 0x54, + 0xa8, 0x4d, 0xc7, 0xc6, 0xbb, 0xe3, 0xc9, 0xb4, 0x55, 0x22, 0xbb, 0xb0, 0x33, 0x9d, 0xd1, 0xc9, + 0xd8, 0x98, 0xbc, 0x30, 0x3f, 0xbd, 0xa5, 0xe6, 0xc1, 0xe1, 0x87, 0x37, 0xaf, 0xa7, 0x2d, 0x45, + 0x7f, 0x09, 0x8d, 0x64, 0xa1, 0xc4, 0x49, 0x9e, 0x42, 0x8d, 0x21, 0x8f, 0x4e, 0x45, 0x76, 0xb4, + 0x7b, 0xff, 0x38, 0x9a, 0x84, 0x68, 0x06, 0xeb, 0x3f, 0x15, 0xd8, 0x92, 0x13, 0xe4, 0x11, 0x10, + 0x2e, 0x2c, 0x26, 0x4c, 0x79, 0x13, 0xc2, 0xf2, 0x42, 0xd3, 0x8b, 0xc3, 0x94, 0x7e, 0x85, 0xb6, + 0xe4, 0xcc, 0x2c, 0x9b, 0x30, 0x38, 0xe9, 0x43, 0x0b, 0x7d, 0x67, 0x93, 0x2d, 0x4b, 0xb6, 0x89, + 0xbe, 0x93, 0x27, 0x9f, 0x41, 0xdd, 0xb3, 0x84, 0xbd, 0x40, 0xc6, 0xd3, 0xdb, 0xbc, 0x5f, 0xd8, + 0xda, 0xb1, 0x35, 0xc7, 0x53, 0x23, 0xa1, 0xe8, 0x15, 0x4e, 0xf6, 0x60, 0x6b, 0xe1, 0xfa, 0x82, + 0xb7, 0xab, 0x3d, 0xa5, 0xaf, 0x8e, 0x3a, 0xd7, 0xd6, 0xfa, 0x30, 0x26, 0x68, 0x02, 0xea, 0x47, + 0xa0, 0xe6, 0x8e, 0x49, 0x9e, 0xff, 0x67, 0x33, 0xe6, 0xdb, 0x50, 0xff, 0x06, 0x3b, 0x07, 0x8b, + 0xc8, 0xff, 0x82, 0xce, 0x46, 0xa5, 0x27, 0xd0, 0xb4, 0x13, 0xd9, 0xdc, 0xc8, 0xd5, 0x0a, 0xb9, + 0xa9, 0x3b, 0x8d, 0xbe, 0x61, 0xe7, 0x7f, 0x49, 0x17, 0xd4, 0xb8, 0xc9, 0x96, 0xa6, 0xeb, 0x3b, + 0xf8, 0x35, 0xad, 0x1d, 0x48, 0xe9, 0x55, 0xac, 0xec, 0xf7, 0xce, 0x57, 0x9a, 0x72, 0xb1, 0xd2, + 0x94, 0xdf, 0x2b, 0x4d, 0xf9, 0xbe, 0xd6, 0x4a, 0x17, 0x6b, 0xad, 0x74, 0xb9, 0xd6, 0x4a, 0x9f, + 0xb7, 0x93, 0xd7, 0x39, 0xdf, 0x96, 0x4f, 0xf0, 0xf1, 0x9f, 0x01, 0x00, 0x32, 0xa1, 0xf6, 0xc4, + 0xf0, 0x03, 0x00, 0x00, } func (m *WriteRequest) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/types.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/types.pb.go index faf37e12dd9..257b3c07f4a 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/types.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/types.pb.go @@ -350,7 +350,6 @@ func (m *Exemplar) GetTimestamp() int64 { // integer histogram as well as a float histogram. type Histogram struct { // Types that are valid to be assigned to Count: - // // *Histogram_CountInt // *Histogram_CountFloat Count isHistogram_Count `protobuf_oneof:"count"` @@ -365,7 +364,6 @@ type Histogram struct { Schema int32 `protobuf:"zigzag32,4,opt,name=schema,proto3" json:"schema,omitempty"` ZeroThreshold float64 `protobuf:"fixed64,5,opt,name=zero_threshold,json=zeroThreshold,proto3" json:"zero_threshold,omitempty"` // Types that are valid to be assigned to ZeroCount: - // // *Histogram_ZeroCountInt // *Histogram_ZeroCountFloat ZeroCount isHistogram_ZeroCount `protobuf_oneof:"zero_count"` @@ -1001,81 +999,80 @@ func init() { func init() { proto.RegisterFile("store/storepb/prompb/types.proto", fileDescriptor_166e07899dab7c14) } var fileDescriptor_166e07899dab7c14 = []byte{ - // 1171 bytes of a gzipped FileDescriptorProto + // 1166 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x8f, 0x1b, 0x45, 0x10, 0xf6, 0x78, 0xfc, 0xac, 0xb5, 0xbd, 0x93, 0x26, 0x24, 0x93, 0x05, 0x1c, 0x33, 0xbc, 0xac, 0x08, 0x6c, 0x29, 0x89, 0xe0, 0x12, 0x10, 0xbb, 0x1b, 0x6f, 0x36, 0x22, 0xb6, 0x95, 0xb6, 0x17, 0x48, 0x2e, 0x56, 0x7b, 0xdc, 0xeb, 0x19, 0xc5, 0xf3, 0xd0, 0x74, 0x3b, 0x8a, 0xf9, 0x15, 0x9c, 0xb9, 0x21, 0x6e, 0x70, 0xe2, 0x5f, 0xe4, 0x98, 0x13, 0x42, 0x1c, 0x22, 0x94, 0xfc, 0x10, 0x50, - 0xd7, 0xcc, 0x78, 0xec, 0x98, 0x48, 0x9c, 0x72, 0xb1, 0xba, 0xbe, 0x7a, 0x7d, 0x3d, 0x55, 0x5d, - 0x65, 0x68, 0x09, 0x19, 0x44, 0xbc, 0x8b, 0xbf, 0xe1, 0xb4, 0x1b, 0x46, 0x81, 0x17, 0x4e, 0xbb, + 0xd7, 0xcc, 0x78, 0xec, 0x98, 0x48, 0x9c, 0x72, 0xb1, 0xaa, 0xbe, 0x7a, 0x7d, 0x3d, 0x55, 0x5d, + 0x6d, 0x68, 0x09, 0x19, 0x44, 0xbc, 0x8b, 0xbf, 0xe1, 0xb4, 0x1b, 0x46, 0x81, 0x17, 0x4e, 0xbb, 0x72, 0x15, 0x72, 0xd1, 0x09, 0xa3, 0x40, 0x06, 0x64, 0x5f, 0x61, 0x5c, 0x3a, 0x7c, 0x29, 0x26, - 0x76, 0x10, 0xae, 0x0e, 0x2e, 0xce, 0x83, 0x79, 0x80, 0xba, 0xae, 0x3a, 0xc5, 0x66, 0x07, 0x57, - 0xe2, 0x40, 0x0b, 0x36, 0xe5, 0x8b, 0xed, 0x08, 0xd6, 0xcf, 0x79, 0x68, 0xf4, 0xb9, 0x8c, 0x5c, - 0xbb, 0xcf, 0x25, 0x9b, 0x31, 0xc9, 0xc8, 0x57, 0x50, 0x50, 0x16, 0xa6, 0xd6, 0xd2, 0xda, 0x8d, - 0xeb, 0xd7, 0x3a, 0xaf, 0xe4, 0xe8, 0x6c, 0x9b, 0x27, 0xe2, 0x78, 0x15, 0x72, 0x8a, 0x7e, 0xe4, - 0x53, 0x20, 0x1e, 0x62, 0x93, 0x73, 0xe6, 0xb9, 0x8b, 0xd5, 0xc4, 0x67, 0x1e, 0x37, 0xf3, 0x2d, - 0xad, 0x5d, 0xa5, 0x46, 0xac, 0x39, 0x41, 0xc5, 0x80, 0x79, 0x9c, 0x10, 0x28, 0x38, 0x7c, 0x11, - 0x9a, 0x05, 0xd4, 0xe3, 0x59, 0x61, 0x4b, 0xdf, 0x95, 0x66, 0x31, 0xc6, 0xd4, 0xd9, 0x5a, 0x01, - 0x64, 0x99, 0xc8, 0x1e, 0x94, 0xcf, 0x06, 0xdf, 0x0c, 0x86, 0xdf, 0x0d, 0x8c, 0x9c, 0x12, 0x8e, - 0x87, 0x67, 0x83, 0x71, 0x8f, 0x1a, 0x1a, 0xa9, 0x42, 0xf1, 0xce, 0xe1, 0xd9, 0x9d, 0x9e, 0x91, - 0x27, 0x75, 0xa8, 0x9e, 0xde, 0x1d, 0x8d, 0x87, 0x77, 0xe8, 0x61, 0xdf, 0xd0, 0x09, 0x81, 0x06, - 0x6a, 0x32, 0xac, 0xa0, 0x5c, 0x47, 0x67, 0xfd, 0xfe, 0x21, 0x7d, 0x60, 0x14, 0x49, 0x05, 0x0a, - 0x77, 0x07, 0x27, 0x43, 0xa3, 0x44, 0x6a, 0x50, 0x19, 0x8d, 0x0f, 0xc7, 0xbd, 0x51, 0x6f, 0x6c, - 0x94, 0xad, 0x5b, 0x50, 0x1a, 0x31, 0x2f, 0x5c, 0x70, 0x72, 0x11, 0x8a, 0x8f, 0xd9, 0x62, 0x19, - 0x7f, 0x1b, 0x8d, 0xc6, 0x02, 0x79, 0x17, 0xaa, 0xd2, 0xf5, 0xb8, 0x90, 0xcc, 0x0b, 0xf1, 0x9e, - 0x3a, 0xcd, 0x00, 0xeb, 0x17, 0x0d, 0x2a, 0xbd, 0x27, 0xdc, 0x0b, 0x17, 0x2c, 0x22, 0x36, 0x94, - 0xb0, 0x0a, 0xc2, 0xd4, 0x5a, 0x7a, 0x7b, 0xef, 0x7a, 0xbd, 0x23, 0x1d, 0xe6, 0x07, 0xa2, 0x73, - 0x4f, 0xa1, 0x47, 0xb7, 0x9e, 0x3e, 0xbf, 0x9a, 0xfb, 0xeb, 0xf9, 0xd5, 0x9b, 0x73, 0x57, 0x3a, - 0xcb, 0x69, 0xc7, 0x0e, 0xbc, 0x6e, 0x6c, 0xf0, 0x99, 0x1b, 0x24, 0xa7, 0x6e, 0xf8, 0x68, 0xde, - 0xdd, 0x2a, 0x68, 0xe7, 0x21, 0x7a, 0xd3, 0x24, 0x74, 0xc6, 0x32, 0xff, 0x5a, 0x96, 0xfa, 0xab, - 0x2c, 0xff, 0x29, 0x42, 0xf5, 0xd4, 0x15, 0x32, 0x98, 0x47, 0xcc, 0x23, 0xef, 0x41, 0xd5, 0x0e, - 0x96, 0xbe, 0x9c, 0xb8, 0xbe, 0xc4, 0xbb, 0x16, 0x4e, 0x73, 0xb4, 0x82, 0xd0, 0x5d, 0x5f, 0x92, - 0xf7, 0x61, 0x2f, 0x56, 0x9f, 0x2f, 0x02, 0x26, 0xe3, 0x34, 0xa7, 0x39, 0x0a, 0x08, 0x9e, 0x28, - 0x8c, 0x18, 0xa0, 0x8b, 0xa5, 0x87, 0x79, 0x34, 0xaa, 0x8e, 0xe4, 0x12, 0x94, 0x84, 0xed, 0x70, - 0x8f, 0x61, 0xa9, 0x2f, 0xd0, 0x44, 0x22, 0x1f, 0x41, 0xe3, 0x07, 0x1e, 0x05, 0x13, 0xe9, 0x44, - 0x5c, 0x38, 0xc1, 0x62, 0x86, 0x65, 0xd7, 0x68, 0x5d, 0xa1, 0xe3, 0x14, 0x24, 0x1f, 0x27, 0x66, - 0x19, 0xaf, 0x12, 0xf2, 0xd2, 0x68, 0x4d, 0xe1, 0xc7, 0x29, 0xb7, 0x6b, 0x60, 0x6c, 0xd8, 0xc5, - 0x04, 0xcb, 0x48, 0x50, 0xa3, 0x8d, 0xb5, 0x65, 0x4c, 0xf2, 0x14, 0x1a, 0x3e, 0x9f, 0x33, 0xe9, - 0x3e, 0xe6, 0x13, 0x11, 0x32, 0x5f, 0x98, 0x15, 0xac, 0xca, 0x3b, 0x3b, 0x3d, 0x7f, 0xb4, 0xb4, - 0x1f, 0x71, 0x39, 0x0a, 0x99, 0x7f, 0x54, 0x50, 0x35, 0xa2, 0xf5, 0xd4, 0x51, 0x61, 0x82, 0x7c, - 0x02, 0xfb, 0xeb, 0x48, 0x33, 0xbe, 0x90, 0x4c, 0x98, 0xd5, 0x96, 0xde, 0x26, 0x74, 0x9d, 0xe0, - 0x36, 0xa2, 0x5b, 0x86, 0x48, 0x51, 0x98, 0xd0, 0xd2, 0xdb, 0x5a, 0x66, 0x88, 0xfc, 0x84, 0xe2, - 0x16, 0x06, 0xc2, 0xdd, 0xe0, 0xb6, 0xf7, 0xbf, 0xb9, 0xa5, 0x8e, 0x6b, 0x6e, 0xeb, 0x48, 0x09, - 0xb7, 0x5a, 0xcc, 0x2d, 0x85, 0x33, 0x6e, 0x6b, 0xc3, 0x84, 0x5b, 0x3d, 0xe6, 0x96, 0xc2, 0x09, - 0xb7, 0x63, 0x80, 0x88, 0x0b, 0x2e, 0x27, 0x8e, 0xaa, 0x43, 0x03, 0xe7, 0xc4, 0x87, 0x3b, 0xbc, - 0xd6, 0xed, 0xd4, 0xa1, 0xca, 0xf8, 0xd4, 0xf5, 0x25, 0xad, 0x46, 0xe9, 0x71, 0xbb, 0x1f, 0xf7, - 0x5f, 0xe9, 0x47, 0xf2, 0x01, 0xd4, 0xed, 0xa5, 0x90, 0x81, 0x37, 0xc1, 0xee, 0x15, 0xa6, 0x81, - 0x4c, 0x6a, 0x31, 0xf8, 0x2d, 0x62, 0xd6, 0x4d, 0xa8, 0xae, 0x43, 0x6f, 0x8f, 0x84, 0x32, 0xe8, - 0x0f, 0x7a, 0x23, 0x43, 0x23, 0x25, 0xc8, 0x0f, 0x86, 0x46, 0x3e, 0x1b, 0x0b, 0xfa, 0x51, 0x19, - 0x8a, 0x78, 0xbb, 0xa3, 0x1a, 0x40, 0xd6, 0x2a, 0xd6, 0x2d, 0x80, 0xec, 0x4b, 0xaa, 0x6e, 0x0d, - 0xce, 0xcf, 0x05, 0x8f, 0xdb, 0xff, 0x02, 0x4d, 0x24, 0x85, 0x2f, 0xb8, 0x3f, 0x97, 0x0e, 0x76, - 0x7d, 0x9d, 0x26, 0x92, 0xf5, 0x5b, 0x1e, 0x60, 0xec, 0x7a, 0x7c, 0xc4, 0x23, 0x97, 0x8b, 0x37, - 0xf3, 0xce, 0xbf, 0x80, 0xb2, 0xc0, 0xb9, 0x24, 0xcc, 0x3c, 0x66, 0xb9, 0xbc, 0x53, 0x83, 0x78, - 0x6e, 0x25, 0x7d, 0x91, 0x5a, 0x93, 0x2f, 0xa1, 0xca, 0x93, 0x89, 0x24, 0x4c, 0x1d, 0x5d, 0xaf, - 0xec, 0xb8, 0xa6, 0x33, 0x2b, 0x71, 0xce, 0x3c, 0xc8, 0xd7, 0x00, 0x4e, 0x5a, 0x5b, 0x61, 0x16, - 0xd0, 0xff, 0xe0, 0xf5, 0xe5, 0x4f, 0x02, 0x6c, 0xf8, 0x58, 0x3f, 0x69, 0x50, 0xc3, 0xbb, 0xf4, - 0x99, 0xb4, 0x1d, 0x1e, 0x91, 0xcf, 0xb7, 0x76, 0x8e, 0xb5, 0x13, 0x6c, 0xd3, 0xb8, 0xb3, 0xb1, - 0x6b, 0x08, 0x14, 0x36, 0xb6, 0x0b, 0x9e, 0xb3, 0xf1, 0xa7, 0x23, 0x18, 0x0b, 0x56, 0x1b, 0x0a, - 0xb8, 0x39, 0x4a, 0x90, 0xef, 0xdd, 0x8f, 0x3b, 0x64, 0xd0, 0xbb, 0x1f, 0x77, 0x08, 0x55, 0xdb, - 0x42, 0x01, 0xb4, 0x67, 0xe8, 0xd6, 0xef, 0x9a, 0x6a, 0x2b, 0x36, 0x53, 0x5d, 0x25, 0xc8, 0x65, - 0x28, 0x0b, 0xc9, 0xc3, 0x89, 0x27, 0x90, 0x9c, 0x4e, 0x4b, 0x4a, 0xec, 0x0b, 0x95, 0xfa, 0x7c, - 0xe9, 0xdb, 0x69, 0x6a, 0x75, 0x26, 0x57, 0xa0, 0x22, 0x24, 0x8b, 0xa4, 0xb2, 0x8e, 0x47, 0x6c, - 0x19, 0xe5, 0xbe, 0x20, 0x6f, 0x43, 0x89, 0xfb, 0xb3, 0x09, 0x7e, 0x30, 0xa5, 0x28, 0x72, 0x7f, - 0xd6, 0x17, 0xe4, 0x00, 0x2a, 0xf3, 0x28, 0x58, 0x86, 0xae, 0x3f, 0x37, 0x8b, 0x2d, 0xbd, 0x5d, - 0xa5, 0x6b, 0x99, 0x34, 0x20, 0x3f, 0x5d, 0xe1, 0x98, 0xab, 0xd0, 0xfc, 0x74, 0xa5, 0xa2, 0x47, - 0xcc, 0x9f, 0x73, 0x15, 0xa4, 0x1c, 0x47, 0x47, 0xb9, 0x2f, 0xac, 0x3f, 0x34, 0x28, 0x1e, 0x3b, - 0x4b, 0xff, 0x11, 0x69, 0xc2, 0x9e, 0xe7, 0xfa, 0x13, 0xf5, 0x92, 0x32, 0xce, 0x55, 0xcf, 0xf5, - 0x55, 0x77, 0xf6, 0x05, 0xea, 0xd9, 0x93, 0xb5, 0x3e, 0x59, 0x57, 0x1e, 0x7b, 0x92, 0xe8, 0x6f, - 0x24, 0x95, 0xd0, 0xb1, 0x12, 0x57, 0x77, 0x2a, 0x81, 0x59, 0x3a, 0x3d, 0xdf, 0x0e, 0x66, 0xae, - 0x3f, 0xcf, 0xca, 0xa0, 0xfe, 0x0b, 0xe0, 0xd5, 0x6a, 0x14, 0xcf, 0xd6, 0x6d, 0xa8, 0xa4, 0x56, - 0x3b, 0x6f, 0xf3, 0xfb, 0xa1, 0x5a, 0xd5, 0x5b, 0xfb, 0x39, 0x4f, 0xde, 0x82, 0xfd, 0x93, 0x7b, - 0xc3, 0xc3, 0xf1, 0x64, 0x63, 0x69, 0x5b, 0xbf, 0x6a, 0x50, 0xc7, 0x94, 0x7c, 0xf6, 0x26, 0x9f, - 0xd6, 0x4d, 0x28, 0xd9, 0x2a, 0x6b, 0xfa, 0xb2, 0x2e, 0xfd, 0xf7, 0x77, 0x48, 0x5a, 0x3b, 0xb1, - 0x3d, 0x6a, 0x3d, 0x7d, 0xd1, 0xd4, 0x9e, 0xbd, 0x68, 0x6a, 0x7f, 0xbf, 0x68, 0x6a, 0x3f, 0xbe, - 0x6c, 0xe6, 0x9e, 0xbd, 0x6c, 0xe6, 0xfe, 0x7c, 0xd9, 0xcc, 0x3d, 0x2c, 0xc5, 0x7f, 0xde, 0xa6, - 0x25, 0xfc, 0xd7, 0x75, 0xe3, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xc8, 0x95, 0x86, 0xdb, - 0x09, 0x00, 0x00, + 0x76, 0x10, 0xae, 0x0e, 0x2e, 0xce, 0x83, 0x79, 0x80, 0xb6, 0xae, 0x92, 0x62, 0xb7, 0x83, 0x2b, + 0x71, 0xa2, 0x05, 0x9b, 0xf2, 0xc5, 0x76, 0x06, 0xeb, 0xe7, 0x3c, 0x34, 0xfa, 0x5c, 0x46, 0xae, + 0xdd, 0xe7, 0x92, 0xcd, 0x98, 0x64, 0xe4, 0x2b, 0x28, 0x28, 0x0f, 0x53, 0x6b, 0x69, 0xed, 0xc6, + 0xf5, 0x6b, 0x9d, 0x57, 0x6a, 0x74, 0xb6, 0xdd, 0x13, 0x75, 0xbc, 0x0a, 0x39, 0xc5, 0x38, 0xf2, + 0x29, 0x10, 0x0f, 0xb1, 0xc9, 0x39, 0xf3, 0xdc, 0xc5, 0x6a, 0xe2, 0x33, 0x8f, 0x9b, 0xf9, 0x96, + 0xd6, 0xae, 0x52, 0x23, 0xb6, 0x9c, 0xa0, 0x61, 0xc0, 0x3c, 0x4e, 0x08, 0x14, 0x1c, 0xbe, 0x08, + 0xcd, 0x02, 0xda, 0x51, 0x56, 0xd8, 0xd2, 0x77, 0xa5, 0x59, 0x8c, 0x31, 0x25, 0x5b, 0x2b, 0x80, + 0xac, 0x12, 0xd9, 0x83, 0xf2, 0xd9, 0xe0, 0x9b, 0xc1, 0xf0, 0xbb, 0x81, 0x91, 0x53, 0xca, 0xf1, + 0xf0, 0x6c, 0x30, 0xee, 0x51, 0x43, 0x23, 0x55, 0x28, 0xde, 0x39, 0x3c, 0xbb, 0xd3, 0x33, 0xf2, + 0xa4, 0x0e, 0xd5, 0xd3, 0xbb, 0xa3, 0xf1, 0xf0, 0x0e, 0x3d, 0xec, 0x1b, 0x3a, 0x21, 0xd0, 0x40, + 0x4b, 0x86, 0x15, 0x54, 0xe8, 0xe8, 0xac, 0xdf, 0x3f, 0xa4, 0x0f, 0x8c, 0x22, 0xa9, 0x40, 0xe1, + 0xee, 0xe0, 0x64, 0x68, 0x94, 0x48, 0x0d, 0x2a, 0xa3, 0xf1, 0xe1, 0xb8, 0x37, 0xea, 0x8d, 0x8d, + 0xb2, 0x75, 0x0b, 0x4a, 0x23, 0xe6, 0x85, 0x0b, 0x4e, 0x2e, 0x42, 0xf1, 0x31, 0x5b, 0x2c, 0xe3, + 0x6f, 0xa3, 0xd1, 0x58, 0x21, 0xef, 0x42, 0x55, 0xba, 0x1e, 0x17, 0x92, 0x79, 0x21, 0x9e, 0x53, + 0xa7, 0x19, 0x60, 0xfd, 0xa2, 0x41, 0xa5, 0xf7, 0x84, 0x7b, 0xe1, 0x82, 0x45, 0xc4, 0x86, 0x12, + 0x76, 0x41, 0x98, 0x5a, 0x4b, 0x6f, 0xef, 0x5d, 0xaf, 0x77, 0xa4, 0xc3, 0xfc, 0x40, 0x74, 0xee, + 0x29, 0xf4, 0xe8, 0xd6, 0xd3, 0xe7, 0x57, 0x73, 0x7f, 0x3d, 0xbf, 0x7a, 0x73, 0xee, 0x4a, 0x67, + 0x39, 0xed, 0xd8, 0x81, 0xd7, 0x8d, 0x1d, 0x3e, 0x73, 0x83, 0x44, 0xea, 0x86, 0x8f, 0xe6, 0xdd, + 0xad, 0x86, 0x76, 0x1e, 0x62, 0x34, 0x4d, 0x52, 0x67, 0x2c, 0xf3, 0xaf, 0x65, 0xa9, 0xbf, 0xca, + 0xf2, 0x9f, 0x22, 0x54, 0x4f, 0x5d, 0x21, 0x83, 0x79, 0xc4, 0x3c, 0xf2, 0x1e, 0x54, 0xed, 0x60, + 0xe9, 0xcb, 0x89, 0xeb, 0x4b, 0x3c, 0x6b, 0xe1, 0x34, 0x47, 0x2b, 0x08, 0xdd, 0xf5, 0x25, 0x79, + 0x1f, 0xf6, 0x62, 0xf3, 0xf9, 0x22, 0x60, 0x32, 0x2e, 0x73, 0x9a, 0xa3, 0x80, 0xe0, 0x89, 0xc2, + 0x88, 0x01, 0xba, 0x58, 0x7a, 0x58, 0x47, 0xa3, 0x4a, 0x24, 0x97, 0xa0, 0x24, 0x6c, 0x87, 0x7b, + 0x0c, 0x5b, 0x7d, 0x81, 0x26, 0x1a, 0xf9, 0x08, 0x1a, 0x3f, 0xf0, 0x28, 0x98, 0x48, 0x27, 0xe2, + 0xc2, 0x09, 0x16, 0x33, 0x6c, 0xbb, 0x46, 0xeb, 0x0a, 0x1d, 0xa7, 0x20, 0xf9, 0x38, 0x71, 0xcb, + 0x78, 0x95, 0x90, 0x97, 0x46, 0x6b, 0x0a, 0x3f, 0x4e, 0xb9, 0x5d, 0x03, 0x63, 0xc3, 0x2f, 0x26, + 0x58, 0x46, 0x82, 0x1a, 0x6d, 0xac, 0x3d, 0x63, 0x92, 0xa7, 0xd0, 0xf0, 0xf9, 0x9c, 0x49, 0xf7, + 0x31, 0x9f, 0x88, 0x90, 0xf9, 0xc2, 0xac, 0x60, 0x57, 0xde, 0xd9, 0x99, 0xf9, 0xa3, 0xa5, 0xfd, + 0x88, 0xcb, 0x51, 0xc8, 0xfc, 0xa3, 0x82, 0xea, 0x11, 0xad, 0xa7, 0x81, 0x0a, 0x13, 0xe4, 0x13, + 0xd8, 0x5f, 0x67, 0x9a, 0xf1, 0x85, 0x64, 0xc2, 0xac, 0xb6, 0xf4, 0x36, 0xa1, 0xeb, 0x02, 0xb7, + 0x11, 0xdd, 0x72, 0x44, 0x8a, 0xc2, 0x84, 0x96, 0xde, 0xd6, 0x32, 0x47, 0xe4, 0x27, 0x14, 0xb7, + 0x30, 0x10, 0xee, 0x06, 0xb7, 0xbd, 0xff, 0xcd, 0x2d, 0x0d, 0x5c, 0x73, 0x5b, 0x67, 0x4a, 0xb8, + 0xd5, 0x62, 0x6e, 0x29, 0x9c, 0x71, 0x5b, 0x3b, 0x26, 0xdc, 0xea, 0x31, 0xb7, 0x14, 0x4e, 0xb8, + 0x1d, 0x03, 0x44, 0x5c, 0x70, 0x39, 0x71, 0x54, 0x1f, 0x1a, 0xb8, 0x27, 0x3e, 0xdc, 0xe1, 0xb5, + 0x1e, 0xa7, 0x0e, 0x55, 0xce, 0xa7, 0xae, 0x2f, 0x69, 0x35, 0x4a, 0xc5, 0xed, 0x79, 0xdc, 0x7f, + 0x65, 0x1e, 0xc9, 0x07, 0x50, 0xb7, 0x97, 0x42, 0x06, 0xde, 0x04, 0xa7, 0x57, 0x98, 0x06, 0x32, + 0xa9, 0xc5, 0xe0, 0xb7, 0x88, 0x59, 0x37, 0xa1, 0xba, 0x4e, 0xbd, 0xbd, 0x12, 0xca, 0xa0, 0x3f, + 0xe8, 0x8d, 0x0c, 0x8d, 0x94, 0x20, 0x3f, 0x18, 0x1a, 0xf9, 0x6c, 0x2d, 0xe8, 0x47, 0x65, 0x28, + 0xe2, 0xe9, 0x8e, 0x6a, 0x00, 0xd9, 0xa8, 0x58, 0xb7, 0x00, 0xb2, 0x2f, 0xa9, 0xa6, 0x35, 0x38, + 0x3f, 0x17, 0x3c, 0x1e, 0xff, 0x0b, 0x34, 0xd1, 0x14, 0xbe, 0xe0, 0xfe, 0x5c, 0x3a, 0x38, 0xf5, + 0x75, 0x9a, 0x68, 0xd6, 0x6f, 0x79, 0x80, 0xb1, 0xeb, 0xf1, 0x11, 0x8f, 0x5c, 0x2e, 0xde, 0xcc, + 0x3d, 0xff, 0x02, 0xca, 0x02, 0xf7, 0x92, 0x30, 0xf3, 0x58, 0xe5, 0xf2, 0x4e, 0x0f, 0xe2, 0xbd, + 0x95, 0xcc, 0x45, 0xea, 0x4d, 0xbe, 0x84, 0x2a, 0x4f, 0x36, 0x92, 0x30, 0x75, 0x0c, 0xbd, 0xb2, + 0x13, 0x9a, 0xee, 0xac, 0x24, 0x38, 0x8b, 0x20, 0x5f, 0x03, 0x38, 0x69, 0x6f, 0x85, 0x59, 0xc0, + 0xf8, 0x83, 0xd7, 0xb7, 0x3f, 0x49, 0xb0, 0x11, 0x63, 0xfd, 0xa4, 0x41, 0x0d, 0xcf, 0xd2, 0x67, + 0xd2, 0x76, 0x78, 0x44, 0x3e, 0xdf, 0x7a, 0x73, 0xac, 0x9d, 0x64, 0x9b, 0xce, 0x9d, 0x8d, 0xb7, + 0x86, 0x40, 0x61, 0xe3, 0x75, 0x41, 0x39, 0x5b, 0x7f, 0x3a, 0x82, 0xb1, 0x62, 0xb5, 0xa1, 0xa0, + 0xe2, 0xd4, 0x40, 0xf4, 0xee, 0xc7, 0x13, 0x32, 0xe8, 0xdd, 0x8f, 0x27, 0x84, 0xaa, 0xd7, 0x42, + 0x01, 0xb4, 0x67, 0xe8, 0xd6, 0xef, 0x9a, 0x1a, 0x2b, 0x36, 0x53, 0x53, 0x25, 0xc8, 0x65, 0x28, + 0x0b, 0xc9, 0xc3, 0x89, 0x27, 0x90, 0x9c, 0x4e, 0x4b, 0x4a, 0xed, 0x0b, 0x55, 0xfa, 0x7c, 0xe9, + 0xdb, 0x69, 0x69, 0x25, 0x93, 0x2b, 0x50, 0x11, 0x92, 0x45, 0x52, 0x79, 0xc7, 0x2b, 0xb6, 0x8c, + 0x7a, 0x5f, 0x90, 0xb7, 0xa1, 0xc4, 0xfd, 0xd9, 0x04, 0x3f, 0x98, 0x32, 0x14, 0xb9, 0x3f, 0xeb, + 0x0b, 0x72, 0x00, 0x95, 0x79, 0x14, 0x2c, 0x43, 0xd7, 0x9f, 0x9b, 0xc5, 0x96, 0xde, 0xae, 0xd2, + 0xb5, 0x4e, 0x1a, 0x90, 0x9f, 0xae, 0x70, 0xcd, 0x55, 0x68, 0x7e, 0xba, 0x52, 0xd9, 0x23, 0xe6, + 0xcf, 0xb9, 0x4a, 0x52, 0x8e, 0xb3, 0xa3, 0xde, 0x17, 0xd6, 0x1f, 0x1a, 0x14, 0x8f, 0x9d, 0xa5, + 0xff, 0x88, 0x34, 0x61, 0xcf, 0x73, 0xfd, 0x89, 0xba, 0x49, 0x19, 0xe7, 0xaa, 0xe7, 0xfa, 0x6a, + 0x3a, 0xfb, 0x02, 0xed, 0xec, 0xc9, 0xda, 0x9e, 0x3c, 0x57, 0x1e, 0x7b, 0x92, 0xd8, 0x6f, 0x24, + 0x9d, 0xd0, 0xb1, 0x13, 0x57, 0x77, 0x3a, 0x81, 0x55, 0x3a, 0x3d, 0xdf, 0x0e, 0x66, 0xae, 0x3f, + 0xcf, 0xda, 0xa0, 0xfe, 0x0b, 0xe0, 0xd1, 0x6a, 0x14, 0x65, 0xeb, 0x36, 0x54, 0x52, 0xaf, 0x9d, + 0xbb, 0xf9, 0xfd, 0x50, 0x3d, 0xd5, 0x5b, 0xef, 0x73, 0x9e, 0xbc, 0x05, 0xfb, 0x27, 0xf7, 0x86, + 0x87, 0xe3, 0x49, 0x06, 0xea, 0xd6, 0xaf, 0x1a, 0xd4, 0xb1, 0x24, 0x9f, 0xbd, 0xc9, 0xab, 0x75, + 0x13, 0x4a, 0xb6, 0xaa, 0x9a, 0xde, 0xac, 0x4b, 0xff, 0xfd, 0x1d, 0x92, 0xd1, 0x4e, 0x7c, 0x8f, + 0x5a, 0x4f, 0x5f, 0x34, 0xb5, 0x67, 0x2f, 0x9a, 0xda, 0xdf, 0x2f, 0x9a, 0xda, 0x8f, 0x2f, 0x9b, + 0xb9, 0x67, 0x2f, 0x9b, 0xb9, 0x3f, 0x5f, 0x36, 0x73, 0x0f, 0x4b, 0xf1, 0x9f, 0xb7, 0x69, 0x09, + 0xff, 0x75, 0xdd, 0xf8, 0x77, 0x00, 0xa3, 0xc8, 0x95, 0x86, 0xdb, 0x09, 0x00, 0x00, } func (m *MetricMetadata) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/rpc.pb.go index a6892d6056b..de61631b68c 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/rpc.pb.go @@ -796,7 +796,7 @@ func init() { func init() { proto.RegisterFile("store/storepb/rpc.proto", fileDescriptor_a938d55a388af629) } var fileDescriptor_a938d55a388af629 = []byte{ - // 1301 bytes of a gzipped FileDescriptorProto + // 1298 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdf, 0x6e, 0x1b, 0xc5, 0x17, 0xf6, 0x7a, 0xbd, 0xfe, 0x73, 0x9c, 0xb8, 0xce, 0xc4, 0x49, 0x37, 0xae, 0x7e, 0x8e, 0x7f, 0x46, 0x48, 0x56, 0x5b, 0x92, 0xca, 0x45, 0x48, 0x20, 0x6e, 0x92, 0x96, 0x92, 0x4a, 0x24, 0xc0, @@ -822,63 +822,63 @@ var fileDescriptor_a938d55a388af629 = []byte{ 0x32, 0x66, 0x3c, 0xf4, 0x13, 0xe1, 0x85, 0x81, 0x7b, 0xee, 0x05, 0xc3, 0xf0, 0xdc, 0x2e, 0x60, 0xfc, 0xf5, 0x09, 0xbd, 0x70, 0x32, 0xec, 0x14, 0x21, 0x72, 0x1d, 0x80, 0x8e, 0x46, 0x31, 0x1b, 0x51, 0xc1, 0xb8, 0x6d, 0xb5, 0xcd, 0x6e, 0xad, 0xb7, 0x92, 0xae, 0xb6, 0x37, 0x1a, 0xc5, 0xce, - 0x1c, 0x4e, 0x3e, 0x82, 0xad, 0x88, 0xc6, 0xc2, 0xa3, 0xbe, 0x5c, 0x05, 0x8b, 0xea, 0x0e, 0x3d, - 0x4e, 0xfb, 0x3e, 0x1b, 0xda, 0xc5, 0xb6, 0xd1, 0x2d, 0x3b, 0x97, 0x35, 0x21, 0x2d, 0xfa, 0x6d, - 0x0d, 0x93, 0x6f, 0x97, 0xcc, 0xe5, 0x22, 0xa6, 0x82, 0x8d, 0xa6, 0x76, 0xa9, 0x6d, 0x74, 0x6b, - 0xbd, 0xed, 0x74, 0xe1, 0x2f, 0x16, 0x63, 0x1c, 0x6b, 0xda, 0xbf, 0x82, 0xa7, 0x00, 0xd9, 0x86, - 0x2a, 0xbf, 0xef, 0x45, 0xee, 0x60, 0x9c, 0x04, 0xf7, 0xb9, 0x5d, 0xc6, 0xad, 0x80, 0x74, 0xdd, - 0x42, 0x0f, 0xb9, 0x0a, 0xd6, 0xd8, 0x0b, 0x04, 0xb7, 0x2b, 0x6d, 0x03, 0x13, 0xaa, 0x64, 0xbb, - 0x93, 0xca, 0x76, 0x67, 0x2f, 0x98, 0x3a, 0x8a, 0x42, 0x08, 0x14, 0xb8, 0x60, 0x91, 0x0d, 0x98, - 0x36, 0x1c, 0x93, 0x06, 0x58, 0x31, 0x0d, 0x46, 0xcc, 0xae, 0xa2, 0x53, 0x19, 0xe4, 0x26, 0x54, - 0x1f, 0x24, 0x2c, 0x9e, 0xba, 0x2a, 0xf6, 0x0a, 0xc6, 0x26, 0xe9, 0x29, 0xbe, 0x94, 0xd0, 0x81, - 0x44, 0x1c, 0x78, 0x90, 0x8d, 0xc9, 0x0d, 0x00, 0x3e, 0xa6, 0xf1, 0xd0, 0xf5, 0x82, 0xb3, 0xd0, - 0x5e, 0xc5, 0x39, 0x6b, 0xe9, 0x9c, 0x63, 0x89, 0xdc, 0x0d, 0xce, 0x42, 0xa7, 0xc2, 0xd3, 0x21, - 0x79, 0x1f, 0x36, 0xcf, 0x3d, 0x31, 0x0e, 0x13, 0xe1, 0x6a, 0x11, 0xbb, 0xbe, 0x14, 0x02, 0xb7, - 0x6b, 0x6d, 0xb3, 0x5b, 0x71, 0x1a, 0x1a, 0x75, 0x14, 0x88, 0x22, 0xe1, 0x72, 0xcb, 0xbe, 0x37, - 0xf1, 0x84, 0x7d, 0x49, 0x6d, 0x19, 0x0d, 0xb2, 0x03, 0xeb, 0x59, 0xfa, 0xfb, 0x52, 0x39, 0x2e, - 0xf7, 0x1e, 0x32, 0xbb, 0x8e, 0x9c, 0xb5, 0x14, 0xda, 0x97, 0xc8, 0xb1, 0xf7, 0x90, 0x75, 0x7e, - 0xce, 0x03, 0xcc, 0x0e, 0x82, 0x89, 0x16, 0x2c, 0x72, 0x27, 0x9e, 0xef, 0x7b, 0x5c, 0x8b, 0x1a, - 0xa4, 0xeb, 0x10, 0x3d, 0xa4, 0x0d, 0x85, 0xb3, 0x24, 0x18, 0xa0, 0xa6, 0xab, 0x33, 0x29, 0xdd, - 0x49, 0x82, 0x81, 0x83, 0x08, 0xb9, 0x0e, 0xe5, 0x51, 0x1c, 0x26, 0x91, 0x17, 0x8c, 0x50, 0x99, - 0xd5, 0x5e, 0x3d, 0x65, 0x7d, 0xaa, 0xfd, 0x4e, 0xc6, 0x20, 0xef, 0xa4, 0x89, 0xb7, 0x90, 0xba, - 0x9a, 0x52, 0x1d, 0xe9, 0x4c, 0xeb, 0x70, 0x0d, 0xd6, 0xa2, 0x38, 0xfc, 0x8e, 0x0d, 0x50, 0xf5, - 0x3a, 0x37, 0x45, 0xcc, 0x4d, 0x7d, 0x06, 0xe8, 0xbc, 0xbc, 0x07, 0x64, 0x8e, 0xec, 0x05, 0x03, - 0x3f, 0x19, 0x32, 0x54, 0x60, 0xd9, 0x99, 0x0b, 0x73, 0x57, 0x01, 0xe4, 0x26, 0x6c, 0xaa, 0x9b, - 0xee, 0x8e, 0x29, 0x1f, 0xab, 0xe0, 0x6e, 0x40, 0x27, 0x0c, 0x55, 0x56, 0x71, 0xd6, 0x15, 0x7a, - 0x40, 0xf9, 0x18, 0x17, 0x38, 0xa2, 0x13, 0xd6, 0x39, 0x87, 0x4a, 0x56, 0x49, 0xcc, 0x99, 0x2e, - 0xf8, 0x90, 0x5d, 0x64, 0x39, 0x53, 0xf8, 0x90, 0x5d, 0x90, 0xff, 0xc3, 0x8a, 0x08, 0x05, 0xf5, - 0x5d, 0xf4, 0x71, 0xdd, 0x0f, 0xaa, 0xe8, 0xc3, 0x30, 0x9c, 0xd4, 0x20, 0xdf, 0x9f, 0x62, 0x27, - 0x2b, 0x3b, 0xf9, 0xfe, 0x54, 0xb6, 0x3d, 0x7d, 0xcc, 0x02, 0x1e, 0x53, 0x5b, 0x9d, 0x26, 0x14, - 0x64, 0xaa, 0xa5, 0x86, 0x71, 0x8f, 0x06, 0xee, 0x11, 0xc7, 0x9d, 0x1e, 0x94, 0xd3, 0x04, 0xeb, - 0x78, 0xc6, 0x92, 0x78, 0xe6, 0x42, 0xbc, 0x6d, 0xb0, 0x30, 0xd3, 0x92, 0xb0, 0x50, 0x73, 0x6d, - 0x75, 0x62, 0xd8, 0x58, 0xda, 0x29, 0xff, 0xc3, 0xde, 0xde, 0xf9, 0xc5, 0x80, 0x5a, 0xda, 0x68, - 0x95, 0x5e, 0x49, 0x17, 0x8a, 0xd9, 0x4a, 0x52, 0x27, 0xb5, 0xec, 0x42, 0xa9, 0xea, 0xe4, 0x1c, - 0x8d, 0x93, 0x26, 0x94, 0xce, 0x69, 0x1c, 0x48, 0xf5, 0x61, 0xd4, 0x83, 0x9c, 0x93, 0x3a, 0xc8, - 0xf5, 0xb4, 0x4b, 0x98, 0xcf, 0xef, 0x12, 0x07, 0xb9, 0xb4, 0x4f, 0x5c, 0x03, 0x0b, 0x6f, 0x90, - 0x56, 0xf1, 0xfa, 0xe2, 0x92, 0x78, 0x85, 0x24, 0x19, 0x39, 0xfb, 0x65, 0x28, 0xc6, 0x8c, 0x27, - 0xbe, 0xe8, 0xfc, 0x60, 0xc2, 0x5a, 0xa6, 0x94, 0xec, 0xa9, 0x78, 0x61, 0x6b, 0x35, 0xde, 0xa0, - 0xb5, 0xe6, 0xdf, 0xb0, 0xb5, 0x36, 0xc0, 0xe2, 0x82, 0xc6, 0x42, 0x3f, 0xa3, 0xca, 0x20, 0x75, - 0x30, 0x59, 0x30, 0xd4, 0x2f, 0x8b, 0x1c, 0xce, 0x3a, 0xac, 0xf5, 0xf2, 0x0e, 0x3b, 0xff, 0xc2, - 0x15, 0x5f, 0xe3, 0x85, 0x7b, 0x7e, 0x23, 0x2c, 0xbd, 0x4a, 0x23, 0x2c, 0xcf, 0x35, 0xc2, 0x4e, - 0x0c, 0x64, 0xbe, 0x0a, 0x5a, 0x47, 0x0d, 0xb0, 0xe4, 0x5d, 0x51, 0x82, 0xad, 0x38, 0xca, 0x20, - 0x4d, 0x28, 0x6b, 0x89, 0xc8, 0xcb, 0x29, 0x81, 0xcc, 0x9e, 0x9d, 0xdb, 0x7c, 0xe9, 0xb9, 0x3b, - 0x3f, 0x99, 0x7a, 0xd1, 0xaf, 0xa8, 0x9f, 0xcc, 0x6a, 0x2f, 0x37, 0x28, 0xbd, 0xfa, 0xb6, 0x2a, - 0xe3, 0xc5, 0x8a, 0xc8, 0xbf, 0x81, 0x22, 0xcc, 0xb7, 0xa5, 0x88, 0xc2, 0x12, 0x45, 0x58, 0x4b, - 0x14, 0x51, 0x7c, 0x3d, 0x45, 0x94, 0xde, 0x8a, 0x22, 0xca, 0xaf, 0xa2, 0x88, 0xca, 0xbc, 0x22, - 0x12, 0x58, 0x5f, 0x28, 0x8e, 0x96, 0xc4, 0x26, 0x14, 0xbf, 0x47, 0x8f, 0xd6, 0x84, 0xb6, 0xde, - 0x96, 0x28, 0xae, 0xee, 0x43, 0x41, 0xfe, 0xd1, 0x22, 0x25, 0x30, 0x9d, 0xbd, 0xd3, 0x7a, 0x8e, - 0x54, 0xc0, 0xba, 0xf5, 0xf9, 0xbd, 0xa3, 0x93, 0xba, 0x21, 0x7d, 0xc7, 0xf7, 0x0e, 0xeb, 0x79, - 0x39, 0x38, 0xbc, 0x7b, 0x54, 0x37, 0x71, 0xb0, 0xf7, 0x75, 0xbd, 0x40, 0xaa, 0x50, 0x42, 0xd6, - 0x27, 0x4e, 0xdd, 0xea, 0xfd, 0x6a, 0x80, 0x75, 0x2c, 0xff, 0xa4, 0x93, 0x0f, 0xa1, 0xa8, 0xfa, - 0x0f, 0xd9, 0x58, 0xec, 0x47, 0x5a, 0x6c, 0xcd, 0xcd, 0x67, 0xdd, 0xea, 0x98, 0x37, 0x0c, 0x72, - 0x0b, 0x60, 0x76, 0x23, 0xc8, 0xd6, 0x42, 0xfe, 0xe7, 0x7b, 0x55, 0xb3, 0xb9, 0x0c, 0xd2, 0xd9, - 0xba, 0x03, 0xd5, 0xb9, 0x24, 0x92, 0x45, 0xea, 0x82, 0xec, 0x9b, 0x57, 0x96, 0x62, 0x2a, 0x4e, - 0xef, 0x08, 0x6a, 0xf8, 0xa9, 0x20, 0xf5, 0xac, 0x4e, 0xf6, 0x31, 0x54, 0x1d, 0x36, 0x09, 0x05, - 0x43, 0x3f, 0xc9, 0xf4, 0x31, 0xff, 0x45, 0xd1, 0xdc, 0x78, 0xc6, 0xab, 0xbf, 0x3c, 0x72, 0xfb, - 0xef, 0x3e, 0xfa, 0xbb, 0x95, 0x7b, 0xf4, 0xa4, 0x65, 0x3c, 0x7e, 0xd2, 0x32, 0xfe, 0x7a, 0xd2, - 0x32, 0x7e, 0x7c, 0xda, 0xca, 0x3d, 0x7e, 0xda, 0xca, 0xfd, 0xfe, 0xb4, 0x95, 0xfb, 0xa6, 0xa4, - 0xbf, 0x70, 0xfa, 0x45, 0xac, 0xd0, 0xcd, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x56, 0x75, - 0xa5, 0x4b, 0x0d, 0x00, 0x00, + 0x1c, 0x4e, 0x3e, 0x82, 0xad, 0x88, 0xc6, 0xc2, 0xa3, 0xbe, 0x1b, 0xeb, 0xa2, 0xba, 0x43, 0x8f, + 0xd3, 0xbe, 0xcf, 0x86, 0x76, 0xb1, 0x6d, 0x74, 0xcb, 0xce, 0x65, 0x4d, 0x48, 0x8b, 0x7e, 0x5b, + 0xc3, 0xe4, 0xdb, 0x25, 0x73, 0xb9, 0x88, 0xa9, 0x60, 0xa3, 0xa9, 0x5d, 0x6a, 0x1b, 0xdd, 0x5a, + 0x6f, 0x3b, 0x5d, 0xf8, 0x8b, 0xc5, 0x18, 0xc7, 0x9a, 0xf6, 0xaf, 0xe0, 0x29, 0x40, 0xb6, 0xa1, + 0xca, 0xef, 0x7b, 0x91, 0x3b, 0x18, 0x27, 0xc1, 0x7d, 0x6e, 0x97, 0x71, 0x2b, 0x20, 0x5d, 0xb7, + 0xd0, 0x43, 0xae, 0x82, 0x35, 0xf6, 0x02, 0xc1, 0xed, 0x4a, 0xdb, 0xc0, 0x84, 0x2a, 0xd9, 0xee, + 0xa4, 0xb2, 0xdd, 0xd9, 0x0b, 0xa6, 0x8e, 0xa2, 0x10, 0x02, 0x05, 0x2e, 0x58, 0x64, 0x03, 0xa6, + 0x0d, 0xc7, 0xa4, 0x01, 0x56, 0x4c, 0x83, 0x11, 0xb3, 0xab, 0xe8, 0x54, 0x06, 0xb9, 0x09, 0xd5, + 0x07, 0x09, 0x8b, 0xa7, 0xae, 0x8a, 0xbd, 0x82, 0xb1, 0x49, 0x7a, 0x8a, 0x2f, 0x25, 0x74, 0x20, + 0x11, 0x07, 0x1e, 0x64, 0x63, 0x72, 0x03, 0x80, 0x8f, 0x69, 0x3c, 0x74, 0xbd, 0xe0, 0x2c, 0xb4, + 0x57, 0x71, 0xce, 0x5a, 0x3a, 0xe7, 0x58, 0x22, 0x77, 0x83, 0xb3, 0xd0, 0xa9, 0xf0, 0x74, 0x48, + 0xde, 0x87, 0xcd, 0x73, 0x4f, 0x8c, 0xc3, 0x44, 0xb8, 0x5a, 0xc4, 0xae, 0x2f, 0x85, 0xc0, 0xed, + 0x5a, 0xdb, 0xec, 0x56, 0x9c, 0x86, 0x46, 0x1d, 0x05, 0xa2, 0x48, 0xb8, 0xdc, 0xb2, 0xef, 0x4d, + 0x3c, 0x61, 0x5f, 0x52, 0x5b, 0x46, 0x83, 0xec, 0xc0, 0x7a, 0x96, 0xfe, 0xbe, 0x54, 0x8e, 0xcb, + 0xbd, 0x87, 0xcc, 0xae, 0x23, 0x67, 0x2d, 0x85, 0xf6, 0x25, 0x72, 0xec, 0x3d, 0x64, 0x9d, 0x9f, + 0xf3, 0x00, 0xb3, 0x83, 0x60, 0xa2, 0x05, 0x8b, 0xdc, 0x89, 0xe7, 0xfb, 0x1e, 0xd7, 0xa2, 0x06, + 0xe9, 0x3a, 0x44, 0x0f, 0x69, 0x43, 0xe1, 0x2c, 0x09, 0x06, 0xa8, 0xe9, 0xea, 0x4c, 0x4a, 0x77, + 0x92, 0x60, 0xe0, 0x20, 0x42, 0xae, 0x43, 0x79, 0x14, 0x87, 0x49, 0xe4, 0x05, 0x23, 0x54, 0x66, + 0xb5, 0x57, 0x4f, 0x59, 0x9f, 0x6a, 0xbf, 0x93, 0x31, 0xc8, 0x3b, 0x69, 0xe2, 0x2d, 0xa4, 0xae, + 0xa6, 0x54, 0x47, 0x3a, 0xd3, 0x3a, 0x5c, 0x83, 0xb5, 0x28, 0x0e, 0xbf, 0x63, 0x03, 0x54, 0xbd, + 0xce, 0x4d, 0x11, 0x73, 0x53, 0x9f, 0x01, 0x3a, 0x2f, 0xef, 0x01, 0x99, 0x23, 0x7b, 0xc1, 0xc0, + 0x4f, 0x86, 0x0c, 0x15, 0x58, 0x76, 0xe6, 0xc2, 0xdc, 0x55, 0x00, 0xb9, 0x09, 0x9b, 0xea, 0xa6, + 0xbb, 0x63, 0xca, 0xc7, 0x2a, 0xb8, 0x1b, 0xd0, 0x09, 0x43, 0x95, 0x55, 0x9c, 0x75, 0x85, 0x1e, + 0x50, 0x3e, 0xc6, 0x05, 0x8e, 0xe8, 0x84, 0x75, 0xce, 0xa1, 0x92, 0x55, 0x12, 0x73, 0xa6, 0x0b, + 0x3e, 0x64, 0x17, 0x59, 0xce, 0x14, 0x3e, 0x64, 0x17, 0xe4, 0xff, 0xb0, 0x22, 0x42, 0x41, 0x7d, + 0x17, 0x7d, 0x5c, 0xf7, 0x83, 0x2a, 0xfa, 0x30, 0x0c, 0x27, 0x35, 0xc8, 0xf7, 0xa7, 0xd8, 0xc9, + 0xca, 0x4e, 0xbe, 0x3f, 0x95, 0x6d, 0x4f, 0x1f, 0xb3, 0x80, 0xc7, 0xd4, 0x56, 0xa7, 0x09, 0x05, + 0x99, 0x6a, 0xa9, 0x61, 0xdc, 0xa3, 0x81, 0x7b, 0xc4, 0x71, 0xa7, 0x07, 0xe5, 0x34, 0xc1, 0x3a, + 0x9e, 0xb1, 0x24, 0x9e, 0xb9, 0x10, 0x6f, 0x1b, 0x2c, 0xcc, 0xb4, 0x24, 0x2c, 0xd4, 0x5c, 0x5b, + 0x9d, 0x18, 0x36, 0x96, 0x76, 0xca, 0xff, 0xb0, 0xb7, 0x77, 0x7e, 0x31, 0xa0, 0x96, 0x36, 0x5a, + 0xa5, 0x57, 0xd2, 0x85, 0x62, 0xb6, 0x92, 0xd4, 0x49, 0x2d, 0xbb, 0x50, 0xaa, 0x3a, 0x39, 0x47, + 0xe3, 0xa4, 0x09, 0xa5, 0x73, 0x1a, 0x07, 0x52, 0x7d, 0x18, 0xf5, 0x20, 0xe7, 0xa4, 0x0e, 0x72, + 0x3d, 0xed, 0x12, 0xe6, 0xf3, 0xbb, 0xc4, 0x41, 0x2e, 0xed, 0x13, 0xd7, 0xc0, 0xc2, 0x1b, 0xa4, + 0x55, 0xbc, 0xbe, 0xb8, 0x24, 0x5e, 0x21, 0x49, 0x46, 0xce, 0x7e, 0x19, 0x8a, 0x31, 0xe3, 0x89, + 0x2f, 0x3a, 0x3f, 0x98, 0xb0, 0x96, 0x29, 0x25, 0x7b, 0x2a, 0x5e, 0xd8, 0x5a, 0x8d, 0x37, 0x68, + 0xad, 0xf9, 0x37, 0x6c, 0xad, 0x0d, 0xb0, 0xb8, 0xa0, 0xb1, 0xd0, 0xcf, 0xa8, 0x32, 0x48, 0x1d, + 0x4c, 0x16, 0x0c, 0xf5, 0xcb, 0x22, 0x87, 0xb3, 0x0e, 0x6b, 0xbd, 0xbc, 0xc3, 0xce, 0xbf, 0x70, + 0xc5, 0xd7, 0x78, 0xe1, 0x9e, 0xdf, 0x08, 0x4b, 0xaf, 0xd2, 0x08, 0xcb, 0x73, 0x8d, 0xb0, 0x13, + 0x03, 0x99, 0xaf, 0x82, 0xd6, 0x51, 0x03, 0x2c, 0x79, 0x57, 0x94, 0x60, 0x2b, 0x8e, 0x32, 0x48, + 0x13, 0xca, 0x5a, 0x22, 0xf2, 0x72, 0x4a, 0x20, 0xb3, 0x67, 0xe7, 0x36, 0x5f, 0x7a, 0xee, 0xce, + 0x4f, 0xa6, 0x5e, 0xf4, 0x2b, 0xea, 0x27, 0xb3, 0xda, 0xcb, 0x0d, 0x4a, 0xaf, 0xbe, 0xad, 0xca, + 0x78, 0xb1, 0x22, 0xf2, 0x6f, 0xa0, 0x08, 0xf3, 0x6d, 0x29, 0xa2, 0xb0, 0x44, 0x11, 0xd6, 0x12, + 0x45, 0x14, 0x5f, 0x4f, 0x11, 0xa5, 0xb7, 0xa2, 0x88, 0xf2, 0xab, 0x28, 0xa2, 0x32, 0xaf, 0x88, + 0x04, 0xd6, 0x17, 0x8a, 0xa3, 0x25, 0xb1, 0x09, 0xc5, 0xef, 0xd1, 0xa3, 0x35, 0xa1, 0xad, 0xb7, + 0x25, 0x8a, 0xab, 0xfb, 0x50, 0x90, 0x7f, 0xb4, 0x48, 0x09, 0x4c, 0x67, 0xef, 0xb4, 0x9e, 0x23, + 0x15, 0xb0, 0x6e, 0x7d, 0x7e, 0xef, 0xe8, 0xa4, 0x6e, 0x48, 0xdf, 0xf1, 0xbd, 0xc3, 0x7a, 0x5e, + 0x0e, 0x0e, 0xef, 0x1e, 0xd5, 0x4d, 0x1c, 0xec, 0x7d, 0x5d, 0x2f, 0x90, 0x2a, 0x94, 0x90, 0xf5, + 0x89, 0x53, 0xb7, 0x7a, 0xbf, 0x1a, 0x60, 0x1d, 0xcb, 0x3f, 0xe9, 0xe4, 0x43, 0x28, 0xaa, 0xfe, + 0x43, 0x36, 0x16, 0xfb, 0x91, 0x16, 0x5b, 0x73, 0xf3, 0x59, 0xb7, 0x3a, 0xe6, 0x0d, 0x83, 0xdc, + 0x02, 0x98, 0xdd, 0x08, 0xb2, 0xb5, 0x90, 0xff, 0xf9, 0x5e, 0xd5, 0x6c, 0x2e, 0x83, 0x74, 0xb6, + 0xee, 0x40, 0x75, 0x2e, 0x89, 0x64, 0x91, 0xba, 0x20, 0xfb, 0xe6, 0x95, 0xa5, 0x98, 0x8a, 0xd3, + 0x3b, 0x82, 0x1a, 0x7e, 0x2a, 0x48, 0x3d, 0xab, 0x93, 0x7d, 0x0c, 0x55, 0x87, 0x4d, 0x42, 0xc1, + 0xd0, 0x4f, 0x32, 0x7d, 0xcc, 0x7f, 0x51, 0x34, 0x37, 0x9e, 0xf1, 0xea, 0x2f, 0x8f, 0xdc, 0xfe, + 0xbb, 0x8f, 0xfe, 0x6e, 0xe5, 0x1e, 0x3d, 0x69, 0x19, 0x8f, 0x9f, 0xb4, 0x8c, 0xbf, 0x9e, 0xb4, + 0x8c, 0x1f, 0x9f, 0xb6, 0x72, 0x8f, 0x9f, 0xb6, 0x72, 0xbf, 0x3f, 0x6d, 0xe5, 0xbe, 0x29, 0xe9, + 0x2f, 0x9c, 0x7e, 0x11, 0x2b, 0x74, 0xf3, 0x9f, 0x01, 0x00, 0x8f, 0x56, 0x75, 0xa5, 0x4b, 0x0d, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/types.pb.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/types.pb.go index 13e81010764..4611730fc3a 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/types.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/types.pb.go @@ -331,7 +331,7 @@ func init() { func init() { proto.RegisterFile("store/storepb/types.proto", fileDescriptor_121fba57de02d8e0) } var fileDescriptor_121fba57de02d8e0 = []byte{ - // 588 bytes of a gzipped FileDescriptorProto + // 585 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x4d, 0x6f, 0xd3, 0x30, 0x18, 0x8e, 0xd3, 0x34, 0x6d, 0xdf, 0x7d, 0x10, 0xcc, 0x04, 0xd9, 0x0e, 0x69, 0x15, 0x04, 0x54, 0x93, 0x96, 0x48, 0x03, 0xc4, 0x85, 0x4b, 0x8b, 0xca, 0x87, 0xb4, 0xad, 0xcc, 0xab, 0x04, 0xda, @@ -367,8 +367,8 @@ var fileDescriptor_121fba57de02d8e0 = []byte{ 0x78, 0x9a, 0xc4, 0x9c, 0x9d, 0x88, 0x8c, 0x0a, 0xe6, 0x5f, 0xe2, 0x26, 0x68, 0x1f, 0x7a, 0xe4, 0xc8, 0x50, 0x70, 0x0b, 0xea, 0xbd, 0xfe, 0x90, 0x8c, 0x0c, 0xd4, 0x7f, 0x34, 0xfb, 0x63, 0x29, 0xb3, 0x1b, 0x0b, 0x5d, 0xdd, 0x58, 0xe8, 0xf7, 0x8d, 0x85, 0xbe, 0xcc, 0x2d, 0xe5, 0x6a, 0x6e, - 0x29, 0x3f, 0xe7, 0x96, 0x72, 0xda, 0xa8, 0x9e, 0xee, 0x58, 0x97, 0x8f, 0xef, 0xe9, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xa9, 0xae, 0xe0, 0xc2, 0xd2, 0x03, 0x00, 0x00, + 0x29, 0x3f, 0xe7, 0x96, 0x72, 0xda, 0xa8, 0x9e, 0xee, 0x58, 0x97, 0x8f, 0xef, 0xe9, 0xdf, 0x01, + 0x00, 0xa9, 0xae, 0xe0, 0xc2, 0xd2, 0x03, 0x00, 0x00, } func (m *Chunk) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/telemetry.go b/vendor/github.com/thanos-io/thanos/pkg/store/telemetry.go index 11812ed2357..da0cdd6fa79 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/telemetry.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/telemetry.go @@ -205,6 +205,14 @@ func (i *instrumentedServer) Send(response *storepb.SeriesResponse) error { if series := response.GetSeries(); series != nil { i.seriesSent++ i.chunksSent += float64(len(series.Chunks)) + } else if batch := response.GetBatch(); batch != nil { + for _, series := range batch.Series { + if series == nil { + continue + } + i.seriesSent++ + i.chunksSent += float64(len(series.Chunks)) + } } return nil } diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go b/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go index 31ae77d7c8f..ae719b7f19e 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go @@ -34,9 +34,10 @@ import ( ) const ( - RemoteReadFrameLimit = 1048576 - cuckooStoreFilterCapacity = 1000000 - storeFilterUpdateInterval = 15 * time.Second + RemoteReadFrameLimit = 1048576 + cuckooStoreFilterCapacity = 1000000 + storeFilterUpdateInterval = 15 * time.Second + seriesContextCheckInterval = 128 ) type TSDBReader interface { @@ -312,7 +313,13 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, seriesSrv storepb.Store_Ser finalExtLset := rmLabels(s.extLsetAsLabelSets[0].Copy(), extLsetToRemove) // Stream at most one series per frame; series may be split over multiple frames according to maxBytesInFrame. - for set.Next() { + ctx := srv.Context() + for i := 0; set.Next(); i++ { + if i%seriesContextCheckInterval == 0 { + if err := ctx.Err(); err != nil { + return status.FromContextError(err).Err() + } + } series := set.At() completeLabelset := labelpb.ExtendSortedLabels(rmLabels(series.Labels(), extLsetToRemove), finalExtLset) diff --git a/vendor/github.com/thanos-io/thanos/pkg/targets/targetspb/rpc.pb.go b/vendor/github.com/thanos-io/thanos/pkg/targets/targetspb/rpc.pb.go index 5344c1905ec..c4f5a0535af 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/targets/targetspb/rpc.pb.go +++ b/vendor/github.com/thanos-io/thanos/pkg/targets/targetspb/rpc.pb.go @@ -350,51 +350,51 @@ func init() { func init() { proto.RegisterFile("targets/targetspb/rpc.proto", fileDescriptor_b5cdaee03579e907) } var fileDescriptor_b5cdaee03579e907 = []byte{ - // 702 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x53, 0xdb, 0x3a, - 0x10, 0xb6, 0x03, 0x38, 0x64, 0x81, 0xbc, 0xa0, 0xe1, 0x81, 0xc9, 0x7b, 0x13, 0x33, 0xb9, 0x3c, - 0x5e, 0x3b, 0x75, 0x3a, 0xe1, 0xd2, 0xce, 0xf4, 0x82, 0x1b, 0x5a, 0x3a, 0x6d, 0x43, 0xaa, 0x84, - 0x32, 0xa5, 0x07, 0x46, 0x49, 0x54, 0x27, 0x33, 0x26, 0x72, 0x25, 0x85, 0x0e, 0xff, 0x82, 0x7f, - 0xd2, 0x43, 0xff, 0x04, 0x87, 0x1e, 0x38, 0xf6, 0x94, 0xb6, 0x70, 0xcb, 0xaf, 0xe8, 0x58, 0xb6, - 0x63, 0x07, 0xd2, 0x63, 0x2f, 0xd6, 0xee, 0xb7, 0xdf, 0x7e, 0xbb, 0xb2, 0xb4, 0x82, 0x7f, 0x24, - 0xe1, 0x2e, 0x95, 0xa2, 0x12, 0xad, 0x7e, 0xbb, 0xc2, 0xfd, 0x8e, 0xed, 0x73, 0x26, 0x19, 0x32, - 0x64, 0x8f, 0x0c, 0x98, 0x28, 0x6e, 0x0a, 0xc9, 0x38, 0xad, 0xa8, 0xaf, 0xdf, 0xae, 0xc8, 0x73, - 0x9f, 0x8a, 0x90, 0x52, 0x5c, 0x73, 0x99, 0xcb, 0x94, 0x59, 0x09, 0xac, 0x08, 0x8d, 0x12, 0x3c, - 0xd2, 0xa6, 0xde, 0xad, 0x04, 0xcb, 0x65, 0xcc, 0xf5, 0x68, 0x45, 0x79, 0xed, 0xe1, 0x87, 0x8a, - 0xec, 0x9f, 0x52, 0x21, 0xc9, 0xa9, 0x1f, 0x12, 0xca, 0x5f, 0x75, 0xc8, 0xb7, 0xc2, 0x66, 0x30, - 0xfd, 0x38, 0xa4, 0x42, 0xa2, 0x2a, 0x2c, 0x08, 0x49, 0x24, 0x35, 0xf5, 0x2d, 0x7d, 0x3b, 0x5f, - 0xfd, 0xd7, 0x0e, 0xfb, 0xb2, 0xa7, 0x69, 0x76, 0x33, 0xe0, 0xe0, 0x90, 0x8a, 0xde, 0xc3, 0xa6, - 0x4f, 0xb8, 0xec, 0x13, 0xef, 0x84, 0x53, 0xe1, 0xb3, 0x81, 0xa0, 0x27, 0x42, 0x72, 0x22, 0xa9, - 0x7b, 0x6e, 0x66, 0x94, 0x8e, 0x15, 0xeb, 0x34, 0x42, 0x22, 0x8e, 0x78, 0xcd, 0x88, 0x86, 0x37, - 0xfc, 0xd9, 0x81, 0xf2, 0xff, 0xb0, 0xa0, 0x8a, 0xa1, 0x2c, 0xcc, 0xed, 0xd6, 0xdf, 0x15, 0x34, - 0x04, 0x60, 0xec, 0x3e, 0x6d, 0xbd, 0x78, 0xbb, 0x57, 0xd0, 0xd1, 0x12, 0x64, 0x6b, 0xf8, 0xa0, - 0xd1, 0xd8, 0xab, 0x15, 0x32, 0x65, 0x0f, 0xfe, 0x9a, 0xb4, 0x19, 0xaa, 0xa0, 0x1d, 0xc8, 0x46, - 0x7f, 0x5b, 0x6d, 0x68, 0xa9, 0xba, 0x31, 0xbd, 0xa1, 0x5a, 0x5f, 0x74, 0xd8, 0x19, 0xe5, 0xe7, - 0xfb, 0x1a, 0x8e, 0x99, 0xa8, 0x08, 0xd9, 0x4f, 0x84, 0x0f, 0xfa, 0x03, 0x57, 0x75, 0x9f, 0x0b, - 0x62, 0x11, 0xe0, 0x2c, 0x82, 0xc1, 0xa9, 0x18, 0x7a, 0xb2, 0xfc, 0x45, 0x8f, 0xcb, 0x4d, 0x44, - 0xd0, 0x6b, 0x58, 0x21, 0x1d, 0xd9, 0x3f, 0xa3, 0xad, 0x49, 0xd1, 0xb9, 0xed, 0xa5, 0xea, 0x5a, - 0x5c, 0x74, 0x37, 0x15, 0x74, 0x56, 0xc7, 0x23, 0x6b, 0x9a, 0x8e, 0xa7, 0x5d, 0xf4, 0x06, 0xf2, - 0x5d, 0xce, 0x7c, 0x9f, 0x76, 0x63, 0xbd, 0x8c, 0xd2, 0xfb, 0x3b, 0xd6, 0xab, 0xa5, 0xa3, 0x0e, - 0x1a, 0x8f, 0xac, 0x5b, 0x09, 0xf8, 0x96, 0x5f, 0xfe, 0x3c, 0x0f, 0xcb, 0xe9, 0x2e, 0xd0, 0x11, - 0x14, 0xba, 0x51, 0xff, 0xb4, 0xfb, 0x2a, 0xb8, 0x45, 0xf1, 0xaf, 0x5a, 0x8d, 0xab, 0x1c, 0x2b, - 0xb8, 0x49, 0xa5, 0x63, 0x5e, 0x8e, 0x2c, 0x6d, 0x3c, 0xb2, 0xee, 0xa4, 0xe0, 0x3b, 0x08, 0x7a, - 0x0c, 0x86, 0x17, 0xca, 0x65, 0x7e, 0x27, 0x97, 0x8f, 0xe4, 0x22, 0x22, 0x8e, 0x56, 0x64, 0x03, - 0x88, 0x0e, 0x27, 0x3e, 0x6d, 0x30, 0xe6, 0x99, 0x73, 0xc1, 0x19, 0x38, 0xf9, 0xf1, 0xc8, 0x4a, - 0xa1, 0x38, 0x65, 0xa3, 0xfb, 0x90, 0x0b, 0xbd, 0x43, 0xee, 0x99, 0xf3, 0x8a, 0xbe, 0x32, 0x1e, - 0x59, 0x09, 0x88, 0x13, 0x33, 0x20, 0xbb, 0x1e, 0x6b, 0x13, 0x2f, 0x20, 0x2f, 0x24, 0xe4, 0x09, - 0x88, 0x13, 0x33, 0x20, 0x7b, 0x44, 0xc8, 0x3d, 0xce, 0x19, 0x37, 0x8d, 0x84, 0x3c, 0x01, 0x71, - 0x62, 0x22, 0x0c, 0x10, 0x38, 0x4d, 0x55, 0xca, 0xcc, 0xaa, 0x5d, 0x17, 0xed, 0x70, 0x08, 0xed, - 0x78, 0x08, 0xed, 0x56, 0x3c, 0x84, 0xce, 0x7a, 0xb4, 0xfd, 0x54, 0xd6, 0xc5, 0x77, 0x4b, 0xc7, - 0x29, 0x1f, 0x3d, 0x03, 0x94, 0x78, 0xb5, 0x21, 0x27, 0xb2, 0xcf, 0x06, 0xe6, 0xe2, 0x96, 0xbe, - 0xad, 0x3b, 0xeb, 0xe3, 0x91, 0x35, 0x23, 0x8a, 0x67, 0x60, 0xe8, 0x11, 0x18, 0x3d, 0x4a, 0x3c, - 0xd9, 0x33, 0x73, 0x6a, 0x20, 0xd7, 0xa6, 0xe7, 0x60, 0x5f, 0xc5, 0x1c, 0x08, 0x0e, 0x23, 0xe4, - 0xe1, 0x68, 0x2d, 0xf7, 0x60, 0x65, 0xea, 0x9a, 0xfd, 0xb1, 0x1b, 0x73, 0xef, 0x01, 0x2c, 0xa7, - 0xbb, 0x41, 0x8b, 0x30, 0x5f, 0x3b, 0x38, 0xaa, 0x17, 0x34, 0x64, 0x40, 0xe6, 0xb0, 0x11, 0x8e, - 0xfb, 0x61, 0xfd, 0x65, 0x3d, 0x00, 0x33, 0xd5, 0xe7, 0x90, 0x8d, 0x07, 0xe5, 0x49, 0x62, 0xae, - 0xcf, 0x7e, 0xb1, 0x8a, 0x1b, 0x77, 0xf0, 0xf0, 0x89, 0x78, 0xa8, 0x3b, 0xff, 0x5d, 0xfe, 0x2c, - 0x69, 0x97, 0xd7, 0x25, 0xfd, 0xea, 0xba, 0xa4, 0xff, 0xb8, 0x2e, 0xe9, 0x17, 0x37, 0x25, 0xed, - 0xea, 0xa6, 0xa4, 0x7d, 0xbb, 0x29, 0x69, 0xc7, 0xb9, 0xc9, 0x73, 0xdd, 0x36, 0xd4, 0x21, 0xee, - 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x5c, 0x84, 0x60, 0xca, 0x05, 0x00, 0x00, + // 698 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xc1, 0x4e, 0xdb, 0x4c, + 0x10, 0xb6, 0x03, 0x38, 0x64, 0x80, 0x10, 0x56, 0xfc, 0x60, 0xf2, 0xff, 0x8a, 0x51, 0x2e, 0x3f, + 0x6d, 0x55, 0xa7, 0x0a, 0x97, 0x56, 0xea, 0x05, 0x37, 0xb4, 0x54, 0x6d, 0x43, 0xba, 0x09, 0x45, + 0xa5, 0x07, 0xb4, 0x49, 0xb6, 0x4e, 0x24, 0x93, 0x75, 0xd7, 0x1b, 0x2a, 0xde, 0x82, 0x37, 0xe9, + 0xa1, 0x2f, 0xc1, 0xa1, 0x07, 0x8e, 0x3d, 0xb9, 0x2d, 0xdc, 0xf2, 0x14, 0x95, 0xd7, 0x76, 0xec, + 0x84, 0xf4, 0xd8, 0x8b, 0x77, 0xe6, 0x9b, 0x6f, 0xbe, 0x99, 0xf5, 0xee, 0x2c, 0xfc, 0x2b, 0x08, + 0xb7, 0xa9, 0xf0, 0x2a, 0xd1, 0xea, 0xb6, 0x2b, 0xdc, 0xed, 0x98, 0x2e, 0x67, 0x82, 0x21, 0x4d, + 0xf4, 0xc8, 0x80, 0x79, 0xc5, 0x2d, 0x4f, 0x30, 0x4e, 0x2b, 0xf2, 0xeb, 0xb6, 0x2b, 0xe2, 0xc2, + 0xa5, 0x5e, 0x48, 0x29, 0xae, 0xdb, 0xcc, 0x66, 0xd2, 0xac, 0x04, 0x56, 0x84, 0x46, 0x09, 0x0e, + 0x69, 0x53, 0x67, 0x2a, 0xc1, 0xb0, 0x19, 0xb3, 0x1d, 0x5a, 0x91, 0x5e, 0x7b, 0xf8, 0xb1, 0x22, + 0xfa, 0x67, 0xd4, 0x13, 0xe4, 0xcc, 0x0d, 0x09, 0xe5, 0x6f, 0x2a, 0xe4, 0x5b, 0x61, 0x33, 0x98, + 0x7e, 0x1a, 0x52, 0x4f, 0xa0, 0x2a, 0x2c, 0x78, 0x82, 0x08, 0xaa, 0xab, 0xdb, 0xea, 0x4e, 0xbe, + 0xfa, 0x9f, 0x19, 0xf6, 0x65, 0x4e, 0xd2, 0xcc, 0x66, 0xc0, 0xc1, 0x21, 0x15, 0x7d, 0x80, 0x2d, + 0x97, 0x70, 0xd1, 0x27, 0xce, 0x29, 0xa7, 0x9e, 0xcb, 0x06, 0x1e, 0x3d, 0xf5, 0x04, 0x27, 0x82, + 0xda, 0x17, 0x7a, 0x46, 0xea, 0x18, 0xb1, 0x4e, 0x23, 0x24, 0xe2, 0x88, 0xd7, 0x8c, 0x68, 0x78, + 0xd3, 0x9d, 0x1d, 0x28, 0xdf, 0x83, 0x05, 0x59, 0x0c, 0x65, 0x61, 0x6e, 0xaf, 0xfe, 0xbe, 0xa0, + 0x20, 0x00, 0x6d, 0xef, 0x59, 0xeb, 0xe5, 0xbb, 0xfd, 0x82, 0x8a, 0x96, 0x20, 0x5b, 0xc3, 0x87, + 0x8d, 0xc6, 0x7e, 0xad, 0x90, 0x29, 0x3b, 0xb0, 0x3a, 0x6e, 0x33, 0x54, 0x41, 0xbb, 0x90, 0x8d, + 0xfe, 0xb6, 0xdc, 0xd0, 0x52, 0x75, 0x73, 0x72, 0x43, 0xb5, 0xbe, 0xd7, 0x61, 0xe7, 0x94, 0x5f, + 0x1c, 0x28, 0x38, 0x66, 0xa2, 0x22, 0x64, 0x3f, 0x13, 0x3e, 0xe8, 0x0f, 0x6c, 0xd9, 0x7d, 0x2e, + 0x88, 0x45, 0x80, 0xb5, 0x08, 0x1a, 0xa7, 0xde, 0xd0, 0x11, 0xe5, 0xaf, 0x2a, 0xac, 0x4e, 0x89, + 0xa0, 0x37, 0xb0, 0x42, 0x3a, 0xa2, 0x7f, 0x4e, 0x5b, 0xe3, 0xa2, 0x73, 0x3b, 0x4b, 0xd5, 0xf5, + 0xb8, 0xe8, 0x5e, 0x2a, 0x68, 0xad, 0x8d, 0x7c, 0x63, 0x92, 0x8e, 0x27, 0x5d, 0xf4, 0x16, 0xf2, + 0x5d, 0xce, 0x5c, 0x97, 0x76, 0x63, 0xbd, 0x8c, 0xd4, 0xfb, 0x27, 0xd6, 0xab, 0xa5, 0xa3, 0x16, + 0x1a, 0xf9, 0xc6, 0x54, 0x02, 0x9e, 0xf2, 0xcb, 0x5f, 0xe6, 0x61, 0x39, 0xdd, 0x05, 0x3a, 0x86, + 0x42, 0x37, 0xea, 0x9f, 0x76, 0x5f, 0x07, 0xb7, 0x28, 0xfe, 0x55, 0x6b, 0x71, 0x95, 0x13, 0x09, + 0x37, 0xa9, 0xb0, 0xf4, 0x2b, 0xdf, 0x50, 0x46, 0xbe, 0x71, 0x27, 0x05, 0xdf, 0x41, 0xd0, 0x13, + 0xd0, 0x9c, 0x50, 0x2e, 0xf3, 0x27, 0xb9, 0x7c, 0x24, 0x17, 0x11, 0x71, 0xb4, 0x22, 0x13, 0xc0, + 0xeb, 0x70, 0xe2, 0xd2, 0x06, 0x63, 0x8e, 0x3e, 0x17, 0x9c, 0x81, 0x95, 0x1f, 0xf9, 0x46, 0x0a, + 0xc5, 0x29, 0x1b, 0x3d, 0x80, 0x5c, 0xe8, 0x1d, 0x71, 0x47, 0x9f, 0x97, 0xf4, 0x95, 0x91, 0x6f, + 0x24, 0x20, 0x4e, 0xcc, 0x80, 0x6c, 0x3b, 0xac, 0x4d, 0x9c, 0x80, 0xbc, 0x90, 0x90, 0xc7, 0x20, + 0x4e, 0xcc, 0x80, 0xec, 0x10, 0x4f, 0xec, 0x73, 0xce, 0xb8, 0xae, 0x25, 0xe4, 0x31, 0x88, 0x13, + 0x13, 0x61, 0x80, 0xc0, 0x69, 0xca, 0x52, 0x7a, 0x56, 0xee, 0xba, 0x68, 0x86, 0x43, 0x68, 0xc6, + 0x43, 0x68, 0xb6, 0xe2, 0x21, 0xb4, 0x36, 0xa2, 0xed, 0xa7, 0xb2, 0x2e, 0x7f, 0x18, 0x2a, 0x4e, + 0xf9, 0xe8, 0x39, 0xa0, 0xc4, 0xab, 0x0d, 0x39, 0x11, 0x7d, 0x36, 0xd0, 0x17, 0xb7, 0xd5, 0x1d, + 0xd5, 0xda, 0x18, 0xf9, 0xc6, 0x8c, 0x28, 0x9e, 0x81, 0xa1, 0xc7, 0xa0, 0xf5, 0x28, 0x71, 0x44, + 0x4f, 0xcf, 0xc9, 0x81, 0x5c, 0x9f, 0x9c, 0x83, 0x03, 0x19, 0xb3, 0x20, 0x38, 0x8c, 0x90, 0x87, + 0xa3, 0xb5, 0xdc, 0x83, 0x95, 0x89, 0x6b, 0xf6, 0xd7, 0x6e, 0xcc, 0xfd, 0x87, 0xb0, 0x9c, 0xee, + 0x06, 0x2d, 0xc2, 0x7c, 0xed, 0xf0, 0xb8, 0x5e, 0x50, 0x90, 0x06, 0x99, 0xa3, 0x46, 0x38, 0xee, + 0x47, 0xf5, 0x57, 0xf5, 0x00, 0xcc, 0x54, 0x5f, 0x40, 0x36, 0x1e, 0x94, 0xa7, 0x89, 0xb9, 0x31, + 0xfb, 0xc5, 0x2a, 0x6e, 0xde, 0xc1, 0xc3, 0x27, 0xe2, 0x91, 0x6a, 0xfd, 0x7f, 0xf5, 0xab, 0xa4, + 0x5c, 0xdd, 0x94, 0xd4, 0xeb, 0x9b, 0x92, 0xfa, 0xf3, 0xa6, 0xa4, 0x5e, 0xde, 0x96, 0x94, 0xeb, + 0xdb, 0x92, 0xf2, 0xfd, 0xb6, 0xa4, 0x9c, 0xe4, 0xc6, 0xcf, 0x75, 0x5b, 0x93, 0x87, 0xb8, 0xfb, + 0x7b, 0x00, 0x2a, 0x5c, 0x84, 0x60, 0xca, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go b/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go index 5736fab331c..bdc231cd811 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go +++ b/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go @@ -46,12 +46,10 @@ import ( const ( defaultPrometheusVersion = "v0.54.1" defaultAlertmanagerVersion = "v0.20.0" - defaultMinioVersion = "RELEASE.2022-07-30T05-21-40Z" // Space delimited list of versions. promPathsEnvVar = "THANOS_TEST_PROMETHEUS_PATHS" alertmanagerBinEnvVar = "THANOS_TEST_ALERTMANAGER_PATH" - minioBinEnvVar = "THANOS_TEST_MINIO_PATH" // A placeholder for actual Prometheus instance address in the scrape config. PromAddrPlaceHolder = "PROMETHEUS_ADDRESS" @@ -101,14 +99,6 @@ func AlertmanagerBinary() string { return b } -func MinioBinary() string { - b := os.Getenv(minioBinEnvVar) - if b == "" { - return fmt.Sprintf("minio-%s", defaultMinioVersion) - } - return b -} - // Prometheus represents a test instance for integration testing. // It can be populated with data before being started. type Prometheus struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 03d0921a4a9..9375d1824b6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1293,7 +1293,7 @@ github.com/thanos-io/objstore/providers/oss github.com/thanos-io/objstore/providers/s3 github.com/thanos-io/objstore/providers/swift github.com/thanos-io/objstore/tracing/opentracing -# github.com/thanos-io/promql-engine v0.0.0-20260915065525-1b359e941bde +# github.com/thanos-io/promql-engine v0.0.0-20261020165614-7157e606efa6 ## explicit; go 1.24.0 github.com/thanos-io/promql-engine/api github.com/thanos-io/promql-engine/compute @@ -1318,7 +1318,7 @@ github.com/thanos-io/promql-engine/ringbuffer github.com/thanos-io/promql-engine/storage github.com/thanos-io/promql-engine/storage/prometheus github.com/thanos-io/promql-engine/warnings -# github.com/thanos-io/thanos v0.42.5-0.20260817064418-8908023d563b +# github.com/thanos-io/thanos v0.42.5-0.20261008195948-dd67d9cc81c3 ## explicit; go 1.26.0 github.com/thanos-io/thanos/pkg/api/query/querypb github.com/thanos-io/thanos/pkg/block