From f02c2758c1f2dac899a451d10ab09dd5704dba55 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 23 Jun 2021 15:19:29 -0400
Subject: [PATCH] Give the monitoring system the same treatment
---
morph/grid/local/grid.nix | 2 +-
morph/grid/production/grid.nix | 7 +++----
morph/grid/testing/grid.nix | 8 ++++----
morph/lib/customize-monitoring.nix | 3 +--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index b8eeb9c3..adac66fc 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -36,7 +36,7 @@ let
imports = [
lib.monitoring
(import ./virtual-hardware.nix ({ inherit publicIPv4; }))
- (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
];
};
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index f5be2853..4796bb46 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -21,11 +21,11 @@ let
];
};
- monitoring = let publicIPv4 = "monitoring.private.storage"; in {
+ monitoring = {
imports = [
lib.monitoring
lib.hardware-aws
- (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
];
};
@@ -95,6 +95,5 @@ in {
};
"payments.${domain}" = payments;
- inherit monitoring;
-
+ "monitoring.${domain}" = monitoring;
} // storageNodes
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index e5cb7fc6..b1ead6f9 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -26,11 +26,11 @@ let
];
};
- monitoring = let publicIPv4 = "18.156.171.217"; in {
+ monitoring = {
imports = [
lib.monitoring
lib.hardware-aws
- (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
];
};
@@ -48,6 +48,6 @@ in {
description = "PrivateStorage.io Testing Grid";
};
"payments.${domain}" = payments;
- "storage001.${domain}" = storage;
- inherit monitoring;
+ "monitoring.${domain}" = monitoring;
+ "storage001.${domain}" = storage001;
}
diff --git a/morph/lib/customize-monitoring.nix b/morph/lib/customize-monitoring.nix
index 5bc55810..126554cc 100644
--- a/morph/lib/customize-monitoring.nix
+++ b/morph/lib/customize-monitoring.nix
@@ -1,5 +1,4 @@
-hostsMap: monitoringvpnKeyDir: publicIPv4: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
- deployment.targetHost = publicIPv4;
+hostsMap: monitoringvpnKeyDir: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
deployment.secrets = {
"monitoringvpn-private-key".source = "${monitoringvpnKeyDir}/server.key";
"monitoringvpn-preshared-key".source = "${monitoringvpnKeyDir}/preshared.key";
--
GitLab