TSDB: fix user metrics when using blocks storage #1990
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… metrics. This affects cortex_ingester_memory_series_created_total and cortex_ingester_memory_series_removed_total. This change also renames previous shipperMetrics to tsdbMetrics, and registers the same registry to TSDB and TSDB shipper component. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
This fixes problem with collection occuring when TSDB already registered metrics, but wasn't otherwise fully initialized yet, and it crashed. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
pracucci
reviewed
Jan 17, 2020
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
|
Thanks for review @pracucci, good points. I've addressed all your feedback. |
pracucci
approved these changes
Jan 17, 2020
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using TSDB, we get per-user created and removed series from TSDB metrics.
This affects
cortex_ingester_memory_series_created_totalandcortex_ingester_memory_series_removed_total.This PR also renames
shipperMetricstotsdbMetrics, and registers the same registry to TSDB and TSDB shipper component.Registration of prometheus registry now happens only after TSDB initialization is finished, in order to fix a panic where metrics were collected while TSDB was still initialized.
This PR builds on PR #1983, so "Files changed" also shows changes from there. I'll rebase once (if) #1983 is merged. Update: now rebased.