feat(monitoring): add monitoring configuration for prometheus exporte…

…rs and system packages

Add configuration for prometheus exporters (node, zfs, smartctl, ipmi) and system packages (ipmitool, lm_sensors) in the monitoring setup.

feat(samba): update allowed hosts in samba configuration

Update the allowed hosts in the samba configuration to include the IP range 100.64.

feat(zfs): enable ZFS trim in ZFS configuration

Enable ZFS trim functionality in the ZFS configuration to improve performance.

feat(nas): include monitoring configuration and additional ZFS pools

Include the monitoring configuration in the NAS setup and add extra ZFS pools named "tank-test" and "ssdtank-test".

fix(hardware): remove unnecessary blacklist entry in kernelParams

Remove unnecessary blacklist entry for i915 in the hardware configuration.

hosts/common/optional/monitoring.nix

@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    ipmitool
+    lm_sensors
+  ];
+  networking.firewall.allowedTCPPorts = [
+    config.services.prometheus.exporters.node.port
+    config.services.prometheus.exporters.zfs.port
+    config.services.prometheus.exporters.smartctl.port
+    config.services.prometheus.exporters.ipmi.port
+  ];
+  services.prometheus = {
+    exporters = {
+      node = {
+        enable = true;
+        enabledCollectors = ["systemd"];
+        disabledCollectors = ["textfile"];
+        port = 9001;
+      };
+      zfs = {
+        enable = true;
+        port = 9002;
+      };
+      smartctl = {
+        enable = true;
+        port = 9003;
+      };
+      ipmi = {
+        enable = true;
+        port = 9004;
+      };
+    };
+  };
+}

hosts/common/optional/samba.nix

@@ -28,7 +28,7 @@
       printcap name = /dev/null
       guest account = nobody
       map to guest = bad user
-      hosts allow = 10.0.7. 10.0.2. 10.2.0. 127.0.0.1 localhost
+      hosts allow = 10.0.7. 10.0.2. 10.2.0. 100.64. 127.0.0.1 localhost
       hosts deny = 0.0.0.0/0
       vfs objects = catia fruit streams_xattr
       fruit:nfs_aces = no

hosts/common/optional/zfs.nix

@@ -5,12 +5,13 @@
 }: {
   boot.supportedFilesystems = [ "zfs" ]; # Enable ZFS support
   boot.zfs.requestEncryptionCredentials = true; # If you're using ZFS encryption, set this to true to prompt for encryption passwords at boot
-  boot.zfs.extraPools = ["tank-test" "ssdtank-test"];
 
   services.zfs.autoScrub = {
     enable = true; # Enable automatic ZFS scrubbing
     interval = "monthly"; # Set the scrubbing interval to 1 month
   };
 
+  services.zfs.trim.enable = true;
+
   environment.systemPackages = with pkgs; [ zfs ]; # Install the ZFS package
 }

hosts/nas/default.nix

@@ -12,6 +12,7 @@
     ../common/nixos/users/nix
     ../common/optional/avahi.nix
     ../common/optional/fish.nix
+    ../common/optional/monitoring.nix
     ../common/optional/nfs.nix
     ../common/optional/reboot-required.nix
     ../common/optional/samba.nix
@@ -37,7 +38,11 @@
       # isNormalUser = true;
     };
   };
+
+  boot.zfs.extraPools = ["tank-test" "ssdtank-test"];
+
   services.smartd.enable = true;
+
   environment.systemPackages = with pkgs; [
     ipmitool
     lshw

hosts/nas/hardware-configuration.nix

@@ -12,8 +12,7 @@
   boot.kernelModules = ["kvm-intel usb_storage"];
   boot.extraModulePackages = [];
 
-  # TODO: not certain we actually need to blacklist i915 here..
-  boot.kernelParams = [ "i915.disable_display=1" "module_blacklist=i915" ];
+  boot.kernelParams = [ "i915.disable_display=1" ];
 
   virtualisation.kvmgt.vgpus = {
     "i915-GVTg_V5_8" = {