From 3d44b64fe61db4eb4684cf5995dbc38c484acf68 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 7 Aug 2023 16:58:14 +0200 Subject: [PATCH 1/5] mergify: update the github checks (#11354) See https://docs.mergify.com/conditions/\#about-status-checks --- .mergify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 68c39eede33..8108a345a7a 100644 --- 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 From 3e6044f26fd6473698d472b5a710d638bfb8081a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:18:28 -0400 Subject: [PATCH 2/5] [updatecli] Bump elastic stack version to 8.10.0-4047f652 (#11357) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Updated to content "" in file "testing/infra/k8s/base/stack/ki... ... bana.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/apm-server.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/elasticsearch.yaml" Made with ❤️️ by updatecli * chore: Updated to content "" in file "docker-compose.yml" Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 8 ++++---- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ad0c8cca7a2..36808b9ef76 100644 --- 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/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 1e6495caacc..12eed80c2c9 100644 --- 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 index 4975c40089a..5aa4f45836a 100644 --- 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 index f90a0c98773..63b9f326d96 100644 --- 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 From ccd8b000cf7950ed9600fc476a4407d835cc88c9 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:38:18 -0400 Subject: [PATCH 3/5] chore: ran shell command ".ci/scripts/update-beats.sh 1f4051f6f715" (#11360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 1be9097ed5e..0bb37608013 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -499,11 +499,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.20230804190612-1f4051f6f715 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.20230804190612-1f4051f6f715/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/go.mod b/go.mod index a4f64ed87b2..22f0fa0b0ef 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b github.com/dustin/go-humanize v1.0.1 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.20230804190612-1f4051f6f715 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 index 1de1a325c96..346f7dc27d9 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= 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.20230804190612-1f4051f6f715 h1:T8n8oi4ie+WC7lzgoZXrT4h+5CRz0aYUrmQOBg7uk9A= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804190612-1f4051f6f715/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= From fae19bcebac820ada0636fb8b2e27c6bd46ef625 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Tue, 8 Aug 2023 16:02:48 +0800 Subject: [PATCH 4/5] Grow docappender indexBuilder to desired capacity for performance (#11361) In docappender batch processor, grow the index string builder to the desired capacity in one go for better performance. --- internal/beater/processors.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/beater/processors.go b/internal/beater/processors.go index 7bfdac017d4..7ab7fc98b85 100644 --- 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) From c8cb2d9a2a93e81df427b656e1058221d7e366a9 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 8 Aug 2023 11:28:31 -0400 Subject: [PATCH 5/5] chore: ran shell command ".ci/scripts/update-beats.sh 1fe462c68f7d" (#11364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 0bb37608013..45d861cd1b8 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -499,11 +499,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.20230804190612-1f4051f6f715 +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.20230804190612-1f4051f6f715/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/go.mod b/go.mod index 22f0fa0b0ef..c997941cbec 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-data v0.1.1-0.20230803060036-9180b59d7888 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804190612-1f4051f6f715 + 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 index 346f7dc27d9..c4412a75bce 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= 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.20230804190612-1f4051f6f715 h1:T8n8oi4ie+WC7lzgoZXrT4h+5CRz0aYUrmQOBg7uk9A= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230804190612-1f4051f6f715/go.mod h1:tBAWj24oF6Fi+RxfxvkIdCeUTBpvIYll6DVfOnLiTmQ= +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=