Merge changes I8e57bb58,I19757abe
* changes:
bgpwtf/machines/tests: fix edge01.waw test for new prefix
bgpwtf/machines/modules: fix bird_exporter
diff --git a/bgpwtf/machines/modules/prometheus.nix b/bgpwtf/machines/modules/prometheus.nix
index 704c257..1ebb435 100644
--- a/bgpwtf/machines/modules/prometheus.nix
+++ b/bgpwtf/machines/modules/prometheus.nix
@@ -10,15 +10,15 @@
birdExporter = pkgs.buildGoModule rec {
pname = "bird-exporter";
- version = "1.2.5";
+ version = "1.2.6";
src = pkgs.fetchFromGitHub {
owner = "czerwonk";
repo = "bird_exporter";
rev = version;
- sha256 = "1qrhncy1f119f5rfgn2d1l6nvapaqkld4zb9bxzdqmmw6kicc7bs";
+ sha256 = "1yqizzlvwyxlrd2priqd1jx9s87yvsypqkmk81dacm1ra4xrs0nd";
};
- vendorSha256 = null;
+ vendorSha256 = "0wczj3g0c917hwjkz23xg5blb4z5a04v3wbx6kg0wfyb09c9bwx3";
};
in {
diff --git a/bgpwtf/machines/tests/edge01-waw.nix b/bgpwtf/machines/tests/edge01-waw.nix
index 1d724e1..6b641b5 100644
--- a/bgpwtf/machines/tests/edge01-waw.nix
+++ b/bgpwtf/machines/tests/edge01-waw.nix
@@ -262,7 +262,7 @@
# edge01 must announce exactly one v4 prefix.
bgpspeaker.succeed("birdc show route protocol bgp_globalmix_v4 | grep unicast")
bgpspeaker.fail(
- "birdc show route protocol bgp_globalmix_v4 | grep unicast | grep -v 185.236.240.0/23"
+ "birdc show route protocol bgp_globalmix_v4 | grep unicast | grep -v 185.236.240.0/24"
)
# edge01 must announce exactly one v6 prefix.