commit f9aba46b575a311a90658513c21863a5057d38e5 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       228
       228
        
       

     

       229
       229
        
       - [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes.

     

       230
       230
        
       

     

       231
       231
       +
       - [Prometheus eBPF Exporter](https://github.com/cloudflare/ebpf_exporter),

     

       232
       232
       +
         Prometheus exporter for custom eBPF metrics. Available as

     

       233
       233
       +
         [services.prometheus.exporters.ebpf](#opt-services.prometheus.exporters.ebpf.enable).

     

       234
       234
       +
       

     

       231
       235
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       232
       236
        
       

     

       233
       237
        
       ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}

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

+49

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

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         options,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       let

     

       10
       10
       +
         cfg = config.services.prometheus.exporters.ebpf;

     

       11
       11
       +
         inherit (lib)

     

       12
       12
       +
           mkOption

     

       13
       13
       +
           types

     

       14
       14
       +
           concatStringsSep

     

       15
       15
       +
           ;

     

       16
       16
       +
       in

     

       17
       17
       +
       {

     

       18
       18
       +
         port = 9435;

     

       19
       19
       +
         extraOpts = {

     

       20
       20
       +
           names = mkOption {

     

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

     

       22
       22
       +
             default = [ ];

     

       23
       23
       +
             example = [ "timers" ];

     

       24
       24
       +
             description = ''

     

       25
       25
       +
               List of eBPF programs to load

     

       26
       26
       +
             '';

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
         serviceOpts = {

     

       30
       30
       +
           serviceConfig = {

     

       31
       31
       +
             AmbientCapabilities = [

     

       32
       32
       +
               "CAP_BPF"

     

       33
       33
       +
               "CAP_DAC_READ_SEARCH"

     

       34
       34
       +
               "CAP_PERFMON"

     

       35
       35
       +
             ];

     

       36
       36
       +
             CapabilityBoundingSet = [

     

       37
       37
       +
               "CAP_BPF"

     

       38
       38
       +
               "CAP_DAC_READ_SEARCH"

     

       39
       39
       +
               "CAP_PERFMON"

     

       40
       40
       +
             ];

     

       41
       41
       +
             ExecStart = ''

     

       42
       42
       +
               ${pkgs.prometheus-ebpf-exporter}/bin/ebpf_exporter \

     

       43
       43
       +
               --config.dir=${pkgs.prometheus-ebpf-exporter}/examples \

     

       44
       44
       +
               --config.names=${concatStringsSep "," cfg.names} \

     

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

     

       46
       46
       +
             '';

     

       47
       47
       +
           };

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+14

nixos/tests/prometheus-exporters.nix

···

       407
       407
        
               '';

     

       408
       408
        
             };

     

       409
       409
        
       

     

       410
       410
       +
           ebpf = {

     

       411
       411
       +
             exporterConfig = {

     

       412
       412
       +
               enable = true;

     

       413
       413
       +
               names = [ "timers" ];

     

       414
       414
       +
             };

     

       415
       415
       +
             exporterTest = ''

     

       416
       416
       +
               wait_for_unit("prometheus-ebpf-exporter.service")

     

       417
       417
       +
               wait_for_open_port(9435)

     

       418
       418
       +
               succeed(

     

       419
       419
       +
                   "curl -sSf http://localhost:9435/metrics | grep 'ebpf_exporter_enabled_configs{name=\"timers\"} 1'"

     

       420
       420
       +
               )

     

       421
       421
       +
             '';

     

       422
       422
       +
           };

     

       423
       423
       +
       

     

       410
       424
        
           fastly = {

     

       411
       425
        
             exporterConfig = {

     

       412
       426
        
               enable = true;