Merge branch 'main' into release-notes-8.13.4

elastic · May 8, 2024 · 0411324 · 0411324
2 parents 86e8542 + 16b6eff
commit 0411324
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.2
+1.22.3
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20240508100038-d1089d151aca
+Version: v7.0.0-alpha2.0.20240508135825-05b79af0254f
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240508100038-d1089d151aca/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240508135825-05b79af0254f/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
@@ -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 v1.1.0
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508100038-d1089d151aca
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508135825-05b79af0254f
 	github.com/elastic/elastic-agent-client/v7 v7.8.1
 	github.com/elastic/elastic-agent-libs v0.9.7
 	github.com/elastic/elastic-agent-system-metrics v0.9.3

diff --git a/go.sum b/go.sum
@@ -145,8 +145,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 v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4=
 github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508100038-d1089d151aca h1:MLUCmmUuJnRjk34d/oC/SlRrc3uREvx/hOTnLeMHHsE=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508100038-d1089d151aca/go.mod h1:UMGh+I+rct6yas9Fij9XXMgThY/lsbGbHXe9vbk8ozo=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508135825-05b79af0254f h1:vSBqtrgyQZs0wIFUrZoyt/9r/cGtaTvX1cRV/OOZACg=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240508135825-05b79af0254f/go.mod h1:UMGh+I+rct6yas9Fij9XXMgThY/lsbGbHXe9vbk8ozo=
 github.com/elastic/elastic-agent-autodiscover v0.6.14 h1:0zJYNyv9GKTOiNqCHqEVboP+WioV73ia17Et+UlFbz8=
 github.com/elastic/elastic-agent-autodiscover v0.6.14/go.mod h1:39/fHHlnyTK6oUNZfAhxJwBTVahO9tNasEIjzsxGMu8=
 github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM=