Skip to content

Commit 4676b44

Browse files
authored
Merge pull request #612 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 9e18e88 + c22bd67 commit 4676b44

File tree

6 files changed

+34
-46
lines changed

6 files changed

+34
-46
lines changed

jsonnetfile.lock.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "991ea7e0b4762303878f5b3c0cb4edc68c16bd39",
21+
"version": "22cedfb21d3710f94a02f9314ec19cf7923a1c7a",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "65f5f82ff9e092cbbf00361ced10a82cd406fa9a",
31+
"version": "c91acb905c36dbf5ce41b0a71ffdc6d9909bc247",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "7a55aea78ce69ed10222877e50479911f6323539",
92+
"version": "17cab45a63bdc604bf85ecceeda23c8ad26e543c",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "7a55aea78ce69ed10222877e50479911f6323539",
102+
"version": "17cab45a63bdc604bf85ecceeda23c8ad26e543c",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "60e0750a092109730ddf120f6200a09cb2f9a4e3",
142+
"version": "c893a8e8aaecac30bf92bd67503fb306ee1d1a60",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "60e0750a092109730ddf120f6200a09cb2f9a4e3",
152+
"version": "c893a8e8aaecac30bf92bd67503fb306ee1d1a60",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "eb2e1d01c9f71732004847bc2aba8050692a6b3b",
172+
"version": "3d04de8b9cba6c68c18f2eb7dee26092c7e92090",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "eb2e1d01c9f71732004847bc2aba8050692a6b3b",
184-
"sum": "6IfP13qYm+MfP2Breez/55+64DU2pFg52Tm5A2v1+IU="
183+
"version": "3d04de8b9cba6c68c18f2eb7dee26092c7e92090",
184+
"sum": "q/qLDOlFe9bTcGhjo4AUBmCzGk65tp4IahbqJpa2rbo="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "d5636601f8220f7e0306b38dc0f0ee907f9e34f9",
193+
"version": "3e70148d4f55a27b0c817d0997149bff30f6343e",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "6471fa313e9e05a41eec9d3e4754c16d86f96db7",
204+
"version": "2f980160aa4197b9036f46c72b8f4995159b4f0e",
205205
"sum": "NcpQ0Hz0qciUqmOYoAR0X8GUK5pH/QiUXm1aDNgvua0="
206206
},
207207
{
@@ -211,8 +211,8 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "18626a99c41d8c8b949c3b2e459ffa4c1fcc69e3",
215-
"sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=",
214+
"version": "913cc8f72b8a4f6ae4beb1d168c16a88ca4705ab",
215+
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},
218218
{
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "f6ba7dce57e6add2e2b9f4318144e20c13ea1773",
225+
"version": "369e6fe4efe195409ad747fbb2f1be56408cc476",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "c93f82d7ca9d8e68b3dd53f38dfd3efc8af8eccc",
236+
"version": "1c4d17bd1285e941141065ff8d861cf8abb8677c",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4244,6 +4244,7 @@ spec:
42444244
server:
42454245
description: The URL to connect to the Eureka server.
42464246
minLength: 1
4247+
pattern: ^http(s)?://.+$
42474248
type: string
42484249
tlsConfig:
42494250
description: TLS configuration applying to the target HTTP endpoint.
@@ -10342,14 +10343,10 @@ spec:
1034210343
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
1034310344
type: string
1034410345
service:
10345-
allOf:
10346-
- enum:
10347-
- VPS
10348-
- DedicatedServer
10349-
- enum:
10350-
- VPS
10351-
- DedicatedServer
1035210346
description: Service of the targets to retrieve. Must be `VPS` or `DedicatedServer`.
10347+
enum:
10348+
- VPS
10349+
- DedicatedServer
1035310350
type: string
1035410351
required:
1035510352
- applicationKey

monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57230,13 +57230,13 @@ items:
5723057230
"type": "prometheus",
5723157231
"uid": "$datasource"
5723257232
},
57233-
"expr": "(\n prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}\n-\n ignoring(remote_name, url) group_right(instance) (prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"} != 0)\n)\n",
57233+
"expr": "(\n prometheus_remote_storage_queue_highest_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}\n-\n prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}\n)\n",
5723457234
"format": "time_series",
5723557235
"intervalFactor": 2,
5723657236
"legendFormat": "{{cluster}}::{{instance}} {{remote_name}}:{{url}}"
5723757237
}
5723857238
],
57239-
"title": "Highest Timestamp In vs. Highest Timestamp Sent",
57239+
"title": "Highest Enqueued Timestamp vs. Highest Timestamp Sent",
5724057240
"type": "timeseries"
5724157241
},
5724257242
{
@@ -57272,7 +57272,7 @@ items:
5727257272
"type": "prometheus",
5727357273
"uid": "$datasource"
5727457274
},
57275-
"expr": "clamp_min(\n rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n-\n ignoring (remote_name, url) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])\n, 0)\n",
57275+
"expr": "clamp_min(\n rate(prometheus_remote_storage_queue_highest_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])\n-\n rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])\n, 0)\n",
5727657276
"format": "time_series",
5727757277
"intervalFactor": 2,
5727857278
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}"

vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json

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

vendor/github.com/prometheus/prometheus/documentation/prometheus-mixin/alerts.libsonnet

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

vendor/github.com/prometheus/prometheus/documentation/prometheus-mixin/dashboards.libsonnet

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

0 commit comments

Comments
 (0)