Merge pull request #128 from wobcom/main

fix dashboardDisplay.minInterval option
monogon-dev · Jul 17, 2023 · 7063169 · 7063169
2 parents af1f83e + fe136d8
commit 7063169
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/deploy/dashboards/base.cue b/deploy/dashboards/base.cue
@@ -2,7 +2,7 @@ package dashboards
 
 #Config: {
 	// Minimum interval for all panels
-	interval: string | null
+	minInterval: string | null
 
 	// Maximum packet size for heatmaps (filter out spurious oversized packet from loopback interfaces)
 	maxPacketSize: uint | *1500
@@ -141,6 +141,7 @@ dashboards: [string]: D={
 	_panels: [...#Panel]
 	panels: [ for i, v in D._panels {
 		id: i
+		interval: #Config.minInterval
 		for _, t in #PanelStructs if t.type == v.type {
 			(t & v)
 		}

diff --git a/deploy/single-node/defs.cue b/deploy/single-node/defs.cue
@@ -35,7 +35,7 @@ netmeta: config: #NetMetaConfig
 netmeta: dashboards: {
 	_dashboards: (grafana_dashboards & {
 		#Config: {
-			interval:      netmeta.config.dashboardDisplay.minInterval
+			minInterval:      netmeta.config.dashboardDisplay.minInterval
 			maxPacketSize: netmeta.config.dashboardDisplay.maxPacketSize
 			fastNetMon:    netmeta.config.fastNetMon
 		}