Skip to content

Commit 50fb0da

Browse files
roboquatroboquat
authored
Merge pull request #318 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents f140cfa + 24c38c2 commit 50fb0da

File tree

3 files changed

+39
-129
lines changed

3 files changed

+39
-129
lines changed

‎jsonnetfile.lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"subdir": "contrib/mixin"
3030
}
3131
},
32-
"version": "a7136933ddb07652f5136cf35d454b805a2a615b",
32+
"version": "d6f76e1aa3b1af8495814c12a05446baa451f90b",
3333
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
3434
},
3535
{
@@ -39,8 +39,8 @@
3939
"subdir": "operations/observability/mixins"
4040
}
4141
},
42-
"version": "62a663912eb99f82e7d7f7fbece3a971197c2f25",
43-
"sum": "yOyZudPcE0EVTBtW0gTf1/vRt60NCf3U2+DUiSDNVEw=",
42+
"version": "44b1dcaab0447fdbcd7563e61d4e86e759f918e2",
43+
"sum": "7E8n6EERBzqPa6K2V0kCPFPfTQf91cmJLnT3/g4FVEs=",
4444
"name": "gitpod"
4545
},
4646
{
@@ -172,7 +172,7 @@
172172
"subdir": "documentation/prometheus-mixin"
173173
}
174174
},
175-
"version": "35d6813963b3f82c5d07f3602cc5e6decd12f53e",
175+
"version": "f1a3dbbb6b73b07857274b00f91b63f3814f676c",
176176
"sum": "Dq+wurABxuqRAHj4DGp2sCmjJWzNjrhP2XEScsS0kmY=",
177177
"name": "prometheus"
178178
},
@@ -193,7 +193,7 @@
193193
"subdir": "mixin"
194194
}
195195
},
196-
"version": "0d8562b1bbd262d262824d1983e9be009b41818f",
196+
"version": "9237dd9f33fc4b316b2cbd0f1f57a87c36386ade",
197197
"sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=",
198198
"name": "thanos-mixin"
199199
},

‎monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml

