Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -5297,6 +5297,11 @@ spec:
message defines the notification message content.
This is the main body text of the Pushover notification.
type: string
monospace:
description: |-
monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
html and monospace formatting are mutually exclusive.
type: boolean
priority:
description: |-
priority defines the notification priority level.
Expand Down Expand Up @@ -8051,7 +8056,7 @@ spec:
x-kubernetes-map-type: atomic
useFIPSSTSEndpoint:
description: |-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
It requires Prometheus >= v2.54.0.
type: boolean
type: object
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/monitoring.rhobs_alertmanagers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: Experimental-SSA
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down
34 changes: 24 additions & 10 deletions bundle/manifests/monitoring.rhobs_podmonitors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -793,11 +793,29 @@ spec:
description: |-
port defines the `Pod` port name which exposes the endpoint.

If the pod doesn't expose a port with the same name, it will result
in no targets being discovered.

If a `Pod` has multiple `Port`s with the same name (which is not
recommended), one target instance per unique port number will be
generated.

It takes precedence over the `portNumber` and `targetPort` fields.
type: string
portNumber:
description: portNumber defines the `Pod` port number which
exposes the endpoint.
description: |-
portNumber defines the `Pod` port number which exposes the endpoint.

The `Pod` must declare the specified `Port` in its spec or the
target will be dropped by Prometheus.

This cannot be used to enable scraping of an undeclared port.
To scrape targets on a port which isn't exposed, you need to use
relabeling to override the `__address__` label (but beware of
duplicate targets if the `Pod` has other declared ports).

In practice Prometheus will select targets for which the
matches the target's __meta_kubernetes_pod_container_port_number.
format: int32
maximum: 65535
minimum: 1
Expand Down Expand Up @@ -942,16 +960,12 @@ spec:
type: object
type: array
scheme:
description: |-
scheme defines the HTTP scheme to use for scraping.

`http` and `https` are the expected values unless you rewrite the
`__scheme__` label via relabeling.

If empty, Prometheus uses the default value `http`.
description: scheme defines the HTTP scheme to use for scraping.
enum:
- http
- https
- HTTP
- HTTPS
type: string
scrapeTimeout:
description: |-
Expand Down
18 changes: 12 additions & 6 deletions bundle/manifests/monitoring.rhobs_probes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -757,16 +757,22 @@ spec:
pattern: ^(http|https|socks5)://.+$
type: string
scheme:
description: |-
scheme defines the HTTP scheme to use for scraping.
`http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling.
If empty, Prometheus uses the default value `http`.
description: scheme defines the HTTP scheme to use when scraping
the prober.
enum:
- http
- https
- HTTP
- HTTPS
type: string
url:
description: url defines the mandatory URL of the prober.
description: |-
url defines the address of the prober.

Unlike what the name indicates, the value should be in the form of
`address:port` without any scheme which should be specified in the
`scheme` field.
minLength: 1
type: string
required:
- url
Expand Down
20 changes: 12 additions & 8 deletions bundle/manifests/monitoring.rhobs_prometheusagents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -5498,11 +5498,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned
Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down Expand Up @@ -5679,8 +5680,11 @@ spec:
- V2.0
type: string
metadataConfig:
description: metadataConfig defines how to send a series metadata
to the remote storage.
description: |-
metadataConfig defines how to send a series metadata to the remote storage.

When the field is empty, **no metadata** is sent. But when the field is
null, metadata is sent.
properties:
maxSamplesPerSend:
description: |-
Expand Down Expand Up @@ -6252,7 +6256,7 @@ spec:
x-kubernetes-map-type: atomic
useFIPSSTSEndpoint:
description: |-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
It requires Prometheus >= v2.54.0.
type: boolean
type: object
Expand Down
31 changes: 21 additions & 10 deletions bundle/manifests/monitoring.rhobs_prometheuses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: Experimental-SSA
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -1373,6 +1373,7 @@ spec:
pathPrefix:
description: pathPrefix defines the prefix for the HTTP
path alerts are pushed to.
minLength: 1
type: string
port:
anyOf:
Expand Down Expand Up @@ -1513,7 +1514,13 @@ spec:
type: object
type: array
scheme:
description: scheme to use when firing alerts.
description: scheme defines the HTTP scheme to use when
sending alerts.
enum:
- http
- https
- HTTP
- HTTPS
type: string
sigv4:
description: |-
Expand Down Expand Up @@ -1589,7 +1596,7 @@ spec:
x-kubernetes-map-type: atomic
useFIPSSTSEndpoint:
description: |-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
It requires Prometheus >= v2.54.0.
type: boolean
type: object
Expand Down Expand Up @@ -7081,11 +7088,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned
Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down Expand Up @@ -7262,8 +7270,11 @@ spec:
- V2.0
type: string
metadataConfig:
description: metadataConfig defines how to send a series metadata
to the remote storage.
description: |-
metadataConfig defines how to send a series metadata to the remote storage.

When the field is empty, **no metadata** is sent. But when the field is
null, metadata is sent.
properties:
maxSamplesPerSend:
description: |-
Expand Down Expand Up @@ -7835,7 +7846,7 @@ spec:
x-kubernetes-map-type: atomic
useFIPSSTSEndpoint:
description: |-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
It requires Prometheus >= v2.54.0.
type: boolean
type: object
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/monitoring.rhobs_prometheusrules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down
12 changes: 7 additions & 5 deletions bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -1429,8 +1429,10 @@ spec:
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
scheme:
description: scheme defines the HTTP Scheme default "http"
description: scheme defines the HTTP Scheme.
enum:
- http
- https
- HTTP
- HTTPS
type: string
Expand Down Expand Up @@ -12513,10 +12515,10 @@ spec:
type: object
type: array
scheme:
description: |-
scheme defines the protocol scheme used for requests.
If empty, Prometheus uses HTTP by default.
description: scheme defines the protocol scheme used for requests.
enum:
- http
- https
- HTTP
- HTTPS
type: string
Expand Down
13 changes: 5 additions & 8 deletions bundle/manifests/monitoring.rhobs_servicemonitors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -854,16 +854,13 @@ spec:
type: object
type: array
scheme:
description: |-
scheme defines the HTTP scheme to use for scraping.

`http` and `https` are the expected values unless you rewrite the
`__scheme__` label via relabeling.

If empty, Prometheus uses the default value `http`.
description: scheme defines the HTTP scheme to use when scraping
the metrics.
enum:
- http
- https
- HTTP
- HTTPS
type: string
scrapeTimeout:
description: |-
Expand Down
20 changes: 12 additions & 8 deletions bundle/manifests/monitoring.rhobs_thanosrulers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.86.2-rhobs1
operator.prometheus.io/version: 0.87.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -4841,11 +4841,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned
Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down Expand Up @@ -5022,8 +5023,11 @@ spec:
- V2.0
type: string
metadataConfig:
description: metadataConfig defines how to send a series metadata
to the remote storage.
description: |-
metadataConfig defines how to send a series metadata to the remote storage.

When the field is empty, **no metadata** is sent. But when the field is
null, metadata is sent.
properties:
maxSamplesPerSend:
description: |-
Expand Down Expand Up @@ -5595,7 +5599,7 @@ spec:
x-kubernetes-map-type: atomic
useFIPSSTSEndpoint:
description: |-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
It requires Prometheus >= v2.54.0.
type: boolean
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/part-of: observability-operator
app.kubernetes.io/version: 0.86.2-rhobs1
app.kubernetes.io/version: 0.87.0-rhobs1
name: obo-prometheus-operator-admission-webhook
spec:
minAvailable: 1
Expand Down
Loading