commit 62f35da2a1d8bee6fcbf650e282f09e161b98c88 · pyrox.dev/nixpkgs

+4 -5

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

···

       31
       31
        
             '';

     

       32
       32
        
           };

     

       33
       33
        
       

     

       34
       34
       -
           tokenPath = mkOption {

     

       34
       34
       +
           environmentFile = mkOption {

     

       35
       35
        
             type = path;

     

       36
       36
        
             description = ''

     

       37
       37
       -
               A run-time path to the token file, which is supposed to be provisioned

     

       38
       38
       -
               outside of Nix store.

     

       37
       37
       +
               An environment file containg at least the FASTLY_API_TOKEN= environment

     

       38
       38
       +
               variable.

     

       39
       39
        
             '';

     

       40
       40
        
           };

     

       41
       41
        
         };

     

       42
       42
        
         serviceOpts = {

     

       43
       43
        
           serviceConfig = {

     

       44
       44
       -
             LoadCredential = "fastly-api-token:${cfg.tokenPath}";

     

       45
       45
       -
             Environment = [ "FASTLY_API_TOKEN=%d/fastly-api-token" ];

     

       44
       44
       +
             EnvironmentFile = cfg.environmentFile;

     

       46
       45
        
             ExecStart = escapeSystemdExecArgs (

     

       47
       46
        
               [

     

       48
       47
        
                 (getExe pkgs.prometheus-fastly-exporter)

+1 -1

nixos/tests/prometheus-exporters.nix

···

       399
       399
        
           fastly = {

     

       400
       400
        
             exporterConfig = {

     

       401
       401
        
               enable = true;

     

       402
       402
       -
               tokenPath = pkgs.writeText "token" "abc123";

     

       402
       402
       +
               environmentFile = pkgs.writeText "fastly-exporter-env" "FASTLY_API_TOKEN=abc123";

     

       403
       403
        
             };

     

       404
       404
        
       

     

       405
       405
        
             exporterTest = ''