commit c6ec272c78d49dfe7b232b3c63b25c98d069e462 · pyrox.dev/nixpkgs

-3

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

···

       238
       238
        
           services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;

     

       239
       239
        
         })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable {

     

       240
       240
        
           hardware.rtl-sdr.enable = mkDefault true;

     

       241
       241
       -
         })] ++ [(mkIf config.services.nginx.enable {

     

       242
       242
       -
           systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ];

     

       243
       243
       -
           systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ];

     

       244
       241
        
         })] ++ [(mkIf config.services.postfix.enable {

     

       245
       242
        
           services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup;

     

       246
       243
        
         })] ++ (mapAttrsToList (name: conf:

+5 -2

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

···

       42
       42
        
             '';

     

       43
       43
        
           };

     

       44
       44
        
         };

     

       45
       45
       -
         serviceOpts = {

     

       45
       45
       +
         serviceOpts = mkMerge ([{

     

       46
       46
        
           serviceConfig = {

     

       47
       47
        
             ExecStart = ''

     

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

     
···

       54
       54
        
                 ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       55
       55
        
             '';

     

       56
       56
        
           };

     

       57
       57
       -
         };

     

       57
       57
       +
         }] ++ [(mkIf config.services.nginx.enable {

     

       58
       58
       +
           after = [ "nginx.service" ];

     

       59
       59
       +
           requires = [ "nginx.service" ];

     

       60
       60
       +
         })]);

     

       58
       61
        
         imports = [

     

       59
       62
        
           (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ])

     

       60
       63
        
           (mkRemovedOptionModule [ "insecure" ] ''