Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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

Merged
kavirajk merged 2 commits intomainfromrevert-6353-mixins_templatize_clusterlabel
Jun 13, 2022

Conversation

kavirajk
Copy link
Contributor

Reverts#6353

@hervenicol Reverting the PR, because it breaks themain 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)

Linting ./production/promtail-mixin/mixin.libsonnetRUNTIME ERROR: Field does not exist: per_cluster_labelproduction/promtail-mixin/vendor/loki-mixin/dashboards/dashboard-utils.libsonnet:34:58-85thunk from <function <anonymous>>production/promtail-mixin/vendor/grafana-builder/grafana.libsonnet:31:57-67thunk from <object <anonymous>><std>:715:15-22thunk <val> from <function <format_codes_arr>><std>:722:27-30thunk from <thunk <s> from <function <format_codes_arr>>><std>:592:22-25thunk from <function <format_code>><std>:592:9-26function <format_code><std>:722:15-60thunk <s> from <function <format_codes_arr>><std>:727:24-25thunk from <thunk <s_padded> from <function <format_codes_arr>>><std>:480:30-33thunk from <thunk from <function <pad_left>>><std>:480:19-34thunk from <function <pad_left>>...<std>:733:11-64function <format_codes_arr><std>:777:7-46function <anonymous><std>:237:7-23function <anonymous>production/promtail-mixin/vendor/grafana-builder/grafana.libsonnet:31:18-68Field "query"Array element 1Field "list"Field "templating"Field "promtail.json"During manifestation

to me it looks like it's failing to lint promtail-mixin because promtail-mixin unable to find this new labelper_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.

@kavirajkkavirajk requested a review froma team as acode ownerJune 13, 2022 09:51
@grafanabot
Copy link
Contributor

./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%

Copy link
Contributor

@dannykoppingdannykopping left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Thanks@kavirajk 👍

@hervenicol
Copy link
Contributor

Oh crap. Sorry 😞
I'll work on it and create a new PR then.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
@grafanabot
Copy link
Contributor

./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%

@grafanabot
Copy link
Contributor

./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%

@kavirajkkavirajk merged commit666bac2 intomainJun 13, 2022
@kavirajkkavirajk deleted the revert-6353-mixins_templatize_clusterlabel branchJune 13, 2022 10:57
kavirajk added a commit that referenced this pull requestJun 13, 2022
…ain` versionWe had to change it to some older version to revert this PR#6377Issue, context and long-term fix are explained in this#6378Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
kavirajk added a commit that referenced this pull requestJun 13, 2022
…ain` version (#6379)We had to change it to some older version to revert this PR#6377Issue, context and long-term fix are explained in this#6378Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
JordanRushing pushed a commit to JordanRushing/loki that referenced this pull requestJun 17, 2022
* 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)
JordanRushing added a commit that referenced this pull requestJun 17, 2022
* 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>
grafanabot pushed a commit that referenced this pull requestJun 24, 2022
* 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)
vlad-diachenko pushed a commit that referenced this pull requestJun 24, 2022
* 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>
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

1 more reviewer

@dannykoppingdannykoppingdannykopping approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kavirajk@grafanabot@hervenicol@dannykopping

[8]ページ先頭

©2009-2025 Movatter.jp