Skip to content

Commit d9f2913

Browse files
roboquatroboquat
committed
[bot] [main] Automated dependencies update
1 parent 45d8898 commit d9f2913

35 files changed

+587
-170
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "438ed969386b7ef258e0d5802ca5ce4a45e46d7b",
21+
"version": "487e5b6ca8de72b1eb1809b7185dce0f2e678d95",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "a2227ff2408864e372ae40ca3684b498fa9dfc9e",
31+
"version": "9411dfce038322d2ff331ddf0678240cb7623c50",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
92+
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
102+
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "d6556e52d2762de47dc28ac0f9f2ffe93a50e785",
133-
"sum": "jLkq96mnGjid6+aQFvT16Fspnvud7NM1edY33kDSpIE="
132+
"version": "40ad8e9a35e08e4e49a587036e8f747230f876ca",
133+
"sum": "YTEoVwxRe6X20IQdUw2UCnMpF16DuDixtLxusvvIjjg="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
142+
"version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
152+
"version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "d98c08e752f6ff143ee3a9491b774f55e572a83b",
163-
"sum": "fKY/bBuoAikhIeljLNu54ut2SdtT4qCjxhlNLEQg7zo="
162+
"version": "6828741a34a392e58d28e484364234fe191da65c",
163+
"sum": "5UKfljOWlHyaphDY0i8CMiPYCJ/fbn7yTnE9aCQugYg="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b",
172+
"version": "4ca908cb214ef1a80d2371b58de26a13ba417599",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b",
184-
"sum": "drgasp5XaNe+XIzV4Er36mq3IbKAmxmfkh7Se4LtGkw="
183+
"version": "4ca908cb214ef1a80d2371b58de26a13ba417599",
184+
"sum": "i2B4sHfUmkF0YcTSgdIGx2PXQsSR3lrF5/OtMyFQkAI="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "28d3f86811b1cd4e8a17f45cf90a1db357092589",
193+
"version": "557d071862dc660635da3614d775d354f8caaf57",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "b6112eac8af48aceb75691416ce66a5056e7f258",
204+
"version": "771c3d458a763aeae8040619ab560e5085699b6f",
205205
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
206206
},
207207
{
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "f4b8840f51bee8afa258e0d4e27fc7fc03358760",
214+
"version": "2c2a4314b9bc904ed437b9564690e5db320f972b",
215215
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "dec7d5cc8d55ed2c2bb6ce48b5eae8effc098947",
225+
"version": "8914f489c838524956adafd426c1e2b512f38fc0",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "d997eed1749e4d91243efc0137f6a20cb659841b",
236+
"version": "be442a5152ecb76c57179634b16e4a18a1345a0c",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 6 additions & 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.85.0
7+
operator.prometheus.io/version: 0.86.0
88
name: alertmanagerconfigs.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -7326,6 +7326,11 @@ spec:
73267326
- key
73277327
type: object
73287328
x-kubernetes-map-type: atomic
7329+
useFIPSSTSEndpoint:
7330+
description: |-
7331+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
7332+
It requires Prometheus >= v2.54.0.
7333+
type: boolean
73297334
type: object
73307335
subject:
73317336
description: |-

‎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.85.0
7+
operator.prometheus.io/version: 0.86.0
88
name: alertmanagers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 25 additions & 22 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.85.0
7+
operator.prometheus.io/version: 0.86.0
88
name: podmonitors.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -177,10 +177,10 @@ spec:
177177
properties:
178178
authorization:
179179
description: |-
180-
authorization defines the Authorization header credentials to use when
181-
scraping the target.
180+
authorization configures the Authorization header credentials used by
181+
the client.
182182
183-
Cannot be set at the same time as `basicAuth`, or `oauth2`.
183+
Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.
184184
properties:
185185
credentials:
186186
description: credentials defines a key of a Secret in the namespace that contains the credentials for authentication.
@@ -215,10 +215,10 @@ spec:
215215
type: object
216216
basicAuth:
217217
description: |-
218-
basicAuth defines the Basic Authentication credentials to use when
219-
scraping the target.
218+
basicAuth defines the Basic Authentication credentials used by the
219+
client.
220220
221-
Cannot be set at the same time as `authorization`, or `oauth2`.
221+
Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.
222222
properties:
223223
password:
224224
description: |-
@@ -271,9 +271,12 @@ spec:
271271
type: object
272272
bearerTokenSecret:
273273
description: |-
274-
bearerTokenSecret defines a key of a Secret containing the bearer
275-
token for scraping targets. The secret needs to be in the same namespace
276-
as the PodMonitor object and readable by the Prometheus Operator.
274+
bearerTokenSecret defines a key of a Secret containing the bearer token
275+
used by the client for authentication. The secret needs to be in the
276+
same namespace as the custom resource and readable by the Prometheus
277+
Operator.
278+
279+
Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.
277280
278281
Deprecated: use `authorization` instead.
279282
properties:
@@ -297,7 +300,7 @@ spec:
297300
type: object
298301
x-kubernetes-map-type: atomic
299302
enableHttp2:
300-
description: enableHttp2 can be used to disable HTTP2 when scraping the target.
303+
description: enableHttp2 can be used to disable HTTP2.
301304
type: boolean
302305
filterRunning:
303306
description: |-
@@ -310,8 +313,8 @@ spec:
310313
type: boolean
311314
followRedirects:
312315
description: |-
313-
followRedirects defines whether the scrape requests should follow HTTP
314-
3xx redirects.
316+
followRedirects defines whether the client should follow HTTP 3xx
317+
redirects.
315318
type: boolean
316319
honorLabels:
317320
description: |-
@@ -401,9 +404,9 @@ spec:
401404
configured regular expression.
402405
items:
403406
description: |-
404-
LabelName is a valid Prometheus label name which may only contain ASCII
405-
letters, numbers, as well as underscores.
406-
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
407+
LabelName is a valid Prometheus label name.
408+
For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
409+
For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
407410
type: string
408411
type: array
409412
targetLabel:
@@ -427,11 +430,11 @@ spec:
427430
type: string
428431
oauth2:
429432
description: |-
430-
oauth2 defines the OAuth2 settings to use when scraping the target.
433+
oauth2 defines the OAuth2 settings used by the client.
431434
432435
It requires Prometheus >= 2.27.0.
433436
434-
Cannot be set at the same time as `authorization`, or `basicAuth`.
437+
Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.
435438
properties:
436439
clientId:
437440
description: |-
@@ -874,9 +877,9 @@ spec:
874877
configured regular expression.
875878
items:
876879
description: |-
877-
LabelName is a valid Prometheus label name which may only contain ASCII
878-
letters, numbers, as well as underscores.
879-
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
880+
LabelName is a valid Prometheus label name.
881+
For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
882+
For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
880883
type: string
881884
type: array
882885
targetLabel:
@@ -922,7 +925,7 @@ spec:
922925
Deprecated: use 'port' or 'portNumber' instead.
923926
x-kubernetes-int-or-string: true
924927
tlsConfig:
925-
description: tlsConfig defines the TLS configuration to use when scraping the target.
928+
description: tlsConfig defines the TLS configuration used by the client.
926929
properties:
927930
ca:
928931
description: ca defines the Certificate authority used when verifying server certificates.

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

Lines changed: 10 additions & 10 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.85.0
7+
operator.prometheus.io/version: 0.86.0
88
name: probes.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -285,9 +285,9 @@ spec:
285285
configured regular expression.
286286
items:
287287
description: |-
288-
LabelName is a valid Prometheus label name which may only contain ASCII
289-
letters, numbers, as well as underscores.
290-
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
288+
LabelName is a valid Prometheus label name.
289+
For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
290+
For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
291291
type: string
292292
type: array
293293
targetLabel:
@@ -878,9 +878,9 @@ spec:
878878
configured regular expression.
879879
items:
880880
description: |-
881-
LabelName is a valid Prometheus label name which may only contain ASCII
882-
letters, numbers, as well as underscores.
883-
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
881+
LabelName is a valid Prometheus label name.
882+
For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
883+
For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
884884
type: string
885885
type: array
886886
targetLabel:
@@ -1023,9 +1023,9 @@ spec:
10231023
configured regular expression.
10241024
items:
10251025
description: |-
1026-
LabelName is a valid Prometheus label name which may only contain ASCII
1027-
letters, numbers, as well as underscores.
1028-
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
1026+
LabelName is a valid Prometheus label name.
1027+
For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
1028+
For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
10291029
type: string
10301030
type: array
10311031
targetLabel:

0 commit comments

Comments
 (0)