Skip to content

Commit

Permalink
feat: bump Prometheus operator to v0.68.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Simon Pasquier <[email protected]>
  • Loading branch information
@simonpasquier
simonpasquier committed Oct 12, 2023
1 parent f651e67 commit 54e0022
Show file tree
Hide file tree
Showing 19 changed files with 3,654 additions and 1,461 deletions.
2,421 changes: 1,605 additions & 816 deletions bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml
View file

Large diffs are not rendered by default.

275 changes: 218 additions & 57 deletions bundle/manifests/monitoring.rhobs_alertmanagers.yaml
View file

Large diffs are not rendered by default.

66 changes: 35 additions & 31 deletions bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ spec:
as `sigv4`, `basicAuth`, or `oauth2`."
properties:
credentials:
description: The secret's key that contains the credentials
of the request
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -358,11 +358,12 @@ spec:
x-kubernetes-map-type: atomic
credentialsFile:
description: File to read a secret from, mutually exclusive
with Credentials (from SafeAuthorization)
with `credentials`.
type: string
type:
description: Set the authentication type. Defaults to
Bearer, Basic will cause an error
description: "Defines the authentication type. The value
is case-insensitive. \n \"Basic\" is not a supported
value. \n Default: \"Bearer\""
type: string
type: object
basicAuth:
Expand Down Expand Up @@ -414,7 +415,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
bearerToken:
description: "*Warning: this field shouldn't used because
description: "*Warning: this field shouldn't be used because
the token value appears in clear-text. Prefer using `authorization`.*
\n *Deprecated: this will be removed in a future release.*"
type: string
Expand All @@ -436,12 +437,12 @@ spec:
metadata to the remote storage.
properties:
send:
description: Whether metric metadata is sent to the
remote storage or not.
description: Defines whether metric metadata is sent
to the remote storage or not.
type: boolean
sendInterval:
description: How frequently metric metadata is sent
to the remote storage.
description: Defines how frequently metric metadata
is sent to the remote storage.
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
type: object
Expand Down Expand Up @@ -810,16 +811,17 @@ spec:
writeRelabelConfigs:
description: The list of remote write relabel configurations.
items:
description: 'RelabelConfig allows dynamic rewriting of
the label set, being applied to samples before ingestion.
It defines `<metric_relabel_configs>`-section of Prometheus
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
description: "RelabelConfig allows dynamic rewriting of
the label set for targets, alerts, scraped samples and
remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
properties:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
description: "Action to perform based on the regex
matching. \n `Uppercase` and `Lowercase` actions
require Prometheus >= v2.36.0. `DropEqual` and `KeepEqual`
actions require Prometheus >= v2.41.0. \n Default:
\"Replace\""
enum:
- replace
- Replace
Expand All @@ -845,29 +847,29 @@ spec:
- DropEqual
type: string
modulus:
description: Modulus to take of the hash of the source
label values.
description: "Modulus to take of the hash of the source
label values. \n Only applicable when the action
is `HashMod`."
format: int64
type: integer
regex:
description: Regular expression against which the
extracted value is matched. Default is '(.*)'
extracted value is matched.
type: string
replacement:
description: Replacement value against which a regex
replace is performed if the regular expression matches.
Regex capture groups are available. Default is '$1'
description: "Replacement value against which a Replace
action is performed if the regular expression matches.
\n Regex capture groups are available."
type: string
separator:
description: Separator placed between concatenated
source label values. default is ';'.
description: Separator is the string between concatenated
SourceLabels.
type: string
sourceLabels:
description: The source labels select values from
existing labels. Their content is concatenated using
the configured separator and matched against the
configured regular expression for the replace, keep,
and drop actions.
the configured Separator and matched against the
configured regular expression.
items:
description: LabelName is a valid Prometheus label
name which may only contain ASCII letters, numbers,
Expand All @@ -876,9 +878,11 @@ spec:
type: string
type: array
targetLabel:
description: Label to which the resulting value is
written in a replace action. It is mandatory for
replace actions. Regex capture groups are available.
description: "Label to which the resulting string
is written in a replacement. \n It is mandatory
for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
`KeepEqual` and `DropEqual` actions. \n Regex capture
groups are available."
type: string
type: object
type: array
Expand Down
Loading

0 comments on commit 54e0022

Please sign in to comment.