diff options
author | WilliButz <wbutz@cyberfnord.de> | 2020-08-20 11:14:02 +0200 |
---|---|---|
committer | WilliButz <wbutz@cyberfnord.de> | 2020-08-20 11:14:43 +0200 |
commit | 876396cac06d76bffe80a197551406fceca85fae (patch) | |
tree | 61a7894d79f0d0d4164c95f62a8fe70e7e36feb8 /nixos | |
parent | 8d45118da70dc11ab71cda76402b0b5c6d3271c9 (diff) | |
download | nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar.gz nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar.bz2 nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar.lz nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar.xz nixpkgs-876396cac06d76bffe80a197551406fceca85fae.tar.zst nixpkgs-876396cac06d76bffe80a197551406fceca85fae.zip |
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 | " |