Merge branch '8.10' into mergify/bp/8.10/pr-11663

elastic · Sep 20, 2023 · 0139f5a · 0139f5a
2 parents 0e4f354 + 35aef4d
commit 0139f5a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -601,11 +601,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20230918173049-480bccf4f042
+Version: v7.0.0-alpha2.0.20230920001037-5da74528be00
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20230918173049-480bccf4f042/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20230920001037-5da74528be00/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.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -61,7 +61,7 @@ services:
     logging: *default-logging
 
   fleet-server:
-    image: docker.elastic.co/beats/elastic-agent:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/beats/elastic-agent:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 8220:8220
     healthcheck:
@@ -90,7 +90,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.10.2-d38be4c2-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/go.mod b/go.mod
@@ -9,7 +9,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 v0.1.1-0.20230814023104-48e4b20579f6
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230918173049-480bccf4f042
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230920001037-5da74528be00
 	github.com/elastic/elastic-agent-client/v7 v7.3.0
 	github.com/elastic/elastic-agent-libs v0.3.13
 	github.com/elastic/elastic-agent-system-metrics v0.6.1

diff --git a/go.sum b/go.sum
@@ -154,8 +154,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 v0.1.1-0.20230814023104-48e4b20579f6 h1:ixw/vSYEKysrW8xl8gcKEo443dySneWvKjtzsOq893s=
 github.com/elastic/apm-data v0.1.1-0.20230814023104-48e4b20579f6/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230918173049-480bccf4f042 h1:HDe67SPEIEJxZb/QIDNZALbYai43hjsOpyKG45Z0IWo=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230918173049-480bccf4f042/go.mod h1:CfMmsfYmkW6NeoXWisw91K/ayRRxn1QC905P94oMbcE=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230920001037-5da74528be00 h1:+Y8SSsdVKUdKlkIbrnxEYTXSHdexNMY0Y5p9zBn4fsM=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230920001037-5da74528be00/go.mod h1:CfMmsfYmkW6NeoXWisw91K/ayRRxn1QC905P94oMbcE=
 github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc=
 github.com/elastic/elastic-agent-client/v7 v7.3.0 h1:LugKtBXK7bp4SFL/uQqGU/f4Ppx12Jk5a36voGabLa0=
 github.com/elastic/elastic-agent-client/v7 v7.3.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0=

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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch