From 1a36dd42cc68cca56d38956b5169f19738174b96 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 22 Mar 2018 20:12:27 +0100
Subject: [PATCH] MON-139 fix missing space in templating name

---
 cloud/aws/apigateway/monitors-api.tf          |  6 ++---
 .../elasticsearch/monitors-elasticsearch.tf   |  4 +--
 cloud/aws/elb/monitors-elb.tf                 | 10 +++----
 cloud/aws/rds/monitors-rds.tf                 |  4 +--
 .../monitors-azure-apimanagement.tf           |  8 +++---
 .../app-services/monitors-app_services.tf     | 10 +++----
 cloud/azure/eventhub/monitors-eventhub.tf     |  4 +--
 cloud/azure/iothubs/monitors-iothubs.tf       | 26 +++++++++----------
 cloud/azure/redis/monitors-azure-redis.tf     |  6 ++---
 .../monitors-sql-database-basics.tf           |  8 +++---
 cloud/azure/storage/monitors-azure-storage.tf | 16 ++++++------
 .../monitors-stream-analytics.tf              |  8 +++---
 middleware/php-fpm/monitors-fpm.tf            |  2 +-
 system/generic/monitors-system.tf             |  8 +++---
 14 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf
index 9466e82..54e6bee 100644
--- a/cloud/aws/apigateway/monitors-api.tf
+++ b/cloud/aws/apigateway/monitors-api.tf
@@ -1,6 +1,6 @@
 # Monitoring Api Gateway latency
 resource "datadog_monitor" "API_Gateway_latency" {
-  name    = "[${var.environment}] API Gateway latency {{#is_alert}}{{comparator}}{{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  name    = "[${var.environment}] API Gateway latency {{#is_alert}}{{comparator}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
   type    = "metric alert"
   message = "${var.message}"
 
@@ -29,7 +29,7 @@ resource "datadog_monitor" "API_Gateway_latency" {
 
 # Monitoring API Gateway 5xx errors percent
 resource "datadog_monitor" "API_http_5xx_errors_count" {
-  name    = "[${var.environment}] API Gateway HTTP 5xx errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Gateway HTTP 5xx errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
   message = "${var.message}"
 
@@ -59,7 +59,7 @@ resource "datadog_monitor" "API_http_5xx_errors_count" {
 
 # Monitoring API Gateway 4xx errors percent
 resource "datadog_monitor" "API_http_4xx_errors_count" {
-  name    = "[${var.environment}] API Gateway HTTP 4xx errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Gateway HTTP 4xx errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
   message = "${var.message}"
 
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index de02a9d..a9f2173 100644
--- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf
+++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
@@ -42,7 +42,7 @@ EOF
 
 ### Elasticsearch cluster free storage space monitor ###
 resource "datadog_monitor" "es_free_space_low" {
-  name    = "[${var.environment}] ElasticSearch cluster free storage space {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ElasticSearch cluster free storage space {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   type = "query alert"
@@ -75,7 +75,7 @@ EOF
 
 ### Elasticsearch cluster CPU monitor ###
 resource "datadog_monitor" "es_cpu_90_15min" {
-  name    = "[${var.environment}] ElasticSearch cluster CPU high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ElasticSearch cluster CPU high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   type = "query alert"
diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index f9d6249..441d207 100644
--- a/cloud/aws/elb/monitors-elb.tf
+++ b/cloud/aws/elb/monitors-elb.tf
@@ -33,7 +33,7 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
 }
 
 resource "datadog_monitor" "ELB_too_much_4xx" {
-  name    = "[${var.environment}] ELB 4xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ELB 4xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -65,7 +65,7 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
 }
 
 resource "datadog_monitor" "ELB_too_much_5xx" {
-  name    = "[${var.environment}] ELB 5xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ELB 5xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -97,7 +97,7 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
 }
 
 resource "datadog_monitor" "ELB_too_much_4xx_backend" {
-  name    = "[${var.environment}] ELB backend 4xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ELB backend 4xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -129,7 +129,7 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
 }
 
 resource "datadog_monitor" "ELB_too_much_5xx_backend" {
-  name    = "[${var.environment}] ELB backend 5xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] ELB backend 5xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -161,7 +161,7 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
 }
 
 resource "datadog_monitor" "ELB_backend_latency" {
-  name    = "[${var.environment}] ELB latency too high {{#is_alert}}{{comparator}}{{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}s ({{value}}s){{/is_warning}}"
+  name    = "[${var.environment}] ELB latency too high {{#is_alert}}{{comparator}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
diff --git a/cloud/aws/rds/monitors-rds.tf b/cloud/aws/rds/monitors-rds.tf
index 03f5efc..5965c52 100644
--- a/cloud/aws/rds/monitors-rds.tf
+++ b/cloud/aws/rds/monitors-rds.tf
@@ -8,7 +8,7 @@ data "template_file" "filter" {
 
 ### RDS instance CPU monitor ###
 resource "datadog_monitor" "rds_cpu_90_15min" {
-  name    = "[${var.environment}] RDS instance CPU high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] RDS instance CPU high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   type = "metric alert"
@@ -39,7 +39,7 @@ EOF
 
 ### RDS instance free space monitor ###
 resource "datadog_monitor" "rds_free_space_low" {
-  name    = "[${var.environment}] RDS instance free space {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] RDS instance free space {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   type = "metric alert"
diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index 2862dc1..e90779f 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -39,7 +39,7 @@ resource "datadog_monitor" "apimgt_status" {
 }
 
 resource "datadog_monitor" "apimgt_failed_requests" {
-  name    = "[${var.environment}] API Management too many failed requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Management too many failed requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_requests_message, var.message)}"
 
   query = <<EOF
@@ -72,7 +72,7 @@ resource "datadog_monitor" "apimgt_failed_requests" {
 }
 
 resource "datadog_monitor" "apimgt_other_requests" {
-  name    = "[${var.environment}] API Management too many other requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Management too many other requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.other_requests_message, var.message)}"
 
   query = <<EOF
@@ -105,7 +105,7 @@ resource "datadog_monitor" "apimgt_other_requests" {
 }
 
 resource "datadog_monitor" "apimgt_unauthorized_requests" {
-  name    = "[${var.environment}] API Management too many unauthorized requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Management too many unauthorized requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.unauthorized_requests_message, var.message)}"
 
   query = <<EOF
@@ -138,7 +138,7 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" {
 }
 
 resource "datadog_monitor" "apimgt_successful_requests" {
-  name    = "[${var.environment}] API Management successful requests rate too low {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] API Management successful requests rate too low {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.successful_requests_message, var.message)}"
 
   query = <<EOF
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index 8fb32cd..fafd3c8 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -8,7 +8,7 @@ data "template_file" "filter" {
 
 # Monitoring App Services response time
 resource "datadog_monitor" "appservices_response_time" {
-  name    = "[${var.environment}] App Services response time too high {{#is_alert}}{{comparator}}{{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}s ({{value}}s){{/is_warning}}"
+  name    = "[${var.environment}] App Services response time too high {{#is_alert}}{{comparator}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   type    = "metric alert"
   message = "${coalesce(var.response_time_message, var.message)}"
 
@@ -39,7 +39,7 @@ resource "datadog_monitor" "appservices_response_time" {
 
 # Monitoring App Services memory usage
 resource "datadog_monitor" "appservices_memory_usage_count" {
-  name    = "[${var.environment}] App Services memory usage {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] App Services memory usage {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   type    = "metric alert"
   message = "${coalesce(var.memory_usage_message, var.message)}"
 
@@ -70,7 +70,7 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
 
 # Monitoring App Services 5xx errors percent
 resource "datadog_monitor" "appservices_http_5xx_errors_count" {
-  name    = "[${var.environment}] App Services HTTP 5xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] App Services HTTP 5xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
   message = "${coalesce(var.http_5xx_requests_message, var.message)}"
 
@@ -102,7 +102,7 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" {
 
 # Monitoring App Services 4xx errors percent
 resource "datadog_monitor" "appservices_http_4xx_errors_count" {
-  name    = "[${var.environment}] App Services HTTP 4xx errors too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] App Services HTTP 4xx errors too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
   message = "${coalesce(var.http_4xx_requests_message, var.message)}"
 
@@ -134,7 +134,7 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" {
 
 # Monitoring App Services HTTP 2xx & 3xx status pages percent
 resource "datadog_monitor" "appservices_http_success_status_rate" {
-  name    = "[${var.environment}] App Services HTTP successful responses too low {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] App Services HTTP successful responses too low {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   type    = "metric alert"
   message = "${coalesce(var.http_successful_requests_message, var.message)}"
 
diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf
index 661e349..a2eee86 100644
--- a/cloud/azure/eventhub/monitors-eventhub.tf
+++ b/cloud/azure/eventhub/monitors-eventhub.tf
@@ -33,7 +33,7 @@ resource "datadog_monitor" "eventhub_status" {
 }
 
 resource "datadog_monitor" "eventhub_failed_requests" {
-  name    = "[${var.environment}] Event Hub too many failed requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Event Hub too many failed requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_requests_rate_message, var.message)}"
 
   query = <<EOF
@@ -69,7 +69,7 @@ resource "datadog_monitor" "eventhub_failed_requests" {
 }
 
 resource "datadog_monitor" "eventhub_errors" {
-  name    = "[${var.environment}] Event Hub too many errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Event Hub too many errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.errors_rate_message, var.message)}"
 
   query = <<EOF
diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf
index 9771c98..259cf8a 100644
--- a/cloud/azure/iothubs/monitors-iothubs.tf
+++ b/cloud/azure/iothubs/monitors-iothubs.tf
@@ -1,5 +1,5 @@
 resource "datadog_monitor" "too_many_jobs_failed" {
-  name    = "[${var.environment}] IOT Hub Too many jobs failed {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many jobs failed {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_jobs_rate_message, var.message)}"
 
   query = <<EOF
@@ -34,7 +34,7 @@ resource "datadog_monitor" "too_many_jobs_failed" {
 }
 
 resource "datadog_monitor" "too_many_list_jobs_failed" {
-  name    = "[${var.environment}] IOT Hub Too many list_jobs failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many list_jobs failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_listjobs_rate_message, var.message)}"
 
   query = <<EOF
@@ -69,7 +69,7 @@ resource "datadog_monitor" "too_many_list_jobs_failed" {
 }
 
 resource "datadog_monitor" "too_many_query_jobs_failed" {
-  name    = "[${var.environment}] IOT Hub Too many query_jobs failed {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many query_jobs failed {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_queryjobs_rate_message, var.message)}"
 
   query = <<EOF
@@ -130,7 +130,7 @@ resource "datadog_monitor" "status" {
 }
 
 resource "datadog_monitor" "total_devices" {
-  name    = "[${var.environment}] IOT Hub Total devices is wrong {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Total devices is wrong {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.total_devices_message, var.message)}"
 
   query = <<EOF
@@ -156,7 +156,7 @@ resource "datadog_monitor" "total_devices" {
 }
 
 resource "datadog_monitor" "too_many_c2d_methods_failed" {
-  name    = "[${var.environment}] IOT Hub Too many c2d methods failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many c2d methods failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_c2d_methods_rate_message, var.message)}"
 
   query = <<EOF
@@ -191,7 +191,7 @@ resource "datadog_monitor" "too_many_c2d_methods_failed" {
 }
 
 resource "datadog_monitor" "too_many_c2d_twin_read_failed" {
-  name    = "[${var.environment}] IOT Hub Too many c2d twin read failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many c2d twin read failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_c2d_twin_read_rate_message, var.message)}"
 
   query = <<EOF
@@ -226,7 +226,7 @@ resource "datadog_monitor" "too_many_c2d_twin_read_failed" {
 }
 
 resource "datadog_monitor" "too_many_c2d_twin_update_failed" {
-  name    = "[${var.environment}] IOT Hub Too many c2d twin update failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many c2d twin update failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_c2d_twin_update_rate_message, var.message)}"
 
   query = <<EOF
@@ -261,7 +261,7 @@ resource "datadog_monitor" "too_many_c2d_twin_update_failed" {
 }
 
 resource "datadog_monitor" "too_many_d2c_twin_read_failed" {
-  name    = "[${var.environment}] IOT Hub Too many d2c twin read failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c twin read failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_d2c_twin_read_rate_message, var.message)}"
 
   query = <<EOF
@@ -296,7 +296,7 @@ resource "datadog_monitor" "too_many_d2c_twin_read_failed" {
 }
 
 resource "datadog_monitor" "too_many_d2c_twin_update_failed" {
-  name    = "[${var.environment}] IOT Hub Too many d2c twin update failure {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c twin update failure {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_d2c_twin_update_rate_message, var.message)}"
 
   query = <<EOF
@@ -331,7 +331,7 @@ resource "datadog_monitor" "too_many_d2c_twin_update_failed" {
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" {
-  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress dropped {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress dropped {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.dropped_d2c_telemetry_egress_message, var.message)}"
 
   query = <<EOF
@@ -369,7 +369,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" {
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" {
-  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress orphaned {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress orphaned {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.orphaned_d2c_telemetry_egress_message, var.message)}"
 
   query = <<EOF
@@ -407,7 +407,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" {
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" {
-  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress invalid {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c telemetry egress invalid {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.invalid_d2c_telemetry_egress_message, var.message)}"
 
   query = <<EOF
@@ -445,7 +445,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" {
 }
 
 resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" {
-  name    = "[${var.environment}] IOT Hub Too many d2c telemetry ingress not sent {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] IOT Hub Too many d2c telemetry ingress not sent {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.too_many_d2c_telemetry_ingress_nosent_message, var.message)}"
 
   query = <<EOF
diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf
index ba14650..f585235 100644
--- a/cloud/azure/redis/monitors-azure-redis.tf
+++ b/cloud/azure/redis/monitors-azure-redis.tf
@@ -33,7 +33,7 @@ EOF
 }
 
 resource "datadog_monitor" "evictedkeys" {
-  name    = "[${var.environment}] Redis too many evictedkeys {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] Redis too many evictedkeys {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.evictedkeys_limit_message, var.message)}"
 
   query = <<EOF
@@ -66,7 +66,7 @@ EOF
 }
 
 resource "datadog_monitor" "percent_processor_time" {
-  name    = "[${var.environment}] Redis processor time too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Redis processor time too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.percent_processor_time_message, var.message)}"
 
   query = <<EOF
@@ -99,7 +99,7 @@ EOF
 }
 
 resource "datadog_monitor" "server_load" {
-  name    = "[${var.environment}] Redis server load too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Redis server load too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.server_load_rate_message, var.message)}"
 
   query = <<EOF
diff --git a/cloud/azure/sql-database/monitors-sql-database-basics.tf b/cloud/azure/sql-database/monitors-sql-database-basics.tf
index dddf4ea..f161732 100644
--- a/cloud/azure/sql-database/monitors-sql-database-basics.tf
+++ b/cloud/azure/sql-database/monitors-sql-database-basics.tf
@@ -7,7 +7,7 @@ data "template_file" "filter" {
 }
 
 resource "datadog_monitor" "sql-database_cpu_90_15min" {
-  name    = "[${var.environment}] SQL Database CPU too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] SQL Database CPU too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_message, var.message)}"
 
   query = <<EOF
@@ -39,7 +39,7 @@ resource "datadog_monitor" "sql-database_cpu_90_15min" {
 }
 
 resource "datadog_monitor" "sql-database_free_space_low" {
-  name    = "[${var.environment}] SQL Database low free space {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] SQL Database low free space {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.diskspace_message, var.message)}"
 
   type = "metric alert"
@@ -72,7 +72,7 @@ resource "datadog_monitor" "sql-database_free_space_low" {
 }
 
 resource "datadog_monitor" "sql-database_dtu_consumption_high" {
-  name    = "[${var.environment}] SQL Database DTU Consumption too high {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] SQL Database DTU Consumption too high {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.dtu_message, var.message)}"
 
   type = "metric alert"
@@ -105,7 +105,7 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" {
 }
 
 resource "datadog_monitor" "sql-database_deadlocks_count" {
-  name    = "[${var.environment}] SQL Database Deadlocks too high {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] SQL Database Deadlocks too high {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.deadlock_message, var.message)}"
 
   type = "metric alert"
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index a0acbbd..c45cb30 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -39,7 +39,7 @@ EOF
 }
 
 resource "datadog_monitor" "successful_requests" {
-  name    = "[${var.environment}] Azure Storage too few successful requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too few successful requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.successful_requests_message, var.message)}"
 
   query = <<EOF
@@ -71,7 +71,7 @@ EOF
 }
 
 resource "datadog_monitor" "latency" {
-  name    = "[${var.environment}] Azure Storage too high end to end latency {{#is_alert}}{{comparator}}{{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too high end to end latency {{#is_alert}}{{comparator}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOF
@@ -103,7 +103,7 @@ EOF
 }
 
 resource "datadog_monitor" "timeout_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many timeout errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many timeout errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.timeout_error_requests_message, var.message)}"
 
   query = <<EOF
@@ -135,7 +135,7 @@ EOF
 }
 
 resource "datadog_monitor" "network_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many network errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many network errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.network_error_requests_message, var.message)}"
 
   query = <<EOF
@@ -167,7 +167,7 @@ EOF
 }
 
 resource "datadog_monitor" "throttling_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.throttling_error_requests_message, var.message)}"
 
   query = <<EOF
@@ -199,7 +199,7 @@ EOF
 }
 
 resource "datadog_monitor" "server_other_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many server_other errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many server_other errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.server_other_error_requests_message, var.message)}"
 
   query = <<EOF
@@ -231,7 +231,7 @@ EOF
 }
 
 resource "datadog_monitor" "client_other_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many client_other errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many client_other errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.client_other_error_requests_message, var.message)}"
 
   query = <<EOF
@@ -263,7 +263,7 @@ EOF
 }
 
 resource "datadog_monitor" "authorization_error_requests" {
-  name    = "[${var.environment}] Azure Storage too many authorization errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Azure Storage too many authorization errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.authorization_error_requests_message, var.message)}"
 
   query = <<EOF
diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
index 134385f..630ff2d 100644
--- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf
+++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
@@ -33,7 +33,7 @@ resource "datadog_monitor" "status" {
 }
 
 resource "datadog_monitor" "su_utilization" {
-  name    = "[${var.environment}] Stream Analytics streaming units utilization too high {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] Stream Analytics streaming units utilization too high {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.su_utilization_message, var.message)}"
 
   query = <<EOF
@@ -66,7 +66,7 @@ resource "datadog_monitor" "su_utilization" {
 }
 
 resource "datadog_monitor" "failed_function_requests" {
-  name    = "[${var.environment}] Stream Analytics too many failed requests {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Stream Analytics too many failed requests {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.failed_function_requests_message, var.message)}"
 
   query = <<EOF
@@ -100,7 +100,7 @@ resource "datadog_monitor" "failed_function_requests" {
 }
 
 resource "datadog_monitor" "conversion_errors" {
-  name    = "[${var.environment}] Stream Analytics too many conversion errors {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Stream Analytics too many conversion errors {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.conversion_errors_message, var.message)}"
 
   query = <<EOF
@@ -133,7 +133,7 @@ resource "datadog_monitor" "conversion_errors" {
 }
 
 resource "datadog_monitor" "runtime_errors" {
-  name    = "[${var.environment}] Stream Analytics too many runtime errors {{#is_alert}}{{comparator}}{{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "[${var.environment}] Stream Analytics too many runtime errors {{#is_alert}}{{comparator}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.runtime_errors_message, var.message)}"
 
   query = <<EOF
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 1a9afb6..51f582d 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -7,7 +7,7 @@ data "template_file" "filter" {
 }
 
 resource "datadog_monitor" "datadog_php_fpm_process_idle" {
-  name    = "[${var.environment}] php_fpm busy worker {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] php_fpm busy worker {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   type = "metric alert"
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index c0fdf25..ce70cd2 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -7,7 +7,7 @@ data "template_file" "filter" {
 }
 
 resource "datadog_monitor" "datadog_cpu_too_high" {
-  name    = "[${var.environment}] CPU usage {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] CPU usage {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -37,7 +37,7 @@ resource "datadog_monitor" "datadog_cpu_too_high" {
 }
 
 resource "datadog_monitor" "datadog_free_disk_space_too_low" {
-  name    = "[${var.environment}] Free disk space {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Free disk space {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -68,7 +68,7 @@ resource "datadog_monitor" "datadog_free_disk_space_too_low" {
 }
 
 resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
-  name    = "[${var.environment}] Free disk inodes {{#is_alert}}{{comparator}}{{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}}{{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] Free disk inodes {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF
@@ -99,7 +99,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}}"
+  name    = "[${var.environment}] Free memory {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${var.message}"
 
   query = <<EOF