Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8846bf0574bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: beb59b76cfc7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 28, 2019

  1. prometheus-wireguard-exporter: 3.1.0 -> 3.1.1 

    https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.1

This release adds a flag `-l` which takes an address where the exporter
is available. The default is `0.0.0.0` (previously, `0.0.0.0` was used
by default).

Please note that there are no dependency changes in Cargo and therefore
the cargo hash didn't change.
    @Ma27
    Ma27 committed Sep 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    beb59b7 View commit details
Showing with 11 additions and 2 deletions.
  1. +9 −0 nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
  2. +2 −2 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
9 changes: 9 additions & 0 deletions nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,14 @@ in {
Whether or not the remote IP of a WireGuard peer should be exposed via prometheus.
'';
};

addr = mkOption {
type = types.str;
default = "0.0.0.0";
description = ''
IP address of the exporter.
'';
};
};
serviceOpts = {
path = [ pkgs.wireguard-tools ];
@@ -51,6 +59,7 @@ in {
ExecStart = ''
${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
-p ${toString cfg.port} \
-l ${cfg.addr} \
${optionalString cfg.verbose "-v"} \
${optionalString cfg.singleSubnetPerField "-s"} \
${optionalString cfg.withRemoteIp "-r"} \
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
version = "3.1.0";
version = "3.1.1";

src = fetchFromGitHub {
owner = "MindFlavor";
repo = "prometheus_wireguard_exporter";
rev = version;
sha256 = "0hl82cg6cijk3xf35cgi4v14gmxk3fj4c3z1x5hrs2i0j1i26ilw";
sha256 = "1cc36bngpjq8138f98d2dl0imgisiph7xmw1i7csmjs03b4pnfcx";
};

cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk";