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.

Sign up for GitHub

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

Jump to bottom

prometheus-wireguard-exporter: 2.0.1 -> 3.0.0 #65225

Merged
merged 2 commits into from Jul 21, 2019
Merged

prometheus-wireguard-exporter: 2.0.1 -> 3.0.0 #65225

merged 2 commits into from Jul 21, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jul 21, 2019 •
edited

Motivation for this change

Updates the prometheus-wireguard-exporter package to the latest version 3.0.0. Please note that this version is incompatible with 2.0.1 as the local_ip and local_port field were replaced by a allowed_ips field with comma-separated peers.

With -s (or services.prometheus.exporters.wireguard.singleSubnetPerField) each peer has its own field allowed_{ip,subnet}_<index>.

cc @WilliButz you might be interested in this as well :)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@Ma27 Ma27 requested a review from fpletz July 21, 2019 14:23
WilliButz
WilliButz approved these changes Jul 21, 2019
View reviewed changes
Copy link
Member

@WilliButz WilliButz left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@WilliButz
Copy link
Member

@GrahamcOfBorg test prometheus-exporters.wireguard

Ma27 added 2 commits July 21, 2019 21:39
@Ma27
prometheus-wireguard-exporter: 2.0.1 -> 3.0.0
543ef56 
Two new releases are available:
* https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.0.0
* https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/2.0.2

The main new feature is that the exporter exposes all allowed ips and
subnets.
@Ma27
nixos/prometheus-exporters/wireguard: add support for -s switch
7095bdf 
Since version 3.0 all allowed IPs and subnets are exposed by the
exporter. With `-s` set on the CLI, instead of a comma-separated list,
each allowed IP and subnet will be in a single field with the schema
`allowed_ip_<index>`.
@Ma27 Ma27 force-pushed the bump-prometheus-wireguard-exporter branch from 1e1b76d to 7095bdf Compare July 21, 2019 19:40
@Ma27
Copy link
Member Author

Ma27 commented Jul 21, 2019

After having a short chat with @WilliButz we both agreed that the tests broke most likely because of some timing issues. I ensured that the test retries the curl call and that the exporter is started after the wireguard unit.

@GrahamcOfBorg test prometheus-exporters.wireguard

@fpletz fpletz merged commit bc41883 into NixOS:master Jul 21, 2019
@Ma27 Ma27 deleted the bump-prometheus-wireguard-exporter branch July 21, 2019 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

@WilliButz WilliButz WilliButz approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @WilliButz @fpletz