fix datadog image (#243)

DataDog · Aug 7, 2024 · 4f6bc39 · 4f6bc39
1 parent 34358f7
commit 4f6bc39
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 7 deletions.
diff --git a/cmd/kubehound/dev.go b/cmd/kubehound/dev.go
@@ -10,11 +10,11 @@ import (
 )
 
 var (
-	DefaultComposeTestingPath = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.testing.yaml"}
-	DefaultComposeDevPath     = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.dev.graph.yaml", "./deployments/kubehound/docker-compose.dev.mongo.yaml"}
-	DefaultComposeDevPathUI   = "./deployments/kubehound/docker-compose.dev.ui.yaml"
-	DefaultComposeDevPathGRPC = "./deployments/kubehound/docker-compose.dev.ingestor.yaml"
-	DefaultDatadogComposePath = "./deployments/kubehound/docker-compose.datadog.yaml"
+	DefaultComposeTestingPath    = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.testing.yaml"}
+	DefaultComposeDevPath        = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.dev.graph.yaml", "./deployments/kubehound/docker-compose.dev.mongo.yaml"}
+	DefaultComposeDevPathUI      = "./deployments/kubehound/docker-compose.dev.ui.yaml"
+	DefaultComposeDevPathGRPC    = "./deployments/kubehound/docker-compose.dev.ingestor.yaml"
+	DefaultComposeDevPathDatadog = "./deployments/kubehound/docker-compose.dev.datadog.yaml"
 )
 
 var (
@@ -41,7 +41,7 @@ var (
 			_, ddAPIKeyOk := os.LookupEnv("DD_API_KEY")
 			_, ddAPPKeyOk := os.LookupEnv("DD_API_KEY")
 			if ddAPIKeyOk && ddAPPKeyOk {
-				DefaultComposeDevPath = append(DefaultComposeDevPath, DefaultDatadogComposePath)
+				DefaultComposeDevPath = append(DefaultComposeDevPath, DefaultComposeDevPathDatadog)
 			}
 
 			return runEnv(cobraCmd.Context(), DefaultComposeDevPath)

diff --git a/deployments/kubehound/datadog/Dockerfile b/deployments/kubehound/datadog/Dockerfile
@@ -0,0 +1,5 @@
+from gcr.io/datadoghq/agent:7-jmx
+
+ADD datadog.yaml /etc/datadog-agent/datadog.yaml
+ADD mongodb.yaml /etc/datadog-agent/conf.d/mongo.d/conf.yaml
+ADD openmetrics.yaml /etc/datadog-agent/conf.d/openmetrics.d/conf.yaml
diff --git a/deployments/kubehound/docker-compose.dev.datadog.yaml b/deployments/kubehound/docker-compose.dev.datadog.yaml
@@ -0,0 +1,34 @@
+services:
+  datadog:
+    image: gcr.io/datadoghq/agent:7-jmx
+    build:
+      context: datadog
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:8225:8125/UDP"
+      - "127.0.0.1:8226:8126"
+    environment:
+      - DD_API_KEY=${DD_API_KEY:?error}
+      - DD_APP_KEY=${DD_APP_KEY:?error}
+      - DD_HOSTNAME=${DOCKER_HOSTNAME:?error}
+      - DD_ENV=${KUBEHOUND_ENV:-dev}
+      - DD_TAGS="service:kubehound"
+      - DD_LOG_LEVEL=debug
+      - DD_APM_ENABLED=true
+      - DD_LOGS_ENABLED=true
+      - DD_PROCESS_AGENT_ENABLED=true
+      - DD_APM_NON_LOCAL_TRAFFIC=true
+      - DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true
+      - DD_CONTAINER_LABELS_AS_TAGS={"com.docker.compose.service":"+app"}
+      - DD_CONTAINER_INCLUDE=name:kubehound-*
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /proc/:/host/proc/:ro
+      - /sys/fs/cgroup:/host/sys/fs/cgroup:ro
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+    networks:
+      - kubenet
+
+networks:
+  kubenet:
diff --git a/...nts/kubehound/docker-compose.datadog.yaml → ...hound/docker-compose.release.datadog.yaml b/...nts/kubehound/docker-compose.datadog.yaml → ...hound/docker-compose.release.datadog.yaml
@@ -1,6 +1,9 @@
 services:
   datadog:
     image: gcr.io/datadoghq/agent:7-jmx
+    build:
+      context: datadog
+      dockerfile: Dockerfile
     restart: unless-stopped
     ports:
       - "127.0.0.1:8225:8125/UDP"

diff --git a/pkg/backend/project.go b/pkg/backend/project.go
@@ -20,7 +20,7 @@ import (
 
 var (
 	DefaultReleaseComposePaths = []string{"docker-compose.yaml", "docker-compose.release.yaml.tpl"}
-	DefaultDatadogComposePath  = "docker-compose.datadog.yaml"
+	DefaultDatadogComposePath  = "docker-compose.release.datadog.yaml"
 	DefaultUIProfile           = []string{DevUIProfile}
 
 	DevUIProfile = "jupyter"