From d9f291300256f2676d05159df521b83080d0155f Mon Sep 17 00:00:00 2001 From: Roboquat Date: Mon, 13 Oct 2025 00:19:59 +0000 Subject: [PATCH] [bot] [main] Automated dependencies update --- jsonnetfile.lock.json | 36 ++-- ...managerConfigCustomResourceDefinition.yaml | 7 +- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- ...r-0podmonitorCustomResourceDefinition.yaml | 47 ++--- ...erator-0probeCustomResourceDefinition.yaml | 20 +-- ...r-0prometheusCustomResourceDefinition.yaml | 42 +++-- ...ometheusagentCustomResourceDefinition.yaml | 25 +-- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 14 +- ...ervicemonitorCustomResourceDefinition.yaml | 25 ++- ...-0thanosrulerCustomResourceDefinition.yaml | 13 +- .../.github/workflows/ci.yaml | 2 +- .../.github/workflows/release.yaml | 4 +- .../.github/workflows/stale.yml | 2 +- .../kubernetes-mixin/Makefile | 38 +++++ .../kubernetes-mixin/scripts/lgtm.sh | 53 ++++++ .../kubernetes-mixin/scripts/lgtm.yaml | 107 ++++++++++++ .../otel-collector-deployment.values.yaml | 161 ++++++++++++++++++ .../provisioning/dashboards/dashboards.yaml | 9 + .../provisioning/prometheus/.gitignore | 2 + .../provisioning/prometheus/prometheus.yaml | 3 + .../components/alertmanager.libsonnet | 4 +- .../components/prometheus.libsonnet | 18 +- .../alertmanagerconfigs-crd.json | 6 +- .../alertmanagerconfigs-v1beta1-crd.libsonnet | 4 + .../alertmanagers-crd.json | 2 +- .../prometheus-operator/podmonitors-crd.json | 22 ++- .../prometheus-operator/probes-crd.json | 11 +- .../prometheus-operator.libsonnet | 1 + .../prometheusagents-crd.json | 15 +- .../prometheus-operator/prometheuses-crd.json | 25 +-- .../prometheusrules-crd.json | 2 +- .../scrapeconfigs-crd.json | 8 +- .../servicemonitors-crd.json | 16 +- .../prometheus-operator/thanosrulers-crd.json | 9 +- 35 files changed, 587 insertions(+), 170 deletions(-) create mode 100755 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.sh create mode 100644 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml create mode 100644 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/otel-collector-deployment.values.yaml create mode 100644 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/dashboards/dashboards.yaml create mode 100644 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/.gitignore create mode 100644 vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/prometheus.yaml diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index f97a1a13..926e96f9 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "438ed969386b7ef258e0d5802ca5ce4a45e46d7b", + "version": "487e5b6ca8de72b1eb1809b7185dce0f2e678d95", "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po=" }, { @@ -28,7 +28,7 @@ "subdir": "operations/observability/mixins" } }, - "version": "a2227ff2408864e372ae40ca3684b498fa9dfc9e", + "version": "9411dfce038322d2ff331ddf0678240cb7623c50", "sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=", "name": "gitpod" }, @@ -89,7 +89,7 @@ "subdir": "grafana-builder" } }, - "version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a", + "version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d", "sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g=" }, { @@ -99,7 +99,7 @@ "subdir": "mixin-utils" } }, - "version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a", + "version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d", "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo=" }, { @@ -129,8 +129,8 @@ "subdir": "" } }, - "version": "d6556e52d2762de47dc28ac0f9f2ffe93a50e785", - "sum": "jLkq96mnGjid6+aQFvT16Fspnvud7NM1edY33kDSpIE=" + "version": "40ad8e9a35e08e4e49a587036e8f747230f876ca", + "sum": "YTEoVwxRe6X20IQdUw2UCnMpF16DuDixtLxusvvIjjg=" }, { "source": { @@ -139,7 +139,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926", + "version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9", "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM=" }, { @@ -149,7 +149,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926", + "version": "3214ab19c28a4ca630c45b9b8d94c1d0ed8c70a9", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -159,8 +159,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "d98c08e752f6ff143ee3a9491b774f55e572a83b", - "sum": "fKY/bBuoAikhIeljLNu54ut2SdtT4qCjxhlNLEQg7zo=" + "version": "6828741a34a392e58d28e484364234fe191da65c", + "sum": "5UKfljOWlHyaphDY0i8CMiPYCJ/fbn7yTnE9aCQugYg=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b", + "version": "4ca908cb214ef1a80d2371b58de26a13ba417599", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,8 +180,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b", - "sum": "drgasp5XaNe+XIzV4Er36mq3IbKAmxmfkh7Se4LtGkw=" + "version": "4ca908cb214ef1a80d2371b58de26a13ba417599", + "sum": "i2B4sHfUmkF0YcTSgdIGx2PXQsSR3lrF5/OtMyFQkAI=" }, { "source": { @@ -190,7 +190,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "28d3f86811b1cd4e8a17f45cf90a1db357092589", + "version": "557d071862dc660635da3614d775d354f8caaf57", "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=", "name": "alertmanager" }, @@ -201,7 +201,7 @@ "subdir": "docs/node-mixin" } }, - "version": "b6112eac8af48aceb75691416ce66a5056e7f258", + "version": "771c3d458a763aeae8040619ab560e5085699b6f", "sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4=" }, { @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "f4b8840f51bee8afa258e0d4e27fc7fc03358760", + "version": "2c2a4314b9bc904ed437b9564690e5db320f972b", "sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "jsonnet/controller-gen" } }, - "version": "dec7d5cc8d55ed2c2bb6ce48b5eae8effc098947", + "version": "8914f489c838524956adafd426c1e2b512f38fc0", "sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=", "name": "pyrra" }, @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "d997eed1749e4d91243efc0137f6a20cb659841b", + "version": "be442a5152ecb76c57179634b16e4a18a1345a0c", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml index 2b0ebd7b..ba8a674c 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -7326,6 +7326,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + useFIPSSTSEndpoint: + description: |- + useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint. + It requires Prometheus >= v2.54.0. + type: boolean type: object subject: description: |- diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml index 9a7ecc12..80c45e8a 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml index 7722feb5..e83400c6 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -177,10 +177,10 @@ spec: properties: authorization: description: |- - authorization defines the Authorization header credentials to use when - scraping the target. + authorization configures the Authorization header credentials used by + the client. - Cannot be set at the same time as `basicAuth`, or `oauth2`. + Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`. properties: credentials: description: credentials defines a key of a Secret in the namespace that contains the credentials for authentication. @@ -215,10 +215,10 @@ spec: type: object basicAuth: description: |- - basicAuth defines the Basic Authentication credentials to use when - scraping the target. + basicAuth defines the Basic Authentication credentials used by the + client. - Cannot be set at the same time as `authorization`, or `oauth2`. + Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`. properties: password: description: |- @@ -271,9 +271,12 @@ spec: type: object bearerTokenSecret: description: |- - bearerTokenSecret defines 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. + bearerTokenSecret defines a key of a Secret containing the bearer token + used by the client for authentication. The secret needs to be in the + same namespace as the custom resource and readable by the Prometheus + Operator. + + Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`. Deprecated: use `authorization` instead. properties: @@ -297,7 +300,7 @@ spec: type: object x-kubernetes-map-type: atomic enableHttp2: - description: enableHttp2 can be used to disable HTTP2 when scraping the target. + description: enableHttp2 can be used to disable HTTP2. type: boolean filterRunning: description: |- @@ -310,8 +313,8 @@ spec: type: boolean followRedirects: description: |- - followRedirects defines whether the scrape requests should follow HTTP - 3xx redirects. + followRedirects defines whether the client should follow HTTP 3xx + redirects. type: boolean honorLabels: description: |- @@ -401,9 +404,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -427,11 +430,11 @@ spec: type: string oauth2: description: |- - oauth2 defines the OAuth2 settings to use when scraping the target. + oauth2 defines the OAuth2 settings used by the client. It requires Prometheus >= 2.27.0. - Cannot be set at the same time as `authorization`, or `basicAuth`. + Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`. properties: clientId: description: |- @@ -874,9 +877,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -922,7 +925,7 @@ spec: Deprecated: use 'port' or 'portNumber' instead. x-kubernetes-int-or-string: true tlsConfig: - description: tlsConfig defines the TLS configuration to use when scraping the target. + description: tlsConfig defines the TLS configuration used by the client. properties: ca: description: ca defines the Certificate authority used when verifying server certificates. diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml index e757bc99..a35c48b3 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -285,9 +285,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -878,9 +878,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -1023,9 +1023,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml index 1079fc42..2d3de539 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1165,9 +1165,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -1435,9 +1435,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -1519,6 +1519,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + useFIPSSTSEndpoint: + description: |- + useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint. + It requires Prometheus >= v2.54.0. + type: boolean type: object timeout: description: timeout defines a per-target Alertmanager timeout when pushing alerts. @@ -7434,6 +7439,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + useFIPSSTSEndpoint: + description: |- + useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint. + It requires Prometheus >= v2.54.0. + type: boolean type: object tlsConfig: description: tlsConfig to use for the URL. @@ -7667,9 +7677,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -8104,9 +8114,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -8201,9 +8211,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml index 31af174a..3fb748db 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -5966,6 +5966,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + useFIPSSTSEndpoint: + description: |- + useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint. + It requires Prometheus >= v2.54.0. + type: boolean type: object tlsConfig: description: tlsConfig to use for the URL. @@ -6199,9 +6204,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -6497,9 +6502,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -6594,9 +6599,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml index 0319b4cf..c2c4ad2e 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml index d4a9689a..bc2eaee3 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -9007,9 +9007,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -11164,9 +11164,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml index 201d33ce..a83c4bad 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -325,9 +325,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -792,9 +792,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: @@ -1199,6 +1199,17 @@ spec: - RelabelConfig - RoleSelector type: string + serviceDiscoveryRole: + description: |- + serviceDiscoveryRole defines the service discovery role used to discover targets. + + If set, the value should be either "Endpoints" or "EndpointSlice". + Otherwise it defaults to the value defined in the + Prometheus/PrometheusAgent resource. + enum: + - Endpoints + - EndpointSlice + type: string targetLabels: description: |- targetLabels defines the labels which are transferred from the diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml index 05ae71bc..41ac8b5c 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.85.0 + operator.prometheus.io/version: 0.86.0 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -5320,6 +5320,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + useFIPSSTSEndpoint: + description: |- + useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint. + It requires Prometheus >= v2.54.0. + type: boolean type: object tlsConfig: description: tlsConfig to use for the URL. @@ -5553,9 +5558,9 @@ spec: configured regular expression. items: description: |- - LabelName is a valid Prometheus label name which may only contain ASCII - letters, numbers, as well as underscores. - pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + LabelName is a valid Prometheus label name. + For Prometheus 3.x, a label name is valid if it contains UTF-8 characters. + For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores. type: string type: array targetLabel: diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml index 8da36cad..930a1e6d 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: persist-credentials: false - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: scripts/go.mod cache-dependency-path: scripts/go.sum diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml index 45d43a7e..30c67fd9 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set up Go - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version: '1.24' @@ -45,7 +45,7 @@ jobs: name: kubernetes-mixin-${{ github.ref_name }}.zip - name: Create release on kubernetes-mixin - uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2 + uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/stale.yml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/stale.yml index 4300a503..9c1f4f41 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/stale.yml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0 + - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0 with: days-before-stale: 30 days-before-close: 7 diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile index 37086c98..f51e7e7a 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile @@ -19,6 +19,44 @@ OUT_DIR ?=dashboards_out .PHONY: all all: fmt generate lint test +.PHONY: dev +dev: generate + @cd scripts && ./lgtm.sh && \ + echo '' && \ + echo '╔═══════════════════════════════════════════════════════════════╗' && \ + echo '║ 🚀 Development Environment Ready! 🚀 ║' && \ + echo '║ ║' && \ + echo '║ Run `make dev-port-forward` ║' && \ + echo '║ Grafana will be available at http://localhost:3000 ║' && \ + echo '║ ║' && \ + echo '║ Data will be available in a few minutes. ║' && \ + echo '║ ║' && \ + echo '║ Dashboards will refresh every 10s, run `make generate` ║' && \ + echo '║ and refresh your browser to see the changes. ║' && \ + echo '║ ║' && \ + echo '║ Alert and recording rules require `make dev-reload`. ║' && \ + echo '║ ║' && \ + echo '╚═══════════════════════════════════════════════════════════════╝' + +.PHONY: dev-port-forward +dev-port-forward: + kubectl --context k3d-kubernetes-mixin port-forward service/lgtm 3000:3000 4317:4317 4318:4318 9090:9090 + +dev-reload: generate + @cp -v prometheus_alerts.yaml scripts/provisioning/prometheus/ && \ + cp -v prometheus_rules.yaml scripts/provisioning/prometheus/ && \ + kubectl --context k3d-kubernetes-mixin rollout restart deployment/lgtm && \ + echo '╔═══════════════════════════════════════════════════════════════╗' && \ + echo '║ ║' && \ + echo '║ 🔄 Reloading Alert and Recording Rules... ║' && \ + echo '║ ║' && \ + echo '╚═══════════════════════════════════════════════════════════════╝' && \ + kubectl --context k3d-kubernetes-mixin rollout status deployment/lgtm + +.PHONY: dev-down +dev-down: + k3d cluster delete kubernetes-mixin + .PHONY: generate generate: prometheus_alerts.yaml prometheus_rules.yaml $(OUT_DIR) diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.sh b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.sh new file mode 100755 index 00000000..b513ae92 --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +set -ex + +# export time in milliseconds +# export OTEL_METRIC_EXPORT_INTERVAL=500 + +# use http instead of https (needed because of https://github.com/open-telemetry/opentelemetry-go/issues/4834) +# export OTEL_EXPORTER_OTLP_INSECURE="true" + +# https://github.com/grafana/docker-otel-lgtm/tree/main/examples + +# docker run -p 3001:3000 -p 4317:4317 -p 4318:4318 \ +# -v ./provisioning/dashboards:/otel-lgtm/grafana/conf/provisioning/dashboards \ +# -v ../dashboards_out:/kubernetes-mixin/dashboards_out \ +# --rm -ti grafana/otel-lgtm + +cp ../prometheus_alerts.yaml provisioning/prometheus/ +cp ../prometheus_rules.yaml provisioning/prometheus/ + +# set up 1-node k3d cluster +k3d cluster create kubernetes-mixin \ + -v "$PWD"/provisioning:/kubernetes-mixin/provisioning \ + -v "$PWD"/../dashboards_out:/kubernetes-mixin/dashboards_out + +# run grafana, prometheus +kubectl apply -f lgtm.yaml +# kubectl port-forward service/lgtm 3000:3000 4317:4317 4318:4318 9090:9090 + +# scrape kube-state-metrics, node_exporter, cAdvisor, kubelet, kube-proxy, kube-apiserver, kube-controller-manager, kube-scheduler... write to prometheus +helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts +helm repo update +helm upgrade --install otel-collector-deployment open-telemetry/opentelemetry-collector \ + -n default \ + -f otel-collector-deployment.values.yaml + +# install kube-state-metrics +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +helm upgrade --install kube-state-metrics prometheus-community/kube-state-metrics \ + -n default + +# install node_exporter +helm upgrade --install prometheus-node-exporter prometheus-community/prometheus-node-exporter \ + -n default + +# TODO OATs: +# https://github.com/grafana/oats + +# test metrics in prometheus +# test recording rules in prometheus +# test alerting rules in prometheus +# e2e test dashboards? diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml new file mode 100644 index 00000000..c0e61702 --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml @@ -0,0 +1,107 @@ +# Modified to support custom prometheus config and volume mounts +# https://raw.githubusercontent.com/grafana/docker-otel-lgtm/refs/heads/main/k8s/lgtm.yaml +# this is intended for demo / testing purposes only, not for production usage +apiVersion: v1 +kind: Service +metadata: + name: lgtm +spec: + selector: + app: lgtm + ports: + - name: grafana + protocol: TCP + port: 3000 + targetPort: 3000 + - name: otel-grpc + protocol: TCP + port: 4317 + targetPort: 4317 + - name: otel-http + protocol: TCP + port: 4318 + targetPort: 4318 + - name: prometheus + protocol: TCP + port: 9090 + targetPort: 9090 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: lgtm +spec: + replicas: 1 + selector: + matchLabels: + app: lgtm + template: + metadata: + labels: + app: lgtm + spec: + containers: + - name: lgtm + image: grafana/otel-lgtm:latest + ports: + - containerPort: 3000 + - containerPort: 4317 + - containerPort: 4318 + - containerPort: 9090 + readinessProbe: + exec: + command: + - cat + - /tmp/ready + command: ['/bin/sh'] + args: + - -c + - | + cat /kubernetes-mixin/prometheus/prometheus.yaml >> /otel-lgtm/prometheus.yaml + exec /otel-lgtm/run-all.sh + # NOTE: By default OpenShift does not allow writing the root directory. + # Thats why the data dirs for grafana, prometheus and loki can not be + # created and the pod never becomes ready. + # See: https://github.com/grafana/docker-otel-lgtm/issues/132 + volumeMounts: + - name: tempo-data + mountPath: /data/tempo + - name: grafana-data + mountPath: /data/grafana + - name: loki-data + mountPath: /data/loki + - name: loki-storage + mountPath: /loki + - name: p8s-storage + mountPath: /data/prometheus + - name: pyroscope-storage + mountPath: /data/pyroscope + + - name: prometheus + mountPath: /kubernetes-mixin/prometheus + - name: dashboards + mountPath: /otel-lgtm/grafana/conf/provisioning/dashboards + - name: dashboards-out + mountPath: /kubernetes-mixin/dashboards_out + volumes: + - name: tempo-data + emptyDir: {} + - name: loki-data + emptyDir: {} + - name: grafana-data + emptyDir: {} + - name: loki-storage + emptyDir: {} + - name: p8s-storage + emptyDir: {} + - name: pyroscope-storage + emptyDir: {} + - name: dashboards + hostPath: + path: /kubernetes-mixin/provisioning/dashboards + - name: prometheus + hostPath: + path: /kubernetes-mixin/provisioning/prometheus + - name: dashboards-out + hostPath: + path: /kubernetes-mixin/dashboards_out diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/otel-collector-deployment.values.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/otel-collector-deployment.values.yaml new file mode 100644 index 00000000..dbf4ccfc --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/otel-collector-deployment.values.yaml @@ -0,0 +1,161 @@ +# Based on the following guide: +# https://grafana.com/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/config-other-methods/otel-collector/ +mode: deployment + +image: + repository: otel/opentelemetry-collector-contrib + +clusterRole: + create: true + rules: + - apiGroups: + - '' + resources: + - nodes + - nodes/proxy + - services + - endpoints + - pods + - events + - namespaces + - namespaces/status + - pods/status + - replicationcontrollers + - replicationcontrollers/status + - resourcequotas + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + - apiGroups: + - apps + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch + - apiGroups: + - extensions + resources: + - daemonsets + - deployments + - replicasets + verbs: + - get + - list + - watch + - apiGroups: + - batch + resources: + - jobs + - cronjobs + verbs: + - get + - list + - watch + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - get + - list + - watch + +config: + receivers: + prometheus: + config: + scrape_configs: + - job_name: cadvisor + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - replacement: kubernetes.default.svc.cluster.local:443 + target_label: __address__ + - regex: (.+) + replacement: /api/v1/nodes/$${1}/proxy/metrics/cadvisor + source_labels: + - __meta_kubernetes_node_name + target_label: __metrics_path__ + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + insecure_skip_verify: false + server_name: kubernetes + + - job_name: kubelet + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - replacement: kubernetes.default.svc.cluster.local:443 + target_label: __address__ + - regex: (.+) + replacement: /api/v1/nodes/$${1}/proxy/metrics + source_labels: + - __meta_kubernetes_node_name + target_label: __metrics_path__ + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + insecure_skip_verify: false + server_name: kubernetes + + - job_name: kube-state-metrics + kubernetes_sd_configs: + - role: pod + relabel_configs: + - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name] + action: keep + regex: kube-state-metrics + + - job_name: node-exporter + kubernetes_sd_configs: + - role: pod + relabel_configs: + - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name] + action: keep + regex: prometheus-node-exporter.* + - source_labels: [__meta_kubernetes_pod_node_name] + target_label: instance + - source_labels: [__meta_kubernetes_namespace] + target_label: namespace + + processors: + batch: {} + + exporters: + prometheusremotewrite: + external_labels: + cluster: 'kubernetes-mixin' + endpoint: 'http://lgtm:9090/api/v1/write' + + prometheus: + endpoint: "0.0.0.0:8889" + resource_to_telemetry_conversion: + enabled: true + + service: + extensions: [health_check] + pipelines: + metrics: + receivers: [prometheus] + processors: [batch] + exporters: [prometheus, prometheusremotewrite] + +ports: + prometheus: + enabled: true + containerPort: 8889 + servicePort: 8889 + protocol: TCP diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/dashboards/dashboards.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/dashboards/dashboards.yaml new file mode 100644 index 00000000..41f04ed2 --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/dashboards/dashboards.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 + +providers: + - name: dashboards + type: file + updateIntervalSeconds: 10 + options: + path: /kubernetes-mixin/dashboards_out + foldersFromFilesStructure: true diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/.gitignore b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/.gitignore new file mode 100644 index 00000000..1a7b57d5 --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/.gitignore @@ -0,0 +1,2 @@ +prometheus_alerts.yaml +prometheus_rules.yaml diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/prometheus.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/prometheus.yaml new file mode 100644 index 00000000..61924b1e --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/provisioning/prometheus/prometheus.yaml @@ -0,0 +1,3 @@ +rule_files: + - "/kubernetes-mixin/prometheus/prometheus_rules.yaml" + - "/kubernetes-mixin/prometheus/prometheus_alerts.yaml" diff --git a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/alertmanager.libsonnet index b23ce0c7..667cd22a 100644 --- a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/alertmanager.libsonnet +++ b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/alertmanager.libsonnet @@ -61,12 +61,13 @@ local defaults = { }, replicas: 3, secrets: [], + alertmanagerConfigSelector: {}, mixin:: { ruleLabels: {}, _config: { alertmanagerName: '{{ $labels.namespace }}/{{ $labels.pod}}', alertmanagerClusterLabels: 'namespace,service', - alertmanagerSelector: 'job="alertmanager-' + defaults.name + '",namespace="' + defaults.namespace + '"', + alertmanagerSelector: 'job="alertmanager-' + defaults.name + '",container="alertmanager"' + ',namespace="' + defaults.namespace + '"', runbookURLPattern: 'https://runbooks.prometheus-operator.dev/runbooks/alertmanager/%s', }, }, @@ -234,6 +235,7 @@ function(params) { fsGroup: 2000, }, [if std.objectHas(params, 'storage') then 'storage']: am._config.storage, + alertmanagerConfigSelector: am._config.alertmanagerConfigSelector, }, }, } diff --git a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/prometheus.libsonnet b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/prometheus.libsonnet index cedd4641..cd721834 100644 --- a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -9,8 +9,6 @@ local defaults = { resources: { requests: { memory: '400Mi' }, }, - //TODO(paulfantom): remove alertmanagerName after release-0.10 and convert to plain 'alerting' object. - alertmanagerName:: '', alerting: {}, namespaces:: ['default', 'kube-system', defaults.namespace], replicas: 2, @@ -35,14 +33,12 @@ local defaults = { _config: { prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"', prometheusName: '{{$labels.namespace}}/{{$labels.pod}}', - // TODO: remove `thanosSelector` after 0.10.0 release. - thanosSelector: 'job="thanos-sidecar"', thanos: { targetGroups: { namespace: defaults.namespace, }, sidecar: { - selector: defaults.mixin._config.thanosSelector, + selector: 'job="thanos-sidecar"', thanosPrometheusCommonDimensions: 'namespace, pod', }, }, @@ -76,8 +72,7 @@ function(params) { (import 'github.com/kubernetes-monitoring/kubernetes-mixin/lib/add-runbook-links.libsonnet') + { _config+:: p._config.mixin._config, targetGroups+: p._config.mixin._config.thanos.targetGroups, - // TODO: remove `_config.thanosSelector` after 0.10.0 release. - sidecar+: { selector: p._config.mixin._config.thanosSelector } + p._config.mixin._config.thanos.sidecar, + sidecar+: p._config.mixin._config.thanos.sidecar, }, prometheusRule: { @@ -364,14 +359,7 @@ function(params) { serviceMonitorNamespaceSelector: {}, nodeSelector: { 'kubernetes.io/os': 'linux' }, resources: p._config.resources, - alerting: if p._config.alerting != {} then p._config.alerting else { - alertmanagers: [{ - namespace: p._config.namespace, - name: 'alertmanager-' + p._config.alertmanagerName, - port: 'web', - apiVersion: 'v2', - }], - }, + alerting: p._config.alerting, securityContext: { runAsUser: 1000, runAsNonRoot: true, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index 781ab1b9..7bfed7a6 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, @@ -7324,6 +7324,10 @@ ], "type": "object", "x-kubernetes-map-type": "atomic" + }, + "useFIPSSTSEndpoint": { + "description": "useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.", + "type": "boolean" } }, "type": "object" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet index 76c3d62e..f4298908 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet @@ -7142,6 +7142,10 @@ type: 'object', 'x-kubernetes-map-type': 'atomic', }, + useFIPSSTSEndpoint: { + description: 'useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.', + type: 'boolean', + }, }, type: 'object', }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json index 37629582..99978ad6 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json index ebb70288..4bc77340 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "podmonitors.monitoring.coreos.com" }, @@ -139,7 +139,7 @@ "description": "PodMetricsEndpoint defines an endpoint serving Prometheus metrics to be scraped by\nPrometheus.", "properties": { "authorization": { - "description": "authorization defines the Authorization header credentials to use when\nscraping the target.\n\nCannot be set at the same time as `basicAuth`, or `oauth2`.", + "description": "authorization configures the Authorization header credentials used by\nthe client.\n\nCannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.", "properties": { "credentials": { "description": "credentials defines a key of a Secret in the namespace that contains the credentials for authentication.", @@ -172,7 +172,7 @@ "type": "object" }, "basicAuth": { - "description": "basicAuth defines the Basic Authentication credentials to use when\nscraping the target.\n\nCannot be set at the same time as `authorization`, or `oauth2`.", + "description": "basicAuth defines the Basic Authentication credentials used by the\nclient.\n\nCannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.", "properties": { "password": { "description": "password defines a key of a Secret containing the password for\nauthentication.", @@ -224,7 +224,7 @@ "type": "object" }, "bearerTokenSecret": { - "description": "bearerTokenSecret defines a key of a Secret containing the bearer\ntoken for scraping targets. The secret needs to be in the same namespace\nas the PodMonitor object and readable by the Prometheus Operator.\n\nDeprecated: use `authorization` instead.", + "description": "bearerTokenSecret defines a key of a Secret containing the bearer token\nused by the client for authentication. The secret needs to be in the\nsame namespace as the custom resource and readable by the Prometheus\nOperator.\n\nCannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.\n\nDeprecated: use `authorization` instead.", "properties": { "key": { "description": "The key of the secret to select from. Must be a valid secret key.", @@ -247,7 +247,7 @@ "x-kubernetes-map-type": "atomic" }, "enableHttp2": { - "description": "enableHttp2 can be used to disable HTTP2 when scraping the target.", + "description": "enableHttp2 can be used to disable HTTP2.", "type": "boolean" }, "filterRunning": { @@ -255,7 +255,7 @@ "type": "boolean" }, "followRedirects": { - "description": "followRedirects defines whether the scrape requests should follow HTTP\n3xx redirects.", + "description": "followRedirects defines whether the client should follow HTTP 3xx\nredirects.", "type": "boolean" }, "honorLabels": { @@ -325,8 +325,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -345,7 +344,7 @@ "type": "string" }, "oauth2": { - "description": "oauth2 defines the OAuth2 settings to use when scraping the target.\n\nIt requires Prometheus >= 2.27.0.\n\nCannot be set at the same time as `authorization`, or `basicAuth`.", + "description": "oauth2 defines the OAuth2 settings used by the client.\n\nIt requires Prometheus >= 2.27.0.\n\nCannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.", "properties": { "clientId": { "description": "clientId defines a key of a Secret or ConfigMap containing the\nOAuth2 client's ID.", @@ -773,8 +772,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -814,7 +812,7 @@ "x-kubernetes-int-or-string": true }, "tlsConfig": { - "description": "tlsConfig defines the TLS configuration to use when scraping the target.", + "description": "tlsConfig defines the TLS configuration used by the client.", "properties": { "ca": { "description": "ca defines the Certificate authority used when verifying server certificates.", diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json index 68429e70..2e0bf3e7 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "probes.monitoring.coreos.com" }, @@ -250,8 +250,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -816,8 +815,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -943,8 +941,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet index a4f9d106..ed243dd8 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet @@ -103,6 +103,7 @@ function(params) { 'probes', 'probes/status', 'prometheusrules', + 'prometheusrules/status', ], verbs: ['*'], }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json index 7f809ac2..4a4881ab 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "prometheusagents.monitoring.coreos.com" }, @@ -5277,6 +5277,10 @@ ], "type": "object", "x-kubernetes-map-type": "atomic" + }, + "useFIPSSTSEndpoint": { + "description": "useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.", + "type": "boolean" } }, "type": "object" @@ -5513,8 +5517,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -5762,8 +5765,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -5836,8 +5838,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json index 28a62695..87979d32 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "prometheuses.monitoring.coreos.com" }, @@ -994,8 +994,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -1236,8 +1235,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -1315,6 +1313,10 @@ ], "type": "object", "x-kubernetes-map-type": "atomic" + }, + "useFIPSSTSEndpoint": { + "description": "useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.", + "type": "boolean" } }, "type": "object" @@ -6656,6 +6658,10 @@ ], "type": "object", "x-kubernetes-map-type": "atomic" + }, + "useFIPSSTSEndpoint": { + "description": "useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.", + "type": "boolean" } }, "type": "object" @@ -6892,8 +6898,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -7270,8 +7275,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -7344,8 +7348,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json index cf2bfe5d..4b2f39df 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json index a20a0927..2e2f510c 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "scrapeconfigs.monitoring.coreos.com" }, @@ -9152,8 +9152,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -11316,8 +11315,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json index 30f3b3f2..5d7190e2 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "servicemonitors.monitoring.coreos.com" }, @@ -259,8 +259,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -700,8 +699,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array" @@ -1082,6 +1080,14 @@ ], "type": "string" }, + "serviceDiscoveryRole": { + "description": "serviceDiscoveryRole defines the service discovery role used to discover targets.\n\nIf set, the value should be either \"Endpoints\" or \"EndpointSlice\".\nOtherwise it defaults to the value defined in the\nPrometheus/PrometheusAgent resource.", + "enum": [ + "Endpoints", + "EndpointSlice" + ], + "type": "string" + }, "targetLabels": { "description": "targetLabels defines the labels which are transferred from the\nassociated Kubernetes `Service` object onto the ingested metrics.", "items": { diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json index 0919f5e4..d94e03ac 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.85.0" + "operator.prometheus.io/version": "0.86.0" }, "name": "thanosrulers.monitoring.coreos.com" }, @@ -4847,6 +4847,10 @@ ], "type": "object", "x-kubernetes-map-type": "atomic" + }, + "useFIPSSTSEndpoint": { + "description": "useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.\nIt requires Prometheus >= v2.54.0.", + "type": "boolean" } }, "type": "object" @@ -5083,8 +5087,7 @@ "sourceLabels": { "description": "sourceLabels defines the source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", "items": { - "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "description": "LabelName is a valid Prometheus label name.\nFor Prometheus 3.x, a label name is valid if it contains UTF-8 characters.\nFor Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.", "type": "string" }, "type": "array"