commit 3b7d9c77b3eb202fc3e8ed1964cc67b628358ac0 · pyrox.dev/nixpkgs

+3 -3

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

···

       1
       1
       -
       { config, pkgs, lib, options, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers

     
···

       94
       94
        
           "zfs"

     

       95
       95
        
         ]

     

       96
       96
        
           (name:

     

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

     

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

     

       98
       98
        
           )) // (mapAttrs

     

       99
       99
        
           (name: params:

     

       100
       100
       -
             import (./. + "/exporters/${params.name}.nix") { inherit config lib pkgs options; type = params.type ; })

     

       100
       100
       +
             import (./. + "/exporters/${params.name}.nix") { inherit config lib pkgs options utils; type = params.type ; })

     

       101
       101
        
           {

     

       102
       102
        
             exportarr-bazarr = {

     

       103
       103
        
               name = "exportarr";

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

       1
       1
       -
       { config, lib, pkgs, options, type }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.prometheus.exporters."exportarr-${type}";

+1

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

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.prometheus.exporters.graphite;

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+13 -9

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

···

       1
       1
        
       { config

     

       2
       2
        
       , lib

     

       3
       3
        
       , pkgs

     

       4
       4
       -
       , options

     

       4
       4
       +
       , utils

     

       5
       5
       +
       , ...

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       with lib;

     
···

       9
       10
        
       let

     

       10
       11
        
         cfg = config.services.prometheus.exporters.kea;

     

       11
       12
        
       in {

     

       13
       13
       +
         imports = [

     

       14
       14
       +
           (mkRenamedOptionModule [ "controlSocketPaths" ] [ "targets" ])

     

       15
       15
       +
         ];

     

       12
       16
        
         port = 9547;

     

       13
       17
        
         extraOpts = {

     

       14
       14
       -
           controlSocketPaths = mkOption {

     

       18
       18
       +
           targets = mkOption {

     

       15
       19
        
             type = types.listOf types.str;

     

       16
       20
        
             example = literalExpression ''

     

       17
       21
        
               [

     

       18
       22
        
                 "/run/kea/kea-dhcp4.socket"

     

       19
       23
        
                 "/run/kea/kea-dhcp6.socket"

     

       24
       24
       +
                 "http://127.0.0.1:8547"

     

       20
       25
        
               ]

     

       21
       26
        
             '';

     

       22
       27
        
             description = lib.mdDoc ''

     

       23
       23
       -
               Paths to kea control sockets

     

       28
       28
       +
               Paths or URLs to the Kea control socket.

     

       24
       29
        
             '';

     

       25
       30
        
           };

     

       26
       31
        
         };

     
···

       32
       37
        
           serviceConfig = {

     

       33
       38
        
             User = "kea";

     

       34
       39
        
             DynamicUser = true;

     

       35
       35
       -
             ExecStart = ''

     

       36
       36
       -
               ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \

     

       37
       37
       -
                 --address ${cfg.listenAddress} \

     

       38
       38
       -
                 --port ${toString cfg.port} \

     

       39
       39
       -
                 ${concatStringsSep " " cfg.controlSocketPaths}

     

       40
       40
       -
             '';

     

       40
       40
       +
             ExecStart = utils.escapeSystemdExecArgs ([

     

       41
       41
       +
               (lib.getExe pkgs.prometheus-kea-exporter)

     

       42
       42
       +
               "--address" cfg.listenAddress

     

       43
       43
       +
               "--port" cfg.port

     

       44
       44
       +
             ] ++ cfg.extraFlags ++ cfg.targets);

     

       41
       45
        
             RuntimeDirectory = "kea";

     

       42
       46
        
             RuntimeDirectoryPreserve = true;

     

       43
       47
        
             RestrictAddressFamilies = [

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       let

     

       3
       3
        
         cfg = config.services.prometheus.exporters.mysqld;

     

       4
       4
        
         inherit (lib) types mkOption mdDoc mkIf mkForce cli concatStringsSep optionalString escapeShellArgs;

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1

nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.prometheus.exporters.rtl_433;

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         inherit (lib) mkOption types;

+1

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

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       with lib;

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.prometheus.exporters.sql;

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1

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

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+1 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4

+26

nixos/tests/kea.nix

···

       44
       44
        
                   name = "/var/lib/kea/dhcp4.leases";

     

       45
       45
        
                 };

     

       46
       46
        
       

     

       47
       47
       +
                 control-socket = {

     

       48
       48
       +
                   socket-type = "unix";

     

       49
       49
       +
                   socket-name = "/run/kea/dhcp4.sock";

     

       50
       50
       +
                 };

     

       51
       51
       +
       

     

       47
       52
        
                 interfaces-config = {

     

       48
       53
        
                   dhcp-socket-type = "raw";

     

       49
       54
        
                   interfaces = [

     
···

       88
       93
        
                   } ];

     

       89
       94
        
                 };

     

       90
       95
        
               };

     

       96
       96
       +
             };

     

       97
       97
       +
       

     

       98
       98
       +
             services.kea.ctrl-agent = {

     

       99
       99
       +
               enable = true;

     

       100
       100
       +
               settings = {

     

       101
       101
       +
                 http-host = "127.0.0.1";

     

       102
       102
       +
                 http-port = 8000;

     

       103
       103
       +
                 control-sockets.dhcp4 = {

     

       104
       104
       +
                   socket-type = "unix";

     

       105
       105
       +
                   socket-name = "/run/kea/dhcp4.sock";

     

       106
       106
       +
                 };

     

       107
       107
       +
               };

     

       108
       108
       +
             };

     

       109
       109
       +
       

     

       110
       110
       +
             services.prometheus.exporters.kea = {

     

       111
       111
       +
               enable = true;

     

       112
       112
       +
               controlSocketPaths = [

     

       113
       113
       +
                 "http://127.0.0.1:8000"

     

       114
       114
       +
               ];

     

       91
       115
        
             };

     

       92
       116
        
           };

     

       93
       117
        
       

     
···

       182
       206
        
           client.wait_until_succeeds("ping -c 5 10.0.0.1")

     

       183
       207
        
           router.wait_until_succeeds("ping -c 5 10.0.0.3")

     

       184
       208
        
           nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3")

     

       209
       209
       +
           router.log(router.execute("curl 127.0.0.1:9547")[1])

     

       210
       210
       +
           router.succeed("curl --no-buffer 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'")

     

       185
       211
        
         '';

     

       186
       212
        
       })

