diff --git a/docs/recipes.rst b/docs/recipes.rst index 2f99f7580..358786905 100644 --- a/docs/recipes.rst +++ b/docs/recipes.rst @@ -161,11 +161,11 @@ Running the ``start.sh`` script requires Docker locally installed and performs t 1. Starts a single node (512MB heap) Elasticsearch cluster locally, to serve as a :ref:`metrics store `. It also starts Kibana attached to the Elasticsearch metric store cluster. 2. Creates a new configuration file for Rally under ``~/.rally/rally-metricstore.ini`` referencing Elasticsearch from step 1. -3. Starts two additional local Elasticsearch clusters with 1 node each, (version ``7.0.0`` by default) called ``leader`` and ``follower`` listening at ports 32901 and 32902 respectively. Each node uses 1GB heap. +3. Starts two additional local Elasticsearch clusters with 1 node each, (version ``7.3.2`` by default) called ``leader`` and ``follower`` listening at ports 32901 and 32902 respectively. Each node uses 1GB heap. 4. Accepts the trial license. 5. Configures ``leader`` on the ``follower`` as a `remote cluster `_. 6. Sets an `auto-follow pattern `_ on the follower for every index on the leader to be replicated as ``-copy``. -7. Runs the `geonames track `_, `append-no-conflicts-index-only challenge `_ challenge, ingesting only 20% of the corpus. It also enables the ``ccr-stats`` :doc:`telemetry device ` with a sample rate interval of ``1s``. +7. Runs the `geonames track `_, `append-no-conflicts-index-only challenge `_ challenge, ingesting only 20% of the corpus using 3 primary shards. It also enables the ``ccr-stats`` :doc:`telemetry device ` with a sample rate interval of ``1s``. Rally will push metrics to the metric store configured in 1. and they can be visualized by accessing Kibana at `http://locahost:5601 `_. diff --git a/recipes/ccr/.elastic-version b/recipes/ccr/.elastic-version index 0099c1f39..9bc85e1fe 100644 --- a/recipes/ccr/.elastic-version +++ b/recipes/ccr/.elastic-version @@ -1,2 +1,2 @@ -export ES_VERSION=${ES_VERSION:-7.0.0} +export ES_VERSION=${ES_VERSION:-7.3.2} diff --git a/recipes/ccr/metricstore-docker-compose.yml b/recipes/ccr/metricstore-docker-compose.yml index e21c4b3a3..2e39fe23a 100644 --- a/recipes/ccr/metricstore-docker-compose.yml +++ b/recipes/ccr/metricstore-docker-compose.yml @@ -1,7 +1,7 @@ version: '2.2' services: metricsstore: - image: docker.elastic.co/elasticsearch/elasticsearch:6.7.1 + image: docker.elastic.co/elasticsearch/elasticsearch:7.3.2 container_name: es01 environment: - cluster.name=es01 @@ -25,7 +25,7 @@ services: retries: 5 kibana: - image: docker.elastic.co/kibana/kibana:6.7.1 + image: docker.elastic.co/kibana/kibana:7.3.2 ports: - 5601:5601 environment: diff --git a/recipes/ccr/start.sh b/recipes/ccr/start.sh index 3542394af..c36d4c5d8 100755 --- a/recipes/ccr/start.sh +++ b/recipes/ccr/start.sh @@ -106,4 +106,4 @@ release.cache = true EOF # Start Rally -esrally --configuration-name=metricstore --target-hosts=./ccr-target-hosts.json --pipeline=benchmark-only --on-error=abort --track=geonames --challenge=append-no-conflicts-index-only --track-params="ingest_percentage:20" --telemetry="ccr-stats" --telemetry-params="ccr-stats-sample-interval:1" +esrally --configuration-name=metricstore --target-hosts=./ccr-target-hosts.json --pipeline=benchmark-only --on-error=abort --track=geonames --challenge=append-no-conflicts-index-only --track-params="ingest_percentage:20,number_of_shards:3" --telemetry="ccr-stats" --telemetry-params="ccr-stats-sample-interval:1"