From 204015dc7221d818bf58c0241ff78ce9a8699f06 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Fri, 1 Dec 2023 14:19:51 +0200 Subject: [PATCH] Bump crds to 0.70.0 Signed-off-by: drfaust92 --- charts/prometheus-operator-crds/Chart.yaml | 4 +- .../templates/crd-alertmanagerconfigs.yaml | 375 ++++++++++-------- .../crds/templates/crd-alertmanagers.yaml | 32 +- .../crds/templates/crd-podmonitors.yaml | 190 +++++---- .../charts/crds/templates/crd-probes.yaml | 31 +- .../crds/templates/crd-prometheusagents.yaml | 118 +++++- .../crds/templates/crd-prometheuses.yaml | 150 +++++-- .../crds/templates/crd-prometheusrules.yaml | 7 +- .../crds/templates/crd-scrapeconfigs.yaml | 216 ++++++++-- .../crds/templates/crd-servicemonitors.yaml | 205 +++++----- .../crds/templates/crd-thanosrulers.yaml | 7 +- 11 files changed, 872 insertions(+), 463 deletions(-) diff --git a/charts/prometheus-operator-crds/Chart.yaml b/charts/prometheus-operator-crds/Chart.yaml index 906882f17bce..f689c0c280a4 100644 --- a/charts/prometheus-operator-crds/Chart.yaml +++ b/charts/prometheus-operator-crds/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 type: application -version: 7.0.0 +version: 8.0.0 name: prometheus-operator-crds icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png description: | @@ -9,7 +9,7 @@ description: | keywords: - prometheus - crds -appVersion: v0.69.1 +appVersion: v0.70.0 kubeVersion: ">=1.16.0-0" sources: - https://github.com/prometheus-community/helm-charts diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml index 4b040aa6d0b7..c6b718d1ed8b 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml @@ -1,15 +1,14 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: -{{- with .Values.annotations }} + {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -244,6 +243,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic httpConfig: description: HTTP client configuration. properties: @@ -288,8 +288,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -310,8 +310,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -356,6 +356,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -365,8 +366,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -414,8 +416,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -438,17 +440,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -634,6 +637,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic authSecret: description: The secret's key that contains the CRAM-MD5 secret. The secret needs to be in the same namespace @@ -656,6 +660,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic authUsername: description: The username to use for authentication. type: string @@ -885,8 +890,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -907,8 +912,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -953,6 +958,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -962,8 +968,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -1011,8 +1018,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -1035,17 +1042,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -1216,6 +1224,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic required: - webhookUrl type: object @@ -1257,6 +1266,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiURL: description: The URL to send OpsGenie API requests to. type: string @@ -1329,8 +1339,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -1351,8 +1361,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -1397,6 +1407,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -1406,8 +1417,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -1455,8 +1467,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -1479,17 +1491,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -1777,8 +1790,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -1799,8 +1812,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -1845,6 +1858,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -1854,8 +1868,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -1903,8 +1918,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -1927,17 +1942,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -2140,6 +2156,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic sendResolved: description: Whether or not to notify about resolved alerts. type: boolean @@ -2167,6 +2184,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic severity: description: Severity of the incident. type: string @@ -2181,6 +2199,10 @@ spec: description: PushoverConfig configures notifications via Pushover. See https://prometheus.io/docs/alerting/latest/configuration/#pushover_config properties: + device: + description: The name of a device to send the notification + to + type: string expire: description: How long your notification will continue to be retried for, unless the user acknowledges the @@ -2235,8 +2257,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -2257,8 +2279,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -2303,6 +2325,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -2312,8 +2335,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -2361,8 +2385,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -2385,17 +2409,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -2584,6 +2609,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic tokenFile: description: The token file that contains the registered application's API token, see https://pushover.net/apps. @@ -2620,6 +2646,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic userKeyFile: description: The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is @@ -2702,6 +2729,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic callbackId: type: string channel: @@ -2783,8 +2811,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -2805,8 +2833,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -2851,6 +2879,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -2860,8 +2889,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -2909,8 +2939,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -2933,17 +2963,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -3177,8 +3208,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -3199,8 +3230,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -3245,6 +3276,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -3254,8 +3286,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -3303,8 +3336,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -3327,17 +3360,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -3604,6 +3638,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic botTokenFile: description: "File to read the Telegram bot token from. It is mutually exclusive with `botToken`. Either `botToken` @@ -3661,8 +3696,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -3683,8 +3718,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -3729,6 +3764,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -3738,8 +3774,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -3787,8 +3824,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -3811,17 +3848,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -4007,6 +4045,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiUrl: description: The VictorOps API URL. type: string @@ -4074,8 +4113,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -4096,8 +4135,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -4142,6 +4181,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -4151,8 +4191,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -4200,8 +4241,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -4224,17 +4265,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -4454,8 +4496,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -4476,8 +4518,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -4522,6 +4564,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -4531,8 +4574,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -4580,8 +4624,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -4604,17 +4648,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -4822,8 +4867,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -4844,8 +4889,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -4890,6 +4935,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -4899,8 +4945,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -4948,8 +4995,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -4972,17 +5019,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: @@ -5163,6 +5211,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object type: array wechatConfigs: @@ -5195,6 +5244,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiURL: description: The WeChat API URL. type: string @@ -5245,8 +5295,8 @@ spec: BasicAuth takes precedence. properties: password: - description: The secret in the service monitor - namespace that contains the password for authentication. + description: '`password` specifies a key of a + Secret containing the password for authentication.' properties: key: description: The key of the secret to select @@ -5267,8 +5317,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor - namespace that contains the username for authentication. + description: '`username` specifies a key of a + Secret containing the username for authentication.' properties: key: description: The key of the secret to select @@ -5313,6 +5363,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. @@ -5322,8 +5373,9 @@ spec: a token for the targets. properties: clientId: - description: The secret or configmap containing - the OAuth2 client id + description: '`clientId` specifies a key of a + Secret or ConfigMap containing the OAuth2 client''s + ID.' properties: configMap: description: ConfigMap containing data to @@ -5371,8 +5423,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 - client secret + description: '`clientSecret` specifies a key of + a Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select @@ -5395,17 +5447,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token - URL + description: '`endpointParams` configures the + HTTP parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token - request + description: '`scopes` defines the OAuth2 scopes + used for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to + fetch the token from.' minLength: 1 type: string required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml index 0acf847614b5..6f931e2c033e 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1065,8 +1064,8 @@ spec: takes precedence. properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret + containing the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1087,8 +1086,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret + containing the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1141,8 +1140,8 @@ spec: token for the targets. properties: clientId: - description: The secret or configmap containing the - OAuth2 client id + description: '`clientId` specifies a key of a Secret + or ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use @@ -1189,8 +1188,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client - secret + description: '`clientSecret` specifies a key of a + Secret containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -1213,15 +1212,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP + parameters to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used + for the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch + the token from.' minLength: 1 type: string required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml index e9d8877b597d..24ad4e28e673 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -46,16 +45,23 @@ spec: by Prometheus. properties: attachMetadata: - description: Attaches node metadata to discovered targets. Requires - Prometheus v2.35.0 and above. + description: "`attachMetadata` defines additional metadata which is + added to the discovered targets. \n It requires Prometheus >= v2.37.0." properties: node: - description: When set to true, Prometheus must have permissions - to get Nodes. + description: When set to true, Prometheus must have the `get` + permission on the `Nodes` objects. type: boolean type: object jobLabel: - description: The label to use to retrieve the job name from. + description: "The label to use to retrieve the job name from. `jobLabel` + selects the label from the associated Kubernetes `Pod` object which + will be used as the `job` label for all metrics. \n For example + if `jobLabel` is set to `foo` and the Kubernetes `Pod` object is + labeled with `foo: bar`, then Prometheus adds the `job=\"bar\"` + label to all ingested metrics. \n If the value of this field is + empty, the `job` label of the metrics defaults to the namespace + and name of the PodMonitor object (e.g. `/`)." type: string keepDroppedTargets: description: "Per-scrape limit on the number of targets dropped by @@ -64,25 +70,23 @@ spec: format: int64 type: integer labelLimit: - description: Per-scrape limit on number of labels that will be accepted - for a sample. Only valid in Prometheus versions 2.27.0 and newer. + description: "Per-scrape limit on number of labels that will be accepted + for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer labelNameLengthLimit: - description: Per-scrape limit on length of labels name that will be - accepted for a sample. Only valid in Prometheus versions 2.27.0 - and newer. + description: "Per-scrape limit on length of labels name that will + be accepted for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer labelValueLengthLimit: - description: Per-scrape limit on length of labels value that will - be accepted for a sample. Only valid in Prometheus versions 2.27.0 - and newer. + description: "Per-scrape limit on length of labels value that will + be accepted for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer namespaceSelector: - description: Selector to select which namespaces the Endpoints objects - are discovered from. + description: Selector to select which namespaces the Kubernetes `Pods` + objects are discovered from. properties: any: description: Boolean describing whether all namespaces are selected @@ -95,13 +99,15 @@ spec: type: array type: object podMetricsEndpoints: - description: A list of endpoints allowed as part of this PodMonitor. + description: List of endpoints part of this PodMonitor. items: - description: PodMetricsEndpoint defines a scrapeable endpoint of - a Kubernetes Pod serving Prometheus metrics. + description: PodMetricsEndpoint defines an endpoint serving Prometheus + metrics to be scraped by Prometheus. properties: authorization: - description: Authorization section for this endpoint + description: "`authorization` configures the Authorization header + credentials to use when scraping the target. \n Cannot be + set at the same time as `basicAuth`, or `oauth2`." properties: credentials: description: Selects a key of a Secret in the namespace @@ -130,12 +136,13 @@ spec: type: string type: object basicAuth: - description: 'BasicAuth allow an endpoint to authenticate over - basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' + description: "`basicAuth` configures the Basic Authentication + credentials to use when scraping the target. \n Cannot be + set at the same time as `authorization`, or `oauth2`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -154,8 +161,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -175,9 +182,11 @@ spec: x-kubernetes-map-type: atomic type: object bearerTokenSecret: - description: Secret to mount to read bearer token for scraping - targets. The secret needs to be in the same namespace as the - pod monitor and accessible by the Prometheus Operator. + description: "`bearerTokenSecret` specifies a key of a Secret + containing the bearer token for scraping targets. The secret + needs to be in the same namespace as the PodMonitor object + and readable by the Prometheus Operator. \n Deprecated: use + `authorization` instead." properties: key: description: The key of the secret to select from. Must @@ -196,32 +205,36 @@ spec: type: object x-kubernetes-map-type: atomic enableHttp2: - description: Whether to enable HTTP2. + description: '`enableHttp2` can be used to disable HTTP2 when + scraping the target.' type: boolean filterRunning: - description: 'Drop pods that are not running. (Failed, Succeeded). - Enabled by default. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase' + description: "When true, the pods which are not running (e.g. + either in Failed or Succeeded state) are dropped during the + target discovery. \n If unset, the filtering is enabled. \n + More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase" type: boolean followRedirects: - description: FollowRedirects configures whether scrape requests - follow HTTP 3xx redirects. + description: '`followRedirects` defines whether the scrape requests + should follow HTTP 3xx redirects.' type: boolean honorLabels: - description: HonorLabels chooses the metric's labels on collisions - with target labels. + description: When true, `honorLabels` preserves the metric's + labels when they collide with the target's labels. type: boolean honorTimestamps: - description: HonorTimestamps controls whether Prometheus respects - the timestamps present in scraped data. + description: '`honorTimestamps` controls whether Prometheus + preserves the timestamps when exposed by the target.' type: boolean interval: - description: Interval at which metrics should be scraped If - not specified Prometheus' global scrape interval is used. + description: "Interval at which Prometheus scrapes the metrics + from the target. \n If empty, Prometheus uses the global scrape + interval." 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 metricRelabelings: - description: MetricRelabelConfigs to apply to samples before - ingestion. + description: '`metricRelabelings` configures the relabeling + rules to apply to the samples before ingestion.' items: description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote @@ -297,12 +310,13 @@ spec: type: object type: array oauth2: - description: OAuth2 for the URL. Only valid in Prometheus versions - 2.27.0 and newer. + description: "`oauth2` configures the OAuth2 settings to use + when scraping the target. \n It requires Prometheus >= 2.27.0. + \n Cannot be set at the same time as `authorization`, or `basicAuth`." properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -346,7 +360,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -367,15 +382,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: @@ -388,26 +406,27 @@ spec: items: type: string type: array - description: Optional HTTP URL parameters + description: '`params` define optional HTTP URL parameters.' type: object path: - description: HTTP path to scrape for metrics. If empty, Prometheus - uses the default value (e.g. `/metrics`). + description: "HTTP path from which to scrape for metrics. \n + If empty, Prometheus uses the default value (e.g. `/metrics`)." type: string port: - description: Name of the pod port this endpoint refers to. Mutually - exclusive with targetPort. + description: "Name of the Pod port which this endpoint refers + to. \n It takes precedence over `targetPort`." type: string proxyUrl: - description: ProxyURL eg http://proxyserver:2195 Directs scrapes - to proxy through this endpoint. + description: '`proxyURL` configures the HTTP Proxy URL (e.g. + "http://proxyserver:2195") to go through when scraping the + target.' type: string relabelings: - description: 'RelabelConfigs to apply to samples before scraping. - Prometheus Operator automatically adds relabelings for a few - standard Kubernetes fields. The original scrape job''s name - is available via the `__tmp_prometheus_job_name` label. More - info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + description: "`relabelings` configures the relabeling rules + to apply the target's metadata labels. \n The Operator automatically + adds relabelings for a few standard Kubernetes fields. \n + The original scrape job's name is available via the `__tmp_prometheus_job_name` + label. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config" items: description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote @@ -483,27 +502,31 @@ spec: type: object type: array scheme: - description: 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: "HTTP scheme to use for scraping. \n `http` and + `https` are the expected values unless you rewrite the `__scheme__` + label via relabeling. \n If empty, Prometheus uses the default + value `http`." enum: - http - https type: string scrapeTimeout: - description: Timeout after which the scrape is ended If not - specified, the Prometheus global scrape interval is used. + description: "Timeout after which Prometheus considers the scrape + to be failed. \n If empty, Prometheus uses the global scrape + timeout unless it is less than the target's scrape interval + value in which the latter is used." 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 targetPort: anyOf: - type: integer - type: string - description: 'Deprecated: Use ''port'' instead.' + description: "Name or number of the target port of the `Pod` + object behind the Service, the port must be specified with + container port property. \n Deprecated: use 'port' instead." x-kubernetes-int-or-string: true tlsConfig: - description: TLS configuration to use when scraping the endpoint. + description: TLS configuration to use when scraping the target. properties: ca: description: Certificate authority used when verifying server @@ -621,21 +644,27 @@ spec: description: Used to verify the hostname for the targets. type: string type: object + trackTimestampsStaleness: + description: "`trackTimestampsStaleness` defines whether Prometheus + tracks staleness of the metrics that have an explicit timestamp + present in scraped data. Has no effect if `honorTimestamps` + is false. \n It requires Prometheus >= v2.48.0." + type: boolean type: object type: array podTargetLabels: - description: PodTargetLabels transfers labels on the Kubernetes Pod - onto the target. + description: '`podTargetLabels` defines the labels which are transferred + from the associated Kubernetes `Pod` object onto the ingested metrics.' items: type: string type: array sampleLimit: - description: SampleLimit defines per-scrape limit on number of scraped - samples that will be accepted. + description: '`sampleLimit` defines a per-scrape limit on the number + of scraped samples that will be accepted.' format: int64 type: integer selector: - description: Selector to select Pod objects. + description: Label selector to select the Kubernetes `Pod` objects. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. @@ -680,12 +709,11 @@ spec: type: object x-kubernetes-map-type: atomic targetLimit: - description: TargetLimit defines a limit on the number of scraped - targets that will be accepted. + description: '`targetLimit` defines a limit on the number of scraped + targets that will be accepted.' format: int64 type: integer required: - - podMetricsEndpoints - selector type: object required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml index 54f1a96c7f38..d8a9e59e5b97 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -78,8 +77,8 @@ spec: authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' properties: password: - description: The secret in the service monitor namespace that - contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must be @@ -98,8 +97,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace that - contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must be @@ -251,8 +250,8 @@ spec: 2.27.0 and newer. properties: clientId: - description: The secret or configmap containing the OAuth2 client - id + description: '`clientId` specifies a key of a Secret or ConfigMap + containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the targets. @@ -293,7 +292,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret containing + the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must be @@ -314,15 +314,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for the + token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the token + from.' minLength: 1 type: string required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml index e4fadbae649d..9cb4e76cc243 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -999,8 +998,8 @@ spec: `bearerTokenFile`." properties: password: - description: The secret in the service monitor namespace that - contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1019,8 +1018,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace that - contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4089,6 +4088,28 @@ spec: description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. type: boolean + persistentVolumeClaimRetentionPolicy: + description: The field controls if and how PVCs are deleted during + the lifecycle of a StatefulSet. The default behavior is all PVCs + are retained. This is an alpha field from kubernetes 1.23 until + 1.26 and a beta field from 1.26. It requires enabling the StatefulSetAutoDeletePVC + feature gate. + properties: + whenDeleted: + description: WhenDeleted specifies what happens to PVCs created + from StatefulSet VolumeClaimTemplates when the StatefulSet is + deleted. The default policy of `Retain` causes PVCs to not be + affected by StatefulSet deletion. The `Delete` policy causes + those PVCs to be deleted. + type: string + whenScaled: + description: WhenScaled specifies what happens to PVCs created + from StatefulSet VolumeClaimTemplates when the StatefulSet is + scaled down. The default policy of `Retain` causes PVCs to not + be affected by a scaledown. The `Delete` policy causes the associated + PVCs for any excess pods above the replica count to be deleted. + type: string + type: object podMetadata: description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are @@ -4350,6 +4371,14 @@ spec: when the field is set to the empty string (`\"\"`). \n Default: \"prometheus\"" type: string + reloadStrategy: + description: Defines the strategy used to reload the Prometheus configuration. + If not specified, the configuration is reloaded using the /-/reload + HTTP endpoint. + enum: + - HTTP + - ProcessSignal + type: string remoteWrite: description: Defines the list of remote write configurations. items: @@ -4406,7 +4435,7 @@ spec: type: string managedIdentity: description: ManagedIdentity defines the Azure User-assigned - Managed identity. + Managed identity. Cannot be set at the same time as `oauth`. properties: clientId: description: The client id @@ -4414,8 +4443,51 @@ spec: required: - clientId type: object - required: - - managedIdentity + oauth: + description: "OAuth defines the oauth config that is being + used to authenticate. Cannot be set at the same time as + `managedIdentity`. \n It requires Prometheus >= v2.48.0." + properties: + clientId: + description: '`clientID` is the clientId of the Azure + Active Directory application that is being used to + authenticate.' + minLength: 1 + type: string + clientSecret: + description: '`clientSecret` specifies a key of a Secret + containing the client secret of the Azure Active Directory + application that is being used to authenticate.' + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + tenantId: + description: '`tenantID` is the tenant ID of the Azure + Active Directory application that is being used to + authenticate.' + minLength: 1 + pattern: ^[0-9a-zA-Z-.]+$ + type: string + required: + - clientId + - clientSecret + - tenantId + type: object type: object basicAuth: description: "BasicAuth configuration for the URL. \n Cannot @@ -4423,8 +4495,8 @@ spec: or `azureAd`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4443,8 +4515,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4507,8 +4579,8 @@ spec: `sigv4`, `authorization`, `basicAuth`, or `azureAd`." properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -4552,7 +4624,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -4573,15 +4646,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml index 31f1289fa763..e41a3a66c45f 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1060,8 +1059,8 @@ spec: `authorization` or `sigv4`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret + containing the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1081,8 +1080,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret + containing the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1397,8 +1396,8 @@ spec: `bearerTokenFile`." properties: password: - description: The secret in the service monitor namespace that - contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -1417,8 +1416,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace that - contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4520,6 +4519,28 @@ spec: description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. type: boolean + persistentVolumeClaimRetentionPolicy: + description: The field controls if and how PVCs are deleted during + the lifecycle of a StatefulSet. The default behavior is all PVCs + are retained. This is an alpha field from kubernetes 1.23 until + 1.26 and a beta field from 1.26. It requires enabling the StatefulSetAutoDeletePVC + feature gate. + properties: + whenDeleted: + description: WhenDeleted specifies what happens to PVCs created + from StatefulSet VolumeClaimTemplates when the StatefulSet is + deleted. The default policy of `Retain` causes PVCs to not be + affected by StatefulSet deletion. The `Delete` policy causes + those PVCs to be deleted. + type: string + whenScaled: + description: WhenScaled specifies what happens to PVCs created + from StatefulSet VolumeClaimTemplates when the StatefulSet is + scaled down. The default policy of `Retain` causes PVCs to not + be affected by a scaledown. The `Delete` policy causes the associated + PVCs for any excess pods above the replica count to be deleted. + type: string + type: object podMetadata: description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are @@ -4838,6 +4859,14 @@ spec: can be set to a standard I/O stream, e.g. `/dev/stdout`, to log query information to the default Prometheus log stream." type: string + reloadStrategy: + description: Defines the strategy used to reload the Prometheus configuration. + If not specified, the configuration is reloaded using the /-/reload + HTTP endpoint. + enum: + - HTTP + - ProcessSignal + type: string remoteRead: description: Defines the list of remote read configurations. items: @@ -4884,8 +4913,8 @@ spec: be set at the same time as `authorization`, or `oauth2`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4904,8 +4933,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -4963,8 +4992,8 @@ spec: `authorization`, or `basicAuth`." properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -5008,7 +5037,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -5029,15 +5059,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: @@ -5256,7 +5289,7 @@ spec: type: string managedIdentity: description: ManagedIdentity defines the Azure User-assigned - Managed identity. + Managed identity. Cannot be set at the same time as `oauth`. properties: clientId: description: The client id @@ -5264,8 +5297,51 @@ spec: required: - clientId type: object - required: - - managedIdentity + oauth: + description: "OAuth defines the oauth config that is being + used to authenticate. Cannot be set at the same time as + `managedIdentity`. \n It requires Prometheus >= v2.48.0." + properties: + clientId: + description: '`clientID` is the clientId of the Azure + Active Directory application that is being used to + authenticate.' + minLength: 1 + type: string + clientSecret: + description: '`clientSecret` specifies a key of a Secret + containing the client secret of the Azure Active Directory + application that is being used to authenticate.' + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + tenantId: + description: '`tenantID` is the tenant ID of the Azure + Active Directory application that is being used to + authenticate.' + minLength: 1 + pattern: ^[0-9a-zA-Z-.]+$ + type: string + required: + - clientId + - clientSecret + - tenantId + type: object type: object basicAuth: description: "BasicAuth configuration for the URL. \n Cannot @@ -5273,8 +5349,8 @@ spec: or `azureAd`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -5293,8 +5369,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -5357,8 +5433,8 @@ spec: `sigv4`, `authorization`, `basicAuth`, or `azureAd`." properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -5402,7 +5478,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -5423,15 +5500,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml index b533e3b58212..1929da72bae1 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml index e048fedea3be..7b8cfd3fa5c5 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -74,12 +73,79 @@ spec: \n \"Basic\" is not a supported value. \n Default: \"Bearer\"" type: string type: object + azureSDConfigs: + description: AzureSDConfigs defines a list of Azure service discovery + configurations. + items: + description: AzureSDConfig allow retrieving scrape targets from + Azure VMs. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config + properties: + authenticationMethod: + description: '# The authentication method, either OAuth or ManagedIdentity. + See https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview' + enum: + - OAuth + - ManagedIdentity + type: string + clientID: + description: Optional client ID. Only required with the OAuth + authentication method. + type: string + clientSecret: + description: Optional client secret. Only required with the + OAuth authentication method. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + environment: + description: The Azure environment. + type: string + port: + description: The port to scrape metrics from. If using the public + IP address, this must instead be specified in the relabeling + rule. + type: integer + refreshInterval: + description: RefreshInterval configures the refresh interval + at which Prometheus will re-read the instance list. + 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 + resourceGroup: + description: Optional resource group name. Limits discovery + to this resource group. + type: string + subscriptionID: + description: The subscription ID. Always required. + minLength: 1 + type: string + tenantID: + description: Optional tenant ID. Only required with the OAuth + authentication method. + type: string + required: + - subscriptionID + type: object + type: array basicAuth: description: BasicAuth information to use on every scrape request. properties: password: - description: The secret in the service monitor namespace that - contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must be @@ -98,8 +164,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace that - contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must be @@ -125,7 +191,7 @@ spec: description: ConsulSDConfig defines a Consul service discovery configuration See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#consul_sd_config properties: - allow_stale: + allowStale: description: Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul. If unset, Prometheus uses its default value. @@ -165,8 +231,8 @@ spec: the Consul Server. More info: https://prometheus.io/docs/operating/configuration/#endpoints' properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -185,8 +251,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -209,23 +275,23 @@ spec: description: Consul Datacenter name, if not provided it will use the local Consul Agent Datacenter. type: string - enable_http2: + enableHTTP2: description: Whether to enable HTTP2. If unset, Prometheus uses its default value. type: boolean - follow_redirects: + followRedirects: description: Configure whether HTTP requests follow HTTP 3xx redirects. If unset, Prometheus uses its default value. type: boolean namespace: description: Namespaces are only supported in Consul Enterprise. type: string - no_proxy: + noProxy: description: Comma-separated string that can contain IPs, CIDR notation, domain names that should be excluded from proxying. IP and domain names can contain port numbers. type: string - node_meta: + nodeMeta: additionalProperties: type: string description: Node metadata key/value pairs to filter nodes for @@ -236,8 +302,8 @@ spec: description: Optional OAuth 2.0 configuration. properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -281,7 +347,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -302,15 +369,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: @@ -321,7 +391,7 @@ spec: partition: description: Admin Partitions are only supported in Consul Enterprise. type: string - proxy_connect_header: + proxyConnectHeader: additionalProperties: description: SecretKeySelector selects a key of a Secret. properties: @@ -340,19 +410,20 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic description: Specifies headers to send to proxies during CONNECT requests. type: object x-kubernetes-map-type: atomic - proxy_from_environment: + proxyFromEnvironment: description: Use proxy URL indicated by environment variables (HTTP_PROXY, https_proxy, HTTPs_PROXY, https_proxy, and no_proxy) If unset, Prometheus uses its default value. type: boolean - proxy_url: + proxyUrl: description: Optional proxy URL. type: string - refresh_interval: + refreshInterval: description: The time after which the provided names are refreshed. On large setup it might be a good idea to increase this value because the catalog will change all the time. If unset, Prometheus @@ -377,7 +448,7 @@ spec: type: string type: array x-kubernetes-list-type: atomic - tag_separator: + tagSeparator: description: The string by which Consul tags are joined into the tag label. If unset, Prometheus uses its default value. type: string @@ -526,6 +597,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic required: - server type: object @@ -596,6 +668,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic filters: description: 'Filters can be used optionally to filter the instance list by other criteria. Available filter criteria can be found @@ -650,6 +723,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object type: array fileSDConfigs: @@ -680,6 +754,55 @@ spec: - files type: object type: array + gceSDConfigs: + description: GCESDConfigs defines a list of GCE service discovery + configurations. + items: + description: "GCESDConfig configures scrape targets from GCP GCE + instances. The private IP address is used by default, but may + be changed to the public IP address with relabeling. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#gce_sd_config + \n The GCE service discovery will load the Google Cloud credentials + from the file specified by the GOOGLE_APPLICATION_CREDENTIALS + environment variable. See https://cloud.google.com/kubernetes-engine/docs/tutorials/authenticating-to-cloud-platform + \n A pre-requisite for using GCESDConfig is that a Secret containing + valid Google Cloud credentials is mounted into the Prometheus + or PrometheusAgent pod via the `.spec.secrets` field and that + the GOOGLE_APPLICATION_CREDENTIALS environment variable is set + to /etc/prometheus/secrets//." + properties: + filter: + description: 'Filter can be used optionally to filter the instance + list by other criteria Syntax of this filter is described + in the filter query parameter section: https://cloud.google.com/compute/docs/reference/latest/instances/list' + type: string + port: + description: The port to scrape metrics from. If using the public + IP address, this must instead be specified in the relabeling + rule. + type: integer + project: + description: The Google Cloud Project ID + minLength: 1 + type: string + refreshInterval: + description: RefreshInterval configures the refresh interval + at which Prometheus will re-read the instance list. + 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 + tagSeparator: + description: The tag separator is used to separate the tags + on concatenation + type: string + zone: + description: The zone of the scrape targets. If you need multiple + zones use multiple GCESDConfigs. + minLength: 1 + type: string + required: + - project + - zone + type: object + type: array honorLabels: description: HonorLabels chooses the metric's labels on collisions with target labels. @@ -730,8 +853,8 @@ spec: the target HTTP endpoint. More info: https://prometheus.io/docs/operating/configuration/#endpoints' properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -750,8 +873,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -923,6 +1046,16 @@ spec: enum: - Node - node + - Service + - service + - Pod + - pod + - Endpoints + - endpoints + - EndpointSlice + - endpointslice + - Ingress + - ingress type: string selectors: description: Selector to select objects. @@ -934,11 +1067,20 @@ spec: label: type: string role: - description: K8SRole is role of the service in Kubernetes. - Currently the only supported role is "Node". + description: Role is role of the service in Kubernetes. enum: - Node - node + - Service + - service + - Pod + - pod + - Endpoints + - endpoints + - EndpointSlice + - endpointslice + - Ingress + - ingress type: string required: - role @@ -1289,6 +1431,12 @@ spec: description: Used to verify the hostname for the targets. type: string type: object + trackTimestampsStaleness: + description: TrackTimestampsStaleness whether Prometheus tracks staleness + of the metrics that have an explicit timestamp present in scraped + data. Has no effect if `honorTimestamps` is false. It requires Prometheus + >= v2.48.0. + type: boolean type: object required: - spec diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml index 71c201de3c64..c5a535c9ba21 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -46,22 +45,24 @@ spec: by Prometheus. properties: attachMetadata: - description: Attaches node metadata to discovered targets. Requires - Prometheus v2.37.0 and above. + description: "`attachMetadata` defines additional metadata which is + added to the discovered targets. \n It requires Prometheus >= v2.37.0." properties: node: - description: When set to true, Prometheus must have permissions - to get Nodes. + description: When set to true, Prometheus must have the `get` + permission on the `Nodes` objects. type: boolean type: object endpoints: - description: A list of endpoints allowed as part of this ServiceMonitor. + description: List of endpoints part of this ServiceMonitor. items: - description: Endpoint defines a scrapeable endpoint serving Prometheus - metrics. + description: Endpoint defines an endpoint serving Prometheus metrics + to be scraped by Prometheus. properties: authorization: - description: Authorization section for this endpoint + description: "`authorization` configures the Authorization header + credentials to use when scraping the target. \n Cannot be + set at the same time as `basicAuth`, or `oauth2`." properties: credentials: description: Selects a key of a Secret in the namespace @@ -90,12 +91,13 @@ spec: type: string type: object basicAuth: - description: 'BasicAuth allow an endpoint to authenticate over - basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints' + description: "`basicAuth` configures the Basic Authentication + credentials to use when scraping the target. \n Cannot be + set at the same time as `authorization`, or `oauth2`." properties: password: - description: The secret in the service monitor namespace - that contains the password for authentication. + description: '`password` specifies a key of a Secret containing + the password for authentication.' properties: key: description: The key of the secret to select from. Must @@ -114,8 +116,8 @@ spec: type: object x-kubernetes-map-type: atomic username: - description: The secret in the service monitor namespace - that contains the username for authentication. + description: '`username` specifies a key of a Secret containing + the username for authentication.' properties: key: description: The key of the secret to select from. Must @@ -135,12 +137,15 @@ spec: x-kubernetes-map-type: atomic type: object bearerTokenFile: - description: File to read bearer token for scraping targets. + description: "File to read bearer token for scraping the target. + \n Deprecated: use `authorization` instead." type: string bearerTokenSecret: - description: Secret to mount to read bearer token for scraping - targets. The secret needs to be in the same namespace as the - service monitor and accessible by the Prometheus Operator. + description: "`bearerTokenSecret` specifies a key of a Secret + containing the bearer token for scraping targets. The secret + needs to be in the same namespace as the ServiceMonitor object + and readable by the Prometheus Operator. \n Deprecated: use + `authorization` instead." properties: key: description: The key of the secret to select from. Must @@ -159,32 +164,36 @@ spec: type: object x-kubernetes-map-type: atomic enableHttp2: - description: Whether to enable HTTP2. + description: '`enableHttp2` can be used to disable HTTP2 when + scraping the target.' type: boolean filterRunning: - description: 'Drop pods that are not running. (Failed, Succeeded). - Enabled by default. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase' + description: "When true, the pods which are not running (e.g. + either in Failed or Succeeded state) are dropped during the + target discovery. \n If unset, the filtering is enabled. \n + More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase" type: boolean followRedirects: - description: FollowRedirects configures whether scrape requests - follow HTTP 3xx redirects. + description: '`followRedirects` defines whether the scrape requests + should follow HTTP 3xx redirects.' type: boolean honorLabels: - description: HonorLabels chooses the metric's labels on collisions - with target labels. + description: When true, `honorLabels` preserves the metric's + labels when they collide with the target's labels. type: boolean honorTimestamps: - description: HonorTimestamps controls whether Prometheus respects - the timestamps present in scraped data. + description: '`honorTimestamps` controls whether Prometheus + preserves the timestamps when exposed by the target.' type: boolean interval: - description: Interval at which metrics should be scraped If - not specified Prometheus' global scrape interval is used. + description: "Interval at which Prometheus scrapes the metrics + from the target. \n If empty, Prometheus uses the global scrape + interval." 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 metricRelabelings: - description: MetricRelabelConfigs to apply to samples before - ingestion. + description: '`metricRelabelings` configures the relabeling + rules to apply to the samples before ingestion.' items: description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote @@ -260,12 +269,13 @@ spec: type: object type: array oauth2: - description: OAuth2 for the URL. Only valid in Prometheus versions - 2.27.0 and newer. + description: "`oauth2` configures the OAuth2 settings to use + when scraping the target. \n It requires Prometheus >= 2.27.0. + \n Cannot be set at the same time as `authorization`, or `basicAuth`." properties: clientId: - description: The secret or configmap containing the OAuth2 - client id + description: '`clientId` specifies a key of a Secret or + ConfigMap containing the OAuth2 client''s ID.' properties: configMap: description: ConfigMap containing data to use for the @@ -309,7 +319,8 @@ spec: x-kubernetes-map-type: atomic type: object clientSecret: - description: The secret containing the OAuth2 client secret + description: '`clientSecret` specifies a key of a Secret + containing the OAuth2 client''s secret.' properties: key: description: The key of the secret to select from. Must @@ -330,15 +341,18 @@ spec: endpointParams: additionalProperties: type: string - description: Parameters to append to the token URL + description: '`endpointParams` configures the HTTP parameters + to append to the token URL.' type: object scopes: - description: OAuth2 scopes used for the token request + description: '`scopes` defines the OAuth2 scopes used for + the token request.' items: type: string type: array tokenUrl: - description: The URL to fetch the token from + description: '`tokenURL` configures the URL to fetch the + token from.' minLength: 1 type: string required: @@ -351,26 +365,27 @@ spec: items: type: string type: array - description: Optional HTTP URL parameters + description: params define optional HTTP URL parameters. type: object path: - description: HTTP path to scrape for metrics. If empty, Prometheus - uses the default value (e.g. `/metrics`). + description: "HTTP path from which to scrape for metrics. \n + If empty, Prometheus uses the default value (e.g. `/metrics`)." type: string port: - description: Name of the service port this endpoint refers to. - Mutually exclusive with targetPort. + description: "Name of the Service port which this endpoint refers + to. \n It takes precedence over `targetPort`." type: string proxyUrl: - description: ProxyURL eg http://proxyserver:2195 Directs scrapes - to proxy through this endpoint. + description: '`proxyURL` configures the HTTP Proxy URL (e.g. + "http://proxyserver:2195") to go through when scraping the + target.' type: string relabelings: - description: 'RelabelConfigs to apply to samples before scraping. - Prometheus Operator automatically adds relabelings for a few - standard Kubernetes fields. The original scrape job''s name - is available via the `__tmp_prometheus_job_name` label. More - info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + description: "`relabelings` configures the relabeling rules + to apply the target's metadata labels. \n The Operator automatically + adds relabelings for a few standard Kubernetes fields. \n + The original scrape job's name is available via the `__tmp_prometheus_job_name` + label. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config" items: description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote @@ -446,30 +461,31 @@ spec: type: object type: array scheme: - description: 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: "HTTP scheme to use for scraping. \n `http` and + `https` are the expected values unless you rewrite the `__scheme__` + label via relabeling. \n If empty, Prometheus uses the default + value `http`." enum: - http - https type: string scrapeTimeout: - description: Timeout after which the scrape is ended If not - specified, the Prometheus global scrape timeout is used unless - it is less than `Interval` in which the latter is used. + description: "Timeout after which Prometheus considers the scrape + to be failed. \n If empty, Prometheus uses the global scrape + timeout unless it is less than the target's scrape interval + value in which the latter is used." 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 targetPort: anyOf: - type: integer - type: string - description: Name or number of the target port of the Pod behind - the Service, the port must be specified with container port - property. Mutually exclusive with port. + description: "Name or number of the target port of the `Pod` + object behind the Service, the port must be specified with + container port property. \n Deprecated: use `port` instead." x-kubernetes-int-or-string: true tlsConfig: - description: TLS configuration to use when scraping the endpoint + description: TLS configuration to use when scraping the target. properties: ca: description: Certificate authority used when verifying server @@ -599,16 +615,23 @@ spec: description: Used to verify the hostname for the targets. type: string type: object + trackTimestampsStaleness: + description: "`trackTimestampsStaleness` defines whether Prometheus + tracks staleness of the metrics that have an explicit timestamp + present in scraped data. Has no effect if `honorTimestamps` + is false. \n It requires Prometheus >= v2.48.0." + type: boolean type: object type: array jobLabel: - description: "JobLabel selects the label from the associated Kubernetes - service which will be used as the `job` label for all metrics. \n - For example: If in `ServiceMonitor.spec.jobLabel: foo` and in `Service.metadata.labels.foo: - bar`, then the `job=\"bar\"` label is added to all metrics. \n If - the value of this field is empty or if the label doesn't exist for - the given Service, the `job` label of the metrics defaults to the - name of the Kubernetes Service." + description: "`jobLabel` selects the label from the associated Kubernetes + `Service` object which will be used as the `job` label for all metrics. + \n For example if `jobLabel` is set to `foo` and the Kubernetes + `Service` object is labeled with `foo: bar`, then Prometheus adds + the `job=\"bar\"` label to all ingested metrics. \n If the value + of this field is empty or if the label doesn't exist for the given + Service, the `job` label of the metrics defaults to the name of + the associated Kubernetes `Service`." type: string keepDroppedTargets: description: "Per-scrape limit on the number of targets dropped by @@ -617,24 +640,22 @@ spec: format: int64 type: integer labelLimit: - description: Per-scrape limit on number of labels that will be accepted - for a sample. Only valid in Prometheus versions 2.27.0 and newer. + description: "Per-scrape limit on number of labels that will be accepted + for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer labelNameLengthLimit: - description: Per-scrape limit on length of labels name that will be - accepted for a sample. Only valid in Prometheus versions 2.27.0 - and newer. + description: "Per-scrape limit on length of labels name that will + be accepted for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer labelValueLengthLimit: - description: Per-scrape limit on length of labels value that will - be accepted for a sample. Only valid in Prometheus versions 2.27.0 - and newer. + description: "Per-scrape limit on length of labels value that will + be accepted for a sample. \n It requires Prometheus >= v2.27.0." format: int64 type: integer namespaceSelector: - description: Selector to select which namespaces the Kubernetes Endpoints + description: Selector to select which namespaces the Kubernetes `Endpoints` objects are discovered from. properties: any: @@ -648,18 +669,18 @@ spec: type: array type: object podTargetLabels: - description: PodTargetLabels transfers labels on the Kubernetes `Pod` - onto the created metrics. + description: '`podTargetLabels` defines the labels which are transferred + from the associated Kubernetes `Pod` object onto the ingested metrics.' items: type: string type: array sampleLimit: - description: SampleLimit defines per-scrape limit on number of scraped - samples that will be accepted. + description: '`sampleLimit` defines a per-scrape limit on the number + of scraped samples that will be accepted.' format: int64 type: integer selector: - description: Selector to select Endpoints objects. + description: Label selector to select the Kubernetes `Endpoints` objects. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. @@ -704,18 +725,18 @@ spec: type: object x-kubernetes-map-type: atomic targetLabels: - description: TargetLabels transfers labels from the Kubernetes `Service` - onto the created metrics. + description: '`targetLabels` defines the labels which are transferred + from the associated Kubernetes `Service` object onto the ingested + metrics.' items: type: string type: array targetLimit: - description: TargetLimit defines a limit on the number of scraped - targets that will be accepted. + description: '`targetLimit` defines a limit on the number of scraped + targets that will be accepted.' format: int64 type: integer required: - - endpoints - selector type: object required: diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml index f957e1b012c3..5f0682aae096 100644 --- a/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml +++ b/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.69.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -7,9 +7,8 @@ metadata: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - controller-gen.kubebuilder.io/version: v0.11.1 - operator.prometheus.io/version: 0.69.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 + operator.prometheus.io/version: 0.70.0 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com