commit afd0dc17d6bbb9d5ee88e3bec56ec02e9a94c6f8 · pyrox.dev/nixpkgs

+7 -3

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

···

       127
       127
        
         );

     

       128
       128
        
       

     

       129
       129
        
         mkExporterConf = { name, conf, serviceOpts }:

     

       130
       130
       +
           let

     

       131
       131
       +
             enableDynamicUser = serviceOpts.serviceConfig.DynamicUser or true;

     

       132
       132
       +
           in

     

       130
       133
        
           mkIf conf.enable {

     

       131
       134
        
             warnings = conf.warnings or [];

     

       132
       132
       -
             users.users = (mkIf (conf.user == "${name}-exporter") {

     

       135
       135
       +
             users.users = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {

     

       133
       136
        
               "${name}-exporter" = {

     

       134
       137
        
                 description = ''

     

       135
       138
        
                   Prometheus ${name} exporter service user

     
···

       138
       141
        
                 inherit (conf) group;

     

       139
       142
        
               };

     

       140
       143
        
             });

     

       141
       141
       -
             users.groups = (mkIf (conf.group == "${name}-exporter") {

     

       144
       144
       +
             users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) {

     

       142
       145
        
               "${name}-exporter" = {};

     

       143
       146
        
             });

     

       144
       147
        
             networking.firewall.extraCommands = mkIf conf.openFirewall (concatStrings [

     
···

       151
       154
        
               serviceConfig.Restart = mkDefault "always";

     

       152
       155
        
               serviceConfig.PrivateTmp = mkDefault true;

     

       153
       156
        
               serviceConfig.WorkingDirectory = mkDefault /tmp;

     

       154
       154
       -
             } serviceOpts ] ++ optional (!(serviceOpts.serviceConfig.DynamicUser or false)) {

     

       157
       157
       +
               serviceConfig.DynamicUser = mkDefault enableDynamicUser;

     

       158
       158
       +
             } serviceOpts ] ++ optional (!enableDynamicUser) {

     

       155
       159
        
               serviceConfig.User = conf.user;

     

       156
       160
        
               serviceConfig.Group = conf.group;

     

       157
       161
        
             });

-1

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

