Commit 2d57b09c authored by Adrian Horrocks's avatar Adrian Horrocks

changes for terraform v0.12

parent 83bffb00
Pipeline #6450 passed with stage
in 13 seconds
...@@ -157,7 +157,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-single" { ...@@ -157,7 +157,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-single" {
count = "${replace(replace(var.cache_clusters, "/^[2-9]$/", "0"), "/^1$/", "1")}" count = "${replace(replace(var.cache_clusters, "/^[2-9]$/", "0"), "/^1$/", "1")}"
alarm_name = "alarmRedisCacheClusterCPUUtilization" alarm_name = "alarmRedisCacheClusterCPUUtilization"
alarm_description = "Redis cache cluster CPU utilization" alarm_description = "Redis cache cluster CPU utilization"
alarm_actions = ["${var.cloudwatch_alarm_sns_arn}"] alarm_actions = "${var.cloudwatch_alarm_sns_arn}"
comparison_operator = "GreaterThanThreshold" comparison_operator = "GreaterThanThreshold"
evaluation_periods = "1" evaluation_periods = "1"
metric_name = "CPUUtilization" metric_name = "CPUUtilization"
...@@ -165,7 +165,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-single" { ...@@ -165,7 +165,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-single" {
period = "300" period = "300"
statistic = "Average" statistic = "Average"
threshold = "75" threshold = "75"
dimensions { dimensions = {
CacheClusterId = "${var.cache_name}-00${count.index + 1}" CacheClusterId = "${var.cache_name}-00${count.index + 1}"
} }
} }
...@@ -174,7 +174,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-single" { ...@@ -174,7 +174,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-single" {
count = "${replace(replace(var.cache_clusters, "/^[2-9]$/", "0"), "/^1$/", "1")}" count = "${replace(replace(var.cache_clusters, "/^[2-9]$/", "0"), "/^1$/", "1")}"
alarm_name = "alarmRedisCacheClusterFreeableMemory" alarm_name = "alarmRedisCacheClusterFreeableMemory"
alarm_description = "Redis cache cluster freeable memory" alarm_description = "Redis cache cluster freeable memory"
alarm_actions = ["${var.cloudwatch_alarm_sns_arn}"] alarm_actions = "${var.cloudwatch_alarm_sns_arn}"
comparison_operator = "LessThanThreshold" comparison_operator = "LessThanThreshold"
evaluation_periods = "1" evaluation_periods = "1"
metric_name = "FreeableMemory" metric_name = "FreeableMemory"
...@@ -183,7 +183,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-single" { ...@@ -183,7 +183,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-single" {
statistic = "Average" statistic = "Average"
# 25MB in bytes # 25MB in bytes
threshold = "25000000" threshold = "25000000"
dimensions { dimensions = {
CacheClusterId = "${var.cache_name}-00${count.index + 1}" CacheClusterId = "${var.cache_name}-00${count.index + 1}"
} }
} }
...@@ -192,7 +192,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-cluster" { ...@@ -192,7 +192,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-cluster" {
count = "${replace(replace(var.cache_clusters, "/^1$/", "0"), "/^[2-9]$/", "${var.cache_clusters}")}" count = "${replace(replace(var.cache_clusters, "/^1$/", "0"), "/^[2-9]$/", "${var.cache_clusters}")}"
alarm_name = "alarmRedisCacheCluster00${count.index + 1}CPUUtilization" alarm_name = "alarmRedisCacheCluster00${count.index + 1}CPUUtilization"
alarm_description = "Redis cache cluster 00${count.index + 1} CPU utilization" alarm_description = "Redis cache cluster 00${count.index + 1} CPU utilization"
alarm_actions = ["${var.cloudwatch_alarm_sns_arn}"] alarm_actions = "${var.cloudwatch_alarm_sns_arn}"
comparison_operator = "GreaterThanThreshold" comparison_operator = "GreaterThanThreshold"
evaluation_periods = "1" evaluation_periods = "1"
metric_name = "CPUUtilization" metric_name = "CPUUtilization"
...@@ -200,7 +200,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-cluster" { ...@@ -200,7 +200,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu-cluster" {
period = "300" period = "300"
statistic = "Average" statistic = "Average"
threshold = "75" threshold = "75"
dimensions { dimensions = {
CacheClusterId = "${var.cache_name}-00${count.index + 1}" CacheClusterId = "${var.cache_name}-00${count.index + 1}"
} }
} }
...@@ -209,7 +209,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-cluster" { ...@@ -209,7 +209,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-cluster" {
count = "${replace(replace(var.cache_clusters, "/^1$/", "0"), "/^[2-9]$/", "${var.cache_clusters}")}" count = "${replace(replace(var.cache_clusters, "/^1$/", "0"), "/^[2-9]$/", "${var.cache_clusters}")}"
alarm_name = "alarmRedisCacheCluster00${count.index + 1}FreeableMemory" alarm_name = "alarmRedisCacheCluster00${count.index + 1}FreeableMemory"
alarm_description = "Redis cache cluster 00${count.index + 1} freeable memory" alarm_description = "Redis cache cluster 00${count.index + 1} freeable memory"
alarm_actions = ["${var.cloudwatch_alarm_sns_arn}"] alarm_actions = "${var.cloudwatch_alarm_sns_arn}"
comparison_operator = "LessThanThreshold" comparison_operator = "LessThanThreshold"
evaluation_periods = "1" evaluation_periods = "1"
metric_name = "FreeableMemory" metric_name = "FreeableMemory"
...@@ -218,7 +218,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-cluster" { ...@@ -218,7 +218,7 @@ resource "aws_cloudwatch_metric_alarm" "memory-free-cluster" {
statistic = "Average" statistic = "Average"
# 25MB in bytes # 25MB in bytes
threshold = "25000000" threshold = "25000000"
dimensions { dimensions = {
CacheClusterId = "${var.cache_name}-00${count.index + 1}" CacheClusterId = "${var.cache_name}-00${count.index + 1}"
} }
} }
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