Skip to content

Commit

Permalink
Merge branch '8.x' into mergify/bp/8.x/pr-14025
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Sep 23, 2024
2 parents f09c59f + 49a736d commit 8ffa334
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 # v45.0.1
uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c # v45.0.2
with:
files: .go-version

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-logging: &default-logging
max-size: "1g"
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-874a7f05-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-decc6350-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -41,7 +41,7 @@ services:
logging: *default-logging

kibana:
image: docker.elastic.co/kibana/kibana:8.16.0-874a7f05-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.16.0-decc6350-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -60,7 +60,7 @@ services:
logging: *default-logging

metricbeat:
image: docker.elastic.co/beats/metricbeat:8.16.0-874a7f05-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:8.16.0-decc6350-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.16.0-874a7f05-SNAPSHOT
version: 8.16.0-decc6350-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.16.0-874a7f05-SNAPSHOT
version: 8.16.0-decc6350-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.16.0-874a7f05-SNAPSHOT
version: 8.16.0-decc6350-SNAPSHOT
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion updatecli-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://www.updatecli.io/docs/core/compose/
policies:
- name: Handle ironbank bumps
policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.4.0@sha256:c4a8a347944c8773536a6194b4ae228f973e95a33dc7e0692f394b59643e6be4
policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.5.2@sha256:6a237aea2c621a675d644dd51580bd3c0cb4d48591f54f5ba1c2ba88240fa08b
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/ironbank.yml
Expand Down

0 comments on commit 8ffa334

Please sign in to comment.