Skip to content

Commit

Permalink
Update metricbeat tests to use 7.4 version of the stack (#14017)
Browse files Browse the repository at this point in the history
* Update metricbeat tests to use 7.4 version of the stack

* Update also latest environment
  • Loading branch information
Carlos Pérez-Aradros Herce authored Oct 11, 2019
1 parent 660daa1 commit 62c6b26
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ services:
- 8080

elasticsearch:
image: docker.elastic.co/observability-ci/beats-integration-elasticsearch:${ELASTICSEARCH_VERSION:-7.3.0}-1
image: docker.elastic.co/observability-ci/beats-integration-elasticsearch:${ELASTICSEARCH_VERSION:-7.4.0}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.3.0}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.4.0}
environment:
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
- "network.host="
Expand Down Expand Up @@ -163,11 +163,11 @@ services:
- 9092

kibana:
image: docker.elastic.co/observability-ci/beats-integration-kibana:${KIBANA_VERSION:-7.3.0}-1
image: docker.elastic.co/observability-ci/beats-integration-kibana:${KIBANA_VERSION:-7.4.0}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.3.0}
KIBANA_VERSION: ${KIBANA_VERSION:-7.4.0}
depends_on:
- elasticsearch
ports:
Expand Down Expand Up @@ -196,7 +196,7 @@ services:
# - 18080

logstash:
image: docker.elastic.co/observability-ci/beats-integration-logstash:${LOGSTASH_VERSION:-7.3.0}-1
image: docker.elastic.co/observability-ci/beats-integration-logstash:${LOGSTASH_VERSION:-7.4.0}-1
build:
context: ./module/logstash/_meta
args:
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.3.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
retries: 300
Expand All @@ -16,7 +16,7 @@ services:
- "xpack.security.enabled=false"

logstash:
image: docker.elastic.co/logstash/logstash:7.3.2
image: docker.elastic.co/logstash/logstash:7.4.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 300
Expand All @@ -26,7 +26,7 @@ services:
- ./docker/logstash/pki:/etc/pki:ro

kibana:
image: docker.elastic.co/kibana/kibana:7.3.2
image: docker.elastic.co/kibana/kibana:7.4.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
retries: 300
Expand Down
4 changes: 2 additions & 2 deletions x-pack/metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ services:
kibana:
# Copied configuration from OSS metricbeat because services with depends_on
# cannot be extended with extends
image: docker.elastic.co/observability-ci/beats-integration-kibana:${KIBANA_VERSION:-7.3.0}-1
image: docker.elastic.co/observability-ci/beats-integration-kibana:${KIBANA_VERSION:-7.4.0}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.3.0}
KIBANA_VERSION: ${KIBANA_VERSION:-7.4.0}
depends_on:
- elasticsearch
ports:
Expand Down

0 comments on commit 62c6b26

Please sign in to comment.