···

       39
       39
        
         };

     

       40
       40
        
         serviceOpts = {

     

       41
       41
        
           serviceConfig = {

     

       42
       42
       -
             DynamicUser = true;

     

       43
       42
        
             ExecStart = ''

     

       44
       43
        
               ${pkgs.prometheus-bind-exporter}/bin/bind_exporter \

     

       45
       44
        
                 -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       18
       18
        
         serviceOpts = {

     

       19
       19
        
           serviceConfig = {

     

       20
       20
        
             AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes

     

       21
       21
       -
             DynamicUser = true;

     

       22
       21
        
             ExecStart = ''

     

       23
       22
        
               ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \

     

       24
       23
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       64
       64
        
           '' else "";

     

       65
       65
        
         in {

     

       66
       66
        
           serviceConfig = {

     

       67
       67
       -
             DynamicUser = true;

     

       68
       67
        
             ExecStart = ''

     

       69
       68
        
               ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \

     

       70
       69
        
                 -log.format ${cfg.logFormat} \

-1

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

···

       26
       26
        
         };

     

       27
       27
        
         serviceOpts = {

     

       28
       28
        
           serviceConfig = {

     

       29
       29
       -
             DynamicUser = true;

     

       30
       29
        
             ExecStart = ''

     

       31
       30
        
               ${pkgs.prometheus-dnsmasq-exporter}/bin/dnsmasq_exporter \

     

       32
       31
        
                 --listen ${cfg.listenAddress}:${toString cfg.port} \

+1

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

···

       59
       59
        
         };

     

       60
       60
        
         serviceOpts = {

     

       61
       61
        
           serviceConfig = {

     

       62
       62
       +
             DynamicUser = false;

     

       62
       63
        
             ExecStart = ''

     

       63
       64
        
               ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \

     

       64
       65
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       26
       26
        
         };

     

       27
       27
        
         serviceOpts = {

     

       28
       28
        
           serviceConfig = {

     

       29
       29
       -
             DynamicUser = true;

     

       30
       29
        
             ExecStart = ''

     

       31
       30
        
               ${pkgs.prometheus-fritzbox-exporter}/bin/exporter \

     

       32
       31
        
                 -listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       24
       24
        
         };

     

       25
       25
        
         serviceOpts = {

     

       26
       26
        
           serviceConfig = {

     

       27
       27
       -
             DynamicUser = true;

     

       28
       27
        
             ExecStart = ''

     

       29
       28
        
               ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \

     

       30
       29
        
                 --port ${toString cfg.port} \

+1

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

···

       143
       143
        
         };

     

       144
       144
        
         serviceOpts = {

     

       145
       145
        
           serviceConfig = {

     

       146
       146
       +
             DynamicUser = false;

     

       146
       147
        
             ExecStart = ''

     

       147
       148
        
               ${pkgs.prometheus-mail-exporter}/bin/mailexporter \

     

       148
       149
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       50
       50
        
         };

     

       51
       51
        
         serviceOpts = {

     

       52
       52
        
           serviceConfig = {

     

       53
       53
       -
             DynamicUser = true;

     

       54
       53
        
             ExecStart = ''

     

       55
       54
        
               ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \

     

       56
       55
        
                 -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       34
       34
        
         };

     

       35
       35
        
         serviceOpts = {

     

       36
       36
        
           serviceConfig = {

     

       37
       37
       -
             DynamicUser = true;

     

       38
       37
        
             ExecStart = ''

     

       39
       38
        
               ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \

     

       40
       39
        
                 --nginx.scrape-uri '${cfg.scrapeUri}' \

+1

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

···

       27
       27
        
         };

     

       28
       28
        
         serviceOpts = {

     

       29
       29
        
           serviceConfig = {

     

       30
       30
       +
             DynamicUser = false;

     

       30
       31
        
             RuntimeDirectory = "prometheus-node-exporter";

     

       31
       32
        
             ExecStart = ''

     

       32
       33
        
               ${pkgs.prometheus-node-exporter}/bin/node_exporter \

+1

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

···

       62
       62
        
         };

     

       63
       63
        
         serviceOpts = {

     

       64
       64
        
           serviceConfig = {

     

       65
       65
       +
             DynamicUser = false;

     

       65
       66
        
             ExecStart = ''

     

       66
       67
        
               ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \

     

       67
       68
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

+1

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

···

       34
       34
        
         serviceOpts = {

     

       35
       35
        
           environment.DATA_SOURCE_NAME = cfg.dataSourceName;

     

       36
       36
        
           serviceConfig = {

     

       37
       37
       +
             DynamicUser = false;

     

       37
       38
        
             User = mkIf cfg.runAsLocalSuperUser (mkForce "postgres");

     

       38
       39
        
             ExecStart = ''

     

       39
       40
        
               ${pkgs.prometheus-postgres-exporter}/bin/postgres_exporter \

-1

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

···

       57
       57
        
                        else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}";

     

       58
       58
        
           in {

     

       59
       59
        
           serviceConfig = {

     

       60
       60
       -
             DynamicUser = true;

     

       61
       60
        
             ExecStart = ''

     

       62
       61
        
               ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \

     

       63
       62
        
                 --config.file=${configFile} \

-1

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

···

       20
       20
        
           description = "Prometheus exporter for surfboard cable modem";

     

       21
       21
        
           unitConfig.Documentation = "https://github.com/ipstatic/surfboard_exporter";

     

       22
       22
        
           serviceConfig = {

     

       23
       23
       -
             DynamicUser = true;

     

       24
       23
        
             ExecStart = ''

     

       25
       24
        
               ${pkgs.prometheus-surfboard-exporter}/bin/surfboard_exporter \

     

       26
       25
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       26
       26
        
         };

     

       27
       27
        
         serviceOpts = {

     

       28
       28
        
           serviceConfig = {

     

       29
       29
       -
             DynamicUser = true;

     

       30
       29
        
             ExecStart = ''

     

       31
       30
        
               ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \

     

       32
       31
        
                 -b ${cfg.listenAddress} \

-1

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

···

       51
       51
        
         };

     

       52
       52
        
         serviceOpts = {

     

       53
       53
        
           serviceConfig = {

     

       54
       54
       -
             DynamicUser = true;

     

       55
       54
        
             ExecStart = ''

     

       56
       55
        
               ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \

     

       57
       56
        
                 -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \

+1

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

···

       69
       69
        
           path = [ pkgs.varnish ];

     

       70
       70
        
           serviceConfig = {

     

       71
       71
        
             RestartSec = mkDefault 1;

     

       72
       72
       +
             DynamicUser = false;

     

       72
       73
        
             ExecStart = ''

     

       73
       74
        
               ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \

     

       74
       75
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

-1

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

···

       47
       47
        
           path = [ pkgs.wireguard-tools ];

     

       48
       48
        
       

     

       49
       49
        
           serviceConfig = {

     

       50
       50
       -
             DynamicUser = true;

     

       51
       50
        
             AmbientCapabilities = [ "CAP_NET_ADMIN" ];

     

       52
       51
        
           };

     

       53
       52
        
         };

+4 -5

nixos/tests/prometheus-exporters.nix

···

       191
       191
        
           mail = {

     

       192
       192
        
             exporterConfig = {

     

       193
       193
        
               enable = true;

     

       194
       194
       -
               user = "mailexporter";

     

       195
       194
        
               configuration = {

     

       196
       195
        
                 monitoringInterval = "2s";

     

       197
       196
        
                 mailCheckTimeout = "10s";

     
···

       199
       198
        
                   name = "testserver";

     

       200
       199
        
                   server = "localhost";

     

       201
       200
        
                   port = 25;

     

       202
       202
       -
                   from = "mailexporter@localhost";

     

       203
       203
       -
                   to = "mailexporter@localhost";

     

       204
       204
       -
                   detectionDir = "/var/spool/mail/mailexporter/new";

     

       201
       201
       +
                   from = "mail-exporter@localhost";

     

       202
       202
       +
                   to = "mail-exporter@localhost";

     

       203
       203
       +
                   detectionDir = "/var/spool/mail/mail-exporter/new";

     

       205
       204
        
                 } ];

     

       206
       205
        
               };

     

       207
       206
        
             };

     
···

       211
       210
        
                 after = [ "postfix.service" ];

     

       212
       211
        
                 requires = [ "postfix.service" ];

     

       213
       212
        
                 preStart = ''

     

       214
       214
       -
                   mkdir -p 0600 mailexporter/new

     

       213
       213
       +
                   mkdir -p 0600 mail-exporter/new

     

       215
       214
        
                 '';

     

       216
       215
        
                 serviceConfig = {

     

       217
       216
        
                   ProtectHome = true;