Skip to content

Commit 1954ad2

Browse files
roboquatroboquat
authored
Merge pull request #618 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 8e01e7c + f18f35b commit 1954ad2

22 files changed

+112
-77
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "487e5b6ca8de72b1eb1809b7185dce0f2e678d95",
21+
"version": "6a8e06bed0d53326c0b6a2236f2a35ccad26ad7a",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "9411dfce038322d2ff331ddf0678240cb7623c50",
31+
"version": "7421edc4e83d6f4ff772a96e3b2cef126b33c6eb",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
92+
"version": "6e872a6003b67b00553f5a8ea16bbf3bd93ddb56",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
102+
"version": "6e872a6003b67b00553f5a8ea16bbf3bd93ddb56",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9",
142+
"version": "3bc0742872d1939f468551e21873b00d54572163",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9",
152+
"version": "3bc0742872d1939f468551e21873b00d54572163",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "6828741a34a392e58d28e484364234fe191da65c",
163-
"sum": "5UKfljOWlHyaphDY0i8CMiPYCJ/fbn7yTnE9aCQugYg="
162+
"version": "3ceecb148a2e0704f5ca3e17a7185cd4d6afccbf",
163+
"sum": "wLuMCUAVrOnMC9OtlH2SutI2OETqG7eof+ISJPQeR1Y="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "4ca908cb214ef1a80d2371b58de26a13ba417599",
172+
"version": "0ecdf4786290c4a06dcfb85cec972a995d465ccc",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "4ca908cb214ef1a80d2371b58de26a13ba417599",
184-
"sum": "i2B4sHfUmkF0YcTSgdIGx2PXQsSR3lrF5/OtMyFQkAI="
183+
"version": "0ecdf4786290c4a06dcfb85cec972a995d465ccc",
184+
"sum": "TcntNOk/HVAJwhK0h23rMgIgxC+5pJFhV4zDBy0IMVI="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "557d071862dc660635da3614d775d354f8caaf57",
193+
"version": "ca9ed089405ed4fd8c4207a7b6fc85ed375c6187",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "771c3d458a763aeae8040619ab560e5085699b6f",
204+
"version": "dedb4712c895f47554b5f4ba07bc1556eb6280ef",
205205
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
206206
},
207207
{
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "2c2a4314b9bc904ed437b9564690e5db320f972b",
214+
"version": "4c1355e14baa60acac0f5d531f79f604ea16da2b",
215215
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "8914f489c838524956adafd426c1e2b512f38fc0",
225+
"version": "03a334dd033e000b32b16285d68a85728663de55",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "be442a5152ecb76c57179634b16e4a18a1345a0c",
236+
"version": "997853705652837cda6171119fc2d68bb512d284",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: alertmanagerconfigs.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: alertmanagers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: podmonitors.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -894,16 +894,12 @@ spec:
894894
type: object
895895
type: array
896896
scheme:
897-
description: |-
898-
scheme defines the HTTP scheme to use for scraping.
899-
900-
`http` and `https` are the expected values unless you rewrite the
901-
`__scheme__` label via relabeling.
902-
903-
If empty, Prometheus uses the default value `http`.
897+
description: scheme defines the HTTP scheme to use for scraping.
904898
enum:
905899
- http
906900
- https
901+
- HTTP
902+
- HTTPS
907903
type: string
908904
scrapeTimeout:
909905
description: |-

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: probes.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -713,16 +713,21 @@ spec:
713713
pattern: ^(http|https|socks5)://.+$
714714
type: string
715715
scheme:
716-
description: |-
717-
scheme defines the HTTP scheme to use for scraping.
718-
`http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling.
719-
If empty, Prometheus uses the default value `http`.
716+
description: scheme defines the HTTP scheme to use when scraping the prober.
720717
enum:
721718
- http
722719
- https
720+
- HTTP
721+
- HTTPS
723722
type: string
724723
url:
725-
description: url defines the mandatory URL of the prober.
724+
description: |-
725+
url defines the address of the prober.
726+
727+
Unlike what the name indicates, the value should be in the form of
728+
`address:port` without any scheme which should be specified in the
729+
`scheme` field.
730+
minLength: 1
726731
type: string
727732
required:
728733
- url

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: prometheuses.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -1317,6 +1317,7 @@ spec:
13171317
type: string
13181318
pathPrefix:
13191319
description: pathPrefix defines the prefix for the HTTP path alerts are pushed to.
1320+
minLength: 1
13201321
type: string
13211322
port:
13221323
anyOf:
@@ -1452,7 +1453,12 @@ spec:
14521453
type: object
14531454
type: array
14541455
scheme:
1455-
description: scheme to use when firing alerts.
1456+
description: scheme defines the HTTP scheme to use when sending alerts.
1457+
enum:
1458+
- http
1459+
- https
1460+
- HTTP
1461+
- HTTPS
14561462
type: string
14571463
sigv4:
14581464
description: |-
@@ -6926,7 +6932,11 @@ spec:
69266932
- V2.0
69276933
type: string
69286934
metadataConfig:
6929-
description: metadataConfig defines how to send a series metadata to the remote storage.
6935+
description: |-
6936+
metadataConfig defines how to send a series metadata to the remote storage.
6937+
6938+
When the field is empty, **no metadata** is sent. But when the field is
6939+
null, metadata is sent.
69306940
properties:
69316941
maxSamplesPerSend:
69326942
description: |-

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
6-
operator.prometheus.io/version: 0.86.0
6+
operator.prometheus.io/version: 0.86.1
77
name: prometheusagents.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -5453,7 +5453,11 @@ spec:
54535453
- V2.0
54545454
type: string
54555455
metadataConfig:
5456-
description: metadataConfig defines how to send a series metadata to the remote storage.
5456+
description: |-
5457+
metadataConfig defines how to send a series metadata to the remote storage.
5458+
5459+
When the field is empty, **no metadata** is sent. But when the field is
5460+
null, metadata is sent.
54575461
properties:
54585462
maxSamplesPerSend:
54595463
description: |-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: prometheusrules.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
6-
operator.prometheus.io/version: 0.86.0
6+
operator.prometheus.io/version: 0.86.1
77
name: scrapeconfigs.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -1313,8 +1313,10 @@ spec:
13131313
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
13141314
type: string
13151315
scheme:
1316-
description: scheme defines the HTTP Scheme default "http"
1316+
description: scheme defines the HTTP Scheme.
13171317
enum:
1318+
- http
1319+
- https
13181320
- HTTP
13191321
- HTTPS
13201322
type: string
@@ -11474,10 +11476,10 @@ spec:
1147411476
type: object
1147511477
type: array
1147611478
scheme:
11477-
description: |-
11478-
scheme defines the protocol scheme used for requests.
11479-
If empty, Prometheus uses HTTP by default.
11479+
description: scheme defines the protocol scheme used for requests.
1148011480
enum:
11481+
- http
11482+
- https
1148111483
- HTTP
1148211484
- HTTPS
1148311485
type: string

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.19.0
7-
operator.prometheus.io/version: 0.86.0
7+
operator.prometheus.io/version: 0.86.1
88
name: servicemonitors.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -809,16 +809,12 @@ spec:
809809
type: object
810810
type: array
811811
scheme:
812-
description: |-
813-
scheme defines the HTTP scheme to use for scraping.
814-
815-
`http` and `https` are the expected values unless you rewrite the
816-
`__scheme__` label via relabeling.
817-
818-
If empty, Prometheus uses the default value `http`.
812+
description: scheme defines the HTTP scheme to use when scraping the metrics.
819813
enum:
820814
- http
821815
- https
816+
- HTTP
817+
- HTTPS
822818
type: string
823819
scrapeTimeout:
824820
description: |-

0 commit comments

Comments
 (0)