Skip to content

Commit a85e312

Browse files
roboquatroboquat
authored
Merge pull request #315 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 0d4e3c4 + 05d42dc commit a85e312

File tree

8 files changed

+103
-65
lines changed

8 files changed

+103
-65
lines changed

‎jsonnetfile.lock.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"subdir": "contrib/mixin"
3030
}
3131
},
32-
"version": "b886bbc89f31d7ac59bdfbb3d14a4263dae85a1b",
32+
"version": "f7bae0da4ee0b62a0874b8d0cf3640580ee45597",
3333
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
3434
},
3535
{
@@ -39,8 +39,8 @@
3939
"subdir": "operations/observability/mixins"
4040
}
4141
},
42-
"version": "da0410fcbc76ab82234e675caf8ba1ca6a55db87",
43-
"sum": "4D+GeiQ+UVDkL85UPMTo6tYaFudIXqDn7gXnhR6GVUg=",
42+
"version": "cf39aba54afdfca8dd6f0f4c2aa262ffbbfb3fc9",
43+
"sum": "7ZMog6DcquMx8FRSmkNSKL6e7DyTMez2RV0DwqMwQ9k=",
4444
"name": "gitpod"
4545
},
4646
{
@@ -90,8 +90,8 @@
9090
"subdir": ""
9191
}
9292
},
93-
"version": "1ddc6f6f739cc9fe4b8ac6a0fbb23cb09fe53bc3",
94-
"sum": "0Goz56z5rF8rRarGQNj4f7VFvnsw7D7pSPUsYutt+J4="
93+
"version": "5e44626d70c2bf2d35c37f3fee5a6261a5335cc6",
94+
"sum": "F0lSJ5J+DUU7Y5u+j783bFLTHNd8Ir1IEkbXuK59RaA="
9595
},
9696
{
9797
"source": {
@@ -130,7 +130,7 @@
130130
"subdir": "jsonnet/mixin"
131131
}
132132
},
133-
"version": "026d4b04c8b2135db16c5a4cae8d75c7e3c9d3d3",
133+
"version": "bb7ec39d215062b6fbb2398547ed8c9b74d93830",
134134
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
135135
"name": "prometheus-operator-mixin"
136136
},
@@ -141,8 +141,8 @@
141141
"subdir": "jsonnet/prometheus-operator"
142142
}
143143
},
144-
"version": "026d4b04c8b2135db16c5a4cae8d75c7e3c9d3d3",
145-
"sum": "STjRmS3z4I0k/wvJ5gse+GJlLlvtF0tASLgFgsbqZbE="
144+
"version": "bb7ec39d215062b6fbb2398547ed8c9b74d93830",
145+
"sum": "Jr+jz8gWA0LnesA7pAOaTpPc46vBUm+g2j+w0ZIL03U="
146146
},
147147
{
148148
"source": {
@@ -151,7 +151,7 @@
151151
"subdir": "doc/alertmanager-mixin"
152152
}
153153
},
154-
"version": "59476d4a1c644897a8abd0c50144811ba835e2c2",
154+
"version": "3d624c0552e173aa57bbdad52a55788e38744252",
155155
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
156156
"name": "alertmanager"
157157
},
@@ -172,7 +172,7 @@
172172
"subdir": "documentation/prometheus-mixin"
173173
}
174174
},
175-
"version": "0c9f9b7f3ff46fd3361413a850db775a7afebbb4",
175+
"version": "d2701be53ae7de46b77779121a52451cd822cc77",
176176
"sum": "Dq+wurABxuqRAHj4DGp2sCmjJWzNjrhP2XEScsS0kmY=",
177177
"name": "prometheus"
178178
},
@@ -193,7 +193,7 @@
193193
"subdir": "mixin"
194194
}
195195
},
196-
"version": "0d659bf171afa6bdf5c5ece3033df3a7e8245d8c",
196+
"version": "0d8562b1bbd262d262824d1983e9be009b41818f",
197197
"sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=",
198198
"name": "thanos-mixin"
199199
},

‎monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5711,6 +5711,10 @@ spec:
57115711
message:
57125712
description: Human-readable message indicating details for the condition's last transition.
57135713
type: string
5714+
observedGeneration:
5715+
description: ObservedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
5716+
format: int64
5717+
type: integer
57145718
reason:
57155719
description: Reason for the condition's last transition.
57165720
type: string

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

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,7 +3966,6 @@ items:
39663966
"editable": true,
39673967
"fiscalYearStartMonth": 0,
39683968
"graphTooltip": 1,
3969-
"id": 72,
39703969
"links": [
39713970

39723971
],
@@ -4689,7 +4688,7 @@ items:
46894688
"type": "prometheus",
46904689
"uid": "P4169E866C3094E38"
46914690
},
4692-
"definition": "label_values(grpc_server_started_total, grpc_method)",
4691+
"definition": "label_values(grpc_server_started_total{grpc_service=~\"$service\"}, grpc_method)",
46934692
"description": "gRPC Method Name",
46944693
"hide": 0,
46954694
"includeAll": true,
@@ -4700,7 +4699,7 @@ items:
47004699

