From 3c08056adb40154eab3d8e79388e82a6e361beb0 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 26 Jun 2019 19:33:00 +0200
Subject: [PATCH] MON-479 convert metric alert type to query alert when it
 needs

---
 caas/kubernetes/ark/monitors-ark.tf           |  2 +-
 .../ingress/vts/monitors-ingress.tf           |  4 +--
 caas/kubernetes/node/monitors-k8s-node.tf     |  4 +--
 caas/kubernetes/pod/monitors-k8s-pod.tf       |  2 +-
 .../workload/monitors-k8s-workload.tf         |  6 ++--
 cloud/aws/alb/monitors-alb.tf                 | 12 ++++----
 cloud/aws/apigateway/monitors-api.tf          |  6 ++--
 .../common/monitors-elasticache.tf            | 12 ++++----
 .../memcached/monitors-memcached.tf           |  4 +--
 cloud/aws/elasticache/redis/monitors-redis.tf |  8 +++---
 .../elasticsearch/monitors-elasticsearch.tf   |  6 ++--
 cloud/aws/elb/monitors-elb.tf                 | 12 ++++----
 .../monitors-kinesis-firehose.tf              |  2 +-
 .../aurora/mysql/monitors-rds-aurora-mysql.tf |  2 +-
 .../monitors-rds-aurora-postgresql.tf         |  2 +-
 cloud/aws/rds/common/monitors-rds-common.tf   |  6 ++--
 cloud/aws/vpn/monitors-vpn.tf                 |  2 +-
 .../monitors-azure-apimanagement.tf           |  8 +++---
 .../app-services/monitors-app_services.tf     | 10 +++----
 .../azure-search/monitors-azure-search.tf     |  4 +--
 cloud/azure/cosmosdb/monitors-cosmosdb.tf     |  6 ++--
 .../datalakestore/monitors-datalakestore.tf   |  2 +-
 cloud/azure/eventgrid/monitors-eventgrid.tf   |  4 +--
 cloud/azure/eventhub/monitors-eventhub.tf     |  6 ++--
 cloud/azure/functions/monitors-functions.tf   |  6 ++--
 cloud/azure/iothubs/monitors-iothubs.tf       | 28 +++++++++----------
 cloud/azure/keyvault/monitors-keyvault.tf     |  4 +--
 .../load-balancer/monitors-load-balancer.tf   |  2 +-
 cloud/azure/mysql/monitors-mysql.tf           |  8 +++---
 .../azure/postgresql/monitors-postegresql.tf  | 10 +++----
 cloud/azure/redis/monitors-azure-redis.tf     |  8 +++---
 .../serverfarms/monitors-azure-serverfarms.tf |  6 ++--
 .../azure/servicebus/monitors-service-bus.tf  |  8 +++---
 .../sql-database/monitors-sql-database.tf     | 10 +++----
 .../monitors-sql-elasticpool.tf               |  6 ++--
 cloud/azure/storage/monitors-azure-storage.tf | 18 ++++++------
 .../monitors-stream-analytics.tf              | 10 +++----
 .../monitors-virtual-machine.tf               |  6 ++--
 cloud/gcp/big-query/monitors-big-query.tf     | 14 +++++-----
 .../common/monitors-cloud-sql-common.tf       |  8 +++---
 .../gcp/gce/instance/monitors-gce-instance.tf |  6 ++--
 cloud/gcp/lb/monitors-lb.tf                   |  8 +++---
 database/mongodb/monitors-mongo.tf            |  2 +-
 database/mysql/monitors-mysql.tf              | 10 +++----
 database/postgresql/monitors-postgresql.tf    |  4 +--
 database/redis/monitors-redis.tf              | 18 ++++++------
 middleware/php-fpm/monitors-fpm.tf            |  2 +-
 system/generic/monitors-system.tf             | 10 +++----
 48 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 38bf079..5a502b2 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -1,7 +1,7 @@
 resource "datadog_monitor" "ark_schedules_monitor" {
   count   = "${var.ark_schedules_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Ark backup failed"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
 
   query = <<EOQ
diff --git a/caas/kubernetes/ingress/vts/monitors-ingress.tf b/caas/kubernetes/ingress/vts/monitors-ingress.tf
index e5a49db..d456559 100644
--- a/caas/kubernetes/ingress/vts/monitors-ingress.tf
+++ b/caas/kubernetes/ingress/vts/monitors-ingress.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" {
       * 100, 0) > ${var.ingress_5xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.ingress_5xx_threshold_warning}"
@@ -42,7 +42,7 @@ resource "datadog_monitor" "nginx_ingress_too_many_4xx" {
     * 100, 0) > ${var.ingress_4xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.ingress_4xx_threshold_warning}"
