From fe19786393ad0c2bb553e78dd5f11e05e33ed7b7 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 13 Apr 2020 11:21:41 +0100 Subject: [PATCH 1/2] Put loki-mixin and promtail-mixin dashboards in a folder. --- production/loki-mixin/mixin.libsonnet | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/production/loki-mixin/mixin.libsonnet b/production/loki-mixin/mixin.libsonnet index b2b2f10dd23fb..7e21657b2e61d 100644 --- a/production/loki-mixin/mixin.libsonnet +++ b/production/loki-mixin/mixin.libsonnet @@ -1,3 +1,5 @@ (import 'dashboards.libsonnet') + (import 'alerts.libsonnet') + -(import 'recording_rules.libsonnet') +(import 'recording_rules.libsonnet') + { + grafanaDashboardFolder: 'Loki', +} From 5bbafebd59889f82bb04c353f3bc0ca69bd668cd Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 13 Apr 2020 11:23:07 +0100 Subject: [PATCH 2/2] And the loki mixin --- production/promtail-mixin/mixin.libsonnet | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/production/promtail-mixin/mixin.libsonnet b/production/promtail-mixin/mixin.libsonnet index b2b2f10dd23fb..7e21657b2e61d 100644 --- a/production/promtail-mixin/mixin.libsonnet +++ b/production/promtail-mixin/mixin.libsonnet @@ -1,3 +1,5 @@ (import 'dashboards.libsonnet') + (import 'alerts.libsonnet') + -(import 'recording_rules.libsonnet') +(import 'recording_rules.libsonnet') + { + grafanaDashboardFolder: 'Loki', +}