movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/prometheus-exporters/fastly: fix secret handling

Browse source 
The exporter expects the token as an environment variable, not a path
to the file containing the token.
This commit is contained in:
Martin Weinelt 2025-01-04 17:48:56 +01:00
parent b25a2b5ff4
commit 62f35da2a1
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/monitoring/prometheus/exporters/fastly.nix
View file

@ -31,18 +31,17 @@ in
''; '';
}; };
tokenPath = mkOption { environmentFile = mkOption {
type = path; type = path;
description = '' description = ''
A run-time path to the token file, which is supposed to be provisioned An environment file containg at least the FASTLY_API_TOKEN= environment
outside of Nix store. variable.
''; '';
}; };
}; };
serviceOpts = { serviceOpts = {
serviceConfig = { serviceConfig = {
LoadCredential = "fastly-api-token:${cfg.tokenPath}"; EnvironmentFile = cfg.environmentFile;
Environment = [ "FASTLY_API_TOKEN=%d/fastly-api-token" ];
ExecStart = escapeSystemdExecArgs ( ExecStart = escapeSystemdExecArgs (
[ [
(getExe pkgs.prometheus-fastly-exporter) (getExe pkgs.prometheus-fastly-exporter)

2
nixos/tests/prometheus-exporters.nix
View file

@ -399,7 +399,7 @@ let
fastly = { fastly = {
exporterConfig = { exporterConfig = {
enable = true; enable = true;
tokenPath = pkgs.writeText "token" "abc123"; environmentFile = pkgs.writeText "fastly-exporter-env" "FASTLY_API_TOKEN=abc123";
}; };
exporterTest = '' exporterTest = ''