merge develop into staging

• Some Prometheus cleanups (!145 (merged))
• Update PaymentServer to 0.1.1.1 for metric fixes (!147 (merged))

nixos/modules/monitoring/server/grafana-config/resources-overview.json

@@ -1281,6 +1281,6 @@
   "timepicker": {},
   "timezone": "utc",
   "title": "Resources overview",
-  "uid": "ResSatUse",
+  "uid": "ResourcesOverview",
   "version": 1
 }