Convert customize-monitoring from positional to set arguments

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";
+      })
     ];
   };
 

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";
+      })
     ];
   };
 

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";
+      })
     ];
   };
 

morph/lib/customize-monitoring.nix

-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";