Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update metricbeat tests to use 7.4 version of the stack #14017

Merged
merged 2 commits into from
Oct 11, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update metricbeat tests to use 7.4 version of the stack
  • Loading branch information
Carlos Pérez-Aradros Herce committed Oct 11, 2019
commit e593338245d48b7eb2807e4c8c1d4af144e75d69
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
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