Skip to content

Commit b9d5d6d

Browse files
authored
Merge branch 'main' into tf-nvme-ssd
2 parents 3d1d502 + b2f756a commit b9d5d6d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ x-logging: &default-logging
1111
services:
1212
elasticsearch:
1313
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
14-
image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-80928867-SNAPSHOT
14+
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-4b928ba7-SNAPSHOT
1515
ports:
1616
- 9200:9200
1717
healthcheck:
@@ -43,7 +43,7 @@ services:
4343

4444
kibana:
4545
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
46-
image: docker.elastic.co/kibana/kibana:9.0.0-80928867-SNAPSHOT
46+
image: docker.elastic.co/kibana/kibana:9.1.0-4b928ba7-SNAPSHOT
4747
ports:
4848
- 5601:5601
4949
healthcheck:
@@ -63,7 +63,7 @@ services:
6363

6464
metricbeat:
6565
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
66-
image: docker.elastic.co/beats/metricbeat:9.0.0-80928867-SNAPSHOT
66+
image: docker.elastic.co/beats/metricbeat:9.1.0-4b928ba7-SNAPSHOT
6767
environment:
6868
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
6969
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

testing/infra/k8s/base/stack/apm-server.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: apm-server
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.0.0-80928867-SNAPSHOT
7+
version: 9.1.0-4b928ba7-SNAPSHOT
88
count: 1
99
http:
1010
tls:

testing/infra/k8s/base/stack/elasticsearch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elasticsearch
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.0.0-80928867-SNAPSHOT
7+
version: 9.1.0-4b928ba7-SNAPSHOT
88
auth:
99
fileRealm:
1010
- secretName: elasticsearch-admin

testing/infra/k8s/base/stack/kibana.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: kibana
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.0.0-80928867-SNAPSHOT
7+
version: 9.1.0-4b928ba7-SNAPSHOT
88
count: 1
99
elasticsearchRef:
1010
name: elasticsearch

0 commit comments

Comments
 (0)