Merge pull request #1536 from prometheus-operator/automated-updates-main

jsonnet/kube-prometheus/versions.json

@@ -1,9 +1,9 @@
 {
   "alertmanager": "0.23.0",
   "blackboxExporter": "0.19.0",
-  "grafana": "8.2.5",
+  "grafana": "8.2.6",
   "kubeStateMetrics": "2.2.4",
-  "nodeExporter": "1.3.0",
+  "nodeExporter": "1.3.1",
   "prometheus": "2.31.1",
   "prometheusAdapter": "0.9.1",
   "prometheusOperator": "0.52.1",

jsonnetfile.lock.json

@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "7572a61a39d4eaad596ab8d9364f7df9a84ff4a3",
+      "version": "29292aa7bdafaf65cb5e054591fe0ff07b36f5ee",
       "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU="
     },
     {
@@ -38,7 +38,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "84900d9dc450116ad66864f48088f92ccae36c54",
+      "version": "9927be87af4be9ff6b009e4503868b1b5493011b",
       "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
     },
     {
@@ -48,8 +48,8 @@
           "subdir": ""
         }
       },
-      "version": "ee732bc30e1a5bc8b45e436508b7685bb1109a28",
+      "version": "9821d07e94e9a9916575a234fb699ae3331fa939",
-      "sum": "TCe4Sctkv+i5/UzDy10Vda5s1Slt6EGzEES9Mi5kTko="
+      "sum": "xubNXyvDwUw9GZzi9BRb6ob3bYzfoMr5F5zCVn2d7ag="
     },
     {
       "source": {
@@ -58,7 +58,7 @@
           "subdir": "lib/promgrafonnet"
         }
       },
-      "version": "ee732bc30e1a5bc8b45e436508b7685bb1109a28",
+      "version": "9821d07e94e9a9916575a234fb699ae3331fa939",
       "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
     },
     {
@@ -68,7 +68,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "0c9580d09c6ac8b35630813afbcc0fe217ce1874",
+      "version": "840d30ce57f75d0ec466a2d612879602c433d5e6",
       "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
     },
     {
@@ -78,7 +78,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "0c9580d09c6ac8b35630813afbcc0fe217ce1874",
+      "version": "840d30ce57f75d0ec466a2d612879602c433d5e6",
       "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
     },
     {
@@ -88,7 +88,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "787f54b055f797464d5832ace1c7f8318321c87a",
+      "version": "009606736ffdcc14b23c77831a5ded26b3c8db43",
       "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
       "name": "prometheus-operator-mixin"
     },
@@ -99,7 +99,7 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "787f54b055f797464d5832ace1c7f8318321c87a",
+      "version": "009606736ffdcc14b23c77831a5ded26b3c8db43",
       "sum": "T1NSdVUDjEfANyLi73zS8+ysAXMmoRLObI6vsCnDAJQ="
     },
     {
@@ -120,7 +120,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "9fbb56c9c80d5486d6de5e06a224a1eb343b28e7",
+      "version": "b5cb72b4097f5782474efb37b66edace7a33cdb1",
       "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
     },
     {
@@ -130,7 +130,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "0e82a96e2f2ecb0110cdfad014aaa6babf4f4941",
+      "version": "14986e52cf256b6ed0590b705fbcbfc938e1c4e4",
       "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
       "name": "prometheus"
     },
@@ -141,7 +141,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "78391ded0f4821f650ed2c4f097b505f4fa30713",
+      "version": "c0a3f145f8c8aa3f5146d8c5e504aae74c8dfa42",
       "sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=",
       "name": "thanos-mixin"
     },

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana-config
   namespace: monitoring
 stringData:

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana-datasources
   namespace: monitoring
 stringData:

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.2.5
+      app.kubernetes.io/version: 8.2.6
     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.2.5
+      app.kubernetes.io/version: 8.2.6
     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.2.5
+      app.kubernetes.io/version: 8.2.6
     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.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-controller-manager
     namespace: monitoring
 - apiVersion: v1
@@ -8484,7 +8484,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-cluster
     namespace: monitoring
 - apiVersion: v1
