diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index c76736d25b2ca8e4cad89b74ddae2cf3073b9521..a36ff58c04c31a6f4264b4e5ea77d72b95b44c0b 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "24e05998c68f481af2bd567ee104cf89879bbf89",
+ "version": "8b1b69b1e26621e1038f78a3fe84e0919b00034d",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -58,7 +58,7 @@
"subdir": "gen/grafonnet-latest"
}
},
- "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
+ "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
"sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
},
{
@@ -68,7 +68,7 @@
"subdir": "gen/grafonnet-v10.0.0"
}
},
- "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
+ "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
},
{
@@ -78,8 +78,8 @@
"subdir": "gen/grafonnet-v11.0.0"
}
},
- "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
- "sum": "Fuo+qTZZzF+sHDBWX/8fkPsUmwW6qhH8hRVz45HznfI="
+ "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
+ "sum": "0BvzR0i4bS4hc2O3xDv6i9m52z7mPrjvqxtcPrGhynA="
},
{
"source": {
@@ -88,8 +88,8 @@
"subdir": "grafana-builder"
}
},
- "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
- "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
+ "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+ "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
},
{
"source": {
@@ -98,8 +98,8 @@
"subdir": "mixin-utils"
}
},
- "version": "0c35fcfb35658ed16fb73d5b5546a36cbdf73f7a",
- "sum": "Qg992ZB0jkrS+YLq0Q7RV1fSHa8+hQT0jbpTyCGE2NI="
+ "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+ "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
},
{
"source": {
@@ -128,8 +128,8 @@
"subdir": ""
}
},
- "version": "de834e9a291b49396125768f041e2078763f48b5",
- "sum": "E6z1j4MS6/NnIVZkUuk+gb0m9FvRmZ77H6SSopIZEa8="
+ "version": "1b71e399caee334af8ba2d15d0dd615043a652d0",
+ "sum": "qcRxavmCpuWQuwCMqYaOZ+soA8jxwWLrK7LYqohN5NA="
},
{
"source": {
@@ -138,8 +138,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
- "sum": "vR59KSqhRDBmKpYbia5VBs/1QFNFXud47G3+RfWSGnQ="
+ "version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
+ "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
},
{
"source": {
@@ -148,7 +148,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
+ "version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
+ "version": "e60738ed4dd56a62f87af80dc7563bcc9101f78e",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
- "sum": "z2/5LjQpWC7snhT+n/mtQqoy5986uI95sTqcKQziwGU="
+ "version": "e60738ed4dd56a62f87af80dc7563bcc9101f78e",
+ "sum": "hd9kNaJYrGW3vwIu0Q3nWT3gvoAMaMK8O9mBpk6MtjY="
},
{
"source": {
@@ -179,7 +179,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "eb8369ec510d76f63901379a8437c4b55885d6c5",
+ "version": "22bfc8ac69163cda2335bdddafae811267c865a9",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -190,8 +190,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "4cc1c177d05e80176f26fe1ca2a1f193c03c67a0",
- "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
+ "version": "b9d0932179a0c5b3a8863f3d6cdafe8584cedc8e",
+ "sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
},
{
"source": {
@@ -200,7 +200,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "8849b7dcadc2960c70467734efce35d737be25f5",
+ "version": "626f2f3571228195c8c1d4c596295cb5a1321a2f",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
@@ -222,7 +222,7 @@
"subdir": "mixin"
}
},
- "version": "cb27548cc43553033d179cec76a13b9f52c5c927",
+ "version": "e155196618a3246c0303fea8c02761ffc5f61f76",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index dcaa67d9828c5fc086b827b3af222564b76139f7..5b03de78cb956c22efc7e05bb39e45f7e488fe49 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -3502,7 +3502,7 @@ items:
},
"fieldConfig": {
"defaults": {
- "unit": "none"
+ "unit": "percentunit"
}
},
"gridPos": {
@@ -15124,6 +15124,7 @@ items:
},
"timezone": "utc",
"title": "Node Exporter / USE Method / Cluster",
+ "uid": "3e97d1d02672cdd0861f4c97c64f89b2",
"version": 0
}
kind: ConfigMap
@@ -16202,6 +16203,7 @@ items:
},
"timezone": "utc",
"title": "Node Exporter / USE Method / Node",
+ "uid": "fac67cfbe174d3ef53eb473d73d9212f",
"version": 0
}
kind: ConfigMap
@@ -17290,6 +17292,7 @@ items:
},
"timezone": "utc",
"title": "Node Exporter / MacOS",
+ "uid": "629701ea43bf69291922ea45f4a87d37",
"version": 0
}
kind: ConfigMap
@@ -18371,6 +18374,7 @@ items:
},
"timezone": "utc",
"title": "Node Exporter / Nodes",
+ "uid": "7d57716318ee0dddbac5a7f451fb7753",
"version": 0
}
kind: ConfigMap
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index f996a123f9c708e40100a7af96d0e73fc27338a8..eebf3ecfaf2a7ff1d44d0b67a3d709acadd952d2 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -116,7 +116,7 @@ spec:
summary: StatefulSet update has not been rolled out.
expr: |
(
- max without (revision) (
+ max by(namespace, statefulset) (
kube_statefulset_status_current_revision{job="kube-state-metrics"}
unless
kube_statefulset_status_update_revision{job="kube-state-metrics"}
@@ -262,7 +262,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubecpuovercommit
summary: Cluster has overcommitted CPU resource requests.
expr: |
- sum(namespace_cpu:kube_pod_container_resource_requests:sum{job="kube-state-metrics",}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0
+ sum(namespace_cpu:kube_pod_container_resource_requests:sum{}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0
and
(sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0
for: 10m
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index bfa9b96dc34027b9adbbdddc0512624c0fcfba28..24e8ec296f65a8d16c84c190428ab533013cefea 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -44,9 +44,12 @@ spec:
type: object
spec:
description: |-
- AlertmanagerConfigSpec is a specification of the desired behavior of the Alertmanager configuration.
- By definition, the Alertmanager configuration only applies to alerts for which
- the `namespace` label is equal to the namespace of the AlertmanagerConfig resource.
+ AlertmanagerConfigSpec is a specification of the desired behavior of the
+ Alertmanager configuration.
+ By default, the Alertmanager configuration only applies to alerts for which
+ the `namespace` label is equal to the namespace of the AlertmanagerConfig
+ resource (see the `.spec.alertmanagerConfigMatcherStrategy` field of the
+ Alertmanager CRD).
properties:
inhibitRules:
description: |-
@@ -620,6 +623,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -879,6 +906,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -1270,6 +1321,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -1757,6 +1832,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -2226,6 +2325,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -2723,6 +2846,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3317,6 +3464,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3743,6 +3914,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -4269,6 +4464,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -4719,6 +4938,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5129,6 +5372,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5528,6 +5795,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5992,6 +6283,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index dd3f64c93a27ef0634f23a334c9f21a12b176862..5389da486c16740933410b5e26a555a4805da94d 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -967,15 +967,18 @@ spec:
type: object
alertmanagerConfigMatcherStrategy:
description: |-
- The AlertmanagerConfigMatcherStrategy defines how AlertmanagerConfig objects match the alerts.
- In the future more options may be added.
+ AlertmanagerConfigMatcherStrategy defines how AlertmanagerConfig objects
+ process incoming alerts.
properties:
type:
default: OnNamespace
description: |-
- If set to `OnNamespace`, the operator injects a label matcher matching the namespace of the AlertmanagerConfig object for all its routes and inhibition rules.
- `None` will not add any additional matchers other than the ones specified in the AlertmanagerConfig.
- Default is `OnNamespace`.
+ AlertmanagerConfigMatcherStrategyType defines the strategy used by
+ AlertmanagerConfig objects to match alerts in the routes and inhibition
+ rules.
+
+
+ The default value is `OnNamespace`.
enum:
- OnNamespace
- None
@@ -1458,6 +1461,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -7874,6 +7901,9 @@ spec:
object (their labels match the selector).
format: int32
type: integer
+ selector:
+ description: The selector used to match the pods targeted by this Alertmanager object.
+ type: string
unavailableReplicas:
description: Total number of unavailable pods targeted by this Alertmanager object.
format: int32
@@ -7897,4 +7927,8 @@ spec:
served: true
storage: true
subresources:
+ scale:
+ labelSelectorPath: .status.selector
+ specReplicasPath: .spec.replicas
+ statusReplicasPath: .status.replicas
status: {}
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 6a6b561614188f79a460cfcf6a385908743f9d21..a933fd6bc7ff8e2150f7afa5abc24717a101d6bc 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -58,12 +58,16 @@ spec:
discovered targets.
- It requires Prometheus >= v2.37.0.
+ It requires Prometheus >= v2.35.0.
properties:
node:
description: |-
- When set to true, Prometheus must have the `get` permission on the
- `Nodes` objects.
+ When set to true, Prometheus attaches node metadata to the discovered
+ targets.
+
+
+ The Prometheus service account must have the `list` and `watch`
+ permissions on the `Nodes` objects.
type: boolean
type: object
bodySizeLimit:
@@ -819,6 +823,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 92ef5589208e5dc9983a1c34964963103b774ce1..d1e1c7842ea6985690f78ebf69ea3146abd1b50a 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -901,6 +901,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 4b4735b4cc1b6d7c11fc8a7ef0bf127adefffed1..bd7ff13809ce8dafe87cfb70157bdd1797449f97 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1334,9 +1334,16 @@ spec:
type: boolean
name:
description: Name of the Endpoints object in the namespace.
+ minLength: 1
type: string
namespace:
- description: Namespace of the Endpoints object.
+ description: |-
+ Namespace of the Endpoints object.
+
+
+ If not set, the object will be discovered in the namespace of the
+ Prometheus object.
+ minLength: 1
type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed to.
@@ -1661,13 +1668,36 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
required:
- name
- - namespace
- port
type: object
type: array
@@ -1963,6 +1993,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -6130,6 +6184,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -6853,6 +6931,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -7196,6 +7298,22 @@ spec:
in a breaking way.
items:
properties:
+ attachMetadata:
+ description: |-
+ AttachMetadata configures additional metadata to the discovered targets.
+ When the scrape object defines its own configuration, it takes
+ precedence over the scrape class configuration.
+ properties:
+ node:
+ description: |-
+ When set to true, Prometheus attaches node metadata to the discovered
+ targets.
+
+
+ The Prometheus service account must have the `list` and `watch`
+ permissions on the `Nodes` objects.
+ type: boolean
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
@@ -7560,6 +7678,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -7728,6 +7870,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: set
securityContext:
description: |-
SecurityContext holds pod-level security attributes and common container settings.
@@ -7929,6 +8072,15 @@ spec:
ServiceAccountName is the name of the ServiceAccount to use to run the
Prometheus Pods.
type: string
+ serviceDiscoveryRole:
+ description: |-
+ Defines the service discovery role used to discover targets from `ServiceMonitor` objects.
+ If set, the value should be either "Endpoints" or "EndpointSlice".
+ If unset, the operator assumes the "Endpoints" role.
+ enum:
+ - Endpoints
+ - EndpointSlice
+ type: string
serviceMonitorNamespaceSelector:
description: |-
Namespaces to match for ServicedMonitors discovery. An empty label selector
@@ -8897,6 +9049,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -9594,6 +9770,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 0f88b734d1008076275a35a46650e668586f9867..54d405f0753b37d1ca197d81e2c6f2a65587ae1d 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1301,6 +1301,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5593,6 +5617,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5800,6 +5848,22 @@ spec:
in a breaking way.
items:
properties:
+ attachMetadata:
+ description: |-
+ AttachMetadata configures additional metadata to the discovered targets.
+ When the scrape object defines its own configuration, it takes
+ precedence over the scrape class configuration.
+ properties:
+ node:
+ description: |-
+ When set to true, Prometheus attaches node metadata to the discovered
+ targets.
+
+
+ The Prometheus service account must have the `list` and `watch`
+ permissions on the `Nodes` objects.
+ type: boolean
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
@@ -6164,6 +6228,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -6332,6 +6420,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: set
securityContext:
description: |-
SecurityContext holds pod-level security attributes and common container settings.
@@ -6533,6 +6622,15 @@ spec:
ServiceAccountName is the name of the ServiceAccount to use to run the
Prometheus Pods.
type: string
+ serviceDiscoveryRole:
+ description: |-
+ Defines the service discovery role used to discover targets from `ServiceMonitor` objects.
+ If set, the value should be either "Endpoints" or "EndpointSlice".
+ If unset, the operator assumes the "Endpoints" role.
+ enum:
+ - Endpoints
+ - EndpointSlice
+ type: string
serviceMonitorNamespaceSelector:
description: |-
Namespaces to match for ServicedMonitors discovery. An empty label selector
@@ -7696,6 +7794,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 4c0e9314c0f39f382af1fa27b0b8e74afbcc93e2..992f31422e121f51eda806a3ac5547ea8b572cf0 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 5dcd5c8d3314cb4415b88c4f627975c3a208e8fe..fdd21cda5908d49d651d5b59c63bb6a34a46c363 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -473,6 +473,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -1111,6 +1135,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -1504,6 +1552,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -1528,6 +1600,9 @@ spec:
description: |-
The port number used if the query type is not SRV
Ignored for SRV records
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
refreshInterval:
description: |-
@@ -1541,13 +1616,14 @@ spec:
If not set, Prometheus uses its default value.
- When set to NS, It requires Prometheus >= 2.49.0.
+ When set to NS, it requires Prometheus >= v2.49.0.
+ When set to MX, it requires Prometheus >= v2.38.0
enum:
- - SRV
- A
- AAAA
- MX
- NS
+ - SRV
type: string
required:
- names
@@ -2000,6 +2076,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -2466,6 +2566,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3001,6 +3125,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3514,6 +3662,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3831,6 +4003,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3877,12 +4073,13 @@ spec:
If left empty, Prometheus is assumed to run inside
of the cluster. It will discover API servers automatically and use the pod's
CA certificate and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/.
+ minLength: 1
type: string
attachMetadata:
description: |-
Optional metadata to attach to discovered targets.
- It requires Prometheus >= v2.35.0 for `pod` role and
- Prometheus >= v2.37.0 for `endpoints` and `endpointslice` roles.
+ It requires Prometheus >= v2.35.0 when using the `Pod` role and
+ Prometheus >= v2.37.0 for `Endpoints` and `Endpointslice` roles.
properties:
node:
description: |-
@@ -4006,8 +4203,9 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: set
ownNamespace:
- description: Includes the namespace in which the Prometheus pod exists to the list of watched namesapces.
+ description: Includes the namespace in which the Prometheus pod runs to the list of watched namespaces.
type: boolean
type: object
noProxy:
@@ -4177,45 +4375,47 @@ spec:
pattern: ^http(s)?://.+$
type: string
role:
- description: Role of the Kubernetes entities that should be discovered.
+ description: |-
+ Role of the Kubernetes entities that should be discovered.
+ Role `Endpointslice` requires Prometheus >= v2.21.0
enum:
- - Node
- - node
- - Service
- - service
- Pod
- - pod
- Endpoints
- - endpoints
- - EndpointSlice
- - endpointslice
- Ingress
- - ingress
+ - Service
+ - Node
+ - EndpointSlice
type: string
selectors:
- description: Selector to select objects.
+ description: |-
+ Selector to select objects.
+ It requires Prometheus >= v2.17.0
items:
description: K8SSelectorConfig is Kubernetes Selector Config
properties:
field:
+ description: |-
+ An optional field selector to limit the service discovery to resources which have fields with specific values.
+ e.g: `metadata.name=foobar`
+ minLength: 1
type: string
label:
+ description: |-
+ An optional label selector to limit the service discovery to resources with specific labels and label values.
+ e.g: `node.kubernetes.io/instance-type=master`
+ minLength: 1
type: string
role:
- description: Role is role of the service in Kubernetes.
+ description: |-
+ Role specifies the type of Kubernetes resource to limit the service discovery to.
+ Accepted values are: Node, Pod, Endpoints, EndpointSlice, Service, Ingress.
enum:
- - Node
- - node
- - Service
- - service
- Pod
- - pod
- Endpoints
- - endpoints
- - EndpointSlice
- - endpointslice
- Ingress
- - ingress
+ - Service
+ - Node
+ - EndpointSlice
type: string
required:
- role
@@ -4225,7 +4425,7 @@ spec:
- role
x-kubernetes-list-type: map
tlsConfig:
- description: TLS configuration to use on every scrape request.
+ description: TLS configuration to connect to the Kubernetes API.
properties:
ca:
description: Certificate authority used when verifying server certificates.
@@ -4358,6 +4558,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -4788,6 +5012,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5297,6 +5545,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -5672,6 +5944,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -6044,6 +6340,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -6639,6 +6959,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -7023,6 +7367,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -7243,6 +7611,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 49bb5ddcce2fd1144ae7cf4fc52398902971c67e..7df321709707d6c0a076ab98ad557cb18e9663d6 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -64,8 +64,12 @@ spec:
properties:
node:
description: |-
- When set to true, Prometheus must have the `get` permission on the
- `Nodes` objects.
+ When set to true, Prometheus attaches node metadata to the discovered
+ targets.
+
+
+ The Prometheus service account must have the `list` and `watch`
+ permissions on the `Nodes` objects.
type: boolean
type: object
bodySizeLimit:
@@ -773,6 +777,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index e959838f02a6de89eb5f18b054e849624bc102cf..5a5ab7890f271f293c92b79497e2cd666547a8a2 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.1
+ operator.prometheus.io/version: 0.75.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -2647,6 +2647,30 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
serverName:
description: Used to verify the hostname for the targets.
type: string