From 0bdba6fff46a9aaedcb4de103ed412deeddb01b3 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Mon, 29 Oct 2018 02:54:55 -0600 Subject: [PATCH] metrics: Update working elasticsearch version. Update working elasticsearch version in order to run the grab data report generator. Fixes #866 Signed-off-by: Gabriela Cervantes --- metrics/report/grabdata.sh | 7 ++++++- versions.yaml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/metrics/report/grabdata.sh b/metrics/report/grabdata.sh index 272b88772..706eff35c 100755 --- a/metrics/report/grabdata.sh +++ b/metrics/report/grabdata.sh @@ -19,6 +19,11 @@ SCRIPT_DIR=$(dirname "$(readlink -f "$0")") source "${SCRIPT_DIR}/../lib/common.bash" RESULTS_DIR=${SCRIPT_DIR}/../results +# Get working elasticsearch version +VERSIONS_FILE="${SCRIPT_DIR}/../../versions.yaml" +ELASTICSEARCH_VERSION=$("${GOPATH}/bin/yq" read "$VERSIONS_FILE" "docker_images.elasticsearch.version") +ELASTICSEARCH_IMAGE="elasticsearch:$ELASTICSEARCH_VERSION" + # By default we run all the tests RUN_ALL=1 @@ -115,7 +120,7 @@ run_density_ksm() { # elasticsearch - large container # Need to wait for elasticsearch to boot and settle before we measure export PAYLOAD_SLEEP="10" - export PAYLOAD="elasticsearch" + export PAYLOAD=$ELASTICSEARCH_IMAGE PAYLOAD_ARGS=" " PAYLOAD_RUNTIME_ARGS=" -m 8G" bash density/footprint_data.sh diff --git a/versions.yaml b/versions.yaml index fdaba6a30..ad0d22c94 100644 --- a/versions.yaml +++ b/versions.yaml @@ -20,6 +20,11 @@ docker_images: url: "https://hub.docker.com/_/alpine/" version: "3.7" + elasticsearch: + description: "RESTful search and analytics engine" + url: "https://hub.docker.com/_/elasticsearch/" + version: "6.4.0" + kibana: description: "Open source analytics and visualization platform" url: "https://hub.docker.com/_/kibana/"