Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mixins templatize clusterlabel fixes #6383

Merged
merged 6 commits into from
Jun 14, 2022
Merged

Mixins templatize clusterlabel fixes #6383

merged 6 commits into from
Jun 14, 2022

Conversation

hervenicol
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #6352

Special notes for your reviewer:

After the mess from PR #6353, here is a revised version.

The changes from the previous PR:

  • support for a config.libsonnet file for promtail-mixins
  • added a comment to the new parameter per_cluster_label in loki-mixins config file
  • added a gitignore for promtail-mixins vendor/ directory

To test the build failure / fix, I had to locally update my production/promtail-mixin/jsonnetfile.json file:

   {
     "source": {
       "git": {
         "remote": [-"https://github.com/grafana/loki.git",-]{+"https://github.com/hervenicol/loki.git",+}
         "subdir": "production/loki-mixin"
       }
     },
     "version": [-"main"-]{+"mixins_templatize_clusterlabel_fixes"+}
   }

The following build targets were run on my machine, from their respective CI docker images:

  • loki-mixin
  • loki-mixin-check
  • fmt-jsonnet
  • lint-jsonnet (the one which was failing)

I hope now everything is OK 🤞

Checklist

  • Documentation added
  • Tests updated
  • Is this an important fix or new feature? Add an entry in the CHANGELOG.md.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@hervenicol hervenicol requested a review from a team as a code owner June 13, 2022 18:57
@grafanabot
Copy link
Collaborator

./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%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
-               loki	-0.7%

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM @hervenicol - thanks for your contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mixins: templatize cluster label name.
3 participants