Skip to content
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.

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

Don't prefix Thanos index-cache metrics #2627

Merged
merged 10 commits into from
Jun 1, 2020
Merged

Don't prefix Thanos index-cache metrics #2627

merged 10 commits into from
Jun 1, 2020

Conversation

pstibrany
Copy link
Contributor

What this PR does: This PR modifies metrics names used by index cache to be consistent with Thanos and other caches (chunks, metadata).

This change also changes some other metrics that used cortex_querier_ and cortex_storegateway_ prefix, as documented by changelog.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

pstibrany added 6 commits May 25, 2020 14:15
(with name="index-cache", and appropriate component)

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>
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>
Copy link
Contributor

@khaines khaines left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These all seem to be related to block store, so it's LGTM from a change perspective.

pkg/storegateway/gateway.go Outdated Show resolved Hide resolved
pkg/storegateway/gateway.go Outdated Show resolved Hide resolved
pstibrany added 2 commits May 27, 2020 21:38
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany merged commit b129d25 into cortexproject:master Jun 1, 2020
simonswine pushed a commit to grafana/e2e that referenced this pull request Jan 13, 2022
* Removed Cortex-specific metrics for index cache, reuse Thanos metrics

(with name="index-cache", and appropriate component)

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Don't prefix metrics, but use new label instead.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix tests.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fixed tests after renaming metrics.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Add cortex_ prefix to metrics (re-)defined in Cortex

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix integration tests.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix comment.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix component name.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Added PR number to CHANGELOG.md entries.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants