Backport #6413 and #6377 to k102 #6422
Merged
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
Signed-off-by: JordanRushing <[email protected]>
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0.4%
+ distributor 0%
- querier -0.3%
- querier/queryrange -0.1%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0.2%
- loki -1.2% |
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0.5%
+ distributor 0%
- querier -0.3%
- querier/queryrange -0.1%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0.2%
- loki -1.2% |
* Revert "Loki Prometheus mixin: templatize cluster label (grafana#6353)" This reverts commit 459036f. * Replace `loki-mixin` dependency to working commit. Signed-off-by: Kaviraj <[email protected]> (cherry picked from commit 666bac2)
JordanRushing
changed the title
|
./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0.4%
- distributor -0.3%
- querier -0.3%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0.2%
- loki -1.2% |
cstyan
approved these changes
Jun 17, 2022
vlad-diachenko
added
the
backport release-2.6.x
grafanabot
pushed a commit
that referenced
this pull request
Jun 24, 2022
* Backport memberlist dependency version pin to k102 Signed-off-by: JordanRushing <[email protected]> * Revert "Loki Prometheus mixin: templatize cluster label" (#6377) * Revert "Loki Prometheus mixin: templatize cluster label (#6353)" This reverts commit 459036f. * Replace `loki-mixin` dependency to working commit. Signed-off-by: Kaviraj <[email protected]> (cherry picked from commit 666bac2) Co-authored-by: Kaviraj Kanagaraj <[email protected]> (cherry picked from commit 372961d)
vlad-diachenko
pushed a commit
that referenced
this pull request
Jun 24, 2022
* Backport memberlist dependency version pin to k102 Signed-off-by: JordanRushing <[email protected]> * Revert "Loki Prometheus mixin: templatize cluster label" (#6377) * Revert "Loki Prometheus mixin: templatize cluster label (#6353)" This reverts commit 459036f. * Replace `loki-mixin` dependency to working commit. Signed-off-by: Kaviraj <[email protected]> (cherry picked from commit 666bac2) Co-authored-by: Kaviraj Kanagaraj <[email protected]> (cherry picked from commit 372961d) Co-authored-by: JordanRushing <[email protected]>
This was referenced Jun 28, 2022
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.
What this PR does / why we need it:
This PR backports aa31b46 and 666bac2 to k102.
Which issue(s) this PR fixes:
N/A
Special notes for your reviewer:
N/A
Checklist
CHANGELOG.md.docs/sources/upgrading/_index.md