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

@WilliButz WilliButz commented Sep 7, 2020

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 requested a review from elseym 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 WilliButz force-pushed the WilliButz:exporters/fix-firewall-filter branch from bf23732 to 5d51096 Sep 7, 2020
@WilliButz
Copy link
Member Author

@WilliButz WilliButz commented Sep 7, 2020

Just noticed I forgot a toString in defaultText.

@elseym
elseym approved these changes Sep 7, 2020
Copy link
Member

@elseym elseym left a comment

tested, works as expected.
馃憤 lgtm.

@elseym elseym merged commit b0a8a74 into NixOS:master Sep 7, 2020
16 checks passed
16 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d51096"; rev="5d5109683912682435d8e7012cfb6a7a20962af8"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@WilliButz WilliButz deleted the WilliButz:exporters/fix-firewall-filter branch Sep 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can鈥檛 perform that action at this time.