Merge branch '8.11' into mergify/bp/8.11/pr-11942

elastic · Oct 26, 2023 · b65e8d6 · b65e8d6
2 parents 3d39e5f + d9454e7
commit b65e8d6
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.20231025115050-fd0446ff94e9
+Version: v7.0.0-alpha2.0.20231026065812-d792f05bb5b0
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231025115050-fd0446ff94e9/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231026065812-d792f05bb5b0/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.11.0-26e5e008-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-6c3c780b-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.11.0-26e5e008-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.11.0-6c3c780b-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.11.0-26e5e008-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.11.0-6c3c780b-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 v0.1.1-0.20230928144734-40b63726f3b7
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025115050-fd0446ff94e9
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231026065812-d792f05bb5b0
 	github.com/elastic/elastic-agent-client/v7 v7.4.0
 	github.com/elastic/elastic-agent-libs v0.6.0
 	github.com/elastic/elastic-agent-system-metrics v0.7.0

diff --git a/go.sum b/go.sum
@@ -136,8 +136,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.20230928144734-40b63726f3b7 h1:QcfCHAh1bHj9WN6y75bD6mBlIIlz9dJVKJSJVXCu4TM=
 github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025115050-fd0446ff94e9 h1:+nST3r4nurpiwSAnvI1EVqMvAWNlNFawnbFRUUISMA4=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025115050-fd0446ff94e9/go.mod h1:PTR3Ni2DKHXfp2GuUAB9FWOJBvUENxRnTd4y5BMJtDI=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231026065812-d792f05bb5b0 h1:gO8cLgmQqxno+JaND7OGDQipH1zrP/UrKjtuf4Xd9Yo=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231026065812-d792f05bb5b0/go.mod h1:lZ7TPoKmS8uzdg499siH4JlrUTsZJEZycyqbvZcBy4s=
 github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA=
 github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M=
 github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo=

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.11.0-26e5e008-SNAPSHOT
+  version: 8.11.0-6c3c780b-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.11.0-26e5e008-SNAPSHOT
+  version: 8.11.0-6c3c780b-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.11.0-26e5e008-SNAPSHOT
+  version: 8.11.0-6c3c780b-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch