Skip to content

Commit 9ab477a

Browse files
committed
move github-mixin from example to monitoring-mixins
Signed-off-by: Weifeng Wang <[email protected]>
1 parent 719c94c commit 9ab477a

File tree

13 files changed

+5
-5
lines changed

13 files changed

+5
-5
lines changed

examples/ghe-with-mixin/compose.override.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ services:
33
# override included service grafana for dashboards pre-provisioning
44
grafana:
55
volumes:
6-
- ./github-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/github-mixin
6+
- ../../monitoring-mixins/github-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/github-mixin
77

88
# override included service mimirtool for rules and alerts pre-provisioning
99
mimirtool:
1010
volumes:
11-
- ./github-mixin/deploy/github-mixin-rules.yaml:/rules/github-mixin-rules.yaml
12-
- ./github-mixin/deploy/github-mixin-alerts.yaml:/rules/github-mixin-alerts.yaml
11+
- ../../monitoring-mixins/github-mixin/deploy/github-mixin-rules.yaml:/rules/github-mixin-rules.yaml
12+
- ../../monitoring-mixins/github-mixin/deploy/github-mixin-alerts.yaml:/rules/github-mixin-alerts.yaml

examples/ghe-with-mixin/github-mixin/Makefile renamed to monitoring-mixins/github-mixin/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.DEFAULT_GOAL := help
22

3-
include ../../../.bingo/Variables.mk
3+
include ../../.bingo/Variables.mk
44

55
# path to jsonnetfmt
66
JSONNET_FMT := $(JSONNETFMT) -n 2 --max-blank-lines 2 --string-style s --comment-style s
@@ -33,7 +33,7 @@ build: $(MIXTOOL) ## Generates the mixin files
3333

3434
.PHONY: check
3535
check: $(MIXTOOL) build fmt ## Build, fmt and check the mixin files
36-
@../../../tools/find-diff-or-untracked.sh . "$(MIXIN_OUT_PATH)" || (echo "Please build and fmt mixin by running 'make build fmt'" && false); \
36+
@../../tools/find-diff-or-untracked.sh . "$(MIXIN_OUT_PATH)" || (echo "Please build and fmt mixin by running 'make build fmt'" && false); \
3737
# jb install && \
3838
# $(MIXTOOL) lint mixin.libsonnet
3939

File renamed without changes.

0 commit comments

Comments
 (0)