@@ -11270,7 +11270,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -11328,13 +11328,31 @@ items:
                           "points": false,
                           "renderer": "flot",
                           "seriesOverrides": [
-
+                              {
+                                  "alias": "max capacity",
+                                  "color": "#F2495C",
+                                  "dashes": true,
+                                  "fill": 0,
+                                  "hiddenSeries": true,
+                                  "hideTooltip": true,
+                                  "legend": true,
+                                  "linewidth": 2,
+                                  "stack": false
+                              }
                           ],
                           "spaceLength": 10,
                           "span": 12,
                           "stack": true,
                           "steppedLine": false,
                           "targets": [
+                              {
+                                  "expr": "sum(kube_node_status_capacity{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"})",
+                                  "format": "time_series",
+                                  "intervalFactor": 2,
+                                  "legendFormat": "max capacity",
+                                  "legendLink": null,
+                                  "step": 10
+                              },
                               {
                                   "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
                                   "format": "time_series",
@@ -11705,13 +11723,31 @@ items:
                           "points": false,
                           "renderer": "flot",
                           "seriesOverrides": [
-
+                              {
+                                  "alias": "max capacity",
+                                  "color": "#F2495C",
+                                  "dashes": true,
+                                  "fill": 0,
+                                  "hiddenSeries": true,
+                                  "hideTooltip": true,
+                                  "legend": true,
+                                  "linewidth": 2,
+                                  "stack": false
+                              }
                           ],
                           "spaceLength": 10,
                           "span": 12,
                           "stack": true,
                           "steppedLine": false,
                           "targets": [
+                              {
+                                  "expr": "sum(kube_node_status_capacity{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"})",
+                                  "format": "time_series",
+                                  "intervalFactor": 2,
+                                  "legendFormat": "max capacity",
+                                  "legendLink": null,
+                                  "step": 10
+                              },
                               {
                                   "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\", container!=\"\"}) by (pod)",
                                   "format": "time_series",
@@ -12249,7 +12285,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-node
     namespace: monitoring
 - apiVersion: v1
@@ -14707,7 +14743,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-pod
     namespace: monitoring
 - apiVersion: v1
@@ -16720,7 +16756,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-workload
     namespace: monitoring
 - apiVersion: v1
@@ -18898,7 +18934,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-k8s-resources-workloads-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -21141,7 +21177,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-kubelet
     namespace: monitoring
 - apiVersion: v1
@@ -22594,7 +22630,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-namespace-by-pod
     namespace: monitoring
 - apiVersion: v1
@@ -24319,7 +24355,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-namespace-by-workload
     namespace: monitoring
 - apiVersion: v1
@@ -25371,7 +25407,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-node-cluster-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -26449,7 +26485,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-node-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -27429,7 +27465,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-nodes
     namespace: monitoring
 - apiVersion: v1
@@ -28005,7 +28041,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-persistentvolumesusage
     namespace: monitoring
 - apiVersion: v1
@@ -29222,7 +29258,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-pod-total
     namespace: monitoring
 - apiVersion: v1
@@ -30881,7 +30917,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-prometheus-remote-write
     namespace: monitoring
 - apiVersion: v1
@@ -32105,7 +32141,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-prometheus
     namespace: monitoring
 - apiVersion: v1
@@ -33365,7 +33401,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-proxy
     namespace: monitoring
 - apiVersion: v1
@@ -34466,7 +34502,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-scheduler
     namespace: monitoring
 - apiVersion: v1
@@ -35893,7 +35929,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.5
+      app.kubernetes.io/version: 8.2.6
     name: grafana-dashboard-workload-total
     namespace: monitoring
 kind: ConfigMapList

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana-dashboards
   namespace: monitoring

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana
   namespace: monitoring
 spec:
@@ -18,18 +18,18 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/grafana-config: 36738edb3585a7b4c59e0ba943c39c0f
+        checksum/grafana-config: 4b307096c13247f897eb04971bc72f1d
-        checksum/grafana-dashboardproviders: 12a41272fc79f3d3ad103c8db5a7e8ed
+        checksum/grafana-dashboardproviders: a2828e7ffe910faaecda6b5af486a5cd
-        checksum/grafana-datasources: 362f3d86f6b4437765b9d03f74316fa7
+        checksum/grafana-datasources: 450b1a10b3cb4a755bdbc77f2c4a58ba
       labels:
         app.kubernetes.io/component: grafana
         app.kubernetes.io/name: grafana
         app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 8.2.5
+        app.kubernetes.io/version: 8.2.6
     spec:
       containers:
       - env: []
-        image: grafana/grafana:8.2.5
+        image: grafana/grafana:8.2.6
         name: grafana
         ports:
         - containerPort: 3000

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana
   namespace: monitoring
 spec:

manifests/grafana-serviceAccount.yaml

@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 8.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana
   namespace: monitoring

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.2.5
+    app.kubernetes.io/version: 8.2.6
   name: grafana
   namespace: monitoring
 spec:

manifests/kubernetesControlPlane-prometheusRule.yaml

@@ -278,7 +278,7 @@ spec:
     - alert: KubeMemoryOvercommit
       annotations:
         description: Cluster has overcommitted memory resource requests for Pods by
-          {{ $value }} bytes and cannot tolerate node failure.
+          {{ $value | humanize }} bytes and cannot tolerate node failure.
         runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubememoryovercommit
         summary: Cluster has overcommitted memory resource requests.
       expr: |

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.3.0
+    app.kubernetes.io/version: 1.3.1
   name: node-exporter
   namespace: monitoring
 rules:

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.3.0
+    app.kubernetes.io/version: 1.3.1
   name: node-exporter
   namespace: monitoring
 roleRef:

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.3.0
+    app.kubernetes.io/version: 1.3.1
   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.3.0
+        app.kubernetes.io/version: 1.3.1
     spec:
       containers:
       - args:
@@ -34,7 +34,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.3.0
+        image: quay.io/prometheus/node-exporter:v1.3.1
         name: node-exporter
         resources:
           limits:

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.3.0
+    app.kubernetes.io/version: 1.3.1
     prometheus: k8s
     role: alert-rules
   name: node-exporter-rules

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.3.0
+    app.kubernetes.io/version: 1.3.1
   name: node-exporter
   namespace: monitoring
 spec:

manifests/nodeExporter-serviceAccount.yaml

@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: node-exporter
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 1.3.0
+    app.kubernetes.io/version: 1.3.1
   name: node-exporter
   namespace: monitoring

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.3.0
+    app.kubernetes.io/version: 1.3.1
   name: node-exporter
   namespace: monitoring
 spec: