summary refs log tree commit diff
path: root/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-10-13 12:12:58 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2019-10-13 12:16:46 +0200
commiteeb4726446425def75bad49a971e3d45c563032d (patch)
tree55e7ec3aec735b8666bcd66797717011d22bbe38 /nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
parent9666f3c03d9ccf5bc9c482b9dbfa46421f5d65b5 (diff)
downloadnixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar.gz
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar.bz2
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar.lz
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar.xz
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.tar.zst
nixpkgs-eeb4726446425def75bad49a971e3d45c563032d.zip
nixos/prometheus-wireguard-exporter: remove `addr` option
This option was added by mistake since `listenAddress` exists by default
for each prometheus-exporter. Using
`services.prometheus.exporters.wireguard.addr` will now cause a warning,
but doesn't break eval.
Diffstat (limited to 'nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix')
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix14
1 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index 82e881236ad..374f83a2939 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -6,6 +6,10 @@ let
   cfg = config.services.prometheus.exporters.wireguard;
 in {
   port = 9586;
+  imports = [
+    (mkRenamedOptionModule [ "addr" ] [ "listenAddress" ])
+    ({ options.warnings = options.warnings; options.assertions = options.assertions; })
+  ];
   extraOpts = {
     verbose = mkEnableOption "Verbose logging mode for prometheus-wireguard-exporter";
 
@@ -42,14 +46,6 @@ 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 ];
@@ -59,7 +55,7 @@ in {
       ExecStart = ''
         ${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
           -p ${toString cfg.port} \
-          -l ${cfg.addr} \
+          -l ${cfg.listenAddress} \
           ${optionalString cfg.verbose "-v"} \
           ${optionalString cfg.singleSubnetPerField "-s"} \
           ${optionalString cfg.withRemoteIp "-r"} \