Merge branch '8.12' into mergify/bp/8.12/pr-12691

elastic · Feb 21, 2024 · 5c26e67 · 5c26e67
2 parents 6c4f758 + 3da2cbc
commit 5c26e67
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.20240219173559-d79af71f2d92
+Version: v7.0.0-alpha2.0.20240221091118-30c7cbebc960
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240219173559-d79af71f2d92/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240221091118-30c7cbebc960/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.12.2-0bde1b22-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.2-bf518ba4-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.12.2-0bde1b22-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.12.2-bf518ba4-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.12.2-0bde1b22-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.12.2-bf518ba4-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.20231120111210-bd8f3ecad5bb
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240219173559-d79af71f2d92
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240221091118-30c7cbebc960
 	github.com/elastic/elastic-agent-client/v7 v7.5.0
 	github.com/elastic/elastic-agent-libs v0.7.3
 	github.com/elastic/elastic-agent-system-metrics v0.9.1

diff --git a/go.sum b/go.sum
@@ -134,8 +134,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.20231120111210-bd8f3ecad5bb h1:mpfOadQBl6amJQzbXa0d9oy9GTvrlx0kqAb4R1soNoU=
 github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240219173559-d79af71f2d92 h1:1wSGCgtWMFGYSyz06D0RpgYzAg0K8B1Xumo7krsC8gk=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240219173559-d79af71f2d92/go.mod h1:7Z82D67QYASt57uI5uewr+gxC1ZVm9z5k+cL/VIiKjk=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240221091118-30c7cbebc960 h1:EaH8aBK3M9n4vx9r4Wx/xRpUMiL1v01KNsNdMM/labE=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240221091118-30c7cbebc960/go.mod h1:7Z82D67QYASt57uI5uewr+gxC1ZVm9z5k+cL/VIiKjk=
 github.com/elastic/elastic-agent-autodiscover v0.6.6 h1:P1y0dDpbhJc7Uw/xe85irPEad4Vljygc+y4iSxtqW7A=
 github.com/elastic/elastic-agent-autodiscover v0.6.6/go.mod h1:chulyCAyZb/njMHgzkhC/yWnt8v/Y6eCRUhmFVnsA5o=
 github.com/elastic/elastic-agent-client/v7 v7.5.0 h1:niI3WQ+01Lnp2r5LxK8SyNhrPJe13vBiOkqrDRK2oTA=

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.12.2-0bde1b22-SNAPSHOT
+  version: 8.12.2-bf518ba4-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.12.2-0bde1b22-SNAPSHOT
+  version: 8.12.2-bf518ba4-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.12.2-0bde1b22-SNAPSHOT
+  version: 8.12.2-bf518ba4-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch