diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index f035bb599025eb56e6966fd986551adb039a66e8..e8587067885156d19a613d782fdc8454b454821b 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
{
"alertmanager": "0.25.0",
"blackboxExporter": "0.23.0",
- "grafana": "9.3.2",
+ "grafana": "9.3.6",
"kubeStateMetrics": "2.7.0",
"nodeExporter": "1.5.0",
- "prometheus": "2.41.0",
+ "prometheus": "2.42.0",
"prometheusAdapter": "0.10.0",
"prometheusOperator": "0.62.0",
"kubeRbacProxy": "0.14.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 8befec11029278a889307bcb643e1e1dc1f63774..aadbef83eafd8d4d121951ee123b1377f12c87b0 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "ee566c492bb2e0962068a531666c68e1c39d3723",
+ "version": "65aa0fa3050ebc28793cb07a6b9efc8f464c9e1b",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
- "version": "a924ab1b5fd4e6eacd7235a20978d050a27bdb65",
+ "version": "4288145d17d2efe8f32bcada567a3e9a3dd49a8c",
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
},
{
@@ -68,8 +68,8 @@
"subdir": ""
}
},
- "version": "05ca993f01ee4dada3ea4d2afd51693784c6d858",
- "sum": "SqrljHWptkp0AT2w5/+n1KdE8EWzr3KydvW2DCltKnA="
+ "version": "07ee0700006ecbc8704ff0b2790fccac18c36c6d",
+ "sum": "lKvjoL0XAZa7+qswrvdV4TzoTiE2KRB73GNyduq/Ygg="
},
{
"source": {
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "1cda0bf92ec2d053286bdac9556755506a871235",
+ "version": "5da24c250f342751981a7e4bd33cee3fd5d718cb",
"sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "1cda0bf92ec2d053286bdac9556755506a871235",
+ "version": "5da24c250f342751981a7e4bd33cee3fd5d718cb",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "57499ba176d8c217621b484ec80cba3696d7acc3",
+ "version": "6be89b4010d06cbd2561b6650b6399438900a944",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "57499ba176d8c217621b484ec80cba3696d7acc3",
- "sum": "GQ2jy+PtGkOjuqinBe00tqtcvrSAbIFJrNsLzwsaUnc="
+ "version": "6be89b4010d06cbd2561b6650b6399438900a944",
+ "sum": "9FAnfN2tcmIdCt98CjTSmYG7tOYoTFtwIUhw+QKIhRk="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "f59460bfd4bf883ca66f4391e7094c0c1794d158",
+ "version": "7923bc5f8ec6df5f0515f346fdd0d30bd28895c3",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "5bc8e9e28fbc39507aebbef1c510cf9085ab716f",
+ "version": "6a0598e563213ae95edb6f5152ffc8156abd0932",
"sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "64842f137e1ae6e041e12a2707d99d6da4ba885b",
+ "version": "c70d85baed260f6013afd18d6cd0ffcac4339861",
"sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
"name": "prometheus"
},
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "2d6b0d43f4e6cbd6089a70b4546a324052bacc8e",
+ "version": "48e82c5bd2c4b67e7a8ac7d11344303ee88c8e74",
"sum": "JGtDv5cQBGsDVhCjG0sOhVPaNO3LvP9+Lf0iVTrEPQI=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 10d9c6a9969ec196231837847bc216e00e505534..b96deee01d0ee120a69c4f7ed6ff7033c6b3eac5 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index f4c4cdef08d669132cfa684546ca4dea6abf507b..dcfaf277e062a557b4e9335ccd89f223459cb33c 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 9ec56fe68989d4a4e420d796abd646676c6b0282..dbdfc7d98d7fa63f14edc1372667f70cd0a2b5f6 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,7 +600,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2361,7 +2361,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4232,7 +4232,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5411,7 +5411,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6036,7 +6036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9113,7 +9113,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11899,7 +11899,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12914,7 +12914,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15372,7 +15372,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17385,7 +17385,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19563,7 +19563,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21806,7 +21806,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23259,7 +23259,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24984,7 +24984,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26036,7 +26036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27114,7 +27114,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28176,7 +28176,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -29231,7 +29231,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -29807,7 +29807,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31024,7 +31024,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -32683,7 +32683,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -33907,7 +33907,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -35167,7 +35167,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -36268,7 +36268,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -37695,7 +37695,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 8fc6d8ec298e9a60458e6c6d2090dd03fb785cc5..78e03951aabfd62df739f3e3c810ce10044c19a7 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index eca41b6ee7f23aa29e845c774ce3bc2296879e92..42e3660747462a14f779b14b6266efe2a014b61d 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: adbde4cde1aa3ca57c408943af53e6f7
- checksum/grafana-dashboardproviders: d8fb24844314114bed088b83042b1bdb
- checksum/grafana-datasources: 0800bab7ea1e2d8ad5c09586d089e033
+ checksum/grafana-config: fb98e3c91d822cbf66c27098b5eab383
+ checksum/grafana-dashboardproviders: 33b30eca3609e24e7ea4571ebc5f9837
+ checksum/grafana-datasources: 8590d8514fdffb4dfe82092c83e592e0
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.3.2
+ app.kubernetes.io/version: 9.3.6
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.3.2
+ image: grafana/grafana:9.3.6
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index cab676c8af1b968e87a702871b24af4ddf445623..4dd53735cae4006f171c33edb84ab0f06ddc96ea 100644
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 5d5ec46fe000c341dc2b28299c807efea670b222..41bb06df31941771e020e4a4c092b584af6f9e8c 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index ce95f0771e7def15281fec488ca8a5a9b5e10e1b..44d4fd3a8ffae28498c6988b372a1cbb0ea7bbe6 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 2f87aca3bd39c8c11f247851f3a8a24e48eaa836..6e96d64e5be2cf78eaa22be42c227574778620ae 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index f13c73c6b3fecf71c871a05c0b44d2da765a7d75..628fc5d19fe1b0fae032f856ebaaf0dcbeec6540 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: 9.3.2
+ app.kubernetes.io/version: 9.3.6
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index ce0fefd6f1d14dd1438d0b893147aedbe79da267..d707eb0810edad68a8806c94cb9ee27a70eb577f 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -1254,26 +1254,26 @@ spec:
record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate
- expr: |
container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
- * on (namespace, pod) group_left(node) topk by(namespace, pod) (1,
- max by(namespace, pod, node) (kube_pod_info{node!=""})
+ * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
+ max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_working_set_bytes
- expr: |
container_memory_rss{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
- * on (namespace, pod) group_left(node) topk by(namespace, pod) (1,
- max by(namespace, pod, node) (kube_pod_info{node!=""})
+ * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
+ max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_rss
- expr: |
container_memory_cache{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
- * on (namespace, pod) group_left(node) topk by(namespace, pod) (1,
- max by(namespace, pod, node) (kube_pod_info{node!=""})
+ * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
+ max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_cache
- expr: |
container_memory_swap{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
- * on (namespace, pod) group_left(node) topk by(namespace, pod) (1,
- max by(namespace, pod, node) (kube_pod_info{node!=""})
+ * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
+ max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_swap
- expr: |
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index e8e866bb377eab355692f36aa62367bcdbad4d88..bf69abd0f0dd959d3ae7b07905557626fa5e7db4 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index abd9d64dc3692fc3157ec1752bf3eaab34bcc0c8..551e173b31e85910305c1819bdc57283b1fbfba6 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml
index 7fbb293cd24527ab4cf4c2bde2e467fdaefb4f4b..f0f6c90b7ccc5c81bad6c9940765bad797b56a62 100644
--- a/manifests/prometheus-networkPolicy.yaml
+++ b/manifests/prometheus-networkPolicy.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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 7e3e656f66f78280b8c3922a0d6ce2bda75210ef..8b7f73ef4582a3e85cd036c66879dfa84ad08b75 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 173761360ab011c00de6fa6ec2df3334cc10e99d..4de8b818a67da3c3ff8e9a17ec90d66fbc1d9d7a 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.41.0
+ image: quay.io/prometheus/prometheus:v2.42.0
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.41.0
+ app.kubernetes.io/version: 2.42.0
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -45,4 +45,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.41.0
+ version: 2.42.0
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 559476fc44909dd1110cec5049bd9e2585b89f2e..4789c3708ce5dbfd02478e389b8a447c3804cf18 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.41.0
+ app.kubernetes.io/version: 2.42.0
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index 27685aa69f1727cae3671675110da1713b412300..389615c7c28bbd4ff98c48c61691e645ede87428 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 6658f10df9c133acf03af312b5113f11bcdd0780..6031a4672b880d392f1938327e59dc09c951ce51 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.41.0
+ app.kubernetes.io/version: 2.42.0
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.41.0
+ app.kubernetes.io/version: 2.42.0
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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 311bfbfa80b6afd25257af56f53f8cfb5546cc75..64954202aa188946ec1e57ad37e4a1f1eea34b69 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index cbdf10a1998462bea722021ccd2a045bdd848bce..91748d3e6e74cfdf191c68ec0060514d49e93249 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.41.0
+ app.kubernetes.io/version: 2.42.0
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.41.0
+ app.kubernetes.io/version: 2.42.0
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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 23ea91814ec96a3375e0da535160a493791e518d..501c5eb86365a79b65b4f86bfa12fee97d4f12ad 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 2a4ada176510ccb7ce3cf2e16fde6a98062d89fe..81921e649ef8a447d0edc237d1c9fe8dc5d0e7a0 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 936b449cecae210a7a8e68ccc1dc96d89c7f07a9..cf8eb086267ceae0459cb8f6c572d2b90fb04a7f 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.41.0
+ app.kubernetes.io/version: 2.42.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index d0821699cf3aa0ff1381b28e77cacc68cb3756cc..2e925b29eb853984ad80bc74848a77c4a054f3f6 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -4378,9 +4378,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
podMonitorSelector:
- description: '*Experimental* PodMonitors to be selected for target
- discovery. *Deprecated:* if neither this nor serviceMonitorSelector
- are specified, configuration is unmanaged.'
+ description: "*Experimental* PodMonitors to be selected for target
+ discovery. \n If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`
+ and `spec.probeSelector` are null, the Prometheus configuration
+ is unmanaged. The Prometheus operator will ensure that the Prometheus
+ configuration's Secret exists, but it is the responsibility of the
+ user to provide the raw gzipped Prometheus configuration under the
+ `prometheus.yaml.gz` key. This behavior is deprecated and will be
+ removed in the next major version of the custom resource definition.
+ It is recommended to use `spec.additionalScrapeConfigs` instead."
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
@@ -4484,7 +4490,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
probeSelector:
- description: '*Experimental* Probes to be selected for target discovery.'
+ description: "*Experimental* Probes to be selected for target discovery.
+ \n If `spec.serviceMonitorSelector`, `spec.podMonitorSelector` and
+ `spec.probeSelector` are null, the Prometheus configuration is unmanaged.
+ The Prometheus operator will ensure that the Prometheus configuration's
+ Secret exists, but it is the responsibility of the user to provide
+ the raw gzipped Prometheus configuration under the `prometheus.yaml.gz`
+ key. This behavior is deprecated and will be removed in the next
+ major version of the custom resource definition. It is recommended
+ to use `spec.additionalScrapeConfigs` instead."
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
@@ -5894,9 +5908,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
serviceMonitorSelector:
- description: ServiceMonitors to be selected for target discovery.
- *Deprecated:* if neither this nor podMonitorSelector are specified,
- configuration is unmanaged.
+ description: "ServiceMonitors to be selected for target discovery.
+ \n If `spec.serviceMonitorSelector`, `spec.podMonitorSelector` and
+ `spec.probeSelector` are null, the Prometheus configuration is unmanaged.
+ The Prometheus operator will ensure that the Prometheus configuration's
+ Secret exists, but it is the responsibility of the user to provide
+ the raw gzipped Prometheus configuration under the `prometheus.yaml.gz`
+ key. This behavior is deprecated and will be removed in the next
+ major version of the custom resource definition. It is recommended
+ to use `spec.additionalScrapeConfigs` instead."
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index f0a02cb99dac2f5668e2bb4cd443c3f6a30f923f..6426702117b8fa610e46276a03ba729824fa6ae9 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -52,6 +52,31 @@ spec:
description: 'Specification of the desired behavior of the ThanosRuler
cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties:
+ additionalArgs:
+ description: AdditionalArgs allows setting additional arguments for
+ the ThanosRuler container. It is intended for e.g. activating hidden
+ flags which are not supported by the dedicated configuration options
+ yet. The arguments are passed as-is to the ThanosRuler container
+ which may cause issues if they are invalid or not supported by the
+ given ThanosRuler version. In case of an argument conflict (e.g.
+ an argument which is already set by the operator itself) or when
+ providing an invalid argument the reconciliation will fail and an
+ error will be logged.
+ items:
+ description: Argument as part of the AdditionalArgs list.
+ properties:
+ name:
+ description: Name of the argument, e.g. "scrape.discovery-reload-interval".
+ minLength: 1
+ type: string
+ value:
+ description: Argument value, e.g. 30s. Can be empty for name-only
+ arguments (e.g. --storage.tsdb.no-lockfile)
+ type: string
+ required:
+ - name
+ type: object
+ type: array
affinity:
description: If specified, the pod's scheduling constraints.
properties: