Skip to content

Commit

Permalink
[Release] update test environment (#29755)
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jan 24, 2022
1 parent 9e0dad7 commit 6df6ff4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions metricbeat/docker-compose.yml
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.16.2}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.16.3}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.16.2}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.16.3}
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.16.2}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.16.3}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.16.2}
KIBANA_VERSION: ${KIBANA_VERSION:-7.16.3}
depends_on:
- elasticsearch
ports:
- 5601

# Used by base tests
metricbeat:
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.16.2}-1
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.16.3}-1
build:
context: ./module/beat/_meta
args:
BEAT_VERSION: ${BEAT_VERSION:-7.16.2}
BEAT_VERSION: ${BEAT_VERSION:-7.16.3}
command: '-e'
ports:
- 5066
8 changes: 4 additions & 4 deletions metricbeat/module/logstash/docker-compose.yml
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.16.2}-1
image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.16.3}-1
build:
context: ./_meta
args:
LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.16.2}
LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.16.3}
ports:
- 9600
depends_on:
- elasticsearch

elasticsearch:
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.16.2}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.16.3}-1
build:
context: ../elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.16.2}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.16.3}
environment:
- "network.host="
- "transport.host=127.0.0.1"
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.16.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -16,7 +16,7 @@ services:
- "xpack.security.enabled=false"

logstash:
image: docker.elastic.co/logstash/logstash:7.16.2
image: docker.elastic.co/logstash/logstash:7.16.3
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.16.2
image: docker.elastic.co/kibana/kibana:7.16.3
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
retries: 300
Expand Down
6 changes: 3 additions & 3 deletions testing/environments/prev-minor.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.16.1
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.2
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -21,7 +21,7 @@ services:
- "action.destructive_requires_name=false"

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

kibana:
image: docker.elastic.co/kibana/kibana:7.16.1
image: docker.elastic.co/kibana/kibana:7.16.2
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
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 @@ -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.16.2}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.16.3}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-7.16.2}
KIBANA_VERSION: ${KIBANA_VERSION:-7.16.3}
depends_on:
- elasticsearch
ports:
Expand Down

0 comments on commit 6df6ff4

Please sign in to comment.