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

[bot] [main] Automated version update

jsonnet/kube-prometheus/versions.json

@@ -1,7 +1,7 @@
 {
   "alertmanager": "0.23.0",
   "blackboxExporter": "0.19.0",
-  "grafana": "8.2.1",
+  "grafana": "8.2.2",
   "kubeStateMetrics": "2.2.3",
   "nodeExporter": "1.2.2",
   "prometheus": "2.30.3",

jsonnetfile.lock.json

@@ -18,8 +18,8 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "38a7d79810bd273bd078bf0931480b743afee003",
-      "sum": "drRRtMPhvpUZ8v7Weqz7Cg2pwDA2cSb6X1pjBPoCx1w="
+      "version": "02cdd195396ad2a81ce6001c8f15615968ba9efb",
+      "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU="
     },
     {
       "source": {
@@ -38,7 +38,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "87b6b50706dfa57b2470470422770f8e7574b7db",
+      "version": "17eca514f990530c411c2e9411af5213dd4bd224",
       "sum": "U34Nd1ViO2LZ3D8IzygPPRfUcy6zOgCnTMVHZ+9O/QE="
     },
     {
@@ -68,7 +68,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "b730cb415234509e6a1425c79e826f2e7688d27b",
+      "version": "25066f254b11143486272cb7bb5956e8b3a2a61b",
       "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
     },
     {
@@ -78,7 +78,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "b730cb415234509e6a1425c79e826f2e7688d27b",
+      "version": "25066f254b11143486272cb7bb5956e8b3a2a61b",
       "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
     },
     {
@@ -120,8 +120,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "a59b2d89903229db0019f73200ec209758f2fd26",
-      "sum": "Yr1xB+EEdBYRbsCtl4MDvx6phDg3UoMQtfpWADHyeGk="
+      "version": "fbc23548b9ec9efc509f5957773e6fe383202aa6",
+      "sum": "7EybLA+57k2P4GclrYjPWZU+lZzxYhXN0NAxNPfO8/c="
     },
     {
       "source": {
@@ -130,7 +130,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "c092a74be9cc3e8e3db41efe3136128cef6c1add",
+      "version": "a6e6011d55ed913cb8e53968cead9a6a6fd84911",
       "sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
       "name": "prometheus"
     },
@@ -141,7 +141,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "d2d53e575b489a8cbfc9e1723d0e3f62a68faf39",
+      "version": "18049504408c5ae09deb76961b92baf7f96b0e93",
       "sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=",
       "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.1
+    app.kubernetes.io/version: 8.2.2
   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.1
+    app.kubernetes.io/version: 8.2.2
   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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-alertmanager-overview
     namespace: monitoring
 - apiVersion: v1
@@ -2332,7 +2332,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-apiserver
     namespace: monitoring
 - apiVersion: v1
@@ -4203,7 +4203,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-cluster-total
     namespace: monitoring
 - apiVersion: v1
@@ -5369,7 +5369,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-controller-manager
     namespace: monitoring
 - apiVersion: v1
@@ -8382,7 +8382,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-cluster
     namespace: monitoring
 - apiVersion: v1
@@ -11115,7 +11115,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -12082,7 +12082,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-node
     namespace: monitoring
 - apiVersion: v1
@@ -14498,7 +14498,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-pod
     namespace: monitoring
 - apiVersion: v1
@@ -16473,7 +16473,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-workload
     namespace: monitoring
 - apiVersion: v1
@@ -18613,7 +18613,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 8.2.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-k8s-resources-workloads-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -20856,7 +20856,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-kubelet
     namespace: monitoring
 - apiVersion: v1
@@ -22309,7 +22309,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-namespace-by-pod
     namespace: monitoring
 - apiVersion: v1
@@ -24034,7 +24034,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-namespace-by-workload
     namespace: monitoring
 - apiVersion: v1
@@ -25086,7 +25086,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-node-cluster-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -26164,7 +26164,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-node-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -27144,7 +27144,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-nodes
     namespace: monitoring
 - apiVersion: v1
@@ -27710,7 +27710,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-persistentvolumesusage
     namespace: monitoring
 - apiVersion: v1
@@ -28927,7 +28927,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-pod-total
     namespace: monitoring
 - apiVersion: v1
@@ -30586,7 +30586,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-prometheus-remote-write
     namespace: monitoring
 - apiVersion: v1
@@ -31810,7 +31810,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-prometheus
     namespace: monitoring
 - apiVersion: v1
@@ -33056,7 +33056,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-proxy
     namespace: monitoring
 - apiVersion: v1
@@ -34145,7 +34145,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.1
+      app.kubernetes.io/version: 8.2.2
     name: grafana-dashboard-scheduler
     namespace: monitoring
 - apiVersion: v1
@@ -35572,7 +35572,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.1
+      app.kubernetes.io/version: 8.2.2
     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.1
+    app.kubernetes.io/version: 8.2.2
   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.1
+    app.kubernetes.io/version: 8.2.2
   name: grafana
   namespace: monitoring
 spec:
@@ -18,18 +18,18 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/grafana-config: 11905dc0549e921f5d3befd288dbf9d5
-        checksum/grafana-dashboardproviders: 4278ba47b6379fd0ee12ad9c15fedda2
-        checksum/grafana-datasources: c83e12e4791b0aef701753f70bfc1fe9
+        checksum/grafana-config: 46c0415b77b987f164f26db3534f3126
+        checksum/grafana-dashboardproviders: c6b43488328ffef02efb6cf85119aee7
+        checksum/grafana-datasources: fe3334ba9a65c5dc3f3546019f2122ee
       labels:
         app.kubernetes.io/component: grafana
         app.kubernetes.io/name: grafana
         app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 8.2.1
+        app.kubernetes.io/version: 8.2.2
     spec:
       containers:
       - env: []
-        image: grafana/grafana:8.2.1
+        image: grafana/grafana:8.2.2
         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.1
+    app.kubernetes.io/version: 8.2.2
   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.1
+    app.kubernetes.io/version: 8.2.2
   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.1
+    app.kubernetes.io/version: 8.2.2
   name: grafana
   namespace: monitoring
 spec:

manifests/node-exporter-prometheusRule.yaml

@@ -289,16 +289,18 @@ spec:
       record: instance:node_load1_per_cpu:ratio
     - expr: |
         1 - (
-          node_memory_MemAvailable_bytes{job="node-exporter"}
-          or
           (
-            node_memory_Buffers_bytes{job="node-exporter"}
-            +
-            node_memory_Cached_bytes{job="node-exporter"}
-            +
-            node_memory_MemFree_bytes{job="node-exporter"}
-            +
-            node_memory_Slab_bytes{job="node-exporter"}
+            node_memory_MemAvailable_bytes{job="node-exporter"}
+            or
+            (
+              node_memory_Buffers_bytes{job="node-exporter"}
+              +
+              node_memory_Cached_bytes{job="node-exporter"}
+              +
+              node_memory_MemFree_bytes{job="node-exporter"}
+              +
+              node_memory_Slab_bytes{job="node-exporter"}
+            )
           )
         /
           node_memory_MemTotal_bytes{job="node-exporter"}