Sum by type, phase (avoids nodepools dupes)

kylos101 · roboquat · commit 074d9842ca28 · 2022-08-25T18:34:10.000+02:00
diff --git a/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.libsonnet b/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.libsonnet
@@ -189,7 +189,7 @@ local workspacePhasesGraph =
     min=0,
     repeat='cluster',
   )
-  .addTarget(prometheus.target('gitpod_ws_manager_workspace_phase_total{%(clusterLabel)s=~"$cluster", phase!="RUNNING"}' % _config, legendFormat='{{type}} - {{phase}}'))
+  .addTarget(prometheus.target('sum by (type, phase)(gitpod_ws_manager_workspace_phase_total{%(clusterLabel)s=~"$cluster", phase!="RUNNING"})' % _config, legendFormat='{{type}} - {{phase}}'))
   // Regular use different levels of green
   .addSeriesOverride({ alias: 'REGULAR - INITIALIZING', color: '#C8F2C2' })
   .addSeriesOverride({ alias: 'REGULAR - CREATING', color: '#96D98D' })

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ local workspacePhasesGraph =`
`189`	`189`	`min=0,`
`190`	`190`	`repeat='cluster',`
`191`	`191`	`)`
`192`		`- .addTarget(prometheus.target('gitpod_ws_manager_workspace_phase_total{%(clusterLabel)s=~"$cluster", phase!="RUNNING"}' % _config, legendFormat='{{type}} - {{phase}}'))`
	`192`	`+ .addTarget(prometheus.target('sum by (type, phase)(gitpod_ws_manager_workspace_phase_total{%(clusterLabel)s=~"$cluster", phase!="RUNNING"})' % _config, legendFormat='{{type}} - {{phase}}'))`
`193`	`193`	`// Regular use different levels of green`
`194`	`194`	`.addSeriesOverride({ alias: 'REGULAR - INITIALIZING', color: '#C8F2C2' })`
`195`	`195`	`.addSeriesOverride({ alias: 'REGULAR - CREATING', color: '#96D98D' })`