diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 45f58cdd9f6f834320414c1c1c4db1f560dcfb53..ded8b862683d22a2c5af229d0f4353f5e8642729 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
{
"alertmanager": "0.22.2",
"blackboxExporter": "0.19.0",
- "grafana": "8.0.3",
+ "grafana": "8.1.1",
"kubeStateMetrics": "2.1.1",
- "nodeExporter": "1.2.0",
- "prometheus": "2.28.1",
+ "nodeExporter": "1.2.2",
+ "prometheus": "2.29.1",
"prometheusAdapter": "0.8.4",
"prometheusOperator": "0.49.0",
"kubeRbacProxy": "0.11.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 71de6da159441778c0052a2a331343faad7ebfdb..e9022e6cf6aee36233f5de0d58a1d0993571e36f 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "2526463e44c4152ee8c6110bd0d0fc5e7f1140e2",
- "sum": "PPTfil9MoAqtyW+hHJuAj3Ap86pB86vIHativ9R5c4I="
+ "version": "ea24fb850762ce38155738aff5ae71368eadb904",
+ "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
"source": {
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "8df6a4ff1623781260c3236761c2ebe837958b3f",
+ "version": "e0c0f8caf0296138f7a74f1af5e9964339881788",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -48,8 +48,8 @@
"subdir": ""
}
},
- "version": "25b5047a57352345e478b215370dfcd1fecee27d",
- "sum": "z+ksn3PAtR/fYtxgsrrG4euIriyiefZsTUcJaVXdG1Q="
+ "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
+ "sum": "y8BjnZprY4KvjPJhLXtTf6MyE6EKFzGjCvxuwc/Ucv8="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "25b5047a57352345e478b215370dfcd1fecee27d",
+ "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "44ddbcf76d062269b9429e6da2e15cb3058e678f",
+ "version": "16e8f54c9e7f9f4b4ad73002e03e9d0dcee5b1ce",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "44ddbcf76d062269b9429e6da2e15cb3058e678f",
+ "version": "16e8f54c9e7f9f4b4ad73002e03e9d0dcee5b1ce",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "8008520bc4097d46d2304c6c015cd3e5b6dd3126",
+ "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "8008520bc4097d46d2304c6c015cd3e5b6dd3126",
- "sum": "TcXPVhn0BIFCf5mWa6hyIljVl13ItwPjyeiwro56kjE="
+ "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
+ "sum": "dIYX9ERZvBUcPNcIVwgdWHnc5BDlAlTocAAdyuqu2ig="
},
{
"source": {
@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "3d86bd709df88e2b95a09636cf36b77a9d79af51",
+ "version": "ff85bec45bdce3d296a229adb47e7d29415f8a05",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "7fc5c6045aeb1d615296f6daca1f7a77554d5efb",
+ "version": "4356c09ebd2d6c6056855cbb6bc51f34235ad919",
"sum": "vvgImniWcZVtiU3rEQmeN4DaIktPXNn7u3Zqzdv5bMg="
},
{
@@ -130,8 +130,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "24165adadc889131dbd0143b5c16cd3a079e46cd",
- "sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=",
+ "version": "bb05485c79084fecd3602eceafca3d554ab88987",
+ "sum": "AS8WYFi/z10BZSF6DFkKBscjB32XDMM7iIso7CO/FyI=",
"name": "prometheus"
},
{
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "aa148f8fdb281a9ea4c1e5a7ee2e1336d8459c4f",
+ "version": "79d9480728052d698691f5e18c032c8332c6656e",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index de658ba8dd6d99c83ec6329cb8ed86c384284ab7..99929952ca36c87a2299d1e8b5715d027b3346df 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-datasources
namespace: monitoring
type: Opaque
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 55cb76db10ee66b51addd9d0963cc1a1c0e3f270..90438154e4543831097c6a4dfb9055196c816b3d 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -596,7 +596,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2332,7 +2332,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4203,7 +4203,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5369,7 +5369,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -8382,7 +8382,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11115,7 +11115,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12082,7 +12082,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -14498,7 +14498,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -16473,7 +16473,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -18613,7 +18613,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -20850,7 +20850,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -22303,7 +22303,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24028,7 +24028,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -25080,7 +25080,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -26158,7 +26158,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27138,7 +27138,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -27704,7 +27704,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -28921,7 +28921,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -30580,7 +30580,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -31722,7 +31722,7 @@ items:
"options": [
],
- "query": "label_values(prometheus_build_info, job)",
+ "query": "label_values(prometheus_build_info{job=\"prometheus-k8s\",namespace=\"monitoring\"}, job)",
"refresh": 1,
"regex": "",
"sort": 2,
@@ -31750,7 +31750,7 @@ items:
"options": [
],
- "query": "label_values(prometheus_build_info, instance)",
+ "query": "label_values(prometheus_build_info{job=~\"$job\"}, instance)",
"refresh": 1,
"regex": "",
"sort": 2,
@@ -31804,7 +31804,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -33050,7 +33050,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -34139,7 +34139,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -35566,7 +35566,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 9e95bdf4c70abff547fbefdb2e4b41263a8dbf42..ff6b09511822ee6874d33278b2b9cd3fd3fdab8a 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -21,6 +21,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 5b954a4b86ceadba385a72e47fc6d9e50aa7e531..df081324790b1f21c4f2978c70e59bf011f6f3a5 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana
namespace: monitoring
spec:
@@ -18,16 +18,16 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-datasources: 94437af43b4bb589dd53fbb6ce41aa2b
+ checksum/grafana-datasources: fbf9c3b28f5667257167c2cec0ac311a
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
spec:
containers:
- env: []
- image: grafana/grafana:8.0.3
+ image: grafana/grafana:8.1.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 2658ce059c2d499ac1063cb3bb23076167ba53ce..7df441f616b3b33e6c8c89bc78a933dec0ff266a 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index a3302cc7541163b38959dacaa16efd30054e9b36..226462e5b1c9ada715704be3f255899274c3649a 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.0.3
+ app.kubernetes.io/version: 8.1.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml
index e54832ade922a6080fd7552a87ac4cde7acc2cc6..a7f1f9c9b3d34f76e869f7d0c4bbfd3340cee125 100644
--- a/manifests/kubernetes-prometheusRule.yaml
+++ b/manifests/kubernetes-prometheusRule.yaml
@@ -248,32 +248,26 @@ spec:
rules:
- alert: KubeCPUOvercommit
annotations:
- description: Cluster has overcommitted CPU resource requests for Pods and cannot tolerate node failure.
+ description: Cluster has overcommitted CPU resource requests for Pods by {{ $value }} CPU shares and cannot tolerate node failure.
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{})
- /
- sum(kube_node_status_allocatable{resource="cpu"})
- >
- ((count(kube_node_status_allocatable{resource="cpu"}) > 1) - 1) / count(kube_node_status_allocatable{resource="cpu"})
- for: 5m
+ sum(namespace_cpu:kube_pod_container_resource_requests:sum{}) - (sum(kube_node_status_allocatable{resource="cpu"}) - max(kube_node_status_allocatable{resource="cpu"})) > 0
+ and
+ (sum(kube_node_status_allocatable{resource="cpu"}) - max(kube_node_status_allocatable{resource="cpu"})) > 0
+ for: 10m
labels:
severity: warning
- alert: KubeMemoryOvercommit
annotations:
- description: Cluster has overcommitted memory resource requests for Pods and cannot tolerate node failure.
+ description: Cluster has overcommitted memory resource requests for Pods by {{ $value }} bytes and cannot tolerate node failure.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubememoryovercommit
summary: Cluster has overcommitted memory resource requests.
expr: |
- sum(namespace_memory:kube_pod_container_resource_requests:sum{})
- /
- sum(kube_node_status_allocatable{resource="memory"})
- >
- ((count(kube_node_status_allocatable{resource="memory"}) > 1) - 1)
- /
- count(kube_node_status_allocatable{resource="memory"})
- for: 5m
+ sum(namespace_memory:kube_pod_container_resource_requests:sum{}) - (sum(kube_node_status_allocatable{resource="memory"}) - max(kube_node_status_allocatable{resource="memory"})) > 0
+ and
+ (sum(kube_node_status_allocatable{resource="memory"}) - max(kube_node_status_allocatable{resource="memory"})) > 0
+ for: 10m
labels:
severity: warning
- alert: KubeCPUQuotaOvercommit
@@ -418,9 +412,9 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeclienterrors
summary: Kubernetes API server client is experiencing errors.
expr: |
- (sum(rate(rest_client_requests_total{code=~"5.."}[5m])) by (instance, job)
+ (sum(rate(rest_client_requests_total{code=~"5.."}[5m])) by (instance, job, namespace)
/
- sum(rate(rest_client_requests_total[5m])) by (instance, job))
+ sum(rate(rest_client_requests_total[5m])) by (instance, job, namespace))
> 0.01
for: 15m
labels:
diff --git a/manifests/node-exporter-clusterRole.yaml b/manifests/node-exporter-clusterRole.yaml
index aae6d312c7e3ffbeb413263f33a8f3a8def0bb31..fe5db25b631269817850191b81749715d23bd708 100644
--- a/manifests/node-exporter-clusterRole.yaml
+++ b/manifests/node-exporter-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
rules:
- apiGroups:
diff --git a/manifests/node-exporter-clusterRoleBinding.yaml b/manifests/node-exporter-clusterRoleBinding.yaml
index 60004d4441578125e9b9ba61b88977ed7dcc32bb..be1016beeff20b388e4f000357fd8bb8969a2f9d 100644
--- a/manifests/node-exporter-clusterRoleBinding.yaml
+++ b/manifests/node-exporter-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index b177635e25b877e9abce054d700b611bc05b812d..69e14810cf1b9711a4dd9288fb32443097b2de59 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
namespace: monitoring
spec:
@@ -20,7 +20,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
spec:
containers:
- args:
@@ -32,7 +32,7 @@ spec:
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
- --collector.netclass.ignored-devices=^(veth.*|[a-f0-9]{15})$
- --collector.netdev.device-exclude=^(veth.*|[a-f0-9]{15})$
- image: quay.io/prometheus/node-exporter:v1.2.0
+ image: quay.io/prometheus/node-exporter:v1.2.2
name: node-exporter
resources:
limits:
diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml
index cd91f442bd227ebc73435b41716a566392110b32..0d582add59eb0466c1a00ce2602f1a420a680f3e 100644
--- a/manifests/node-exporter-prometheusRule.yaml
+++ b/manifests/node-exporter-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
prometheus: k8s
role: alert-rules
name: node-exporter-rules
diff --git a/manifests/node-exporter-service.yaml b/manifests/node-exporter-service.yaml
index 7db5a09340146c114a1c0e39602cf456fe21cd64..c18c7c75396bf8b22b7724fa2f5a6c4f4c4d5c1f 100644
--- a/manifests/node-exporter-service.yaml
+++ b/manifests/node-exporter-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
namespace: monitoring
spec:
diff --git a/manifests/node-exporter-serviceAccount.yaml b/manifests/node-exporter-serviceAccount.yaml
index a45f3d59a9ede47c3fccb17267ba5ed6f03f8c67..343fe6daa3ad5053d002b2cfd9f9f81453f737c2 100644
--- a/manifests/node-exporter-serviceAccount.yaml
+++ b/manifests/node-exporter-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
namespace: monitoring
diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml
index ab0d9cef00e1ee5776052e911d02391e587bb547..6d2edd3a5cb6cf325078b8f36f0ef2aa2427799f 100644
--- a/manifests/node-exporter-serviceMonitor.yaml
+++ b/manifests/node-exporter-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.2.0
+ app.kubernetes.io/version: 1.2.2
name: node-exporter
namespace: monitoring
spec:
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index 4d337456fa1c6cb7e6f9a9d6f3bc6c6d4dbadd3e..b878982a8ae17984e4c7f7ba0715f8ab595100b3 100644
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index 54247417d258b81b2f3e840b92338eef6eddd7fb..a1096b6120b5d84b70760d86bcc5ef67284db836 100644
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index c55ecc42e029b8b5a3c1ee4eda33fd2067138c69..65303f8843cbcf077606845b30b37991c931e044 100644
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index e41383e91faa3acfcdd81bf8a8d8a6d015358b40..cc9b674b4fbc897e73eb75fa43a5a1bba27accc1 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
prometheus: k8s
name: k8s
namespace: monitoring
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.28.1
+ image: quay.io/prometheus/prometheus:v2.29.1
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -26,7 +26,7 @@ spec:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -44,4 +44,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.28.1
+ version: 2.29.1
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 5dd5b248894f899b7c72141bc3d8008d126dfbea..ae5078b8e4ac13e21a6b151d0dad5e341f3b14d5 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index 8e15e69de57b098e7180bc659395364b7394a4ad..a0340332adb56f801d0bc297d81ce83e36899f22 100644
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 4cf325c6dd150368a31cc1827de7bdc5423ec0f0..78e3ebe2360ad07774f9a4288f7e07b30324b725 100644
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: default
roleRef:
@@ -25,7 +25,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: kube-system
roleRef:
@@ -43,7 +43,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 9f16e65a662ba732485137ea5a1f5c48f1a5f450..c2f1870dc93e9c30b06dbeb3fa105f0851616963 100644
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index 53888f38c30588b900cc9efff25d231b513d1ee1..53f6e44e138cde6dd6053498cc22cbc7695696b9 100644
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: default
rules:
@@ -44,7 +44,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: kube-system
rules:
@@ -81,7 +81,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 8b1965418ba3e444b462dc845cc9428e1b983ff1..611a0f05a0d3f0b2cd14969bba736258bd42cfb4 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
prometheus: k8s
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 45bd92b49f705b06057edf40c7b2094af831b9fa..b8c486ba95f244f346458083b3ae38b6354e9508 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index f8f0e878c2f38ba67af607165fc000979fc55c62..b9907a17d547110d6a6f2276dad337706e72464c 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.28.1
+ app.kubernetes.io/version: 2.29.1
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
index 1d25f7a536637fcdcfd2607140375904fe229fda..927a0ba6df860bfd200a3d77000c564c2ce0d10d 100644
--- a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
@@ -35,6 +35,18 @@ spec:
jobLabel:
description: The label to use to retrieve the job name from.
type: string
+ labelLimit:
+ description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelNameLengthLimit:
+ description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelValueLengthLimit:
+ description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
namespaceSelector:
description: Selector to select which namespaces the Endpoints objects are discovered from.
properties:
@@ -52,6 +64,28 @@ spec:
items:
description: PodMetricsEndpoint defines a scrapeable endpoint of a Kubernetes Pod serving Prometheus metrics.
properties:
+ authorization:
+ description: Authorization section for this endpoint
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint'
properties:
diff --git a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
index 8d1810313deae95458bed793540ca6b67e31f2c7..6b69feac2867b2b335b5944b852235b53d0983a3 100644
--- a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
@@ -32,6 +32,28 @@ spec:
spec:
description: Specification of desired Ingress selection for target discovery by Prometheus.
properties:
+ authorization:
+ description: Authorization section for this endpoint
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint'
properties:
@@ -87,6 +109,18 @@ spec:
jobName:
description: The job name assigned to scraped metrics by default.
type: string
+ labelLimit:
+ description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelNameLengthLimit:
+ description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelValueLengthLimit:
+ description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
module:
description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
type: string
@@ -179,9 +213,17 @@ spec:
required:
- url
type: object
+ sampleLimit:
+ description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+ format: int64
+ type: integer
scrapeTimeout:
description: Timeout for scraping metrics from the Prometheus exporter.
type: string
+ targetLimit:
+ description: TargetLimit defines a limit on the number of scraped targets that will be accepted.
+ format: int64
+ type: integer
targets:
description: Targets defines a set of static and/or dynamically discovered targets to be probed using the prober.
properties:
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index cd6e2ecbb084a12392b4d5bae445d36c0cd0b16d..d35c3060b3390aec9380d963a504e3fda811db63 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -441,6 +441,28 @@ spec:
apiVersion:
description: Version of the Alertmanager API that Prometheus uses to send alerts. It can be "v1" or "v2".
type: string
+ authorization:
+ description: Authorization section for this alertmanager endpoint
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
bearerTokenFile:
description: BearerTokenFile to read from filesystem to use when authenticating to Alertmanager.
type: string
@@ -582,6 +604,31 @@ spec:
apiserverConfig:
description: APIServerConfig allows specifying a host and auth methods to access apiserver. If left empty, Prometheus is assumed to run inside of the cluster and will discover API servers automatically and use the pod's CA certificate and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/.
properties:
+ authorization:
+ description: Authorization section for accessing apiserver
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive with Credentials (from SafeAuthorization)
+ type: string
+ type:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: BasicAuth allow an endpoint to authenticate over basic authentication
properties:
@@ -1469,6 +1516,18 @@ spec:
items:
type: string
type: array
+ enforcedLabelLimit:
+ description: Per-scrape limit on number of labels that will be accepted for a sample. If more than this number of labels are present post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ enforcedLabelNameLengthLimit:
+ description: Per-scrape limit on length of labels name that will be accepted for a sample. If a label name is longer than this number post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ enforcedLabelValueLengthLimit:
+ description: Per-scrape limit on length of labels value that will be accepted for a sample. If a label value is longer than this number post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
enforcedNamespaceLabel:
description: "EnforcedNamespaceLabel If set, a label will be added to \n 1. all user-metrics (created by `ServiceMonitor`, `PodMonitor` and `ProbeConfig` object) and 2. in all `PrometheusRule` objects (except the ones excluded in `prometheusRulesExcludedFromEnforce`) to * alerting & recording rules and * the metrics used in their expressions (`expr`). \n Label name is this field's value. Label value is the namespace of the created object (mentioned above)."
type: string
@@ -2432,6 +2491,31 @@ spec:
items:
description: RemoteReadSpec defines the remote_read configuration for prometheus.
properties:
+ authorization:
+ description: Authorization section for remote read
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive with Credentials (from SafeAuthorization)
+ type: string
+ type:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: BasicAuth for the URL.
properties:
@@ -2674,6 +2758,31 @@ spec:
items:
description: RemoteWriteSpec defines the remote_write configuration for prometheus.
properties:
+ authorization:
+ description: Authorization section for remote write
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive with Credentials (from SafeAuthorization)
+ type: string
+ type:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: BasicAuth for the URL.
properties:
diff --git a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
index a112b242652d841579302f6654b0a0ede5f8c59e..e5f847714c851341fdf4cdba3c544c628e4d8e21 100644
--- a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -37,6 +37,28 @@ spec:
items:
description: Endpoint defines a scrapeable endpoint serving Prometheus metrics.
properties:
+ authorization:
+ description: Authorization section for this endpoint
+ properties:
+ credentials:
+ description: The secret's key that contains the credentials of the request
+ 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:
+ description: Set the authentication type. Defaults to Bearer, Basic will cause an error
+ type: string
+ type: object
basicAuth:
description: 'BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
properties:
@@ -366,6 +388,18 @@ spec:
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`."
type: string
+ labelLimit:
+ description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelNameLengthLimit:
+ description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
+ labelValueLengthLimit:
+ description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ format: int64
+ type: integer
namespaceSelector:
description: Selector to select which namespaces the Kubernetes Endpoints objects are discovered from.
properties: