Merge pull request #14 from roylines/newrelic

allow newrelic instrumentation

Author: roylines

cluster.tf

@@ -37,6 +37,15 @@ resource "aws_autoscaling_group" "cluster" {
   }
 }
 
+resource "template_file" "user_data" {
+  template = "${file("${path.module}/user-data.sh")}"
+  vars {
+    vpc = "${var.vpc}"
+    bucket_id = "${aws_s3_bucket.ecs_config.id}"
+    newrelic_license_key = "${var.newrelic_license_key}"
+  }
+}
+
 resource "aws_launch_configuration" "cluster" {
     name_prefix = "${var.vpc}-cluster"
     image_id = "${var.image_id}"
@@ -45,24 +54,5 @@ resource "aws_launch_configuration" "cluster" {
     security_groups = ["${aws_security_group.cluster.id}", "${aws_security_group.microservices.id}"]
     key_name = "${aws_key_pair.instance.key_name}"
     depends_on = ["aws_s3_bucket_object.ecs_config", "aws_s3_bucket_object.awslogs_conf"]
-    user_data = <<EOF
-#!/bin/bash
-yum -y update --security
-yum install -y aws-cli awslogs jq
-
-# copy configurations
-aws s3 cp s3://${aws_s3_bucket.ecs_config.id}/ecs.config /etc/ecs/ecs.config
-aws s3 cp s3://${aws_s3_bucket.ecs_config.id}/awslogs.conf /etc/awslogs/awslogs.conf
-
-# substitute container id 
-sed -i -e "s/{container_instance_id}/$HOSTNAME/g" /etc/awslogs/awslogs.conf
-
-# substitute region 
-region=$(curl 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//')
-sed -i -e "s/region = us-east-1/region = $region/g" /etc/awslogs/awscli.conf
-
-# start aws logs 
-service awslogs start
-chkconfig awslogs on
-EOF
+    user_data = "${template_file.user_data.rendered}" 
 }

s3.tf

@@ -20,8 +20,13 @@ resource "aws_s3_bucket_object" "awslogs_conf" {
     key = "awslogs.conf"
     content = <<EOF
 [general]
-state_file = /var/lib/awslogs/agent-state        
- 
+state_file = /var/lib/awslogs/agent-state
+        
+[/var/log/newrelic/nrsysmond.log] 
+file = /var/log/newrelic/nrsysmond.log
+log_group_name = ${aws_cloudwatch_log_group.cluster.name}
+log_stream_name = {container_instance_id}/var/log/newrelic/nrsysmond.log
+
 [/var/log/dmesg]
 file = /var/log/dmesg
 log_group_name = ${aws_cloudwatch_log_group.cluster.name}

user-data.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+yum -y update
+yum install -y aws-cli awslogs jq
+
+# copy configurations
+aws s3 cp s3://${bucket_id}/ecs.config /etc/ecs/ecs.config
+aws s3 cp s3://${bucket_id}/awslogs.conf /etc/awslogs/awslogs.conf
+
+# substitute container id 
+instanceId=$(curl 169.254.169.254/latest/meta-data/instance-id)
+sed -i -e "s/{container_instance_id}/$instanceId/g" /etc/awslogs/awslogs.conf
+
+# substitute region 
+region=$(curl 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//')
+sed -i -e "s/region = us-east-1/region = $region/g" /etc/awslogs/awscli.conf
+
+# start aws logs 
+service awslogs start
+chkconfig awslogs on
+
+# configure and start new relic server monitoring 
+if ["${newrelic_license_key}" = "none" ]; then
+  echo "no newrelic key set, skipping"
+else
+  rpm -Uvh https://download.newrelic.com/pub/newrelic/el5/i386/newrelic-repo-5-3.noarch.rpm
+  yum install -y newrelic-sysmond
+  nrsysmond-config --set license_key=${newrelic_license_key}
+  echo "labels=Type:cluster;VPC:${vpc};Instance:$instanceId" >> /etc/newrelic/nrsysmond.cfg
+
+  /etc/init.d/newrelic-sysmond start
+fi

variables.tf

@@ -48,7 +48,11 @@ variable "to_port" {
   default = 8010
 }
 
+variable "newrelic_license_key" {
+  description = "new relic license key"
+  default = "none"
+}
+
 variable "ssh_public_key" {
   description = "public key to allow ssh to cluster instances"
 }
-