From 3ce483e63f54ae199c459753922ddf00d4d05b7d Mon Sep 17 00:00:00 2001 From: aknysh Date: Fri, 20 Oct 2017 22:44:09 -0400 Subject: [PATCH 1/3] Bump `terraform-null-label` version to `0.2.2` --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 471faf2..762d0a2 100644 --- a/main.tf +++ b/main.tf @@ -1,6 +1,6 @@ # Define composite variables for resources module "label" { - source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.1" + source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.2" namespace = "${var.namespace}" name = "${var.name}" stage = "${var.stage}" From 2a52ba1ff71e77902aa15af12c2431bc3f48f2bb Mon Sep 17 00:00:00 2001 From: aknysh Date: Fri, 20 Oct 2017 22:46:17 -0400 Subject: [PATCH 2/3] Remove `tags` from `aws_cloudwatch_metric_alarm` --- main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.tf b/main.tf index 762d0a2..fedd0c6 100644 --- a/main.tf +++ b/main.tf @@ -81,7 +81,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_cpu" { alarm_actions = ["${var.alarm_actions}"] depends_on = ["aws_elasticache_replication_group.default"] - tags = "${module.label.tags}" } resource "aws_cloudwatch_metric_alarm" "cache_memory" { @@ -102,7 +101,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" { alarm_actions = ["${var.alarm_actions}"] depends_on = ["aws_elasticache_replication_group.default"] - tags = "${module.label.tags}" } module "dns" { From 167e30cb26988651a3163278409cb85d98a296be Mon Sep 17 00:00:00 2001 From: aknysh Date: Fri, 20 Oct 2017 22:51:29 -0400 Subject: [PATCH 3/3] Update `README` --- README.md | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 985534c..ab41faa 100644 --- a/README.md +++ b/README.md @@ -34,28 +34,31 @@ module "example_redis" { ## Input -| Name | Default | Description | -|:-----------------------------|:-------------------:|:-------------------------------------------------------| -| namespace |global |Namespace | -| stage |default |Stage | -| name |redis |Name | -| security_groups |[] |AWS security group ids | -| vpc_id |__REQUIRED__ |AWS VPC id | -| subnets | [] | AWS subnet ids | -| cluster_size | 1 | Count of nodes in cluster | -| instance_type | cache.t2.micro | Elastic cache instance type | -| family | redis3.2 | Redis family | -| engine_version | 3.2.4 | Redis engine version | -| port | 6379 | Redis port | -| maintenance_window | wed:03:00-wed:04:00 | Maintenance window | -| notification_topic_arn | | Notification topic arn | -| alarm_cpu_threshold_percent | 75 | CPU threshold alarm level | -| alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level | -| alarm_actions | [] | Alarm action list | -| apply_immediately | true | Apply changes immediately | -| automatic_failover | false | Automatic failover (Not available for T1/T2 instances) | -| availability_zones | [] | Availability zone ids | -| zone_id | false | Route53 dns zone id | +| Name | Default | Description | +|:-----------------------------|:-------------------:|:----------------------------------------------------------------| +| namespace | global | Namespace | +| stage | default | Stage | +| name | redis | Name | +| security_groups | [] | AWS security group ids | +| vpc_id | __REQUIRED__ | AWS VPC id | +| subnets | [] | AWS subnet ids | +| cluster_size | 1 | Count of nodes in cluster | +| instance_type | cache.t2.micro | Elastic cache instance type | +| family | redis3.2 | Redis family | +| engine_version | 3.2.4 | Redis engine version | +| port | 6379 | Redis port | +| maintenance_window | wed:03:00-wed:04:00 | Maintenance window | +| notification_topic_arn | | Notification topic arn | +| alarm_cpu_threshold_percent | 75 | CPU threshold alarm level | +| alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level | +| alarm_actions | [] | Alarm action list | +| apply_immediately | true | Apply changes immediately | +| automatic_failover | false | Automatic failover (Not available for T1/T2 instances) | +| availability_zones | [] | Availability zone ids | +| zone_id | false | Route53 DNS Zone id | +| attributes | [] | Additional attributes (_e.g._ "1") | +| tags | {} | Additional tags (_e.g._ map("BusinessUnit","ABC") | +| delimiter | - | Delimiter between `name`, `namespace`, `stage` and `attributes` | ## Output