Skip to content
Snippets Groups Projects
Commit f02c2758 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Give the monitoring system the same treatment

parent fed74d15
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ let ...@@ -36,7 +36,7 @@ let
imports = [ imports = [
lib.monitoring lib.monitoring
(import ./virtual-hardware.nix ({ inherit publicIPv4; })) (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")
]; ];
}; };
......
...@@ -21,11 +21,11 @@ let ...@@ -21,11 +21,11 @@ let
]; ];
}; };
monitoring = let publicIPv4 = "monitoring.private.storage"; in { monitoring = {
imports = [ imports = [
lib.monitoring lib.monitoring
lib.hardware-aws 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 { ...@@ -95,6 +95,5 @@ in {
}; };
"payments.${domain}" = payments; "payments.${domain}" = payments;
inherit monitoring; "monitoring.${domain}" = monitoring;
} // storageNodes } // storageNodes
...@@ -26,11 +26,11 @@ let ...@@ -26,11 +26,11 @@ let
]; ];
}; };
monitoring = let publicIPv4 = "18.156.171.217"; in { monitoring = {
imports = [ imports = [
lib.monitoring lib.monitoring
lib.hardware-aws 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 { ...@@ -48,6 +48,6 @@ in {
description = "PrivateStorage.io Testing Grid"; description = "PrivateStorage.io Testing Grid";
}; };
"payments.${domain}" = payments; "payments.${domain}" = payments;
"storage001.${domain}" = storage; "monitoring.${domain}" = monitoring;
inherit monitoring; "storage001.${domain}" = storage001;
} }
hostsMap: monitoringvpnKeyDir: publicIPv4: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: { hostsMap: monitoringvpnKeyDir: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
deployment.targetHost = publicIPv4;
deployment.secrets = { deployment.secrets = {
"monitoringvpn-private-key".source = "${monitoringvpnKeyDir}/server.key"; "monitoringvpn-private-key".source = "${monitoringvpnKeyDir}/server.key";
"monitoringvpn-preshared-key".source = "${monitoringvpnKeyDir}/preshared.key"; "monitoringvpn-preshared-key".source = "${monitoringvpnKeyDir}/preshared.key";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment