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

bumps cortex to 0.6.1 master #1612

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Jan 30, 2020

What

re-vendors cortex

Why

This pulls in work on cortex master which automatically aligns the results cache intervals with the querier split by intervals #2040. It also includes an interface change which will enable #1565

@codecov-io
Copy link

Codecov Report

Merging #1612 into master will increase coverage by 0.07%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1612      +/-   ##
==========================================
+ Coverage   60.69%   60.77%   +0.07%     
==========================================
  Files         107      107              
  Lines        8075     8073       -2     
==========================================
+ Hits         4901     4906       +5     
+ Misses       2787     2782       -5     
+ Partials      387      385       -2
Impacted Files Coverage Δ
pkg/querier/queryrange/roundtrip.go 75% <ø> (ø) ⬆️
pkg/loki/modules.go 11.29% <0%> (+0.09%) ⬆️
pkg/promtail/targets/filetarget.go 70.55% <0%> (+1.84%) ⬆️
pkg/promtail/targets/tailer.go 75.86% <0%> (+2.29%) ⬆️

@cyriltovena cyriltovena merged commit 018e6bc into grafana:master Jan 30, 2020
cyriltovena added a commit that referenced this pull request Jan 30, 2020
Since #1612 we don't need the cache_split_interval anymore.
cyriltovena added a commit that referenced this pull request Jan 30, 2020
Since #1612 we don't need the cache_split_interval anymore.
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
* adding support for Redis cache

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fix lint errors

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* minor bugfix

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* proper use of pool connections

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fix lint errors

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* addressed comments
added unit test

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* update unit tests

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* reuse context in request timeout

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* use correct function names in logs

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* use common config for cache storage

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* added missing module dependency

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* delete extra newline

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* optimize redis SET

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* adding support for Redis cache

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fix lint errors

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* minor bugfix

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* proper use of pool connections

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fix lint errors

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* addressed comments
added unit test

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* update unit tests

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* reuse context in request timeout

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* use correct function names in logs

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* use common config for cache storage

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* added missing module dependency

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* delete extra newline

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* optimize redis SET

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* undo common config for storage systems

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* restore changes in CHANGELOG.md

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fixed lint error

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fixed mod-check error

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* fix metric labels

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>

* addressed comments

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.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