[overwatch] enable metrics

machines/configuration.nix

@@ -43,7 +43,6 @@ let
   defaultModules = baseModules;
 
   makeMicroVM = hostName: ipv4Addr: macAddr: modules: [
-    self.nixosModules.malobeo.metrics
     {
       microvm = {
         hypervisor = "cloud-hypervisor";
@@ -81,13 +80,6 @@ let
         ];
       };
 
-      malobeo.metrics = {
-        enable = true;
-        enablePromtail = true;
-        logNginx = false;
-        lokiHost = "10.0.0.14";
-      };
-      
       systemd.network.enable = true;
       
       systemd.network.networks."20-lan" = {

machines/infradocs/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ self, config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -9,16 +9,18 @@ with lib;
   };
 
   imports = [
+    self.nixosModules.malobeo.metrics
     ../durruti/documentation.nix
     ../modules/malobeo_user.nix
     ../modules/sshd.nix
   ];
 
-  networking.firewall.allowedTCPPorts = [ 9002 ];
+  malobeo.metrics = {
-
+    enable = true;
-  malobeo.metrics.logNginx = lib.mkForce true;
+    enablePromtail = true;
-
+    logNginx = true;
-  users.users.promtail.extraGroups = [ "nginx" "systemd-journal" ];
+    lokiHost = "10.0.0.14";
+  };
 
   system.stateVersion = "22.11"; # Did you read the comment?
 }

machines/overwatch/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, self, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -9,11 +9,19 @@ with lib;
   };
 
   imports = [
+    self.nixosModules.malobeo.metrics
     ../modules/malobeo_user.nix
     ../modules/sshd.nix
   ];
 
-  networking.firewall.allowedTCPPorts = [ 80 9080 9001 3100 ];
+  networking.firewall.allowedTCPPorts = [ 80 3100 ];
+
+  malobeo.metrics = {
+    enable = true;
+    enablePromtail = true;
+    logNginx = false;
+    lokiHost = "10.0.0.14";
+  };
 
   services.grafana = {
     enable = true;