Merge branch 'main' into lsm-poc

elastic · Aug 8, 2023 · 6f740c6 · 6f740c6
2 parents eb4cc88 + c8cb2d9
commit 6f740c6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,7 +1,8 @@
 queue_rules:
   - name: default
     conditions:
-      - check-success=apm-ci/pr-merge
+      - check-success=test (macos-latest)
+      - check-success=test (windows-latest)
       - check-success=system-test
       - check-success=lint
       - check-success=CLA

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20230804142914-5d84cafff95f
+Version: v7.0.0-alpha2.0.20230808073125-1fe462c68f7d
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230804142914-5d84cafff95f/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230808073125-1fe462c68f7d/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.0-2619e48b-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.0-4047f652-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.10.0-2619e48b-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.10.0-4047f652-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -61,7 +61,7 @@ services:
     logging: *default-logging
 
   fleet-server:
-    image: docker.elastic.co/beats/elastic-agent:8.10.0-2619e48b-SNAPSHOT
+    image: docker.elastic.co/beats/elastic-agent:8.10.0-4047f652-SNAPSHOT
     ports:
       - 8220:8220
     healthcheck:
@@ -90,7 +90,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.10.0-2619e48b-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.10.0-4047f652-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/apm-aggregation v0.0.0-20230807142825-c82b2b7e590c
 	github.com/elastic/apm-data v0.1.1-0.20230803060036-9180b59d7888
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804142914-5d84cafff95f
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230808073125-1fe462c68f7d
 	github.com/elastic/elastic-agent-client/v7 v7.2.0
 	github.com/elastic/elastic-agent-libs v0.3.9
 	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-20230807142825-c82b2b7e590c h1:VKmJ07O
 github.com/elastic/apm-aggregation v0.0.0-20230807142825-c82b2b7e590c/go.mod h1:TwDJCDT04Ni8WrSrD4oEBATnDa18dteY//jhL4kqGio=
 github.com/elastic/apm-data v0.1.1-0.20230803060036-9180b59d7888 h1:R2HpM1KxROvzvMHq/3XmuT/Y6oTcTteUFMJtQCP04GM=
 github.com/elastic/apm-data v0.1.1-0.20230803060036-9180b59d7888/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804142914-5d84cafff95f h1:klxSMTXpDsYHairAeHOD1wopN/IRklLxap+dmtzZ67U=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804142914-5d84cafff95f/go.mod h1:wMne5p69cYgX9Z2k8OqfRvZAC7Q4bX/o6PwNs6UI2Xo=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230808073125-1fe462c68f7d h1:bZA2xJV6WQOQvu8C5P7BNsy/rQRbhoUiXtSS4wu37rk=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230808073125-1fe462c68f7d/go.mod h1:tBAWj24oF6Fi+RxfxvkIdCeUTBpvIYll6DVfOnLiTmQ=
 github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc=
 github.com/elastic/elastic-agent-client/v7 v7.2.0 h1:WCPu7t+NGrnjzfu76FxyZpAzoQirIEBn1ne6kKHacIU=
 github.com/elastic/elastic-agent-client/v7 v7.2.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0=

diff --git a/internal/beater/processors.go b/internal/beater/processors.go
@@ -108,6 +108,8 @@ func newDocappenderBatchProcessor(a *docappender.Appender) modelpb.ProcessBatchF
 				r.reset()
 				return err
 			}
+			r.indexBuilder.Grow(len(event.DataStream.Type) + 1 +
+				len(event.DataStream.Dataset) + 1 + len(event.DataStream.Namespace))
 			r.indexBuilder.WriteString(event.DataStream.Type)
 			r.indexBuilder.WriteByte('-')
 			r.indexBuilder.WriteString(event.DataStream.Dataset)

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.0-2619e48b-SNAPSHOT
+  version: 8.10.0-4047f652-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.0-2619e48b-SNAPSHOT
+  version: 8.10.0-4047f652-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.0-2619e48b-SNAPSHOT
+  version: 8.10.0-4047f652-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch