diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix index ec0c1b37f996dd836f6011425f114471a2ccde0a..5fd17f66d1d419d390c60db65dc2e9872f13c2ed 100644 --- a/morph/grid/production/grid.nix +++ b/morph/grid/production/grid.nix @@ -70,6 +70,10 @@ let # Slightly awkwardly, enable some of our hardware / network / bootloader options. ../../../nixos/modules/100tb.nix + # At least some of our storage nodes utilize MegaRAID storage controllers. + # Monitor their array status. + ../../../nixos/modules/monitoring/exporters/megacli2prom.nix + # Get all of the configuration that is common across all storage nodes. gridlib.storage @@ -88,6 +92,10 @@ let # name is quoted because `1` makes `100tb` look an awful lot like a # number. "100tb".config = nodecfg; + + # Enable statistics gathering for MegaRAID cards. + # TODO would be nice to enable only on machines that have such a device. + services.private-storage.monitoring.megacli2prom.enable = true; }; # Define all of the storage nodes for this grid. diff --git a/morph/lib/storage.nix b/morph/lib/storage.nix index 92adc653cce83f28312d66b8fad3c79ca9b2bbe8..86e142286351237099337d38d03a9b54255b8246 100644 --- a/morph/lib/storage.nix +++ b/morph/lib/storage.nix @@ -43,14 +43,8 @@ in { ../../nixos/modules/monitoring/vpn/client.nix # Expose base system metrics over the monitoringvpn. ../../nixos/modules/monitoring/exporters/node.nix - # At least some of our storage nodes utilize MegaRAID storage controllers. - ../../nixos/modules/monitoring/exporters/megacli2prom.nix ]; - # Enable statistics gathering for MegaRAID cards. - # TODO would be nice to enable only on machines that have such a device. - services.private-storage.monitoring.megacli2prom.enable = true; - # Turn on the Private Storage (Tahoe-LAFS) service. services.private-storage = { # Yep. Turn it on.