diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-22 21:22:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 21:22:38 +0200 |
| commit | 0436b987539b5447cadd1ea9c1eaea52b27a9be2 (patch) | |
| tree | 97edca9a302b03636fcee89fe4c0be6221ceddd7 /nixos | |
| parent | 8f0350a213f1899815d7cbb698a90b9dd5183675 (diff) | |
| parent | 876396cac06d76bffe80a197551406fceca85fae (diff) | |
| download | nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar.gz nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar.bz2 nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar.lz nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar.xz nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.tar.zst nixpkgs-0436b987539b5447cadd1ea9c1eaea52b27a9be2.zip | |
Merge pull request #95845 from WilliButz/update/prometheus-2.20.1
prometheus: 2.19.3 -> 2.20.1, fix thanos test
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/prometheus.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index bce489168f9..af2aa66a552 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -158,7 +158,10 @@ in import ./make-test-python.nix { s3 = { pkgs, ... } : { # Minio requires at least 1GiB of free disk space to run. - virtualisation.diskSize = 2 * 1024; + virtualisation = { + diskSize = 2 * 1024; + memorySize = 1024; + }; networking.firewall.allowedTCPPorts = [ minioPort ]; services.minio = { @@ -235,7 +238,7 @@ in import ./make-test-python.nix { # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket # and check if the blocks have the correct labels: store.succeed( - "thanos bucket ls " + "thanos tools bucket ls " + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} " + "--output=json | " + "jq .thanos.labels.some_label | " |