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.

Sign up for GitHub

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

Jump to bottom

Bump stack version to 7.12.0 for testing #24957

Merged
merged 3 commits into from
Apr 14, 2021
Merged

Bump stack version to 7.12.0 for testing #24957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69f7050
Bump stack version to 7.12.0 for testing
kaiyan-sheng Apr 7, 2021
0040ef8
Merge remote-tracking branch 'upstream/master' into bump_versions
kaiyan-sheng Apr 13, 2021
11780ba
Merge remote-tracking branch 'upstream/master' into bump_versions
kaiyan-sheng Apr 14, 2021
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
12 changes: 6 additions & 6 deletions metricbeat/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ services:

# Used by base tests
elasticsearch:
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.12.0}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.10.0}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.12.0}
environment:
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
- "network.host="
Expand All @@ -37,23 +37,23 @@ services:

# Used by base tests
kibana:
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.10.0}
KIBANA_VERSION: ${KIBANA_VERSION:-7.12.0}
depends_on:
- elasticsearch
ports:
- 5601

# Used by base tests
metricbeat:
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.12.0}-1
build:
context: ./module/beat/_meta
args:
BEAT_VERSION: ${BEAT_VERSION:-7.10.0}
BEAT_VERSION: ${BEAT_VERSION:-7.12.0}
command: '-e'
ports:
- 5066
8 changes: 4 additions & 4 deletions metricbeat/module/logstash/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ version: '2.3'

services:
logstash:
image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.12.0}-1
build:
context: ./_meta
args:
LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.10.0}
LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.12.0}
ports:
- 9600
depends_on:
- elasticsearch

elasticsearch:
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.12.0}-1
build:
context: ../elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.10.0}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.12.0}
environment:
- "network.host="
- "transport.host=127.0.0.1"
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/latest.yml
View file
Open in desktop
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.10.0
image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -20,7 +20,7 @@ services:
- "script.context.template.cache_max_size=2000"

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

kibana:
image: docker.elastic.co/kibana/kibana:7.10.0
image: docker.elastic.co/kibana/kibana:7.12.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ services:
kibana:
# Copied configuration from OSS metricbeat because services with depends_on
# cannot be extended with extends
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.10.0}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.10.0}
KIBANA_VERSION: ${KIBANA_VERSION:-7.12.0}
depends_on:
- elasticsearch
ports:
Expand Down