commit 8cc2dcce7d623b5e276b4c53dc14b52178f714fa · pyrox.dev/nixpkgs

+2 -1

nixos/modules/services/monitoring/prometheus/exporters.nix

···

       77
       77
        
           "varnish"

     

       78
       78
        
           "wireguard"

     

       79
       79
        
           "flow"

     

       80
       80
       +
           "zfs"

     

       80
       81
        
         ] (name:

     

       81
       82
        
           import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; }

     

       82
       83
        
         );

     
···

       196
       197
        
               serviceConfig.LockPersonality = true;

     

       197
       198
        
               serviceConfig.MemoryDenyWriteExecute = true;

     

       198
       199
        
               serviceConfig.NoNewPrivileges = true;

     

       199
       199
       -
               serviceConfig.PrivateDevices = true;

     

       200
       200
       +
               serviceConfig.PrivateDevices = mkDefault true;

     

       200
       201
        
               serviceConfig.ProtectClock = mkDefault true;

     

       201
       202
        
               serviceConfig.ProtectControlGroups = true;

     

       202
       203
        
               serviceConfig.ProtectHome = true;

+44

nixos/modules/services/monitoring/prometheus/exporters/zfs.nix

···

       1
       1
       +
       { config, lib, pkgs, options }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.prometheus.exporters.zfs;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         port = 9134;

     

       10
       10
       +
       

     

       11
       11
       +
         extraOpts = {

     

       12
       12
       +
           telemetryPath = mkOption {

     

       13
       13
       +
             type = types.str;

     

       14
       14
       +
             default = "/metrics";

     

       15
       15
       +
             description = lib.mdDoc ''

     

       16
       16
       +
               Path under which to expose metrics.

     

       17
       17
       +
             '';

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           pools = mkOption {

     

       21
       21
       +
             type = with types; nullOr (listOf str);

     

       22
       22
       +
             default = [ ];

     

       23
       23
       +
             description = lib.mdDoc ''

     

       24
       24
       +
               Name of the pool(s) to collect, repeat for multiple pools (default: all pools).

     

       25
       25
       +
             '';

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         serviceOpts = {

     

       30
       30
       +
           # needs zpool

     

       31
       31
       +
           path = [ config.boot.zfs.package ];

     

       32
       32
       +
           serviceConfig = {

     

       33
       33
       +
             ExecStart = ''

     

       34
       34
       +
               ${pkgs.prometheus-zfs-exporter}/bin/zfs_exporter \

     

       35
       35
       +
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

     

       36
       36
       +
                 --web.telemetry-path ${cfg.telemetryPath} \

     

       37
       37
       +
                 ${concatMapStringsSep " " (x: "--pool=${x}") cfg.pools} \

     

       38
       38
       +
                 ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       39
       39
       +
             '';

     

       40
       40
       +
             ProtectClock = false;

     

       41
       41
       +
             PrivateDevices = false;

     

       42
       42
       +
           };

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+16

nixos/tests/prometheus-exporters.nix

···

       1396
       1396
        
                 )

     

       1397
       1397
        
               '';

     

       1398
       1398
        
             };

     

       1399
       1399
       +
       

     

       1400
       1400
       +
           zfs = {

     

       1401
       1401
       +
             exporterConfig = {

     

       1402
       1402
       +
               enable = true;

     

       1403
       1403
       +
             };

     

       1404
       1404
       +
             metricProvider = {

     

       1405
       1405
       +
               boot.supportedFilesystems = [ "zfs" ];

     

       1406
       1406
       +
               networking.hostId = "7327ded7";

     

       1407
       1407
       +
             };

     

       1408
       1408
       +
             exporterTest = ''

     

       1409
       1409
       +
               wait_for_unit("prometheus-zfs-exporter.service")

     

       1410
       1410
       +
               wait_for_unit("zfs.target")

     

       1411
       1411
       +
               wait_for_open_port(9134)

     

       1412
       1412
       +
               wait_until_succeeds("curl -f localhost:9134/metrics | grep 'zfs_scrape_collector_success{.*} 1'")

     

       1413
       1413
       +
             '';

     

       1414
       1414
       +
           };

     

       1399
       1415
        
         };

     

       1400
       1416
        
       in

     

       1401
       1417
        
       mapAttrs