Skip to content

TSDB: metrics for queries #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 15, 2020
+7 −0
Merged

TSDB: metrics for queries #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
219c775
Update queriedSeries and queriedSamples metrics in v2Query.
pstibrany Jan 15, 2020
25fbdb2
Increment number of users when creating new TSDB.
pstibrany Jan 15, 2020
57a58e6
Use length of slices to update metrics.
pstibrany Jan 15, 2020
21fdbc2
Update CHANGELOG.md
pstibrany Jan 15, 2020
55a797d
Removed memUsers.Inc() in favor of PR #1982.
pstibrany Jan 15, 2020
075b6c0
Removed mention of cortex_ingester_memory_users from CHANGELOG.md
pstibrany Jan 15, 2020
f2c054e
One more small fix to CHANGELOG.md.
pstibrany Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions pkg/ingester/ingester_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
}

Expand Down