Skip to content

Commit 0095706

Browse files
authored
Fix tags (#7)
* Bump `terraform-null-label` version to `0.2.2` * Remove `tags` from `aws_cloudwatch_metric_alarm` * Update `README`
1 parent 10e299b commit 0095706

File tree

2 files changed

+26
-25
lines changed

2 files changed

+26
-25
lines changed

README.md

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,31 @@ module "example_redis" {
3434

3535
## Input
3636

37-
| Name | Default | Description |
38-
|:-----------------------------|:-------------------:|:-------------------------------------------------------|
39-
| namespace |global |Namespace |
40-
| stage |default |Stage |
41-
| name |redis |Name |
42-
| security_groups |[] |AWS security group ids |
43-
| vpc_id |__REQUIRED__ |AWS VPC id |
44-
| subnets | [] | AWS subnet ids |
45-
| cluster_size | 1 | Count of nodes in cluster |
46-
| instance_type | cache.t2.micro | Elastic cache instance type |
47-
| family | redis3.2 | Redis family |
48-
| engine_version | 3.2.4 | Redis engine version |
49-
| port | 6379 | Redis port |
50-
| maintenance_window | wed:03:00-wed:04:00 | Maintenance window |
51-
| notification_topic_arn | | Notification topic arn |
52-
| alarm_cpu_threshold_percent | 75 | CPU threshold alarm level |
53-
| alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level |
54-
| alarm_actions | [] | Alarm action list |
55-
| apply_immediately | true | Apply changes immediately |
56-
| automatic_failover | false | Automatic failover (Not available for T1/T2 instances) |
57-
| availability_zones | [] | Availability zone ids |
58-
| zone_id | false | Route53 dns zone id |
37+
| Name | Default | Description |
38+
|:-----------------------------|:-------------------:|:----------------------------------------------------------------|
39+
| namespace | global | Namespace |
40+
| stage | default | Stage |
41+
| name | redis | Name |
42+
| security_groups | [] | AWS security group ids |
43+
| vpc_id | __REQUIRED__ | AWS VPC id |
44+
| subnets | [] | AWS subnet ids |
45+
| cluster_size | 1 | Count of nodes in cluster |
46+
| instance_type | cache.t2.micro | Elastic cache instance type |
47+
| family | redis3.2 | Redis family |
48+
| engine_version | 3.2.4 | Redis engine version |
49+
| port | 6379 | Redis port |
50+
| maintenance_window | wed:03:00-wed:04:00 | Maintenance window |
51+
| notification_topic_arn | | Notification topic arn |
52+
| alarm_cpu_threshold_percent | 75 | CPU threshold alarm level |
53+
| alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level |
54+
| alarm_actions | [] | Alarm action list |
55+
| apply_immediately | true | Apply changes immediately |
56+
| automatic_failover | false | Automatic failover (Not available for T1/T2 instances) |
57+
| availability_zones | [] | Availability zone ids |
58+
| zone_id | false | Route53 DNS Zone id |
59+
| attributes | [] | Additional attributes (_e.g._ "1") |
60+
| tags | {} | Additional tags (_e.g._ map("BusinessUnit","ABC") |
61+
| delimiter | - | Delimiter between `name`, `namespace`, `stage` and `attributes` |
5962

6063

6164
## Output

main.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Define composite variables for resources
22
module "label" {
3-
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.1"
3+
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.2"
44
namespace = "${var.namespace}"
55
name = "${var.name}"
66
stage = "${var.stage}"
@@ -81,7 +81,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_cpu" {
8181

8282
alarm_actions = ["${var.alarm_actions}"]
8383
depends_on = ["aws_elasticache_replication_group.default"]
84-
tags = "${module.label.tags}"
8584
}
8685

8786
resource "aws_cloudwatch_metric_alarm" "cache_memory" {
@@ -102,7 +101,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" {
102101

103102
alarm_actions = ["${var.alarm_actions}"]
104103
depends_on = ["aws_elasticache_replication_group.default"]
105-
tags = "${module.label.tags}"
106104
}
107105

108106
module "dns" {

0 commit comments

Comments
 (0)