Skip to content

Commit 461f484

Browse files
jan--fjan--f
committed
chore: bump p-o to v0.87.0
Signed-off-by: Jan Fajerski <[email protected]>
1 parent b13d7b2 commit 461f484

17 files changed

+243
-198
lines changed

‎bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -5297,6 +5297,11 @@ spec:
52975297
message defines the notification message content.
52985298
This is the main body text of the Pushover notification.
52995299
type: string
5300+
monospace:
5301+
description: |-
5302+
monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
5303+
html and monospace formatting are mutually exclusive.
5304+
type: boolean
53005305
priority:
53015306
description: |-
53025307
priority defines the notification priority level.
@@ -8051,7 +8056,7 @@ spec:
80518056
x-kubernetes-map-type: atomic
80528057
useFIPSSTSEndpoint:
80538058
description: |-
8054-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
8059+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
80558060
It requires Prometheus >= v2.54.0.
80568061
type: boolean
80578062
type: object

‎bundle/manifests/monitoring.rhobs_alertmanagers.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: Experimental-SSA
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

‎bundle/manifests/monitoring.rhobs_podmonitors.yaml‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -793,11 +793,29 @@ spec:
793793
description: |-
794794
port defines the `Pod` port name which exposes the endpoint.
795795
796+
If the pod doesn't expose a port with the same name, it will result
797+
in no targets being discovered.
798+
799+
If a `Pod` has multiple `Port`s with the same name (which is not
800+
recommended), one target instance per unique port number will be
801+
generated.
802+
796803
It takes precedence over the `portNumber` and `targetPort` fields.
797804
type: string
798805
portNumber:
799-
description: portNumber defines the `Pod` port number which
800-
exposes the endpoint.
806+
description: |-
807+
portNumber defines the `Pod` port number which exposes the endpoint.
808+
809+
The `Pod` must declare the specified `Port` in its spec or the
810+
target will be dropped by Prometheus.
811+
812+
This cannot be used to enable scraping of an undeclared port.
813+
To scrape targets on a port which isn't exposed, you need to use
814+
relabeling to override the `__address__` label (but beware of
815+
duplicate targets if the `Pod` has other declared ports).
816+
817+
In practice Prometheus will select targets for which the
818+
matches the target's __meta_kubernetes_pod_container_port_number.
801819
format: int32
802820
maximum: 65535
803821
minimum: 1
@@ -942,16 +960,12 @@ spec:
942960
type: object
943961
type: array
944962
scheme:
945-
description: |-
946-
scheme defines the HTTP scheme to use for scraping.
947-
948-
`http` and `https` are the expected values unless you rewrite the
949-
`__scheme__` label via relabeling.
950-
951-
If empty, Prometheus uses the default value `http`.
963+
description: scheme defines the HTTP scheme to use for scraping.
952964
enum:
953965
- http
954966
- https
967+
- HTTP
968+
- HTTPS
955969
type: string
956970
scrapeTimeout:
957971
description: |-

