morph/grid/production/storage000-config.nix

-{ "interface" = "eno1";
-  "publicIPv4" = "69.36.183.24";
-  "prefixLength" = 24;
-  "gateway" = "69.36.183.1";
-  "gatewayInterface" = "eno1";
-  "grubDeviceID" = "wwn-0x5000c500936410b9";
-}

morph/grid/production/storage000-hardware.nix

-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "megaraid_sas" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ccabaa39-d888-467e-b8d9-75b5790a91aa";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/849c8696-a7e6-42d2-810d-15326d9f9ff6";
-      fsType = "ext4";
-    };
-
-  fileSystems."/storage" =
-    { device = "/dev/disk/by-uuid/2745cbf3-5a63-491d-ab92-6dfd4da1b504";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/c6f09c9a-572a-4b0f-b792-412cb5c749d4"; }
-    ];
-
-  nix.maxJobs = lib.mkDefault 32;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}

morph/grid/testing/config.json

 { "publicStoragePort": 8898
 , "ristrettoSigningKeyPath": "./secrets/ristretto.signing-key"
 , "stripeSecretKeyPath": "./secrets/stripe.secret"
+, "monitoringvpnKeyDir": "./secrets/monitoringvpn"
+, "monitoringvpnEndpoint": "monitoring.privatestorage-staging.com:51820"
 , "passValue": 1000000
 , "issuerDomains": [
     "payments.privatestorage-staging.com"

morph/grid/testing/grid.nix

@@ -7,19 +7,48 @@ import ../../lib/make-grid.nix {
   nodes = cfg:
   let
     sshUsers = import ./secrets/users.nix;
+
+    # Get absolute vpn key directory path, as a string:
+    monitoringvpnKeyDir = toString ./. + "/${cfg.monitoringvpnKeyDir}";
+
+    # TBD: derive these automatically:
+    hostsMap = {
+      "172.23.23.1"  = [ "monitoring" "monitoring.monitoringvpn" ];
+      "172.23.23.11" = [ "payments"   "payments.monitoringvpn"   ];
+      "172.23.23.12" = [ "storage001" "storage001.monitoringvpn" ];
+    };
+    vpnClientIPs = [ "172.23.23.11" "172.23.23.12" ];
+    nodeExporterTargets = [ "monitoring" "payments" "storage001" ];
+
   in {
-    "payments" = import ../../lib/make-issuer.nix ({
+    "payments" = import ../../lib/make-issuer.nix (cfg // {
       publicIPv4 = "18.194.183.13";
+      monitoringvpnIPv4 = "172.23.23.11";
+      inherit monitoringvpnKeyDir;
       inherit sshUsers;
       hardware = ../../lib/issuer-aws.nix;
       stateVersion = "19.03";
-    } // cfg);
+    });
 
     "storage001" = import ../../lib/make-testing.nix (cfg // {
       publicIPv4 = "3.120.26.190";
+      monitoringvpnIPv4 = "172.23.23.12";
+      inherit monitoringvpnKeyDir;
       inherit sshUsers;
       hardware = ./testing001-hardware.nix;
       stateVersion = "19.03";
     });
+
+    "monitoring" = import ../../lib/make-monitoring.nix (cfg // {
+      publicIPv4 = "18.156.171.217";
+      monitoringvpnIPv4 = "172.23.23.1";
+      inherit monitoringvpnKeyDir;
+      inherit vpnClientIPs;
+      inherit hostsMap;
+      inherit nodeExporterTargets;
+      hardware = ../../lib/issuer-aws.nix;
+      stateVersion = "19.09";
+      inherit sshUsers;
+    });
   };
 }