Unverified Commit 62f35da2 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

nixos/prometheus-exporters/fastly: fix secret handling 

The exporter expects the token as an environment variable, not a path
to the file containing the token.
parent b25a2b5f

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

+4 −5
Original line number Diff line number Diff line
@@ -31,18 +31,17 @@ in 
      '';

    };



    tokenPath = mkOption {

    environmentFile = mkOption {

      type = path;

      description = ''

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

        outside of Nix store.

        An environment file containg at least the FASTLY_API_TOKEN= environment

        variable.

      '';

    };

  };

  serviceOpts = {

    serviceConfig = {

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

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

      EnvironmentFile = cfg.environmentFile;

      ExecStart = escapeSystemdExecArgs (

        [

          (getExe pkgs.prometheus-fastly-exporter)

nixos/tests/prometheus-exporters.nix

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ let 
    fastly = {

      exporterConfig = {

        enable = true;

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

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

      };



      exporterTest = ''