From 983bebcd5f138781a1fd88d6f6c20aa5b8753e70 Mon Sep 17 00:00:00 2001
From: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Date: Wed, 6 Jun 2018 10:34:17 +0200
Subject: [PATCH] MON-32 - Fix free_memory monitors

---
 cloud/aws/elasticache/memcached/monitors-memcached.tf | 4 ++--
 cloud/aws/elasticache/redis/monitors-redis.tf         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index af4925b..9ee1f34 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -91,9 +91,9 @@ resource "datadog_monitor" "memcached_free_memory" {
 
   query = <<EOF
     ${var.free_memory_time_aggregator}(${var.free_memory_timeframe}): (
-      avg:aws.elasticache.freeable_memory{dd_monitoring:enabled,dd_aws_elasticache_memcached:enabled,env:${var.environment},cache_node_type:${element(keys(local.memory), count.index)}} by {region,cacheclusterid,cachenodeid} /
+      ( avg:aws.elasticache.freeable_memory{dd_monitoring:enabled,dd_aws_elasticache_memcached:enabled,env:${var.environment},cache_node_type:${element(keys(local.memory), count.index)}} by {region,cacheclusterid,cachenodeid} * 100 ) /
       ${element(values(local.memory), count.index)}
-    ) * 100 < ${var.free_memory_threshold_critical}
+    ) < ${var.free_memory_threshold_critical}
   EOF
 
   thresholds {
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index fa8bd56..ed9db87 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -148,9 +148,9 @@ resource "datadog_monitor" "redis_free_memory" {
 
   query = <<EOF
     ${var.free_memory_time_aggregator}(${var.free_memory_timeframe}): (
-      avg:aws.elasticache.freeable_memory{dd_monitoring:enabled,dd_aws_elasticache_redis:enabled,env:${var.environment},cache_node_type:${element(keys(local.memory), count.index)}} by {region,cacheclusterid,cachenodeid} /
+      ( avg:aws.elasticache.freeable_memory{dd_monitoring:enabled,dd_aws_elasticache_redis:enabled,env:${var.environment},cache_node_type:${element(keys(local.memory), count.index)}} by {region,cacheclusterid,cachenodeid} * 100 ) /
       ( ${element(values(local.memory), count.index)} / ${var.nodes} )
-    ) * 100 < ${var.free_memory_threshold_critical}
+    ) < ${var.free_memory_threshold_critical}
   EOF
 
   thresholds {