From 5877edfe9e61befe3b86cb0c493aca79de538d28 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Dec 2019 12:12:59 +0100
Subject: [PATCH 1/3] MON-543 only use is_recovery conditionnal variable for
 alerting message

---
 common/alerting-message/main.tf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf
index 115b805..35e9985 100644
--- a/common/alerting-message/main.tf
+++ b/common/alerting-message/main.tf
@@ -2,11 +2,9 @@ data "template_file" "alerting-message" {
   template = <<EOF
 $${prepend_text}
 {{#is_alert}} $${message_alert} {{/is_alert}}
-{{#is_recovery}} $${message_alert} {{/is_recovery}}
 {{#is_warning}} $${message_warning} {{/is_warning}}
-{{#is_warning_recovery}} $${message_warning} {{/is_warning_recovery}}
 {{#is_no_data}} $${message_nodata} {{/is_no_data}}
-{{#is_no_data_recovery}} $${message_nodata} {{/is_no_data_recovery}}
+{{#is_recovery}} $${message_alert} $${message_warning} $${message_nodata} {{/is_recovery}}
 $${append_text}
 EOF
 

From 958553f1d43acfc17956b073b5d90877841bb994 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Dec 2019 18:18:11 +0100
Subject: [PATCH 2/3] MON-543 avoid duplication of same destination

---
 common/alerting-message/main.tf | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf
index 35e9985..38d3315 100644
--- a/common/alerting-message/main.tf
+++ b/common/alerting-message/main.tf
@@ -4,16 +4,17 @@ $${prepend_text}
 {{#is_alert}} $${message_alert} {{/is_alert}}
 {{#is_warning}} $${message_warning} {{/is_warning}}
 {{#is_no_data}} $${message_nodata} {{/is_no_data}}
-{{#is_recovery}} $${message_alert} $${message_warning} $${message_nodata} {{/is_recovery}}
+{{#is_recovery}} $${message_recovery} {{/is_recovery}}
 $${append_text}
 EOF
 
   vars = {
-    message_alert   = var.message_alert
-    message_warning = var.message_warning
-    message_nodata  = coalesce(var.message_nodata, var.message_alert)
-    prepend_text    = var.prepend_text
-    append_text     = var.append_text
+    message_alert    = var.message_alert
+    message_warning  = coalesce(var.message_warning, var.message_alert)
+    message_nodata   = coalesce(var.message_nodata, var.message_alert)
+    message_recovery = join(" ", compact(distinct(list(var.message_alert, var.message_warning, var.message_nodata))))
+    prepend_text     = var.prepend_text
+    append_text      = var.append_text
   }
 }
 

From 882aa1d13f83fd4e91c2e662ac75a40a00be60df Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 12 Dec 2019 18:10:21 +0100
Subject: [PATCH 3/3] MON-543 come back to mandatory warning message

---
 common/alerting-message/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf
index 38d3315..88d4840 100644
--- a/common/alerting-message/main.tf
+++ b/common/alerting-message/main.tf
@@ -10,7 +10,7 @@ EOF
 
   vars = {
     message_alert    = var.message_alert
-    message_warning  = coalesce(var.message_warning, var.message_alert)
+    message_warning  = var.message_warning
     message_nodata   = coalesce(var.message_nodata, var.message_alert)
     message_recovery = join(" ", compact(distinct(list(var.message_alert, var.message_warning, var.message_nodata))))
     prepend_text     = var.prepend_text