From 7819c468faa98d6bd3004a9bf03888db1e7ebbfd Mon Sep 17 00:00:00 2001
From: Jean-Maxime LEBLANC <jean-maxime.leblanc@fr.clara.net>
Date: Wed, 13 Nov 2019 09:30:57 +0100
Subject: [PATCH] MON-530: Fix monitor name (use ms instead of %)

---
 cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf        | 3 +--
 .../rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf    | 3 +--
 cloud/aws/rds/common/monitors-rds-common.tf                    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf b/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
index c4d63bd..9d66a64 100644
--- a/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
+++ b/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
@@ -1,7 +1,7 @@
 ### RDS Aurora Mysql Replica Lag monitor ###
 resource "datadog_monitor" "rds_aurora_mysql_replica_lag" {
   count   = var.aurora_replicalag_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora Mysql replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora Mysql replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
   message = coalesce(var.aurora_replicalag_message, var.message)
   type    = "query alert"
 
@@ -31,4 +31,3 @@ EOQ
     ignore_changes = ["silenced"]
   }
 }
-
diff --git a/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf b/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
index 77a2ab3..bbbfd34 100644
--- a/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
+++ b/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
@@ -1,7 +1,7 @@
 ### RDS Aurora Postgresql Replica Lag monitor ###
 resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" {
   count   = var.aurora_replicalag_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora PostgreSQL replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS Aurora PostgreSQL replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
   message = coalesce(var.aurora_replicalag_message, var.message)
   type    = "query alert"
 
@@ -31,4 +31,3 @@ EOQ
     ignore_changes = ["silenced"]
   }
 }
-
diff --git a/cloud/aws/rds/common/monitors-rds-common.tf b/cloud/aws/rds/common/monitors-rds-common.tf
index bbef968..11463ca 100644
--- a/cloud/aws/rds/common/monitors-rds-common.tf
+++ b/cloud/aws/rds/common/monitors-rds-common.tf
@@ -70,7 +70,7 @@ EOQ
 ### RDS Replica Lag monitor ###
 resource "datadog_monitor" "rds_replica_lag" {
   count   = var.replicalag_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}%){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS replica lag {{#is_alert}}{{{comparator}}} {{threshold}} ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ms ({{value}}ms){{/is_warning}}"
   message = coalesce(var.replicalag_message, var.message)
   type    = "query alert"
 
@@ -100,4 +100,3 @@ EOQ
     ignore_changes = ["silenced"]
   }
 }
-