‎bundle/manifests/monitoring.rhobs_probes.yaml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -757,16 +757,22 @@ spec:
757757
pattern: ^(http|https|socks5)://.+$
758758
type: string
759759
scheme:
760-
description: |-
761-
scheme defines the HTTP scheme to use for scraping.
762-
`http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling.
763-
If empty, Prometheus uses the default value `http`.
760+
description: scheme defines the HTTP scheme to use when scraping
761+
the prober.
764762
enum:
765763
- http
766764
- https
765+
- HTTP
766+
- HTTPS
767767
type: string
768768
url:
769-
description: url defines the mandatory URL of the prober.
769+
description: |-
770+
url defines the address of the prober.
771+
772+
Unlike what the name indicates, the value should be in the form of
773+
`address:port` without any scheme which should be specified in the
774+
`scheme` field.
775+
minLength: 1
770776
type: string
771777
required:
772778
- url

‎bundle/manifests/monitoring.rhobs_prometheusagents.yaml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -5498,11 +5498,12 @@ spec:
54985498
Cannot be set at the same time as `oauth` or `sdk`.
54995499
properties:
55005500
clientId:
5501-
description: clientId defines defines the Azure User-assigned
5502-
Managed identity.
5501+
description: |-
5502+
clientId defines the Azure User-assigned Managed identity.
5503+
5504+
For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
5505+
minLength: 1
55035506
type: string
5504-
required:
5505-
- clientId
55065507
type: object
55075508
oauth:
55085509
description: |-
@@ -5679,8 +5680,11 @@ spec:
56795680
- V2.0
56805681
type: string
56815682
metadataConfig:
5682-
description: metadataConfig defines how to send a series metadata
5683-
to the remote storage.
5683+
description: |-
5684+
metadataConfig defines how to send a series metadata to the remote storage.
5685+
5686+
When the field is empty, **no metadata** is sent. But when the field is
5687+
null, metadata is sent.
56845688
properties:
56855689
maxSamplesPerSend:
56865690
description: |-
@@ -6252,7 +6256,7 @@ spec:
62526256
x-kubernetes-map-type: atomic
62536257
useFIPSSTSEndpoint:
62546258
description: |-
6255-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
6259+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
62566260
It requires Prometheus >= v2.54.0.
62576261
type: boolean
62586262
type: object

‎bundle/manifests/monitoring.rhobs_prometheuses.yaml‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: Experimental-SSA
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -1373,6 +1373,7 @@ spec:
13731373
pathPrefix:
13741374
description: pathPrefix defines the prefix for the HTTP
13751375
path alerts are pushed to.
1376+
minLength: 1
13761377
type: string
13771378
port:
13781379
anyOf:
@@ -1513,7 +1514,13 @@ spec:
15131514
type: object
15141515
type: array
15151516
scheme:
1516-
description: scheme to use when firing alerts.
1517+
description: scheme defines the HTTP scheme to use when
1518+
sending alerts.
1519+
enum:
1520+
- http
1521+
- https
1522+
- HTTP
1523+
- HTTPS
15171524
type: string
15181525
sigv4:
15191526
description: |-
@@ -1589,7 +1596,7 @@ spec:
15891596
x-kubernetes-map-type: atomic
15901597
useFIPSSTSEndpoint:
15911598
description: |-
1592-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
1599+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
15931600
It requires Prometheus >= v2.54.0.
15941601
type: boolean
15951602
type: object
@@ -7081,11 +7088,12 @@ spec:
70817088
Cannot be set at the same time as `oauth` or `sdk`.
70827089
properties:
70837090
clientId:
7084-
description: clientId defines defines the Azure User-assigned
7085-
Managed identity.
7091+
description: |-
7092+
clientId defines the Azure User-assigned Managed identity.
7093+
7094+
For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
7095+
minLength: 1
70867096
type: string
7087-
required:
7088-
- clientId
70897097
type: object
70907098
oauth:
70917099
description: |-
@@ -7262,8 +7270,11 @@ spec:
72627270
- V2.0
72637271
type: string
72647272
metadataConfig:
7265-
description: metadataConfig defines how to send a series metadata
7266-
to the remote storage.
7273+
description: |-
7274+
metadataConfig defines how to send a series metadata to the remote storage.
7275+
7276+
When the field is empty, **no metadata** is sent. But when the field is
7277+
null, metadata is sent.
72677278
properties:
72687279
maxSamplesPerSend:
72697280
description: |-
@@ -7835,7 +7846,7 @@ spec:
78357846
x-kubernetes-map-type: atomic
78367847
useFIPSSTSEndpoint:
78377848
description: |-
7838-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
7849+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
78397850
It requires Prometheus >= v2.54.0.
78407851
type: boolean
78417852
type: object

‎bundle/manifests/monitoring.rhobs_prometheusrules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

‎bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -1429,8 +1429,10 @@ spec:
14291429
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
14301430
type: string
14311431
scheme:
1432-
description: scheme defines the HTTP Scheme default "http"
1432+
description: scheme defines the HTTP Scheme.
14331433
enum:
1434+
- http
1435+
- https
14341436
- HTTP
14351437
- HTTPS
14361438
type: string
@@ -12513,10 +12515,10 @@ spec:
1251312515
type: object
1251412516
type: array
1251512517
scheme:
12516-
description: |-
12517-
scheme defines the protocol scheme used for requests.
12518-
If empty, Prometheus uses HTTP by default.
12518+
description: scheme defines the protocol scheme used for requests.
1251912519
enum:
12520+
- http
12521+
- https
1252012522
- HTTP
1252112523
- HTTPS
1252212524
type: string

‎bundle/manifests/monitoring.rhobs_servicemonitors.yaml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -854,16 +854,13 @@ spec:
854854
type: object
855855
type: array
856856
scheme:
857-
description: |-
858-
scheme defines the HTTP scheme to use for scraping.
859-
860-
`http` and `https` are the expected values unless you rewrite the
861-
`__scheme__` label via relabeling.
862-
863-
If empty, Prometheus uses the default value `http`.
857+
description: scheme defines the HTTP scheme to use when scraping
858+
the metrics.
864859
enum:
865860
- http
866861
- https
862+
- HTTP
863+
- HTTPS
867864
type: string
868865
scrapeTimeout:
869866
description: |-

‎bundle/manifests/monitoring.rhobs_thanosrulers.yaml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.2-rhobs1
7+
operator.prometheus.io/version: 0.87.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -4841,11 +4841,12 @@ spec:
48414841
Cannot be set at the same time as `oauth` or `sdk`.
48424842
properties:
48434843
clientId:
4844-
description: clientId defines defines the Azure User-assigned
4845-
Managed identity.
4844+
description: |-
4845+
clientId defines the Azure User-assigned Managed identity.
4846+
4847+
For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
4848+
minLength: 1
48464849
type: string
4847-
required:
4848-
- clientId
48494850
type: object
48504851
oauth:
48514852
description: |-
@@ -5022,8 +5023,11 @@ spec:
50225023
- V2.0
50235024
type: string
50245025
metadataConfig:
5025-
description: metadataConfig defines how to send a series metadata
5026-
to the remote storage.
5026+
description: |-
5027+
metadataConfig defines how to send a series metadata to the remote storage.
5028+
5029+
When the field is empty, **no metadata** is sent. But when the field is
5030+
null, metadata is sent.
50275031
properties:
50285032
maxSamplesPerSend:
50295033
description: |-
@@ -5595,7 +5599,7 @@ spec:
55955599
x-kubernetes-map-type: atomic
55965600
useFIPSSTSEndpoint:
55975601
description: |-
5598-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
5602+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
55995603
It requires Prometheus >= v2.54.0.
56005604
type: boolean
56015605
type: object

0 commit comments

Comments
 (0)