Merge branch 'main' into otlp-apis

elastic · May 22, 2024 · 397acaa · 397acaa
2 parents 3f5f117 + 2436eb1
commit 397acaa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20240520140334-062cc9b191b5
+Version: v7.0.0-alpha2.0.20240521131913-d8072923498c
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240520140334-062cc9b191b5/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240521131913-d8072923498c/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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ x-logging: &default-logging
     max-size: "1g"
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-1a872dbc-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-9bce1e63-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.15.0-1a872dbc-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.15.0-9bce1e63-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.15.0-1a872dbc-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.15.0-9bce1e63-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6
 	github.com/elastic/apm-data v1.1.0
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240520140334-062cc9b191b5
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240521131913-d8072923498c
 	github.com/elastic/elastic-agent-client/v7 v7.9.0
 	github.com/elastic/elastic-agent-libs v0.9.8
 	github.com/elastic/elastic-agent-system-metrics v0.10.2

diff --git a/go.sum b/go.sum
@@ -147,8 +147,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE
 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo=
 github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4=
 github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240520140334-062cc9b191b5 h1:hIBg9g1QqlW66S8Au0SJPX+qqVc8Wagcgn7zROuOccA=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240520140334-062cc9b191b5/go.mod h1:5Ks2Sy06G8DMVBEe/7L5GTRylicDfRGM+ezAEjaLxxM=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240521131913-d8072923498c h1:MmC7+apCkOayFvM2u15B2xgIgyrC+yahhi7Xoh7N8V4=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240521131913-d8072923498c/go.mod h1:5Ks2Sy06G8DMVBEe/7L5GTRylicDfRGM+ezAEjaLxxM=
 github.com/elastic/elastic-agent-autodiscover v0.6.14 h1:0zJYNyv9GKTOiNqCHqEVboP+WioV73ia17Et+UlFbz8=
 github.com/elastic/elastic-agent-autodiscover v0.6.14/go.mod h1:39/fHHlnyTK6oUNZfAhxJwBTVahO9tNasEIjzsxGMu8=
 github.com/elastic/elastic-agent-client/v7 v7.9.0 h1:ryNbISIg4tTRT9KA0MYOa+fxW0CpsF+qxELWWb13rYE=

diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml
@@ -3,7 +3,7 @@ kind: ApmServer
 metadata:
   name: apm-server
 spec:
-  version: 8.15.0-1a872dbc-SNAPSHOT
+  version: 8.15.0-9bce1e63-SNAPSHOT
   count: 1
   http:
     tls:

diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.15.0-1a872dbc-SNAPSHOT
+  version: 8.15.0-9bce1e63-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.15.0-1a872dbc-SNAPSHOT
+  version: 8.15.0-9bce1e63-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch