Skip to content

T
terraform-aws-elasticache-redis
Commit 0095706d authored by Andriy Knysh's avatar Andriy Knysh Committed by GitHub
Browse files
Options

Fix tags (#7) 

* Bump `terraform-null-label` version to `0.2.2`

* Remove `tags` from `aws_cloudwatch_metric_alarm`

* Update `README`
parent 10e299b0
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 25 deletions
README.md
View file @ 0095706d
...@@ -34,28 +34,31 @@ module "example_redis" { ...@@ -34,28 +34,31 @@ module "example_redis" {
## Input ## Input
| Name | Default | Description | | Name | Default | Description |
|:-----------------------------|:-------------------:|:-------------------------------------------------------| |:-----------------------------|:-------------------:|:----------------------------------------------------------------|
| namespace |global |Namespace | | namespace | global | Namespace |
| stage |default |Stage | | stage | default | Stage |
| name |redis |Name | | name | redis | Name |
| security_groups |[] |AWS security group ids | | security_groups | [] | AWS security group ids |
| vpc_id |__REQUIRED__ |AWS VPC id | | vpc_id | __REQUIRED__ | AWS VPC id |
| subnets | [] | AWS subnet ids | | subnets | [] | AWS subnet ids |
| cluster_size | 1 | Count of nodes in cluster | | cluster_size | 1 | Count of nodes in cluster |
| instance_type | cache.t2.micro | Elastic cache instance type | | instance_type | cache.t2.micro | Elastic cache instance type |
| family | redis3.2 | Redis family | | family | redis3.2 | Redis family |
| engine_version | 3.2.4 | Redis engine version | | engine_version | 3.2.4 | Redis engine version |
| port | 6379 | Redis port | | port | 6379 | Redis port |
| maintenance_window | wed:03:00-wed:04:00 | Maintenance window | | maintenance_window | wed:03:00-wed:04:00 | Maintenance window |
| notification_topic_arn | | Notification topic arn | | notification_topic_arn | | Notification topic arn |
| alarm_cpu_threshold_percent | 75 | CPU threshold alarm level | | alarm_cpu_threshold_percent | 75 | CPU threshold alarm level |
| alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level | | alarm_memory_threshold_bytes | 10000000 | Ram threshold alarm level |
| alarm_actions | [] | Alarm action list | | alarm_actions | [] | Alarm action list |
| apply_immediately | true | Apply changes immediately | | apply_immediately | true | Apply changes immediately |
| automatic_failover | false | Automatic failover (Not available for T1/T2 instances) | | automatic_failover | false | Automatic failover (Not available for T1/T2 instances) |
| availability_zones | [] | Availability zone ids | | availability_zones | [] | Availability zone ids |
| zone_id | false | Route53 dns zone id | | 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 ## Output
......
main.tf
View file @ 0095706d
# Define composite variables for resources # Define composite variables for resources
module "label" { 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}" namespace = "${var.namespace}"
name = "${var.name}" name = "${var.name}"
stage = "${var.stage}" stage = "${var.stage}"
...@@ -81,7 +81,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_cpu" { ...@@ -81,7 +81,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_cpu" {
alarm_actions = ["${var.alarm_actions}"] alarm_actions = ["${var.alarm_actions}"]
depends_on = ["aws_elasticache_replication_group.default"] depends_on = ["aws_elasticache_replication_group.default"]
tags = "${module.label.tags}"
} }
resource "aws_cloudwatch_metric_alarm" "cache_memory" { resource "aws_cloudwatch_metric_alarm" "cache_memory" {
...@@ -102,7 +101,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" { ...@@ -102,7 +101,6 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" {
alarm_actions = ["${var.alarm_actions}"] alarm_actions = ["${var.alarm_actions}"]
depends_on = ["aws_elasticache_replication_group.default"] depends_on = ["aws_elasticache_replication_group.default"]
tags = "${module.label.tags}"
} }
module "dns" { module "dns" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment