commit 6148b0e59f972fbab0818c06b2749b6c772e5d90 · pyrox.dev/nixpkgs

+2 -4

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

···

       38
       38
        
           "nextcloud"

     

       39
       39
        
           "nginx"

     

       40
       40
        
           "node"

     

       41
       41
       +
           "openvpn"

     

       41
       42
        
           "postfix"

     

       42
       43
        
           "postgres"

     

       43
       44
        
           "redis"

     
···

       101
       102
        
             default = "${name}-exporter";

     

       102
       103
        
             description = ''

     

       103
       104
        
               User name under which the ${name} exporter shall be run.

     

       104
       104
       -
               Has no effect when <option>systemd.services.prometheus-${name}-exporter.serviceConfig.DynamicUser</option> is true.

     

       105
       105
        
             '';

     

       106
       106
        
           };

     

       107
       107
        
           group = mkOption {

     
···

       109
       109
        
             default = "${name}-exporter";

     

       110
       110
        
             description = ''

     

       111
       111
        
               Group under which the ${name} exporter shall be run.

     

       112
       112
       -
               Has no effect when <option>systemd.services.prometheus-${name}-exporter.serviceConfig.DynamicUser</option> is true.

     

       113
       112
        
             '';

     

       114
       113
        
           };

     

       115
       114
        
         });

     
···

       161
       160
        
               serviceConfig.PrivateTmp = mkDefault true;

     

       162
       161
        
               serviceConfig.WorkingDirectory = mkDefault /tmp;

     

       163
       162
        
               serviceConfig.DynamicUser = mkDefault enableDynamicUser;

     

       164
       164
       -
             } serviceOpts ] ++ optional (!enableDynamicUser) {

     

       165
       163
        
               serviceConfig.User = conf.user;

     

       166
       164
        
               serviceConfig.Group = conf.group;

     

       167
       167
       -
             });

     

       165
       165
       +
             } serviceOpts ]);

     

       168
       166
        
         };

     

       169
       167
        
       in

     

       170
       168
        
       {

+39

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

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

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

     

       7
       7
       +
       in {

     

       8
       8
       +
         port = 9176;

     

       9
       9
       +
         extraOpts = {

     

       10
       10
       +
           statusPaths = mkOption {

     

       11
       11
       +
             type = types.listOf types.str;

     

       12
       12
       +
             description = ''

     

       13
       13
       +
               Paths to OpenVPN status files. Please configure the OpenVPN option

     

       14
       14
       +
               <literal>status</literal> accordingly.

     

       15
       15
       +
             '';

     

       16
       16
       +
           };

     

       17
       17
       +
           telemetryPath = mkOption {

     

       18
       18
       +
             type = types.str;

     

       19
       19
       +
             default = "/metrics";

     

       20
       20
       +
             description = ''

     

       21
       21
       +
               Path under which to expose metrics.

     

       22
       22
       +
             '';

     

       23
       23
       +
           };

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         serviceOpts = {

     

       27
       27
       +
           serviceConfig = {

     

       28
       28
       +
             PrivateDevices = true;

     

       29
       29
       +
             ProtectKernelModules = true;

     

       30
       30
       +
             NoNewPrivileges = true;

     

       31
       31
       +
             ExecStart = ''

     

       32
       32
       +
               ${pkgs.prometheus-openvpn-exporter}/bin/openvpn_exporter \

     

       33
       33
       +
                 -openvpn.status_paths "${concatStringsSep "," cfg.statusPaths}" \

     

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

     

       35
       35
       +
                 -web.telemetry-path ${cfg.telemetryPath}

     

       36
       36
       +
             '';

     

       37
       37
       +
           };

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+25

nixos/tests/prometheus-exporters.nix

···

       457
       457
        
             '';

     

       458
       458
        
           };

     

       459
       459
        
       

     

       460
       460
       +
           openvpn = {

     

       461
       461
       +
             exporterConfig = {

     

       462
       462
       +
               enable = true;

     

       463
       463
       +
               group = "openvpn";

     

       464
       464
       +
               statusPaths = ["/run/openvpn-test"];

     

       465
       465
       +
             };

     

       466
       466
       +
             metricProvider = {

     

       467
       467
       +
               users.groups.openvpn = {};

     

       468
       468
       +
               services.openvpn.servers.test = {

     

       469
       469
       +
                 config = ''

     

       470
       470
       +
                   dev tun

     

       471
       471
       +
                   status /run/openvpn-test

     

       472
       472
       +
                   status-version 3

     

       473
       473
       +
                 '';

     

       474
       474
       +
                 up = "chmod g+r /run/openvpn-test";

     

       475
       475
       +
               };

     

       476
       476
       +
               systemd.services."openvpn-test".serviceConfig.Group = "openvpn";

     

       477
       477
       +
             };

     

       478
       478
       +
             exporterTest = ''

     

       479
       479
       +
               wait_for_unit("openvpn-test.service")

     

       480
       480
       +
               wait_for_unit("prometheus-openvpn-exporter.service")

     

       481
       481
       +
               succeed("curl -sSf http://localhost:9176/metrics | grep -q 'openvpn_up{.*} 1'")

     

       482
       482
       +
             '';

     

       483
       483
       +
           };

     

       484
       484
       +
       

     

       460
       485
        
           postfix = {

     

       461
       486
        
             exporterConfig = {

     

       462
       487
        
               enable = true;