From dee7762ae384275ddc7fe80cd8bc014694a022e5 Mon Sep 17 00:00:00 2001 From: "ben.ye" Date: Tue, 13 Jul 2021 19:39:01 -0700 Subject: [PATCH 1/3] create dashboardDefinitions if rawDashboards or folderDashboards are specified Signed-off-by: ben.ye --- jsonnet/kube-prometheus/components/grafana.libsonnet | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index cb6cafa5..33c7511e 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -76,7 +76,9 @@ function(params) { dashboardDatasources: glib.grafana.dashboardDatasources, dashboardSources: glib.grafana.dashboardSources, - dashboardDefinitions: if std.length(g._config.dashboards) > 0 then { + dashboardDefinitions: if std.length(g._config.dashboards) > 0 || + std.length(g._config.rawDashboards) > 0 || + std.length(g._config.folderDashboards) > 0 then { apiVersion: 'v1', kind: 'ConfigMapList', items: glib.grafana.dashboardDefinitions, From 90b2751f06798733e949c5fdb830bff46d5d89a7 Mon Sep 17 00:00:00 2001 From: "ben.ye" Date: Tue, 13 Jul 2021 19:48:01 -0700 Subject: [PATCH 2/3] fmt code Signed-off-by: ben.ye --- jsonnet/kube-prometheus/components/grafana.libsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 33c7511e..def62d61 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -77,8 +77,8 @@ function(params) { dashboardSources: glib.grafana.dashboardSources, dashboardDefinitions: if std.length(g._config.dashboards) > 0 || - std.length(g._config.rawDashboards) > 0 || - std.length(g._config.folderDashboards) > 0 then { + std.length(g._config.rawDashboards) > 0 || + std.length(g._config.folderDashboards) > 0 then { apiVersion: 'v1', kind: 'ConfigMapList', items: glib.grafana.dashboardDefinitions, From 43adca8df7dba6cec1f0e2c6fecc5899f2c38ff0 Mon Sep 17 00:00:00 2001 From: "ben.ye" Date: Tue, 13 Jul 2021 19:56:38 -0700 Subject: [PATCH 3/3] fmt again Signed-off-by: ben.ye --- jsonnet/kube-prometheus/components/grafana.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index def62d61..ce6cb40e 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -76,7 +76,7 @@ function(params) { dashboardDatasources: glib.grafana.dashboardDatasources, dashboardSources: glib.grafana.dashboardSources, - dashboardDefinitions: if std.length(g._config.dashboards) > 0 || + dashboardDefinitions: if std.length(g._config.dashboards) > 0 || std.length(g._config.rawDashboards) > 0 || std.length(g._config.folderDashboards) > 0 then { apiVersion: 'v1',