diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-08 18:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 18:01:24 +0000 |
| commit | f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c (patch) | |
| tree | 72f48cbc6b62cbb38c847d268cbff1d5782c4a93 /nixos/tests | |
| parent | 40b71c3159786e26785d0fbda27f0e2042c7f764 (diff) | |
| parent | 159ed1e4f00b1a4dfe06881f27cb7d3ffe7d3ec3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/prometheus.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index d102b4c07518..20f8c4459e10 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -130,14 +130,10 @@ in import ./make-test-python.nix { # This configuration just adds a new prometheus job # to scrape the node_exporter metrics of the s3 machine. - # We also use an environmentFile to test if that works correctly. services.prometheus = { - environmentFile = pkgs.writeText "prometheus-config-env-file" '' - JOB_NAME=s3-node_exporter - ''; scrapeConfigs = [ { - job_name = "$JOB_NAME"; + job_name = "s3-node_exporter"; static_configs = [ { targets = [ "s3:9100" ]; @@ -232,11 +228,6 @@ in import ./make-test-python.nix { # Check if prometheus responds to requests: prometheus.wait_for_unit("prometheus.service") - # Check if prometheus' config file is correctly locked down because it could contain secrets. - prometheus.succeed( - "stat -c '%a %U' /var/lib/prometheus2/prometheus-substituted.yaml | grep '600 prometheus'" - ) - prometheus.wait_for_open_port(${toString queryPort}) prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics") |