diff --git a/.gitignore b/.gitignore
index ebaf100..7f40959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,3 @@ docker-data/
 # Misc
 *.tsbuildinfo
 next-env.d.ts
-monitoring/metrics-token
diff --git a/monitoring/grafana-dashboards/docker.json b/monitoring/grafana-dashboards/docker.json
index 18b8be6..3a88643 100644
--- a/monitoring/grafana-dashboards/docker.json
+++ b/monitoring/grafana-dashboards/docker.json
@@ -61,7 +61,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "format": "none",
@@ -142,7 +142,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "format": "mbytes",
@@ -223,7 +223,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "format": "percent",
@@ -306,7 +306,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "editable": true,
           "error": false,
@@ -396,7 +396,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "editable": true,
           "error": false,
@@ -487,7 +487,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -565,7 +565,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROMETHEUS}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
diff --git a/monitoring/grafana-dashboards/memento.json b/monitoring/grafana-dashboards/memento.json
new file mode 100644
index 0000000..414f040
--- /dev/null
+++ b/monitoring/grafana-dashboards/memento.json
@@ -0,0 +1,589 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "title": "Application Health & Status",
+      "type": "row"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 0,
+        "y": 1
+      },
+      "id": 2,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_uptime_seconds",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Uptime",
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "color": "red",
+                  "index": 0,
+                  "text": "DOWN"
+                },
+                "1": {
+                  "color": "green",
+                  "index": 1,
+                  "text": "UP"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 8,
+        "y": 1
+      },
+      "id": 3,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_db_up",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Database Status",
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "color": "red",
+                  "index": 0,
+                  "text": "DOWN"
+                },
+                "1": {
+                  "color": "green",
+                  "index": 1,
+                  "text": "UP"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 16,
+        "y": 1
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_redis_up",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Redis Status",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 5
+      },
+      "id": 5,
+      "title": "Database & Application Statistics",
+      "type": "row"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 0,
+        "y": 6
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_users_total",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Total Users",
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "orange",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 8,
+        "y": 6
+      },
+      "id": 7,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_notebooks_total",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Total Notebooks",
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "purple",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 16,
+        "y": 6
+      },
+      "id": 8,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "center",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "8.0.0",
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "editorMode": "code",
+          "expr": "memento_notes_total",
+          "instant": true,
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Total Notes",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 9,
+      "title": "Performance & Latencies",
+      "type": "row"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "drawStyle": "line",
+            "lineInterpolation": "smooth"
+          },
+          "unit": "ms"
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 11
+      },
+      "id": 10,
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_db_latency_ms",
+          "legendFormat": "Database Query Latency",
+          "refId": "A"
+        }
+      ],
+      "title": "PostgreSQL Query Latency",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "drawStyle": "line",
+            "lineInterpolation": "smooth"
+          },
+          "unit": "ms"
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 11
+      },
+      "id": 11,
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_redis_latency_ms",
+          "legendFormat": "Redis Ping Latency",
+          "refId": "A"
+        }
+      ],
+      "title": "Redis Ping Latency",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 12,
+      "title": "Application Resources & Memory",
+      "type": "row"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "drawStyle": "line"
+          },
+          "unit": "bytes"
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 19
+      },
+      "id": 13,
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_process_rss_bytes",
+          "legendFormat": "Process RSS Memory",
+          "refId": "A"
+        },
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_process_heap_total_bytes",
+          "legendFormat": "Process Heap Total",
+          "refId": "B"
+        },
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_process_heap_used_bytes",
+          "legendFormat": "Process Heap Used",
+          "refId": "C"
+        }
+      ],
+      "title": "Node.js Process Memory Usage",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "drawStyle": "line"
+          },
+          "unit": "bytes"
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 19
+      },
+      "id": 14,
+      "targets": [
+        {
+          "datasource": "Prometheus",
+          "expr": "memento_redis_memory_bytes",
+          "legendFormat": "Redis Memory Used",
+          "refId": "A"
+        }
+      ],
+      "title": "Redis Memory Usage",
+      "type": "timeseries"
+    }
+  ],
+  "schemaVersion": 39,
+  "tags": [
+    "memento",
+    "app",
+    "production"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Memento App Metrics",
+  "uid": "memento-app",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/monitoring/grafana-dashboards/node-exporter.json b/monitoring/grafana-dashboards/node-exporter.json
index 1e2cdbf..4686213 100644
--- a/monitoring/grafana-dashboards/node-exporter.json
+++ b/monitoring/grafana-dashboards/node-exporter.json
@@ -65,7 +65,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": null,
           "description": "Busy state of all CPU cores together",
           "format": "percent",
@@ -144,7 +144,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 0,
           "description": "Used RAM Memory without swap and cache",
           "format": "percent",
@@ -221,7 +221,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": null,
           "description": "Used Swap",
           "format": "percent",
@@ -298,7 +298,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": null,
           "description": "Busy state of all CPU cores together (1 min average)",
           "format": "percent",
@@ -394,7 +394,7 @@
             "trans_errs_lo": "#890F02"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "Basic network info per interface.",
           "fill": 3,
           "id": 74,
@@ -503,7 +503,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "Total number of CPU cores",
           "format": "none",
           "gauge": {
@@ -579,7 +579,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "Total RAM",
           "format": "bytes",
@@ -656,7 +656,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "Total SWAP",
           "format": "bytes",
@@ -733,7 +733,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "System Load (1m avg)",
           "format": "none",
@@ -811,7 +811,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 1,
           "description": "System uptime",
           "format": "s",
@@ -889,7 +889,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": null,
           "description": "Used RootFS",
           "format": "percent",
@@ -986,7 +986,7 @@
             "user": "#5195CE"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "Basic CPU info",
           "fill": 4,
@@ -1093,7 +1093,7 @@
             "Unused": "#EAB839"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "Basic memory usage",
           "fill": 4,
@@ -1341,7 +1341,7 @@
             "user": "#5195CE"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "CPU info",
           "fill": 3,
@@ -1499,7 +1499,7 @@
             "Unused - Free memory unasigned": "#052B51"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "description": "Memory Stack",
           "fill": 3,
@@ -1765,7 +1765,7 @@
             "trans_errs_lo": "#890F02"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "Network info. Need to fix https://github.com/grafana/grafana/issues/1271",
           "fill": 3,
           "id": 59,
@@ -1897,7 +1897,7 @@
             "io time": "#890F02"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 3,
           "description": "Need to fix https://github.com/grafana/grafana/issues/1271",
           "fill": 3,
@@ -2001,7 +2001,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 3,
           "description": "Disk space used of all filesystems mounted",
           "fill": 1,
@@ -2110,7 +2110,7 @@
             "Unused": "#EAB839"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "fill": 1,
           "id": 79,
@@ -2299,7 +2299,7 @@
             "VmallocUsed": "#EA6460"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "fill": 1,
           "id": 46,
@@ -2452,7 +2452,7 @@
             "VmallocUsed": "#EA6460"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "fill": 1,
           "id": 47,
@@ -2614,7 +2614,7 @@
             "VmallocUsed": "#EA6460"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "fill": 1,
           "id": 70,
@@ -2707,7 +2707,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 22,
           "legend": {
@@ -2812,7 +2812,7 @@
             "VmallocUsed": "#EA6460"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "fill": 1,
           "id": 71,
@@ -2933,7 +2933,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 8,
           "legend": {
@@ -3020,7 +3020,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 64,
           "legend": {
@@ -3101,7 +3101,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 62,
           "legend": {
@@ -3193,7 +3193,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 65,
           "legend": {
@@ -3281,7 +3281,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 7,
           "legend": {
@@ -3380,7 +3380,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The total number of bytes read / write successfully.",
           "fill": 2,
           "id": 33,
@@ -3468,7 +3468,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The total number of reads / writes completed successfully.",
           "fill": 2,
           "id": 9,
@@ -3557,7 +3557,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The weighted # of milliseconds spent doing I/Os. This field is incremented at each I/O start, I/O completion, I/O  merge, or read of these stats by the number of I/Os in progress times the number of milliseconds spent doing I/O since the last update of this field. This can provide an easy measure of both I/O completion time and the backlog that may be accumulating.",
           "fill": 3,
           "id": 35,
@@ -3635,7 +3635,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The total number of milliseconds spent by all reads / writes.",
           "fill": 3,
           "id": 37,
@@ -3727,7 +3727,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The number of I/Os currently in progress.",
           "fill": 3,
           "id": 34,
@@ -3805,7 +3805,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The total number of reads / writes completed successfully and the number of reads merged. See https://www.kernel.org/doc/Documentation/iostats.txt.",
           "fill": 2,
           "id": 38,
@@ -3915,7 +3915,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "Milliseconds spent doing I/Os.",
           "fill": 3,
           "id": 36,
@@ -3993,7 +3993,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "1 if there was an error opening or reading a file, 0 otherwise",
           "fill": 2,
           "id": 66,
@@ -4068,7 +4068,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "The total number of sectors read successfully.",
           "fill": 2,
           "id": 80,
@@ -4168,7 +4168,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 3,
           "description": "Filesystem space available to non-root users in bytes. Filesystem free space in bytes. Filesystem read-only status. Filesystem size in bytes.",
           "fill": 1,
@@ -4262,7 +4262,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "Filesystem total file nodes.",
           "fill": 1,
           "id": 41,
@@ -4337,7 +4337,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "File descriptor statistics: allocated.",
           "fill": 1,
           "id": 28,
@@ -4419,7 +4419,7 @@
             "/ ReadOnly": "#890F02"
           },
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "decimals": 0,
           "description": "Filesystem read-only status.",
           "fill": 1,
@@ -4509,7 +4509,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 58,
           "legend": {
@@ -4682,7 +4682,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 60,
           "legend": {
@@ -4767,7 +4767,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 61,
           "legend": {
@@ -4859,7 +4859,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 30,
           "legend": {
@@ -4930,7 +4930,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "",
           "id": 49,
@@ -5077,7 +5077,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "",
           "id": 51,
@@ -5273,7 +5273,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "",
           "id": 81,
@@ -5415,7 +5415,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "id": 63,
           "legend": {
@@ -5589,7 +5589,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 52,
@@ -5705,7 +5705,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 82,
@@ -5846,7 +5846,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 53,
@@ -6091,7 +6091,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 54,
@@ -6368,7 +6368,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 56,
@@ -6570,7 +6570,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 55,
@@ -6699,7 +6699,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 57,
@@ -6824,7 +6824,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "fill": 1,
           "height": "300px",
           "id": 50,
@@ -7112,7 +7112,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_LOCALHOST}",
+          "datasource": "Prometheus",
           "description": "node_exporter: Duration of a scrape job.",
           "fill": 1,
           "id": 40,
@@ -7198,7 +7198,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_LOCALHOST}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": false,
         "label": "Host:",
diff --git a/monitoring/grafana-dashboards/postgres.json b/monitoring/grafana-dashboards/postgres.json
index d3a8ccc..f9fd7fb 100644
--- a/monitoring/grafana-dashboards/postgres.json
+++ b/monitoring/grafana-dashboards/postgres.json
@@ -78,7 +78,7 @@
         "#7eb26d",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -159,7 +159,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "description": "start time of the process",
       "format": "dateTimeFromNow",
       "gauge": {
@@ -241,7 +241,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "decbytes",
       "gauge": {
         "maxValue": 100,
@@ -323,7 +323,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "decbytes",
       "gauge": {
         "maxValue": 100,
@@ -405,7 +405,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "decbytes",
       "gauge": {
         "maxValue": 100,
@@ -487,7 +487,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -563,7 +563,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "description": "Average user and system CPU time spent in seconds.",
       "fill": 1,
       "gridPos": {
@@ -649,7 +649,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "description": "Virtual and Resident memory size in bytes, averages over 5 min interval",
       "fill": 1,
       "gridPos": {
@@ -743,7 +743,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "description": "Number of open file descriptors",
       "fill": 1,
       "gridPos": {
@@ -847,7 +847,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -927,7 +927,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -1007,7 +1007,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -1087,7 +1087,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -1168,7 +1168,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "decimals": 1,
       "format": "bytes",
       "gauge": {
@@ -1249,7 +1249,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -1329,7 +1329,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -1409,7 +1409,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -1489,7 +1489,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -1578,7 +1578,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -1669,7 +1669,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -1762,7 +1762,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -1852,7 +1852,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -1941,7 +1941,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2030,7 +2030,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "decimals": 0,
       "fill": 1,
       "gridPos": {
@@ -2122,7 +2122,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2211,7 +2211,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2300,7 +2300,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2389,7 +2389,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "decimals": 2,
       "fill": 1,
       "gridPos": {
@@ -2477,7 +2477,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2591,7 +2591,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "decimals": 0,
       "fill": 1,
       "gridPos": {
@@ -2685,7 +2685,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "description": "Total amount of data written to temporary files by queries in this database. All temporary files are counted, regardless of why the temporary file was created, and regardless of the log_temp_files setting.",
       "fill": 1,
       "gridPos": {
@@ -2772,7 +2772,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_DS_PROMETHEUS}",
+      "datasource": "Prometheus",
       "fill": 1,
       "gridPos": {
         "h": 7,
@@ -2930,7 +2930,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_DS_PROMETHEUS}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": false,
         "label": "Namespace",
@@ -2950,7 +2950,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_DS_PROMETHEUS}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": false,
         "label": "Release",
@@ -2970,7 +2970,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_DS_PROMETHEUS}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": false,
         "label": "Instance",
@@ -2990,7 +2990,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_DS_PROMETHEUS}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Database",
@@ -3010,7 +3010,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": "${DS_DS_PROMETHEUS}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Lock table",
diff --git a/monitoring/grafana-dashboards/redis.json b/monitoring/grafana-dashboards/redis.json
index 813c15d..aefb474 100644
--- a/monitoring/grafana-dashboards/redis.json
+++ b/monitoring/grafana-dashboards/redis.json
@@ -62,7 +62,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "decimals": 0,
           "editable": true,
           "error": false,
@@ -142,7 +142,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "decimals": 0,
           "editable": true,
           "error": false,
@@ -225,7 +225,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(245, 54, 54, 0.9)"
           ],
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "decimals": 0,
           "editable": true,
           "error": false,
@@ -302,7 +302,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -382,7 +382,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "decimals": 2,
           "editable": true,
           "error": false,
@@ -485,7 +485,7 @@
             "max": "#BF1B00"
           },
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -574,7 +574,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -667,7 +667,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 7,
@@ -748,7 +748,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 7,
@@ -840,7 +840,7 @@
             "reclaims": "#3F6833"
           },
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -933,7 +933,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_PROM}",
+          "datasource": "Prometheus",
           "editable": true,
           "error": false,
           "fill": 8,
@@ -1046,7 +1046,7 @@
     "list": [
       {
         "current": {},
-        "datasource": "${DS_PROM}",
+        "datasource": "Prometheus",
         "hide": 0,
         "includeAll": false,
         "multi": false,
diff --git a/monitoring/metrics-token b/monitoring/metrics-token
new file mode 100644
index 0000000..9972f9a
--- /dev/null
+++ b/monitoring/metrics-token
@@ -0,0 +1 @@
+changeme-replace-with-real-token