-48

nixos/tests/prometheus-exporters.nix

···

       418
       418
        
             '';

     

       419
       419
        
           };

     

       420
       420
        
       

     

       421
       421
       -
           kea = let

     

       422
       422
       -
             controlSocketPathV4 = "/run/kea/dhcp4.sock";

     

       423
       423
       -
             controlSocketPathV6 = "/run/kea/dhcp6.sock";

     

       424
       424
       -
           in

     

       425
       425
       -
           {

     

       426
       426
       -
             exporterConfig = {

     

       427
       427
       -
               enable = true;

     

       428
       428
       -
               controlSocketPaths = [

     

       429
       429
       -
                 controlSocketPathV4

     

       430
       430
       -
                 controlSocketPathV6

     

       431
       431
       -
               ];

     

       432
       432
       -
             };

     

       433
       433
       -
             metricProvider = {

     

       434
       434
       -
               services.kea = {

     

       435
       435
       -
                 dhcp4 = {

     

       436
       436
       -
                   enable = true;

     

       437
       437
       -
                   settings = {

     

       438
       438
       -
                     control-socket = {

     

       439
       439
       -
                       socket-type = "unix";

     

       440
       440
       -
                       socket-name = controlSocketPathV4;

     

       441
       441
       -
                     };

     

       442
       442
       -
                   };

     

       443
       443
       -
                 };

     

       444
       444
       -
                 dhcp6 = {

     

       445
       445
       -
                   enable = true;

     

       446
       446
       -
                   settings = {

     

       447
       447
       -
                     control-socket = {

     

       448
       448
       -
                       socket-type = "unix";

     

       449
       449
       -
                       socket-name = controlSocketPathV6;

     

       450
       450
       -
                     };

     

       451
       451
       -
                   };

     

       452
       452
       -
                 };

     

       453
       453
       -
               };

     

       454
       454
       -
             };

     

       455
       455
       -
       

     

       456
       456
       -
             exporterTest = ''

     

       457
       457
       -
               wait_for_unit("kea-dhcp4-server.service")

     

       458
       458
       -
               wait_for_unit("kea-dhcp6-server.service")

     

       459
       459
       -
               wait_for_file("${controlSocketPathV4}")

     

       460
       460
       -
               wait_for_file("${controlSocketPathV6}")

     

       461
       461
       -
               wait_for_unit("prometheus-kea-exporter.service")

     

       462
       462
       -
               wait_for_open_port(9547)

     

       463
       463
       -
               succeed(

     

       464
       464
       -
                   "curl --fail localhost:9547/metrics | grep 'packets_received_total'"

     

       465
       465
       -
               )

     

       466
       466
       -
             '';

     

       467
       467
       -
           };

     

       468
       468
       -
       

     

       469
       421
        
           knot = {

     

       470
       422
        
             exporterConfig = {

     

       471
       423
        
               enable = true;

+3 -3

pkgs/servers/monitoring/prometheus/kea-exporter.nix

···

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     

       8
       8
        
         pname = "kea-exporter";

     

       9
       9
       -
         version = "0.6.1";

     

       9
       9
       +
         version = "0.7.0";

     

       10
       10
        
         format = "pyproject";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           pname = "kea_exporter";

     

       14
       14
        
           inherit version;

     

       15
       15
       -
           hash = "sha256-PyNFSTDqT+PBY7d9NSG1FVhN+Y3ID13T6859kBYsFzU=";

     

       15
       15
       +
           hash = "sha256-kn2iwYWcyW90tgfWmzLF7rU06fJyLRzqYKNLOgu/Yqk=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = with python3Packages; [

     
···

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
        
         passthru.tests = {

     

       34
       34
       -
           inherit (nixosTests.prometheus-exporters) kea;

     

       34
       34
       +
           inherit (nixosTests) kea;

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         meta = with lib; {