diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index d00b68d3d07c8e2213e39314e9c7b088874628e2..55017322f30d5b1d0b6805fe9863550c9a5bdc40 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -9,5 +9,5 @@
"prometheusOperator": "0.57.0",
"kubeRbacProxy": "0.13.0",
"configmapReload": "0.5.0",
- "pyrra": "0.4.3"
+ "pyrra": "0.4.4"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 2bf96be2de1a129cc70e4a20b7db1e081c9cea20..efec4b4a5e529a6ca6341c7d82fd22146b6fd4ee 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "33347b6845fc725894c02e57b604fe2d224260e6",
+ "version": "20bf49c24e57f3b78ff88d0f77c5e10fbcb1fd04",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
@@ -38,8 +38,8 @@
"subdir": "grafonnet"
}
},
- "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
- "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
+ "version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
+ "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
},
{
"source": {
@@ -48,7 +48,7 @@
"subdir": "grafonnet-7.0"
}
},
- "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
+ "version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
- "version": "3517c7c0889d0cb29d89b5e67e03f11d30bc99d3",
+ "version": "1aa353b7afc7ce46351b88d52235ae7a17f4ec0e",
"sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
},
{
@@ -78,8 +78,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "e4011f8f4b4f04fef2ccced18f309fe7aa0e136b",
- "sum": "YV+ciAA4d+IRk7GVy6NatFniJWEcjxHHca4dRpZgRXg="
+ "version": "335e9e1235150fb62ee965b3ba15ce0f7dc769d8",
+ "sum": "dFXBd/OAQREzokDmW+6Wnp28KrjK5ZLUz4YX7GO4/m0="
},
{
"source": {
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "e4011f8f4b4f04fef2ccced18f309fe7aa0e136b",
+ "version": "335e9e1235150fb62ee965b3ba15ce0f7dc769d8",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "3bbba976b89ca2c0b0df188aae8fb425167822f4",
+ "version": "aba99cf01649a6bed9190bbf990d3f0d0e9565d2",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "3bbba976b89ca2c0b0df188aae8fb425167822f4",
- "sum": "wh/sdynvFt57+JsVK7AIwPxmN14K5i4WMOjaydyzQ2w="
+ "version": "aba99cf01649a6bed9190bbf990d3f0d0e9565d2",
+ "sum": "F4j3BEVGvfxI4OmpxwqSWQarImDjWuo84Q+ssx/GSMY="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "528b9588bf814c394b3111a21c66aab71828131c",
+ "version": "f9c1c9072d30ce3b4051af451c3e615cef36ad99",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "69a3f73a9b1e1452cb3a9e62f969f21a1baaeade",
+ "version": "690efa61e86acefdf05bb4334a3d68128ded49c9",
"sum": "f+sVYdKOuFgyX5dnR8lfqXhN2ReTrDqa5Ys7DeVoj3U="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "d56d0a9d52c8614fdf1c5c652061929ede562f3e",
+ "version": "44fcf876caad9a5d28b92a728d2c98c34015d377",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "373040506502d516be297768faf80bf22302016d",
+ "version": "e42ac7d326e167499ae41013d9e0679bfc9b986c",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "4de555db87d38d69b78602c1e1d0fb8ed6e0371b",
+ "version": "b5d0a6167d97c0e179dc9d637fe708091da28f3c",
"sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw=",
"name": "thanos-mixin"
},
diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml
index 42cb46a040cf363e6b5345a9854b11582a9aaa2b..251dec1dc7c87bb1988d698ad8a18f62f4a8c72b 100644
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -109,3 +109,11 @@ rules:
verbs:
- list
- watch
+- apiGroups:
+ - rbac.authorization.k8s.io
+ resources:
+ - clusterroles
+ - roles
+ verbs:
+ - list
+ - watch
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index ab9d0564294e984a77c9dfb0615d8cf4d139f82c..5b6798d2bdfb7575388db1e06d536344a20681d6 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -6049,6 +6049,154 @@ spec:
- name
type: object
type: array
+ web:
+ description: Defines the web command line flags when starting Alertmanager.
+ properties:
+ tlsConfig:
+ description: WebTLSConfig defines the TLS parameters for HTTPS.
+ properties:
+ cert:
+ description: Contains the TLS certificate for the server.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the
+ targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its
+ key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must
+ be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key
+ must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ cipherSuites:
+ description: 'List of supported cipher suites for TLS versions
+ up to TLS 1.2. If empty, Go default cipher suites are used.
+ Available cipher suites are documented in the go documentation:
+ https://golang.org/pkg/crypto/tls/#pkg-constants'
+ items:
+ type: string
+ type: array
+ client_ca:
+ description: Contains the CA certificate for client certificate
+ authentication to the server.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the
+ targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its
+ key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must
+ be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key
+ must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ clientAuthType:
+ description: 'Server policy for client authentication. Maps
+ to ClientAuth Policies. For more detail on clientAuth options:
+ https://golang.org/pkg/crypto/tls/#ClientAuthType'
+ type: string
+ curvePreferences:
+ description: 'Elliptic curves that will be used in an ECDHE
+ handshake, in preference order. Available curves are documented
+ in the go documentation: https://golang.org/pkg/crypto/tls/#CurveID'
+ items:
+ type: string
+ type: array
+ keySecret:
+ description: Secret containing the TLS key for the server.
+ properties:
+ key:
+ description: The key of the secret to select from. Must
+ be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ maxVersion:
+ description: Maximum TLS version that is acceptable. Defaults
+ to TLS13.
+ type: string
+ minVersion:
+ description: Minimum TLS version that is acceptable. Defaults
+ to TLS12.
+ type: string
+ preferServerCipherSuites:
+ description: Controls whether the server selects the client's
+ most preferred cipher suite, or the server's most preferred
+ cipher suite. If true then the server's preference, as expressed
+ in the order of elements in cipherSuites, is used.
+ type: boolean
+ required:
+ - cert
+ - keySecret
+ type: object
+ type: object
type: object
status:
description: 'Most recent observed status of the Alertmanager cluster.
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 08293725ece2626d5fdc0643dbba97c8a4aa13d9..ee8226d6cdf452e1d04d2c64e4e77490734643f7 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -178,6 +178,9 @@ spec:
required:
- key
type: object
+ enableHttp2:
+ description: Whether to enable HTTP2.
+ type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 2fc9efa2d7c17446c8bab4c2ade348194293d031..268a8154ca76712334ec8b94f5eb45871970358a 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -8246,8 +8246,7 @@ spec:
This flag is only available in versions of Prometheus >= 2.11.0.
type: boolean
web:
- description: WebSpec defines the web command line flags when starting
- Prometheus.
+ description: Defines the web command line flags when starting Prometheus.
properties:
pageTitle:
description: The prometheus web page title
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index a018b1b45351051fee0e3aa29a9079d438ab31bb..0dc81742c32cc6b4e33514c2178484c8d1fc7ee0 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -138,6 +138,9 @@ spec:
required:
- key
type: object
+ enableHttp2:
+ description: Whether to enable HTTP2.
+ type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
@@ -550,10 +553,13 @@ spec:
type: object
type: array
jobLabel:
- description: "Chooses the label of the Kubernetes `Endpoints`. Its
- value will be used for the `job`-label's value of the created metrics.
- \n Default & fallback value: the name of the respective Kubernetes
- `Endpoint`."
+ description: "JobLabel selects the label from the associated Kubernetes
+ service which will be used as the `job` label for all metrics. \n
+ For example: If in `ServiceMonitor.spec.jobLabel: foo` and in `Service.metadata.labels.foo:
+ bar`, then the `job=\"bar\"` label is added to all metrics. \n If
+ the value of this field is empty or if the label doesn't exist for
+ the given Service, the `job` label of the metrics defaults to the
+ name of the Kubernetes Service."
type: string
labelLimit:
description: Per-scrape limit on number of labels that will be accepted