diff --git a/nixos/modules/monitoring/server/grafana-config/resources-overview.json b/nixos/modules/monitoring/server/grafana-config/resources-overview.json index cd171d50594d77153f4d905bd91aec12f6bafcb9..8cf342514143d84de1263a3d6debaf8e40b4c922 100644 --- a/nixos/modules/monitoring/server/grafana-config/resources-overview.json +++ b/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 } diff --git a/nixos/modules/monitoring/server/grafana-config/services-overview.json b/nixos/modules/monitoring/server/grafana-config/services-overview.json index 8ee7b130ce917183edfa26a7a53c1a8df1353303..1606d2e59593fea116323dfaea25448bc4fbc9b6 100644 --- a/nixos/modules/monitoring/server/grafana-config/services-overview.json +++ b/nixos/modules/monitoring/server/grafana-config/services-overview.json @@ -659,6 +659,6 @@ }, "timezone": "", "title": "Services overview", - "uid": "JX3RVEk7k", + "uid": "ServicesOverview", "version": 6 } diff --git a/nixos/modules/monitoring/server/prometheus.nix b/nixos/modules/monitoring/server/prometheus.nix index c92261ccad2ebdd8dd34dda9027e66962b345be9..1f27f023df5b3211a81e3603226cc7cfe2c25e27 100644 --- a/nixos/modules/monitoring/server/prometheus.nix +++ b/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 ]; }