Mixins: Align schema with other mixins (thanos-io#2619)

* mixin/thanos: align mixin schema with other mixins - 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 <[email protected]> * mixin: move one directory higher Signed-off-by: paulfantom <[email protected]>
vinted · May 18, 2020 · 11c75ae · 11c75ae
1 parent 334a41b
commit 11c75ae
Show file tree

Hide file tree

Showing 43 changed files with 32 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -58,8 +58,7 @@ PROMTOOL                ?= $(GOBIN)/promtool-$(PROMTOOL_VERSION)
 # systems gsed won't be installed, so will use sed as expected.
 SED ?= $(shell which gsed 2>/dev/null || which sed)
 
-MIXIN_ROOT              ?= mixin
-THANOS_MIXIN            ?= mixin/thanos
+THANOS_MIXIN            ?= mixin
 JSONNET_VENDOR_DIR      ?= mixin/vendor
 
 WEB_DIR           ?= website
@@ -404,20 +403,20 @@ examples/tmp:
 	$(JSONNET) -J ${JSONNET_VENDOR_DIR} -m examples/tmp/ ${THANOS_MIXIN}/separated_alerts.jsonnet | xargs -I{} sh -c 'cat {} | $(GOJSONTOYAML) > {}.yaml; rm -f {}' -- {}
 
 .PHONY: examples/dashboards # to keep examples/dashboards/dashboards.md.
-examples/dashboards: $(JSONNET) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/defaults.libsonnet ${THANOS_MIXIN}/dashboards/*
+examples/dashboards: $(JSONNET) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/config.libsonnet ${THANOS_MIXIN}/dashboards/*
 	-rm -rf examples/dashboards/*.json
 	$(JSONNET) -J ${JSONNET_VENDOR_DIR} -m examples/dashboards ${THANOS_MIXIN}/dashboards.jsonnet
 
-examples/alerts/alerts.yaml: $(JSONNET) $(GOJSONTOYAML) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/defaults.libsonnet ${THANOS_MIXIN}/alerts/*
+examples/alerts/alerts.yaml: $(JSONNET) $(GOJSONTOYAML) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/config.libsonnet ${THANOS_MIXIN}/alerts/*
 	$(JSONNET) ${THANOS_MIXIN}/alerts.jsonnet | $(GOJSONTOYAML) > $@
 
-examples/alerts/rules.yaml: $(JSONNET) $(GOJSONTOYAML) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/defaults.libsonnet ${THANOS_MIXIN}/rules/*
+examples/alerts/rules.yaml: $(JSONNET) $(GOJSONTOYAML) ${THANOS_MIXIN}/mixin.libsonnet ${THANOS_MIXIN}/config.libsonnet ${THANOS_MIXIN}/rules/*
 	$(JSONNET) ${THANOS_MIXIN}/rules.jsonnet | $(GOJSONTOYAML) > $@
 
 .PHONY: jsonnet-vendor
-jsonnet-vendor: $(JSONNET_BUNDLER) $(MIXIN_ROOT)/jsonnetfile.json $(MIXIN_ROOT)/jsonnetfile.lock.json
+jsonnet-vendor: $(JSONNET_BUNDLER) $(THANOS_MIXIN)/jsonnetfile.json $(THANOS_MIXIN)/jsonnetfile.lock.json
 	rm -rf ${JSONNET_VENDOR_DIR}
-	cd ${MIXIN_ROOT} && $(JSONNET_BUNDLER) install
+	cd ${THANOS_MIXIN} && $(JSONNET_BUNDLER) install
 
 JSONNETFMT_CMD := $(JSONNETFMT) -n 2 --max-blank-lines 2 --string-style s --comment-style s
 

diff --git a/mixin/thanos/README.md → mixin/README.md b/mixin/thanos/README.md → mixin/README.md
@@ -54,9 +54,9 @@ $ jb update
 
 #### Configure
 
-This project is intended to be used as a library. You can extend and customize dashboards and alerting rules by creating for own generators, such as the generators ([alerts.jsonnet](alerts.jsonnet) and [dashboards.jsonnet](dashboards.jsonnet)) that are use to create [examples](../../examples). Default parameters are collected in [defaults.libsonnet](defaults.libsonnet), feel free to modify and generate your own definitons.
+This project is intended to be used as a library. You can extend and customize dashboards and alerting rules by creating for own generators, such as the generators ([alerts.jsonnet](alerts.jsonnet) and [dashboards.jsonnet](dashboards.jsonnet)) that are use to create [examples](../../examples). Default parameters are collected in [config.libsonnet](config.libsonnet), feel free to modify and generate your own definitons.
 
-[embedmd]:# (defaults.libsonnet)
+[embedmd]:# (config.libsonnet)
 ```libsonnet
 {
   query+:: {

diff --git a/mixin/alerts.jsonnet b/mixin/alerts.jsonnet
@@ -0,0 +1,3 @@
+(
+  import 'mixin.libsonnet'
+).prometheusAlerts
diff --git a/mixin/thanos/alerts/absent.libsonnet → mixin/alerts/absent.libsonnet b/mixin/thanos/alerts/absent.libsonnet → mixin/alerts/absent.libsonnet
diff --git a/mixin/thanos/alerts/alerts.libsonnet → mixin/alerts/alerts.libsonnet b/mixin/thanos/alerts/alerts.libsonnet → mixin/alerts/alerts.libsonnet
diff --git a/.../thanos/alerts/bucket_replicate.libsonnet → mixin/alerts/bucket_replicate.libsonnet b/.../thanos/alerts/bucket_replicate.libsonnet → mixin/alerts/bucket_replicate.libsonnet
diff --git a/mixin/thanos/alerts/compact.libsonnet → mixin/alerts/compact.libsonnet b/mixin/thanos/alerts/compact.libsonnet → mixin/alerts/compact.libsonnet
diff --git a/mixin/thanos/alerts/query.libsonnet → mixin/alerts/query.libsonnet b/mixin/thanos/alerts/query.libsonnet → mixin/alerts/query.libsonnet
diff --git a/mixin/thanos/alerts/receive.libsonnet → mixin/alerts/receive.libsonnet b/mixin/thanos/alerts/receive.libsonnet → mixin/alerts/receive.libsonnet
diff --git a/mixin/thanos/alerts/rule.libsonnet → mixin/alerts/rule.libsonnet b/mixin/thanos/alerts/rule.libsonnet → mixin/alerts/rule.libsonnet
diff --git a/mixin/thanos/alerts/sidecar.libsonnet → mixin/alerts/sidecar.libsonnet b/mixin/thanos/alerts/sidecar.libsonnet → mixin/alerts/sidecar.libsonnet
diff --git a/mixin/thanos/alerts/store.libsonnet → mixin/alerts/store.libsonnet b/mixin/thanos/alerts/store.libsonnet → mixin/alerts/store.libsonnet
diff --git a/mixin/thanos/defaults.libsonnet → mixin/config.libsonnet b/mixin/thanos/defaults.libsonnet → mixin/config.libsonnet
diff --git a/mixin/dashboards.jsonnet b/mixin/dashboards.jsonnet
@@ -0,0 +1,9 @@
+local dashboards =
+  (
+    import 'mixin.libsonnet'
+  ).grafanaDashboards;
+
+{
+  [name]: dashboards[name]
+  for name in std.objectFields(dashboards)
+}
diff --git a/...nos/dashboards/bucket_replicate.libsonnet → mixin/dashboards/bucket_replicate.libsonnet b/...nos/dashboards/bucket_replicate.libsonnet → mixin/dashboards/bucket_replicate.libsonnet
diff --git a/mixin/thanos/dashboards/compact.libsonnet → mixin/dashboards/compact.libsonnet b/mixin/thanos/dashboards/compact.libsonnet → mixin/dashboards/compact.libsonnet
diff --git a/mixin/thanos/dashboards/dashboards.libsonnet → mixin/dashboards/dashboards.libsonnet b/mixin/thanos/dashboards/dashboards.libsonnet → mixin/dashboards/dashboards.libsonnet
diff --git a/mixin/thanos/dashboards/defaults.libsonnet → mixin/dashboards/defaults.libsonnet b/mixin/thanos/dashboards/defaults.libsonnet → mixin/dashboards/defaults.libsonnet
diff --git a/mixin/thanos/dashboards/overview.libsonnet → mixin/dashboards/overview.libsonnet b/mixin/thanos/dashboards/overview.libsonnet → mixin/dashboards/overview.libsonnet
diff --git a/mixin/thanos/dashboards/query.libsonnet → mixin/dashboards/query.libsonnet b/mixin/thanos/dashboards/query.libsonnet → mixin/dashboards/query.libsonnet
diff --git a/mixin/thanos/dashboards/receive.libsonnet → mixin/dashboards/receive.libsonnet b/mixin/thanos/dashboards/receive.libsonnet → mixin/dashboards/receive.libsonnet
diff --git a/mixin/thanos/dashboards/rule.libsonnet → mixin/dashboards/rule.libsonnet b/mixin/thanos/dashboards/rule.libsonnet → mixin/dashboards/rule.libsonnet
diff --git a/mixin/thanos/dashboards/sidecar.libsonnet → mixin/dashboards/sidecar.libsonnet b/mixin/thanos/dashboards/sidecar.libsonnet → mixin/dashboards/sidecar.libsonnet
diff --git a/mixin/thanos/dashboards/store.libsonnet → mixin/dashboards/store.libsonnet b/mixin/thanos/dashboards/store.libsonnet → mixin/dashboards/store.libsonnet
diff --git a/mixin/jsonnetfile.json b/mixin/jsonnetfile.json
@@ -17,15 +17,6 @@
         }
       },
       "version": "master"
-    },
-    {
-      "source": {
-        "local": {
-          "directory": "thanos"
-        }
-      },
-      "version": ".",
-      "name": "thanos-mixin"
     }
   ],
   "legacyImports": true

diff --git a/mixin/jsonnetfile.lock.json b/mixin/jsonnetfile.lock.json
@@ -19,15 +19,6 @@
       },
       "version": "f4c59f64f80442f871a06c91edf74d014b82acaf",
       "sum": "ELsYwK+kGdzX1mee2Yy+/b2mdO4Y503BOCDkFzwmGbE="
-    },
-    {
-      "source": {
-        "local": {
-          "directory": "thanos"
-        }
-      },
-      "version": "",
-      "name": "thanos-mixin"
     }
   ],
   "legacyImports": false

diff --git a/...anos/lib/thanos-grafana-builder/README.md → mixin/lib/thanos-grafana-builder/README.md b/...anos/lib/thanos-grafana-builder/README.md → mixin/lib/thanos-grafana-builder/README.md
diff --git a/.../thanos-grafana-builder/builder.libsonnet → .../thanos-grafana-builder/builder.libsonnet b/.../thanos-grafana-builder/builder.libsonnet → .../thanos-grafana-builder/builder.libsonnet
diff --git a/...lib/thanos-grafana-builder/grpc.libsonnet → ...lib/thanos-grafana-builder/grpc.libsonnet b/...lib/thanos-grafana-builder/grpc.libsonnet → ...lib/thanos-grafana-builder/grpc.libsonnet
diff --git a/...lib/thanos-grafana-builder/http.libsonnet → ...lib/thanos-grafana-builder/http.libsonnet b/...lib/thanos-grafana-builder/http.libsonnet → ...lib/thanos-grafana-builder/http.libsonnet
diff --git a/.../lib/thanos-grafana-builder/slo.libsonnet → .../lib/thanos-grafana-builder/slo.libsonnet b/.../lib/thanos-grafana-builder/slo.libsonnet → .../lib/thanos-grafana-builder/slo.libsonnet
diff --git a/mixin/thanos/mixin.libsonnet → mixin/mixin.libsonnet b/mixin/thanos/mixin.libsonnet → mixin/mixin.libsonnet
@@ -1,3 +1,4 @@
 (import 'dashboards/dashboards.libsonnet') +
 (import 'alerts/alerts.libsonnet') +
-(import 'rules/rules.libsonnet')
+(import 'rules/rules.libsonnet') +
+(import 'config.libsonnet')
diff --git a/mixin/rules.jsonnet b/mixin/rules.jsonnet
@@ -0,0 +1,3 @@
+(
+  import 'mixin.libsonnet'
+).prometheusRules
diff --git a/...n/thanos/rules/bucket_replicate.libsonnet → mixin/rules/bucket_replicate.libsonnet b/...n/thanos/rules/bucket_replicate.libsonnet → mixin/rules/bucket_replicate.libsonnet
diff --git a/mixin/thanos/rules/query.libsonnet → mixin/rules/query.libsonnet b/mixin/thanos/rules/query.libsonnet → mixin/rules/query.libsonnet
diff --git a/mixin/thanos/rules/receive.libsonnet → mixin/rules/receive.libsonnet b/mixin/thanos/rules/receive.libsonnet → mixin/rules/receive.libsonnet
diff --git a/mixin/thanos/rules/rules.libsonnet → mixin/rules/rules.libsonnet b/mixin/thanos/rules/rules.libsonnet → mixin/rules/rules.libsonnet
diff --git a/mixin/thanos/rules/store.libsonnet → mixin/rules/store.libsonnet b/mixin/thanos/rules/store.libsonnet → mixin/rules/store.libsonnet
diff --git a/mixin/separated_alerts.jsonnet b/mixin/separated_alerts.jsonnet
@@ -0,0 +1,7 @@
+{
+  [group.name]: group
+  for group in
+    (
+      import 'mixin.libsonnet'
+    ).prometheusAlerts.groups
+}
diff --git a/mixin/thanos/alerts.jsonnet b/mixin/thanos/alerts.jsonnet
diff --git a/mixin/thanos/dashboards.jsonnet b/mixin/thanos/dashboards.jsonnet
diff --git a/mixin/thanos/rules.jsonnet b/mixin/thanos/rules.jsonnet
diff --git a/mixin/thanos/separated_alerts.jsonnet b/mixin/thanos/separated_alerts.jsonnet