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

avoids further time splitting in querysharding mware #2252

Merged
merged 3 commits into from
Jun 23, 2020

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Jun 23, 2020

Fixes the cortexproject/cortex#2765 in loki

@owen-d
Copy link
Member Author

owen-d commented Jun 23, 2020

/cc @gouthamve should be happy about cortex/prom parity :)

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov-commenter
Copy link

Codecov Report

Merging #2252 into master will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2252      +/-   ##
==========================================
- Coverage   62.34%   62.31%   -0.04%     
==========================================
  Files         158      158              
  Lines       12760    12718      -42     
==========================================
- Hits         7955     7925      -30     
+ Misses       4193     4184       -9     
+ Partials      612      609       -3     
Impacted Files Coverage Δ
pkg/querier/queryrange/querysharding.go 46.34% <100.00%> (-5.28%) ⬇️
pkg/querier/queryrange/downstreamer.go 95.87% <0.00%> (-2.07%) ⬇️
pkg/ingester/transfer.go 65.49% <0.00%> (-1.41%) ⬇️

@owen-d owen-d merged commit 70900be into grafana:master Jun 23, 2020
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
* Allow 1w in the period duration.

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Add support for 1w, 1y to table manager retention

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Update docs and changelog

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Added model.Duration support to doc generator

Signed-off-by: Marco Pracucci <[email protected]>

* Fix infinite recursion in UnmarshalYAML.

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Walk back integration config changes to support old versions

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Final nits

Signed-off-by: Goutham Veeramachaneni <[email protected]>

Co-authored-by: Marco Pracucci <[email protected]>
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