From fa37940bfe22a20ca1c8733858086ac98101a6b7 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 18 Jun 2026 23:12:38 +0200 Subject: [PATCH] nixos/tests/victoriametrics: migrate to container tests --- .../external-promscrape-config.nix | 12 +++---- nixos/tests/victoriametrics/remote-write.nix | 12 +++---- nixos/tests/victoriametrics/vmalert.nix | 32 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/nixos/tests/victoriametrics/external-promscrape-config.nix b/nixos/tests/victoriametrics/external-promscrape-config.nix index f645b8c839b9..15b8c9bde157 100644 --- a/nixos/tests/victoriametrics/external-promscrape-config.nix +++ b/nixos/tests/victoriametrics/external-promscrape-config.nix @@ -29,8 +29,8 @@ in ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -55,14 +55,14 @@ in node.wait_for_unit("prometheus-node-exporter") node.wait_for_open_port(${toString nodeExporterPort}) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_open_port(8428) - promscrape_config = victoriametrics.succeed("journalctl -u victoriametrics -o cat | grep 'promscrape.config'") + promscrape_config = vmserver.succeed("journalctl -u victoriametrics -o cat | grep 'promscrape.config'") assert '${toString promscrapeConfigYaml}' in promscrape_config - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) diff --git a/nixos/tests/victoriametrics/remote-write.nix b/nixos/tests/victoriametrics/remote-write.nix index 1788c9d8747c..721c4822c1d0 100644 --- a/nixos/tests/victoriametrics/remote-write.nix +++ b/nixos/tests/victoriametrics/remote-write.nix @@ -14,8 +14,8 @@ in ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -34,7 +34,7 @@ in services.vmagent = { enable = true; remoteWrite = { - url = "http://victoriametrics:8428/api/v1/write"; + url = "http://vmserver:8428/api/v1/write"; basicAuthUsername = username; basicAuthPasswordFile = toString passwordFile; }; @@ -71,13 +71,13 @@ in node.wait_for_unit("prometheus-node-exporter") node.wait_for_open_port(9100) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_open_port(8428) vmagent.wait_for_unit("vmagent") # check remote write - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl --user '${username}:${password}' -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) diff --git a/nixos/tests/victoriametrics/vmalert.nix b/nixos/tests/victoriametrics/vmalert.nix index e6a0ab5d4e52..684b60d0a605 100644 --- a/nixos/tests/victoriametrics/vmalert.nix +++ b/nixos/tests/victoriametrics/vmalert.nix @@ -9,8 +9,8 @@ ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -27,7 +27,7 @@ static_configs = [ { targets = [ - "alertmanager:${toString config.services.prometheus.alertmanager.port}" + "alert:${toString config.services.prometheus.alertmanager.port}" ]; } ]; @@ -51,7 +51,7 @@ settings = { "datasource.url" = "http://localhost:8428"; # victoriametrics' api "notifier.url" = [ - "http://alertmanager:${toString config.services.prometheus.alertmanager.port}" + "http://alert:${toString config.services.prometheus.alertmanager.port}" ]; # alertmanager's api rule = [ (pkgs.writeText "instance-down.yml" '' @@ -71,7 +71,7 @@ }; }; - alertmanager = { + alert = { services.prometheus.alertmanager = { enable = true; openFirewall = true; @@ -115,33 +115,33 @@ }; testScript = '' - alertmanager.wait_for_unit("alertmanager") - alertmanager.wait_for_open_port(9093) - alertmanager.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") + alert.wait_for_unit("alertmanager") + alert.wait_for_open_port(9093) + alert.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") logger.wait_for_unit("alertmanager-webhook-logger") logger.wait_for_open_port(6725) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_unit("vmalert") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_unit("vmalert") + vmserver.wait_for_open_port(8428) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"alertmanager\"\}==1)' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=sum(alertmanager_build_info)%20by%20(version)' | " + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-alertmanager.version}\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"node\"\}!=1)' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=alertmanager_notifications_total\{integration=\"webhook\"\}' | " + "jq '.data.result[0].value[1]' | grep -v '\"0\"'" ) @@ -152,6 +152,6 @@ logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'")) - alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) + alert.log(alert.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) ''; }