diff --git a/caas/kubernetes/node/monitors-k8s-node.tf b/caas/kubernetes/node/monitors-k8s-node.tf
index 965e2ac..cca6ed1 100644
--- a/caas/kubernetes/node/monitors-k8s-node.tf
+++ b/caas/kubernetes/node/monitors-k8s-node.tf
@@ -221,7 +221,7 @@ resource "datadog_monitor" "node_unschedulable" {
 resource "datadog_monitor" "volume_space" {
   count   = "${var.volume_space_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Node volume space usage {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.volume_space_message, var.message)}"
 
   query = <<EOQ
@@ -253,7 +253,7 @@ resource "datadog_monitor" "volume_space" {
 resource "datadog_monitor" "volume_inodes" {
   count   = "${var.volume_inodes_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Node volume inodes usage {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.volume_inodes_message, var.message)}"
 
   query = <<EOQ
diff --git a/caas/kubernetes/pod/monitors-k8s-pod.tf b/caas/kubernetes/pod/monitors-k8s-pod.tf
index 1c8ebb5..2ca4830 100644
--- a/caas/kubernetes/pod/monitors-k8s-pod.tf
+++ b/caas/kubernetes/pod/monitors-k8s-pod.tf
@@ -30,7 +30,7 @@ resource "datadog_monitor" "pod_phase_status" {
 resource "datadog_monitor" "error" {
   count   = "${var.error_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod waiting errors"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.error_message, var.message)}"
 
   query = <<EOQ
diff --git a/caas/kubernetes/workload/monitors-k8s-workload.tf b/caas/kubernetes/workload/monitors-k8s-workload.tf
index 6dc07d4..bcfdcb6 100644
--- a/caas/kubernetes/workload/monitors-k8s-workload.tf
+++ b/caas/kubernetes/workload/monitors-k8s-workload.tf
@@ -57,7 +57,7 @@ resource "datadog_monitor" "cronjob" {
 resource "datadog_monitor" "replica_available" {
   count   = "${var.replica_available_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Available replicas {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.replica_available_message, var.message)}"
 
   query = <<EOQ
@@ -88,7 +88,7 @@ resource "datadog_monitor" "replica_available" {
 resource "datadog_monitor" "replica_ready" {
   count   = "${var.replica_ready_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Ready replicas {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.replica_ready_message, var.message)}"
 
   query = <<EOQ
@@ -119,7 +119,7 @@ resource "datadog_monitor" "replica_ready" {
 resource "datadog_monitor" "replica_current" {
   count   = "${var.replica_current_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Current replicas {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.replica_current_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf
index 392edab..39662d7 100644
--- a/cloud/aws/alb/monitors-alb.tf
+++ b/cloud/aws/alb/monitors-alb.tf
@@ -1,7 +1,7 @@
 resource "datadog_monitor" "ALB_no_healthy_instances" {
   count   = "${var.alb_no_healthy_instances_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB healthy instances {{#is_alert}}is at 0{{/is_alert}}{{#is_warning}}is at {{value}}%{{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.alb_no_healthy_instances_message, var.message)}"
 
   query = <<EOQ
@@ -32,7 +32,7 @@ resource "datadog_monitor" "ALB_no_healthy_instances" {
 resource "datadog_monitor" "ALB_latency" {
   count   = "${var.latency_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB latency {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOQ
@@ -61,7 +61,7 @@ resource "datadog_monitor" "ALB_latency" {
 resource "datadog_monitor" "ALB_httpcode_5xx" {
   count   = "${var.httpcode_alb_5xx_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB HTTP code 5xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.httpcode_alb_5xx_message, var.message)}"
 
   query = <<EOQ
@@ -91,7 +91,7 @@ resource "datadog_monitor" "ALB_httpcode_5xx" {
 resource "datadog_monitor" "ALB_httpcode_4xx" {
   count   = "${var.httpcode_alb_4xx_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB HTTP code 4xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.httpcode_alb_4xx_message, var.message)}"
 
   query = <<EOQ
@@ -121,7 +121,7 @@ resource "datadog_monitor" "ALB_httpcode_4xx" {
 resource "datadog_monitor" "ALB_httpcode_target_5xx" {
   count   = "${var.httpcode_target_5xx_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB target HTTP code 5xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.httpcode_target_5xx_message, var.message)}"
 
   query = <<EOQ
@@ -151,7 +151,7 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" {
 resource "datadog_monitor" "ALB_httpcode_target_4xx" {
   count   = "${var.httpcode_target_4xx_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ALB target HTTP code 4xx {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.httpcode_target_4xx_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf
index 841662a..8352d10 100644
--- a/cloud/aws/apigateway/monitors-api.tf
+++ b/cloud/aws/apigateway/monitors-api.tf
@@ -2,7 +2,7 @@
 resource "datadog_monitor" "API_Gateway_latency" {
   count   = "${var.latency_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOQ
@@ -32,7 +32,7 @@ resource "datadog_monitor" "API_Gateway_latency" {
 resource "datadog_monitor" "API_http_5xx_errors_count" {
   count   = "${var.http_5xx_requests_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.http_5xx_requests_message, var.message)}"
 
   query = <<EOQ
@@ -63,7 +63,7 @@ resource "datadog_monitor" "API_http_5xx_errors_count" {
 resource "datadog_monitor" "API_http_4xx_errors_count" {
   count   = "${var.http_4xx_requests_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.http_4xx_requests_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
index 54fde09..64e4ba7 100644
--- a/cloud/aws/elasticache/common/monitors-elasticache.tf
+++ b/cloud/aws/elasticache/common/monitors-elasticache.tf
@@ -3,7 +3,7 @@ resource "datadog_monitor" "elasticache_eviction" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache eviction {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}"
   message = "${coalesce(var.eviction_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     sum(${var.eviction_timeframe}): (
@@ -34,7 +34,7 @@ resource "datadog_monitor" "elasticache_max_connection" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache max connections reached {{#is_alert}}{{{comparator}}} {{threshold}} {{/is_alert}}"
   message = "${coalesce(var.max_connection_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.max_connection_time_aggregator}(${var.max_connection_timeframe}): (
@@ -60,7 +60,7 @@ resource "datadog_monitor" "elasticache_no_connection" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache connections {{#is_alert}}{{{comparator}}} {{threshold}} {{/is_alert}}"
   message = "${coalesce(var.no_connection_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.no_connection_time_aggregator}(${var.no_connection_timeframe}): (
@@ -86,7 +86,7 @@ resource "datadog_monitor" "elasticache_swap" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache swap {{#is_alert}}{{{comparator}}} {{threshold}}MB ({{value}}MB){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}MB ({{value}}MB){{/is_warning}}"
   message = "${coalesce(var.swap_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.swap_time_aggregator}(${var.swap_timeframe}): (
@@ -117,7 +117,7 @@ resource "datadog_monitor" "elasticache_free_memory" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache 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)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     pct_change(avg(${var.free_memory_timeframe}),${var.free_memory_condition_timeframe}):
@@ -148,7 +148,7 @@ resource "datadog_monitor" "elasticache_eviction_growing" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache evictions is growing {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.eviction_growing_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     pct_change(avg(${var.eviction_growing_timeframe}),${var.eviction_growing_condition_timeframe}):
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 09d6d95..07839b1 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -3,7 +3,7 @@ resource "datadog_monitor" "memcached_get_hits" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache memcached cache hit ratio {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.get_hits_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.get_hits_time_aggregator}(${var.get_hits_timeframe}): (
@@ -36,7 +36,7 @@ resource "datadog_monitor" "memcached_cpu_high" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache memcached CPU {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_high_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.cpu_high_time_aggregator}(${var.cpu_high_timeframe}): (
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index c40d896..6489660 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -3,7 +3,7 @@ resource "datadog_monitor" "redis_cache_hits" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache redis cache hit ratio {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cache_hits_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.cache_hits_time_aggregator}(${var.cache_hits_timeframe}): default(
@@ -36,7 +36,7 @@ resource "datadog_monitor" "redis_cpu_high" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache redis CPU {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_high_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.cpu_high_time_aggregator}(${var.cpu_high_timeframe}): (
@@ -62,7 +62,7 @@ resource "datadog_monitor" "redis_replication_lag" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache redis replication lag {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = "${coalesce(var.replication_lag_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.replication_lag_time_aggregator}(${var.replication_lag_timeframe}): (
@@ -93,7 +93,7 @@ resource "datadog_monitor" "redis_commands" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Elasticache redis is receiving no commands"
   message = "${coalesce(var.commands_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     sum(${var.commands_timeframe}): (
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index a00ca4b..c9ceb47 100644
--- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf
+++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
@@ -8,7 +8,7 @@ resource "datadog_monitor" "es_cluster_status" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster status is not green"
   message = "${coalesce(var.es_cluster_status_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   max(${var.es_cluster_status_timeframe}): (
@@ -41,7 +41,7 @@ resource "datadog_monitor" "es_free_space_low" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster free storage 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"
+  type = "query alert"
 
   query = <<EOQ
   ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
@@ -74,7 +74,7 @@ resource "datadog_monitor" "es_cpu_90_15min" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] ElasticSearch cluster CPU high {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.cpu_time_aggregator}(${var.cpu_timeframe}): (
diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index 90c2304..04bc028 100644
--- a/cloud/aws/elb/monitors-elb.tf
+++ b/cloud/aws/elb/monitors-elb.tf
@@ -11,7 +11,7 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
     ) * 100 < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = 1
@@ -43,7 +43,7 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
       * 100 > ${var.elb_4xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.elb_4xx_threshold_warning}"
@@ -75,7 +75,7 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
       * 100 > ${var.elb_5xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.elb_5xx_threshold_warning}"
@@ -107,7 +107,7 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
       * 100 > ${var.elb_backend_4xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.elb_backend_4xx_threshold_warning}"
@@ -139,7 +139,7 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
       * 100 > ${var.elb_backend_5xx_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.elb_backend_5xx_threshold_warning}"
@@ -170,7 +170,7 @@ resource "datadog_monitor" "ELB_backend_latency" {
     > ${var.elb_backend_latency_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.elb_backend_latency_warning}"
diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
index 35006ce..633e22a 100644
--- a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
+++ b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
@@ -4,7 +4,7 @@ resource "datadog_monitor" "firehose_incoming_records" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kinesis Firehose No incoming records"
   message = "${coalesce(var.incoming_records_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     sum(${var.incoming_records_timeframe}): (
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 0a5cb49..de4a874 100644
--- a/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
+++ b/cloud/aws/rds/aurora/mysql/monitors-rds-aurora-mysql.tf
@@ -4,7 +4,7 @@ resource "datadog_monitor" "rds_aurora_mysql_replica_lag" {
   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}}"
   message = "${coalesce(var.aurora_replicalag_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.aurora_replicalag_timeframe}): (
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 d9894b3..e97638e 100644
--- a/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
+++ b/cloud/aws/rds/aurora/postgresql/monitors-rds-aurora-postgresql.tf
@@ -4,7 +4,7 @@ resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" {
   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}}"
   message = "${coalesce(var.aurora_replicalag_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.aurora_replicalag_timeframe}): (
diff --git a/cloud/aws/rds/common/monitors-rds-common.tf b/cloud/aws/rds/common/monitors-rds-common.tf
index d173971..098d6e6 100644
--- a/cloud/aws/rds/common/monitors-rds-common.tf
+++ b/cloud/aws/rds/common/monitors-rds-common.tf
@@ -4,7 +4,7 @@ resource "datadog_monitor" "rds_cpu_90_15min" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS instance CPU high {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.cpu_time_aggregator}(${var.cpu_timeframe}): (
@@ -35,7 +35,7 @@ resource "datadog_monitor" "rds_free_space_low" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] RDS instance 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"
+  type = "query alert"
 
   query = <<EOQ
   ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
@@ -67,7 +67,7 @@ resource "datadog_monitor" "rds_replica_lag" {
   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}}"
   message = "${coalesce(var.replicalag_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.replicalag_timeframe}): (
diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf
index c396629..2c30a33 100644
--- a/cloud/aws/vpn/monitors-vpn.tf
+++ b/cloud/aws/vpn/monitors-vpn.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "VPN_status" {
         ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   renotify_interval   = 0
diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index 88bcdb2..c06d2f9 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -43,7 +43,7 @@ resource "datadog_monitor" "apimgt_failed_requests" {
     warning  = "${var.failed_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -74,7 +74,7 @@ resource "datadog_monitor" "apimgt_other_requests" {
     warning  = "${var.other_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -105,7 +105,7 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" {
     warning  = "${var.unauthorized_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -138,7 +138,7 @@ resource "datadog_monitor" "apimgt_successful_requests" {
     warning  = "${var.successful_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index 7ab8b8c..4eeba04 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -2,7 +2,7 @@
 resource "datadog_monitor" "appservices_response_time" {
   count   = "${var.response_time_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.response_time_message, var.message)}"
 
   query = <<EOQ
@@ -32,7 +32,7 @@ resource "datadog_monitor" "appservices_response_time" {
 resource "datadog_monitor" "appservices_memory_usage_count" {
   count   = "${var.memory_usage_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] App Services memory usage {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.memory_usage_message, var.message)}"
 
   query = <<EOQ
@@ -62,7 +62,7 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
 resource "datadog_monitor" "appservices_http_5xx_errors_count" {
   count   = "${var.http_5xx_requests_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.http_5xx_requests_message, var.message)}"
 
   query = <<EOQ
@@ -93,7 +93,7 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" {
 resource "datadog_monitor" "appservices_http_4xx_errors_count" {
   count   = "${var.http_4xx_requests_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.http_4xx_requests_message, var.message)}"
 
   query = <<EOQ
@@ -124,7 +124,7 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" {
 resource "datadog_monitor" "appservices_http_success_status_rate" {
   count   = "${var.http_successful_requests_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type    = "query alert"
   message = "${coalesce(var.http_successful_requests_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/azure/azure-search/monitors-azure-search.tf b/cloud/azure/azure-search/monitors-azure-search.tf
index 5ed15c9..7aec213 100644
--- a/cloud/azure/azure-search/monitors-azure-search.tf
+++ b/cloud/azure/azure-search/monitors-azure-search.tf
@@ -2,7 +2,7 @@
 resource "datadog_monitor" "azure_search_latency" {
   count   = "${var.latency_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Search latency too high {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOQ
@@ -32,7 +32,7 @@ resource "datadog_monitor" "azure_search_latency" {
 resource "datadog_monitor" "azure_search_throttled_queries_rate" {
   count   = "${var.throttled_queries_rate_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Search throttled queries rate is too high {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.throttled_queries_rate_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/azure/cosmosdb/monitors-cosmosdb.tf b/cloud/azure/cosmosdb/monitors-cosmosdb.tf
index 0241ae8..24d3df5 100644
--- a/cloud/azure/cosmosdb/monitors-cosmosdb.tf
+++ b/cloud/azure/cosmosdb/monitors-cosmosdb.tf
@@ -52,7 +52,7 @@ resource "datadog_monitor" "cosmos_db_4xx_requests" {
     , 0) * 100 > ${var.cosmos_db_4xx_request_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cosmos_db_4xx_request_rate_threshold_critical}"
@@ -86,7 +86,7 @@ resource "datadog_monitor" "cosmos_db_5xx_requests" {
     , 0) * 100 > ${var.cosmos_db_5xx_request_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cosmos_db_5xx_request_rate_threshold_critical}"
@@ -120,7 +120,7 @@ resource "datadog_monitor" "cosmos_db_scaling" {
     , 0) * 100 > ${var.cosmos_db_scaling_error_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cosmos_db_scaling_error_rate_threshold_critical}"
diff --git a/cloud/azure/datalakestore/monitors-datalakestore.tf b/cloud/azure/datalakestore/monitors-datalakestore.tf
index 3993797..edf703e 100644
--- a/cloud/azure/datalakestore/monitors-datalakestore.tf
+++ b/cloud/azure/datalakestore/monitors-datalakestore.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "datalakestore_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/eventgrid/monitors-eventgrid.tf b/cloud/azure/eventgrid/monitors-eventgrid.tf
index 083ede5..c0ef553 100644
--- a/cloud/azure/eventgrid/monitors-eventgrid.tf
+++ b/cloud/azure/eventgrid/monitors-eventgrid.tf
@@ -39,7 +39,7 @@ resource "datadog_monitor" "eventgrid_failed_messages" {
     ) > ${var.failed_messages_rate_thresold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.failed_messages_rate_thresold_critical}"
@@ -74,7 +74,7 @@ resource "datadog_monitor" "eventgrid_unmatched_events" {
     ) > ${var.unmatched_events_rate_thresold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.unmatched_events_rate_thresold_critical}"
diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf
index 27fb10f..f79635b 100644
--- a/cloud/azure/eventhub/monitors-eventhub.tf
+++ b/cloud/azure/eventhub/monitors-eventhub.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "eventhub_status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -36,7 +36,7 @@ resource "datadog_monitor" "eventhub_failed_requests" {
     ) * 100 > ${var.failed_requests_rate_thresold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.failed_requests_rate_thresold_critical}"
@@ -70,7 +70,7 @@ resource "datadog_monitor" "eventhub_errors" {
     ) * 100 > ${var.errors_rate_thresold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.errors_rate_thresold_critical}"
diff --git a/cloud/azure/functions/monitors-functions.tf b/cloud/azure/functions/monitors-functions.tf
index af98ec7..1f946ac 100644
--- a/cloud/azure/functions/monitors-functions.tf
+++ b/cloud/azure/functions/monitors-functions.tf
@@ -1,7 +1,7 @@
 resource "datadog_monitor" "function_http_5xx_errors_rate" {
   count   = "${var.http_5xx_errors_rate_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Function App HTTP 5xx errors too high {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.http_5xx_errors_rate_message, var.message)}"
 
   query = <<EOQ
@@ -31,7 +31,7 @@ resource "datadog_monitor" "function_http_5xx_errors_rate" {
 resource "datadog_monitor" "function_high_connections_count" {
   count   = "${var.high_connections_count_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Function App connections count too high {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.high_connections_count_message, var.message)}"
 
   query = <<EOQ
@@ -60,7 +60,7 @@ resource "datadog_monitor" "function_high_connections_count" {
 resource "datadog_monitor" "function_high_threads_count" {
   count   = "${var.high_threads_count_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Function App threads count too high {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
-  type    = "metric alert"
+  type    = "query alert"
   message = "${coalesce(var.high_threads_count_message, var.message)}"
 
   query = <<EOQ
diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf
index dbc8a68..7681534 100644
--- a/cloud/azure/iothubs/monitors-iothubs.tf
+++ b/cloud/azure/iothubs/monitors-iothubs.tf
@@ -12,7 +12,7 @@ resource "datadog_monitor" "too_many_jobs_failed" {
       * 100 , 0) > ${var.failed_jobs_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_jobs_rate_threshold_warning}"
@@ -46,7 +46,7 @@ resource "datadog_monitor" "too_many_list_jobs_failed" {
       * 100, 0) > ${var.failed_listjobs_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_listjobs_rate_threshold_warning}"
@@ -80,7 +80,7 @@ resource "datadog_monitor" "too_many_query_jobs_failed" {
       * 100, 0) > ${var.failed_queryjobs_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_queryjobs_rate_threshold_warning}"
@@ -111,7 +111,7 @@ resource "datadog_monitor" "status" {
     ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -137,7 +137,7 @@ resource "datadog_monitor" "total_devices" {
     ) == 0
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -166,7 +166,7 @@ resource "datadog_monitor" "too_many_c2d_methods_failed" {
       * 100, 0) > ${var.failed_c2d_methods_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_c2d_methods_rate_threshold_warning}"
@@ -200,7 +200,7 @@ resource "datadog_monitor" "too_many_c2d_twin_read_failed" {
       * 100, 0) > ${var.failed_c2d_twin_read_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_c2d_twin_read_rate_threshold_warning}"
@@ -234,7 +234,7 @@ resource "datadog_monitor" "too_many_c2d_twin_update_failed" {
       * 100, 0) > ${var.failed_c2d_twin_update_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_c2d_twin_update_rate_threshold_warning}"
@@ -268,7 +268,7 @@ resource "datadog_monitor" "too_many_d2c_twin_read_failed" {
       * 100, 0) > ${var.failed_d2c_twin_read_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_d2c_twin_read_rate_threshold_warning}"
@@ -302,7 +302,7 @@ resource "datadog_monitor" "too_many_d2c_twin_update_failed" {
       * 100, 0) > ${var.failed_d2c_twin_update_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.failed_d2c_twin_update_rate_threshold_warning}"
@@ -338,7 +338,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_dropped" {
       * 100, 0) > ${var.dropped_d2c_telemetry_egress_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.dropped_d2c_telemetry_egress_rate_threshold_warning}"
@@ -374,7 +374,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_orphaned" {
       * 100, 0) > ${var.orphaned_d2c_telemetry_egress_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.orphaned_d2c_telemetry_egress_rate_threshold_warning}"
@@ -410,7 +410,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_egress_invalid" {
       * 100, 0) > ${var.invalid_d2c_telemetry_egress_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.invalid_d2c_telemetry_egress_rate_threshold_warning}"
@@ -443,7 +443,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" {
     , 0) > 0
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/keyvault/monitors-keyvault.tf b/cloud/azure/keyvault/monitors-keyvault.tf
index e905c35..6005b71 100644
--- a/cloud/azure/keyvault/monitors-keyvault.tf
+++ b/cloud/azure/keyvault/monitors-keyvault.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "keyvault_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -45,7 +45,7 @@ resource "datadog_monitor" "keyvault_api_result" {
     warning  = "${var.api_result_threshold_warning}"
   }
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/load-balancer/monitors-load-balancer.tf b/cloud/azure/load-balancer/monitors-load-balancer.tf
index 658b1b5..45ede58 100644
--- a/cloud/azure/load-balancer/monitors-load-balancer.tf
+++ b/cloud/azure/load-balancer/monitors-load-balancer.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "loadbalancer_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/mysql/monitors-mysql.tf b/cloud/azure/mysql/monitors-mysql.tf
index 481cc1c..9dd0910 100644
--- a/cloud/azure/mysql/monitors-mysql.tf
+++ b/cloud/azure/mysql/monitors-mysql.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "mysql_cpu_usage" {
     ) > ${var.cpu_usage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_usage_threshold_critical}"
@@ -40,7 +40,7 @@ resource "datadog_monitor" "mysql_free_storage" {
     ) < ${var.free_storage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.free_storage_threshold_critical}"
@@ -71,7 +71,7 @@ resource "datadog_monitor" "mysql_io_consumption" {
     ) > ${var.io_consumption_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.io_consumption_threshold_critical}"
@@ -102,7 +102,7 @@ resource "datadog_monitor" "mysql_memory_usage" {
     ) > ${var.memory_usage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.memory_usage_threshold_critical}"
diff --git a/cloud/azure/postgresql/monitors-postegresql.tf b/cloud/azure/postgresql/monitors-postegresql.tf
index 374b5f5..679278f 100644
--- a/cloud/azure/postgresql/monitors-postegresql.tf
+++ b/cloud/azure/postgresql/monitors-postegresql.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "postgresql_cpu_usage" {
     ) > ${var.cpu_usage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_usage_threshold_critical}"
@@ -40,7 +40,7 @@ resource "datadog_monitor" "postgresql_no_connection" {
     ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -66,7 +66,7 @@ resource "datadog_monitor" "postgresql_free_storage" {
     ) < ${var.free_storage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.free_storage_threshold_critical}"
@@ -97,7 +97,7 @@ resource "datadog_monitor" "postgresql_io_consumption" {
     ) > ${var.io_consumption_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.io_consumption_threshold_critical}"
@@ -128,7 +128,7 @@ resource "datadog_monitor" "postgresql_memory_usage" {
     ) > ${var.memory_usage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.memory_usage_threshold_critical}"
diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf
index 85ac8df..fd38fc2 100644
--- a/cloud/azure/redis/monitors-azure-redis.tf
+++ b/cloud/azure/redis/monitors-azure-redis.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -35,7 +35,7 @@ resource "datadog_monitor" "evictedkeys" {
      ) > ${var.evictedkeys_limit_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.evictedkeys_limit_threshold_warning}"
@@ -66,7 +66,7 @@ resource "datadog_monitor" "percent_processor_time" {
     ) > ${var.percent_processor_time_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.percent_processor_time_threshold_warning}"
@@ -97,7 +97,7 @@ resource "datadog_monitor" "server_load" {
     ) > ${var.server_load_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.server_load_rate_threshold_warning}"
diff --git a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
index 081092d..1dccf59 100644
--- a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
+++ b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -35,7 +35,7 @@ resource "datadog_monitor" "cpu_percentage" {
     ) > ${var.cpu_percentage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.cpu_percentage_threshold_warning}"
@@ -66,7 +66,7 @@ resource "datadog_monitor" "memory_percentage" {
     ) > ${var.memory_percentage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.memory_percentage_threshold_warning}"
diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf
index 8f8af34..ccad349 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "servicebus_status" {
       ) != 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -37,7 +37,7 @@ resource "datadog_monitor" "service_bus_no_active_connections" {
       ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -65,7 +65,7 @@ resource "datadog_monitor" "service_bus_user_errors" {
       ) * 100 > ${var.user_errors_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.user_errors_threshold_critical}"
@@ -98,7 +98,7 @@ resource "datadog_monitor" "service_bus_server_errors" {
       ) * 100 > ${var.server_errors_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.server_errors_threshold_critical}"
diff --git a/cloud/azure/sql-database/monitors-sql-database.tf b/cloud/azure/sql-database/monitors-sql-database.tf
index dfb068c..6d8908c 100644
--- a/cloud/azure/sql-database/monitors-sql-database.tf
+++ b/cloud/azure/sql-database/monitors-sql-database.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -35,7 +35,7 @@ resource "datadog_monitor" "sql-database_cpu" {
     ) > ${var.cpu_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_threshold_critical}"
@@ -60,7 +60,7 @@ resource "datadog_monitor" "sql-database_free_space_low" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] SQL Database high disk usage {{#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"
+  type = "query alert"
 
   query = <<EOQ
     ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
@@ -91,7 +91,7 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type = "query alert"
 
   query = <<EOQ
     ${var.dtu_time_aggregator}(${var.dtu_timeframe}): (
@@ -122,7 +122,7 @@ resource "datadog_monitor" "sql-database_deadlocks_count" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${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"
+  type = "query alert"
 
   query = <<EOQ
     sum(${var.deadlock_timeframe}): (
diff --git a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
index 15cf99a..3cea3cc 100644
--- a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
+++ b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "sql_elasticpool_cpu" {
     ) > ${var.cpu_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_threshold_critical}"
@@ -34,7 +34,7 @@ resource "datadog_monitor" "sql_elasticpool_free_space_low" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] SQL Elastic Pool high disk usage {{#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"
+  type = "query alert"
 
   query = <<EOQ
     ${var.diskspace_time_aggregator}(${var.diskspace_timeframe}): (
@@ -65,7 +65,7 @@ resource "datadog_monitor" "sql_elasticpool_dtu_consumption_high" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] SQL Elastic Pool 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"
+  type = "query alert"
 
   query = <<EOQ
     ${var.dtu_time_aggregator}(${var.dtu_timeframe}): (
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index c2c83de..f5b6d92 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -14,7 +14,7 @@ resource "datadog_monitor" "availability" {
     warning  = "${var.availability_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -44,7 +44,7 @@ resource "datadog_monitor" "successful_requests" {
     warning  = "${var.successful_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -74,7 +74,7 @@ resource "datadog_monitor" "latency" {
     warning  = "${var.latency_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -104,7 +104,7 @@ resource "datadog_monitor" "timeout_error_requests" {
     warning  = "${var.timeout_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -134,7 +134,7 @@ resource "datadog_monitor" "network_error_requests" {
     warning  = "${var.network_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -164,7 +164,7 @@ resource "datadog_monitor" "throttling_error_requests" {
     warning  = "${var.throttling_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -194,7 +194,7 @@ resource "datadog_monitor" "server_other_error_requests" {
     warning  = "${var.server_other_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -224,7 +224,7 @@ resource "datadog_monitor" "client_other_error_requests" {
     warning  = "${var.client_other_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -254,7 +254,7 @@ resource "datadog_monitor" "authorization_error_requests" {
     warning  = "${var.authorization_error_requests_threshold_warning}"
   }
 
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
index b0efc05..f9ab56a 100644
--- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf
+++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "status" {
     ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -35,7 +35,7 @@ resource "datadog_monitor" "su_utilization" {
     ) > ${var.su_utilization_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -67,7 +67,7 @@ resource "datadog_monitor" "failed_function_requests" {
     ) * 100 > ${var.failed_function_requests_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -98,7 +98,7 @@ resource "datadog_monitor" "conversion_errors" {
     ) > ${var.conversion_errors_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -129,7 +129,7 @@ resource "datadog_monitor" "runtime_errors" {
     ) > ${var.runtime_errors_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/virtual-machine/monitors-virtual-machine.tf b/cloud/azure/virtual-machine/monitors-virtual-machine.tf
index 2998547..aaeddc7 100644
--- a/cloud/azure/virtual-machine/monitors-virtual-machine.tf
+++ b/cloud/azure/virtual-machine/monitors-virtual-machine.tf
@@ -10,7 +10,7 @@ resource "datadog_monitor" "virtualmachine_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -36,7 +36,7 @@ resource "datadog_monitor" "virtualmachine_cpu_usage" {
     ) > ${var.cpu_usage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_usage_threshold_critical}"
@@ -70,7 +70,7 @@ resource "datadog_monitor" "virtualmachine_credit_cpu_remaining_too_low" {
       * 100 , 100) < ${var.cpu_remaining_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.cpu_remaining_rate_threshold_warning}"
diff --git a/cloud/gcp/big-query/monitors-big-query.tf b/cloud/gcp/big-query/monitors-big-query.tf
index b20484d..6575b87 100644
--- a/cloud/gcp/big-query/monitors-big-query.tf
+++ b/cloud/gcp/big-query/monitors-big-query.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "concurrent_queries" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Concurrent Queries {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.concurrent_queries_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.concurrent_queries_timeframe}):default(avg:gcp.bigquery.query.count{${var.filter_tags}}, 0)
@@ -40,7 +40,7 @@ resource "datadog_monitor" "execution_time" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Execution Time {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = "${coalesce(var.execution_time_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.execution_time_timeframe}):default(avg:gcp.bigquery.query.execution_times.avg{${var.filter_tags}}, 0)
@@ -74,7 +74,7 @@ resource "datadog_monitor" "scanned_bytes" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Scanned Bytes {{#is_alert}}{{{comparator}}} {{threshold}}B/mn ({{value}}B/mn){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}B/mn ({{value}}B/mn){{/is_warning}}"
   message = "${coalesce(var.scanned_bytes_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.scanned_bytes_timeframe}):default(avg:gcp.bigquery.query.scanned_bytes{${var.filter_tags}}, 0)
@@ -108,7 +108,7 @@ resource "datadog_monitor" "scanned_bytes_billed" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Scanned Bytes Billed {{#is_alert}}{{{comparator}}} {{threshold}}B/mn ({{value}}B/mn){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}B/mn ({{value}}B/mn){{/is_warning}}"
   message = "${coalesce(var.scanned_bytes_billed_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.scanned_bytes_billed_timeframe}):default(avg:gcp.bigquery.query.scanned_bytes_billed{${var.filter_tags}}, 0)
@@ -176,7 +176,7 @@ resource "datadog_monitor" "stored_bytes" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Stored Bytes {{#is_alert}}{{{comparator}}} {{threshold}}B ({{value}}B){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}B ({{value}}B){{/is_warning}}"
   message = "${coalesce(var.stored_bytes_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.stored_bytes_timeframe}):default(avg:gcp.bigquery.storage.stored_bytes{${var.filter_tags}} by {dataset_id,table}, 0)
@@ -244,7 +244,7 @@ resource "datadog_monitor" "uploaded_bytes" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Uploaded Bytes {{#is_alert}}{{{comparator}}} {{threshold}}B/mn ({{value}}B/mn){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}B/mn ({{value}}B/mn){{/is_warning}}"
   message = "${coalesce(var.uploaded_bytes_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.uploaded_bytes_timeframe}):default(avg:gcp.bigquery.storage.uploaded_bytes{${var.filter_tags}} by {dataset_id,table}, 0)
@@ -278,7 +278,7 @@ resource "datadog_monitor" "uploaded_bytes_billed" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Big Query Uploaded Bytes Billed {{#is_alert}}{{{comparator}}} {{threshold}}B/mn ({{value}}B/mn){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}B/mn ({{value}}B/mn){{/is_warning}}"
   message = "${coalesce(var.uploaded_bytes_billed_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   avg(${var.uploaded_bytes_billed_timeframe}):default(avg:gcp.bigquery.storage.uploaded_bytes_billed{${var.filter_tags}} by {dataset_id,table}, 0)
diff --git a/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf b/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf
index 95e95e2..c422129 100644
--- a/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf
+++ b/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "cpu_utilization" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Cloud SQL CPU Utilization {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_utilization_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.cpu_utilization_time_aggregator}(${var.cpu_utilization_timeframe}):
@@ -42,7 +42,7 @@ resource "datadog_monitor" "disk_utilization" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Cloud SQL Disk Utilization {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.disk_utilization_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.disk_utilization_time_aggregator}(${var.disk_utilization_timeframe}):
@@ -78,7 +78,7 @@ resource "datadog_monitor" "disk_utilization_forecast" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Cloud SQL Disk Utilization could reach {{#is_alert}}{{threshold}}%{{/is_alert}} in a near future"
   message = "${coalesce(var.disk_utilization_forecast_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.disk_utilization_forecast_time_aggregator}(${var.disk_utilization_forecast_timeframe}):
@@ -120,7 +120,7 @@ resource "datadog_monitor" "memory_utilization" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Cloud SQL Memory Utilization {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.memory_utilization_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.memory_utilization_time_aggregator}(${var.memory_utilization_timeframe}):
diff --git a/cloud/gcp/gce/instance/monitors-gce-instance.tf b/cloud/gcp/gce/instance/monitors-gce-instance.tf
index fb7ca01..b23d8c3 100644
--- a/cloud/gcp/gce/instance/monitors-gce-instance.tf
+++ b/cloud/gcp/gce/instance/monitors-gce-instance.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "cpu_utilization" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Compute Engine instance CPU Utilization {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.cpu_utilization_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.cpu_utilization_time_aggregator}(${var.cpu_utilization_timeframe}):
@@ -41,7 +41,7 @@ resource "datadog_monitor" "disk_throttled_bps" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Compute Engine instance Disk Throttled Bps {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.disk_throttled_bps_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.disk_throttled_bps_time_aggregator}(${var.disk_throttled_bps_timeframe}):
@@ -82,7 +82,7 @@ resource "datadog_monitor" "disk_throttled_ops" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Compute Engine instance Disk Throttled OPS {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.disk_throttled_ops_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.disk_throttled_ops_time_aggregator}(${var.disk_throttled_ops_timeframe}):
diff --git a/cloud/gcp/lb/monitors-lb.tf b/cloud/gcp/lb/monitors-lb.tf
index 3c08105..f623464 100644
--- a/cloud/gcp/lb/monitors-lb.tf
+++ b/cloud/gcp/lb/monitors-lb.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "error_rate_4xx" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP LB 4xx errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.error_rate_4xx_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.error_rate_4xx_time_aggregator}(${var.error_rate_4xx_timeframe}):
@@ -42,7 +42,7 @@ resource "datadog_monitor" "error_rate_5xx" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP LB 5xx errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.error_rate_5xx_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.error_rate_5xx_time_aggregator}(${var.error_rate_5xx_timeframe}):
@@ -78,7 +78,7 @@ resource "datadog_monitor" "backend_latency_service" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP LB service backend latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
   message = "${coalesce(var.backend_latency_service_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.backend_latency_service_time_aggregator}(${var.backend_latency_service_timeframe}):
@@ -113,7 +113,7 @@ resource "datadog_monitor" "backend_latency_bucket" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP LB bucket backend latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
   message = "${coalesce(var.backend_latency_bucket_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
   ${var.backend_latency_bucket_time_aggregator}(${var.backend_latency_bucket_timeframe}):
diff --git a/database/mongodb/monitors-mongo.tf b/database/mongodb/monitors-mongo.tf
index ac01fff..f251bf6 100644
--- a/database/mongodb/monitors-mongo.tf
+++ b/database/mongodb/monitors-mongo.tf
@@ -39,7 +39,7 @@ resource "datadog_monitor" "mongodb_secondary" {
     warning  = 0
   }
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   renotify_interval   = 0
diff --git a/database/mysql/monitors-mysql.tf b/database/mysql/monitors-mysql.tf
index 630a112..d599e88 100644
--- a/database/mysql/monitors-mysql.tf
+++ b/database/mysql/monitors-mysql.tf
@@ -31,7 +31,7 @@ resource "datadog_monitor" "mysql_connection" {
   count   = "${var.mysql_connection_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Mysql Connections limit {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.mysql_connection_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.mysql_connection_time_aggregator}(${var.mysql_connection_timeframe}): (
@@ -61,7 +61,7 @@ resource "datadog_monitor" "mysql_aborted" {
   count   = "${var.mysql_aborted_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Mysql Aborted connects {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.mysql_aborted_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.mysql_aborted_time_aggregator}(${var.mysql_aborted_timeframe}): (
@@ -91,7 +91,7 @@ resource "datadog_monitor" "mysql_slow" {
   count   = "${var.mysql_slow_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Mysql Slow queries {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.mysql_slow_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.mysql_slow_time_aggregator}(${var.mysql_slow_timeframe}): (
@@ -121,7 +121,7 @@ resource "datadog_monitor" "mysql_pool_efficiency" {
   count   = "${var.mysql_pool_efficiency_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Mysql Innodb buffer pool efficiency {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.mysql_pool_efficiency_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.mysql_pool_efficiency_time_aggregator}(${var.mysql_pool_efficiency_timeframe}): (
@@ -151,7 +151,7 @@ resource "datadog_monitor" "mysql_pool_utilization" {
   count   = "${var.mysql_pool_utilization_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Mysql Innodb buffer pool utilization {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.mysql_pool_utilization_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.mysql_pool_utilization_time_aggregator}(${var.mysql_pool_utilization_timeframe}):
diff --git a/database/postgresql/monitors-postgresql.tf b/database/postgresql/monitors-postgresql.tf
index 486d3e9..2612638 100644
--- a/database/postgresql/monitors-postgresql.tf
+++ b/database/postgresql/monitors-postgresql.tf
@@ -31,7 +31,7 @@ resource "datadog_monitor" "postgresql_connection_too_high" {
   count   = "${var.postgresql_connection_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] PostgreSQL Connections {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.postgresql_connection_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.postgresql_connection_time_aggregator}(${var.postgresql_connection_timeframe}):
@@ -60,7 +60,7 @@ resource "datadog_monitor" "postgresql_too_many_locks" {
   count   = "${var.postgresql_lock_enabled == "true" ? 1 : 0}"
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] PostgreSQL too many locks {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.postgresql_lock_message, var.message)}"
-  type    = "metric alert"
+  type    = "query alert"
 
   query = <<EOQ
     ${var.postgresql_lock_time_aggregator}(${var.postgresql_lock_timeframe}):
diff --git a/database/redis/monitors-redis.tf b/database/redis/monitors-redis.tf
index 1df119f..b2ce347 100644
--- a/database/redis/monitors-redis.tf
+++ b/database/redis/monitors-redis.tf
@@ -42,7 +42,7 @@ resource "datadog_monitor" "evicted_keys" {
      ) > ${var.evictedkeys_change_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.evictedkeys_change_threshold_warning}"
@@ -73,7 +73,7 @@ resource "datadog_monitor" "expirations" {
      ) > ${var.expirations_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.expirations_rate_threshold_warning}"
@@ -105,7 +105,7 @@ resource "datadog_monitor" "blocked_clients" {
      ) * 100 > ${var.blocked_clients_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.blocked_clients_threshold_warning}"
@@ -136,7 +136,7 @@ resource "datadog_monitor" "keyspace_full" {
      ) == ${var.keyspace_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.keyspace_threshold_warning}"
@@ -168,7 +168,7 @@ resource "datadog_monitor" "memory_used" {
      ) * 100 > ${var.mem_used_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.mem_used_threshold_warning}"
@@ -199,7 +199,7 @@ resource "datadog_monitor" "memory_frag" {
      * 100 > ${var.mem_frag_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.mem_frag_threshold_warning}"
@@ -230,7 +230,7 @@ resource "datadog_monitor" "rejected_connections" {
      ) > ${var.rejected_con_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.rejected_con_threshold_warning}"
@@ -261,7 +261,7 @@ resource "datadog_monitor" "latency" {
      ) > ${var.latency_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.latency_threshold_warning}"
@@ -294,7 +294,7 @@ resource "datadog_monitor" "hitrate" {
      ) * 100 < ${var.hitrate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.hitrate_threshold_warning}"
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index bbb70f9..464cd5e 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -32,7 +32,7 @@ resource "datadog_monitor" "php_fpm_connect_idle" {
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Php-fpm busy worker {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.php_fpm_busy_message, var.message)}"
 
-  type = "metric alert"
+  type = "query alert"
 
   query = <<EOQ
     ${var.php_fpm_busy_time_aggregator}(${var.php_fpm_busy_timeframe}): (
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index dcf91a0..b6dfb90 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "cpu" {
     ) > ${var.cpu_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.cpu_threshold_warning}"
@@ -39,7 +39,7 @@ resource "datadog_monitor" "load" {
     ) > ${var.load_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.load_threshold_warning}"
@@ -69,7 +69,7 @@ resource "datadog_monitor" "disk_space" {
     * 100 > ${var.disk_space_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.disk_space_threshold_warning}"
@@ -137,7 +137,7 @@ resource "datadog_monitor" "disk_inodes" {
     * 100 > ${var.disk_inodes_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.disk_inodes_threshold_warning}"
@@ -168,7 +168,7 @@ resource "datadog_monitor" "memory" {
     < ${var.memory_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.memory_threshold_warning}"