Merge branch 'develop' into 'staging'

merge develop into staging

See merge request !148

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
 }

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

@@ -659,6 +659,6 @@
   },
   "timezone": "",
   "title": "Services overview",
-  "uid": "JX3RVEk7k",
+  "uid": "ServicesOverview",
   "version": 6
 }

nixos/modules/monitoring/server/prometheus.nix

@@ -59,7 +59,9 @@ in {
           scheme = "https";
           tls_config.insecure_skip_verify = true;
           static_configs = [{
-            targets = cfg.paymentExporterTargets;
+            # Explicitly setting the port number so the relabel_config can filter it out again.
+            # Leaving it out makes the port number show in Grafana.
+            targets = map (x: x + ":443") cfg.paymentExporterTargets;
           }];
           relabel_configs = [ dropPortNumber ];
         }

nixpkgs-ps.json

 { "name": "nixpkgs"
-, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/a5cbaadd9676e8c568061e92bbf5ad6a5d884ded.tar.gz"
-, "sha256": "0q5zknsp0qb25ag9zr9bw1ap7pb3f76bxsw81ahxkzj4z5dw6k2f"
+, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/5ebd5af2d5c6caf23735c8c0e6bc27357fa8d2a8.tar.gz"
+, "sha256": "1g2bvs8prqjskzv8s1qmh36k7rmj98jib0syqbrq02xxzw5dpqb4"
 }