wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MON-32 - static variable updated to locals

Browse Source
This commit is contained in:
Alexandre Gaillet 2018-05-22 10:58:36 +02:00 committed by Quentin Manfroi
parent f118f36161
commit 52c71698fe
5 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloud/aws/elasticache/memcached/memory.tf → cloud/aws/elasticache/memcached/locals.tf
View File

@ -1,9 +1,5 @@
variable "memory" { locals {
type = "map" memory = {
description = "Mapping between Elasticache size and Memory."
default = {
cache.t2.micro = "595926712" cache.t2.micro = "595926712"
cache.t2.small = "1664299827" cache.t2.small = "1664299827"
cache.t2.medium = "3457448673" cache.t2.medium = "3457448673"

2
cloud/aws/elasticache/memcached/monitors-memcached.tf
View File

@ -122,7 +122,7 @@ resource "datadog_monitor" "memcached_free_memory" {
query = <<EOF query = <<EOF
${var.free_memory_aggregator}(${var.free_memory_timeframe}): ( ${var.free_memory_aggregator}(${var.free_memory_timeframe}): (
${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} / ${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} /
${var.memory[var.elasticache_size]} * 100 ${local.memory[var.elasticache_size]} * 100
) < ${var.free_memory_threshold_critical} ) < ${var.free_memory_threshold_critical}
EOF EOF

31
cloud/aws/elasticache/redis/core.tf
View File

@ -1,31 +0,0 @@
variable "core" {
type = "map"
description = "Mapping between Elasticache size and vCPU."
default = {
cache.t2.micro = "1"
cache.t2.small = "1"
cache.t2.medium = "2"
cache.m3.medium = "1"
cache.m3.large = "2"
cache.m3.xlarge = "4"
cache.m3.2xlarge = "8"
cache.m4.large = "2"
cache.m4.xlarge = "4"
cache.m4.2xlarge = "8"
cache.m4.4xlarge = "16"
cache.m4.10xlarge = "40"
cache.r3.large = "2"
cache.r3.xlarge = "4"
cache.r3.2xlarge = "8"
cache.r3.4xlarge = "16"
cache.r3.8xlarge = "32"
cache.r4.large = "2"
cache.r4.xlarge = "4"
cache.r4.2xlarge = "8"
cache.r4.4xlarge = "16"
cache.r4.8xlarge = "32"
cache.r4.16xlarge = "64"
}
}

32
cloud/aws/elasticache/redis/memory.tf → cloud/aws/elasticache/redis/locals.tf
View File

@ -1,9 +1,31 @@
variable "memory" { locals {
type = "map" core = {
cache.t2.micro = "1"
cache.t2.small = "1"
cache.t2.medium = "2"
cache.m3.medium = "1"
cache.m3.large = "2"
cache.m3.xlarge = "4"
cache.m3.2xlarge = "8"
cache.m4.large = "2"
cache.m4.xlarge = "4"
cache.m4.2xlarge = "8"
cache.m4.4xlarge = "16"
cache.m4.10xlarge = "40"
cache.r3.large = "2"
cache.r3.xlarge = "4"
cache.r3.2xlarge = "8"
cache.r3.4xlarge = "16"
cache.r3.8xlarge = "32"
cache.r4.large = "2"
cache.r4.xlarge = "4"
cache.r4.2xlarge = "8"
cache.r4.4xlarge = "16"
cache.r4.8xlarge = "32"
cache.r4.16xlarge = "64"
}
description = "Mapping between Elasticache size and Memory." memory = {
default = {
cache.t2.micro = "595926712" cache.t2.micro = "595926712"
cache.t2.small = "1664299827" cache.t2.small = "1664299827"
cache.t2.medium = "3457448673" cache.t2.medium = "3457448673"

4
cloud/aws/elasticache/redis/monitors-redis.tf
View File

@ -58,7 +58,7 @@ resource "datadog_monitor" "redis_cpu_high" {
query = <<EOF query = <<EOF
${var.cpu_high_aggregator}(${var.cpu_high_timeframe}): ( ${var.cpu_high_aggregator}(${var.cpu_high_timeframe}): (
${var.cpu_high_aggregator}:aws.elasticache.cpuutilization{${data.template_file.filter.rendered}} by {region,cluster,node} ${var.cpu_high_aggregator}:aws.elasticache.cpuutilization{${data.template_file.filter.rendered}} by {region,cluster,node}
) > ( ${var.cpu_high_threshold_critical} / ${var.core[var.elasticache_size]} ) ) > ( ${var.cpu_high_threshold_critical} / ${local.core[var.elasticache_size]} )
EOF EOF
thresholds { thresholds {
@ -177,7 +177,7 @@ resource "datadog_monitor" "redis_free_memory" {
query = <<EOF query = <<EOF
${var.free_memory_aggregator}(${var.free_memory_timeframe}): ( ${var.free_memory_aggregator}(${var.free_memory_timeframe}): (
${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} / ${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} /
( ${var.memory[var.elasticache_size]} / ${var.nodes} ) ( ${local.memory[var.elasticache_size]} / ${var.nodes} )
) * 100 < ${var.free_memory_threshold_critical} ) * 100 < ${var.free_memory_threshold_critical}
EOF EOF