diff --git a/dashboards/platform/gitea.json b/dashboards/platform/gitea.json
index 4747296..f13aabc 100644
--- a/dashboards/platform/gitea.json
+++ b/dashboards/platform/gitea.json
@@ -57,7 +57,7 @@
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 70,
+            "fillOpacity": 10,
             "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
@@ -65,14 +65,14 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 0,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -123,14 +123,18 @@
             "type": "prometheus",
             "uid": "kube-prometheus-stack"
           },
-          "editorMode": "code",
+          "disableTextWrap": false,
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "process_resident_memory_bytes{job=~\"gitea\",namespace=~\"$namespace\"}",
+          "expr": "process_resident_memory_bytes{namespace=\"$namespace\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
           "interval": "$resolution",
           "legendFormat": "",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Memory Usage",
@@ -156,7 +160,7 @@
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 70,
+            "fillOpacity": 10,
             "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
@@ -164,14 +168,14 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 0,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -182,6 +186,7 @@
           },
           "links": [],
           "mappings": [],
+          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -221,14 +226,18 @@
             "type": "prometheus",
             "uid": "kube-prometheus-stack"
           },
-          "editorMode": "code",
+          "disableTextWrap": false,
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "irate(process_cpu_seconds_total{job=~\"gitea\",namespace=~\"$namespace\"}[$resolution])",
+          "expr": "rate(process_cpu_seconds_total{namespace=\"$namespace\"}[24h])",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
           "instant": false,
           "interval": "$resolution",
           "legendFormat": "",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "CPU Usage",
@@ -325,30 +334,38 @@
             "type": "prometheus",
             "uid": "kube-prometheus-stack"
           },
-          "editorMode": "code",
+          "disableTextWrap": false,
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "(\n  sum without(instance, node) (topk(1, (kubelet_volume_stats_capacity_bytes{job=\"kubelet\", metrics_path=\"/metrics\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"})))\n  -\n  sum without(instance, node) (topk(1, (kubelet_volume_stats_available_bytes{job=\"kubelet\", metrics_path=\"/metrics\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"})))\n)\n",
+          "expr": "sum without(instance, node) (kubelet_volume_stats_capacity_bytes{job=\"kubelet\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"}) - sum without(instance, node) (kubelet_volume_stats_available_bytes{job=\"kubelet\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"})",
           "format": "time_series",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
           "intervalFactor": 1,
           "legendFormat": "Used Space",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "kube-prometheus-stack"
           },
-          "editorMode": "code",
+          "disableTextWrap": false,
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "sum without(instance, node) (topk(1, (kubelet_volume_stats_available_bytes{job=\"kubelet\", metrics_path=\"/metrics\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"})))\n",
+          "expr": "sum without(instance, node) (kubelet_volume_stats_available_bytes{job=\"kubelet\", namespace=\"$namespace\", persistentvolumeclaim=\"$volume\"})",
           "format": "time_series",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
           "intervalFactor": 1,
           "legendFormat": "Free Space",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "PVC Storage",
@@ -406,7 +423,7 @@
             "uid": "kube-prometheus-stack"
           },
           "editorMode": "code",
-          "expr": "time() - max(process_start_time_seconds{job=\"gitea\",namespace=~\"$namespace\"})",
+          "expr": "time() - max(process_start_time_seconds{namespace=\"$namespace\"})",
           "interval": "$resolution",
           "legendFormat": "",
           "range": true,
@@ -465,7 +482,7 @@
             "uid": "kube-prometheus-stack"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "expr": "max(gitea_organizations)",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -1215,17 +1232,17 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineStyle": {
               "fill": "solid"
             },
-            "lineWidth": 1,
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -1319,17 +1336,17 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineStyle": {
               "fill": "solid"
             },
-            "lineWidth": 1,
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -1396,6 +1413,8 @@
     }
   ],
   "preload": true,
+  "refresh": "",
+  "schemaVersion": 41,
   "tags": ["platform", "code"],
   "templating": {
     "list": [
@@ -1463,8 +1482,8 @@
       },
       {
         "current": {
-          "text": "5m",
-          "value": "5m"
+          "text": "15m",
+          "value": "15m"
         },
         "includeAll": false,
         "name": "resolution",
@@ -1475,12 +1494,12 @@
             "value": "1m"
           },
           {
-            "selected": true,
+            "selected": false,
             "text": "5m",
             "value": "5m"
           },
           {
-            "selected": false,
+            "selected": true,
             "text": "15m",
             "value": "15m"
           },
@@ -1517,5 +1536,5 @@
   "timezone": "browser",
   "title": "Gitea",
   "uid": "nNq1Iw5Gz",
-  "version": 2
+  "version": 3
 }
