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/promtail: configFile for passing path as config #322426

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

Kek5chen
Copy link
Contributor

@Kek5chen Kek5chen commented Jun 25, 2024

Description of changes

Added an option that is used instead of the configurations attribute in case you wish to use a config file instead.

Shouldn't break existing configurations.

Things done

  • Built on platform(s)

    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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/)

  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 25, 2024
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 25, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 25, 2024
Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be good to mention that configFile and configuration are incompatible options

Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Please squash your commits

@Kek5chen Kek5chen force-pushed the feat/promtail-config-file branch from b1be81b to 05c18dc Compare October 27, 2024 12:45
@Kek5chen
Copy link
Contributor Author

Kek5chen commented Nov 2, 2024

@FliegendeWurst done ":3

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 2, 2024
@Aleksanaa Aleksanaa requested review from Mic92, mweinelt and dasJ November 5, 2024 16:30
@Kek5chen Kek5chen force-pushed the feat/promtail-config-file branch from 05c18dc to 518bc9c Compare November 7, 2024 21:53
@Kek5chen Kek5chen requested a review from NetaliDev November 7, 2024 21:53
Copy link
Member

@NetaliDev NetaliDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've also tested it, and it works as it should.

@Kek5chen Kek5chen added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 8, 2024
@NetaliDev NetaliDev merged commit 8db8859 into NixOS:master Nov 8, 2024
26 checks passed
@Kek5chen Kek5chen deleted the feat/promtail-config-file branch November 10, 2024 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants