From 238a60ff8ecdfb0e511eaad8a3ff4ae25ee003c1 Mon Sep 17 00:00:00 2001
From: vincent EL KHATIB <vincent.elkhatib@morea.fr>
Date: Mon, 11 Sep 2017 15:20:28 +0200
Subject: [PATCH] change hno & ho variable name

---
 inputs.tf                    | 4 ++--
 monitors-custom-cpu.tf       | 2 +-
 monitors-rds_mysql-basics.tf | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/inputs.tf b/inputs.tf
index d07327d..980a3a1 100644
--- a/inputs.tf
+++ b/inputs.tf
@@ -1,5 +1,5 @@
-variable "critical_escalation_group" {}
-variable "warning_escalation_group" {}
+variable "hno_escalation_group" {}
+variable "ho_escalation_group" {}
 
 variable env {}
 variable region {}
diff --git a/monitors-custom-cpu.tf b/monitors-custom-cpu.tf
index a29d3af..c73d532 100644
--- a/monitors-custom-cpu.tf
+++ b/monitors-custom-cpu.tf
@@ -1,6 +1,6 @@
 resource "datadog_monitor" "cpu_custom" {
   name    = "${var.dd_custom_cpu["name"]}"
-  message = "{{#is_alert}}\n${var.critical_escalation_group}\n{{/is_alert}}\n{{#is_recovery}}\n${var.critical_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.warning_escalation_group}\n{{/is_warning}}\n{{#is_warning_recovery}}\n${var.warning_escalation_group}\n{{/is_warning_recovery}}"
+  message = "{{#is_alert}}\n${var.hno_escalation_group}\n{{/is_alert}}\n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group}\n{{/is_warning}}\n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
   count   = "${var.dd_custom_cpu["status"] == "enabled" ? 1 : 0}"
 
   query = "min(${var.dd_custom_cpu["period"]}):avg:system.cpu.system{dd_monitoring:enabled,dd_linux_basics:enabled,!dd_custom_cpu.monitoring:enabled} by {host} + avg:system.cpu.user{dd_monitoring:enabled,dd_linux_basics:enabled,!dd_custom_cpu:enabled} by {host} > ${var.dd_custom_cpu["critical_threshold"]}"
diff --git a/monitors-rds_mysql-basics.tf b/monitors-rds_mysql-basics.tf
index 90b15af..078bc76 100644
--- a/monitors-rds_mysql-basics.tf
+++ b/monitors-rds_mysql-basics.tf
@@ -3,7 +3,8 @@
 
 resource "datadog_monitor" "rds-mysql_cpu_80_15min" {
   name    = "[${var.env}] rds Cpu high > 90% for 15 min on {{host.identifier}}"
-  message = "{{#is_alert}}\n${var.critical_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.critical_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.warning_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.warning_escalation_group}\n{{/is_warning_recovery}}"
+  message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
+
   count = "${var.dd_aws_rds == "enabled" ? 1 : 0 }"
 
 
@@ -29,8 +30,8 @@ resource "datadog_monitor" "rds-mysql_cpu_80_15min" {
 
 resource "datadog_monitor" "mysql_rds_free_space_low" {
   name    = "[${var.env}] rds free space low < 10 % on {{host.identifier}}"
-  message = "{{#is_alert}}\n${var.critical_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.critical_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.warning_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.warning_escalation_group}\n{{/is_warning_recovery}}"
-
+  message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
+  
   type  = "query alert"
   query = "avg(last_15m): avg:aws.rds.free_storage_space{dd_monitoring:enabled,dd_aws_rds:enabled,env:${var.env},!dd_custom_rds-mysql:enabled} by {identifier,region} /  avg:aws.rds.total_storage_space{dd_monitoring:enabled,dd_rds-mysql_basics:enabled,env:${var.env},!dd_custom_rds-mysql:enabled} by {identifier,region}  * 100 < 10"
   count = "${var.dd_aws_rds == "enabled" ? 1 : 0 }"