diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 58daa17cb09eb976ceccbbca01571bab99b21f77..6dbf22d745f2d4241c9fe97dc5d01af18bb5a994 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
- "grafana": "8.4.1",
+ "grafana": "8.4.2",
"kubeStateMetrics": "2.3.0",
"nodeExporter": "1.3.1",
- "prometheus": "2.33.3",
+ "prometheus": "2.33.4",
"prometheusAdapter": "0.9.1",
- "prometheusOperator": "0.54.0",
+ "prometheusOperator": "0.54.1",
"kubeRbacProxy": "0.11.0",
"configmapReload": "0.5.0"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index e1dafed6ac3e7505af84c27a29960d4e7a09e93d..0ea9aaa26b11bbfe5799bf59f21f83f6239a882c 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "a63fa17b76bbc53e09d50fdb1cc52a2b99a0c261",
+ "version": "af7154c1f432d2ec896e281b36a127cfc09faff7",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "c6470be34ce41dade11f74317ce4dea1af78bc64",
+ "version": "1b2c4dca61648fb65345df329d51b1deaac7a41d",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "03d32a72a2a0bf0ee00ffc853be5f07ad3bafcbe",
+ "version": "857530e2e73565c40a3d06aaf8e2195a77cda55b",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
@@ -58,8 +58,8 @@
"subdir": ""
}
},
- "version": "2b33b82dfe04e4b37d62008ead7a04272a0fb42d",
- "sum": "aE4obJU9mxKR0pX/aF46JUvcvaVLkc5fra7HatmzdQg="
+ "version": "177bc8ec789fa049a9585713d232035b159f8c92",
+ "sum": "FmC8wErB/CVwI3w5RDmtOMVegDGCiQMSdKts/u/TlG8="
},
{
"source": {
@@ -68,7 +68,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "2b33b82dfe04e4b37d62008ead7a04272a0fb42d",
+ "version": "177bc8ec789fa049a9585713d232035b159f8c92",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "929f4acd01262eeb8e0395d4673cbce176322c09",
+ "version": "5db4c85d4e1b4655da68a3f3f882a6a0bcabde63",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "929f4acd01262eeb8e0395d4673cbce176322c09",
+ "version": "5db4c85d4e1b4655da68a3f3f882a6a0bcabde63",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "c0baa01acd516ffc26fe8cd5763c0eaa0cd93c88",
+ "version": "f156f4ff3bd2e600cbd7758e48fadfa0590c850e",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "c0baa01acd516ffc26fe8cd5763c0eaa0cd93c88",
- "sum": "ATGBsVlAVmzIvrRLKh7DWkI+uwM19BTtOVKMV801axo="
+ "version": "f156f4ff3bd2e600cbd7758e48fadfa0590c850e",
+ "sum": "/HVgGcQcgj+pAzRFrXlYFE9algvDEXmxcoh4tj3Le3U="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "4030e3670b359b8814aa8340ea1144f32b1f5ab3",
+ "version": "1138a088f60aa8cf4c6ef9c3c3ca23aabfbdd6e0",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"name": "alertmanager"
},
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "c2b4b2a33b91464f2e6bf1ca3fc87c851118c6d5",
- "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
+ "version": "e3a18fdd37447992c213f42d61fdaed997fe9351",
+ "sum": "/SFdKggqBEmznyeGfpyEZl4rC69mMtLGEB9lG1mQhVA="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "e239e3ee8b13b51b0f791a199813a14f74600a7e",
+ "version": "4cc25c0cb0b96042a7d36a0dd53dc6970ad607fd",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "mixin"
}
},
- "version": "b76925019deae1f902370aaa386b4e02a2e841c7",
+ "version": "7528375b8f7181c15f8df64e1fcb8acb182c454c",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 7c4e25ee898ec83408fc2133f81f8c7be16058b3..76d4650ca1ad41280076de80b7c2b44b294afcf5 100644
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index b8b5862630c88df7ee29b243041fb7f3c95f7425..9a6c083bccedc803273ca081e236e71285fb5e55 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index c4a0dd0d03d81a9698e11182346b3b7dc008bf77..04022c32aab2d8243a36b4e2baef648890e77940 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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2357,7 +2357,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4228,7 +4228,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5407,7 +5407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6032,7 +6032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -6099,7 +6099,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "1 - sum(avg by (mode) (rate(node_cpu_seconds_total{job=\"node-exporter\", mode=~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__rate_interval])))",
+ "expr": "cluster:node_cpu:ratio_rate5m{cluster=\"$cluster\"}",
"format": "time_series",
"instant": true,
"intervalFactor": 2,
@@ -9109,7 +9109,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11895,7 +11895,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12910,7 +12910,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15368,7 +15368,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17381,7 +17381,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19559,7 +19559,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21802,7 +21802,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23255,7 +23255,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24980,7 +24980,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -25950,8 +25950,8 @@ items:
"list": [
{
"current": {
- "text": "Prometheus",
- "value": "Prometheus"
+ "text": "default",
+ "value": "default"
},
"hide": 0,
"label": "Data Source",
@@ -26032,7 +26032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27002,8 +27002,8 @@ items:
"list": [
{
"current": {
- "text": "Prometheus",
- "value": "Prometheus"
+ "text": "default",
+ "value": "default"
},
"hide": 0,
"label": "Data Source",
@@ -27110,7 +27110,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28009,8 +28009,8 @@ items:
"list": [
{
"current": {
- "text": "Prometheus",
- "value": "Prometheus"
+ "text": "default",
+ "value": "default"
},
"hide": 0,
"label": "Data Source",
@@ -28090,7 +28090,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -28666,7 +28666,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -29883,7 +29883,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -31542,7 +31542,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -32766,7 +32766,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -34026,7 +34026,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -35127,7 +35127,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -36554,7 +36554,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 8e46cd3727af04868337f4d22ec50ef0605b8022..b5e453d8e6ae537bcd58f2f251896da0f93465fc 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 90c11ed67abf0df9d103ba832bd4bd0f7049ebd2..963b24e7f03e1158058096ce41aaf1c2e081683b 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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 8fae34c71e5623fb5cbb6621d2f25ed5
- checksum/grafana-dashboardproviders: 4dc71cf9c7313af2357fc284b7d642a6
- checksum/grafana-datasources: 1f2184bad7e29410ee63a5f6b6ced56c
+ checksum/grafana-config: 1ff75fd8225fb74f8949e00830249f0b
+ checksum/grafana-dashboardproviders: 627757dd1e5b9d642d9bd8c6831c1a62
+ checksum/grafana-datasources: 95aedebefdc4506190a8582126c27944
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:8.4.1
+ image: grafana/grafana:8.4.2
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 87dc05515ab160bddc181f8dce80e3ca1dbf239b..d7187a380cdb5638d2a0ced02498976876428a2c 100644
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.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.4.1
+ app.kubernetes.io/version: 8.4.2
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index c9c2f8fa3102f8f269df7dd3bfe94b65b75d00d1..f2f9d92a30d99c478f2e1744f08b9e2b74b72715 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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 6073b6cf45a043a2cf905b0755d1387af2d835f6..2260c777fef387d4a80b6bbe6f100df27d79a682 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 0f6aad976fe81dab84729c6097beaccdd01bfe7d..e8569d55ab6bf608f0fa3068ad11d63b51145cd6 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.4.1
+ app.kubernetes.io/version: 8.4.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index 42977a8540113734e904b3468355c094f1c383e3..57a65e048e64204bc57470f57d77c70076d023fc 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -1414,6 +1414,10 @@ spec:
)
) by (cluster)
record: :node_memory_MemAvailable_bytes:sum
+ - expr: |
+ sum(rate(node_cpu_seconds_total{job="node-exporter",mode!="idle",mode!="iowait",mode!="steal"}[5m])) /
+ count(sum(node_cpu_seconds_total{job="node-exporter"}) by (cluster, instance, cpu))
+ record: cluster:node_cpu:ratio_rate5m
- name: kubelet.rules
rules:
- expr: |
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index 9849f2b3b4b53ec509006092e9e59e56597d50fa..04a843a0eccbd3875794e13e153fa31d034685a1 100644
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index d04d5a06b7e7ac574f476e3f6397aa6436490695..ddbef4891369163203318bac3970c4535a0bdf16 100644
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 75a9fb9fb618af1733fc14a753536bdfaeff52df..953e9d2ad5a9e7a4f252744c9c383747aef4c26b 100644
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index f6772bbd12f3741eb3233be2f3ebdc22bc67625b..05daad8b4e7ec66a8b2e89e478c1d48a133b5671 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.33.3
+ image: quay.io/prometheus/prometheus:v2.33.4
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -27,7 +27,7 @@ spec:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -45,4 +45,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.33.3
+ version: 2.33.4
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 6cd38f4f2224153af80028fbea2e03336d7ee43b..c4d0527e684bed73d10dc92f82298f16c58c5d9c 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index ba42c1d6a0f862d70b5c83bd3da204077285965e..1703a1c86d6cb1768c1b5f046512975d9902cdcd 100644
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 5032633c03ec704b3f1a7984571ede213f452159..b35be759c6e2901da49e4efd19b6195e04924166 100644
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: default
roleRef:
@@ -27,7 +27,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: kube-system
roleRef:
@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 5ef42bc524bbd6dc13d9fa072eb123a60d476029..353576eba090e6343f4756cf1a0db2c6ad6d499f 100644
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index d99a4944824924fcb5e26459f8092b01e21ffa9c..c789e2ec7fdc2f4b20a9460a32726177e39da54f 100644
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: default
rules:
@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: kube-system
rules:
@@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index f3630eb5b50a95d91f4dd49874a522256bb6d0ae..34d1b3feecb399c27a37ccaf7edbf74cc5fc355a 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 5399102ccad523623dff7b72980a52ae9c23f982..1595ef25f8cb0e062cf5762074c67aebea4eb919 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index d5a05e1c4a8191e06d86c2e12bd6e4ddf388a87f..918ffbaea2e72efd82241f7ce3d578d491b3cdc0 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.33.3
+ app.kubernetes.io/version: 2.33.4
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index b53b995d4922856a4c22e9eb69085af67401d2f8..1719ab9faca5d699d326cf4ebf3964e39721030b 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index a0f24ecd8230394402c95fe0ec7426aa3b890535..b6220148e290505eb65a9528aa1e1acb79571642 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 10317204def0aa19e7361b9e95d172767ba8a4e8..d534434bdb934e00c0255f57ace4ba5dec79656b 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.54.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.54.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.54.1
+ image: quay.io/prometheus-operator/prometheus-operator:v0.54.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index bbab50b4fcfdb008ebc09290f00383a5bce714dd..04017a8ea275a72ec0afeb8bd96494265faa572b 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index c4c78cdfc3b3af1d4c89c3bc2d70534e6ad1bbde..5f5d631c3caf9695adda76334b9e5cc6e4df1cec 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 9d6153bc8eaa6f690ef94ff9adab7c4738f8591b..7cc6a3e11958dc13db8704ba13347d4911a72ddd 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 9f680fc8ae6943511dc5c4f83075724433a61eb2..63224d31f925ee0728d8125ceadbf2b88d04ad6a 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.54.0
+ app.kubernetes.io/version: 0.54.1
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index affe63e1dda6626b72cbc48719e7858cdfd9fa13..1b50f6dc85a86fd36ba949487317ab821a97b310 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -5163,8 +5163,9 @@ spec:
type: object
retention:
description: Time duration Prometheus shall retain data for. Default
- is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)`
- (milliseconds seconds minutes hours days weeks years).
+ is '24h' if retentionSize is not set, and must match the regular
+ expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds seconds minutes
+ hours days weeks years).
type: string
retentionSize:
description: 'Maximum amount of disk space used by blocks. Supported