[create-vm-flavor-adxt-814] Implemented python side

common/config/environment.go

@@ -264,11 +264,7 @@ func (e *CommonEnvironment) AgentVersion() string {
 }
 
 func (e *CommonEnvironment) AgentFlavor() string {
-	flavor := e.AgentConfig.Get(DDAgentFlavorParamName)
-
-	panic("flavor: " + flavor)
-
-	return flavor
+	return e.AgentConfig.Get(DDAgentFlavorParamName)
 }
 
 func (e *CommonEnvironment) PipelineID() string {

tasks/aks.py

@@ -21,6 +21,7 @@ def create_aks(
     install_agent: Optional[bool] = True,
     install_workload: Optional[bool] = True,
     agent_version: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ):
     print('This command is deprecated, please use `az.create-aks` instead')
     print("Running `az.create-aks`...")
@@ -33,6 +34,7 @@ def create_aks(
         install_agent=install_agent,
         install_workload=install_workload,
         agent_version=agent_version,
+        agent_flavor=agent_flavor,
     )
 
 

tasks/aws/deploy.py

@@ -33,6 +33,7 @@ def deploy(
     deploy_job: Optional[str] = None,
     full_image_path: Optional[str] = None,
     cluster_agent_full_image_path: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ) -> str:
     flags = extra_flags if extra_flags else {}
 
@@ -87,6 +88,7 @@ def deploy(
         use_fakeintake,
         full_image_path,
         cluster_agent_full_image_path,
+        agent_flavor,
     )
 
 

tasks/aws/docker.py

@@ -38,6 +38,7 @@ def create_docker(
     use_loadBalancer: Optional[bool] = False,
     interactive: Optional[bool] = True,
     full_image_path: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ):
     """
     Create a docker environment.
@@ -59,6 +60,7 @@ def create_docker(
         use_fakeintake=use_fakeintake,
         extra_flags=extra_flags,
         full_image_path=full_image_path,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/aws/eks.py

@@ -49,6 +49,7 @@ def create_eks(
     instance_type: Optional[str] = None,
     full_image_path: Optional[str] = None,
     cluster_agent_full_image_path: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ):
     """
     Create a new EKS environment. It lasts around 20 minutes.
@@ -81,6 +82,7 @@ def create_eks(
         extra_flags=extra_flags,
         full_image_path=full_image_path,
         cluster_agent_full_image_path=cluster_agent_full_image_path,
+        agent_flavor=agent_flavor,
     )
 
     tool.notify(ctx, "Your EKS cluster is now created")

tasks/aws/installer.py

@@ -22,6 +22,7 @@ def create_installer_lab(
     debug: Optional[bool] = False,
     pipeline_id: Optional[str] = None,
     site: Optional[str] = "datad0g.com",
+    agent_flavor: Optional[str] = None,
 ):
     full_stack_name = deploy(
         ctx,
@@ -31,6 +32,7 @@ def create_installer_lab(
         install_installer=True,
         debug=debug,
         extra_flags={"ddagent:site": site},
+        agent_flavor=agent_flavor,
     )
 
     print(f"Installer lab created: {full_stack_name}")

tasks/aws/kind.py

@@ -43,6 +43,7 @@ def create_kind(
     interactive: Optional[bool] = True,
     full_image_path: Optional[str] = None,
     cluster_agent_full_image_path: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ):
     """
     Create a kind environment.
@@ -68,6 +69,7 @@ def create_kind(
         app_key_required=True,
         full_image_path=full_image_path,
         cluster_agent_full_image_path=cluster_agent_full_image_path,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/aws/vm.py

@@ -68,6 +68,7 @@ def create_vm(
     no_verify: Optional[bool] = False,
     ssh_user: Optional[str] = None,
     add_known_host: Optional[bool] = True,
+    agent_flavor: Optional[str] = None,
 ) -> None:
     """
     Create a new virtual machine on aws.
@@ -110,6 +111,7 @@ def create_vm(
         extra_flags=extra_flags,
         use_fakeintake=use_fakeintake,
         deploy_job=deploy_job,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/azure/aks.py

@@ -37,6 +37,7 @@ def create_aks(
     full_image_path: Optional[str] = None,
     cluster_agent_full_image_path: Optional[str] = None,
     use_fakeintake: Optional[bool] = False,
+    agent_flavor: Optional[str] = None,
 ):
     """
     Create a new AKS environment. It lasts around 5 minutes.
@@ -66,6 +67,7 @@ def create_aks(
         full_image_path=full_image_path,
         cluster_agent_full_image_path=cluster_agent_full_image_path,
         use_fakeintake=use_fakeintake,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/azure/vm.py

@@ -61,6 +61,7 @@ def create_vm(
     no_verify: Optional[bool] = False,
     use_fakeintake: Optional[bool] = False,
     add_known_host: Optional[bool] = True,
+    agent_flavor: Optional[str] = None,
 ) -> None:
     """
     Create a new virtual machine on azure.
@@ -103,6 +104,7 @@ def create_vm(
         debug=debug,
         extra_flags=extra_flags,
         use_fakeintake=use_fakeintake,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/deploy.py

@@ -27,6 +27,7 @@ def deploy(
     use_fakeintake: Optional[bool] = False,
     full_image_path: Optional[str] = None,
     cluster_agent_full_image_path: Optional[str] = None,
+    agent_flavor: Optional[str] = None,
 ) -> str:
     flags = extra_flags if extra_flags else {}
 
@@ -47,6 +48,7 @@ def deploy(
     flags["scenario"] = scenario_name
     flags["ddagent:pipeline_id"] = pipeline_id
     flags["ddagent:version"] = agent_version
+    flags["ddagent:flavor"] = agent_flavor
     flags["ddagent:fakeintake"] = use_fakeintake
     flags["ddagent:fullImagePath"] = full_image_path
     flags["ddagent:clusterAgentFullImagePath"] = cluster_agent_full_image_path

tasks/gcp/gke.py

@@ -37,6 +37,7 @@ def create_gke(
     cluster_agent_full_image_path: Optional[str] = None,
     use_fakeintake: Optional[bool] = False,
     use_autopilot: Optional[bool] = False,
+    agent_flavor: Optional[str] = None,
 ) -> None:
     """
     Create a new GKE environment.
@@ -67,6 +68,7 @@ def create_gke(
         full_image_path=full_image_path,
         cluster_agent_full_image_path=cluster_agent_full_image_path,
         use_fakeintake=use_fakeintake,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/gcp/vm.py

@@ -68,6 +68,7 @@ def create_vm(
     no_verify: Optional[bool] = False,
     use_fakeintake: Optional[bool] = False,
     add_known_host: Optional[bool] = True,
+    agent_flavor: Optional[str] = None,
 ) -> None:
     """
     Create a new virtual machine on gcp.
@@ -110,6 +111,7 @@ def create_vm(
         debug=debug,
         extra_flags=extra_flags,
         use_fakeintake=use_fakeintake,
+        agent_flavor=agent_flavor,
     )
 
     if interactive:

tasks/localpodman/vm.py

@@ -40,6 +40,7 @@ def create_vm(
     use_fakeintake: Optional[bool] = False,
     interactive: Optional[bool] = True,
     add_known_host: Optional[bool] = True,
+    agent_flavor: Optional[str] = None,
 ) -> None:
     """
     Create a new virtual machine on local podman.
@@ -68,6 +69,7 @@ def create_vm(
         debug=debug,
         extra_flags=extra_flags,
         use_fakeintake=use_fakeintake,
+        agent_flavor=agent_flavor,
     )
 
     if interactive: