From bf5a2d503e2c805cef3832a0d40161bd4ca40cf1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 24 Jun 2021 07:31:18 -0400
Subject: [PATCH] Convert customize-monitoring from positional to set arguments
---
morph/grid/local/grid.nix | 7 ++++++-
morph/grid/production/grid.nix | 7 ++++++-
morph/grid/testing/grid.nix | 7 ++++++-
morph/lib/customize-monitoring.nix | 11 ++++++++++-
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 1e063d00..41c4d0c8 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -40,7 +40,12 @@ let
imports = [
gridlib.monitoring
(import ./virtual-hardware.nix ({ inherit publicIPv4; }))
- (gridlib.customize-monitoring hostsMap config.monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (gridlib.customize-monitoring {
+ inherit hostsMap publicIPv4 vpnClientIPs nodeExporterTargets;
+ inherit (config) monitoringvpnKeyDir;
+ monitoringvpnIPv4 = "172.23.23.1";
+ stateVersion = "19.09";
+ })
];
};
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index 9b7c4979..3f39f977 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -25,7 +25,12 @@ let
imports = [
gridlib.monitoring
gridlib.hardware-aws
- (gridlib.customize-monitoring hostsMap config.monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (gridlib.customize-monitoring {
+ inherit hostsMap publicIPv4 vpnClientIPs nodeExporterTargets;
+ inherit (config) monitoringvpnKeyDir;
+ monitoringvpnIPv4 = "172.23.23.1";
+ stateVersion = "19.09";
+ })
];
};
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index e5eaf990..c4ef5008 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -33,7 +33,12 @@ let
imports = [
gridlib.monitoring
gridlib.hardware-aws
- (gridlib.customize-monitoring hostsMap config.monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+ (gridlib.customize-monitoring {
+ inherit hostsMap publicIPv4 vpnClientIPs nodeExporterTargets;
+ inherit (config) monitoringvpnKeyDir;
+ monitoringvpnIPv4 = "172.23.23.1";
+ stateVersion = "19.09";
+ })
];
};
diff --git a/morph/lib/customize-monitoring.nix b/morph/lib/customize-monitoring.nix
index 5bc55810..c81a765f 100644
--- a/morph/lib/customize-monitoring.nix
+++ b/morph/lib/customize-monitoring.nix
@@ -1,4 +1,13 @@
-hostsMap: monitoringvpnKeyDir: publicIPv4: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
+{ hostsMap
+, monitoringvpnKeyDir
+, publicIPv4
+, monitoringvpnIPv4
+, vpnClientIPs
+, nodeExporterTargets
+, nginxExporterTargets ? []
+, stateVersion
+, ...
+}: {
deployment.targetHost = publicIPv4;
deployment.secrets = {
"monitoringvpn-private-key".source = "${monitoringvpnKeyDir}/server.key";
--
GitLab