Add Prometheus Server

morph/grid/local/grid.nix

@@ -38,6 +38,8 @@ import ../../lib/make-grid.nix {
       monitoringvpnIPv4 = "172.23.23.1";
       inherit vpnClientIPs;
       inherit sshUsers;
+      nodeExporterHostNames = [ ];
+      nginxExporterHostNames = [ ];
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
       stateVersion = "19.09";
     } // cfg);

morph/lib/make-monitoring.nix

@@ -9,6 +9,8 @@
 , stateVersion
 , monitoringvpnIPv4
 , vpnClientIPs
+, nodeExporterHostNames
+, nginxExporterHostNames
 , ... }: rec {
 
   deployment = {
@@ -38,6 +40,7 @@
     hardware
     ../../nixos/modules/monitoring/vpn/server.nix
     ../../nixos/modules/monitoring/server/grafana.nix
+    ../../nixos/modules/monitoring/server/prometheus.nix
   ];
 
   services.private-storage.monitoring.vpn.server = {
@@ -52,5 +55,10 @@
     lokiUrl = "http://localhost:3100/";
   };
 
+  services.private-storage.monitoring.prometheus = {
+    nodeExporterTargets = nodeExporterHostNames;
+    nginxExporterTargets = nginxExporterHostNames;
+  };
+
   system.stateVersion = stateVersion;
 }

nixos/modules/monitoring/server/prometheus.nix

@@ -24,11 +24,11 @@ in {
   };
 
   config = rec {
-    networking.firewall.allowedTCPPorts = [ services.prometheus.port ];
+    # networking.firewall.allowedTCPPorts = [ services.prometheus.port ];
 
     services.prometheus = {
       enable = true;
-      port = 9090; # Option only in recent (20.09?) nixpkgs, 9090 default
+      # port = 9090; # Option only in recent (20.09?) nixpkgs, 9090 default
       scrapeConfigs = [
         {
           job_name = "node-exporters";