Skip to content

Commit d9298e8

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2614 from slashpai/bump-po-0.83
MON-4255: Bump prometheus-operator to v0.83
2 parents 2c1eb53 + 251da83 commit d9298e8

10 files changed

+4294
-1594
lines changed

‎jsonnet/jsonnetfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"subdir": "jsonnet/prometheus-operator"
1818
}
1919
},
20-
"version": "release-0.81"
20+
"version": "release-0.83"
2121
},
2222
{
2323
"source": {

‎jsonnet/jsonnetfile.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"subdir": "jsonnet/mixin"
192192
}
193193
},
194-
"version": "81634cc2c103d3f755932fd586bd63fd2c13d705",
194+
"version": "6176050674d427a1cee23d17b6b0bf307d806e57",
195195
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
196196
"name": "prometheus-operator-mixin"
197197
},
@@ -202,8 +202,8 @@
202202
"subdir": "jsonnet/prometheus-operator"
203203
}
204204
},
205-
"version": "81634cc2c103d3f755932fd586bd63fd2c13d705",
206-
"sum": "wAOdGxl8D660MfS7YW5Rhh+KObOJBr0F/OOImHSTMO8="
205+
"version": "5cf2f5d37906d64b2259a262e319df4c74639e31",
206+
"sum": "xzGiEUwaDtS7FdoiizjlOFbvhz7d8vrbKUAJML1ssXw="
207207
},
208208
{
209209
"source": {

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml‎

Lines changed: 2815 additions & 1436 deletions
Large diffs are not rendered by default.

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml‎

Lines changed: 233 additions & 31 deletions
Large diffs are not rendered by default.

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.81.0
10+
operator.prometheus.io/version: 0.83.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -82,6 +82,11 @@ spec:
8282
It requires Prometheus >= v2.28.0.
8383
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
8484
type: string
85+
convertClassicHistogramsToNHCB:
86+
description: |-
87+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
88+
It requires Prometheus >= v3.0.0.
89+
type: boolean
8590
fallbackScrapeProtocol:
8691
description: |-
8792
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
@@ -513,7 +518,7 @@ spec:
513518
that should be excluded from proxying. IP and domain names can
514519
contain port numbers.
515520
516-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
521+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
517522
type: string
518523
proxyConnectHeader:
519524
additionalProperties:
@@ -544,18 +549,18 @@ spec:
544549
ProxyConnectHeader optionally specifies headers to send to
545550
proxies during CONNECT requests.
546551
547-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
552+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
548553
type: object
549554
x-kubernetes-map-type: atomic
550555
proxyFromEnvironment:
551556
description: |-
552557
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
553558
554-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
559+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
555560
type: boolean
556561
proxyUrl:
557562
description: '`proxyURL` defines the HTTP proxy server to use.'
558-
pattern: ^http(s)?://.+$
563+
pattern: ^(http|https|socks5)://.+$
559564
type: string
560565
scopes:
561566
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -692,7 +697,7 @@ spec:
692697
description: |-
693698
Maximum acceptable TLS version.
694699
695-
It requires Prometheus >= v2.41.0.
700+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
696701
enum:
697702
- TLS10
698703
- TLS11
@@ -703,7 +708,7 @@ spec:
703708
description: |-
704709
Minimum acceptable TLS version.
705710
706-
It requires Prometheus >= v2.35.0.
711+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
707712
enum:
708713
- TLS10
709714
- TLS11
@@ -1005,7 +1010,7 @@ spec:
10051010
description: |-
10061011
Maximum acceptable TLS version.
10071012
1008-
It requires Prometheus >= v2.41.0.
1013+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
10091014
enum:
10101015
- TLS10
10111016
- TLS11
@@ -1016,7 +1021,7 @@ spec:
10161021
description: |-
10171022
Minimum acceptable TLS version.
10181023
1019-
It requires Prometheus >= v2.35.0.
1024+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
10201025
enum:
10211026
- TLS10
10221027
- TLS11

‎manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.81.0
10+
operator.prometheus.io/version: 0.83.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -170,6 +170,11 @@ spec:
170170
- key
171171
type: object
172172
x-kubernetes-map-type: atomic
173+
convertClassicHistogramsToNHCB:
174+
description: |-
175+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
176+
It requires Prometheus >= v3.0.0.
177+
type: boolean
173178
fallbackScrapeProtocol:
174179
description: |-
175180
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
@@ -415,7 +420,7 @@ spec:
415420
that should be excluded from proxying. IP and domain names can
416421
contain port numbers.
417422
418-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
423+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
419424
type: string
420425
proxyConnectHeader:
421426
additionalProperties:
@@ -446,18 +451,18 @@ spec:
446451
ProxyConnectHeader optionally specifies headers to send to
447452
proxies during CONNECT requests.
448453
449-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
454+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
450455
type: object
451456
x-kubernetes-map-type: atomic
452457
proxyFromEnvironment:
453458
description: |-
454459
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
455460
456-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
461+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
457462
type: boolean
458463
proxyUrl:
459464
description: '`proxyURL` defines the HTTP proxy server to use.'
460-
pattern: ^http(s)?://.+$
465+
pattern: ^(http|https|socks5)://.+$
461466
type: string
462467
scopes:
463468
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -594,7 +599,7 @@ spec:
594599
description: |-
595600
Maximum acceptable TLS version.
596601
597-
It requires Prometheus >= v2.41.0.
602+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
598603
enum:
599604
- TLS10
600605
- TLS11
@@ -605,7 +610,7 @@ spec:
605610
description: |-
606611
Minimum acceptable TLS version.
607612
608-
It requires Prometheus >= v2.35.0.
613+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
609614
enum:
610615
- TLS10
611616
- TLS11
@@ -1099,7 +1104,7 @@ spec:
10991104
description: |-
11001105
Maximum acceptable TLS version.
11011106
1102-
It requires Prometheus >= v2.41.0.
1107+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
11031108
enum:
11041109
- TLS10
11051110
- TLS11
@@ -1110,7 +1115,7 @@ spec:
11101115
description: |-
11111116
Minimum acceptable TLS version.
11121117
1113-
It requires Prometheus >= v2.35.0.
1118+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
11141119
enum:
11151120
- TLS10
11161121
- TLS11

0 commit comments

Comments
 (0)