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 #2427

Merged
merged 2 commits into from
Jul 28, 2020
Merged

Revendor cortex #2427

merged 2 commits into from
Jul 28, 2020

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Jul 27, 2020

This is split into a vendor bump commit and a compatibility commit. Notably we remove a replace directive inherited from cortex which appears no longer necessary:

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible

Also this bumps cortex & prometheus, which should enable #2392

@codecov-commenter
Copy link

Codecov Report

Merging #2427 into master will increase coverage by 0.13%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2427      +/-   ##
==========================================
+ Coverage   61.55%   61.69%   +0.13%     
==========================================
  Files         160      160              
  Lines       13612    13611       -1     
==========================================
+ Hits         8379     8397      +18     
+ Misses       4607     4588      -19     
  Partials      626      626              
Impacted Files Coverage Δ
pkg/loki/modules.go 10.77% <0.00%> (-0.10%) ⬇️
pkg/loki/runtime_config.go 0.00% <0.00%> (ø)
pkg/storage/store.go 62.50% <0.00%> (ø)
pkg/querier/queryrange/downstreamer.go 95.87% <0.00%> (-2.07%) ⬇️
pkg/promtail/targets/file/filetarget.go 69.64% <0.00%> (+1.78%) ⬆️
pkg/promtail/targets/file/tailer.go 76.13% <0.00%> (+2.27%) ⬆️
pkg/promtail/positions/positions.go 59.64% <0.00%> (+13.15%) ⬆️

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

@owen-d owen-d merged commit 4a45ca5 into grafana:master Jul 28, 2020
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