From ab604c328d39f7e289ace8606dc22754d985c8c3 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 22 Mar 2018 23:36:14 +0100
Subject: [PATCH] MON-134 make the memory message specific only and mandatory

---
 system/generic/README.md          | 4 ++--
 system/generic/inputs.tf          | 1 -
 system/generic/monitors-system.tf | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/generic/README.md b/system/generic/README.md
index cfcdda0..831a20a 100644
--- a/system/generic/README.md
+++ b/system/generic/README.md
@@ -41,8 +41,8 @@ Inputs
 | free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no |
 | free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no |
 | free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no |
-| free_memory_message | Custom message for Free memory monitor | string | `` | no |
+| free_memory_message | Custom message for Free memory monitor | string | - | yes |
 | free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no |
 | free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no |
 | free_memory_threshold_warning | Free disk space warning threshold | string | `10` | no |
-| message | Message sent when an alert is triggered | string | - | yes |
\ No newline at end of file
+| message | Message sent when an alert is triggered | string | - | yes |
diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf
index a9a7a98..96bd0f2 100644
--- a/system/generic/inputs.tf
+++ b/system/generic/inputs.tf
@@ -106,7 +106,6 @@ variable "free_memory_silenced" {
 variable "free_memory_message" {
   description = "Custom message for Free memory monitor"
   type        = "string"
-  default     = ""
 }
 
 variable "free_memory_threshold_warning" {
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index 9908b0e..a52ff10 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -106,7 +106,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
 
 resource "datadog_monitor" "datadog_free_memory" {
   name    = "[${var.environment}] Free memory {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = "${coalesce(var.free_memory_message, var.message)}"
+  message = "${var.free_memory_message}"
 
   query = <<EOF
     min(last_1m): (