Merge branch '8.x' into mergify/bp/8.x/pr-15092

elastic · Jan 2, 2025 · 53b1f86 · 53b1f86
2 parents 173cbc9 + 18d3d0f
commit 53b1f86
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 25 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -829,11 +829,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.17.5
+Version: v0.18.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.17.5/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/elastic/apm-data v1.15.0
 	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241231164428-129374e72499
 	github.com/elastic/elastic-agent-client/v7 v7.17.0
-	github.com/elastic/elastic-agent-libs v0.17.5
+	github.com/elastic/elastic-agent-libs v0.18.0
 	github.com/elastic/elastic-agent-system-metrics v0.11.6
 	github.com/elastic/gmux v0.3.2
 	github.com/elastic/go-docappender/v2 v2.3.2

diff --git a/go.sum b/go.sum
@@ -136,8 +136,8 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0
 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
 github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
 github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
-github.com/elastic/elastic-agent-libs v0.17.5 h1:oyv5BohMia+49tZnsOmTyRWp5LoZbH8iOmGa7c4TqTs=
-github.com/elastic/elastic-agent-libs v0.17.5/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
+github.com/elastic/elastic-agent-libs v0.18.0 h1:PKG1StgHu2MfOwOryGuAVgNZlZXyvVSDw3SvLUfel+w=
+github.com/elastic/elastic-agent-libs v0.18.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
 github.com/elastic/elastic-agent-system-metrics v0.11.6 h1:yAR9N1MMyf6rzVEuk+SZcuTzYnf5mM7Xlja9pwZlJzg=
 github.com/elastic/elastic-agent-system-metrics v0.11.6/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI=
 github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=

diff --git a/testing/benchmark/main.tf b/testing/benchmark/main.tf
@@ -146,7 +146,6 @@ module "moxy" {
 
   aws_provisioner_key_name = var.private_key
 
-  tags       = merge(local.ci_tags, module.tags.tags)
   depends_on = [module.vpc]
 }
 
@@ -167,6 +166,5 @@ module "standalone_apm_server" {
   elasticsearch_username = "elastic"
   elasticsearch_password = module.moxy[0].moxy_password
 
-  tags       = merge(local.ci_tags, module.tags.tags)
   depends_on = [module.moxy]
 }
diff --git a/testing/infra/terraform/modules/moxy/main.tf b/testing/infra/terraform/modules/moxy/main.tf
@@ -88,13 +88,10 @@ resource "aws_instance" "moxy" {
       "sleep 1"
     ]
   }
-
-  tags = var.tags
 }
 
 resource "aws_key_pair" "provisioner_key" {
   public_key = file("${var.aws_provisioner_key_name}.pub")
-  tags       = var.tags
 }
 
 resource "random_password" "moxy_password" {

diff --git a/testing/infra/terraform/modules/moxy/variables.tf b/testing/infra/terraform/modules/moxy/variables.tf
@@ -17,9 +17,3 @@ variable "moxy_bin_path" {
   type        = string
   description = "Moxy path to binary to copy to the worker machine"
 }
-
-variable "tags" {
-  type        = map(string)
-  default     = {}
-  description = "Optional set of tags to use for all resources"
-}
diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf
@@ -217,8 +217,6 @@ resource "aws_instance" "apm" {
       ]
     )
   }
-
-  tags = var.tags
 }
 
 resource "null_resource" "apm_server_log" {
@@ -247,7 +245,6 @@ data "external" "latest_apm_server" {
 
 resource "aws_key_pair" "provisioner_key" {
   public_key = file("${var.aws_provisioner_key_name}.pub")
-  tags       = var.tags
 }
 
 resource "random_password" "apm_secret_token" {

diff --git a/testing/infra/terraform/modules/standalone_apm_server/variables.tf b/testing/infra/terraform/modules/standalone_apm_server/variables.tf
@@ -54,9 +54,3 @@ variable "apm_server_bin_path" {
   type        = string
   description = "Optionally use the apm-server binary from the specified path instead"
 }
-
-variable "tags" {
-  type        = map(string)
-  default     = {}
-  description = "Optional set of tags to use for all deployments"
-}