From f4618411fddf8b0647ae9666050a12753f33dce0 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 5 Dec 2022 10:55:44 +0100 Subject: [PATCH] [bot] [main] Automated version update (#1952) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com> --- jsonnet/kube-prometheus/versions.json | 8 +-- jsonnetfile.lock.json | 26 +++++----- .../blackboxExporter-clusterRoleBinding.yaml | 2 +- manifests/blackboxExporter-configuration.yaml | 2 +- manifests/blackboxExporter-deployment.yaml | 6 +-- manifests/blackboxExporter-networkPolicy.yaml | 2 +- manifests/blackboxExporter-service.yaml | 2 +- .../blackboxExporter-serviceAccount.yaml | 2 +- .../blackboxExporter-serviceMonitor.yaml | 2 +- manifests/grafana-config.yaml | 2 +- manifests/grafana-dashboardDatasources.yaml | 2 +- manifests/grafana-dashboardDefinitions.yaml | 50 +++++++++---------- manifests/grafana-dashboardSources.yaml | 2 +- manifests/grafana-deployment.yaml | 12 ++--- manifests/grafana-networkPolicy.yaml | 2 +- manifests/grafana-prometheusRule.yaml | 2 +- manifests/grafana-service.yaml | 2 +- manifests/grafana-serviceAccount.yaml | 2 +- manifests/grafana-serviceMonitor.yaml | 2 +- manifests/kubeStateMetrics-clusterRole.yaml | 7 +++ ...kubernetesControlPlane-prometheusRule.yaml | 20 +++++--- manifests/nodeExporter-clusterRole.yaml | 2 +- .../nodeExporter-clusterRoleBinding.yaml | 2 +- manifests/nodeExporter-daemonset.yaml | 6 +-- manifests/nodeExporter-networkPolicy.yaml | 2 +- manifests/nodeExporter-prometheusRule.yaml | 2 +- manifests/nodeExporter-service.yaml | 2 +- manifests/nodeExporter-serviceAccount.yaml | 2 +- manifests/nodeExporter-serviceMonitor.yaml | 2 +- manifests/prometheus-clusterRole.yaml | 2 +- manifests/prometheus-clusterRoleBinding.yaml | 2 +- manifests/prometheus-networkPolicy.yaml | 2 +- manifests/prometheus-podDisruptionBudget.yaml | 2 +- manifests/prometheus-prometheus.yaml | 8 +-- manifests/prometheus-prometheusRule.yaml | 2 +- manifests/prometheus-roleBindingConfig.yaml | 2 +- ...metheus-roleBindingSpecificNamespaces.yaml | 6 +-- manifests/prometheus-roleConfig.yaml | 2 +- .../prometheus-roleSpecificNamespaces.yaml | 6 +-- manifests/prometheus-service.yaml | 2 +- manifests/prometheus-serviceAccount.yaml | 2 +- manifests/prometheus-serviceMonitor.yaml | 2 +- 42 files changed, 116 insertions(+), 101 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 295b82a3..e5fe9102 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,10 +1,10 @@ { "alertmanager": "0.24.0", - "blackboxExporter": "0.22.0", - "grafana": "9.2.6", + "blackboxExporter": "0.23.0", + "grafana": "9.3.1", "kubeStateMetrics": "2.7.0", - "nodeExporter": "1.4.0", - "prometheus": "2.40.3", + "nodeExporter": "1.5.0", + "prometheus": "2.40.5", "prometheusAdapter": "0.10.0", "prometheusOperator": "0.61.1", "kubeRbacProxy": "0.13.1", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index dd0d54fb..be3eca81 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "6a156bd5556be3fd562b4eb20eed0e5e1f34bcc5", + "version": "40cc73c22eff232534602031f0db6fa9bb918a75", "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds=" }, { @@ -58,7 +58,7 @@ "subdir": "grafana-builder" } }, - "version": "0725eec50dfd40d7c776f9ad1c83520a6c23d7ae", + "version": "ffd29d159b574ba549dd2d87953dd28a597b1472", "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" }, { @@ -68,8 +68,8 @@ "subdir": "" } }, - "version": "eb707bf721dc702baeac2827345e531d6fd207e1", - "sum": "PzmQo7PuXIvfRMXJtolk/CDFyHYTnbVlVD/8+jkz634=" + "version": "3c386687c1f8ceb6b79ff887c4a934e9cee1b90a", + "sum": "H8lcnk7gQEUoRi58/xq+JTfd2PcjJUjMQHgxGklUiFY=" }, { "source": { @@ -78,8 +78,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "0cbabf95239b33e8a469630e63c668b8e9786ad3", - "sum": "TOS2nb0CFfVg+Bc7+AT/nPivCQO6zkefZb3wHN2E5/E=" + "version": "44aea58610a9fcfa7ca1158d9c71e55d2e33ace0", + "sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI=" }, { "source": { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "0cbabf95239b33e8a469630e63c668b8e9786ad3", + "version": "44aea58610a9fcfa7ca1158d9c71e55d2e33ace0", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "54b251386815c8aa43a3b1b26cdcdb04ae8a4474", + "version": "49a12372e228f881ea388d480b45736fa6cc97cd", "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=", "name": "prometheus-operator-mixin" }, @@ -109,7 +109,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "54b251386815c8aa43a3b1b26cdcdb04ae8a4474", + "version": "49a12372e228f881ea388d480b45736fa6cc97cd", "sum": "YmH5ulQrf0BAXuOzdNaMpHnlXTJE0urk+MT0i62iM50=" }, { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "6ef6e6868dbeb7984d2d577dd4bf75c65bf1904f", + "version": "1b202b91bf269b737d9fae2930fe4fb1a5c43ab2", "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=", "name": "alertmanager" }, @@ -130,7 +130,7 @@ "subdir": "docs/node-mixin" } }, - "version": "956a3f8d47287f20478ded92ce3069ac947c6aac", + "version": "9869d34a24d440ddd661c434556482935a09baac", "sum": "5H6gKQvR23QHpvNvLkNn9DL3Vx37g015eHG2iqrlCzE=" }, { @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "dfa5cd55db548b8f1355b5aabb7cf869491272a2", + "version": "72a48321dabed43f2cd9e510dda96c50d4a48a58", "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=", "name": "prometheus" }, @@ -161,7 +161,7 @@ "subdir": "mixin" } }, - "version": "39fa00576af5f2d4fb70d6cd2449b89b8651c7e7", + "version": "72083fc5657bc42c0ad58f1a5bb01afb23e0a3ff", "sum": "7tyoT2wSJ8U7+zMmT5w549MRGk5k6ViDSz5A8/sia88=", "name": "thanos-mixin" }, diff --git a/manifests/blackboxExporter-clusterRoleBinding.yaml b/manifests/blackboxExporter-clusterRoleBinding.yaml index d9385781..67a49077 100644 --- a/manifests/blackboxExporter-clusterRoleBinding.yaml +++ b/manifests/blackboxExporter-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring roleRef: diff --git a/manifests/blackboxExporter-configuration.yaml b/manifests/blackboxExporter-configuration.yaml index 4fc3492a..ad18007e 100644 --- a/manifests/blackboxExporter-configuration.yaml +++ b/manifests/blackboxExporter-configuration.yaml @@ -46,6 +46,6 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter-configuration namespace: monitoring diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml index fcbd2e91..ba3990a6 100644 --- a/manifests/blackboxExporter-deployment.yaml +++ b/manifests/blackboxExporter-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring spec: @@ -23,14 +23,14 @@ spec: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 spec: automountServiceAccountToken: true containers: - args: - --config.file=/etc/blackbox_exporter/config.yml - --web.listen-address=:19115 - image: quay.io/prometheus/blackbox-exporter:v0.22.0 + image: quay.io/prometheus/blackbox-exporter:v0.23.0 name: blackbox-exporter ports: - containerPort: 19115 diff --git a/manifests/blackboxExporter-networkPolicy.yaml b/manifests/blackboxExporter-networkPolicy.yaml index 6bde0270..a44bc29c 100644 --- a/manifests/blackboxExporter-networkPolicy.yaml +++ b/manifests/blackboxExporter-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring spec: diff --git a/manifests/blackboxExporter-service.yaml b/manifests/blackboxExporter-service.yaml index 07a96caa..3cdafea2 100644 --- a/manifests/blackboxExporter-service.yaml +++ b/manifests/blackboxExporter-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring spec: diff --git a/manifests/blackboxExporter-serviceAccount.yaml b/manifests/blackboxExporter-serviceAccount.yaml index 3b0443d3..4560ea6a 100644 --- a/manifests/blackboxExporter-serviceAccount.yaml +++ b/manifests/blackboxExporter-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring diff --git a/manifests/blackboxExporter-serviceMonitor.yaml b/manifests/blackboxExporter-serviceMonitor.yaml index bb44db07..d148419a 100644 --- a/manifests/blackboxExporter-serviceMonitor.yaml +++ b/manifests/blackboxExporter-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.22.0 + app.kubernetes.io/version: 0.23.0 name: blackbox-exporter namespace: monitoring spec: diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index 7fbfd20a..c934f688 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 0835a2f7..c3c03d89 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 8dffbc8a..d78f5998 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index b55a10f7..7997c045 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index d1a278f5..6973ec39 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: ca4d39aa38256fd2dd32accfe3ed1041 - checksum/grafana-dashboardproviders: 3b50593cf30151e1c0119a9bc357830c - checksum/grafana-datasources: 593f5455c53076706e408e8064393e14 + checksum/grafana-config: 627fdaa411d0d3c04f1f6a9af5297fb3 + checksum/grafana-dashboardproviders: 1fe0b2fc5b553dffeaae39fcbd73b07c + checksum/grafana-datasources: 245ba8685f5357772a78910d591a985e labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.2.6 + app.kubernetes.io/version: 9.3.1 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:9.2.6 + image: grafana/grafana:9.3.1 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index c857ccff..89ad2dbc 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 4398599d..3c5c1a12 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.2.6 + app.kubernetes.io/version: 9.3.1 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index c698fc4d..f2bb6e27 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 4ff9cd80..04b3a416 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 9b9a609d..e4f60abb 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.2.6 + app.kubernetes.io/version: 9.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml index d2441287..1c1f60ad 100644 --- a/manifests/kubeStateMetrics-clusterRole.yaml +++ b/manifests/kubeStateMetrics-clusterRole.yaml @@ -78,6 +78,13 @@ rules: verbs: - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - list + - watch - apiGroups: - storage.k8s.io resources: diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml index 6d14d9f7..ce0fefd6 100644 --- a/manifests/kubernetesControlPlane-prometheusRule.yaml +++ b/manifests/kubernetesControlPlane-prometheusRule.yaml @@ -1447,11 +1447,11 @@ spec: )) record: 'node_namespace_pod:kube_pod_info:' - expr: | - count by (cluster, node) (sum by (node, cpu) ( - node_cpu_seconds_total{job="node-exporter"} - * on (namespace, pod) group_left(node) + count by (cluster, node) ( + node_cpu_seconds_total{mode="idle",job="node-exporter"} + * on (namespace, pod) group_left(node) topk by(namespace, pod) (1, node_namespace_pod:kube_pod_info:) - )) + ) record: node:node_num_cpu:sum - expr: | sum( @@ -1465,8 +1465,16 @@ 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)) + avg by (cluster, node) ( + sum without (mode) ( + rate(node_cpu_seconds_total{mode!="idle",mode!="iowait",mode!="steal",job="node-exporter"}[5m]) + ) + ) + record: node:node_cpu_utilization:ratio_rate5m + - expr: | + avg by (cluster) ( + node:node_cpu_utilization:ratio_rate5m + ) record: cluster:node_cpu:ratio_rate5m - name: kubelet.rules rules: diff --git a/manifests/nodeExporter-clusterRole.yaml b/manifests/nodeExporter-clusterRole.yaml index abe7a82c..e4a8b763 100644 --- a/manifests/nodeExporter-clusterRole.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring rules: diff --git a/manifests/nodeExporter-clusterRoleBinding.yaml b/manifests/nodeExporter-clusterRoleBinding.yaml index c21d667a..ba3594e3 100644 --- a/manifests/nodeExporter-clusterRoleBinding.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring roleRef: diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml index d01bdac5..61593e47 100644 --- a/manifests/nodeExporter-daemonset.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring spec: @@ -22,7 +22,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.4.0 + app.kubernetes.io/version: 1.5.0 spec: automountServiceAccountToken: true containers: @@ -36,7 +36,7 @@ spec: - --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|run/k3s/containerd/.+|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.4.0 + image: quay.io/prometheus/node-exporter:v1.5.0 name: node-exporter resources: limits: diff --git a/manifests/nodeExporter-networkPolicy.yaml b/manifests/nodeExporter-networkPolicy.yaml index 9280a779..c03fdd41 100644 --- a/manifests/nodeExporter-networkPolicy.yaml +++ b/manifests/nodeExporter-networkPolicy.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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring spec: diff --git a/manifests/nodeExporter-prometheusRule.yaml b/manifests/nodeExporter-prometheusRule.yaml index 92d6e133..38ed81ab 100644 --- a/manifests/nodeExporter-prometheusRule.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 prometheus: k8s role: alert-rules name: node-exporter-rules diff --git a/manifests/nodeExporter-service.yaml b/manifests/nodeExporter-service.yaml index b0a64113..7f3b2704 100644 --- a/manifests/nodeExporter-service.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring spec: diff --git a/manifests/nodeExporter-serviceAccount.yaml b/manifests/nodeExporter-serviceAccount.yaml index 0038ba3e..b3d72ad7 100644 --- a/manifests/nodeExporter-serviceAccount.yaml +++ b/manifests/nodeExporter-serviceAccount.yaml @@ -6,6 +6,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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring diff --git a/manifests/nodeExporter-serviceMonitor.yaml b/manifests/nodeExporter-serviceMonitor.yaml index 7fa95783..00081b2e 100644 --- a/manifests/nodeExporter-serviceMonitor.yaml +++ b/manifests/nodeExporter-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.4.0 + app.kubernetes.io/version: 1.5.0 name: node-exporter namespace: monitoring spec: diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index fd5ac1c2..2fbd63b9 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index 4e926298..8a566f79 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml index 37a1accf..01717ec5 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml index e6666d90..96173aa5 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 00e83041..e25412db 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.40.3 + app.kubernetes.io/version: 2.40.5 name: k8s namespace: monitoring spec: @@ -18,7 +18,7 @@ spec: port: web enableFeatures: [] externalLabels: {} - image: quay.io/prometheus/prometheus:v2.40.3 + image: quay.io/prometheus/prometheus:v2.40.5 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.40.3 + app.kubernetes.io/version: 2.40.5 podMonitorNamespaceSelector: {} podMonitorSelector: {} probeNamespaceSelector: {} @@ -45,4 +45,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: 2.40.3 + version: 2.40.5 diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index 7ae12ae1..a4ec5eb2 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.40.3 + app.kubernetes.io/version: 2.40.5 prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index 250d7ddd..81e6a552 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index a95664df..08363a79 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.40.3 + app.kubernetes.io/version: 2.40.5 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.40.3 + app.kubernetes.io/version: 2.40.5 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index b58540d1..c5797745 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index 6be84327..2f87b22e 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.40.3 + app.kubernetes.io/version: 2.40.5 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.40.3 + app.kubernetes.io/version: 2.40.5 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index 8778feee..697f559c 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index ff3aeec2..84b26574 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index 07eb85be..98ebf43e 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.40.3 + app.kubernetes.io/version: 2.40.5 name: prometheus-k8s namespace: monitoring spec: -- GitLab