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

Remove thanos-mixin #67

Merged
merged 4 commits into from
Dec 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
- image: quay.io/coreos/jsonnet-ci
steps:
- checkout
- run: make --always-make vendor generate lint
- run: make --always-make vendor generate
- run: git diff --exit-code
workflows:
version: 2
Expand Down
22 changes: 1 addition & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ generate-in-docker:
$(CONTAINER_CMD) make $(MFLAGS) generate

.PHONY: generate
generate: manifests jsonnet/thanos-mixin/alerts.yaml jsonnet/thanos-mixin/rules.yaml jsonnet/thanos-mixin/dashboards **.md
generate: manifests **.md

**.md: $(shell find examples) build.sh example.jsonnet
embedmd -w `find . -name "*.md" | grep -v vendor`
Expand All @@ -26,16 +26,6 @@ manifests: vendor example.jsonnet build.sh
rm -rf manifests
./build.sh

jsonnet/thanos-mixin/dashboards: jsonnet/thanos-mixin/mixin.libsonnet jsonnet/thanos-mixin/config.libsonnet jsonnet/thanos-mixin/dashboards/*
rm -rf jsonnet/thanos-mixin/dashboards/*.json
jsonnet -J vendor -m jsonnet/thanos-mixin/dashboards jsonnet/thanos-mixin/dashboards.jsonnet

jsonnet/thanos-mixin/alerts.yaml: jsonnet/thanos-mixin/mixin.libsonnet jsonnet/thanos-mixin/config.libsonnet jsonnet/thanos-mixin/alerts/*
jsonnet jsonnet/thanos-mixin/alerts.jsonnet | gojsontoyaml > $@

jsonnet/thanos-mixin/rules.yaml: jsonnet/thanos-mixin/mixin.libsonnet jsonnet/thanos-mixin/config.libsonnet jsonnet/thanos-mixin/rules/*
jsonnet jsonnet/thanos-mixin/rules.jsonnet | gojsontoyaml > $@

vendor: jsonnetfile.json jsonnetfile.lock.json
rm -rf vendor
jb install
Expand All @@ -45,16 +35,6 @@ fmt:
find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
xargs -n 1 -- $(JSONNET_FMT) -i

.PHONY: lint
lint: fmt jsonnet/thanos-mixin/alerts.yaml jsonnet/thanos-mixin/rules.yaml
promtool check rules jsonnet/thanos-mixin/alerts.yaml jsonnet/thanos-mixin/rules.yaml

.PHONY: test
test: jsonnet/thanos-mixin/alerts.yaml jsonnet/thanos-mixin/rules.yaml
promtool test rules tests.yaml

.PHONY: clean
clean:
rm -rf manifests/
rm -rf jsonnet/thanos-mixin/alerts.yaml
rm -rf dashboards/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> Note that everything is experimental and may change significantly at any time.

This repository collects Kubernetes manifests, [Grafana](http://grafana.com/) dashboards, and [Prometheus rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) combined with documentation and scripts to provide easy to deploy experience for Thanos on Kubernetes.
This repository collects Kubernetes manifests combined with documentation and scripts to provide easy to deploy experience for Thanos on Kubernetes.

The content of this project is written in [jsonnet](http://jsonnet.org/). This project could both be described as a package as well as a library.

Expand Down
5 changes: 5 additions & 0 deletions jsonnet/thanos-mixin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# thanos-mixin

> ### `thanos-mixin` is **moved** to the upstream [`Thanos`](https://github.com/thanos-io/thanos) repository.

Please visit [`thanos/mixin/thanos`](https://github.com/thanos-io/thanos/blob/master/mixin/thanos/README.md) for further instructions.
1 change: 0 additions & 1 deletion jsonnet/thanos-mixin/alerts.jsonnet

This file was deleted.

329 changes: 0 additions & 329 deletions jsonnet/thanos-mixin/alerts.yaml

This file was deleted.

Loading