From 5eccf0529f20f48fb12c3757087e7a4a1e8a4b23 Mon Sep 17 00:00:00 2001 From: Duologic Date: Fri, 6 Mar 2020 15:59:27 +0100 Subject: [PATCH 1/2] Use kubernetes-mixin master --- prometheus-ksonnet/jsonnetfile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus-ksonnet/jsonnetfile.json b/prometheus-ksonnet/jsonnetfile.json index 0e22905d4..9770e1b84 100644 --- a/prometheus-ksonnet/jsonnetfile.json +++ b/prometheus-ksonnet/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "" } }, - "version": "release-0.1" + "version": "master" }, { "name": "prometheus-mixin", From bb607dfb0af73b3efb66a9255fcbc0ea8e37e5a7 Mon Sep 17 00:00:00 2001 From: Duologic Date: Wed, 18 Mar 2020 09:49:14 +0100 Subject: [PATCH 2/2] Remove obsolete dashboard overrides --- prometheus-ksonnet/prometheus-ksonnet.libsonnet | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/prometheus-ksonnet/prometheus-ksonnet.libsonnet b/prometheus-ksonnet/prometheus-ksonnet.libsonnet index 005185322..6f8bc7775 100644 --- a/prometheus-ksonnet/prometheus-ksonnet.libsonnet +++ b/prometheus-ksonnet/prometheus-ksonnet.libsonnet @@ -13,19 +13,4 @@ (import 'prometheus-mixin/mixin.libsonnet') + (import 'alertmanager-mixin/mixin.libsonnet') + (import 'node-mixin/mixin.libsonnet') + -(import 'lib/config.libsonnet') + -{ - // Mark obsolete node-related dashboards from the k8s mixin as - // hidden. - // Once we can use the current version of the k8s mixin, those - // overrides can be removed. - // (Note: In jsonnet, you cannot easily remove a field from - // a tuple. Marking it as hidden is a hack suggested by - // @sparkprime himself. See https://github.com/google/jsonnet/issues/312 - // for details.) - grafanaDashboards+:: { - 'k8s-cluster-rsrc-use.json':: super['k8s-cluster-rsrc-use.json'], - 'k8s-node-rsrc-use.json':: super['k8s-node-rsrc-use.json'], - 'k8s-multicluster-rsrc-use.json':: super['k8s-multicluster-rsrc-use.json'], - }, -} +(import 'lib/config.libsonnet')