From 8bcde734e9ad7818f3ad73c9987f6990c9082eed Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Fri, 18 Jun 2021 00:03:24 +0000
Subject: [PATCH] This should be the DNS name for monitoring name after all
Also change the `domain` parameter for Grafana to always
use that beautiful name - besides display it's cosmetic anyway
IIANM so I'll not parametrize it for now.
---
morph/grid/production/grid.nix | 2 +-
morph/lib/make-monitoring.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index eb4b97d6..b01d490d 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -103,7 +103,7 @@ import ../../lib/make-grid.nix {
});
"monitoring" = import ../../lib/make-monitoring.nix (cfg // {
- publicIPv4 = "monitoring.private.storage"; # XXX TBD when the machine is online
+ publicIPv4 = "monitoring.private.storage";
monitoringvpnIPv4 = "172.23.23.1";
inherit monitoringvpnKeyDir;
inherit vpnClientIPs;
diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix
index 8eb53c6d..592a8596 100644
--- a/morph/lib/make-monitoring.nix
+++ b/morph/lib/make-monitoring.nix
@@ -61,7 +61,7 @@ in rec {
};
services.private-storage.monitoring.grafana = {
- domain = "grafana.grid.private.storage";
+ domain = "monitoring.private.storage";
prometheusUrl = "http://localhost:9090/";
lokiUrl = "http://localhost:3100/";
};
--
GitLab