Merge pull request #282 from gitpod-io/roboquat/automated-dependency-update-main

roboquat · web-flow · commit 0b23f83e4899 · 2022-08-25T18:56:53.000+02:00
[bot] [main] Automated dependencies update
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -39,8 +39,8 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "803b52a388107e72d90d8f6ed11a14ea87c2b2a4",
-      "sum": "ofmf/heE6uIkoRj4sMCiywjW3lHSNdiIqIPCTBiDTTY=",
+      "version": "074d9842ca28ac5e8cc9c44de20c9b19a060f92f",
+      "sum": "YcwcgtFa/V9zrtcXWkD0EqYGuAhN8H2qH5yfI8puCd4=",
       "name": "gitpod"
     },
     {
@@ -120,7 +120,7 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "a4e3fc4cda07ffad693c811a112d8b3a6ae51326",
+      "version": "bfb332ee037e17848f8aeaf7529da321558a4898",
       "sum": "LlAIPGfg64e7PQdLzfTx1rXt6+jaWcATgYIMoqMOTd0="
     },
     {
diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml
@@ -9551,7 +9551,7 @@ items:
                           "steppedLine": false,
                           "targets": [
                               {
-                                  "expr": "gitpod_ws_manager_workspace_phase_total{cluster=~\"$cluster\", phase!=\"RUNNING\"}",
+                                  "expr": "sum by (type, phase)(gitpod_ws_manager_workspace_phase_total{cluster=~\"$cluster\", phase!=\"RUNNING\"})",
                                   "format": "time_series",
                                   "intervalFactor": 2,
                                   "legendFormat": "{{type}} - {{phase}}",
diff --git a/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.libsonnet b/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.libsonnet

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@`
`39`	`39`	`"subdir": "operations/observability/mixins"`
`40`	`40`	`}`
`41`	`41`	`},`
`42`		`- "version": "803b52a388107e72d90d8f6ed11a14ea87c2b2a4",`
`43`		`- "sum": "ofmf/heE6uIkoRj4sMCiywjW3lHSNdiIqIPCTBiDTTY=",`
	`42`	`+ "version": "074d9842ca28ac5e8cc9c44de20c9b19a060f92f",`
	`43`	`+ "sum": "YcwcgtFa/V9zrtcXWkD0EqYGuAhN8H2qH5yfI8puCd4=",`
`44`	`44`	`"name": "gitpod"`
`45`	`45`	`},`
`46`	`46`	`{`
`@@ -120,7 +120,7 @@`
`120`	`120`	`"subdir": "jsonnet/kube-prometheus"`
`121`	`121`	`}`
`122`	`122`	`},`
`123`		`- "version": "a4e3fc4cda07ffad693c811a112d8b3a6ae51326",`
	`123`	`+ "version": "bfb332ee037e17848f8aeaf7529da321558a4898",`
`124`	`124`	`"sum": "LlAIPGfg64e7PQdLzfTx1rXt6+jaWcATgYIMoqMOTd0="`
`125`	`125`	`},`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9551,7 +9551,7 @@ items:`
`9551`	`9551`	`"steppedLine": false,`
`9552`	`9552`	`"targets": [`
`9553`	`9553`	`{`
`9554`		`- "expr": "gitpod_ws_manager_workspace_phase_total{cluster=~\"$cluster\", phase!=\"RUNNING\"}",`
	`9554`	`+ "expr": "sum by (type, phase)(gitpod_ws_manager_workspace_phase_total{cluster=~\"$cluster\", phase!=\"RUNNING\"})",`
`9555`	`9555`	`"format": "time_series",`
`9556`	`9556`	`"intervalFactor": 2,`
`9557`	`9557`	`"legendFormat": "{{type}} - {{phase}}",`