Merge branch 'main' into otel/added-k8s-comps

Author: michalpristas

NOTICE.txt

@@ -1166,11 +1166,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.9.11
+Version: v0.9.12
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.11/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.12/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -16603,11 +16603,11 @@ Contents of probable licence file $GOMODCACHE/github.com/docker/go-connections@v
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/go-docappender/v2
-Version: v2.1.3
+Version: v2.1.4
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.4/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/elastic/e2e-testing v1.2.1
 	github.com/elastic/elastic-agent-autodiscover v0.7.0
 	github.com/elastic/elastic-agent-client/v7 v7.11.0
-	github.com/elastic/elastic-agent-libs v0.9.11
+	github.com/elastic/elastic-agent-libs v0.9.12
 	github.com/elastic/elastic-agent-system-metrics v0.10.2
 	github.com/elastic/elastic-transport-go/v8 v8.6.0
 	github.com/elastic/go-elasticsearch/v8 v8.14.0
@@ -133,7 +133,7 @@ require (
 	github.com/dnephin/pflag v1.0.7 // indirect
 	github.com/docker/docker v25.0.5+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
-	github.com/elastic/go-docappender/v2 v2.1.3 // indirect
+	github.com/elastic/go-docappender/v2 v2.1.4 // indirect
 	github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
 	github.com/elastic/go-structform v0.0.10 // indirect
 	github.com/elastic/go-windows v1.0.1 // indirect

go.sum

@@ -797,16 +797,16 @@ github.com/elastic/elastic-agent-autodiscover v0.7.0 h1:FCrHXh5AZGrPlpAx8kBu/s/g
 github.com/elastic/elastic-agent-autodiscover v0.7.0/go.mod h1:zLf0SDdQXisVZxzXPxKXdj3Fa+H4bsu4HHbTEQImDz8=
 github.com/elastic/elastic-agent-client/v7 v7.11.0 h1:YpkFQyE3qPnVai2a2NiKTMpBXXmPcHRV86AtW7LdpA8=
 github.com/elastic/elastic-agent-client/v7 v7.11.0/go.mod h1:/AeiwX9zxG99eUNrLhpApTpwmE71Qwuh4ozObn7a0ss=
-github.com/elastic/elastic-agent-libs v0.9.11 h1:J4aduNJhVeb699FxJIW/dD4BPREILqXgpWD41sCw8Uc=
-github.com/elastic/elastic-agent-libs v0.9.11/go.mod h1:TLFd0T/e1SHmxnx9pbdm/pqOV9y+VMvHikDyPN4Owkw=
+github.com/elastic/elastic-agent-libs v0.9.12 h1:k3U+F4RA0kUYoP1o9YfXF9aGTmNHzvppmqQfxrA9qs4=
+github.com/elastic/elastic-agent-libs v0.9.12/go.mod h1:TLFd0T/e1SHmxnx9pbdm/pqOV9y+VMvHikDyPN4Owkw=
 github.com/elastic/elastic-agent-system-metrics v0.10.2 h1:AVW+YqgezR0mNOZ80NxPLH3tiYMenNGZ8SC/bIUf4Uc=
 github.com/elastic/elastic-agent-system-metrics v0.10.2/go.mod h1:0jJ2ARnzTTOEMmcRX9UNqSwbwguEluE/mK2HaM3GViI=
 github.com/elastic/elastic-integration-corpus-generator-tool v0.5.0/go.mod h1:uf9N86y+UACGybdEhZLpwZ93XHWVhsYZAA4c2T2v6YM=
 github.com/elastic/elastic-package v0.77.0/go.mod h1:Xeqx0OOVnKBfFoSHsHmKI74RxgRGiDhU6yXEu8BkJJM=
 github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
 github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-docappender/v2 v2.1.3 h1:2hMOR+h4aVNzcm+ZaAzNPDKj1qB+Y1M2dwopXo2/1HM=
-github.com/elastic/go-docappender/v2 v2.1.3/go.mod h1:3kbAiLPY/IAtDywtcXCnqBxwumNnRoh7rAUYnOO412w=
+github.com/elastic/go-docappender/v2 v2.1.4 h1:R6TN4udeC5pap+uA7Lrb3pzeOm03vx6K3+yQdczviH0=
+github.com/elastic/go-docappender/v2 v2.1.4/go.mod h1:eixVwyxvjJJLMditD/9630jjPbN6nHtSkVjae8nqJsY=
 github.com/elastic/go-elasticsearch/v7 v7.17.7/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
 github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
 github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=

pkg/testing/multipass/provisioner.go

@@ -54,7 +54,7 @@ func (p *provisioner) Supported(os define.OS) bool {
 	if os.Distro != Ubuntu {
 		return false
 	}
-	if os.Version != "20.04" && os.Version != "22.04" {
+	if os.Version != "20.04" && os.Version != "22.04" && os.Version != "24.04" {
 		return false
 	}
 	// multipass only supports the same architecture of the host

pkg/testing/ogc/supported.go

@@ -20,6 +20,19 @@ const (
 // one in this list will be picked. So it's best to place the one that we want the
 // most testing at the top.
 var ogcSupported = []LayoutOS{
+	{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.AMD64,
+			Distro:  runner.Ubuntu,
+			Version: "24.04",
+		},
+		Provider:     Google,
+		InstanceSize: "e2-standard-2", // 2 amd64 cpus, 8 GB RAM
+		RunsOn:       "ubuntu-2404-lts-amd64",
+		Username:     "ubuntu",
+		RemotePath:   "/home/ubuntu/agent",
+	},
 	{
 		OS: define.OS{
 			Type:    define.Linux,
@@ -54,6 +67,19 @@ var ogcSupported = []LayoutOS{
 	// 		Type:    define.Linux,
 	// 		Arch:    define.ARM64,
 	// 		Distro:  runner.Ubuntu,
+	// 		Version: "24.04",
+	// 	},
+	// 	Provider:     Google,
+	// 	InstanceSize: "t2a-standard-4", // 4 arm64 cpus, 16 GB RAM
+	// 	RunsOn:       "ubuntu-2404-lts-arm64",
+	// 	Username:     "ubuntu",
+	// 	RemotePath:   "/home/ubuntu/agent",
+	// },
+	// {
+	// 	OS: define.OS{
+	// 		Type:    define.Linux,
+	// 		Arch:    define.ARM64,
+	// 		Distro:  runner.Ubuntu,
 	// 		Version: "22.04",
 	// 	},
 	// 	Provider:     Google,

pkg/testing/runner/supported.go

@@ -31,6 +31,16 @@ type SupportedOS struct {
 }
 
 var (
+	// UbuntuAMD64_2404 - Ubuntu (amd64) 24.04
+	UbuntuAMD64_2404 = SupportedOS{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.AMD64,
+			Distro:  Ubuntu,
+			Version: "24.04",
+		},
+		Runner: DebianRunner{},
+	}
 	// UbuntuAMD64_2204 - Ubuntu (amd64) 22.04
 	UbuntuAMD64_2204 = SupportedOS{
 		OS: define.OS{
@@ -51,6 +61,16 @@ var (
 		},
 		Runner: DebianRunner{},
 	}
+	// UbuntuARM64_2404 - Ubuntu (arm64) 24.04
+	UbuntuARM64_2404 = SupportedOS{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.ARM64,
+			Distro:  Ubuntu,
+			Version: "24.04",
+		},
+		Runner: DebianRunner{},
+	}
 	// UbuntuARM64_2204 - Ubuntu (arm64) 22.04
 	UbuntuARM64_2204 = SupportedOS{
 		OS: define.OS{
@@ -146,8 +166,10 @@ var (
 // one in this list will be picked. So it's best to place the one that we want the
 // most testing at the top.
 var supported = []SupportedOS{
+	UbuntuAMD64_2404,
 	UbuntuAMD64_2204,
 	UbuntuAMD64_2004,
+	UbuntuARM64_2404,
 	UbuntuARM64_2204,
 	UbuntuARM64_2004,
 	RhelAMD64_8,

pkg/testing/runner/supported_test.go

@@ -37,6 +37,7 @@ func TestGetSupported(t *testing.T) {
 				Distro: Ubuntu,
 			},
 			Results: []SupportedOS{
+				UbuntuAMD64_2404,
 				UbuntuAMD64_2204,
 				UbuntuAMD64_2004,
 			},