diff --git a/dashboards/platform/ntfy.json b/dashboards/platform/ntfy.json
index e7ca102..40b520a 100644
--- a/dashboards/platform/ntfy.json
+++ b/dashboards/platform/ntfy.json
@@ -73,7 +73,7 @@
         "orientation": "auto",
         "percentChangeColorMode": "standard",
         "reduceOptions": {
-          "calcs": ["last"],
+          "calcs": ["lastNotNull"],
           "fields": "",
           "values": false
         },
@@ -88,11 +88,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "ntfy_messages_published_success{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_messages_published_success{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Messages cached",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Published",
@@ -149,11 +153,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_messages_cached_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_messages_cached_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Messages cached",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Cached",
@@ -210,11 +218,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_visitors_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_visitors_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Visitors",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Visitors",
@@ -276,11 +288,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_users_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_users_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Visitors",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Users",
@@ -338,11 +354,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_topics_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_topics_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Topics",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Topics",
@@ -400,11 +420,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_subscribers_total",
+          "expr": "sum by(endpoint) (ntfy_subscribers_total)",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Subscribers",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Subscribers",
@@ -526,23 +550,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_messages_published_success{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_messages_published_success{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_messages_published_failure{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_messages_published_failure{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Failed",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Messages published (per second)",
@@ -651,23 +683,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_messages_published_success{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_messages_published_success{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Successful",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_messages_published_failure{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_messages_published_failure{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Failed",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Messages published",
@@ -760,11 +800,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_messages_cached_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_messages_cached_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Messages in database",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Messages cached",
@@ -856,47 +900,63 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_visitors_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_visitors_total{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Visitors",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_topics_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_topics_total{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Topics",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_subscribers_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_subscribers_total{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Subscribers",
           "range": true,
-          "refId": "C"
+          "refId": "C",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_users_total{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_users_total{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Users",
           "range": true,
-          "refId": "D"
+          "refId": "D",
+          "useBackend": false
         }
       ],
       "title": "Visitors, subscribers, topics",
@@ -988,7 +1048,7 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
+          "editorMode": "builder",
           "expr": "sum by(job) (rate(ntfy_http_requests_total{job=\"$job\"}[$rate]))",
           "legendFormat": "Requests per second",
           "range": true,
@@ -1281,11 +1341,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_attachments_total_size{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_attachments_total_size{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Total size in MB",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Attachments: Total cache size",
@@ -1393,23 +1457,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_firebase_published_success{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_firebase_published_success{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_firebase_published_failure{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_firebase_published_failure{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Failure",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Firebase messages sent",
@@ -1513,23 +1585,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_unifiedpush_published_success{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_unifiedpush_published_success{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_http_requests_total{job=\"$job\",http_code=\"507\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "rate(ntfy_http_requests_total{job=\"$job\", http_code=\"507\"}[$rate])",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Rejected (HTTP 507)",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "UnifiedPush messages",
@@ -1637,23 +1717,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_matrix_published_success{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_matrix_published_success{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "rate(ntfy_matrix_published_failure{job=\"$job\"}[$rate])",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (rate(ntfy_matrix_published_failure{job=\"$job\"}[$rate]))",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Failure",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Matrix messages published",
@@ -1761,23 +1849,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_emails_sent_success{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_emails_sent_success{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_emails_sent_failure{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_emails_sent_failure{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": false,
           "legendFormat": "Failure",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Emails sent",
@@ -1885,23 +1981,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_emails_received_success{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_emails_received_success{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Success",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_emails_received_failure{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_emails_received_failure{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Failure",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Emails received",
@@ -1994,11 +2098,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ntfy_message_publish_duration_ms{job=\"$job\"}",
+          "expr": "sum by(endpoint) (ntfy_message_publish_duration_ms{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Duration",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Message publish duration",
@@ -2103,11 +2211,15 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "go_goroutines{job=\"$job\"}",
+          "expr": "sum by(endpoint) (go_goroutines{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Go routines",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Go routines",
@@ -2201,23 +2313,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "process_open_fds{job=\"$job\"}",
+          "expr": "sum by(endpoint) (process_open_fds{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Open",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "process_max_fds{job=\"$job\"}",
+          "expr": "sum by(endpoint) (process_max_fds{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Max",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "File descriptors",
@@ -2310,23 +2430,31 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "process_resident_memory_bytes{job=\"$job\"}",
+          "expr": "sum by(endpoint) (process_resident_memory_bytes{job=\"$job\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "Resident memory used by ntfy (RSS)",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "process_virtual_memory_bytes{job=\"$job\"}",
+          "expr": "sum by(endpoint) (process_virtual_memory_bytes{job=\"$job\"})",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "Virtual memory used by ntfy (VSS)",
           "range": true,
-          "refId": "B"
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Resident/virtual memory",
@@ -2424,5 +2552,5 @@
   "timezone": "browser",
   "title": "Ntfy",
   "uid": "4abe772d4ad285c34395ac63",
-  "version": 11
+  "version": 5
 }
diff --git a/dashboards/service/gatus.json b/dashboards/service/gatus.json
index 1aa689a..4f3bc6b 100644
--- a/dashboards/service/gatus.json
+++ b/dashboards/service/gatus.json
@@ -31,11 +31,13 @@
           },
           "mappings": [
             {
-              "id": 0,
-              "op": "=",
-              "text": "N/A",
-              "type": 1,
-              "value": "null"
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
             }
           ],
           "max": 1,
@@ -72,17 +74,19 @@
       },
       "id": 9,
       "options": {
-        "minVizHeight": 75,
-        "minVizWidth": 75,
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": ["mean"],
           "fields": "",
           "values": false
         },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": false,
-        "sizing": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
       "pluginVersion": "12.0.0",
       "targets": [
@@ -91,14 +95,20 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "sum(rate(gatus_results_total{success=\"true\"}[30s])) by (key) / sum(rate(gatus_results_total[30s])) by (key)",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(endpoint) (sum by(key) (rate(gatus_results_total{success=\"true\"}[5m]))) / sum by(endpoint) (sum by(key) (rate(gatus_results_total[5m])))",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "legendFormat": "{{key}}",
-          "refId": "B"
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Success rate",
-      "type": "gauge"
+      "type": "stat"
     },
     {
       "datasource": {
@@ -120,21 +130,21 @@
             "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 10,
-            "gradientMode": "none",
+            "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -156,7 +166,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "ms"
         },
         "overrides": []
       },
@@ -214,12 +224,13 @@
             "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
+            "axisGridShow": false,
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 10,
+            "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -227,13 +238,13 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 6,
             "scaleDistribution": {
               "type": "linear"
             },
-            "showPoints": "always",
+            "showPoints": "never",
             "spanNulls": true,
             "stacking": {
               "group": "A",
@@ -256,7 +267,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "percentunit"
         },
         "overrides": []
       },
@@ -273,12 +284,12 @@
           "calcs": [],
           "displayMode": "list",
           "placement": "bottom",
-          "showLegend": true
+          "showLegend": false
         },
         "tooltip": {
           "hideZeros": false,
           "mode": "multi",
-          "sort": "none"
+          "sort": "asc"
         }
       },
       "pluginVersion": "12.0.0",
@@ -288,13 +299,18 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "sum(rate(gatus_results_total{success=\"true\"}[30s])) by (key) / sum(rate(gatus_results_total[30s])) by (key)",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(key) (rate(gatus_results_total{success=\"true\"}[5m])) / sum by(key) (rate(gatus_results_total[5m]))",
           "format": "time_series",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{key}}",
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Success rate",
@@ -320,22 +336,22 @@
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
+            "fillOpacity": 0,
+            "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -421,22 +437,22 @@
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
+            "fillOpacity": 0,
+            "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -520,15 +536,15 @@
             "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 10,
-            "gradientMode": "none",
+            "gradientMode": "opacity",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
@@ -625,5 +641,5 @@
   "timezone": "browser",
   "title": "Gatus",
   "uid": "d88e4f7842628afcf48cb603bc5b667f",
-  "version": 10
+  "version": 2
 }