diff --git a/monitoring/onpremise/grafana/dashboard-diskio.json b/monitoring/onpremise/grafana/dashboard-diskio.json
index 8f26a1311..9f4b011be 100644
--- a/monitoring/onpremise/grafana/dashboard-diskio.json
+++ b/monitoring/onpremise/grafana/dashboard-diskio.json
@@ -18,105 +18,21 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 5,
+  "id": 6,
   "links": [],
   "panels": [
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "rps"
-        },
-        "overrides": []
-      },
+      "collapsed": false,
       "gridPos": {
-        "h": 8,
-        "w": 5,
+        "h": 1,
+        "w": 24,
         "x": 0,
         "y": 0
       },
-      "id": 1,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(node_disk_reads_completed_total{kubernetes_pod_node_name=~\"$nodeNames\"}[$__rate_interval]))",
-          "instant": false,
-          "legendFormat": "Node reads per second",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Reads per second",
-      "type": "timeseries"
+      "id": 12,
+      "panels": [],
+      "title": "Disk IO",
+      "type": "row"
     },
     {
       "datasource": {
@@ -180,10 +96,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 16,
-        "w": 8,
-        "x": 5,
-        "y": 0
+        "h": 10,
+        "w": 10,
+        "x": 0,
+        "y": 1
       },
       "id": 3,
       "options": {
@@ -271,17 +187,18 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "wps"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 3,
-        "x": 13,
-        "y": 0
+        "h": 10,
+        "w": 7,
+        "x": 10,
+        "y": 1
       },
-      "id": 4,
+      "id": 2,
       "options": {
         "legend": {
           "calcs": [],
@@ -301,14 +218,14 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(delta(node_disk_read_time_seconds_total[5m])) / sum(delta(node_disk_reads_completed_total[5m]))",
+          "expr": "sum(rate(node_disk_writes_completed_total{kubernetes_pod_node_name=~\"$nodeNames\"}[$__rate_interval]))",
           "instant": false,
-          "legendFormat": "Average time spent per read",
+          "legendFormat": "Node writes per second",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Time spent per read",
+      "title": "Writes per second",
       "type": "timeseries"
     },
     {
@@ -368,17 +285,17 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "rps"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 3,
-        "x": 16,
-        "y": 0
+        "h": 10,
+        "w": 7,
+        "x": 17,
+        "y": 1
       },
-      "id": 6,
+      "id": 1,
       "options": {
         "legend": {
           "calcs": [],
@@ -398,16 +315,27 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(irate(node_disk_read_bytes_total[$__rate_interval]))",
+          "expr": "sum(rate(node_disk_reads_completed_total{kubernetes_pod_node_name=~\"$nodeNames\"}[$__rate_interval]))",
           "instant": false,
-          "legendFormat": "Average bytes read",
+          "legendFormat": "Node reads per second",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Data read rate",
+      "title": "Reads per second",
       "type": "timeseries"
     },
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 11
+      },
+      "id": 11,
+      "title": "Rates",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -416,77 +344,54 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
+            "mode": "thresholds"
           },
           "mappings": [],
+          "min": 0,
           "thresholds": {
-            "mode": "absolute",
+            "mode": "percentage",
             "steps": [
               {
                 "color": "green",
                 "value": null
               },
               {
-                "color": "red",
+                "color": "#EAB839",
                 "value": 80
+              },
+              {
+                "color": "red",
+                "value": 90
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "bytes"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 16,
+        "h": 4,
         "w": 4,
-        "x": 19,
-        "y": 0
+        "x": 0,
+        "y": 12
       },
-      "id": 8,
+      "id": 9,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "minVizHeight": 75,
+        "minVizWidth": 75,
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showThresholdLabels": true,
+        "showThresholdMarkers": true,
+        "sizing": "auto"
       },
+      "pluginVersion": "11.1.1",
       "targets": [
         {
           "datasource": {
@@ -494,15 +399,52 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(irate(node_disk_read_bytes_total[$__rate_interval])) + sum(irate(node_disk_written_bytes_total[$__rate_interval]))",
+          "expr": "node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"$nodeNames\"} - node_memory_MemFree_bytes{kubernetes_pod_node_name=~\"$nodeNames\"}",
           "instant": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"$nodeNames\"}",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "B"
         }
       ],
-      "title": "Data read/write rate",
-      "type": "timeseries"
+      "title": "Node memory usage",
+      "transformations": [
+        {
+          "id": "configFromData",
+          "options": {
+            "applyTo": {
+              "id": "byName",
+              "options": "Value"
+            },
+            "configRefId": "B",
+            "mappings": [
+              {
+                "fieldName": "sum(node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"desktop-n60j4kt\"})",
+                "handlerKey": "max",
+                "reducerId": "lastNotNull"
+              },
+              {
+                "fieldName": "Time",
+                "handlerKey": "__ignore"
+              }
+            ]
+          }
+        }
+      ],
+      "type": "gauge"
     },
     {
       "datasource": {
@@ -560,18 +502,17 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "wps"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 5,
-        "x": 0,
-        "y": 8
+        "w": 6,
+        "x": 4,
+        "y": 12
       },
-      "id": 2,
+      "id": 4,
       "options": {
         "legend": {
           "calcs": [],
@@ -591,14 +532,14 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(node_disk_writes_completed_total{kubernetes_pod_node_name=~\"$nodeNames\"}[$__rate_interval]))",
+          "expr": "sum(delta(node_disk_read_time_seconds_total[5m])) / sum(delta(node_disk_reads_completed_total[5m]))",
           "instant": false,
-          "legendFormat": "Node writes per second",
+          "legendFormat": "Average time spent per read",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Writes per second",
+      "title": "Time spent per read",
       "type": "timeseries"
     },
     {
@@ -663,9 +604,9 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 3,
-        "x": 13,
-        "y": 8
+        "w": 6,
+        "x": 10,
+        "y": 12
       },
       "id": 5,
       "options": {
@@ -740,7 +681,6 @@
             }
           },
           "mappings": [],
-          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -754,17 +694,17 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "binBps"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 3,
+        "h": 10,
+        "w": 8,
         "x": 16,
-        "y": 8
+        "y": 12
       },
-      "id": 7,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -784,14 +724,14 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(irate(node_disk_written_bytes_total[$__rate_interval]))",
+          "expr": "sum(irate(node_disk_read_bytes_total[$__rate_interval])) + sum(irate(node_disk_written_bytes_total[$__rate_interval]))",
           "instant": false,
-          "legendFormat": "Average bytes written",
+          "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Data write rate",
+      "title": "Data read/write rate",
       "type": "timeseries"
     },
     {
@@ -804,7 +744,6 @@
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "min": 0,
           "thresholds": {
@@ -824,17 +763,17 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "percentunit"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 3,
+        "h": 4,
+        "w": 4,
         "x": 0,
         "y": 16
       },
-      "id": 9,
+      "id": 10,
       "options": {
         "minVizHeight": 75,
         "minVizWidth": 75,
@@ -858,7 +797,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"$nodeNames\"} - node_memory_MemFree_bytes{kubernetes_pod_node_name=~\"$nodeNames\"}",
+          "expr": "sum(irate(node_cpu_seconds_total{kubernetes_pod_node_name=~\"$nodeNames\", mode!='idle'}[$__rate_interval]))",
           "instant": false,
           "legendFormat": "__auto",
           "range": true,
@@ -871,7 +810,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"$nodeNames\"}",
+          "expr": "sum(irate(node_cpu_usage_seconds_total{kubernetes_pod_node_name=~\"$nodeNames\", mode!='idle'}[$__rate_interval]))",
           "hide": false,
           "instant": false,
           "legendFormat": "__auto",
@@ -879,7 +818,7 @@
           "refId": "B"
         }
       ],
-      "title": "Node memory usage",
+      "title": "Node CPU usage",
       "transformations": [
         {
           "id": "configFromData",
@@ -913,54 +852,78 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
           },
           "mappings": [],
           "min": 0,
           "thresholds": {
-            "mode": "percentage",
+            "mode": "absolute",
             "steps": [
               {
                 "color": "green",
                 "value": null
               },
-              {
-                "color": "#EAB839",
-                "value": 80
-              },
               {
                 "color": "red",
-                "value": 90
+                "value": 80
               }
             ]
           },
-          "unit": "percentunit"
+          "unit": "binBps"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 3,
-        "x": 3,
-        "y": 16
+        "h": 8,
+        "w": 6,
+        "x": 4,
+        "y": 20
       },
-      "id": 10,
+      "id": 6,
       "options": {
-        "minVizHeight": 75,
-        "minVizWidth": 75,
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true,
-        "sizing": "auto"
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
       },
-      "pluginVersion": "11.1.1",
       "targets": [
         {
           "datasource": {
@@ -968,52 +931,112 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(irate(node_cpu_seconds_total{kubernetes_pod_node_name=~\"$nodeNames\", mode!='idle'}[$__rate_interval]))",
+          "expr": "sum(irate(node_disk_read_bytes_total[$__rate_interval]))",
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "Average bytes read",
           "range": true,
           "refId": "A"
+        }
+      ],
+      "title": "Data read rate",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "bytes"
         },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 10,
+        "y": 20
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(irate(node_cpu_usage_seconds_total{kubernetes_pod_node_name=~\"$nodeNames\", mode!='idle'}[$__rate_interval]))",
-          "hide": false,
+          "expr": "sum(irate(node_disk_written_bytes_total[$__rate_interval]))",
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "Average bytes written",
           "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Node CPU usage",
-      "transformations": [
-        {
-          "id": "configFromData",
-          "options": {
-            "applyTo": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "configRefId": "B",
-            "mappings": [
-              {
-                "fieldName": "sum(node_memory_MemTotal_bytes{kubernetes_pod_node_name=~\"desktop-n60j4kt\"})",
-                "handlerKey": "max",
-                "reducerId": "lastNotNull"
-              },
-              {
-                "fieldName": "Time",
-                "handlerKey": "__ignore"
-              }
-            ]
-          }
+          "refId": "A"
         }
       ],
-      "type": "gauge"
+      "title": "Data write rate",
+      "type": "timeseries"
     }
   ],
   "refresh": "5s",
@@ -1063,6 +1086,6 @@
   "timezone": "browser",
   "title": "Node disk monitoring",
   "uid": "cdy3jenh325moc",
-  "version": 4,
+  "version": 3,
   "weekStart": ""
 }