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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/prometheus-exporters: fix default firewall filter #97338

Merged
merged 1 commit into from Sep 7, 2020

Conversation

WilliButz
Copy link
Member

Motivation for this change

I was made aware by @elseym (thanks for that 馃帀) that the exporter module does not update the default value of the firewallFilter option when the port option is changed. I suspect that this was not noticed because so far no one used a custom port combined with openFirewall for an exporter.

Things done

Instead of always using the default port of one exporter for its default
firewall filter, the port from the current service configuration is used.

I did a short test to verify this works by setting a custom port for one of the exporters in the test, setting openFirewall = true; and checking the firewall rules in the test VM.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@WilliButz WilliButz added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 7, 2020
Instead of always using the default port of one exporter for its default
firewall filter, the port from the current service configuration is used.
@WilliButz
Copy link
Member Author

Just noticed I forgot a toString in defaultText.

Copy link
Member

@elseym elseym left a comment

Choose a reason for hiding this comment

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

tested, works as expected.
馃憤 lgtm.

@elseym elseym merged commit b0a8a74 into NixOS:master Sep 7, 2020
@WilliButz WilliButz deleted the exporters/fix-firewall-filter branch September 8, 2020 17:00
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