[release-2.6.x] Backport #6413 and #6377 to k102 #6492
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
* Backport memberlist dependency version pin to k102 Signed-off-by: JordanRushing <rushing.jordan@gmail.com> * 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 <kavirajkanagaraj@gmail.com> (cherry picked from commit 666bac2) Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com> (cherry picked from commit 372961d)
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.
Backport 372961d from #6422