- Notifications
You must be signed in to change notification settings - Fork3.8k
Revert "Loki Prometheus mixin: templatize cluster label"#6377
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This reverts commit459036f.
./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. + ingester0%+ distributor0%+ querier0%+ querier/queryrange0%+ iter0%+ storage0%+ chunkenc0%+ logql0%+ loki0% |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thanks@kavirajk 👍
Oh crap. Sorry 😞 |
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
./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. + ingester0%+ distributor0%+ querier0%+ querier/queryrange0%+ iter0%+ storage0%+ chunkenc0%+ logql0%+ loki0% |
./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. + ingester0%+ distributor0.3%+ querier0%+ querier/queryrange0%+ iter0%+ storage0%+ chunkenc0%+ logql0%+ loki0% |
* Revert "Loki Prometheus mixin: templatize cluster label (grafana#6353)"This reverts commit459036f.* Replace `loki-mixin` dependency to working commit.Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>(cherry picked from commit666bac2)
* Backport memberlist dependency version pin to k102Signed-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 commit459036f.* Replace `loki-mixin` dependency to working commit.Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>(cherry picked from commit666bac2)Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
* Backport memberlist dependency version pin to k102Signed-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 commit459036f.* Replace `loki-mixin` dependency to working commit.Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>(cherry picked from commit666bac2)Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>(cherry picked from commit372961d)
* Backport memberlist dependency version pin to k102Signed-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 commit459036f.* Replace `loki-mixin` dependency to working commit.Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>(cherry picked from commit666bac2)Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>(cherry picked from commit372961d)Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
Reverts#6353
@hervenicol Reverting the PR, because it breaks the
main
branch. (it passed on your original branch, but suspect that CI may be bit flaky. But when tried in localmake lint-jsonnet
it fails as well)to me it looks like it's failing to lint promtail-mixin because promtail-mixin unable to find this new label
per_cluster_label
when used with called withaddCluster()
wheremulti=false
by default.Will be happy to merge it again, once the CI linter is fixed. :) may be in separate PR.