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

[Release] Update test environments for 8.13.5 #39438

Merged
merged 4 commits into from
May 20, 2024
Merged

[Release] Update test environments for 8.13.5 #39438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41386b5
[Release] update test environment
elasticmachine May 7, 2024
98866ec
Merge branch '8.13' into update-testing-env-next-8.13.5
pierrehilbert May 10, 2024
758065b
Merge branch '8.13' into update-testing-env-next-8.13.5
pierrehilbert May 12, 2024
cb8e9d8
Merge branch '8.13' into update-testing-env-next-8.13.5
pierrehilbert May 19, 2024
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 @@ -17,11 +17,11 @@ services:

# Used by base tests
elasticsearch:
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.13.3}-1
image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.13.4}-1
build:
context: ./module/elasticsearch/_meta
args:
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.13.3}
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.13.4}
environment:
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
- "transport.host=127.0.0.1"
Expand All @@ -38,11 +38,11 @@ services:

# Used by base tests
kibana:
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.13.3}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.13.4}-1
build:
context: ./module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-8.13.3}
KIBANA_VERSION: ${KIBANA_VERSION:-8.13.4}
healthcheck:
test: ["CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
Expand All @@ -53,11 +53,11 @@ services:

# Used by base tests
metricbeat:
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.13.3}-1
image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.13.4}-1
build:
context: ./module/beat/_meta
args:
BEAT_VERSION: ${BEAT_VERSION:-8.13.3}
BEAT_VERSION: ${BEAT_VERSION:-8.13.4}
command: '-e'
ports:
- 5066:5066
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:8.13.3
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
Expand All @@ -19,7 +19,7 @@ services:
- "script.context.template.cache_max_size=2000"

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

kibana:
image: docker.elastic.co/kibana/kibana:8.13.3
image: docker.elastic.co/kibana/kibana:8.13.4
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:-8.13.3}-1
image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.13.4}-1
build:
context: ../../metricbeat/module/kibana/_meta
args:
KIBANA_VERSION: ${KIBANA_VERSION:-8.13.3}
KIBANA_VERSION: ${KIBANA_VERSION:-8.13.4}
depends_on:
- elasticsearch
ports:
Expand Down
Loading