Do not create dashboards provisioning config if there are no dashboards

redbaron · redbaron · commit b60dbbea981c · 2019-05-23T11:10:31.000+01:00
If there is no dashboards, then no /grafana-dashboard-definitions/0/
is created and Grafana becomes upset, because it's provisioning
config points there.
diff --git a/grafana/grafana.libsonnet b/grafana/grafana.libsonnet
@@ -114,8 +114,8 @@ local configMapList = k.core.v1.configMapList;
         [
           storageVolumeMount,
           datasourcesVolumeMount,
-          dashboardsVolumeMount,
         ] +
+        if std.length(self.dashboardDefinitions.items) > 0 then [dashboardsVolumeMount] else [] +
         [
           local dashboardName = std.strReplace(name, '.json', '');
           containerVolumeMount.new('grafana-dashboard-' + dashboardName, '/grafana-dashboard-definitions/0/' + dashboardName)
@@ -127,8 +127,8 @@ local configMapList = k.core.v1.configMapList;
         [
           storageVolume,
           datasourcesVolume,
-          dashboardsVolume,
         ] +
+        if std.length(self.dashboardDefinitions.items) > 0 then [dashboardsVolume] else [] +
         [
           local dashboardName = 'grafana-dashboard-' + std.strReplace(name, '.json', '');
           volume.withName(dashboardName) +

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ local configMapList = k.core.v1.configMapList;`
`114`	`114`	`[`
`115`	`115`	`storageVolumeMount,`
`116`	`116`	`datasourcesVolumeMount,`
`117`		`- dashboardsVolumeMount,`
`118`	`117`	`] +`
	`118`	`+ if std.length(self.dashboardDefinitions.items) > 0 then [dashboardsVolumeMount] else [] +`
`119`	`119`	`[`
`120`	`120`	`local dashboardName = std.strReplace(name, '.json', '');`
`121`	`121`	`containerVolumeMount.new('grafana-dashboard-' + dashboardName, '/grafana-dashboard-definitions/0/' + dashboardName)`
`@@ -127,8 +127,8 @@ local configMapList = k.core.v1.configMapList;`
`127`	`127`	`[`
`128`	`128`	`storageVolume,`
`129`	`129`	`datasourcesVolume,`
`130`		`- dashboardsVolume,`
`131`	`130`	`] +`
	`131`	`+ if std.length(self.dashboardDefinitions.items) > 0 then [dashboardsVolume] else [] +`
`132`	`132`	`[`
`133`	`133`	`local dashboardName = 'grafana-dashboard-' + std.strReplace(name, '.json', '');`
`134`	`134`	`volume.withName(dashboardName) +`