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

revendor cortex to latest master #2463

Merged
merged 1 commit into from
Aug 4, 2020

Conversation

sandeepsukhani
Copy link
Contributor

What this PR does / why we need it:
Revendor cortex to include a fix for boltdb index client causing panic when reading the index. cortexproject/cortex#2971

@codecov-commenter
Copy link

Codecov Report

Merging #2463 into master will decrease coverage by 0.05%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2463      +/-   ##
==========================================
- Coverage   62.90%   62.85%   -0.06%     
==========================================
  Files         162      162              
  Lines       13964    13966       +2     
==========================================
- Hits         8784     8778       -6     
- Misses       4496     4501       +5     
- Partials      684      687       +3     
Impacted Files Coverage Δ
pkg/querier/queryrange/roundtrip.go 70.64% <100.00%> (+0.29%) ⬆️
pkg/storage/store.go 66.48% <100.00%> (ø)
pkg/promtail/targets/file/tailer.go 73.86% <0.00%> (-4.55%) ⬇️
pkg/querier/queryrange/downstreamer.go 95.87% <0.00%> (-2.07%) ⬇️
pkg/logql/evaluator.go 92.47% <0.00%> (-0.41%) ⬇️

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

lgtm

@owen-d owen-d merged commit 4a358bc into grafana:master Aug 4, 2020
@sandeepsukhani sandeepsukhani deleted the cortex-revendor branch August 24, 2020 06:59
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
…NG METRICS (grafana#2463)

* Add initial per tenant query metric

More will be added once the following is merged:
prometheus/prometheus#6890

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Add per tenant chunks stored and fetched metrics

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Address feedback

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.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.

None yet

3 participants