Skip to content

Commit

Permalink
Merge pull request #318 from gitpod-io/roboquat/automated-dependency-…
Browse files Browse the repository at this point in the history 
…update-main

[bot] [main] Automated dependencies update
  • Loading branch information
@roboquat
roboquat committed Sep 16, 2022
2 parents f140cfa + 24c38c2 commit 50fb0da
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 129 deletions.
10 changes: 5 additions & 5 deletions jsonnetfile.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"subdir": "contrib/mixin"
}
},
"version": "a7136933ddb07652f5136cf35d454b805a2a615b",
"version": "d6f76e1aa3b1af8495814c12a05446baa451f90b",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
Expand All @@ -39,8 +39,8 @@
"subdir": "operations/observability/mixins"
}
},
"version": "62a663912eb99f82e7d7f7fbece3a971197c2f25",
"sum": "yOyZudPcE0EVTBtW0gTf1/vRt60NCf3U2+DUiSDNVEw=",
"version": "44b1dcaab0447fdbcd7563e61d4e86e759f918e2",
"sum": "7E8n6EERBzqPa6K2V0kCPFPfTQf91cmJLnT3/g4FVEs=",
"name": "gitpod"
},
{
Expand Down Expand Up @@ -172,7 +172,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "35d6813963b3f82c5d07f3602cc5e6decd12f53e",
"version": "f1a3dbbb6b73b07857274b00f91b63f3814f676c",
"sum": "Dq+wurABxuqRAHj4DGp2sCmjJWzNjrhP2XEScsS0kmY=",
"name": "prometheus"
},
Expand All @@ -193,7 +193,7 @@
"subdir": "mixin"
}
},
"version": "0d8562b1bbd262d262824d1983e9be009b41818f",
"version": "9237dd9f33fc4b316b2cbd0f1f57a87c36386ade",
"sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=",
"name": "thanos-mixin"
},
Expand Down
80 changes: 17 additions & 63 deletions monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95529,39 +95529,6 @@ items:
data:
gitpod-network-limiting.json: |-
{
"__elements": {

},
"__inputs": [
{
"description": "",
"label": "prometheus",
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"pluginName": "Prometheus",
"type": "datasource"
}
],
"__requires": [
{
"id": "grafana",
"name": "Grafana",
"type": "grafana",
"version": "9.1.0"
},
{
"id": "prometheus",
"name": "Prometheus",
"type": "datasource",
"version": "1.0.0"
},
{
"id": "timeseries",
"name": "Time series",
"type": "panel",
"version": ""
}
],
"annotations": {
"list": [
{
Expand Down Expand Up @@ -95590,7 +95557,6 @@ items:
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": null,
"links": [

],
Expand All @@ -95599,7 +95565,7 @@ items:
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -95682,26 +95648,13 @@ items:
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_packets{node=~\"$node\", workspace=~\"$workspace\"}) by (node, workspace)\n",
"interval": "",
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_packets{node=~\"$node\", workspace=~\"$workspace\"}) by(node, workspace)",
"legendFormat": "{{workspace}}",
"range": true,
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "builder",
"expr": "",
"hide": false,
"legendFormat": "__auto",
"range": true,
"refId": "B"
}
],
"title": "Dropped packets",
Expand All @@ -95710,7 +95663,7 @@ items:
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -95793,7 +95746,7 @@ items:
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=~\"$node\", workspace=~\"$workspace\"}) by (node, workspace)",
Expand All @@ -95816,17 +95769,18 @@ items:
{
"current": {
"selected": false,
"text": "prometheus",
"value": "prometheus"
"text": "VictoriaMetrics",
"value": "VictoriaMetrics"
},
"hide": 0,
"hide": 2,
"includeAll": false,
"multi": false,
"name": "datasource",
"options": [

],
"query": "prometheus",
"queryValue": "",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand All @@ -95838,9 +95792,9 @@ items:
},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"definition": "label_values(kube_node_labels{nodepool=\"workspace-pool\"}, node)",
"definition": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes,node)",
"hide": 0,
"includeAll": false,
"label": "Node",
Expand All @@ -95850,7 +95804,7 @@ items:

],
"query": {
"query": "label_values(kube_node_labels{nodepool=\"workspace-pool\"}, node)",
"query": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes,node)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -95865,19 +95819,19 @@ items:
},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"definition": "label_values(kube_pod_labels{component=\"workspace\"}, pod)",
"definition": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=\"$node\"},workspace)",
"hide": 0,
"includeAll": true,
"label": "Workspace",
"multi": false,
"multi": true,
"name": "workspace",
"options": [

],
"query": {
"query": "label_values(kube_pod_labels{component=\"workspace\"}, pod)",
"query": "label_values(gitpod_ws_daemon_netlimit_connections_dropped_bytes{node=\"$node\"},workspace)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -95898,7 +95852,7 @@ items:
"timezone": "",
"title": "Network limiting",
"uid": "-q-ZCsW4z",
"version": 24,
"version": 1,
"weekStart": ""
}
kind: ConfigMap
Expand Down
78 changes: 17 additions & 61 deletions ...tpod-io/gitpod/operations/observability/mixins/workspace/dashboards/network-limiting.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 50fb0da

Please sign in to comment.