Merge branch 'release/0.3.0'

Author: Sharp Hall

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0
+
+- Add cache name to alarm names so multiple instances do not conflict within
+  the same AWS account.
+- Apply hclfmt.
+
 ## 0.2.0
 
 - Remove hardcoded identifiers and interpolate the new `cache_name` variable to

main.tf

@@ -6,16 +6,16 @@ resource "aws_security_group" "redis" {
   vpc_id = "${var.vpc_id}"
 
   ingress {
-    from_port = 6379
-    to_port = 6379
-    protocol = "tcp"
+    from_port   = 6379
+    to_port     = 6379
+    protocol    = "tcp"
     cidr_blocks = ["${var.vpc_cidr_block}"]
   }
 
   egress {
-    from_port = 6379
-    to_port = 6379
-    protocol = "tcp"
+    from_port   = 6379
+    to_port     = 6379
+    protocol    = "tcp"
     cidr_blocks = ["${var.vpc_cidr_block}"]
   }
 
@@ -29,61 +29,66 @@ resource "aws_security_group" "redis" {
 #
 
 resource "aws_elasticache_cluster" "redis" {
-  cluster_id = "${var.cache_name}"
-  engine = "redis"
-  engine_version = "${var.engine_version}"
-  maintenance_window = "${var.maintenance_window}"
-  node_type = "${var.instance_type}"
-  num_cache_nodes = "1"
+  cluster_id           = "${var.cache_name}"
+  engine               = "redis"
+  engine_version       = "${var.engine_version}"
+  maintenance_window   = "${var.maintenance_window}"
+  node_type            = "${var.instance_type}"
+  num_cache_nodes      = "1"
   parameter_group_name = "default.redis2.8"
-  port = "6379"
-  subnet_group_name = "${aws_elasticache_subnet_group.default.name}"
-  security_group_ids = ["${aws_security_group.redis.id}"]
+  port                 = "6379"
+  subnet_group_name    = "${aws_elasticache_subnet_group.default.name}"
+  security_group_ids   = ["${aws_security_group.redis.id}"]
 
   tags {
     Name = "CacheCluster"
   }
 }
 
 resource "aws_elasticache_subnet_group" "default" {
-  name = "${var.cache_name}-subnet-group"
+  name        = "${var.cache_name}-subnet-group"
   description = "Private subnets for the ElastiCache instances"
-  subnet_ids = ["${split(",", var.private_subnet_ids)}"]
+  subnet_ids  = ["${split(",", var.private_subnet_ids)}"]
 }
 
 #
 # CloudWatch resources
 #
 
 resource "aws_cloudwatch_metric_alarm" "cpu" {
-  alarm_name = "alarmCacheClusterCPUUtilization"
-  alarm_description = "Cache cluster CPU utilization" 
+  alarm_name          = "alarmCacheClusterCPUUtilization-${var.cache_name}"
+  alarm_description   = "Cache cluster CPU utilization"
   comparison_operator = "GreaterThanThreshold"
-  evaluation_periods = "1"
-  metric_name = "CPUUtilization"
-  namespace = "AWS/ElastiCache"
-  period = "300"
-  statistic = "Average"
-  threshold = "75"
+  evaluation_periods  = "1"
+  metric_name         = "CPUUtilization"
+  namespace           = "AWS/ElastiCache"
+  period              = "300"
+  statistic           = "Average"
+  threshold           = "75"
+
   dimensions {
     CacheClusterId = "${aws_elasticache_cluster.redis.id}"
   }
+
   alarm_actions = ["${split(",", var.alarm_actions)}"]
 }
 
 resource "aws_cloudwatch_metric_alarm" "memory_free" {
-  alarm_name = "alarmCacheClusterFreeableMemory"
-  alarm_description = "Cache cluster freeable memory"
+  alarm_name          = "alarmCacheClusterFreeableMemory-${var.cache_name}"
+  alarm_description   = "Cache cluster freeable memory"
   comparison_operator = "LessThanThreshold"
-  evaluation_periods = "1"
-  metric_name = "FreeableMemory"
-  namespace = "AWS/ElastiCache"
-  period = "60"
-  statistic = "Average"
+  evaluation_periods  = "1"
+  metric_name         = "FreeableMemory"
+  namespace           = "AWS/ElastiCache"
+  period              = "60"
+  statistic           = "Average"
+
   # 10MB in bytes
   threshold = "10000000"
+
   dimensions {
     CacheClusterId = "${aws_elasticache_cluster.redis.id}"
   }
+
   alarm_actions = ["${split(",", var.alarm_actions)}"]
 }

variables.tf

@@ -1,18 +1,27 @@
-variable "vpc_id" { }
-variable "vpc_cidr_block" { }
+variable "vpc_id" {
+}
+
+variable "vpc_cidr_block" {
+}
+
+variable "cache_name" {
+}
 
-variable "cache_name" { }
 variable "engine_version" {
   default = "2.8.22"
 }
+
 variable "instance_type" {
   default = "cache.t2.micro"
 }
+
 variable "maintenance_window" {
   # SUN 01:00AM-02:00AM ET
   default = "sun:05:00-sun:06:00"
 }
 
-variable "private_subnet_ids" { }
+variable "private_subnet_ids" {
+}
 
-variable "alarm_actions" { }
+variable "alarm_actions" {
+}