diff --git a/CHANGELOG.md b/CHANGELOG.md index f810771cb68..335c15554d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ * [BUGFIX] TSDB: Fixed error handling in the series to chunks conversion with the experimental TSDB blocks storage. #1837 * [BUGFIX] TSDB: Fixed TSDB creation conflict with blocks transfer in a `JOINING` ingester with the experimental TSDB blocks storage. #1818 * [BUGFIX] TSDB: `experimental.tsdb.ship-interval` of <=0 treated as disabled instead of allowing panic. #1975 +* [BUGFIX] TSDB: Fixed `cortex_ingester_queried_samples` and `cortex_ingester_queried_series` metrics when using block storage. #1981 ## 0.4.0 / 2019-12-02 diff --git a/pkg/ingester/ingester_v2.go b/pkg/ingester/ingester_v2.go index f23f5ac6162..7557065e7c6 100644 --- a/pkg/ingester/ingester_v2.go +++ b/pkg/ingester/ingester_v2.go @@ -194,6 +194,8 @@ func (i *Ingester) v2Query(ctx old_ctx.Context, req *client.QueryRequest) (*clie return nil, err } + numSamples := 0 + result := &client.QueryResponse{} for ss.Next() { series := ss.At() @@ -208,9 +210,13 @@ func (i *Ingester) v2Query(ctx old_ctx.Context, req *client.QueryRequest) (*clie ts.Samples = append(ts.Samples, client.Sample{Value: v, TimestampMs: t}) } + numSamples += len(ts.Samples) result.Timeseries = append(result.Timeseries, ts) } + i.metrics.queriedSeries.Observe(float64(len(result.Timeseries))) + i.metrics.queriedSamples.Observe(float64(numSamples)) + return result, ss.Err() }