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.

Sign up for GitHub

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

Jump to bottom

Mixins: Align schema with other mixins #2619

Merged
merged 2 commits into from
May 18, 2020
Merged

Mixins: Align schema with other mixins #2619

merged 2 commits into from
May 18, 2020

Conversation

paulfantom
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

  • promote default.libsonnet to main config file
  • include config.libsonnet in mixin.libsonnet
  • include jsonnetfile.json
  • allow generating directly from mixin/thanos directory
  • moved mixin files one directory higher in hierarchy

Verification

  1. Run make examples --always-make
  2. Run:
cd mixin
jb install
jsonnet -J vendor -S -e 'std.manifestYamlDoc((import "mixin.libsonnet").prometheusAlerts)' > alerts.yml
jsonnet -J vendor -S -e 'std.manifestYamlDoc((import "mixin.libsonnet").prometheusRules)' > rules.yml
jsonnet -J vendor -m dashboards -e '(import "mixin.libsonnet").grafanaDashboards'

/cc @kakkoyun @metalmatze

paulfantom added 2 commits May 15, 2020 18:08
@paulfantom
mixin/thanos: align mixin schema with other mixins
d831322 
- promote default.libsonnet to main config file
- include config.libsonnet in mixin.libsonnet
- include jsonnetfile.json
- allow generating directly from mixin/thanos directory

Signed-off-by: paulfantom <pawel@krupa.net.pl>
@paulfantom
mixin: move one directory higher
2b953ac 
Signed-off-by: paulfantom <pawel@krupa.net.pl>
@kakkoyun kakkoyun self-requested a review May 15, 2020 16:20
bwplotka
bwplotka approved these changes May 16, 2020
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Looks fine by me.. @squat @kakkoyun ? (:

@brancz brancz merged commit 11c75ae into thanos-io:master May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwplotka bwplotka bwplotka approved these changes

@povilasv povilasv povilasv approved these changes

@kakkoyun kakkoyun Awaiting requested review from kakkoyun

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@paulfantom @bwplotka @povilasv @brancz