47014700
],
47024701
"query": {
4703-
"query": "label_values(grpc_server_started_total, grpc_method)",
4702+
"query": "label_values(grpc_server_started_total{grpc_service=~\"$service\"}, grpc_method)",
47044703
"refId": "StandardVariableQuery"
47054704
},
47064705
"refresh": 1,
@@ -4724,7 +4723,7 @@ items:
47244723
"type": "prometheus",
47254724
"uid": "P4169E866C3094E38"
47264725
},
4727-
"definition": "label_values(grpc_server_started_total, grpc_type)",
4726+
"definition": "label_values(grpc_server_started_total{grpc_service=~\"$service\", grpc_method=~\"$method\"}, grpc_type)",
47284727
"description": "gRPC request type - bidirectional stream, server stream, unary, client_stream",
47294728
"hide": 0,
47304729
"includeAll": true,
@@ -4735,7 +4734,7 @@ items:
47354734

47364735
],
47374736
"query": {
4738-
"query": "label_values(grpc_server_started_total, grpc_type)",
4737+
"query": "label_values(grpc_server_started_total{grpc_service=~\"$service\", grpc_method=~\"$method\"}, grpc_type)",
47394738
"refId": "StandardVariableQuery"
47404739
},
47414740
"refresh": 1,
@@ -4765,7 +4764,7 @@ items:
47654764
"timezone": "utc",
47664765
"title": "gRPC / Server",
47674766
"uid": "fDH4_QMVk",
4768-
"version": 5,
4767+
"version": 1,
47694768
"weekStart": "monday"
47704769
}
47714770
kind: ConfigMap
@@ -71132,8 +71131,6 @@ items:
7113271131
"editable": true,
7113371132
"fiscalYearStartMonth": 0,
7113471133
"graphTooltip": 0,
71135-
"id": 68,
71136-
"iteration": 1658784406433,
7113771134
"links": [
7113871135

7113971136
],
@@ -71161,6 +71158,8 @@ items:
7116171158
"mode": "palette-classic"
7116271159
},
7116371160
"custom": {
71161+
"axisCenteredZero": false,
71162+
"axisColorMode": "text",
7116471163
"axisLabel": "",
7116571164
"axisPlacement": "auto",
7116671165
"barAlignment": 0,
@@ -71223,7 +71222,8 @@ items:
7122371222

7122471223
],
7122571224
"displayMode": "list",
71226-
"placement": "bottom"
71225+
"placement": "bottom",
71226+
"showLegend": true
7122771227
},
7122871228
"tooltip": {
7122971229
"mode": "single",
@@ -71257,6 +71257,8 @@ items:
7125771257
"mode": "palette-classic"
7125871258
},
7125971259
"custom": {
71260+
"axisCenteredZero": false,
71261+
"axisColorMode": "text",
7126071262
"axisLabel": "",
7126171263
"axisPlacement": "auto",
7126271264
"barAlignment": 0,
@@ -71319,7 +71321,8 @@ items:
7131971321

7132071322
],
7132171323
"displayMode": "list",
71322-
"placement": "bottom"
71324+
"placement": "bottom",
71325+
"showLegend": true
7132371326
},
7132471327
"tooltip": {
7132571328
"mode": "single",
@@ -71362,11 +71365,11 @@ items:
7136271365
"x": 0,
7136371366
"y": 9
7136471367
},
71365-
"id": 2,
71368+
"id": 14,
7136671369
"panels": [
7136771370

7136871371
],
71369-
"title": "Usage Controller",
71372+
"title": "Scheduled jobs",
7137071373
"type": "row"
7137171374
},
7137271375
{
@@ -71381,6 +71384,8 @@ items:
7138171384
"mode": "palette-classic"
7138271385
},
7138371386
"custom": {
71387+
"axisCenteredZero": false,
71388+
"axisColorMode": "text",
7138471389
"axisLabel": "# of events",
7138571390
"axisPlacement": "auto",
7138671391
"barAlignment": 0,
@@ -71442,7 +71447,8 @@ items:
7144271447

7144371448
],
7144471449
"displayMode": "list",
71445-
"placement": "bottom"
71450+
"placement": "bottom",
71451+
"showLegend": true
7144671452
},
7144771453
"tooltip": {
7144871454
"mode": "single",
@@ -71456,8 +71462,8 @@ items:
7145671462
"uid": "P4169E866C3094E38"
7145771463
},
7145871464
"editorMode": "code",
71459-
"expr": "sum(increase(gitpod_usage_reconcile_started_total{cluster=~\"$cluster\"}[1m]))",
71460-
"legendFormat": "Reconcile started",
71465+
"expr": "sum(increase(gitpod_usage_scheduler_job_started_total{cluster=~\"$cluster\"}[1m])) by (job)",
71466+
"legendFormat": "{{job}} started",
7146171467
"range": true,
7146271468
"refId": "A"
7146371469
},
@@ -71468,15 +71474,15 @@ items:
7146871474
},
7146971475
"editorMode": "code",
7147071476
"exemplar": false,
71471-
"expr": "sum(increase(gitpod_usage_reconcile_completed_duration_seconds_count{cluster=~\"$cluster\"}[1m])) by (outcome)",
71477+
"expr": "sum(increase(gitpod_usage_scheduler_job_completed_seconds_count{cluster=~\"$cluster\"}[1m])) by (job, outcome)",
7147271478
"hide": false,
7147371479
"instant": false,
71474-
"legendFormat": "Reconcile completed: {{outcome}}",
71480+
"legendFormat": "{{job}} completed: {{outcome}}",
7147571481
"range": true,
7147671482
"refId": "B"
7147771483
}
7147871484
],
71479-
"title": "Usage Controller Ticks",
71485+
"title": "Scheduled jobs started & completed",
7148071486
"type": "timeseries"
7148171487
},
7148271488
{
@@ -71491,6 +71497,8 @@ items:
7149171497
"mode": "palette-classic"
7149271498
},
7149371499
"custom": {
71500+
"axisCenteredZero": false,
71501+
"axisColorMode": "text",
7149471502
"axisGridShow": true,
7149571503
"axisLabel": "",
7149671504
"axisPlacement": "auto",
@@ -71554,7 +71562,8 @@ items:
7155471562

7155571563
],
7155671564
"displayMode": "list",
71557-
"placement": "bottom"
71565+
"placement": "bottom",
71566+
"showLegend": true
7155871567
},
7155971568
"tooltip": {
7156071569
"mode": "single",
@@ -71568,7 +71577,7 @@ items:
7156871577
"uid": "P4169E866C3094E38"
7156971578
},
7157071579
"editorMode": "code",
71571-
"expr": "histogram_quantile(0.5, sum(rate(gitpod_usage_reconcile_completed_duration_seconds_bucket{cluster=~\"$cluster\"}[$__rate_interval])) by (le))",
71580+
"expr": "histogram_quantile(0.5, sum(rate(gitpod_usage_scheduler_job_completed_seconds_bucket{cluster=~\"$cluster\"}[$__rate_interval])) by (le))",
7157271581
"legendFormat": "50th percentile",
7157371582
"range": true,
7157471583
"refId": "A"
@@ -71579,18 +71588,18 @@ items:
7157971588
"uid": "P4169E866C3094E38"
7158071589
},
7158171590
"editorMode": "code",
71582-
"expr": "histogram_quantile(0.9, sum(rate(gitpod_usage_reconcile_completed_duration_seconds_bucket{cluster=~\"$cluster\"}[$__rate_interval])) by (le))",
71591+
"expr": "histogram_quantile(0.9, sum(rate(gitpod_usage_scheduler_job_completed_seconds_bucket{cluster=~\"$cluster\"}[$__rate_interval])) by (le))",
7158371592
"hide": false,
7158471593
"legendFormat": "90th percentile",
7158571594
"range": true,
7158671595
"refId": "B"
7158771596
}
7158871597
],
71589-
"title": "Tick Duration",
71598+
"title": "Scheduled job duration",
7159071599
"type": "timeseries"
7159171600
}
7159271601
],
71593-
"schemaVersion": 36,
71602+
"schemaVersion": 37,
7159471603
"style": "dark",
7159571604
"tags": [
7159671605

@@ -71707,7 +71716,7 @@ items:
7170771716
"timezone": "utc",
7170871717
"title": "Component: Usage",
7170971718
"uid": "8W7P-jg4z",
71710-
"version": 8,
71719+
"version": 1,
7171171720
"weekStart": "monday"
7171271721
}
7171371722
kind: ConfigMap

‎vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-grpc-server.json

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

0 commit comments

Comments
 (0)