Lines changed: 17 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -95529,39 +95529,6 @@ items:
9552995529
data:
9553095530
gitpod-network-limiting.json: |-
9553195531
{
95532-
"__elements": {
95533-
95534-
},
95535-
"__inputs": [
95536-
{
95537-
"description": "",
95538-
"label": "prometheus",
95539-
"name": "DS_PROMETHEUS",
95540-
"pluginId": "prometheus",
95541-
"pluginName": "Prometheus",
95542-
"type": "datasource"
95543-
}
95544-
],
95545-
"__requires": [
95546-
{
95547-
"id": "grafana",
95548-
"name": "Grafana",
95549-
"type": "grafana",
95550-
"version": "9.1.0"
95551-
},
95552-
{
95553-
"id": "prometheus",
95554-
"name": "Prometheus",
95555-
"type": "datasource",
95556-
"version": "1.0.0"
95557-
},
95558-
{
95559-
"id": "timeseries",
95560-
"name": "Time series",
95561-
"type": "panel",
95562-
"version": ""
95563-
}
95564-
],
9556595532
"annotations": {
9556695533
"list": [
9556795534
{
@@ -95590,7 +95557,6 @@ items:
9559095557
"editable": true,
9559195558
"fiscalYearStartMonth": 0,
9559295559
"graphTooltip": 0,
95593-
"id": null,
9559495560
"links": [
9559595561

9559695562
],
@@ -95599,7 +95565,7 @@ items:
9559995565
{
9560095566
"datasource": {
9560195567
"type": "prometheus",
95602-
"uid": "${DS_PROMETHEUS}"
95568+
"uid": "${datasource}"
9560395569
},
9560495570
"fieldConfig": {
9560595571
"defaults": {
@@ -95682,26 +95648,13 @@ items:
9568295648
{
9568395649
"datasource": {
9568495650
"type": "prometheus",
95685-
"uid": "${DS_PROMETHEUS}"
95651+
"uid": "${datasource}"
9568695652
},
9568795653
"editorMode": "code",
95688-
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_packets{node=~\"$node\", workspace=~\"$workspace\"}) by (node, workspace)\n",
95689-
"interval": "",
95654+
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_packets{node=~\"$node\", workspace=~\"$workspace\"}) by(node, workspace)",
9569095655
"legendFormat": "{{workspace}}",
9569195656
"range": true,
9569295657
"refId": "A"
95693-
},
95694-
{
95695-
"datasource": {
95696-
"type": "prometheus",
95697-
"uid": "${DS_PROMETHEUS}"
95698-
},
95699-
"editorMode": "builder",
95700-
"expr": "",
95701-
"hide": false,
95702-
"legendFormat": "__auto",
95703-
"range": true,
95704-
"refId": "B"
9570595658
}
9570695659
],
9570795660
"title": "Dropped packets",
@@ -95710,7 +95663,7 @@ items:
9571095663
{
9571195664
"datasource": {
9571295665
"type": "prometheus",
95713-
"uid": "${DS_PROMETHEUS}"
95666+
"uid": "${datasource}"
9571495667
},
9571595668
"fieldConfig": {
9571695669
"defaults": {
@@ -95793,7 +95746,7 @@ items:
9579395746
{
9579495747
"datasource": {
9579595748
"type": "prometheus",
95796-
"uid": "${DS_PROMETHEUS}"
95749+
"uid": "${datasource}"
9579795750
},
9579895751
"editorMode": "code",
9579995752
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=~\"$node\", workspace=~\"$workspace\"}) by (node, workspace)",
@@ -95816,17 +95769,18 @@ items:
9581695769
{
9581795770
"current": {
9581895771
"selected": false,
95819-
"text": "prometheus",
95820-
"value": "prometheus"
95772+
"text": "VictoriaMetrics",
95773+
"value": "VictoriaMetrics"
9582195774
},
95822-
"hide": 0,
95775+
"hide": 2,
9582395776
"includeAll": false,
9582495777
"multi": false,
9582595778
"name": "datasource",
9582695779
"options": [
9582795780

9582895781
],
9582995782
"query": "prometheus",
95783+
"queryValue": "",
9583095784
"refresh": 1,
9583195785
"regex": "",
9583295786
"skipUrlSync": false,
@@ -95838,9 +95792,9 @@ items:
9583895792
},
9583995793
"datasource": {
9584095794
"type": "prometheus",
95841-
"uid": "${DS_PROMETHEUS}"
95795+
"uid": "${datasource}"
9584295796
},
95843-
"definition": "label_values(kube_node_labels{nodepool=\"workspace-pool\"}, node)",
95797+
"definition": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes,node)",
9584495798
"hide": 0,
9584595799
"includeAll": false,
9584695800
"label": "Node",
@@ -95850,7 +95804,7 @@ items:
9585095804

9585195805
],
9585295806
"query": {
95853-
"query": "label_values(kube_node_labels{nodepool=\"workspace-pool\"}, node)",
95807+
"query": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes,node)",
9585495808
"refId": "StandardVariableQuery"
9585595809
},
9585695810
"refresh": 2,
@@ -95865,19 +95819,19 @@ items:
9586595819
},
9586695820
"datasource": {
9586795821
"type": "prometheus",
95868-
"uid": "${DS_PROMETHEUS}"
95822+
"uid": "${datasource}"
9586995823
},
95870-
"definition": "label_values(kube_pod_labels{component=\"workspace\"}, pod)",
95824+
"definition": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=\"$node\"},workspace)",
9587195825
"hide": 0,
9587295826
"includeAll": true,
9587395827
"label": "Workspace",
95874-
"multi": false,
95828+
"multi": true,
9587595829
"name": "workspace",
9587695830
"options": [
9587795831

9587895832
],
9587995833
"query": {
95880-
"query": "label_values(kube_pod_labels{component=\"workspace\"}, pod)",
95834+
"query": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=\"$node\"},workspace)",
9588195835
"refId": "StandardVariableQuery"
9588295836
},
9588395837
"refresh": 2,
@@ -95898,7 +95852,7 @@ items:
9589895852
"timezone": "",
9589995853
"title": "Network limiting",
9590095854
"uid": "-q-ZCsW4z",
95901-
"version": 24,
95855+
"version": 1,
9590295856
"weekStart": ""
9590395857
}
9590495858
kind: ConfigMap

‎vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/workspace/dashboards/network-limiting.json

Lines changed: 17 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)