Datadog launched in as ECS_SERVICE using daemon scheduler

Author: maartenvanderhoef

main.tf

@@ -37,8 +37,6 @@ module "autoscalinggroup" {
   tags                   = "${var.tags}"
   subnet_ids             = ["${var.subnet_ids}"]
   environment            = "${var.environment}"
-  datadog_enabled        = "${var.datadog_enabled}"
-  datadog_api_key        = "${var.datadog_api_key}"
 }
 
 #
@@ -52,3 +50,16 @@ module "ecs_instance_scaling" {
   ecs_instance_draining_lambda_arn = "${var.ecs_instance_draining_lambda_arn}"
   ecs_instance_scaling_properties  = ["${var.ecs_instance_scaling_properties}"]
 }
+
+#
+# Datadog ECS Service
+#
+module "datadog" {
+  source          = "./modules/datadog/"
+  create          = "${var.datadog_enabled && var.create}"
+  name    = "${var.name}"
+  cluster_id      = "${aws_ecs_cluster.this.id}"
+  datadog_enabled = "${var.datadog_enabled}"
+  datadog_api_key = "${var.datadog_api_key}"
+  environment     = "${var.environment}"
+}

modules/autoscalinggroup/amazon_ecs_ami.yml

@@ -1,24 +1,10 @@
 #!/bin/bash
 set -Eeuxo pipefail
 
-cluster="${name}"
-task_def="dd-agent-task-${name}"
-
 echo ECS_CLUSTER=${name} >> /etc/ecs/ecs.config
 
 echo iptables --insert FORWARD 1 --in-interface docker+ --destination 169.254.169.254/32 --jump DROP >> /etc/rc.local
 
-
-start ecs
-yum install -y aws-cli jq
-instance_arn=$(curl -s http://localhost:51678/v1/metadata | jq -r '. | .ContainerInstanceArn' | awk -F/ '{print $NF}' )
-#
-# Run Task by Terraform.
-#
-if [ "${datadog_enabled}" == "1" ]; then
-  echo aws ecs start-task --cluster ${name} --task-definition $$task_def --container-instances $$instance_arn --region ${region} >> /etc/rc.local
-fi
-
 # EFS MOUNTING
 if [ "${efs_enabled}" == "1" ]; then
   mkdir /mnt/efs

modules/autoscalinggroup/main.tf

@@ -22,7 +22,6 @@ data "template_file" "cloud_config_amazon" {
     region          = "${data.aws_region._.name}"
     name            = "${local.name}"
     efs_enabled     = "${lookup(var.cluster_properties, "efs_enabled","0")}"
-    datadog_enabled = "${var.datadog_enabled ? "1" : "0" }"
     efs_id          = "${lookup(var.cluster_properties, "efs_id","")}"
     custom_userdata = "${lookup(var.cluster_properties, "ec2_custom_userdata","")}"
   }

modules/autoscalinggroup/datadog.tf renamed to modules/datadog/main.tf

@@ -1,8 +1,11 @@
 /* "Datadog agent ECS TASK" */
 
+data "aws_region" "_" {}
+
+
 resource "aws_ecs_task_definition" "datadog_agent" {
-  count        = "${(var.datadog_enabled && var.create ) ? 1 : 0}"
-  family       = "${local.name}-dd-agent-task"
+  count        = "${var.create ? 1 : 0}"
+  family       = "${var.name}-dd-agent-task"
   network_mode = "host"
 
   volume {
@@ -64,3 +67,12 @@ resource "aws_ecs_task_definition" "datadog_agent" {
 ]
 EOF
 }
+
+resource "aws_ecs_service" "datadog" {
+  count               = "${var.create ? 1 : 0}"
+  name                = "dd-agent-task"
+  cluster             = "${var.cluster_id}"
+  task_definition     = "${aws_ecs_task_definition.datadog_agent.arn}"
+  scheduling_strategy = "DAEMON"
+
+}

modules/datadog/variables.tf

@@ -0,0 +1,26 @@
+variable "create" {
+  default = true
+}
+
+variable "name" {
+  description = "The name of the Cluster"
+}
+
+variable "cluster_id" {
+  description = "The id of the Cluster"
+}
+
+variable "datadog_enabled" {
+  description = "Is datadog enabled ? "
+  default     = false
+}
+
+variable "datadog_api_key" {
+  description = "Datadog API Key"
+  default     = false
+}
+
+variable "environment" {
+  description = "Which environment are we in ? For datadog"
+  type        = "string"
+}