commit e11f06a9517b306691231e8a4207365e48cc9d5c · pyrox.dev/nixpkgs

+2

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

···

       76
       76
        
       

     

       77
       77
        
       - `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.

     

       78
       78
        
       

     

       79
       79
       +
       - `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.

     

       80
       80
       +
       

     

       79
       81
        
       ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

     

       80
       82
        
       

     

       81
       83
        
       - The `qemu-vm.nix` module by default now identifies block devices via

+16

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

···

       65
       65
        
           "redis"

     

       66
       66
        
           "rspamd"

     

       67
       67
        
           "rtl_433"

     

       68
       68
       +
           "scaphandre"

     

       68
       69
        
           "script"

     

       69
       70
        
           "shelly"

     

       70
       71
        
           "snmp"

     
···

       300
       301
        
             message = ''

     

       301
       302
        
               Please specify either 'services.prometheus.exporters.sql.configuration' or

     

       302
       303
        
                 'services.prometheus.exporters.sql.configFile'

     

       304
       304
       +
             '';

     

       305
       305
       +
           } {

     

       306
       306
       +
             assertion = cfg.scaphandre.enable -> (pkgs.stdenv.hostPlatform.isx86_64 == true);

     

       307
       307
       +
             message = ''

     

       308
       308
       +
               Only x86_64 host platform architecture is not supported.

     

       309
       309
       +
             '';

     

       310
       310
       +
           } {

     

       311
       311
       +
             assertion = cfg.scaphandre.enable -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;

     

       312
       312
       +
             message = ''

     

       313
       313
       +
               A kernel version newer than '5.11' is required. ${pkgs.linux.version}

     

       314
       314
       +
             '';

     

       315
       315
       +
           } {

     

       316
       316
       +
             assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);

     

       317
       317
       +
             message = ''

     

       318
       318
       +
               Please enable 'intel_rapl_common' in 'boot.kernelModules'.

     

       303
       319
        
             '';

     

       304
       320
        
           } ] ++ (flip map (attrNames exporterOpts) (exporter: {

     

       305
       321
        
             assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;

+33

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

···

       1
       1
       +
       { config

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , pkgs

     

       4
       4
       +
       , options

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         logPrefix = "services.prometheus.exporter.scaphandre";

     

       9
       9
       +
         cfg = config.services.prometheus.exporters.scaphandre;

     

       10
       10
       +
       in {

     

       11
       11
       +
         port = 8080;

     

       12
       12
       +
         extraOpts = {

     

       13
       13
       +
           telemetryPath = lib.mkOption {

     

       14
       14
       +
             type = lib.types.str;

     

       15
       15
       +
             default = "/metrics";

     

       16
       16
       +
             description = lib.mdDoc ''

     

       17
       17
       +
               Path under which to expose metrics.

     

       18
       18
       +
             '';

     

       19
       19
       +
           };

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         serviceOpts = {

     

       23
       23
       +
           serviceConfig = {

     

       24
       24
       +
             ExecStart = ''

     

       25
       25
       +
               ${pkgs.scaphandre}/bin/scaphandre prometheus \

     

       26
       26
       +
                 --address ${cfg.listenAddress} \

     

       27
       27
       +
                 --port ${toString cfg.port} \

     

       28
       28
       +
                 --suffix ${cfg.telemetryPath} \

     

       29
       29
       +
                 ${lib.concatStringsSep " \\\n  " cfg.extraFlags}

     

       30
       30
       +
             '';

     

       31
       31
       +
           };

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+16

nixos/tests/prometheus-exporters.nix

···

       1085
       1085
        
             '';

     

       1086
       1086
        
           };

     

       1087
       1087
        
       

     

       1088
       1088
       +
           scaphandre = {

     

       1089
       1089
       +
             exporterConfig = {

     

       1090
       1090
       +
               enable = true;

     

       1091
       1091
       +
             };

     

       1092
       1092
       +
             metricProvider = {

     

       1093
       1093
       +
               boot.kernelModules = [ "intel_rapl_common" ];

     

       1094
       1094
       +
             };

     

       1095
       1095
       +
             exporterTest = ''

     

       1096
       1096
       +
               wait_for_unit("prometheus-scaphandre-exporter.service")

     

       1097
       1097
       +
               wait_for_open_port(8080)

     

       1098
       1098
       +
               wait_until_succeeds(

     

       1099
       1099
       +
                   "curl -sSf 'localhost:8080/metrics'"

     

       1100
       1100
       +
               )

     

       1101
       1101
       +
             '';

     

       1102
       1102
       +
           };

     

       1103
       1103
       +
       

     

       1088
       1104
        
           shelly = {

     

       1089
       1105
        
             exporterConfig = {

     

       1090
       1106
        
               enable = true;

+1 -1

pkgs/servers/scaphandre/default.nix

···

       55
       55
        
           description = "Electrical power consumption metrology agent";

     

       56
       56
        
           homepage = "https://github.com/hubblo-org/scaphandre";

     

       57
       57
        
           license = licenses.asl20;

     

       58
       58
       -
           platforms = platforms.linux;

     

       58
       58
       +
           platforms = with platforms; [ "x86_64-linux"];

     

       59
       59
        
           maintainers = with maintainers; [ gaelreyrol ];

     

       60
       60
        
         };

     

       61
       61
        
       }