Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dogstatsd): Deactivate client associated to the dogstatsd standalone #1249

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scenarios/aws/eks/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ func Run(ctx *pulumi.Context) error {
return err
}

// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket, utils.PulumiDependsOn(cluster)); err != nil {
return err
if awsEnv.DogstatsdDeploy() {
// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket, utils.PulumiDependsOn(cluster)); err != nil {
return err
}
}

if _, err := tracegen.K8sAppDefinition(&awsEnv, cluster.KubeProvider, "workload-tracegen", utils.PulumiDependsOn(cluster)); err != nil {
Expand Down
6 changes: 4 additions & 2 deletions scenarios/aws/kindvm/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,10 @@ agents:
}

// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket); err != nil {
return err
if awsEnv.DogstatsdDeploy() {
if _, err := dogstatsd.K8sAppDefinition(&awsEnv, kindKubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket); err != nil {
return err
}
}

// for tracegen we can't find the cgroup version as it depends on the underlying version of the kernel
Expand Down
8 changes: 5 additions & 3 deletions scenarios/azure/aks/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,11 @@ providers:
return err
}

// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&env, aksCluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket); err != nil {
return err
if env.DogstatsdDeploy() {
// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&env, aksCluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket); err != nil {
return err
}
}

if _, err := prometheus.K8sAppDefinition(&env, aksCluster.KubeProvider, "workload-prometheus"); err != nil {
Expand Down
10 changes: 5 additions & 5 deletions scenarios/gcp/gke/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,18 @@ func Run(ctx *pulumi.Context) error {
if _, err := dogstatsdstandalone.K8sAppDefinition(&env, cluster.KubeProvider, "dogstatsd-standalone", nil, true, ""); err != nil {
return err
}

// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&env, cluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket, dependsOnCrd); err != nil {
return err
}
}

// dogstatsd clients that report to the Agent
if _, err := dogstatsd.K8sAppDefinition(&env, cluster.KubeProvider, "workload-dogstatsd", 8125, "/var/run/datadog/dsd.socket", dependsOnCrd); err != nil {
return err
}

// dogstatsd clients that report to the dogstatsd standalone deployment
if _, err := dogstatsd.K8sAppDefinition(&env, cluster.KubeProvider, "workload-dogstatsd-standalone", dogstatsdstandalone.HostPort, dogstatsdstandalone.Socket, dependsOnCrd); err != nil {
return err
}

if _, err := tracegen.K8sAppDefinition(&env, cluster.KubeProvider, "workload-tracegen", dependsOnCrd); err != nil {
return err
}
Expand Down