Skip to content

Commit

Permalink
Merge branch '8.8' into updatecli_updatecli-update-beats-8.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jun 23, 2023
2 parents a8ae324 + 69acbe1 commit 0c70bba
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ x-logging: &default-logging
max-size: "1g"
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.2-363ffebd-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.2-c7e9ae2e-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -36,7 +36,7 @@ services:
logging: *default-logging

kibana:
image: docker.elastic.co/kibana/kibana:8.8.2-363ffebd-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.8.2-c7e9ae2e-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -56,7 +56,7 @@ services:
logging: *default-logging

fleet-server:
image: docker.elastic.co/beats/elastic-agent:8.8.2-363ffebd-SNAPSHOT
image: docker.elastic.co/beats/elastic-agent:8.8.2-c7e9ae2e-SNAPSHOT
ports:
- 8220:8220
healthcheck:
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
logging: *default-logging

metricbeat:
image: docker.elastic.co/beats/metricbeat:8.8.2-363ffebd-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:8.8.2-c7e9ae2e-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/apm-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ApmServer
metadata:
name: apm-server
spec:
version: 8.8.2-363ffebd-SNAPSHOT
version: 8.8.2-c7e9ae2e-SNAPSHOT
count: 1
http:
tls:
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.8.2-363ffebd-SNAPSHOT
version: 8.8.2-c7e9ae2e-SNAPSHOT
auth:
fileRealm:
- secretName: elasticsearch-admin
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.8.2-363ffebd-SNAPSHOT
version: 8.8.2-c7e9ae2e-SNAPSHOT
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down

0 comments on commit 0c70bba

Please sign in to comment.