[create-vm-agent-config-adxt-84] POC with ec2 / microvm

DataDog · Jan 16, 2025 · e8742c5 · e8742c5
1 parent 80c6293
commit e8742c5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/common/config/environment.go b/common/config/environment.go
@@ -58,6 +58,7 @@ const (
 	DDAgentExtraEnvVars                  = "extraEnvVars" // extraEnvVars is expected in the format: <key1>=<value1>,<key2>=<value2>,...
 	DDAgentJMX                           = "jmx"
 	DDAgentFIPS                          = "fips"
+	DDAgentConfigPathParamName           = "configPath"
 
 	// Updater Namespace
 	DDUpdaterParamName = "deploy"
@@ -445,3 +446,18 @@ func (e *CommonEnvironment) AgentFIPS() bool {
 func (e *CommonEnvironment) AgentJMX() bool {
 	return e.GetBoolWithDefault(e.AgentConfig, DDAgentJMX, false)
 }
+
+func (e *CommonEnvironment) AgentConfigPath() string {
+	return e.AgentConfig.Get(DDAgentConfigPathParamName)
+}
+
+func (e *CommonEnvironment) CustomAgentConfig() (string, error) {
+	configPath := e.AgentConfigPath()
+	if configPath == "" {
+		return "", fmt.Errorf("agent config path is empty")
+	}
+
+	config, err := os.ReadFile(configPath)
+
+	return string(config), err
+}
diff --git a/scenarios/aws/ec2/vm_run.go b/scenarios/aws/ec2/vm_run.go
@@ -52,6 +52,14 @@ func VMRun(ctx *pulumi.Context) error {
 			agentOptions = append(agentOptions, agentparams.WithFlavor(env.AgentFlavor()))
 		}
 
+		if env.AgentConfigPath() != "" {
+			configContent, err := env.CustomAgentConfig()
+			if err != nil {
+				return err
+			}
+			agentOptions = append(agentOptions, agentparams.WithAgentConfig(configContent))
+		}
+
 		agent, err := agent.NewHostAgent(&env, vm, agentOptions...)
 		if err != nil {
 			return err

diff --git a/scenarios/aws/microVMs/microvms/run.go b/scenarios/aws/microVMs/microvms/run.go
@@ -150,6 +150,15 @@ func newMetalInstance(instanceEnv *InstanceEnvironment, name, arch string, m con
 			agentOptions = append(agentOptions, agentparams.WithFlavor(awsEnv.AgentFlavor()))
 		}
 
+		if awsEnv.AgentConfigPath() != "" {
+			configContent, err := awsEnv.CustomAgentConfig()
+			if err != nil {
+				return nil, err
+			}
+
+			agentOptions = append(agentOptions, agentparams.WithAgentConfig(configContent))
+		}
+
 		_, err := agent.NewHostAgent(awsEnv, awsInstance, agentOptions...)
 		if err != nil {
 			awsEnv.Ctx().Log.Warn(fmt.Sprintf("failed to deploy datadog agent on host instance: %v", err), nil)