Skip to content

nixos/filebeat: Improve options#322425

Draft
felbinger wants to merge 1 commit intoNixOS:masterfrom
secshellnet:mod-filebeat-fix
Draft

nixos/filebeat: Improve options#322425
felbinger wants to merge 1 commit intoNixOS:masterfrom
secshellnet:mod-filebeat-fix

Conversation

@felbinger
Copy link
Copy Markdown
Member

@felbinger felbinger commented Jun 25, 2024

Description of changes

The implemented nixos options for filebeat could be improved.

I had trouble finding a way to disable the elasticsearch output in the first place, which was the main reason to open this pr, see: #280535

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 25, 2024
@felbinger felbinger marked this pull request as draft June 25, 2024 14:16
@felbinger felbinger force-pushed the mod-filebeat-fix branch 2 times, most recently from 6604677 to ecf1834 Compare June 25, 2024 14:23
@felbinger felbinger changed the title nixos/filebeat: Remove default outputs nixos/filebeat: Improve options 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 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 25, 2024
@github-actions github-actions bot removed 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes labels Jun 25, 2024
@felbinger felbinger force-pushed the mod-filebeat-fix branch 2 times, most recently from 8bfb5f1 to bd7f7d3 Compare June 26, 2024 11:50
@felbinger felbinger marked this pull request as ready for review June 26, 2024 11:50
@felbinger felbinger force-pushed the mod-filebeat-fix branch 6 times, most recently from f04fcab to fd2bd02 Compare June 26, 2024 16:08
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes labels Jun 26, 2024
@felbinger
Copy link
Copy Markdown
Member Author

@SuperSandro2000 Is it possible to set default values for attrOf submodule, which can be set like outputs.<name>.enable ?
I tried setting the default value (see code), but I don't think this is going to work.

Do you see any other way to accomplish this without removing the default option (which again is a breaking change)?

Is there also a simpler solution to filter the outputs attrs to only get the enabled (see code)?

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 30, 2024
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think the module system will now properly merge this.

I think this could be similar to 490ba58 but not fully sure.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Looks like it is working. I tested a couple configurations and just had one issue with an assertion. Also this is nothing I changed in this commit, it was just changed due to new formatting standard which has been introduced in #326407.

@felbinger felbinger force-pushed the mod-filebeat-fix branch 2 times, most recently from 39fbea0 to b18d21f Compare August 4, 2024 20:52
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 10, 2024
@SuperSandro2000 SuperSandro2000 marked this pull request as draft October 3, 2024 16:08
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 7, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants