diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 6a9380d61df6e61135538c1cd3618ccff2608ccb..e5727a67fb14c772e2edc7f670379a8566e1a103 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -7,7 +7,7 @@
"prometheus": "2.49.1",
"prometheusAdapter": "0.11.2",
"prometheusOperator": "0.71.2",
- "kubeRbacProxy": "0.15.0",
+ "kubeRbacProxy": "0.16.0",
"configmapReload": "0.5.0",
"pyrra": "0.6.4"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index c1aa3e92119b61b8c1f282d9695e16b60ea22686..99deb7323d0f6fd6e28ec745cc8676a07933bc3d 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "58846bd8f3bedee3260623301d1c02a99580a2a9",
+ "version": "42f0cb9762cafa440a3f77884b0deb454ccb22c5",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
@@ -58,8 +58,8 @@
"subdir": "gen/grafonnet-v10.0.0"
}
},
- "version": "f78203c631538db21c04af6b7606f581dc2d3b79",
- "sum": "DpIPVF1qwjNj9ZlEdeH8cCXW3ODpcsq+6nyDkUK9NnE="
+ "version": "fe65a22df6d3a897729fff47cff599805a2c5710",
+ "sum": "pt4Lkc1SrZ0afjRGBU3hQrit1YUVyjaZRQEH30lviz8="
},
{
"source": {
@@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
- "version": "328cd1e1b8978755706c695de6b6dd5a92f064d3",
+ "version": "789ee1bc5c3662f9b51b6023aa77a3cffa24c18e",
"sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
},
{
@@ -108,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "0fb6eee2af82b5b45667d7a5b1f2b9bb3dd2c632",
+ "version": "122e5e899943eb78eaf3e366733d5dbec6613ac0",
"sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
},
{
@@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "0fb6eee2af82b5b45667d7a5b1f2b9bb3dd2c632",
+ "version": "122e5e899943eb78eaf3e366733d5dbec6613ac0",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "81b409d0db7956213e4bf95881e672c4e5e96cd0",
+ "version": "02b0ece96e9aa6d20419fe25b75a91f8e2b6c253",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "81b409d0db7956213e4bf95881e672c4e5e96cd0",
- "sum": "tr81OyVVhhAsBeROJha6y90XI3vPJHFRufw4GMOXA+Y="
+ "version": "02b0ece96e9aa6d20419fe25b75a91f8e2b6c253",
+ "sum": "/k0SfFvrGsS1gpSSC0NPFUvc9c+gAAjJmmTmQNLaKKw="
},
{
"source": {
@@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "1da134aa30c81e656c5156df1499a77d5df92269",
+ "version": "f69a5086657bc69049f207945702a7436cb93840",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "4db443e5a62aed2dd3607de5131f12971c083a5d",
+ "version": "d54744a555197fa1875b85658d5e8c033b72e03b",
"sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
},
{
@@ -170,8 +170,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "bdc3cfdd5dff0e076e1a5778289b36b3fe5962f3",
- "sum": "GORLOoG6efKxGuj57d06LiqwtVkRhllDfqWQS7c+j1w=",
+ "version": "b66b0a52882fc0ba5182f51400465e2f805b7e39",
+ "sum": "u/Fpz2MPkezy71/q+c7mF0vc3hE9fWt2W/YbvF0LP/8=",
"name": "prometheus"
},
{
@@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
- "version": "1cf333e28df1b4e15845fee20b93606eb6f33713",
+ "version": "3da5c1c2f80696ec07c384aaae830f0cc3e217c4",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml
index daf96b95cbf51e18393b685aa22631df4f69e7c0..4e1ba6d73ba51f9d7d7aae2de5cd4221da232c06 100644
--- a/manifests/blackboxExporter-deployment.yaml
+++ b/manifests/blackboxExporter-deployment.yaml
@@ -84,7 +84,7 @@ spec:
- --secure-listen-address=:9115
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:19115/
- image: quay.io/brancz/kube-rbac-proxy:v0.15.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.16.0
name: kube-rbac-proxy
ports:
- containerPort: 9115
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 9ad08b9f06eac2d04e69c55b78b69f1460a89d1b..5a4b4c9815b92ce539df07808bfe45a632ca901e 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -55,7 +55,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8081/
- image: quay.io/brancz/kube-rbac-proxy:v0.15.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.16.0
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
@@ -82,7 +82,7 @@ spec:
- --secure-listen-address=:9443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8082/
- image: quay.io/brancz/kube-rbac-proxy:v0.15.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.16.0
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml
index 79ae3ec5187c503813fe9a0718d515ff2e5ced51..822a052e9b1628dc6fd90e9dd5378fdce0475f9a 100644
--- a/manifests/nodeExporter-daemonset.yaml
+++ b/manifests/nodeExporter-daemonset.yaml
@@ -72,7 +72,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: quay.io/brancz/kube-rbac-proxy:v0.15.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.16.0
name: kube-rbac-proxy
ports:
- containerPort: 9100
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index dd9f6f047568c707b756b9326ce5e7dcaca40b3e..cf4ae4a72b61345d8e9032429169bdd85e4f3018 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -108,7 +108,7 @@ spec:
summary: Prometheus is not ingesting samples.
expr: |
(
- rate(prometheus_tsdb_head_samples_appended_total{job="prometheus-k8s",namespace="monitoring"}[5m]) <= 0
+ sum without(type) (rate(prometheus_tsdb_head_samples_appended_total{job="prometheus-k8s",namespace="monitoring"}[5m])) <= 0
and
(
sum without(scrape_job) (prometheus_target_metadata_cache_entries{job="prometheus-k8s",namespace="monitoring"}) > 0
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index a8b3933a271400be4d86bf207a39c0c6a3ee6134..42e089d8c9a21a41f6a80cbaefda7cf2fec8a038 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -55,7 +55,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/
- image: quay.io/brancz/kube-rbac-proxy:v0.15.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.16.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 8ac8b403b0d0839872ec85f289308b68fdd6a45f..1d3927282416bbd2e7ca51363c6eaab17e44baf9 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -503,6 +503,18 @@ spec:
description: '`sampleLimit` defines a per-scrape limit on the number of scraped samples that will be accepted.'
format: int64
type: integer
+ scrapeProtocols:
+ description: "`scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
selector:
description: Label selector to select the Kubernetes `Pod` objects.
properties:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index db2421b9035afe625f6a8763a8544ccf9a897571..3757225ed589eb9beee748f0e52a2129c2dd087f 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -292,6 +292,18 @@ spec:
description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
format: int64
type: integer
+ scrapeProtocols:
+ description: "`scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
scrapeTimeout:
description: Timeout for scraping metrics from the Prometheus exporter. If not specified, the Prometheus global scrape timeout is used.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 788c3a3dfff5863be8ab8b3685b0147c5937087c..d7ee9585dbb4373b117a5c99ef5c3fcce95beb44 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -515,6 +515,18 @@ spec:
description: '`sampleLimit` defines a per-scrape limit on the number of scraped samples that will be accepted.'
format: int64
type: integer
+ scrapeProtocols:
+ description: "`scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
selector:
description: Label selector to select the Kubernetes `Endpoints` objects.
properties: