diff --git a/provision/minikube/monitoring/dashboards/keycloak-perf-tests.json b/provision/minikube/monitoring/dashboards/keycloak-perf-tests.json
index 54a860525..95f0f36d3 100644
--- a/provision/minikube/monitoring/dashboards/keycloak-perf-tests.json
+++ b/provision/minikube/monitoring/dashboards/keycloak-perf-tests.json
@@ -25,6 +25,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": 6,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -88,7 +89,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "9.0.5",
+      "pluginVersion": "9.4.7",
       "targets": [
         {
           "datasource": {
@@ -149,7 +150,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "9.0.5",
+      "pluginVersion": "9.4.7",
       "targets": [
         {
           "datasource": {
@@ -179,6 +180,8 @@
             "mode": "continuous-GrYlRd"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -240,7 +243,8 @@
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -255,14 +259,14 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "instance:node_cpu:ratio",
+          "expr": "instance:node_cpu_utilisation:rate1m",
           "hide": false,
           "legendFormat": "VM : {{instance}} - ",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Node CPU Usage by VM",
+      "title": "Node CPU Usage by Node",
       "type": "timeseries"
     },
     {
@@ -277,6 +281,8 @@
             "mode": "continuous-GrYlRd"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -335,7 +341,8 @@
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -372,6 +379,8 @@
             "mode": "continuous-GrYlRd"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -429,7 +438,8 @@
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -444,14 +454,14 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "min(node_filesystem_avail_bytes{job=\"node-exporter\",device=\"/dev/vda1\"}) by (device)",
+          "expr": "min(node_filesystem_avail_bytes{job=\"node-exporter\",device!=\"tmpfs\"}) by (device,instance)",
           "hide": false,
-          "legendFormat": "VM Drive : {{device}} - ",
+          "legendFormat": "VM Drive : {{instance}} {{device}} - ",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Disk space left on VM",
+      "title": "Disk space left on Node",
       "type": "timeseries"
     },
     {
@@ -466,6 +476,8 @@
             "mode": "continuous-GrYlRd"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -524,7 +536,8 @@
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -539,14 +552,14 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "min(node_filesystem_files_free{device=\"/dev/vda1\"}/node_filesystem_files{device=\"/dev/vda1\"}) without (mountpoint)",
+          "expr": "min(node_filesystem_files_free{device!=\"tmpfs\"}/node_filesystem_files{device!=\"tmpfs\"}) without (mountpoint)",
           "hide": false,
-          "legendFormat": "{{device}}",
+          "legendFormat": "{{instance}} {{device}}",
           "range": true,
           "refId": "B"
         }
       ],
-      "title": "inodes % available on VM",
+      "title": "inodes % available on Node",
       "type": "timeseries"
     },
     {
@@ -561,6 +574,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "Node FS Total Read OPS",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -620,6 +635,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Mean",
           "sortDesc": true
         },
@@ -657,6 +673,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "Node FS Total Write OPS",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -716,6 +734,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -753,6 +772,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "Node FS Reads + Writes Total",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -812,6 +833,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -862,6 +884,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -925,6 +949,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -940,9 +965,9 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(rate(container_cpu_usage_seconds_total{job=\"cadvisor/cadvisor\", container_label_io_kubernetes_pod_namespace=\"$namespace\",container_label_io_kubernetes_container_name!=\"POD\"}\r\n[$__rate_interval])) without (cpu)",
+          "expr": "sum(irate(container_cpu_usage_seconds_total{job=\"kubelet\", namespace=\"$namespace\",container!=\"\"}\r\n[$__rate_interval])) without (cpu)",
           "hide": false,
-          "legendFormat": "{{container_label_io_kubernetes_pod_name}}",
+          "legendFormat": "{{pod}}",
           "range": true,
           "refId": "B"
         }
@@ -962,6 +987,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1013,7 +1040,7 @@
         "x": 6,
         "y": 18
       },
-      "id": 61,
+      "id": 52,
       "interval": "30",
       "options": {
         "legend": {
@@ -1025,6 +1052,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -1042,7 +1070,7 @@
           "exemplar": false,
           "expr": "irate(container_cpu_cfs_throttled_seconds_total{namespace=\"$namespace\",container=\"keycloak\"}[1m])",
           "hide": false,
-          "legendFormat": "{{container_label_io_kubernetes_pod_name}}",
+          "legendFormat": "{{pod}}",
           "range": true,
           "refId": "B"
         }
@@ -1062,6 +1090,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "Memory Usage",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1125,6 +1155,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last *",
           "sortDesc": true
         },
@@ -1140,14 +1171,14 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "container_memory_working_set_bytes{job=\"cadvisor/cadvisor\", container_label_io_kubernetes_pod_namespace=\"$namespace\",container_label_io_kubernetes_container_name!=\"POD\"}",
+          "expr": "container_memory_working_set_bytes{job=\"kubelet\", namespace=\"$namespace\",container!=\"\"}",
           "hide": false,
-          "legendFormat": "{{container_label_io_kubernetes_pod_name}}",
+          "legendFormat": "{{pod}}",
           "range": true,
           "refId": "B"
         }
       ],
-      "title": "Memory Util % by Pod",
+      "title": "Memory usage totals by Pod",
       "type": "timeseries"
     },
     {
@@ -1162,6 +1193,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "Network I/O",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1225,6 +1258,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last *",
           "sortDesc": true
         },
@@ -1240,9 +1274,9 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(rate(container_network_receive_bytes_total{job=\"cadvisor/cadvisor\",container_label_io_kubernetes_pod_namespace=\"$namespace\"}[$__rate_interval])) without (interface)",
+          "expr": "sum(irate(container_network_receive_bytes_total{job=\"kubelet\",namespace=\"$namespace\"}[1m])) without (interface)",
           "hide": false,
-          "legendFormat": "{{container_label_io_kubernetes_pod_name}} receive",
+          "legendFormat": "{{pod}} receive",
           "range": true,
           "refId": "B"
         },
@@ -1252,9 +1286,9 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "- sum(rate(container_network_transmit_bytes_total{job=\"cadvisor/cadvisor\",container_label_io_kubernetes_pod_namespace=\"$namespace\"}[$__rate_interval])) without (interface)",
+          "expr": "- sum(rate(container_network_transmit_bytes_total{job=\"kubelet\",namespace=\"$namespace\"}[$__rate_interval])) without (interface)",
           "hide": false,
-          "legendFormat": "{{container_label_io_kubernetes_pod_name}} transmit",
+          "legendFormat": "{{pod}} transmit",
           "range": true,
           "refId": "A"
         }
@@ -1283,6 +1317,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1342,7 +1378,8 @@
                 "mean"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1376,6 +1413,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1435,7 +1474,8 @@
                 "mean"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1469,6 +1509,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1528,7 +1570,8 @@
                 "mean"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1562,6 +1605,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1622,7 +1667,8 @@
                 "mean"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1656,6 +1702,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1716,7 +1764,8 @@
                 "mean"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1750,6 +1799,8 @@
                 "mode": "palette-classic"
               },
               "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
@@ -1807,7 +1858,8 @@
                 "lastNotNull"
               ],
               "displayMode": "table",
-              "placement": "bottom"
+              "placement": "bottom",
+              "showLegend": true
             },
             "tooltip": {
               "mode": "single",
@@ -1871,7 +1923,9 @@
           },
           "custom": {
             "align": "auto",
-            "displayMode": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
             "inspect": false
           },
           "mappings": [],
@@ -1897,7 +1951,7 @@
         "x": 0,
         "y": 33
       },
-      "id": 46,
+      "id": 12,
       "options": {
         "footer": {
           "countRows": false,
@@ -1909,7 +1963,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "9.0.5",
+      "pluginVersion": "9.4.7",
       "targets": [
         {
           "datasource": {
@@ -1955,6 +2009,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2001,12 +2057,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 15,
         "w": 6,
         "x": 12,
         "y": 33
       },
-      "id": 48,
+      "id": 46,
       "options": {
         "legend": {
           "calcs": [
@@ -2051,6 +2107,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2097,12 +2155,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 15,
         "w": 6,
         "x": 18,
         "y": 33
       },
-      "id": 50,
+      "id": 13,
       "options": {
         "legend": {
           "calcs": [
@@ -2125,7 +2183,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max(jvm_memory_usage_after_gc_percent) by (pod, pool)",
+          "expr": "max(jvm_memory_usage_after_gc_percent{namespace=\"$namespace\"}) by (pod, pool)",
           "format": "time_series",
           "instant": false,
           "legendFormat": "{{pod}} - {{pool}}",
@@ -2147,6 +2205,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2188,17 +2248,34 @@
               }
             ]
           },
-          "unit": "s"
+          "unit": "percentunit"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byFrameRefID",
+              "options": "B"
+            },
+            "properties": [
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              },
+              {
+                "id": "unit",
+                "value": "ops"
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
-        "h": 10,
-        "w": 6,
+        "h": 20,
+        "w": 12,
         "x": 0,
         "y": 38
       },
-      "id": 52,
+      "id": 45,
       "options": {
         "legend": {
           "calcs": [
@@ -2223,12 +2300,28 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "jvm_gc_pause_seconds_max{namespace=\"$namespace\"}",
+          "expr": "rate(jvm_gc_pause_seconds_sum{namespace=\"$namespace\"}[$__rate_interval])",
           "format": "time_series",
+          "hide": false,
           "instant": false,
           "legendFormat": "{{pod}} :  {{action}}({{cause}})",
           "range": true,
           "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "rate(jvm_gc_pause_seconds_count{namespace=\"$namespace\"}[$__rate_interval])",
+          "format": "time_series",
+          "hide": true,
+          "instant": false,
+          "legendFormat": "{{pod}} :  {{action}}({{cause}})",
+          "range": true,
+          "refId": "B"
         }
       ],
       "title": "JVM GC Pause seconds total",
@@ -2245,6 +2338,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2291,15 +2386,19 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
-        "w": 6,
-        "x": 6,
-        "y": 38
+        "h": 27,
+        "w": 12,
+        "x": 12,
+        "y": 48
       },
-      "id": 54,
+      "id": 16,
       "options": {
         "legend": {
-          "calcs": [],
+          "calcs": [
+            "min",
+            "max",
+            "lastNotNull"
+          ],
           "displayMode": "table",
           "placement": "bottom",
           "showLegend": true
@@ -2316,11 +2415,8 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "jvm_gc_live_data_size_bytes{namespace=\"$namespace\"}",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "{{pod}} : {{__name__}}",
+          "expr": "(sum(jvm_memory_used_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"heap\"}) by (pod))",
+          "legendFormat": "{{pod}} - total heap used",
           "range": true,
           "refId": "A"
         },
@@ -2330,17 +2426,37 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "jvm_gc_max_data_size_bytes{namespace=\"$namespace\"}",
-          "format": "time_series",
+          "expr": "sum(jvm_memory_committed_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"heap\"}) by (pod)",
           "hide": false,
-          "instant": false,
-          "legendFormat": "{{pod}} : {{__name__}}",
+          "legendFormat": "{{pod}} - total heap committed",
+          "range": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "editorMode": "code",
+          "expr": "(sum(jvm_memory_used_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"nonheap\"}) by (pod))",
+          "legendFormat": "{{pod}} - total nonheap used",
           "range": true,
           "refId": "C"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "editorMode": "code",
+          "expr": "sum(jvm_memory_committed_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"nonheap\"}) by (pod)",
+          "hide": false,
+          "legendFormat": "{{pod}} - total nonheap committed",
+          "range": true,
+          "refId": "D"
         }
       ],
-      "title": "JVM GC Max/Live Data",
+      "title": "Keycloak - JVM Memory",
       "type": "timeseries"
     },
     {
@@ -2354,6 +2470,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2400,21 +2518,22 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 11,
+        "h": 17,
         "w": 12,
-        "x": 12,
-        "y": 47
+        "x": 0,
+        "y": 58
       },
-      "id": 16,
+      "id": 51,
       "options": {
         "legend": {
           "calcs": [
+            "last",
             "min",
-            "max",
-            "lastNotNull"
+            "max"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -2428,8 +2547,11 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "(sum(jvm_memory_used_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"heap\"}) by (pod))",
-          "legendFormat": "{{pod}} - total heap used",
+          "exemplar": false,
+          "expr": "rate(jvm_gc_memory_allocated_bytes_total{namespace=\"$namespace\"}[$__rate_interval])",
+          "format": "time_series",
+          "instant": false,
+          "legendFormat": "{{ pod }} : JVM GC Memory Alloc Total",
           "range": true,
           "refId": "A"
         },
@@ -2439,37 +2561,17 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(jvm_memory_committed_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"heap\"}) by (pod)",
+          "exemplar": false,
+          "expr": "rate(jvm_gc_memory_promoted_bytes_total{namespace=\"$namespace\"}[$__rate_interval])",
+          "format": "time_series",
           "hide": false,
-          "legendFormat": "{{pod}} - total heap committed",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "(sum(jvm_memory_used_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"nonheap\"}) by (pod))",
-          "legendFormat": "{{pod}} - total nonheap used",
+          "instant": false,
+          "legendFormat": "{{ pod }} : JVM GC Memory Promoted Total",
           "range": true,
           "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum(jvm_memory_committed_bytes{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\",area=\"nonheap\"}) by (pod)",
-          "hide": false,
-          "legendFormat": "{{pod}} - total nonheap committed",
-          "range": true,
-          "refId": "D"
         }
       ],
-      "title": "Keycloak - JVM Memory",
+      "title": "JVM GC Memory Allocated vs Promoted",
       "type": "timeseries"
     },
     {
@@ -2483,6 +2585,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2529,12 +2633,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 15,
         "w": 6,
         "x": 0,
-        "y": 48
+        "y": 75
       },
-      "id": 56,
+      "id": 48,
       "options": {
         "legend": {
           "calcs": [
@@ -2596,6 +2700,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2642,19 +2748,15 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 15,
         "w": 6,
         "x": 6,
-        "y": 48
+        "y": 75
       },
-      "id": 58,
+      "id": 50,
       "options": {
         "legend": {
-          "calcs": [
-            "last",
-            "min",
-            "max"
-          ],
+          "calcs": [],
           "displayMode": "table",
           "placement": "bottom",
           "showLegend": true
@@ -2672,10 +2774,10 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "jvm_gc_memory_allocated_bytes_total{namespace=\"$namespace\"}",
+          "expr": "jvm_gc_live_data_size_bytes{namespace=\"$namespace\"}",
           "format": "time_series",
           "instant": false,
-          "legendFormat": "{{ pod }} : JVM GC Memory Alloc Total",
+          "legendFormat": "{{pod}} : {{__name__}}",
           "range": true,
           "refId": "A"
         },
@@ -2686,16 +2788,16 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "jvm_gc_memory_promoted_bytes_total{namespace=\"$namespace\"}",
+          "expr": "jvm_gc_max_data_size_bytes{namespace=\"$namespace\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
-          "legendFormat": "{{ pod }} : JVM GC Memory Promoted Total",
+          "legendFormat": "{{pod}} : {{__name__}}",
           "range": true,
           "refId": "C"
         }
       ],
-      "title": "JVM GC Memory Allocated vs Promoted",
+      "title": "JVM GC Max/Live Data",
       "type": "timeseries"
     },
     {
@@ -2709,6 +2811,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2755,12 +2859,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 17,
         "w": 12,
-        "x": 0,
-        "y": 58
+        "x": 12,
+        "y": 75
       },
-      "id": 15,
+      "id": 32,
       "options": {
         "legend": {
           "calcs": [
@@ -2769,7 +2873,8 @@
             "lastNotNull"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -2783,8 +2888,8 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "agroal_available_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
-          "legendFormat": "{{pod}} - available connections",
+          "expr": "jvm_threads_live_threads{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
+          "legendFormat": "{{pod}} : {{__name__}}",
           "range": true,
           "refId": "A"
         },
@@ -2794,26 +2899,14 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "agroal_awaiting_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
+          "expr": "jvm_threads_daemon_threads{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
           "hide": false,
-          "legendFormat": "{{pod}} - awaiting connections",
+          "legendFormat": "{{pod}} : {{__name__}}",
           "range": true,
           "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "agroal_active_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
-          "hide": false,
-          "legendFormat": "{{pod}} - active connections",
-          "range": true,
-          "refId": "C"
         }
       ],
-      "title": "Keycloak - JDBC Connection Pool Stats",
+      "title": "Keycloak - JVM Threads",
       "type": "timeseries"
     },
     {
@@ -2827,6 +2920,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2873,12 +2968,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 15,
-        "w": 6,
-        "x": 12,
-        "y": 58
+        "h": 17,
+        "w": 12,
+        "x": 0,
+        "y": 90
       },
-      "id": 32,
+      "id": 49,
       "options": {
         "legend": {
           "calcs": [
@@ -2887,7 +2982,10 @@
             "lastNotNull"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
         },
         "tooltip": {
           "mode": "single",
@@ -2901,25 +2999,16 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "jvm_threads_live_threads{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
-          "legendFormat": "{{pod}} - jvm threads",
+          "exemplar": false,
+          "expr": "jvm_threads_states_threads{namespace=\"$namespace\"}",
+          "format": "time_series",
+          "instant": false,
+          "legendFormat": "{{pod}} : {{__name__}} - {{state}}",
           "range": true,
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "jvm_threads_daemon_threads{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
-          "hide": false,
-          "legendFormat": "{{pod}} - jvm thread daemons",
-          "range": true,
-          "refId": "B"
         }
       ],
-      "title": "Keycloak - JVM Threads",
+      "title": "JVM Threads by States",
       "type": "timeseries"
     },
     {
@@ -2933,6 +3022,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2980,11 +3071,11 @@
       },
       "gridPos": {
         "h": 15,
-        "w": 6,
-        "x": 18,
-        "y": 58
+        "w": 12,
+        "x": 12,
+        "y": 92
       },
-      "id": 60,
+      "id": 15,
       "options": {
         "legend": {
           "calcs": [
@@ -3008,136 +3099,8 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "jvm_threads_states_threads{namespace=\"$namespace\"}",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "{{pod}} : {{__name__}} - {{state}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "JVM Threads by States",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 73
-      },
-      "id": 20,
-      "panels": [],
-      "title": "PostgreSQL DB Stats",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMin": 0,
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "max connections"
-            },
-            "properties": [
-              {
-                "id": "custom.stacking",
-                "value": {
-                  "group": "A",
-                  "mode": "none"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 74
-      },
-      "id": 22,
-      "options": {
-        "legend": {
-          "calcs": [
-            "min",
-            "max",
-            "lastNotNull"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum(pg_settings_max_connections{namespace=\"${namespace}\"}) by (server)",
-          "hide": false,
-          "legendFormat": "max connections",
+          "expr": "agroal_available_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
+          "legendFormat": "{{pod}} - available connections",
           "range": true,
           "refId": "A"
         },
@@ -3147,10 +3110,9 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "pg_stat_activity_count{datname=\"keycloak\",namespace=\"${namespace}\"} > 0",
-          "format": "time_series",
+          "expr": "agroal_awaiting_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
           "hide": false,
-          "legendFormat": "{{state}}",
+          "legendFormat": "{{pod}} - awaiting connections",
           "range": true,
           "refId": "B"
         },
@@ -3160,395 +3122,557 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(pg_stat_activity_count{datname!=\"keycloak\",namespace=\"${namespace}\"}) > 0",
+          "expr": "agroal_active_count{job=\"${namespace}/keycloak-metrics\",namespace=\"${namespace}\"}",
           "hide": false,
-          "legendFormat": "other db connections",
+          "legendFormat": "{{pod}} - active connections",
           "range": true,
           "refId": "C"
         }
       ],
-      "title": "DB Connection Usage",
+      "title": "Keycloak - JDBC Connection Pool Stats",
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
+      "collapsed": true,
       "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 74
-      },
-      "id": 23,
-      "options": {
-        "legend": {
-          "calcs": [
-            "min",
-            "max",
-            "lastNotNull"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 107
       },
-      "targets": [
+      "id": 20,
+      "panels": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "100 * (rate(pg_stat_database_blks_hit{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]) /\n((rate(pg_stat_database_blks_hit{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]) +\nrate(pg_stat_database_blks_read{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]))>0))",
-          "legendFormat": "cache hit rate",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "DB Cache hit rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
               },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 82
-      },
-      "id": 24,
-      "options": {
-        "legend": {
-          "calcs": [
-            "min",
-            "max",
-            "lastNotNull"
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "axisSoftMin": 0,
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "normal"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "none"
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "max connections"
+                },
+                "properties": [
+                  {
+                    "id": "custom.stacking",
+                    "value": {
+                      "group": "A",
+                      "mode": "none"
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 84
+          },
+          "id": 22,
+          "options": {
+            "legend": {
+              "calcs": [
+                "min",
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "sum(pg_settings_max_connections{namespace=\"${namespace}\"}) by (server)",
+              "hide": false,
+              "legendFormat": "max connections",
+              "range": true,
+              "refId": "A"
+            },
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "pg_stat_activity_count{datname=\"keycloak\",namespace=\"${namespace}\"} > 0",
+              "format": "time_series",
+              "hide": false,
+              "legendFormat": "{{state}}",
+              "range": true,
+              "refId": "B"
+            },
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "sum(pg_stat_activity_count{datname!=\"keycloak\",namespace=\"${namespace}\"}) > 0",
+              "hide": false,
+              "legendFormat": "other db connections",
+              "range": true,
+              "refId": "C"
+            }
           ],
-          "displayMode": "table",
-          "placement": "bottom"
+          "title": "DB Connection Usage",
+          "type": "timeseries"
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "rate(pg_stat_bgwriter_checkpoints_req{namespace=\"${namespace}\"}[5m]) /\n(rate(pg_stat_bgwriter_checkpoints_req{namespace=\"${namespace}\"}[5m]) + rate(pg_stat_bgwriter_checkpoints_timed{namespace=\"${namespace}\"}[5m])) * 100",
-          "legendFormat": "requested checkpoint rate",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "DB Requested buffer checkpoint rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "percent"
             },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 84
+          },
+          "id": 23,
+          "options": {
+            "legend": {
+              "calcs": [
+                "min",
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
             },
-            "thresholdsStyle": {
-              "mode": "off"
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
             }
           },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
               },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "string"
+              "editorMode": "code",
+              "expr": "100 * (rate(pg_stat_database_blks_hit{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]) /\n((rate(pg_stat_database_blks_hit{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]) +\nrate(pg_stat_database_blks_read{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval]))>0))",
+              "legendFormat": "cache hit rate",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "DB Cache hit rate",
+          "type": "timeseries"
         },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 82
-      },
-      "id": 21,
-      "options": {
-        "legend": {
-          "calcs": [
-            "min",
-            "max",
-            "lastNotNull"
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 8,
+            "x": 0,
+            "y": 92
+          },
+          "id": 24,
+          "options": {
+            "legend": {
+              "calcs": [
+                "min",
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "rate(pg_stat_bgwriter_checkpoints_req{namespace=\"${namespace}\"}[5m]) /\n(rate(pg_stat_bgwriter_checkpoints_req{namespace=\"${namespace}\"}[5m]) + rate(pg_stat_bgwriter_checkpoints_timed{namespace=\"${namespace}\"}[5m])) * 100",
+              "legendFormat": "requested checkpoint rate",
+              "range": true,
+              "refId": "A"
+            }
           ],
-          "displayMode": "table",
-          "placement": "bottom"
+          "title": "DB Requested buffer checkpoint rate",
+          "type": "timeseries"
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "rate(pg_stat_database_deadlocks{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval])",
-          "legendFormat": "{{pod}} : pg_stat_db_deadlocks",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "DB Total Number of Dead Locks",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "string"
             },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 8,
+            "x": 8,
+            "y": 92
+          },
+          "id": 21,
+          "options": {
+            "legend": {
+              "calcs": [
+                "min",
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
             },
-            "thresholdsStyle": {
-              "mode": "off"
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
             }
           },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
               },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "string"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 90
-      },
-      "id": 18,
-      "options": {
-        "legend": {
-          "calcs": [
-            "min",
-            "max",
-            "lastNotNull"
+              "editorMode": "code",
+              "expr": "rate(pg_stat_database_deadlocks{datname=\"keycloak\",namespace=\"${namespace}\"}[$__rate_interval])",
+              "legendFormat": "{{pod}} : pg_stat_db_deadlocks",
+              "range": true,
+              "refId": "A"
+            }
           ],
-          "displayMode": "table",
-          "placement": "bottom"
+          "title": "DB Total Number of Dead Locks",
+          "type": "timeseries"
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "sum(pg_locks_waiting_count{job=\"postgres-exporter\", datname=\"keycloak\",namespace=\"${namespace}\"}) without (mode)",
-          "legendFormat": "{{pod}} : pg_locks_waiting_count",
-          "range": true,
-          "refId": "A"
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "string"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 8,
+            "x": 16,
+            "y": 92
+          },
+          "id": 18,
+          "options": {
+            "legend": {
+              "calcs": [
+                "min",
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "sum(pg_locks_waiting_count{job=\"postgres-exporter\", datname=\"keycloak\",namespace=\"${namespace}\"}) without (mode)",
+              "legendFormat": "{{pod}} : pg_locks_waiting_count",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "DB Total Number of Locks Waiting",
+          "type": "timeseries"
         }
       ],
-      "title": "DB Total Number of Locks Waiting",
-      "type": "timeseries"
+      "title": "PostgreSQL DB Stats",
+      "type": "row"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 36,
+  "refresh": "5s",
+  "revision": 1,
+  "schemaVersion": 38,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -3556,8 +3680,8 @@
       {
         "current": {
           "selected": false,
-          "text": "keycloak",
-          "value": "keycloak"
+          "text": "runner-keycloak",
+          "value": "runner-keycloak"
         },
         "datasource": {
           "type": "prometheus",
@@ -3589,6 +3713,6 @@
   "timezone": "",
   "title": "keycloak-perf-tests",
   "uid": "basic-keycloak-dashboard-by-namespace",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }