commit 8373b658567fd15bde88bb100fc9bedaeecc51d4 · pyrox.dev/nixpkgs

+31 -20

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

···

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

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       let

     

       4
       9
        
         cfg = config.services.prometheus.exporters.kafka;

     
···

       9
       14
        
           types

     

       10
       15
        
           concatStringsSep

     

       11
       16
        
           ;

     

       12
       12
       -
       in {

     

       17
       17
       +
       in

     

       18
       18
       +
       {

     

       13
       19
        
         port = 8080;

     

       14
       20
        
       

     

       15
       21
        
         extraOpts = {

     
···

       24
       30
        
             '';

     

       25
       31
        
           };

     

       26
       32
        
         };

     

       27
       27
       -
         serviceOpts = mkMerge ([{

     

       28
       28
       -
           serviceConfig = {

     

       29
       29
       -
             ExecStart = ''

     

       30
       30
       -
               ${lib.getExe cfg.package}

     

       31
       31
       -
             '';

     

       32
       32
       -
             EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;

     

       33
       33
       -
             RestartSec = "5s";

     

       34
       34
       -
             RestrictAddressFamilies = [

     

       35
       35
       -
               "AF_INET"

     

       36
       36
       -
               "AF_INET6"

     

       37
       37
       -
             ];

     

       38
       38
       -
           };

     

       39
       39
       -
         }] ++ [

     

       40
       40
       -
           (mkIf config.services.apache-kafka.enable {

     

       41
       41
       -
             after = [ "apache-kafka.service" ];

     

       42
       42
       -
             requires = [ "apache-kafka.service" ];

     

       43
       43
       -
           })

     

       44
       44
       -
         ]);

     

       33
       33
       +
         serviceOpts = mkMerge (

     

       34
       34
       +
           [

     

       35
       35
       +
             {

     

       36
       36
       +
               serviceConfig = {

     

       37
       37
       +
                 ExecStart = ''

     

       38
       38
       +
                   ${lib.getExe cfg.package}

     

       39
       39
       +
                 '';

     

       40
       40
       +
                 EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;

     

       41
       41
       +
                 RestartSec = "5s";

     

       42
       42
       +
                 RestrictAddressFamilies = [

     

       43
       43
       +
                   "AF_INET"

     

       44
       44
       +
                   "AF_INET6"

     

       45
       45
       +
                 ];

     

       46
       46
       +
               };

     

       47
       47
       +
             }

     

       48
       48
       +
           ]

     

       49
       49
       +
           ++ [

     

       50
       50
       +
             (mkIf config.services.apache-kafka.enable {

     

       51
       51
       +
               after = [ "apache-kafka.service" ];

     

       52
       52
       +
               requires = [ "apache-kafka.service" ];

     

       53
       53
       +
             })

     

       54
       54
       +
           ]

     

       55
       55
       +
         );

     

       45
       56
        
       }

+6 -5

pkgs/by-name/km/kminion/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , buildGoModule

     

       5
       5
       -
       , nixosTests

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         buildGoModule,

     

       6
       6
       +
         nixosTests,

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildGoModule {