From 558002a225b1d0a41f5b7453377234dbf7984c57 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Tue, 23 Apr 2024 12:00:50 +0200 Subject: [PATCH 1/2] Try to shorten docker container name --- internal/agentdeployer/agent.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/agentdeployer/agent.go b/internal/agentdeployer/agent.go index 0927333dcf..d5697a0f77 100644 --- a/internal/agentdeployer/agent.go +++ b/internal/agentdeployer/agent.go @@ -24,7 +24,8 @@ import ( ) const ( - dockerTestAgentNamePrefix = "elastic-agent" + dockerTestAgentNamePrefix = "agent" + dockerTestAgentServiceName = "elastic-agent" dockerTestAgentDockerCompose = "docker-agent-base.yml" defaultAgentPolicyName = "Elastic-Agent (elastic-package)" ) @@ -163,7 +164,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI } // Service name defined in the docker-compose file - agentInfo.Name = dockerTestAgentNamePrefix + agentInfo.Name = dockerTestAgentServiceName agentName := agentInfo.Name opts := compose.CommandOptions{ From a161483576a3c6c42c7eba6947b9ac07e41982fc Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 24 Apr 2024 18:39:51 +0200 Subject: [PATCH 2/2] Use just elastic-agent plus RunID as hostname --- internal/agentdeployer/agent.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/agentdeployer/agent.go b/internal/agentdeployer/agent.go index d5697a0f77..be74e1f191 100644 --- a/internal/agentdeployer/agent.go +++ b/internal/agentdeployer/agent.go @@ -24,7 +24,6 @@ import ( ) const ( - dockerTestAgentNamePrefix = "agent" dockerTestAgentServiceName = "elastic-agent" dockerTestAgentDockerCompose = "docker-agent-base.yml" defaultAgentPolicyName = "Elastic-Agent (elastic-package)" @@ -224,7 +223,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI } func (d *DockerComposeAgentDeployer) agentHostname() string { - return fmt.Sprintf("%s-%s-%s", dockerTestAgentNamePrefix, d.agentName(), d.agentRunID) + return fmt.Sprintf("%s-%s", dockerTestAgentServiceName, d.agentRunID) } func (d *DockerComposeAgentDeployer) agentName() string {