Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/tempo: add extraFlags option #249150

Merged
merged 1 commit into from
Aug 14, 2023
Merged

nixos/tempo: add extraFlags option #249150

merged 1 commit into from
Aug 14, 2023

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Aug 14, 2023

Description of changes

Main use-case for me is to specify -config.expand-env=true which allows me inject secrets via systemd's environment file mechanism[1] like this:

storage.trace.s3 = {
  /* all the other stuff */
  secret_key = "\${GARAGE_SECRET_KEY}";
};

[1] https://grafana.com/docs/tempo/latest/configuration/#use-environment-variables-in-the-configuration

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Main use-case for me is to specify `-config.expand-env=true` which
allows me inject secrets via systemd's environment file mechanism[1]
like this:

    storage.trace.s3 = {
      /* all the other stuff */
      secret_key = "\${GARAGE_SECRET_KEY}";
    };

[1] https://grafana.com/docs/tempo/latest/configuration/#use-environment-variables-in-the-configuration
@Ma27 Ma27 requested a review from K900 August 14, 2023 16:08
@K900 K900 merged commit 25c3788 into NixOS:master Aug 14, 2023
4 of 5 checks passed
@Ma27 Ma27 deleted the tempo-extraflags branch August 14, 2023 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants