diff --git a/ops/nixos/blade-tuvok/default.nix b/ops/nixos/blade-tuvok/default.nix index b2894d93cd..9bd71953b0 100644 --- a/ops/nixos/blade-tuvok/default.nix +++ b/ops/nixos/blade-tuvok/default.nix @@ -233,7 +233,7 @@ in { WorkingDirectory = "/tmp"; SupplementaryGroups = "bird2"; ExecStart = '' - ${pkgs.prometheus-bird-exporter}/bin/bird_exporter \ + ${depot.pkgs.prometheus-bird-exporter-lfty}/bin/bird_exporter \ -web.listen-address 0.0.0.0:9325 \ -bird.socket /var/run/bird-wg-endpoint.ctl \ -bird.v2=true \ @@ -241,6 +241,7 @@ in { ''; }; }; + my.prometheus.additionalExporterPorts.bird-wg-endpoint-exporter = 9325; services.lukegbgp.config.export = { v4Extra = '' route 92.118.30.0/24 via 92.118.28.252; diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix index 12e6f82526..25de4adae4 100644 --- a/ops/nixos/swann/default.nix +++ b/ops/nixos/swann/default.nix @@ -505,5 +505,13 @@ in { ''; }; + systemd.services.prometheus-bird-exporter.serviceConfig.ExecStart = '' + ${depot.pkgs.prometheus-bird-exporter-lfty}/bin/bird_exporter \ + -web.listen-address 0.0.0.0:9324 \ + -bird.socket /var/run/bird.ctl \ + -bird.v2=true \ + -format.new=true + ''; + system.stateVersion = "21.03"; }