Update Cortex to master #1785
Merged
Update Cortex to master #1785
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
FYI just merged #1746 which should help you but this means you will need to rebase. |
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>
queryrange.NewRetryMiddleware in NewLogFilterTripperware is now created without metrics, as that would collide with metrics in NewMetricTripperware. 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>
cyriltovena
reviewed
Mar 10, 2020
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Codecov Report
@@ Coverage Diff @@
## master #1785 +/- ##
==========================================
- Coverage 64.34% 64.05% -0.29%
==========================================
Files 121 121
Lines 9086 9123 +37
==========================================
- Hits 5846 5844 -2
- Misses 2836 2867 +31
- Partials 404 412 +8
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates Cortex to master (just before cutting Cortex 0.7 release).
Cortex master already converted many of the components to "services" (see Cortex PR #2166), but this PR doesn't go that far for Loki. However, it needs to start some of the components explicitly (lifecycler, ring, client.Pool).
In addition to that, this PR also fixes usage of memberlist KV in single-binary mode.
One more change included in this PR is cortexproject/cortex#2219, which moves stopIncomingRequests outside of FlushTransferer interface. This ingester's method must now be called before shutting down lifecycler (Loki ingester does the right thing here).
Checklist