Skip to content

Commit

Permalink
Merge branch 'main' into functionaltests-disable
Browse files Browse the repository at this point in the history
  • Loading branch information
endorama authored Feb 19, 2025
2 parents 1fb76f6 + 53723d4 commit 11c51f3
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250218144733-26fecc126fe8
Version: v7.0.0-alpha2.0.20250219140752-d05a0706e4e1
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250218144733-26fecc126fe8/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250219140752-d05a0706e4e1/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ x-logging: &default-logging
services:
elasticsearch:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-723b8fb6-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-5859ff16-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -43,7 +43,7 @@ services:

kibana:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/kibana/kibana:9.1.0-723b8fb6-SNAPSHOT
image: docker.elastic.co/kibana/kibana:9.1.0-5859ff16-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -63,7 +63,7 @@ services:

metricbeat:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:9.1.0-723b8fb6-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:9.1.0-5859ff16-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v1.2.0
github.com/elastic/apm-data v1.18.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250218144733-26fecc126fe8
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250219140752-d05a0706e4e1
github.com/elastic/elastic-agent-client/v7 v7.17.1
github.com/elastic/elastic-agent-libs v0.18.6
github.com/elastic/elastic-agent-system-metrics v0.11.8
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ github.com/elastic/apm-aggregation v1.2.0 h1:UndqG3ccBTjyxTqHujBVjcbVLb9qG1clxRc
github.com/elastic/apm-aggregation v1.2.0/go.mod h1:YllYwPYVV27pbuPfjRtQAKo6eSSrh13PZr38RKYd810=
github.com/elastic/apm-data v1.18.0 h1:GaWnrIoh7+UPmsbkQGls3tSCVk54sJng2v2YCYGpwyM=
github.com/elastic/apm-data v1.18.0/go.mod h1:Bm4VpGkWHwVRAA32kVyVk1f9urv0dnh86DGFdOIiewk=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250218144733-26fecc126fe8 h1:KEzyyEzLbFqfHCXE5/N1lKRKBOP3w+KraRQGYttoDQM=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250218144733-26fecc126fe8/go.mod h1:2SDOWb8YDiImz/Xsgupuvilfddf4SrGEIJQvHrepdT4=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250219140752-d05a0706e4e1 h1:ZFMCYVqXTt1A9CQaSACiOchmuGPUYNnsyJxvFRqPVdQ=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250219140752-d05a0706e4e1/go.mod h1:2SDOWb8YDiImz/Xsgupuvilfddf4SrGEIJQvHrepdT4=
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0=
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 @@ -4,7 +4,7 @@ metadata:
name: apm-server
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 9.1.0-723b8fb6-SNAPSHOT
version: 9.1.0-5859ff16-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 @@ -4,7 +4,7 @@ metadata:
name: elasticsearch
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 9.1.0-723b8fb6-SNAPSHOT
version: 9.1.0-5859ff16-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 @@ -4,7 +4,7 @@ metadata:
name: kibana
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 9.1.0-723b8fb6-SNAPSHOT
version: 9.1.0-5859ff16-SNAPSHOT
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down

0 comments on commit 11c51f3

Please sign in to comment.