diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-25 16:46:39 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-25 18:53:10 +0200 |
commit | 241377ee76b0f3c8f9a852756689ec01fe05764a (patch) | |
tree | 9bdf9e77ba22a33900134f38f30860ab03c450ff /nixos/tests/elk.nix | |
parent | 8aa331874175dc3d35c9211ea2e627c8194f40d4 (diff) |
nixos/tests/elk.nix: make sure the test doesn't wait for too long on elasticsearch-curator
Diffstat (limited to 'nixos/tests/elk.nix')
-rw-r--r-- | nixos/tests/elk.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 665e27a05534..15be72b80bba 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -72,7 +72,7 @@ let 1: action: delete_indices description: >- - Delete indices older than 1 minute (based on index name), for logstash- + Delete indices older than 1 second (based on index name), for logstash- prefixed indices. Ignore the error if the filter does not result in an actionable list of indices (ignore_empty_list) and exit cleanly. options: @@ -86,7 +86,7 @@ let source: name direction: older timestring: '%Y.%m.%d' - unit: minutes + unit: seconds unit_count: 1 ''; }; @@ -118,6 +118,8 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + + # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); |