diff --git a/README.md b/README.md
index faa5ba1..0aa27ee 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Before importing some modules, you must define the DataDog provider in your `mai
 
 ```
 provider "datadog" {
-  version = "1.7.0" # if you use version before 1.0.4 you will have diff on monitor type
+  version = "2.0.2"
 
   api_key = "${var.datadog_api_key}"
   app_key = "${var.datadog_app_key}"
diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md
index d7ec1d5..1950b0c 100644
--- a/caas/kubernetes/ark/README.md
+++ b/caas/kubernetes/ark/README.md
@@ -26,7 +26,6 @@ Creates DataDog monitors with the following checks:
 | ark\_schedules\_extra\_tags | Extra tags for Ark schedules monitor | list | `[]` | no |
 | ark\_schedules\_monitor\_message | Custom message for Ark schedules monitor | string | `""` | no |
 | ark\_schedules\_monitor\_no\_data\_timeframe | No data timeframe in minutes | string | `"1440"` | no |
-| ark\_schedules\_monitor\_silenced | Groups to mute for Ark schedules monitor | map | `{}` | no |
 | ark\_schedules\_monitor\_timeframe | Monitor timeframe for Ark schedules monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1d"` | no |
 | environment | Architecture environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
index e390964..2e5d4cc 100644
--- a/caas/kubernetes/ark/inputs.tf
+++ b/caas/kubernetes/ark/inputs.tf
@@ -52,12 +52,6 @@ variable "ark_schedules_monitor_timeframe" {
   default     = "last_1d"
 }
 
-variable "ark_schedules_monitor_silenced" {
-  description = "Groups to mute for Ark schedules monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "ark_schedules_enabled" {
   description = "Flag to enable Ark schedules monitor"
   type        = "string"
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 38f30bd..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
@@ -25,6 +25,5 @@ resource "datadog_monitor" "ark_schedules_monitor" {
   locked              = false
   require_full_window = false
 
-  silenced = "${var.ark_schedules_monitor_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform", "${var.ark_schedules_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform", "${var.ark_schedules_extra_tags}"]
 }
diff --git a/caas/kubernetes/cluster/README.md b/caas/kubernetes/cluster/README.md
index 465dfca..21c1dc4 100644
--- a/caas/kubernetes/cluster/README.md
+++ b/caas/kubernetes/cluster/README.md
@@ -25,7 +25,6 @@ Creates DataDog monitors with the following checks:
 | apiserver\_enabled | Flag to enable API server monitor | string | `"true"` | no |
 | apiserver\_extra\_tags | Extra tags for API server monitor | list | `[]` | no |
 | apiserver\_message | Custom message for API server monitor | string | `""` | no |
-| apiserver\_silenced | Groups to mute for API server monitor | map | `{}` | no |
 | apiserver\_threshold\_warning | API server monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
diff --git a/caas/kubernetes/cluster/inputs.tf b/caas/kubernetes/cluster/inputs.tf
index ee2e84e..8f7cdb7 100644
--- a/caas/kubernetes/cluster/inputs.tf
+++ b/caas/kubernetes/cluster/inputs.tf
@@ -40,12 +40,6 @@ variable "prefix_slug" {
 
 # Datadog monitors variables
 
-variable "apiserver_silenced" {
-  description = "Groups to mute for API server monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "apiserver_enabled" {
   description = "Flag to enable API server monitor"
   type        = "string"
diff --git a/caas/kubernetes/cluster/monitors-k8s-cluster.tf b/caas/kubernetes/cluster/monitors-k8s-cluster.tf
index 6f8a55c..ea97fc5 100644
--- a/caas/kubernetes/cluster/monitors-k8s-cluster.tf
+++ b/caas/kubernetes/cluster/monitors-k8s-cluster.tf
@@ -23,7 +23,5 @@ resource "datadog_monitor" "apiserver" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.apiserver_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.apiserver_extra_tags}"]
 }
diff --git a/caas/kubernetes/ingress/vts/README.md b/caas/kubernetes/ingress/vts/README.md
index 65ac6fa..6ab32ac 100644
--- a/caas/kubernetes/ingress/vts/README.md
+++ b/caas/kubernetes/ingress/vts/README.md
@@ -32,7 +32,6 @@ Creates DataDog monitors with the following checks:
 | ingress\_4xx\_enabled | Flag to enable Ingress 4xx errors monitor | string | `"true"` | no |
 | ingress\_4xx\_extra\_tags | Extra tags for Ingress 4xx errors monitor | list | `[]` | no |
 | ingress\_4xx\_message | Message sent when an alert is triggered | string | `""` | no |
-| ingress\_4xx\_silenced | Groups to mute for Ingress 4xx errors monitor | map | `{}` | no |
 | ingress\_4xx\_threshold\_critical | 4xx critical threshold in percentage | string | `"40"` | no |
 | ingress\_4xx\_threshold\_warning | 4xx warning threshold in percentage | string | `"20"` | no |
 | ingress\_4xx\_time\_aggregator | Monitor aggregator for Ingress 4xx errors [available values: min, max or avg] | string | `"min"` | no |
@@ -40,7 +39,6 @@ Creates DataDog monitors with the following checks:
 | ingress\_5xx\_enabled | Flag to enable Ingress 5xx errors monitor | string | `"true"` | no |
 | ingress\_5xx\_extra\_tags | Extra tags for Ingress 5xx errors monitor | list | `[]` | no |
 | ingress\_5xx\_message | Message sent when an alert is triggered | string | `""` | no |
-| ingress\_5xx\_silenced | Groups to mute for Ingress 5xx errors monitor | map | `{}` | no |
 | ingress\_5xx\_threshold\_critical | 5xx critical threshold in percentage | string | `"20"` | no |
 | ingress\_5xx\_threshold\_warning | 5xx warning threshold in percentage | string | `"10"` | no |
 | ingress\_5xx\_time\_aggregator | Monitor aggregator for Ingress 5xx errors [available values: min, max or avg] | string | `"min"` | no |
diff --git a/caas/kubernetes/ingress/vts/inputs.tf b/caas/kubernetes/ingress/vts/inputs.tf
index f3de8ba..5a6377b 100644
--- a/caas/kubernetes/ingress/vts/inputs.tf
+++ b/caas/kubernetes/ingress/vts/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 #Ingress
-variable "ingress_5xx_silenced" {
-  description = "Groups to mute for Ingress 5xx errors monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "ingress_5xx_enabled" {
   description = "Flag to enable Ingress 5xx errors monitor"
@@ -87,12 +82,6 @@ variable "ingress_5xx_threshold_warning" {
   description = "5xx warning threshold in percentage"
 }
 
-variable "ingress_4xx_silenced" {
-  description = "Groups to mute for Ingress 4xx errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "ingress_4xx_enabled" {
   description = "Flag to enable Ingress 4xx errors monitor"
   type        = "string"
diff --git a/caas/kubernetes/ingress/vts/monitors-ingress.tf b/caas/kubernetes/ingress/vts/monitors-ingress.tf
index b5d944b..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}"
@@ -27,8 +27,6 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.ingress_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform", "${var.ingress_5xx_extra_tags}"]
 }
 
@@ -44,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}"
@@ -61,7 +59,5 @@ resource "datadog_monitor" "nginx_ingress_too_many_4xx" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.ingress_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform", "${var.ingress_4xx_extra_tags}"]
 }
diff --git a/caas/kubernetes/node/README.md b/caas/kubernetes/node/README.md
index 379135a..01e8d2a 100644
--- a/caas/kubernetes/node/README.md
+++ b/caas/kubernetes/node/README.md
@@ -34,12 +34,10 @@ Creates DataDog monitors with the following checks:
 | disk\_out\_enabled | Flag to enable Out of disk monitor | string | `"true"` | no |
 | disk\_out\_extra\_tags | Extra tags for Out of disk monitor | list | `[]` | no |
 | disk\_out\_message | Custom message for Out of disk monitor | string | `""` | no |
-| disk\_out\_silenced | Groups to mute for Out of disk monitor | map | `{}` | no |
 | disk\_out\_threshold\_warning | Out of disk monitor (warning threshold) | string | `"3"` | no |
 | disk\_pressure\_enabled | Flag to enable Disk pressure monitor | string | `"true"` | no |
 | disk\_pressure\_extra\_tags | Extra tags for Disk pressure monitor | list | `[]` | no |
 | disk\_pressure\_message | Custom message for Disk pressure monitor | string | `""` | no |
-| disk\_pressure\_silenced | Groups to mute for Disk pressure monitor | map | `{}` | no |
 | disk\_pressure\_threshold\_warning | Disk pressure monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
@@ -49,43 +47,36 @@ Creates DataDog monitors with the following checks:
 | kubelet\_ping\_enabled | Flag to enable Kubelet ping monitor | string | `"true"` | no |
 | kubelet\_ping\_extra\_tags | Extra tags for Kubelet ping monitor | list | `[]` | no |
 | kubelet\_ping\_message | Custom message for Kubelet ping monitor | string | `""` | no |
-| kubelet\_ping\_silenced | Groups to mute for Kubelet ping monitor | map | `{}` | no |
 | kubelet\_ping\_threshold\_warning | Kubelet ping monitor (warning threshold) | string | `"3"` | no |
 | kubelet\_syncloop\_enabled | Flag to enable Kubelet sync loop monitor | string | `"true"` | no |
 | kubelet\_syncloop\_extra\_tags | Extra tags for Kubelet sync loop monitor | list | `[]` | no |
 | kubelet\_syncloop\_message | Custom message for Kubelet sync loop monitor | string | `""` | no |
-| kubelet\_syncloop\_silenced | Groups to mute for Kubelet sync loop monitor | map | `{}` | no |
 | kubelet\_syncloop\_threshold\_warning | Kubelet sync loop monitor (warning threshold) | string | `"3"` | no |
 | memory\_pressure\_enabled | Flag to enable Memory pressure monitor | string | `"true"` | no |
 | memory\_pressure\_extra\_tags | Extra tags for Memory pressure monitor | list | `[]` | no |
 | memory\_pressure\_message | Custom message for Memory pressure monitor | string | `""` | no |
-| memory\_pressure\_silenced | Groups to mute for Memory pressure monitor | map | `{}` | no |
 | memory\_pressure\_threshold\_warning | Memory pressure monitor (warning threshold) | string | `"3"` | no |
 | message | Message sent when a monitor is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | node\_unschedulable\_enabled | Flag to enable node unschedulable monitor | string | `"true"` | no |
 | node\_unschedulable\_extra\_tags | Extra tags for node unschedulable monitor | list | `[]` | no |
 | node\_unschedulable\_message | Custom message for node unschedulable monitor | string | `""` | no |
-| node\_unschedulable\_silenced | Groups to mute for node unschedulable monitor | map | `{}` | no |
 | node\_unschedulable\_time\_aggregator | Monitor aggregator for node unschedulable [available values: min, max or avg] | string | `"min"` | no |
 | node\_unschedulable\_timeframe | Monitor timeframe for node unschedulable [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1h"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | ready\_enabled | Flag to enable Node ready monitor | string | `"true"` | no |
 | ready\_extra\_tags | Extra tags for Node ready monitor | list | `[]` | no |
 | ready\_message | Custom message for Node ready monitor | string | `""` | no |
-| ready\_silenced | Groups to mute for Node ready monitor | map | `{}` | no |
 | ready\_threshold\_warning | Node ready monitor (warning threshold) | string | `"3"` | no |
 | unregister\_net\_device\_enabled | Flag to enable Unregister net device monitor | string | `"true"` | no |
 | unregister\_net\_device\_extra\_tags | Extra tags for Unregister net device monitor | list | `[]` | no |
 | unregister\_net\_device\_message | Custom message for Unregister net device monitor | string | `""` | no |
-| unregister\_net\_device\_silenced | Groups to mute for Unregister net device monitor | map | `{}` | no |
 | unregister\_net\_device\_threshold\_critical | Unregister net device critical threshold | string | `"3"` | no |
 | unregister\_net\_device\_time\_aggregator | Monitor aggregator for Unregister net device [available values: min, max or avg] | string | `"min"` | no |
 | unregister\_net\_device\_timeframe | Monitor timeframe for Unregister net device [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"15m"` | no |
 | volume\_inodes\_enabled | Flag to enable Volume inodes monitor | string | `"true"` | no |
 | volume\_inodes\_extra\_tags | Extra tags for Volume inodes monitor | list | `[]` | no |
 | volume\_inodes\_message | Custom message for Volume inodes monitor | string | `""` | no |
-| volume\_inodes\_silenced | Groups to mute for Volume inodes monitor | map | `{}` | no |
 | volume\_inodes\_threshold\_critical | Volume inodes critical threshold | string | `"95"` | no |
 | volume\_inodes\_threshold\_warning | Volume inodes warning threshold | string | `"90"` | no |
 | volume\_inodes\_time\_aggregator | Monitor aggregator for Volume inodes [available values: min, max or avg] | string | `"min"` | no |
@@ -93,7 +84,6 @@ Creates DataDog monitors with the following checks:
 | volume\_space\_enabled | Flag to enable Volume space monitor | string | `"true"` | no |
 | volume\_space\_extra\_tags | Extra tags for Volume space monitor | list | `[]` | no |
 | volume\_space\_message | Custom message for Volume space monitor | string | `""` | no |
-| volume\_space\_silenced | Groups to mute for Volume space monitor | map | `{}` | no |
 | volume\_space\_threshold\_critical | Volume space critical threshold | string | `"95"` | no |
 | volume\_space\_threshold\_warning | Volume space warning threshold | string | `"90"` | no |
 | volume\_space\_time\_aggregator | Monitor aggregator for Volume space [available values: min, max or avg] | string | `"min"` | no |
diff --git a/caas/kubernetes/node/inputs.tf b/caas/kubernetes/node/inputs.tf
index 6084ab8..02f8148 100644
--- a/caas/kubernetes/node/inputs.tf
+++ b/caas/kubernetes/node/inputs.tf
@@ -40,12 +40,6 @@ variable "prefix_slug" {
 
 # Datadog monitors variables
 
-variable "disk_pressure_silenced" {
-  description = "Groups to mute for Disk pressure monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_pressure_enabled" {
   description = "Flag to enable Disk pressure monitor"
   type        = "string"
@@ -70,12 +64,6 @@ variable "disk_pressure_threshold_warning" {
   default     = 3
 }
 
-variable "disk_out_silenced" {
-  description = "Groups to mute for Out of disk monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_out_enabled" {
   description = "Flag to enable Out of disk monitor"
   type        = "string"
@@ -100,12 +88,6 @@ variable "disk_out_threshold_warning" {
   default     = 3
 }
 
-variable "memory_pressure_silenced" {
-  description = "Groups to mute for Memory pressure monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_pressure_enabled" {
   description = "Flag to enable Memory pressure monitor"
   type        = "string"
@@ -130,12 +112,6 @@ variable "memory_pressure_threshold_warning" {
   default     = 3
 }
 
-variable "ready_silenced" {
-  description = "Groups to mute for Node ready monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "ready_enabled" {
   description = "Flag to enable Node ready monitor"
   type        = "string"
@@ -160,12 +136,6 @@ variable "ready_threshold_warning" {
   default     = 3
 }
 
-variable "kubelet_ping_silenced" {
-  description = "Groups to mute for Kubelet ping monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "kubelet_ping_enabled" {
   description = "Flag to enable Kubelet ping monitor"
   type        = "string"
@@ -190,12 +160,6 @@ variable "kubelet_ping_threshold_warning" {
   default     = 3
 }
 
-variable "kubelet_syncloop_silenced" {
-  description = "Groups to mute for Kubelet sync loop monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "kubelet_syncloop_enabled" {
   description = "Flag to enable Kubelet sync loop monitor"
   type        = "string"
@@ -220,12 +184,6 @@ variable "kubelet_syncloop_threshold_warning" {
   default     = 3
 }
 
-variable "unregister_net_device_silenced" {
-  description = "Groups to mute for Unregister net device monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "unregister_net_device_enabled" {
   description = "Flag to enable Unregister net device monitor"
   type        = "string"
@@ -261,12 +219,6 @@ variable "unregister_net_device_threshold_critical" {
   description = "Unregister net device critical threshold"
 }
 
-variable "node_unschedulable_silenced" {
-  description = "Groups to mute for node unschedulable monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "node_unschedulable_enabled" {
   description = "Flag to enable node unschedulable monitor"
   type        = "string"
@@ -297,12 +249,6 @@ variable "node_unschedulable_timeframe" {
   default     = "last_1h"
 }
 
-variable "volume_space_silenced" {
-  description = "Groups to mute for Volume space monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "volume_space_enabled" {
   description = "Flag to enable Volume space monitor"
   type        = "string"
@@ -343,12 +289,6 @@ variable "volume_space_threshold_warning" {
   description = "Volume space warning threshold"
 }
 
-variable "volume_inodes_silenced" {
-  description = "Groups to mute for Volume inodes monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "volume_inodes_enabled" {
   description = "Flag to enable Volume inodes monitor"
   type        = "string"
diff --git a/caas/kubernetes/node/monitors-k8s-node.tf b/caas/kubernetes/node/monitors-k8s-node.tf
index 5db12c1..cca6ed1 100644
--- a/caas/kubernetes/node/monitors-k8s-node.tf
+++ b/caas/kubernetes/node/monitors-k8s-node.tf
@@ -23,8 +23,6 @@ resource "datadog_monitor" "disk_pressure" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.disk_pressure_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.disk_pressure_extra_tags}"]
 }
 
@@ -53,8 +51,6 @@ resource "datadog_monitor" "disk_out" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.disk_out_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.disk_out_extra_tags}"]
 }
 
@@ -83,8 +79,6 @@ resource "datadog_monitor" "memory_pressure" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.memory_pressure_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.memory_pressure_extra_tags}"]
 }
 
@@ -113,8 +107,6 @@ resource "datadog_monitor" "ready" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.ready_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.ready_extra_tags}"]
 }
 
@@ -143,8 +135,6 @@ resource "datadog_monitor" "kubelet_ping" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.kubelet_ping_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.kubelet_ping_extra_tags}"]
 }
 
@@ -173,8 +163,6 @@ resource "datadog_monitor" "kubelet_syncloop" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.kubelet_syncloop_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.kubelet_syncloop_extra_tags}"]
 }
 
@@ -197,8 +185,7 @@ resource "datadog_monitor" "unregister_net_device" {
   include_tags      = true
   locked            = false
 
-  silenced = "${var.unregister_net_device_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.unregister_net_device_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.unregister_net_device_extra_tags}"]
 }
 
 resource "datadog_monitor" "node_unschedulable" {
@@ -228,14 +215,13 @@ resource "datadog_monitor" "node_unschedulable" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.node_unschedulable_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.node_unschedulable_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.node_unschedulable_extra_tags}"]
 }
 
 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
@@ -261,14 +247,13 @@ resource "datadog_monitor" "volume_space" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.volume_space_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.volume_space_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.volume_space_extra_tags}"]
 }
 
 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
@@ -294,6 +279,5 @@ resource "datadog_monitor" "volume_inodes" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.volume_inodes_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.volume_inodes_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-node", "team:claranet", "created-by:terraform", "${var.volume_inodes_extra_tags}"]
 }
diff --git a/caas/kubernetes/pod/README.md b/caas/kubernetes/pod/README.md
index 50d0946..91c7366 100644
--- a/caas/kubernetes/pod/README.md
+++ b/caas/kubernetes/pod/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | error\_enabled | Flag to enable Pod errors monitor | string | `"true"` | no |
 | error\_extra\_tags | Extra tags for Pod errors monitor | list | `[]` | no |
 | error\_message | Custom message for Pod errors monitor | string | `""` | no |
-| error\_silenced | Groups to mute for Pod errors monitor | map | `{}` | no |
 | error\_threshold\_critical | error critical threshold | string | `"0.5"` | no |
 | error\_threshold\_warning | error warning threshold | string | `"0"` | no |
 | error\_time\_aggregator | Monitor aggregator for Pod errors [available values: min, max or avg] | string | `"sum"` | no |
@@ -41,7 +40,6 @@ Creates DataDog monitors with the following checks:
 | pod\_phase\_status\_enabled | Flag to enable Pod phase status monitor | string | `"true"` | no |
 | pod\_phase\_status\_extra\_tags | Extra tags for Pod phase status monitor | list | `[]` | no |
 | pod\_phase\_status\_message | Custom message for Pod phase status monitor | string | `""` | no |
-| pod\_phase\_status\_silenced | Groups to mute for Pod phase status monitor | map | `{}` | no |
 | pod\_phase\_status\_time\_aggregator | Monitor aggregator for Pod phase status [available values: min, max or avg] | string | `"max"` | no |
 | pod\_phase\_status\_timeframe | Monitor timeframe for Pod phase status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
diff --git a/caas/kubernetes/pod/inputs.tf b/caas/kubernetes/pod/inputs.tf
index 0c9ef8e..69b56af 100644
--- a/caas/kubernetes/pod/inputs.tf
+++ b/caas/kubernetes/pod/inputs.tf
@@ -40,12 +40,6 @@ variable "prefix_slug" {
 
 # Datadog monitors variables
 
-variable "pod_phase_status_silenced" {
-  description = "Groups to mute for Pod phase status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "pod_phase_status_enabled" {
   description = "Flag to enable Pod phase status monitor"
   type        = "string"
@@ -76,12 +70,6 @@ variable "pod_phase_status_timeframe" {
   default     = "last_5m"
 }
 
-variable "error_silenced" {
-  description = "Groups to mute for Pod errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "error_enabled" {
   description = "Flag to enable Pod errors monitor"
   type        = "string"
diff --git a/caas/kubernetes/pod/monitors-k8s-pod.tf b/caas/kubernetes/pod/monitors-k8s-pod.tf
index e760f56..2ca4830 100644
--- a/caas/kubernetes/pod/monitors-k8s-pod.tf
+++ b/caas/kubernetes/pod/monitors-k8s-pod.tf
@@ -24,14 +24,13 @@ resource "datadog_monitor" "pod_phase_status" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.pod_phase_status_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform", "${var.pod_phase_status_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform", "${var.pod_phase_status_extra_tags}"]
 }
 
 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
@@ -56,6 +55,5 @@ resource "datadog_monitor" "error" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.error_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform", "${var.error_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-pod", "team:claranet", "created-by:terraform", "${var.error_extra_tags}"]
 }
diff --git a/caas/kubernetes/workload/README.md b/caas/kubernetes/workload/README.md
index cb2f4a6..f377c9e 100644
--- a/caas/kubernetes/workload/README.md
+++ b/caas/kubernetes/workload/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | cronjob\_enabled | Flag to enable Cronjob monitor | string | `"true"` | no |
 | cronjob\_extra\_tags | Extra tags for Cronjob monitor | list | `[]` | no |
 | cronjob\_message | Custom message for Cronjob monitor | string | `""` | no |
-| cronjob\_silenced | Groups to mute for Cronjob monitor | map | `{}` | no |
 | cronjob\_threshold\_warning | Cronjob monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
@@ -39,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | job\_enabled | Flag to enable Job monitor | string | `"true"` | no |
 | job\_extra\_tags | Extra tags for Job monitor | list | `[]` | no |
 | job\_message | Custom message for Job monitor | string | `""` | no |
-| job\_silenced | Groups to mute for Job monitor | map | `{}` | no |
 | job\_threshold\_warning | Job monitor (warning threshold) | string | `"3"` | no |
 | message | Message sent when a monitor is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
@@ -47,21 +45,18 @@ Creates DataDog monitors with the following checks:
 | replica\_available\_enabled | Flag to enable Available replica monitor | string | `"true"` | no |
 | replica\_available\_extra\_tags | Extra tags for Available replicamonitor | list | `[]` | no |
 | replica\_available\_message | Custom message for Available replica monitor | string | `""` | no |
-| replica\_available\_silenced | Groups to mute for Available replica monitor | map | `{}` | no |
 | replica\_available\_threshold\_critical | Available replica critical threshold | string | `"1"` | no |
 | replica\_available\_time\_aggregator | Monitor aggregator for Available replica [available values: min, max or avg] | string | `"max"` | no |
 | replica\_available\_timeframe | Monitor timeframe for Available replica [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
 | replica\_current\_enabled | Flag to enable Current replica monitor | string | `"true"` | no |
 | replica\_current\_extra\_tags | Extra tags for Current replica monitor | list | `[]` | no |
 | replica\_current\_message | Custom message for Current replica monitor | string | `""` | no |
-| replica\_current\_silenced | Groups to mute for Current replica monitor | map | `{}` | no |
 | replica\_current\_threshold\_critical | Current replica critical threshold | string | `"1"` | no |
 | replica\_current\_time\_aggregator | Monitor aggregator for Current replica [available values: min, max or avg] | string | `"max"` | no |
 | replica\_current\_timeframe | Monitor timeframe for Current replica [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
 | replica\_ready\_enabled | Flag to enable Ready replica monitor | string | `"true"` | no |
 | replica\_ready\_extra\_tags | Extra tags for Ready replica monitor | list | `[]` | no |
 | replica\_ready\_message | Custom message for Ready replica monitor | string | `""` | no |
-| replica\_ready\_silenced | Groups to mute for Ready replica monitor | map | `{}` | no |
 | replica\_ready\_threshold\_critical | Ready replica critical threshold | string | `"1"` | no |
 | replica\_ready\_time\_aggregator | Monitor aggregator for Ready replica [available values: min, max or avg] | string | `"max"` | no |
 | replica\_ready\_timeframe | Monitor timeframe for Ready replica [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
diff --git a/caas/kubernetes/workload/inputs.tf b/caas/kubernetes/workload/inputs.tf
index 0956509..25d2a7e 100644
--- a/caas/kubernetes/workload/inputs.tf
+++ b/caas/kubernetes/workload/inputs.tf
@@ -40,12 +40,6 @@ variable "prefix_slug" {
 
 # Datadog monitors variables
 
-variable "job_silenced" {
-  description = "Groups to mute for Job monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "job_enabled" {
   description = "Flag to enable Job monitor"
   type        = "string"
@@ -70,12 +64,6 @@ variable "job_threshold_warning" {
   default     = 3
 }
 
-variable "cronjob_silenced" {
-  description = "Groups to mute for Cronjob monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cronjob_enabled" {
   description = "Flag to enable Cronjob monitor"
   type        = "string"
@@ -100,12 +88,6 @@ variable "cronjob_threshold_warning" {
   default     = 3
 }
 
-variable "replica_available_silenced" {
-  description = "Groups to mute for Available replica monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replica_available_enabled" {
   description = "Flag to enable Available replica monitor"
   type        = "string"
@@ -141,12 +123,6 @@ variable "replica_available_threshold_critical" {
   description = "Available replica critical threshold"
 }
 
-variable "replica_ready_silenced" {
-  description = "Groups to mute for Ready replica monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replica_ready_enabled" {
   description = "Flag to enable Ready replica monitor"
   type        = "string"
@@ -182,12 +158,6 @@ variable "replica_ready_threshold_critical" {
   description = "Ready replica critical threshold"
 }
 
-variable "replica_current_silenced" {
-  description = "Groups to mute for Current replica monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replica_current_enabled" {
   description = "Flag to enable Current replica monitor"
   type        = "string"
diff --git a/caas/kubernetes/workload/monitors-k8s-workload.tf b/caas/kubernetes/workload/monitors-k8s-workload.tf
index 8a0c87f..bcfdcb6 100644
--- a/caas/kubernetes/workload/monitors-k8s-workload.tf
+++ b/caas/kubernetes/workload/monitors-k8s-workload.tf
@@ -23,8 +23,6 @@ resource "datadog_monitor" "job" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.job_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.job_extra_tags}"]
 }
 
@@ -53,15 +51,13 @@ resource "datadog_monitor" "cronjob" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.cronjob_silenced}"
-
   tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.cronjob_extra_tags}"]
 }
 
 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
@@ -86,14 +82,13 @@ resource "datadog_monitor" "replica_available" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.replica_available_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_available_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_available_extra_tags}"]
 }
 
 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
@@ -118,14 +113,13 @@ resource "datadog_monitor" "replica_ready" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.replica_ready_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_ready_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_ready_extra_tags}"]
 }
 
 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
@@ -150,6 +144,5 @@ resource "datadog_monitor" "replica_current" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.replica_current_silenced}"
-  tags     = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_current_extra_tags}"]
+  tags = ["env:${var.environment}", "type:caas", "provider:kubernetes", "resource:kubernetes-workload", "team:claranet", "created-by:terraform", "${var.replica_current_extra_tags}"]
 }
diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md
index a0c0991..7c07fdf 100644
--- a/cloud/aws/alb/README.md
+++ b/cloud/aws/alb/README.md
@@ -30,7 +30,6 @@ Creates DataDog monitors with the following checks:
 | alb\_no\_healthy\_instances\_enabled | Flag to enable ALB no healthy instances monitor | string | `"true"` | no |
 | alb\_no\_healthy\_instances\_extra\_tags | Extra tags for ALB no healthy instances monitor | list | `[]` | no |
 | alb\_no\_healthy\_instances\_message | Custom message for ALB no healthy instances monitor | string | `""` | no |
-| alb\_no\_healthy\_instances\_silenced | Groups to mute for ALB no healthy instances monitor | map | `{}` | no |
 | alb\_no\_healthy\_instances\_time\_aggregator | Monitor aggregator for ALB no healthy instances [available values: min, max or avg] | string | `"min"` | no |
 | alb\_no\_healthy\_instances\_timeframe | Monitor timeframe for ALB no healthy instances [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | artificial\_requests\_count | Number of false requests used to mitigate false positive in case of low trafic | string | `"5"` | no |
@@ -42,7 +41,6 @@ Creates DataDog monitors with the following checks:
 | httpcode\_alb\_4xx\_enabled | Flag to enable ALB httpcode 4xx monitor | string | `"true"` | no |
 | httpcode\_alb\_4xx\_extra\_tags | Extra tags for ALB httpcode 4xx monitor | list | `[]` | no |
 | httpcode\_alb\_4xx\_message | Custom message for ALB httpcode 4xx monitor | string | `""` | no |
-| httpcode\_alb\_4xx\_silenced | Groups to mute for ALB httpcode 4xx monitor | map | `{}` | no |
 | httpcode\_alb\_4xx\_threshold\_critical | loadbalancer 4xx critical threshold in percentage | string | `"80"` | no |
 | httpcode\_alb\_4xx\_threshold\_warning | loadbalancer 4xx warning threshold in percentage | string | `"60"` | no |
 | httpcode\_alb\_4xx\_time\_aggregator | Monitor aggregator for ALB httpcode 4xx [available values: min, max or avg] | string | `"min"` | no |
@@ -50,7 +48,6 @@ Creates DataDog monitors with the following checks:
 | httpcode\_alb\_5xx\_enabled | Flag to enable ALB httpcode 5xx monitor | string | `"true"` | no |
 | httpcode\_alb\_5xx\_extra\_tags | Extra tags for ALB httpcode 5xx monitor | list | `[]` | no |
 | httpcode\_alb\_5xx\_message | Custom message for ALB httpcode 5xx monitor | string | `""` | no |
-| httpcode\_alb\_5xx\_silenced | Groups to mute for ALB httpcode 5xx monitor | map | `{}` | no |
 | httpcode\_alb\_5xx\_threshold\_critical | loadbalancer 5xx critical threshold in percentage | string | `"80"` | no |
 | httpcode\_alb\_5xx\_threshold\_warning | loadbalancer 5xx warning threshold in percentage | string | `"60"` | no |
 | httpcode\_alb\_5xx\_time\_aggregator | Monitor aggregator for ALB httpcode 5xx [available values: min, max or avg] | string | `"min"` | no |
@@ -58,7 +55,6 @@ Creates DataDog monitors with the following checks:
 | httpcode\_target\_4xx\_enabled | Flag to enable ALB target httpcode 4xx monitor | string | `"true"` | no |
 | httpcode\_target\_4xx\_extra\_tags | Extra tags for ALB target httpcode 4xx monitor | list | `[]` | no |
 | httpcode\_target\_4xx\_message | Custom message for ALB target httpcode 4xx monitor | string | `""` | no |
-| httpcode\_target\_4xx\_silenced | Groups to mute for ALB target httpcode 4xx monitor | map | `{}` | no |
 | httpcode\_target\_4xx\_threshold\_critical | target 4xx critical threshold in percentage | string | `"80"` | no |
 | httpcode\_target\_4xx\_threshold\_warning | target 4xx warning threshold in percentage | string | `"60"` | no |
 | httpcode\_target\_4xx\_time\_aggregator | Monitor aggregator for ALB target httpcode 4xx [available values: min, max or avg] | string | `"min"` | no |
@@ -66,7 +62,6 @@ Creates DataDog monitors with the following checks:
 | httpcode\_target\_5xx\_enabled | Flag to enable ALB target httpcode 5xx monitor | string | `"true"` | no |
 | httpcode\_target\_5xx\_extra\_tags | Extra tags for ALB target httpcode 5xx monitor | list | `[]` | no |
 | httpcode\_target\_5xx\_message | Custom message for ALB target httpcode 5xx monitor | string | `""` | no |
-| httpcode\_target\_5xx\_silenced | Groups to mute for ALB target httpcode 5xx monitor | map | `{}` | no |
 | httpcode\_target\_5xx\_threshold\_critical | target 5xx critical threshold in percentage | string | `"80"` | no |
 | httpcode\_target\_5xx\_threshold\_warning | target 5xx warning threshold in percentage | string | `"60"` | no |
 | httpcode\_target\_5xx\_time\_aggregator | Monitor aggregator for ALB target httpcode 5xx [available values: min, max or avg] | string | `"min"` | no |
@@ -74,7 +69,6 @@ Creates DataDog monitors with the following checks:
 | latency\_enabled | Flag to enable ALB latency monitor | string | `"true"` | no |
 | latency\_extra\_tags | Extra tags for ALB latency monitor | list | `[]` | no |
 | latency\_message | Custom message for ALB latency monitor | string | `""` | no |
-| latency\_silenced | Groups to mute for ALB latency monitor | map | `{}` | no |
 | latency\_threshold\_critical | latency critical threshold in milliseconds | string | `"1000"` | no |
 | latency\_threshold\_warning | latency warning threshold in milliseconds | string | `"500"` | no |
 | latency\_time\_aggregator | Monitor aggregator for ALB latency [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf
index 270caf8..d666ea5 100644
--- a/cloud/aws/alb/inputs.tf
+++ b/cloud/aws/alb/inputs.tf
@@ -41,12 +41,6 @@ variable "prefix_slug" {
 
 # Datadog monitors variables
 
-variable "alb_no_healthy_instances_silenced" {
-  description = "Groups to mute for ALB no healthy instances monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "alb_no_healthy_instances_enabled" {
   description = "Flag to enable ALB no healthy instances monitor"
   type        = "string"
@@ -77,12 +71,6 @@ variable "alb_no_healthy_instances_timeframe" {
   default     = "last_5m"
 }
 
-variable "latency_silenced" {
-  description = "Groups to mute for ALB latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "latency_enabled" {
   description = "Flag to enable ALB latency monitor"
   type        = "string"
@@ -123,12 +111,6 @@ variable "latency_threshold_warning" {
   description = "latency warning threshold in milliseconds"
 }
 
-variable "httpcode_alb_4xx_silenced" {
-  description = "Groups to mute for ALB httpcode 4xx monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "httpcode_alb_4xx_enabled" {
   description = "Flag to enable ALB httpcode 4xx monitor"
   type        = "string"
@@ -169,12 +151,6 @@ variable "httpcode_alb_4xx_threshold_warning" {
   description = "loadbalancer 4xx warning threshold in percentage"
 }
 
-variable "httpcode_target_4xx_silenced" {
-  description = "Groups to mute for ALB target httpcode 4xx monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "httpcode_target_4xx_enabled" {
   description = "Flag to enable ALB target httpcode 4xx monitor"
   type        = "string"
@@ -215,12 +191,6 @@ variable "httpcode_target_4xx_threshold_warning" {
   description = "target 4xx warning threshold in percentage"
 }
 
-variable "httpcode_alb_5xx_silenced" {
-  description = "Groups to mute for ALB httpcode 5xx monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "httpcode_alb_5xx_enabled" {
   description = "Flag to enable ALB httpcode 5xx monitor"
   type        = "string"
@@ -261,12 +231,6 @@ variable "httpcode_alb_5xx_threshold_warning" {
   description = "loadbalancer 5xx warning threshold in percentage"
 }
 
-variable "httpcode_target_5xx_silenced" {
-  description = "Groups to mute for ALB target httpcode 5xx monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "httpcode_target_5xx_enabled" {
   description = "Flag to enable ALB target httpcode 5xx monitor"
   type        = "string"
diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf
index 786e209..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
@@ -26,15 +26,13 @@ resource "datadog_monitor" "ALB_no_healthy_instances" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.alb_no_healthy_instances_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.alb_no_healthy_instances_extra_tags}"]
 }
 
 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
@@ -57,15 +55,13 @@ resource "datadog_monitor" "ALB_latency" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.latency_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.latency_extra_tags}"]
 }
 
 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
@@ -89,15 +85,13 @@ resource "datadog_monitor" "ALB_httpcode_5xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_alb_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.httpcode_alb_5xx_extra_tags}"]
 }
 
 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,15 +115,13 @@ resource "datadog_monitor" "ALB_httpcode_4xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_alb_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.httpcode_alb_4xx_extra_tags}"]
 }
 
 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
@@ -153,15 +145,13 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_target_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.httpcode_target_5xx_extra_tags}"]
 }
 
 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
@@ -185,7 +175,5 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.httpcode_target_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:alb", "team:claranet", "created-by:terraform", "${var.httpcode_target_4xx_extra_tags}"]
 }
diff --git a/cloud/aws/apigateway/README.md b/cloud/aws/apigateway/README.md
index 382ee10..1a0206b 100644
--- a/cloud/aws/apigateway/README.md
+++ b/cloud/aws/apigateway/README.md
@@ -31,7 +31,6 @@ Creates DataDog monitors with the following checks:
 | http\_4xx\_requests\_enabled | Flag to enable API Gateway HTTP 4xx requests monitor | string | `"true"` | no |
 | http\_4xx\_requests\_extra\_tags | Extra tags for API Gateway HTTP 4xx requests monitor | list | `[]` | no |
 | http\_4xx\_requests\_message | Custom message for API Gateway HTTP 4xx requests monitor | string | `""` | no |
-| http\_4xx\_requests\_silenced | Groups to mute for API Gateway HTTP 4xx requests monitor | map | `{}` | no |
 | http\_4xx\_requests\_threshold\_critical | Maximum critical acceptable percent of 4xx errors | string | `"30"` | no |
 | http\_4xx\_requests\_threshold\_warning | Maximum warning acceptable percent of 4xx errors | string | `"15"` | no |
 | http\_4xx\_requests\_time\_aggregator | Monitor aggregator for API HTTP 4xx requests [available values: min, max or avg] | string | `"min"` | no |
@@ -39,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | http\_5xx\_requests\_enabled | Flag to enable API Gateway HTTP 5xx requests monitor | string | `"true"` | no |
 | http\_5xx\_requests\_extra\_tags | Extra tags for API Gateway HTTP 5xx requests monitor | list | `[]` | no |
 | http\_5xx\_requests\_message | Custom message for API Gateway HTTP 5xx requests monitor | string | `""` | no |
-| http\_5xx\_requests\_silenced | Groups to mute for API Gateway HTTP 5xx requests monitor | map | `{}` | no |
 | http\_5xx\_requests\_threshold\_critical | Maximum critical acceptable percent of 5xx errors | string | `"20"` | no |
 | http\_5xx\_requests\_threshold\_warning | Maximum warning acceptable percent of 5xx errors | string | `"10"` | no |
 | http\_5xx\_requests\_time\_aggregator | Monitor aggregator for API HTTP 5xx requests [available values: min, max or avg] | string | `"min"` | no |
@@ -47,7 +45,6 @@ Creates DataDog monitors with the following checks:
 | latency\_enabled | Flag to enable API Gateway latency monitor | string | `"true"` | no |
 | latency\_extra\_tags | Extra tags for API Gateway latency monitor | list | `[]` | no |
 | latency\_message | Custom message for API Gateway latency monitor | string | `""` | no |
-| latency\_silenced | Groups to mute for API Gateway latency monitor | map | `{}` | no |
 | latency\_threshold\_critical | Alerting threshold in milliseconds | string | `"800"` | no |
 | latency\_threshold\_warning | Warning threshold in milliseconds | string | `"400"` | no |
 | latency\_time\_aggregator | Monitor aggregator for API Gateway latency [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/aws/apigateway/inputs.tf b/cloud/aws/apigateway/inputs.tf
index b37cf4a..b572377 100644
--- a/cloud/aws/apigateway/inputs.tf
+++ b/cloud/aws/apigateway/inputs.tf
@@ -31,12 +31,6 @@ variable "prefix_slug" {
 ###   LATENCY VARIABLES   ###
 ###################################
 
-variable "latency_silenced" {
-  description = "Groups to mute for API Gateway latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "latency_enabled" {
   description = "Flag to enable API Gateway latency monitor"
   type        = "string"
@@ -81,12 +75,6 @@ variable "latency_threshold_warning" {
 ###   HTTP 5xx status pages   ###
 #################################
 
-variable "http_5xx_requests_silenced" {
-  description = "Groups to mute for API Gateway HTTP 5xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_5xx_requests_enabled" {
   description = "Flag to enable API Gateway HTTP 5xx requests monitor"
   type        = "string"
@@ -131,12 +119,6 @@ variable "http_5xx_requests_threshold_warning" {
 ###   HTTP 4xx status pages   ###
 #################################
 
-variable "http_4xx_requests_silenced" {
-  description = "Groups to mute for API Gateway HTTP 4xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_4xx_requests_enabled" {
   description = "Flag to enable API Gateway HTTP 4xx requests monitor"
   type        = "string"
diff --git a/cloud/aws/apigateway/monitors-api.tf b/cloud/aws/apigateway/monitors-api.tf
index d12e10a..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
@@ -25,8 +25,6 @@ resource "datadog_monitor" "API_Gateway_latency" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.latency_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform", "${var.latency_extra_tags}"]
 }
 
@@ -34,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
@@ -58,8 +56,6 @@ resource "datadog_monitor" "API_http_5xx_errors_count" {
   timeout_h           = 1
   include_tags        = true
 
-  silenced = "${var.http_5xx_requests_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform", "${var.http_5xx_requests_extra_tags}"]
 }
 
@@ -67,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
@@ -91,7 +87,5 @@ resource "datadog_monitor" "API_http_4xx_errors_count" {
   timeout_h           = 1
   include_tags        = true
 
-  silenced = "${var.http_4xx_requests_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:apigateway", "team:claranet", "created-by:terraform", "${var.http_4xx_requests_extra_tags}"]
 }
diff --git a/cloud/aws/elasticache/common/README.md b/cloud/aws/elasticache/common/README.md
index eaca25e..bfb099f 100644
--- a/cloud/aws/elasticache/common/README.md
+++ b/cloud/aws/elasticache/common/README.md
@@ -35,12 +35,10 @@ Creates DataDog monitors with the following checks:
 | eviction\_growing\_enabled | Flag to enable Elasticache eviction growing monitor | string | `"true"` | no |
 | eviction\_growing\_extra\_tags | Extra tags for Elasticache eviction growing monitor | list | `[]` | no |
 | eviction\_growing\_message | Custom message for Elasticache eviction growing monitor | string | `""` | no |
-| eviction\_growing\_silenced | Groups to mute for Elasticache eviction growing monitor | map | `{}` | no |
 | eviction\_growing\_threshold\_critical | Elasticache eviction growing critical threshold in percentage | string | `"30"` | no |
 | eviction\_growing\_threshold\_warning | Elasticache eviction growing warning threshold in percentage | string | `"10"` | no |
 | eviction\_growing\_timeframe | Monitor timeframe for Elasticache eviction growing [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | eviction\_message | Custom message for Elasticache eviction monitor | string | `""` | no |
-| eviction\_silenced | Groups to mute for Elasticache eviction monitor | map | `{}` | no |
 | eviction\_threshold\_critical | Elasticache free memory critical threshold in percentage | string | `"30"` | no |
 | eviction\_threshold\_warning | Elasticache free memory warning threshold in percentage | string | `"0"` | no |
 | eviction\_timeframe | Monitor timeframe for Elasticache eviction [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
@@ -51,14 +49,12 @@ Creates DataDog monitors with the following checks:
 | free\_memory\_enabled | Flag to enable Elasticache free memory monitor | string | `"true"` | no |
 | free\_memory\_extra\_tags | Extra tags for Elasticache free memory monitor | list | `[]` | no |
 | free\_memory\_message | Custom message for Elasticache free memory monitor | string | `""` | no |
-| free\_memory\_silenced | Groups to mute for Elasticache free memory monitor | map | `{}` | no |
 | free\_memory\_threshold\_critical | Elasticache free memory critical threshold in percentage | string | `"-70"` | no |
 | free\_memory\_threshold\_warning | Elasticache free memory warning threshold in percentage | string | `"-50"` | no |
 | free\_memory\_timeframe | Monitor timeframe for Elasticache free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
 | max\_connection\_enabled | Flag to enable Elasticache max connection monitor | string | `"true"` | no |
 | max\_connection\_extra\_tags | Extra tags for Elasticache max connection monitor | list | `[]` | no |
 | max\_connection\_message | Custom message for Elasticache max connection monitor | string | `""` | no |
-| max\_connection\_silenced | Groups to mute for Elasticache max connection monitor | map | `{}` | no |
 | max\_connection\_time\_aggregator | Monitor aggregator for Elasticache max connection [available values: min, max or avg] | string | `"max"` | no |
 | max\_connection\_timeframe | Monitor timeframe for Elasticache max connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
@@ -66,14 +62,12 @@ Creates DataDog monitors with the following checks:
 | no\_connection\_enabled | Flag to enable Elasticache no connection monitor | string | `"true"` | no |
 | no\_connection\_extra\_tags | Extra tags for Elasticache no connection monitor | list | `[]` | no |
 | no\_connection\_message | Custom message for Elasticache no connection monitor | string | `""` | no |
-| no\_connection\_silenced | Groups to mute for Elasticache no connection monitor | map | `{}` | no |
 | no\_connection\_time\_aggregator | Monitor aggregator for Elasticache no connection [available values: min, max or avg] | string | `"min"` | no |
 | no\_connection\_timeframe | Monitor timeframe for Elasticache no connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | swap\_enabled | Flag to enable Elasticache swap monitor | string | `"true"` | no |
 | swap\_extra\_tags | Extra tags for Elasticache swap monitor | list | `[]` | no |
 | swap\_message | Custom message for Elasticache swap monitor | string | `""` | no |
-| swap\_silenced | Groups to mute for Elasticache swap monitor | map | `{}` | no |
 | swap\_threshold\_critical | Elasticache swap critical threshold in bytes | string | `"50000000"` | no |
 | swap\_threshold\_warning | Elasticache swap warning threshold in bytes | string | `"0"` | no |
 | swap\_time\_aggregator | Monitor aggregator for Elasticache memcached swap [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/aws/elasticache/common/inputs.tf b/cloud/aws/elasticache/common/inputs.tf
index 3924a21..6641020 100644
--- a/cloud/aws/elasticache/common/inputs.tf
+++ b/cloud/aws/elasticache/common/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Elasticache specific
-variable "eviction_silenced" {
-  description = "Groups to mute for Elasticache eviction monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "eviction_enabled" {
   description = "Flag to enable Elasticache eviction monitor"
@@ -82,12 +77,6 @@ variable "eviction_threshold_critical" {
   default     = 30
 }
 
-variable "max_connection_silenced" {
-  description = "Groups to mute for Elasticache max connection monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "max_connection_enabled" {
   description = "Flag to enable Elasticache max connection monitor"
   type        = "string"
@@ -118,12 +107,6 @@ variable "max_connection_timeframe" {
   default     = "last_5m"
 }
 
-variable "no_connection_silenced" {
-  description = "Groups to mute for Elasticache no connection monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "no_connection_enabled" {
   description = "Flag to enable Elasticache no connection monitor"
   type        = "string"
@@ -154,12 +137,6 @@ variable "no_connection_timeframe" {
   default     = "last_5m"
 }
 
-variable "swap_silenced" {
-  description = "Groups to mute for Elasticache swap monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "swap_enabled" {
   description = "Flag to enable Elasticache swap monitor"
   type        = "string"
@@ -202,12 +179,6 @@ variable "swap_threshold_critical" {
   default     = 50000000
 }
 
-variable "free_memory_silenced" {
-  description = "Groups to mute for Elasticache free memory monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "free_memory_enabled" {
   description = "Flag to enable Elasticache free memory monitor"
   type        = "string"
@@ -250,12 +221,6 @@ variable "free_memory_threshold_critical" {
   default     = -70
 }
 
-variable "eviction_growing_silenced" {
-  description = "Groups to mute for Elasticache eviction growing monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "eviction_growing_enabled" {
   description = "Flag to enable Elasticache eviction growing monitor"
   type        = "string"
diff --git a/cloud/aws/elasticache/common/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
index 0a774e3..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}): (
@@ -26,8 +26,6 @@ resource "datadog_monitor" "elasticache_eviction" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.eviction_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.eviction_extra_tags}"]
 }
 
@@ -36,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}): (
@@ -54,8 +52,6 @@ resource "datadog_monitor" "elasticache_max_connection" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.max_connection_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.max_connection_extra_tags}"]
 }
 
@@ -64,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}): (
@@ -82,8 +78,6 @@ resource "datadog_monitor" "elasticache_no_connection" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.no_connection_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.no_connection_extra_tags}"]
 }
 
@@ -92,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}): (
@@ -115,8 +109,6 @@ resource "datadog_monitor" "elasticache_swap" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.swap_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.swap_extra_tags}"]
 }
 
@@ -125,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,8 +140,6 @@ resource "datadog_monitor" "elasticache_free_memory" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.free_memory_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.free_memory_extra_tags}"]
 }
 
@@ -158,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}):
@@ -181,7 +171,5 @@ resource "datadog_monitor" "elasticache_eviction_growing" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.eviction_growing_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache", "team:claranet", "created-by:terraform", "${var.eviction_growing_extra_tags}"]
 }
diff --git a/cloud/aws/elasticache/memcached/README.md b/cloud/aws/elasticache/memcached/README.md
index 1f4a27f..7af26dc 100644
--- a/cloud/aws/elasticache/memcached/README.md
+++ b/cloud/aws/elasticache/memcached/README.md
@@ -26,7 +26,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_high\_enabled | Flag to enable Elasticache memcached cpu high monitor | string | `"true"` | no |
 | cpu\_high\_extra\_tags | Extra tags for Elasticache memcached cpu high monitor | list | `[]` | no |
 | cpu\_high\_message | Custom message for Elasticache memcached cpu high monitor | string | `""` | no |
-| cpu\_high\_silenced | Groups to mute for Elasticache memcached cpu high monitor | map | `{}` | no |
 | cpu\_high\_threshold\_critical | Elasticache memcached cpu high critical threshold in percentage | string | `"90"` | no |
 | cpu\_high\_threshold\_warning | Elasticache memcached cpu high warning threshold in percentage | string | `"75"` | no |
 | cpu\_high\_time\_aggregator | Monitor aggregator for Elasticache memcached cpu high [available values: min, max or avg] | string | `"min"` | no |
@@ -39,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | get\_hits\_enabled | Flag to enable Elasticache memcached get hits monitor | string | `"true"` | no |
 | get\_hits\_extra\_tags | Extra tags for Elasticache memcached get hits monitor | list | `[]` | no |
 | get\_hits\_message | Custom message for Elasticache memcached get hits monitor | string | `""` | no |
-| get\_hits\_silenced | Groups to mute for Elasticache memcached get hits monitor | map | `{}` | no |
 | get\_hits\_threshold\_critical | Elasticache memcached get hits critical threshold in percentage | string | `"60"` | no |
 | get\_hits\_threshold\_warning | Elasticache memcached get hits warning threshold in percentage | string | `"80"` | no |
 | get\_hits\_time\_aggregator | Monitor aggregator for Elasticache memcached get hits [available values: min, max or avg] | string | `"max"` | no |
diff --git a/cloud/aws/elasticache/memcached/inputs.tf b/cloud/aws/elasticache/memcached/inputs.tf
index f9a9d18..b0cca66 100644
--- a/cloud/aws/elasticache/memcached/inputs.tf
+++ b/cloud/aws/elasticache/memcached/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Memcached specific
-variable "get_hits_silenced" {
-  description = "Groups to mute for Elasticache memcached get hits monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "get_hits_enabled" {
   description = "Flag to enable Elasticache memcached get hits monitor"
@@ -88,12 +83,6 @@ variable "get_hits_threshold_critical" {
   default     = 60
 }
 
-variable "cpu_high_silenced" {
-  description = "Groups to mute for Elasticache memcached cpu high monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_high_enabled" {
   description = "Flag to enable Elasticache memcached cpu high monitor"
   type        = "string"
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 8b578d1..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}): (
@@ -28,8 +28,6 @@ resource "datadog_monitor" "memcached_get_hits" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.get_hits_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-memcached", "team:claranet", "created-by:terraform", "engine:memcached", "${var.get_hits_extra_tags}"]
 }
 
@@ -38,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}): (
@@ -61,7 +59,5 @@ resource "datadog_monitor" "memcached_cpu_high" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_high_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-memcached", "team:claranet", "created-by:terraform", "engine:memcached", "${var.cpu_high_extra_tags}"]
 }
diff --git a/cloud/aws/elasticache/redis/README.md b/cloud/aws/elasticache/redis/README.md
index c43491c..a1ef9c3 100644
--- a/cloud/aws/elasticache/redis/README.md
+++ b/cloud/aws/elasticache/redis/README.md
@@ -28,7 +28,6 @@ Creates DataDog monitors with the following checks:
 | cache\_hits\_enabled | Flag to enable Elasticache redis cache hits monitor | string | `"true"` | no |
 | cache\_hits\_extra\_tags | Extra tags for Elasticache redis cache hits monitor | list | `[]` | no |
 | cache\_hits\_message | Custom message for Elasticache redis cache hits monitor | string | `""` | no |
-| cache\_hits\_silenced | Groups to mute for Elasticache redis cache hits monitor | map | `{}` | no |
 | cache\_hits\_threshold\_critical | Elasticache redis cache hits critical threshold in percentage | string | `"60"` | no |
 | cache\_hits\_threshold\_warning | Elasticache redis cache hits warning threshold in percentage | string | `"80"` | no |
 | cache\_hits\_time\_aggregator | Monitor aggregator for Elasticache redis cache hits [available values: min, max or avg] | string | `"max"` | no |
@@ -36,12 +35,10 @@ Creates DataDog monitors with the following checks:
 | commands\_enabled | Flag to enable Elasticache redis commands monitor | string | `"true"` | no |
 | commands\_extra\_tags | Extra tags for Elasticache redis commands monitor | list | `[]` | no |
 | commands\_message | Custom message for Elasticache redis commands monitor | string | `""` | no |
-| commands\_silenced | Groups to mute for Elasticache redis commands monitor | map | `{}` | no |
 | commands\_timeframe | Monitor timeframe for Elasticache redis commands [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | cpu\_high\_enabled | Flag to enable Elasticache redis cpu high monitor | string | `"true"` | no |
 | cpu\_high\_extra\_tags | Extra tags for Elasticache redis cpu high monitor | list | `[]` | no |
 | cpu\_high\_message | Custom message for Elasticache redis cpu high monitor | string | `""` | no |
-| cpu\_high\_silenced | Groups to mute for Elasticache redis cpu high monitor | map | `{}` | no |
 | cpu\_high\_threshold\_critical | Elasticache redis cpu high critical threshold in percentage | string | `"90"` | no |
 | cpu\_high\_threshold\_warning | Elasticache redis cpu high warning threshold in percentage | string | `"75"` | no |
 | cpu\_high\_time\_aggregator | Monitor aggregator for Elasticache redis cpu high [available values: min, max or avg] | string | `"min"` | no |
@@ -57,7 +54,6 @@ Creates DataDog monitors with the following checks:
 | replication\_lag\_enabled | Flag to enable Elasticache redis replication lag monitor | string | `"true"` | no |
 | replication\_lag\_extra\_tags | Extra tags for Elasticache redis replication lag monitor | list | `[]` | no |
 | replication\_lag\_message | Custom message for Elasticache redis replication lag monitor | string | `""` | no |
-| replication\_lag\_silenced | Groups to mute for Elasticache redis replication lag monitor | map | `{}` | no |
 | replication\_lag\_threshold\_critical | Elasticache redis replication lag critical threshold in seconds | string | `"180"` | no |
 | replication\_lag\_threshold\_warning | Elasticache redis replication lag warning threshold in seconds | string | `"90"` | no |
 | replication\_lag\_time\_aggregator | Monitor aggregator for Elasticache redis replication lag [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/aws/elasticache/redis/inputs.tf b/cloud/aws/elasticache/redis/inputs.tf
index 3d5189a..d17347a 100644
--- a/cloud/aws/elasticache/redis/inputs.tf
+++ b/cloud/aws/elasticache/redis/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # redis specific
-variable "cache_hits_silenced" {
-  description = "Groups to mute for Elasticache redis cache hits monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "cache_hits_enabled" {
   description = "Flag to enable Elasticache redis cache hits monitor"
@@ -88,12 +83,6 @@ variable "cache_hits_threshold_critical" {
   default     = 60
 }
 
-variable "cpu_high_silenced" {
-  description = "Groups to mute for Elasticache redis cpu high monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_high_enabled" {
   description = "Flag to enable Elasticache redis cpu high monitor"
   type        = "string"
@@ -136,12 +125,6 @@ variable "cpu_high_threshold_critical" {
   default     = 90
 }
 
-variable "replication_lag_silenced" {
-  description = "Groups to mute for Elasticache redis replication lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replication_lag_enabled" {
   description = "Flag to enable Elasticache redis replication lag monitor"
   type        = "string"
@@ -184,12 +167,6 @@ variable "replication_lag_threshold_critical" {
   default     = 180
 }
 
-variable "commands_silenced" {
-  description = "Groups to mute for Elasticache redis commands monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "commands_enabled" {
   description = "Flag to enable Elasticache redis commands monitor"
   type        = "string"
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index a0ce10a..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(
@@ -28,8 +28,6 @@ resource "datadog_monitor" "redis_cache_hits" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.cache_hits_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis", "${var.cache_hits_extra_tags}"]
 }
 
@@ -38,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}): (
@@ -56,8 +54,6 @@ resource "datadog_monitor" "redis_cpu_high" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_high_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis", "${var.cpu_high_extra_tags}"]
 }
 
@@ -66,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}): (
@@ -89,8 +85,6 @@ resource "datadog_monitor" "redis_replication_lag" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.replication_lag_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis", "${var.replication_lag_extra_tags}"]
 }
 
@@ -99,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}): (
@@ -118,7 +112,5 @@ resource "datadog_monitor" "redis_commands" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.commands_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticache-redis", "team:claranet", "created-by:terraform", "engine:redis", "${var.commands_extra_tags}"]
 }
diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md
index 5471170..3e92e3f 100644
--- a/cloud/aws/elasticsearch/README.md
+++ b/cloud/aws/elasticsearch/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_enabled | Flag to enable ES cluster cpu monitor | string | `"true"` | no |
 | cpu\_extra\_tags | Extra tags for ES cluster cpu monitor | list | `[]` | no |
 | cpu\_message | Custom message for ES cluster cpu monitor | string | `""` | no |
-| cpu\_silenced | Groups to mute for ES cluster cpu monitor | map | `{}` | no |
 | cpu\_threshold\_critical | CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_threshold\_warning | CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_time\_aggregator | Monitor aggregator for ES cluster cpu [available values: min, max or avg] | string | `"min"` | no |
@@ -37,7 +36,6 @@ Creates DataDog monitors with the following checks:
 | diskspace\_enabled | Flag to enable ES cluster diskspace monitor | string | `"true"` | no |
 | diskspace\_extra\_tags | Extra tags for ES cluster diskspace monitor | list | `[]` | no |
 | diskspace\_message | Custom message for ES cluster diskspace monitor | string | `""` | no |
-| diskspace\_silenced | Groups to mute for ES cluster diskspace monitor | map | `{}` | no |
 | diskspace\_threshold\_critical | Disk free space in percent (critical threshold) | string | `"10"` | no |
 | diskspace\_threshold\_warning | Disk free space in percent (warning threshold) | string | `"20"` | no |
 | diskspace\_time\_aggregator | Monitor aggregator for ES cluster diskspace [available values: min, max or avg] | string | `"max"` | no |
@@ -46,7 +44,6 @@ Creates DataDog monitors with the following checks:
 | es\_cluster\_status\_enabled | Flag to enable ES cluster status monitor | string | `"true"` | no |
 | es\_cluster\_status\_extra\_tags | Extra tags for ES cluster status monitor | list | `[]` | no |
 | es\_cluster\_status\_message | Custom message for ES cluster status monitor | string | `""` | no |
-| es\_cluster\_status\_silenced | Groups to mute for ES cluster status monitor | map | `{}` | no |
 | es\_cluster\_status\_timeframe | Monitor timeframe for ES cluster status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_30m"` | no |
 | es\_cluster\_volume\_size | ElasticSearch Domain volume size (in GB) | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"900"` | no |
diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf
index 6e4c8c2..b505d1a 100644
--- a/cloud/aws/elasticsearch/inputs.tf
+++ b/cloud/aws/elasticsearch/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # AWS ElasticSearch Service specific
 
-variable "es_cluster_status_silenced" {
-  description = "Groups to mute for ES cluster status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "es_cluster_status_enabled" {
   description = "Flag to enable ES cluster status monitor"
   type        = "string"
@@ -75,12 +69,6 @@ variable "es_cluster_volume_size" {
   description = "ElasticSearch Domain volume size (in GB)"
 }
 
-variable "diskspace_silenced" {
-  description = "Groups to mute for ES cluster diskspace monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "diskspace_enabled" {
   description = "Flag to enable ES cluster diskspace monitor"
   type        = "string"
@@ -121,12 +109,6 @@ variable "diskspace_threshold_critical" {
   default     = "10"
 }
 
-variable "cpu_silenced" {
-  description = "Groups to mute for ES cluster cpu monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_enabled" {
   description = "Flag to enable ES cluster cpu monitor"
   type        = "string"
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index 6ff5d78..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}): (
@@ -32,8 +32,6 @@ resource "datadog_monitor" "es_cluster_status" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.es_cluster_status_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform", "${var.es_cluster_status_extra_tags}"]
 }
 
@@ -43,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}): (
@@ -67,8 +65,6 @@ resource "datadog_monitor" "es_free_space_low" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.diskspace_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform", "${var.diskspace_extra_tags}"]
 }
 
@@ -78,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}): (
@@ -101,7 +97,5 @@ resource "datadog_monitor" "es_cpu_90_15min" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elasticsearch", "team:claranet", "created-by:terraform", "${var.cpu_extra_tags}"]
 }
diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md
index eba6782..ae1e91a 100644
--- a/cloud/aws/elb/README.md
+++ b/cloud/aws/elb/README.md
@@ -31,28 +31,24 @@ Creates DataDog monitors with the following checks:
 | elb\_4xx\_enabled | Flag to enable ELB 4xx errors monitor | string | `"true"` | no |
 | elb\_4xx\_extra\_tags | Extra tags for ELB 4xx errors monitor | list | `[]` | no |
 | elb\_4xx\_message | Custom message for ELB 4xx errors monitor | string | `""` | no |
-| elb\_4xx\_silenced | Groups to mute for ELB 4xx errors monitor | map | `{}` | no |
 | elb\_4xx\_threshold\_critical | loadbalancer 4xx critical threshold in percentage | string | `"10"` | no |
 | elb\_4xx\_threshold\_warning | loadbalancer 4xx warning threshold in percentage | string | `"5"` | no |
 | elb\_4xx\_timeframe | Monitor timeframe for ELB 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | elb\_5xx\_enabled | Flag to enable ELB 5xx errors monitor | string | `"true"` | no |
 | elb\_5xx\_extra\_tags | Extra tags for ELB 5xx errors monitor | list | `[]` | no |
 | elb\_5xx\_message | Custom message for ELB 5xx errors monitor | string | `""` | no |
-| elb\_5xx\_silenced | Groups to mute for ELB 5xx errors monitor | map | `{}` | no |
 | elb\_5xx\_threshold\_critical | loadbalancer 5xx critical threshold in percentage | string | `"10"` | no |
 | elb\_5xx\_threshold\_warning | loadbalancer 5xx warning threshold in percentage | string | `"5"` | no |
 | elb\_5xx\_timeframe | Monitor timeframe for ELB 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | elb\_backend\_4xx\_enabled | Flag to enable ELB backend 4xx errors monitor | string | `"true"` | no |
 | elb\_backend\_4xx\_extra\_tags | Extra tags for ELB backend 4xx errors monitor | list | `[]` | no |
 | elb\_backend\_4xx\_message | Custom message for ELB backend 4xx errors monitor | string | `""` | no |
-| elb\_backend\_4xx\_silenced | Groups to mute for ELB backend 4xx errors monitor | map | `{}` | no |
 | elb\_backend\_4xx\_threshold\_critical | loadbalancer backend 4xx critical threshold in percentage | string | `"10"` | no |
 | elb\_backend\_4xx\_threshold\_warning | loadbalancer backend 4xx warning threshold in percentage | string | `"5"` | no |
 | elb\_backend\_4xx\_timeframe | Monitor timeframe for ELB backend 4xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | elb\_backend\_5xx\_enabled | Flag to enable ELB backend 5xx errors monitor | string | `"true"` | no |
 | elb\_backend\_5xx\_extra\_tags | Extra tags for ELB backend 5xx errors monitor | list | `[]` | no |
 | elb\_backend\_5xx\_message | Custom message for ELB backend 5xx errors monitor | string | `""` | no |
-| elb\_backend\_5xx\_silenced | Groups to mute for ELB backend 5xx errors monitor | map | `{}` | no |
 | elb\_backend\_5xx\_threshold\_critical | loadbalancer backend 5xx critical threshold in percentage | string | `"10"` | no |
 | elb\_backend\_5xx\_threshold\_warning | loadbalancer backend 5xx warning threshold in percentage | string | `"5"` | no |
 | elb\_backend\_5xx\_timeframe | Monitor timeframe for ELB backend 5xx errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
@@ -60,14 +56,12 @@ Creates DataDog monitors with the following checks:
 | elb\_backend\_latency\_enabled | Flag to enable ELB backend latency monitor | string | `"true"` | no |
 | elb\_backend\_latency\_extra\_tags | Extra tags for ELB backend latency monitor | list | `[]` | no |
 | elb\_backend\_latency\_message | Custom message for ELB backend latency monitor | string | `""` | no |
-| elb\_backend\_latency\_silenced | Groups to mute for ELB backend latency monitor | map | `{}` | no |
 | elb\_backend\_latency\_time\_aggregator | Monitor aggregator for ELB backend latency [available values: min, max or avg] | string | `"min"` | no |
 | elb\_backend\_latency\_timeframe | Monitor timeframe for ELB backend latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | elb\_backend\_latency\_warning | latency warning threshold in seconds | string | `"1"` | no |
 | elb\_no\_healthy\_instance\_enabled | Flag to enable ELB no healty instance monitor | string | `"true"` | no |
 | elb\_no\_healthy\_instance\_extra\_tags | Extra tags for ELB no healty instance monitor | list | `[]` | no |
 | elb\_no\_healthy\_instance\_message | Custom message for ELB no healty instance monitor | string | `""` | no |
-| elb\_no\_healthy\_instance\_silenced | Groups to mute for ELB no healty instance monitor | map | `{}` | no |
 | elb\_no\_healthy\_instance\_time\_aggregator | Monitor aggregator for ELB no healty instance [available values: min or max] | string | `"min"` | no |
 | elb\_no\_healthy\_instance\_timeframe | Monitor timeframe for ELB no healty instance [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | environment | Architecture Environment | string | n/a | yes |
diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf
index 6efb0cf..08ce711 100644
--- a/cloud/aws/elb/inputs.tf
+++ b/cloud/aws/elb/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 ## ELB
-variable "elb_no_healthy_instance_silenced" {
-  description = "Groups to mute for ELB no healty instance monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "elb_no_healthy_instance_enabled" {
   description = "Flag to enable ELB no healty instance monitor"
@@ -76,12 +71,6 @@ variable "elb_no_healthy_instance_timeframe" {
   default     = "last_5m"
 }
 
-variable "elb_4xx_silenced" {
-  description = "Groups to mute for ELB 4xx errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "elb_4xx_enabled" {
   description = "Flag to enable ELB 4xx errors monitor"
   type        = "string"
@@ -116,12 +105,6 @@ variable "elb_4xx_threshold_critical" {
   default     = 10
 }
 
-variable "elb_5xx_silenced" {
-  description = "Groups to mute for ELB 5xx errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "elb_5xx_enabled" {
   description = "Flag to enable ELB 5xx errors monitor"
   type        = "string"
@@ -156,12 +139,6 @@ variable "elb_5xx_threshold_critical" {
   default     = 10
 }
 
-variable "elb_backend_4xx_silenced" {
-  description = "Groups to mute for ELB backend 4xx errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "elb_backend_4xx_enabled" {
   description = "Flag to enable ELB backend 4xx errors monitor"
   type        = "string"
@@ -196,12 +173,6 @@ variable "elb_backend_4xx_threshold_critical" {
   default     = 10
 }
 
-variable "elb_backend_5xx_silenced" {
-  description = "Groups to mute for ELB backend 5xx errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "elb_backend_5xx_enabled" {
   description = "Flag to enable ELB backend 5xx errors monitor"
   type        = "string"
@@ -236,12 +207,6 @@ variable "elb_backend_5xx_threshold_critical" {
   default     = 10
 }
 
-variable "elb_backend_latency_silenced" {
-  description = "Groups to mute for ELB backend latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "elb_backend_latency_enabled" {
   description = "Flag to enable ELB backend latency monitor"
   type        = "string"
diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index 119dbc1..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
@@ -28,8 +28,6 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_no_healthy_instance_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_no_healthy_instance_extra_tags}"]
 }
 
@@ -45,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}"
@@ -62,8 +60,6 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_4xx_extra_tags}"]
 }
 
@@ -79,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}"
@@ -96,8 +92,6 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_5xx_extra_tags}"]
 }
 
@@ -113,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}"
@@ -130,8 +124,6 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_backend_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_backend_4xx_extra_tags}"]
 }
 
@@ -147,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}"
@@ -164,8 +156,6 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_backend_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_backend_5xx_extra_tags}"]
 }
 
@@ -180,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}"
@@ -197,7 +187,5 @@ resource "datadog_monitor" "ELB_backend_latency" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.elb_backend_latency_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:elb", "team:claranet", "created-by:terraform", "${var.elb_backend_latency_extra_tags}"]
 }
diff --git a/cloud/aws/kinesis-firehose/README.md b/cloud/aws/kinesis-firehose/README.md
index de2b8d0..b8130ce 100644
--- a/cloud/aws/kinesis-firehose/README.md
+++ b/cloud/aws/kinesis-firehose/README.md
@@ -30,7 +30,6 @@ Creates DataDog monitors with the following checks:
 | incoming\_records\_enabled | Flag to enable Kinesis Firehorse incoming records monitor | string | `"true"` | no |
 | incoming\_records\_extra\_tags | Extra tags for Kinesis Firehorse incoming records monitor | list | `[]` | no |
 | incoming\_records\_message | Custom message for Kinesis Firehorse incoming records monitor | string | `""` | no |
-| incoming\_records\_silenced | Groups to mute for Kinesis Firehorse incoming records monitor | map | `{}` | no |
 | incoming\_records\_timeframe | Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
diff --git a/cloud/aws/kinesis-firehose/inputs.tf b/cloud/aws/kinesis-firehose/inputs.tf
index 65edf74..3e60557 100644
--- a/cloud/aws/kinesis-firehose/inputs.tf
+++ b/cloud/aws/kinesis-firehose/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # Kinesis-Firehose
 
-variable "incoming_records_silenced" {
-  description = "Groups to mute for Kinesis Firehorse incoming records monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "incoming_records_enabled" {
   description = "Flag to enable Kinesis Firehorse incoming records monitor"
   type        = "string"
diff --git a/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf b/cloud/aws/kinesis-firehose/monitors-kinesis-firehose.tf
index 28f10c6..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}): (
@@ -26,7 +26,5 @@ resource "datadog_monitor" "firehose_incoming_records" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.incoming_records_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:kinesis-firehose", "team:claranet", "created-by:terraform", "${var.incoming_records_extra_tags}"]
 }
diff --git a/cloud/aws/rds/aurora/mysql/README.md b/cloud/aws/rds/aurora/mysql/README.md
index 8df1186..547738a 100644
--- a/cloud/aws/rds/aurora/mysql/README.md
+++ b/cloud/aws/rds/aurora/mysql/README.md
@@ -25,7 +25,6 @@ Creates DataDog monitors with the following checks:
 | aurora\_replicalag\_enabled | Flag to enable RDS Aurora replica lag monitor | string | `"true"` | no |
 | aurora\_replicalag\_extra\_tags | Extra tags for RDS Aurora replica lag monitor | list | `[]` | no |
 | aurora\_replicalag\_message | Custom message for RDS Aurora replica lag monitor | string | `""` | no |
-| aurora\_replicalag\_silenced | Groups to mute for RDS Aurora replica lag monitor | map | `{}` | no |
 | aurora\_replicalag\_threshold\_critical | Aurora replica lag in milliseconds (critical threshold) | string | `"200"` | no |
 | aurora\_replicalag\_threshold\_warning | Aurora replica lag in milliseconds (warning threshold) | string | `"100"` | no |
 | aurora\_replicalag\_timeframe | Monitor timeframe for RDS Aurora replica lag monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
diff --git a/cloud/aws/rds/aurora/mysql/inputs.tf b/cloud/aws/rds/aurora/mysql/inputs.tf
index 27c765c..6b07522 100644
--- a/cloud/aws/rds/aurora/mysql/inputs.tf
+++ b/cloud/aws/rds/aurora/mysql/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # AWS RDS Aurora instance specific
 
-variable "aurora_replicalag_silenced" {
-  description = "Groups to mute for RDS Aurora replica lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "aurora_replicalag_enabled" {
   description = "Flag to enable RDS Aurora replica lag monitor"
   type        = "string"
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 a1fc64e..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}): (
@@ -26,7 +26,5 @@ resource "datadog_monitor" "rds_aurora_mysql_replica_lag" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.aurora_replicalag_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds-aurora-mysql", "team:claranet", "created-by:terraform", "${var.aurora_replicalag_extra_tags}"]
 }
diff --git a/cloud/aws/rds/aurora/postgresql/README.md b/cloud/aws/rds/aurora/postgresql/README.md
index e110c73..aa14718 100644
--- a/cloud/aws/rds/aurora/postgresql/README.md
+++ b/cloud/aws/rds/aurora/postgresql/README.md
@@ -25,7 +25,6 @@ Creates DataDog monitors with the following checks:
 | aurora\_replicalag\_enabled | Flag to enable RDS Aurora replica lag monitor | string | `"true"` | no |
 | aurora\_replicalag\_extra\_tags | Extra tags for RDS Aurora replica lag monitor | list | `[]` | no |
 | aurora\_replicalag\_message | Custom message for RDS Aurora replica lag monitor | string | `""` | no |
-| aurora\_replicalag\_silenced | Groups to mute for RDS Aurora replica lag monitor | map | `{}` | no |
 | aurora\_replicalag\_threshold\_critical | Aurora replica lag in milliseconds (critical threshold) | string | `"200"` | no |
 | aurora\_replicalag\_threshold\_warning | Aurora replica lag in milliseconds (warning threshold) | string | `"100"` | no |
 | aurora\_replicalag\_timeframe | Monitor timeframe for RDS Aurora replica lag monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
diff --git a/cloud/aws/rds/aurora/postgresql/inputs.tf b/cloud/aws/rds/aurora/postgresql/inputs.tf
index 27c765c..6b07522 100644
--- a/cloud/aws/rds/aurora/postgresql/inputs.tf
+++ b/cloud/aws/rds/aurora/postgresql/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # AWS RDS Aurora instance specific
 
-variable "aurora_replicalag_silenced" {
-  description = "Groups to mute for RDS Aurora replica lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "aurora_replicalag_enabled" {
   description = "Flag to enable RDS Aurora replica lag monitor"
   type        = "string"
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 8596bdc..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}): (
@@ -26,7 +26,5 @@ resource "datadog_monitor" "rds_aurora_postgresql_replica_lag" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.aurora_replicalag_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds-aurora-postgresql", "team:claranet", "created-by:terraform", "${var.aurora_replicalag_extra_tags}"]
 }
diff --git a/cloud/aws/rds/common/README.md b/cloud/aws/rds/common/README.md
index 49556e4..7a98914 100644
--- a/cloud/aws/rds/common/README.md
+++ b/cloud/aws/rds/common/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_enabled | Flag to enable RDS CPU usage monitor | string | `"true"` | no |
 | cpu\_extra\_tags | Extra tags for RDS CPU usage monitor | list | `[]` | no |
 | cpu\_message | Custom message for RDS CPU usage monitor | string | `""` | no |
-| cpu\_silenced | Groups to mute for RDS CPU usage monitor | map | `{}` | no |
 | cpu\_threshold\_critical | CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_threshold\_warning | CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_time\_aggregator | Monitor aggregator for RDS CPU usage [available values: min, max or avg] | string | `"min"` | no |
@@ -35,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | diskspace\_enabled | Flag to enable RDS free diskspace monitor | string | `"true"` | no |
 | diskspace\_extra\_tags | Extra tags for RDS free diskspace monitor | list | `[]` | no |
 | diskspace\_message | Custom message for RDS free diskspace monitor | string | `""` | no |
-| diskspace\_silenced | Groups to mute for RDS free diskspace monitor | map | `{}` | no |
 | diskspace\_threshold\_critical | Disk free space in percent (critical threshold) | string | `"10"` | no |
 | diskspace\_threshold\_warning | Disk free space in percent (warning threshold) | string | `"20"` | no |
 | diskspace\_time\_aggregator | Monitor aggregator for RDS free diskspace [available values: min, max or avg] | string | `"min"` | no |
@@ -51,7 +49,6 @@ Creates DataDog monitors with the following checks:
 | replicalag\_enabled | Flag to enable RDS replica lag monitor | string | `"true"` | no |
 | replicalag\_extra\_tags | Extra tags for RDS replica lag monitor | list | `[]` | no |
 | replicalag\_message | Custom message for RDS replica lag monitor | string | `""` | no |
-| replicalag\_silenced | Groups to mute for RDS replica lag monitor | map | `{}` | no |
 | replicalag\_threshold\_critical | replica lag in seconds (critical threshold) | string | `"300"` | no |
 | replicalag\_threshold\_warning | replica lag in seconds (warning threshold) | string | `"200"` | no |
 | replicalag\_timeframe | Monitor timeframe for RDS replica lag monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
diff --git a/cloud/aws/rds/common/inputs.tf b/cloud/aws/rds/common/inputs.tf
index 0c3781e..89c996d 100644
--- a/cloud/aws/rds/common/inputs.tf
+++ b/cloud/aws/rds/common/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # AWS RDS instance specific
 
-variable "cpu_silenced" {
-  description = "Groups to mute for RDS CPU usage monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_enabled" {
   description = "Flag to enable RDS CPU usage monitor"
   type        = "string"
@@ -87,12 +81,6 @@ variable "cpu_threshold_critical" {
   default     = "90"
 }
 
-variable "diskspace_silenced" {
-  description = "Groups to mute for RDS free diskspace monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "diskspace_enabled" {
   description = "Flag to enable RDS free diskspace monitor"
   type        = "string"
@@ -133,12 +121,6 @@ variable "diskspace_threshold_critical" {
   default     = "10"
 }
 
-variable "replicalag_silenced" {
-  description = "Groups to mute for RDS replica lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replicalag_enabled" {
   description = "Flag to enable RDS replica lag monitor"
   type        = "string"
diff --git a/cloud/aws/rds/common/monitors-rds-common.tf b/cloud/aws/rds/common/monitors-rds-common.tf
index c82c775..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}): (
@@ -26,8 +26,6 @@ resource "datadog_monitor" "rds_cpu_90_15min" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform", "${var.cpu_extra_tags}"]
 }
 
@@ -37,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}): (
@@ -60,8 +58,6 @@ resource "datadog_monitor" "rds_free_space_low" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.diskspace_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform", "${var.diskspace_extra_tags}"]
 }
 
@@ -71,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}): (
@@ -93,7 +89,5 @@ resource "datadog_monitor" "rds_replica_lag" {
   require_full_window = false
   new_host_delay      = "${var.new_host_delay}"
 
-  silenced = "${var.replicalag_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform", "${var.replicalag_extra_tags}"]
 }
diff --git a/cloud/aws/vpn/README.md b/cloud/aws/vpn/README.md
index fc6329b..3d57f63 100644
--- a/cloud/aws/vpn/README.md
+++ b/cloud/aws/vpn/README.md
@@ -31,7 +31,6 @@ Creates DataDog monitors with the following checks:
 | vpn\_status\_enabled | Flag to enable VPN status monitor | string | `"true"` | no |
 | vpn\_status\_extra\_tags | Extra tags for VPN status monitor | list | `[]` | no |
 | vpn\_status\_message | Custom message for VPN status monitor | string | `""` | no |
-| vpn\_status\_silenced | Groups to mute for VPN status monitor | map | `{}` | no |
 | vpn\_status\_time\_aggregator | Monitor aggregator for VPN status [available values: min, max or avg] | string | `"max"` | no |
 | vpn\_status\_timeframe | Monitor timeframe for VPN status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/aws/vpn/inputs.tf b/cloud/aws/vpn/inputs.tf
index 2121e23..2994bd3 100644
--- a/cloud/aws/vpn/inputs.tf
+++ b/cloud/aws/vpn/inputs.tf
@@ -29,12 +29,6 @@ variable "filter_tags" {
   default     = "*"
 }
 
-variable "vpn_status_silenced" {
-  description = "Groups to mute for VPN status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "vpn_status_enabled" {
   description = "Flag to enable VPN status monitor"
   type        = "string"
diff --git a/cloud/aws/vpn/monitors-vpn.tf b/cloud/aws/vpn/monitors-vpn.tf
index 082f3f3..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
@@ -20,7 +20,5 @@ resource "datadog_monitor" "VPN_status" {
   include_tags        = true
   require_full_window = false
 
-  silenced = "${var.vpn_status_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:aws", "resource:vpn", "team:claranet", "created-by:terraform", "${var.vpn_status_extra_tags}"]
 }
diff --git a/cloud/azure/apimanagement/README.md b/cloud/azure/apimanagement/README.md
index d158262..303d6cb 100644
--- a/cloud/azure/apimanagement/README.md
+++ b/cloud/azure/apimanagement/README.md
@@ -31,7 +31,6 @@ Creates DataDog monitors with the following checks:
 | failed\_requests\_enabled | Flag to enable API Management failed requests monitor | string | `"true"` | no |
 | failed\_requests\_extra\_tags | Extra tags for API Management failed requests monitor | list | `[]` | no |
 | failed\_requests\_message | Custom message for API Management failed requests monitor | string | `""` | no |
-| failed\_requests\_silenced | Groups to mute for API Management failed requests monitor | map | `{}` | no |
 | failed\_requests\_threshold\_critical | Maximum acceptable percent of failed requests | string | `"90"` | no |
 | failed\_requests\_threshold\_warning | Warning regarding acceptable percent of failed requests | string | `"50"` | no |
 | failed\_requests\_time\_aggregator | Monitor aggregator for API Management failed requests [available values: min, max or avg] | string | `"min"` | no |
@@ -44,7 +43,6 @@ Creates DataDog monitors with the following checks:
 | other\_requests\_enabled | Flag to enable API Management other requests monitor | string | `"true"` | no |
 | other\_requests\_extra\_tags | Extra tags for API Management other requests monitor | list | `[]` | no |
 | other\_requests\_message | Custom message for API Management other requests monitor | string | `""` | no |
-| other\_requests\_silenced | Groups to mute for API Management other requests monitor | map | `{}` | no |
 | other\_requests\_threshold\_critical | Maximum acceptable percent of other requests | string | `"90"` | no |
 | other\_requests\_threshold\_warning | Warning regarding acceptable percent of other requests | string | `"50"` | no |
 | other\_requests\_time\_aggregator | Monitor aggregator for API Management other requests [available values: min, max or avg] | string | `"min"` | no |
@@ -53,13 +51,11 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable API Management status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for API Management status monitor | list | `[]` | no |
 | status\_message | Custom message for API Management status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for API Management status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for API Management status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for API Management status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | successful\_requests\_enabled | Flag to enable API Management successful requests monitor | string | `"true"` | no |
 | successful\_requests\_extra\_tags | Extra tags for API Management successful requests monitor | list | `[]` | no |
 | successful\_requests\_message | Custom message for API Management successful requests monitor | string | `""` | no |
-| successful\_requests\_silenced | Groups to mute for API Management successful requests monitor | map | `{}` | no |
 | successful\_requests\_threshold\_critical | Minimum acceptable percent of successful requests | string | `"10"` | no |
 | successful\_requests\_threshold\_warning | Warning regarding acceptable percent of successful requests | string | `"30"` | no |
 | successful\_requests\_time\_aggregator | Monitor aggregator for API Management successful requests [available values: min, max or avg] | string | `"max"` | no |
@@ -67,7 +63,6 @@ Creates DataDog monitors with the following checks:
 | unauthorized\_requests\_enabled | Flag to enable API Management unauthorized requests monitor | string | `"true"` | no |
 | unauthorized\_requests\_extra\_tags | Extra tags for API Management unauthorized requests monitor | list | `[]` | no |
 | unauthorized\_requests\_message | Custom message for API Management unauthorized requests monitor | string | `""` | no |
-| unauthorized\_requests\_silenced | Groups to mute for API Management unauthorized requests monitor | map | `{}` | no |
 | unauthorized\_requests\_threshold\_critical | Maximum acceptable percent of unauthorized requests | string | `"90"` | no |
 | unauthorized\_requests\_threshold\_warning | Warning regarding acceptable percent of unauthorized requests | string | `"50"` | no |
 | unauthorized\_requests\_time\_aggregator | Monitor aggregator for API Management unauthorized requests [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/apimanagement/inputs.tf b/cloud/azure/apimanagement/inputs.tf
index 3b70496..1c596b5 100644
--- a/cloud/azure/apimanagement/inputs.tf
+++ b/cloud/azure/apimanagement/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure API Management specific
-variable "status_silenced" {
-  description = "Groups to mute for API Management status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable API Management status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "failed_requests_silenced" {
-  description = "Groups to mute for API Management failed requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_requests_enabled" {
   description = "Flag to enable API Management failed requests monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "failed_requests_threshold_warning" {
   default     = 50
 }
 
-variable "other_requests_silenced" {
-  description = "Groups to mute for API Management other requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "other_requests_enabled" {
   description = "Flag to enable API Management other requests monitor"
   type        = "string"
@@ -168,12 +151,6 @@ variable "other_requests_threshold_warning" {
   default     = 50
 }
 
-variable "unauthorized_requests_silenced" {
-  description = "Groups to mute for API Management unauthorized requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "unauthorized_requests_enabled" {
   description = "Flag to enable API Management unauthorized requests monitor"
   type        = "string"
@@ -214,12 +191,6 @@ variable "unauthorized_requests_threshold_warning" {
   default     = 50
 }
 
-variable "successful_requests_silenced" {
-  description = "Groups to mute for API Management successful requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "successful_requests_enabled" {
   description = "Flag to enable API Management successful requests monitor"
   type        = "string"
diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index c42a25d..c06d2f9 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -13,8 +13,6 @@ resource "datadog_monitor" "apimgt_status" {
     critical = 1
   }
 
-  silenced = "${var.status_silenced}"
-
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -45,9 +43,7 @@ resource "datadog_monitor" "apimgt_failed_requests" {
     warning  = "${var.failed_requests_threshold_warning}"
   }
 
-  silenced = "${var.failed_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -78,9 +74,7 @@ resource "datadog_monitor" "apimgt_other_requests" {
     warning  = "${var.other_requests_threshold_warning}"
   }
 
-  silenced = "${var.other_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -111,9 +105,7 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" {
     warning  = "${var.unauthorized_requests_threshold_warning}"
   }
 
-  silenced = "${var.unauthorized_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
@@ -146,9 +138,7 @@ resource "datadog_monitor" "apimgt_successful_requests" {
     warning  = "${var.successful_requests_threshold_warning}"
   }
 
-  silenced = "${var.successful_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 1
diff --git a/cloud/azure/app-services/README.md b/cloud/azure/app-services/README.md
index ca57b7a..a3dbc04 100644
--- a/cloud/azure/app-services/README.md
+++ b/cloud/azure/app-services/README.md
@@ -35,7 +35,6 @@ Creates DataDog monitors with the following checks:
 | http\_4xx\_requests\_enabled | Flag to enable App Services 4xx requests monitor | string | `"true"` | no |
 | http\_4xx\_requests\_extra\_tags | Extra tags for App Services 4xx requests monitor | list | `[]` | no |
 | http\_4xx\_requests\_message | Custom message for App Services 4xx requests monitor | string | `""` | no |
-| http\_4xx\_requests\_silenced | Groups to mute for App Services 4xx requests monitor | map | `{}` | no |
 | http\_4xx\_requests\_threshold\_critical | Maximum critical acceptable percent of 4xx errors | string | `"90"` | no |
 | http\_4xx\_requests\_threshold\_warning | Warning regarding acceptable percent of 4xx errors | string | `"50"` | no |
 | http\_4xx\_requests\_time\_aggregator | Monitor aggregator for App Services 4xx requests [available values: min, max or avg] | string | `"min"` | no |
@@ -43,7 +42,6 @@ Creates DataDog monitors with the following checks:
 | http\_5xx\_requests\_enabled | Flag to enable App Services 5xx requests monitor | string | `"true"` | no |
 | http\_5xx\_requests\_extra\_tags | Extra tags for App Services 5xx requests monitor | list | `[]` | no |
 | http\_5xx\_requests\_message | Custom message for App Services 5xx requests monitor | string | `""` | no |
-| http\_5xx\_requests\_silenced | Groups to mute for App Services 5xx requests monitor | map | `{}` | no |
 | http\_5xx\_requests\_threshold\_critical | Maximum critical acceptable percent of 5xx errors | string | `"90"` | no |
 | http\_5xx\_requests\_threshold\_warning | Warning regarding acceptable percent of 5xx errors | string | `"50"` | no |
 | http\_5xx\_requests\_time\_aggregator | Monitor aggregator for App Services 5xx requests [available values: min, max or avg] | string | `"min"` | no |
@@ -51,7 +49,6 @@ Creates DataDog monitors with the following checks:
 | http\_successful\_requests\_enabled | Flag to enable App Services successful requests monitor | string | `"true"` | no |
 | http\_successful\_requests\_extra\_tags | Extra tags for App Services successful requests monitor | list | `[]` | no |
 | http\_successful\_requests\_message | Custom message for App Services successful requests monitor | string | `""` | no |
-| http\_successful\_requests\_silenced | Groups to mute for App Services successful requests monitor | map | `{}` | no |
 | http\_successful\_requests\_threshold\_critical | Minimum critical acceptable percent of 2xx & 3xx requests | string | `"10"` | no |
 | http\_successful\_requests\_threshold\_warning | Warning regarding acceptable percent of 2xx & 3xx requests | string | `"30"` | no |
 | http\_successful\_requests\_time\_aggregator | Monitor aggregator for App Services successful requests [available values: min, max or avg] | string | `"max"` | no |
@@ -59,7 +56,6 @@ Creates DataDog monitors with the following checks:
 | memory\_usage\_enabled | Flag to enable App Services memory usage monitor | string | `"true"` | no |
 | memory\_usage\_extra\_tags | Extra tags for App Services memory usage monitor | list | `[]` | no |
 | memory\_usage\_message | Custom message for App Services memory usage monitor | string | `""` | no |
-| memory\_usage\_silenced | Groups to mute for App Services memory usage monitor | map | `{}` | no |
 | memory\_usage\_threshold\_critical | Alerting threshold in Mib | string | `"1073741824"` | no |
 | memory\_usage\_threshold\_warning | Warning threshold in MiB | string | `"536870912"` | no |
 | memory\_usage\_time\_aggregator | Monitor aggregator for App Services memory usage [available values: min, max or avg] | string | `"min"` | no |
@@ -70,7 +66,6 @@ Creates DataDog monitors with the following checks:
 | response\_time\_enabled | Flag to enable App Services response time monitor | string | `"true"` | no |
 | response\_time\_extra\_tags | Extra tags for App Services response time monitor | list | `[]` | no |
 | response\_time\_message | Custom message for App Services response time monitor | string | `""` | no |
-| response\_time\_silenced | Groups to mute for App Services response time monitor | map | `{}` | no |
 | response\_time\_threshold\_critical | Alerting threshold for response time in seconds | string | `"10"` | no |
 | response\_time\_threshold\_warning | Warning threshold for response time in seconds | string | `"5"` | no |
 | response\_time\_time\_aggregator | Monitor aggregator for App Services response time [available values: min, max or avg] | string | `"min"` | no |
@@ -78,7 +73,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable App Services status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for App Services status monitor | list | `[]` | no |
 | status\_message | Custom message for App Services status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for App Services status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for App Services status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for App Services status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/app-services/inputs.tf b/cloud/azure/app-services/inputs.tf
index 88cc73f..93bf3b9 100644
--- a/cloud/azure/app-services/inputs.tf
+++ b/cloud/azure/app-services/inputs.tf
@@ -38,11 +38,6 @@ variable "prefix_slug" {
 }
 
 # Azure App Services specific variables
-variable "response_time_silenced" {
-  description = "Groups to mute for App Services response time monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "response_time_enabled" {
   description = "Flag to enable App Services response time monitor"
@@ -84,12 +79,6 @@ variable "response_time_threshold_warning" {
   description = "Warning threshold for response time in seconds"
 }
 
-variable "memory_usage_silenced" {
-  description = "Groups to mute for App Services memory usage monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_usage_enabled" {
   description = "Flag to enable App Services memory usage monitor"
   type        = "string"
@@ -130,12 +119,6 @@ variable "memory_usage_threshold_warning" {
   description = "Warning threshold in MiB"
 }
 
-variable "http_4xx_requests_silenced" {
-  description = "Groups to mute for App Services 4xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_4xx_requests_enabled" {
   description = "Flag to enable App Services 4xx requests monitor"
   type        = "string"
@@ -176,12 +159,6 @@ variable "http_4xx_requests_threshold_warning" {
   description = "Warning regarding acceptable percent of 4xx errors"
 }
 
-variable "http_5xx_requests_silenced" {
-  description = "Groups to mute for App Services 5xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_5xx_requests_enabled" {
   description = "Flag to enable App Services 5xx requests monitor"
   type        = "string"
@@ -222,12 +199,6 @@ variable "http_5xx_requests_threshold_warning" {
   description = "Warning regarding acceptable percent of 5xx errors"
 }
 
-variable "http_successful_requests_silenced" {
-  description = "Groups to mute for App Services successful requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_successful_requests_enabled" {
   description = "Flag to enable App Services successful requests monitor"
   type        = "string"
@@ -280,12 +251,6 @@ variable "status_message" {
   default     = ""
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for App Services status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_extra_tags" {
   description = "Extra tags for App Services status monitor"
   type        = "list"
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index 5a9ec8f..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
@@ -19,8 +19,6 @@ resource "datadog_monitor" "appservices_response_time" {
     critical = "${var.response_time_threshold_critical}"
   }
 
-  silenced = "${var.response_time_silenced}"
-
   notify_no_data      = false # Will NOT notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -34,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
@@ -51,8 +49,6 @@ resource "datadog_monitor" "appservices_memory_usage_count" {
     critical = "${var.memory_usage_threshold_critical}"
   }
 
-  silenced = "${var.memory_usage_silenced}"
-
   notify_no_data      = false # Will NOT notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -66,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
@@ -84,8 +80,6 @@ resource "datadog_monitor" "appservices_http_5xx_errors_count" {
     critical = "${var.http_5xx_requests_threshold_critical}"
   }
 
-  silenced = "${var.http_5xx_requests_silenced}"
-
   notify_no_data      = false # Will NOT notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -99,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
@@ -117,8 +111,6 @@ resource "datadog_monitor" "appservices_http_4xx_errors_count" {
     critical = "${var.http_4xx_requests_threshold_critical}"
   }
 
-  silenced = "${var.http_4xx_requests_silenced}"
-
   notify_no_data      = false # Will NOT notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -132,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
@@ -152,8 +144,6 @@ resource "datadog_monitor" "appservices_http_success_status_rate" {
     critical = "${var.http_successful_requests_threshold_critical}"
   }
 
-  silenced = "${var.http_successful_requests_silenced}"
-
   notify_no_data      = false # Will notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -181,7 +171,6 @@ resource "datadog_monitor" "appservices_status" {
     critical = 1
   }
 
-  silenced            = "${var.status_silenced}"
   notify_no_data      = true                                                                                                                                                     # Will notify when no data is received
   renotify_interval   = 0
   require_full_window = false
diff --git a/cloud/azure/azure-search/README.md b/cloud/azure/azure-search/README.md
index e8b4fde..9e740c3 100644
--- a/cloud/azure/azure-search/README.md
+++ b/cloud/azure/azure-search/README.md
@@ -31,7 +31,6 @@ Creates DataDog monitors with the following checks:
 | latency\_enabled | Flag to enable Azure Search latency monitor | string | `"true"` | no |
 | latency\_extra\_tags | Extra tags for Azure Search latency monitor | list | `[]` | no |
 | latency\_message | Custom message for Azure Search latency monitor | string | `""` | no |
-| latency\_silenced | Groups to mute for Azure Search latency monitor | map | `{}` | no |
 | latency\_threshold\_critical | Alerting threshold for Azure Search latency in seconds | string | `"4"` | no |
 | latency\_threshold\_warning | Warning threshold for Azure Search latency in seconds | string | `"2"` | no |
 | latency\_time\_aggregator | Monitor aggregator for Azure Search latency [available values: min, max or avg] | string | `"min"` | no |
@@ -42,7 +41,6 @@ Creates DataDog monitors with the following checks:
 | throttled\_queries\_rate\_enabled | Flag to enable Azure Search throttled queries rate monitor | string | `"true"` | no |
 | throttled\_queries\_rate\_extra\_tags | Extra tags for Azure Search throttled queries rate monitor | list | `[]` | no |
 | throttled\_queries\_rate\_message | Custom message for Azure Search throttled queries rate monitor | string | `""` | no |
-| throttled\_queries\_rate\_silenced | Groups to mute for Azure Search throttled queries rate monitor | map | `{}` | no |
 | throttled\_queries\_rate\_threshold\_critical | Alerting threshold for Azure Search throttled queries rate | string | `"50"` | no |
 | throttled\_queries\_rate\_threshold\_warning | Warning threshold for Azure Search throttled queries rate | string | `"25"` | no |
 | throttled\_queries\_rate\_time\_aggregator | Monitor aggregator for Azure Search throttled queries rate [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/azure-search/inputs.tf b/cloud/azure/azure-search/inputs.tf
index e9229ff..1007e8d 100644
--- a/cloud/azure/azure-search/inputs.tf
+++ b/cloud/azure/azure-search/inputs.tf
@@ -38,11 +38,6 @@ variable "prefix_slug" {
 }
 
 # Azure Search specific variables
-variable "latency_silenced" {
-  description = "Groups to mute for Azure Search latency monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "latency_enabled" {
   description = "Flag to enable Azure Search latency monitor"
@@ -84,12 +79,6 @@ variable "latency_threshold_warning" {
   description = "Warning threshold for Azure Search latency in seconds"
 }
 
-variable "throttled_queries_rate_silenced" {
-  description = "Groups to mute for Azure Search throttled queries rate monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "throttled_queries_rate_enabled" {
   description = "Flag to enable Azure Search throttled queries rate monitor"
   type        = "string"
diff --git a/cloud/azure/azure-search/monitors-azure-search.tf b/cloud/azure/azure-search/monitors-azure-search.tf
index c280d3b..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
@@ -19,8 +19,6 @@ resource "datadog_monitor" "azure_search_latency" {
     critical = "${var.latency_threshold_critical}"
   }
 
-  silenced = "${var.latency_silenced}"
-
   notify_no_data      = true  # Will not notify when no data is received
   renotify_interval   = 0
   require_full_window = false
@@ -34,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
@@ -51,8 +49,6 @@ resource "datadog_monitor" "azure_search_throttled_queries_rate" {
     critical = "${var.throttled_queries_rate_threshold_critical}"
   }
 
-  silenced = "${var.throttled_queries_rate_silenced}"
-
   notify_no_data      = false # Will notify when no data is received
   renotify_interval   = 0
   require_full_window = false
diff --git a/cloud/azure/cosmosdb/README.md b/cloud/azure/cosmosdb/README.md
index 5018163..bdb1b99 100644
--- a/cloud/azure/cosmosdb/README.md
+++ b/cloud/azure/cosmosdb/README.md
@@ -32,7 +32,6 @@ Creates DataDog monitors with the following checks:
 | cosmos\_db\_4xx\_request\_timeframe | Monitor timeframe for Cosmos DB 4xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | cosmos\_db\_4xx\_requests\_enabled | Flag to enable Cosmos DB 4xx requests monitor | string | `"true"` | no |
 | cosmos\_db\_4xx\_requests\_message | Custom message for Cosmos DB 4xx requests monitor | string | `""` | no |
-| cosmos\_db\_4xx\_requests\_silenced | Groups to mute for Cosmos DB 4xx requests monitor | map | `{}` | no |
 | cosmos\_db\_5xx\_request\_rate\_extra\_tags | Extra tags for Cosmos DB 5xx requests monitor | list | `[]` | no |
 | cosmos\_db\_5xx\_request\_rate\_threshold\_critical | Critical threshold for Cosmos DB 5xx requests monitor | string | `"80"` | no |
 | cosmos\_db\_5xx\_request\_rate\_threshold\_warning | Warning threshold for Cosmos DB 5xx requests monitor | string | `"50"` | no |
@@ -40,13 +39,11 @@ Creates DataDog monitors with the following checks:
 | cosmos\_db\_5xx\_request\_timeframe | Monitor timeframe for Cosmos DB 5xx requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | cosmos\_db\_5xx\_requests\_enabled | Flag to enable Cosmos DB 5xx requests monitor | string | `"true"` | no |
 | cosmos\_db\_5xx\_requests\_message | Custom message for Cosmos DB 5xx requests monitor | string | `""` | no |
-| cosmos\_db\_5xx\_requests\_silenced | Groups to mute for Cosmos DB 5xx requests monitor | map | `{}` | no |
 | cosmos\_db\_scaling\_enabled | Flag to enable Cosmos DB scaling monitor | string | `"true"` | no |
 | cosmos\_db\_scaling\_error\_rate\_threshold\_critical | Critical threshold for Cosmos DB scaling monitor | string | `"10"` | no |
 | cosmos\_db\_scaling\_error\_rate\_threshold\_warning | Warning threshold for Cosmos DB scaling monitor | string | `"5"` | no |
 | cosmos\_db\_scaling\_extra\_tags | Extra tags for Cosmos DB scaling monitor | list | `[]` | no |
 | cosmos\_db\_scaling\_message | Custom message for Cosmos DB scaling monitor | string | `""` | no |
-| cosmos\_db\_scaling\_silenced | Groups to mute for Cosmos DB scaling monitor | map | `{}` | no |
 | cosmos\_db\_scaling\_time\_aggregator | Monitor aggregator for Cosmos DB scaling [available values: min, max or avg] | string | `"min"` | no |
 | cosmos\_db\_scaling\_timeframe | Monitor timeframe for Cosmos DB scaling [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | environment | Architecture environment | string | n/a | yes |
@@ -60,7 +57,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Cosmos DB status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Cosmos DB status monitor | list | `[]` | no |
 | status\_message | Custom message for Cosmos DB status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Cosmos DB status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Cosmos DB status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Cosmos DB status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/cosmosdb/inputs.tf b/cloud/azure/cosmosdb/inputs.tf
index 4d27562..480f698 100644
--- a/cloud/azure/cosmosdb/inputs.tf
+++ b/cloud/azure/cosmosdb/inputs.tf
@@ -44,12 +44,6 @@ variable "status_enabled" {
   default     = "true"
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for Cosmos DB status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_extra_tags" {
   description = "Extra tags for Cosmos DB status monitor"
   type        = "list"
@@ -86,12 +80,6 @@ variable "cosmos_db_4xx_requests_enabled" {
   default     = "true"
 }
 
-variable "cosmos_db_4xx_requests_silenced" {
-  description = "Groups to mute for Cosmos DB 4xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cosmos_db_4xx_request_rate_threshold_critical" {
   description = "Critical threshold for Cosmos DB 4xx requests monitor"
   default     = 80
@@ -132,12 +120,6 @@ variable "cosmos_db_5xx_requests_enabled" {
   default     = "true"
 }
 
-variable "cosmos_db_5xx_requests_silenced" {
-  description = "Groups to mute for Cosmos DB 5xx requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cosmos_db_5xx_request_rate_threshold_critical" {
   description = "Critical threshold for Cosmos DB 5xx requests monitor"
   default     = 80
@@ -178,12 +160,6 @@ variable "cosmos_db_scaling_enabled" {
   default     = "true"
 }
 
-variable "cosmos_db_scaling_silenced" {
-  description = "Groups to mute for Cosmos DB scaling monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cosmos_db_scaling_error_rate_threshold_critical" {
   description = "Critical threshold for Cosmos DB scaling monitor"
   default     = 10
diff --git a/cloud/azure/cosmosdb/monitors-cosmosdb.tf b/cloud/azure/cosmosdb/monitors-cosmosdb.tf
index 5472bd1..24d3df5 100644
--- a/cloud/azure/cosmosdb/monitors-cosmosdb.tf
+++ b/cloud/azure/cosmosdb/monitors-cosmosdb.tf
@@ -16,8 +16,6 @@ resource "datadog_monitor" "cosmos_db_status" {
     critical = 1
   }
 
-  silenced = "${var.status_silenced}"
-
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -54,15 +52,13 @@ 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}"
     warning  = "${var.cosmos_db_4xx_request_rate_threshold_warning}"
   }
 
-  silenced = "${var.cosmos_db_4xx_requests_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -90,15 +86,13 @@ 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}"
     warning  = "${var.cosmos_db_5xx_request_rate_threshold_warning}"
   }
 
-  silenced = "${var.cosmos_db_5xx_requests_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -126,15 +120,13 @@ 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}"
     warning  = "${var.cosmos_db_scaling_error_rate_threshold_warning}"
   }
 
-  silenced = "${var.cosmos_db_scaling_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/datalakestore/README.md b/cloud/azure/datalakestore/README.md
index 9874f83..6f5883b 100644
--- a/cloud/azure/datalakestore/README.md
+++ b/cloud/azure/datalakestore/README.md
@@ -33,7 +33,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Datalake Store status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Datalake Store status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | list | `[]` | no |
 | status\_message | Custom message for Datalake Store status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Datalake Store status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Datalake Store status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Datalake Store status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/datalakestore/inputs.tf b/cloud/azure/datalakestore/inputs.tf
index 804fb14..21ed4f1 100644
--- a/cloud/azure/datalakestore/inputs.tf
+++ b/cloud/azure/datalakestore/inputs.tf
@@ -44,12 +44,6 @@ variable "status_enabled" {
   default     = "true"
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for Datalake Store status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_message" {
   description = "Custom message for Datalake Store status monitor"
   type        = "string"
diff --git a/cloud/azure/datalakestore/monitors-datalakestore.tf b/cloud/azure/datalakestore/monitors-datalakestore.tf
index 697d526..edf703e 100644
--- a/cloud/azure/datalakestore/monitors-datalakestore.tf
+++ b/cloud/azure/datalakestore/monitors-datalakestore.tf
@@ -10,9 +10,7 @@ resource "datadog_monitor" "datalakestore_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/eventgrid/README.md b/cloud/azure/eventgrid/README.md
index d706dc5..08aa485 100644
--- a/cloud/azure/eventgrid/README.md
+++ b/cloud/azure/eventgrid/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | failed\_messages\_rate\_enabled | Flag to enable Event Grid failed messages monitor | string | `"true"` | no |
 | failed\_messages\_rate\_extra\_tags | Extra tags for Event Grid failed messages monitor | list | `[]` | no |
 | failed\_messages\_rate\_message | Custom message for Event Grid failed messages monitor | string | `""` | no |
-| failed\_messages\_rate\_silenced | Groups to mute for Event Grid failed messages monitor | map | `{}` | no |
 | failed\_messages\_rate\_thresold\_critical | Failed messages ratio (percentage) to trigger the critical alert | string | `"90"` | no |
 | failed\_messages\_rate\_thresold\_warning | Failed messages ratio (percentage) to trigger a warning alert | string | `"50"` | no |
 | failed\_messages\_rate\_time\_aggregator | Monitor aggregator for Event Grid failed messages [available values: min, max or avg] | string | `"min"` | no |
@@ -42,14 +41,12 @@ Creates DataDog monitors with the following checks:
 | no\_successful\_message\_rate\_enabled | Flag to enable Event Grid no successful message monitor | string | `"true"` | no |
 | no\_successful\_message\_rate\_extra\_tags | Extra tags for Event Grid no successful message monitor | list | `[]` | no |
 | no\_successful\_message\_rate\_message | Custom message for Event Grid no successful message monitor | string | `""` | no |
-| no\_successful\_message\_rate\_silenced | Groups to mute for²id no successful message monitor | map | `{}` | no |
 | no\_successful\_message\_rate\_time\_aggregator | Monitor aggregator for Event Grid no successful message [available values: min, max or avg] | string | `"min"` | no |
 | no\_successful\_message\_rate\_timeframe | Monitor timeframe for Event Grid no successful message [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | unmatched\_events\_rate\_enabled | Flag to enable Event Grid unmatched events monitor | string | `"true"` | no |
 | unmatched\_events\_rate\_extra\_tags | Extra tags for Event Grid unmatched events monitor | list | `[]` | no |
 | unmatched\_events\_rate\_message | Custom message for Event Grid unmatched events monitor | string | `""` | no |
-| unmatched\_events\_rate\_silenced | Groups to mute for Event Grid unmatched events monitor | map | `{}` | no |
 | unmatched\_events\_rate\_thresold\_critical | Unmatched events ratio (percentage) to trigger the critical alert | string | `"90"` | no |
 | unmatched\_events\_rate\_thresold\_warning | Unmatched events ratio (percentage) to trigger a warning alert | string | `"50"` | no |
 | unmatched\_events\_rate\_time\_aggregator | Monitor aggregator for Event Grid unmatched events [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/eventgrid/inputs.tf b/cloud/azure/eventgrid/inputs.tf
index ecf9a5b..f700653 100644
--- a/cloud/azure/eventgrid/inputs.tf
+++ b/cloud/azure/eventgrid/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Event Grid specific variables
-variable "no_successful_message_rate_silenced" {
-  description = "Groups to mute for²id no successful message monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "no_successful_message_rate_enabled" {
   description = "Flag to enable Event Grid no successful message monitor"
@@ -76,12 +71,6 @@ variable "no_successful_message_rate_timeframe" {
   default     = "last_5m"
 }
 
-variable "failed_messages_rate_silenced" {
-  description = "Groups to mute for Event Grid failed messages monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_messages_rate_enabled" {
   description = "Flag to enable Event Grid failed messages monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "failed_messages_rate_thresold_warning" {
   default     = 50
 }
 
-variable "unmatched_events_rate_silenced" {
-  description = "Groups to mute for Event Grid unmatched events monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "unmatched_events_rate_enabled" {
   description = "Flag to enable Event Grid unmatched events monitor"
   type        = "string"
diff --git a/cloud/azure/eventgrid/monitors-eventgrid.tf b/cloud/azure/eventgrid/monitors-eventgrid.tf
index d7e31ab..c0ef553 100644
--- a/cloud/azure/eventgrid/monitors-eventgrid.tf
+++ b/cloud/azure/eventgrid/monitors-eventgrid.tf
@@ -11,8 +11,6 @@ resource "datadog_monitor" "eventgrid_no_successful_message" {
 
   type = "metric alert"
 
-  silenced = "${var.no_successful_message_rate_silenced}"
-
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -41,15 +39,13 @@ 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}"
     warning  = "${var.failed_messages_rate_thresold_warning}"
   }
 
-  silenced = "${var.failed_messages_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -78,15 +74,13 @@ 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}"
     warning  = "${var.unmatched_events_rate_thresold_warning}"
   }
 
-  silenced = "${var.unmatched_events_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/eventhub/README.md b/cloud/azure/eventhub/README.md
index 8958aa2..bee96c1 100644
--- a/cloud/azure/eventhub/README.md
+++ b/cloud/azure/eventhub/README.md
@@ -28,7 +28,6 @@ Creates DataDog monitors with the following checks:
 | errors\_rate\_enabled | Flag to enable Event Hub errors monitor | string | `"true"` | no |
 | errors\_rate\_extra\_tags | Extra tags for Event Hub errors monitor | list | `[]` | no |
 | errors\_rate\_message | Custom message for Event Hub errors monitor | string | `""` | no |
-| errors\_rate\_silenced | Groups to mute for Event Hub errors monitor | map | `{}` | no |
 | errors\_rate\_thresold\_critical | Errors ratio (percentage) to trigger the critical alert | string | `"90"` | no |
 | errors\_rate\_thresold\_warning | Errors ratio (percentage) to trigger a warning alert | string | `"50"` | no |
 | errors\_rate\_time\_aggregator | Monitor aggregator for Event Hub errors [available values: min, max or avg] | string | `"min"` | no |
@@ -37,7 +36,6 @@ Creates DataDog monitors with the following checks:
 | failed\_requests\_rate\_enabled | Flag to enable Event Hub failed requests monitor | string | `"true"` | no |
 | failed\_requests\_rate\_extra\_tags | Extra tags for Event Hub failed requests monitor | list | `[]` | no |
 | failed\_requests\_rate\_message | Custom message for Event Hub failed requests monitor | string | `""` | no |
-| failed\_requests\_rate\_silenced | Groups to mute for Event Hub failed requests monitor | map | `{}` | no |
 | failed\_requests\_rate\_thresold\_critical | Failed requests ratio (percentage) to trigger the critical alert | string | `"90"` | no |
 | failed\_requests\_rate\_thresold\_warning | Failed requests ratio (percentage) to trigger a warning alert | string | `"50"` | no |
 | failed\_requests\_rate\_time\_aggregator | Monitor aggregator for Event Hub failed requests [available values: min, max or avg] | string | `"min"` | no |
@@ -51,7 +49,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Event Hub status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Event Hub status monitor | list | `[]` | no |
 | status\_message | Custom message for Event Hub status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Event Hub status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Event Hub status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Event Hub status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/eventhub/inputs.tf b/cloud/azure/eventhub/inputs.tf
index 5435ba2..ca54d2e 100644
--- a/cloud/azure/eventhub/inputs.tf
+++ b/cloud/azure/eventhub/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Event Hub specific variables
-variable "status_silenced" {
-  description = "Groups to mute for Event Hub status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable Event Hub status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "failed_requests_rate_silenced" {
-  description = "Groups to mute for Event Hub failed requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_requests_rate_enabled" {
   description = "Flag to enable Event Hub failed requests monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "failed_requests_rate_thresold_warning" {
   default     = 50
 }
 
-variable "errors_rate_silenced" {
-  description = "Groups to mute for Event Hub errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "errors_rate_enabled" {
   description = "Flag to enable Event Hub errors monitor"
   type        = "string"
diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf
index eba63f5..f79635b 100644
--- a/cloud/azure/eventhub/monitors-eventhub.tf
+++ b/cloud/azure/eventhub/monitors-eventhub.tf
@@ -9,9 +9,7 @@ resource "datadog_monitor" "eventhub_status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -38,15 +36,13 @@ 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}"
     warning  = "${var.failed_requests_rate_thresold_warning}"
   }
 
-  silenced = "${var.failed_requests_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -74,15 +70,13 @@ 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}"
     warning  = "${var.errors_rate_thresold_warning}"
   }
 
-  silenced = "${var.errors_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/functions/README.md b/cloud/azure/functions/README.md
index 42bbeec..b3a39b0 100644
--- a/cloud/azure/functions/README.md
+++ b/cloud/azure/functions/README.md
@@ -32,7 +32,6 @@ Creates DataDog monitors with the following checks:
 | high\_connections\_count\_enabled | Flag to enable Functions high connections count monitor | string | `"true"` | no |
 | high\_connections\_count\_extra\_tags | Extra tags for Functions high connections count monitor | list | `[]` | no |
 | high\_connections\_count\_message | Custom message for Functions high connections count monitor | string | `""` | no |
-| high\_connections\_count\_silenced | Groups to mute for Functions high connections count monitor | map | `{}` | no |
 | high\_connections\_count\_threshold\_critical | Alerting threshold for Functions high connections count | string | `"590"` | no |
 | high\_connections\_count\_threshold\_warning | Warning threshold for Functions high connections count | string | `"550"` | no |
 | high\_connections\_count\_time\_aggregator | Monitor aggregator for Functions high connections count [available values: min, max or avg] | string | `"min"` | no |
@@ -40,7 +39,6 @@ Creates DataDog monitors with the following checks:
 | high\_threads\_count\_enabled | Flag to enable Functions high threads count monitor | string | `"true"` | no |
 | high\_threads\_count\_extra\_tags | Extra tags for Functions high threads count monitor | list | `[]` | no |
 | high\_threads\_count\_message | Custom message for Functions high threads count monitor | string | `""` | no |
-| high\_threads\_count\_silenced | Groups to mute for Functions high threads count monitor | map | `{}` | no |
 | high\_threads\_count\_threshold\_critical | Alerting threshold for Functions high threads count | string | `"510"` | no |
 | high\_threads\_count\_threshold\_warning | Warning threshold for Functions high threads count | string | `"490"` | no |
 | high\_threads\_count\_time\_aggregator | Monitor aggregator for Functions high threads count [available values: min, max or avg] | string | `"min"` | no |
@@ -48,7 +46,6 @@ Creates DataDog monitors with the following checks:
 | http\_5xx\_errors\_rate\_enabled | Flag to enable Functions Http 5xx errors rate monitor | string | `"true"` | no |
 | http\_5xx\_errors\_rate\_extra\_tags | Extra tags for Functions Http 5xx errors rate monitor | list | `[]` | no |
 | http\_5xx\_errors\_rate\_message | Custom message for Functions Http 5xx errors rate monitor | string | `""` | no |
-| http\_5xx\_errors\_rate\_silenced | Groups to mute for Functions Http 5xx errors rate monitor | map | `{}` | no |
 | http\_5xx\_errors\_rate\_threshold\_critical | Alerting threshold for Functions Http 5xx errors rate | string | `"20"` | no |
 | http\_5xx\_errors\_rate\_threshold\_warning | Warning threshold for Functions Http 5xx errors rate | string | `"10"` | no |
 | http\_5xx\_errors\_rate\_time\_aggregator | Monitor aggregator for Functions Http 5xx errors rate [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/functions/inputs.tf b/cloud/azure/functions/inputs.tf
index d115f5f..d7497ff 100644
--- a/cloud/azure/functions/inputs.tf
+++ b/cloud/azure/functions/inputs.tf
@@ -38,11 +38,6 @@ variable "prefix_slug" {
 }
 
 # Azure Function App specific variables
-variable "http_5xx_errors_rate_silenced" {
-  description = "Groups to mute for Functions Http 5xx errors rate monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "http_5xx_errors_rate_enabled" {
   description = "Flag to enable Functions Http 5xx errors rate monitor"
@@ -84,12 +79,6 @@ variable "http_5xx_errors_rate_threshold_warning" {
   description = "Warning threshold for Functions Http 5xx errors rate"
 }
 
-variable "high_connections_count_silenced" {
-  description = "Groups to mute for Functions high connections count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "high_connections_count_enabled" {
   description = "Flag to enable Functions high connections count monitor"
   type        = "string"
@@ -130,12 +119,6 @@ variable "high_connections_count_threshold_warning" {
   description = "Warning threshold for Functions high connections count"
 }
 
-variable "high_threads_count_silenced" {
-  description = "Groups to mute for Functions high threads count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "high_threads_count_enabled" {
   description = "Flag to enable Functions high threads count monitor"
   type        = "string"
diff --git a/cloud/azure/functions/monitors-functions.tf b/cloud/azure/functions/monitors-functions.tf
index dcca646..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
@@ -19,8 +19,6 @@ resource "datadog_monitor" "function_http_5xx_errors_rate" {
     critical = "${var.http_5xx_errors_rate_threshold_critical}"
   }
 
-  silenced = "${var.http_5xx_errors_rate_silenced}"
-
   notify_no_data      = false
   renotify_interval   = 0
   require_full_window = false
@@ -33,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
@@ -50,8 +48,6 @@ resource "datadog_monitor" "function_high_connections_count" {
     critical = "${var.high_connections_count_threshold_critical}"
   }
 
-  silenced = "${var.high_connections_count_silenced}"
-
   notify_no_data      = false
   renotify_interval   = 0
   require_full_window = false
@@ -64,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
@@ -81,8 +77,6 @@ resource "datadog_monitor" "function_high_threads_count" {
     critical = "${var.high_threads_count_threshold_critical}"
   }
 
-  silenced = "${var.high_threads_count_silenced}"
-
   notify_no_data      = false
   renotify_interval   = 0
   require_full_window = false
diff --git a/cloud/azure/iothubs/README.md b/cloud/azure/iothubs/README.md
index c72dcbb..d9a0c26 100644
--- a/cloud/azure/iothubs/README.md
+++ b/cloud/azure/iothubs/README.md
@@ -40,7 +40,6 @@ Creates DataDog monitors with the following checks:
 | dropped\_d2c\_telemetry\_egress\_message | Custom message for IoT Hub dropped d2c telemetry monitor | string | `""` | no |
 | dropped\_d2c\_telemetry\_egress\_rate\_threshold\_critical | D2C Telemetry Dropped limit (critical threshold) | string | `"90"` | no |
 | dropped\_d2c\_telemetry\_egress\_rate\_threshold\_warning | D2C Telemetry Dropped limit (warning threshold) | string | `"50"` | no |
-| dropped\_d2c\_telemetry\_egress\_silenced | Groups to mute for IoT Hub dropped d2c telemetry monitor | map | `{}` | no |
 | dropped\_d2c\_telemetry\_egress\_time\_aggregator | Monitor aggregator for IoT Hub dropped d2c telemetry [available values: min, max, sum or avg] | string | `"min"` | no |
 | dropped\_d2c\_telemetry\_egress\_timeframe | Monitor timeframe for IoT Hub dropped d2c telemetry [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | environment | Architecture Environment | string | n/a | yes |
@@ -48,7 +47,6 @@ Creates DataDog monitors with the following checks:
 | failed\_c2d\_methods\_rate\_enabled | Flag to enable IoT Hub failed c2d methods monitor | string | `"true"` | no |
 | failed\_c2d\_methods\_rate\_extra\_tags | Extra tags for IoT Hub failed c2d methods monitor | list | `[]` | no |
 | failed\_c2d\_methods\_rate\_message | Custom message for IoT Hub failed c2d method monitor | string | `""` | no |
-| failed\_c2d\_methods\_rate\_silenced | Groups to mute for IoT Hub failed c2d methods monitor | map | `{}` | no |
 | failed\_c2d\_methods\_rate\_threshold\_critical | C2D Methods Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_c2d\_methods\_rate\_threshold\_warning | C2D Methods Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_c2d\_methods\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed c2d method [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -56,7 +54,6 @@ Creates DataDog monitors with the following checks:
 | failed\_c2d\_twin\_read\_rate\_enabled | Flag to enable IoT Hub failed c2d twin read monitor | string | `"true"` | no |
 | failed\_c2d\_twin\_read\_rate\_extra\_tags | Extra tags for IoT Hub failed c2d twin read monitor | list | `[]` | no |
 | failed\_c2d\_twin\_read\_rate\_message | Custom message for IoT Hub failed c2d twin read monitor | string | `""` | no |
-| failed\_c2d\_twin\_read\_rate\_silenced | Groups to mute for IoT Hub failed c2d twin read monitor | map | `{}` | no |
 | failed\_c2d\_twin\_read\_rate\_threshold\_critical | C2D Twin Read Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_c2d\_twin\_read\_rate\_threshold\_warning | C2D Twin Read Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_c2d\_twin\_read\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed c2d twin read [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -64,7 +61,6 @@ Creates DataDog monitors with the following checks:
 | failed\_c2d\_twin\_update\_rate\_enabled | Flag to enable IoT Hub failed c2d twin update monitor | string | `"true"` | no |
 | failed\_c2d\_twin\_update\_rate\_extra\_tags | Extra tags for IoT Hub failed c2d twin update monitor | list | `[]` | no |
 | failed\_c2d\_twin\_update\_rate\_message | Custom message for IoT Hub failed c2d twin update monitor | string | `""` | no |
-| failed\_c2d\_twin\_update\_rate\_silenced | Groups to mute for IoT Hub failed c2d twin update monitor | map | `{}` | no |
 | failed\_c2d\_twin\_update\_rate\_threshold\_critical | C2D Twin Update Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_c2d\_twin\_update\_rate\_threshold\_warning | C2D Twin Update Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_c2d\_twin\_update\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed c2d twin update [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -72,7 +68,6 @@ Creates DataDog monitors with the following checks:
 | failed\_d2c\_twin\_read\_rate\_enabled | Flag to enable IoT Hub failed d2c twin read monitor | string | `"true"` | no |
 | failed\_d2c\_twin\_read\_rate\_extra\_tags | Extra tags for IoT Hub failed d2c twin read monitor | list | `[]` | no |
 | failed\_d2c\_twin\_read\_rate\_message | Custom message for IoT Hub failed d2c twin read monitor | string | `""` | no |
-| failed\_d2c\_twin\_read\_rate\_silenced | Groups to mute for IoT Hub failed d2c twin read monitor | map | `{}` | no |
 | failed\_d2c\_twin\_read\_rate\_threshold\_critical | D2C Twin Read Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_d2c\_twin\_read\_rate\_threshold\_warning | D2C Twin Read Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_d2c\_twin\_read\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed d2c twin read [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -80,7 +75,6 @@ Creates DataDog monitors with the following checks:
 | failed\_d2c\_twin\_update\_rate\_enabled | Flag to enable IoT Hub failed d2c twin update monitor | string | `"true"` | no |
 | failed\_d2c\_twin\_update\_rate\_extra\_tags | Extra tags for IoT Hub failed d2c twin update monitor | list | `[]` | no |
 | failed\_d2c\_twin\_update\_rate\_message | Custom message for IoT Hub failed d2c twin update monitor | string | `""` | no |
-| failed\_d2c\_twin\_update\_rate\_silenced | Groups to mute for IoT Hub failed d2c twin update monitor | map | `{}` | no |
 | failed\_d2c\_twin\_update\_rate\_threshold\_critical | D2C Twin Update Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_d2c\_twin\_update\_rate\_threshold\_warning | D2C Twin Update Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_d2c\_twin\_update\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed d2c twin update [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -88,7 +82,6 @@ Creates DataDog monitors with the following checks:
 | failed\_jobs\_rate\_enabled | Flag to enable IoT Hub failed jobs monitor | string | `"true"` | no |
 | failed\_jobs\_rate\_extra\_tags | Extra tags for IoT Hub failed jobs monitor | list | `[]` | no |
 | failed\_jobs\_rate\_message | Custom message for IoT Hub failed jobs monitor | string | `""` | no |
-| failed\_jobs\_rate\_silenced | Groups to mute for IoT Hub failed jobs monitor | map | `{}` | no |
 | failed\_jobs\_rate\_threshold\_critical | Jobs Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_jobs\_rate\_threshold\_warning | Jobs Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_jobs\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed jobs [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -96,7 +89,6 @@ Creates DataDog monitors with the following checks:
 | failed\_listjobs\_rate\_enabled | Flag to enable IoT Hub failed list jobs monitor | string | `"true"` | no |
 | failed\_listjobs\_rate\_extra\_tags | Extra tags for IoT Hub failed list jobs monitor | list | `[]` | no |
 | failed\_listjobs\_rate\_message | Custom message for IoT Hub failed list jobs monitor | string | `""` | no |
-| failed\_listjobs\_rate\_silenced | Groups to mute for IoT Hub failed list jobs monitor | map | `{}` | no |
 | failed\_listjobs\_rate\_threshold\_critical | ListJobs Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_listjobs\_rate\_threshold\_warning | ListJobs Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_listjobs\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed list jobs [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -104,7 +96,6 @@ Creates DataDog monitors with the following checks:
 | failed\_queryjobs\_rate\_enabled | Flag to enable IoT Hub failed query jobs monitor | string | `"true"` | no |
 | failed\_queryjobs\_rate\_extra\_tags | Extra tags for IoT Hub failed query jobs monitor | list | `[]` | no |
 | failed\_queryjobs\_rate\_message | Custom message for IoT Hub failed query jobs monitor | string | `""` | no |
-| failed\_queryjobs\_rate\_silenced | Groups to mute for IoT Hub failed query jobs monitor | map | `{}` | no |
 | failed\_queryjobs\_rate\_threshold\_critical | QueryJobs Failed rate limit (critical threshold) | string | `"90"` | no |
 | failed\_queryjobs\_rate\_threshold\_warning | QueryJobs Failed rate limit (warning threshold) | string | `"50"` | no |
 | failed\_queryjobs\_rate\_time\_aggregator | Monitor aggregator for IoT Hub failed query jobs [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -117,7 +108,6 @@ Creates DataDog monitors with the following checks:
 | invalid\_d2c\_telemetry\_egress\_message | Custom message for IoT Hub invalid d2c telemetry monitor | string | `""` | no |
 | invalid\_d2c\_telemetry\_egress\_rate\_threshold\_critical | D2C Telemetry Invalid limit (critical threshold) | string | `"90"` | no |
 | invalid\_d2c\_telemetry\_egress\_rate\_threshold\_warning | D2C Telemetry Invalid limit (warning threshold) | string | `"50"` | no |
-| invalid\_d2c\_telemetry\_egress\_silenced | Groups to mute for IoT Hub invalid d2c telemetry monitor | map | `{}` | no |
 | invalid\_d2c\_telemetry\_egress\_time\_aggregator | Monitor aggregator for IoT Hub invalid d2c telemetry [available values: min, max, sum or avg] | string | `"min"` | no |
 | invalid\_d2c\_telemetry\_egress\_timeframe | Monitor timeframe for IoT Hub invalid d2c telemetry [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
@@ -127,25 +117,21 @@ Creates DataDog monitors with the following checks:
 | orphaned\_d2c\_telemetry\_egress\_message | Custom message for IoT Hub orphaned d2c telemetry monitor | string | `""` | no |
 | orphaned\_d2c\_telemetry\_egress\_rate\_threshold\_critical | D2C Telemetry Orphaned limit (critical threshold) | string | `"90"` | no |
 | orphaned\_d2c\_telemetry\_egress\_rate\_threshold\_warning | D2C Telemetry Orphaned limit (warning threshold) | string | `"50"` | no |
-| orphaned\_d2c\_telemetry\_egress\_silenced | Groups to mute for IoT Hub orphaned d2c telemetry monitor | map | `{}` | no |
 | orphaned\_d2c\_telemetry\_egress\_time\_aggregator | Monitor aggregator for IoT Hub orphaned d2c telemetry [available values: min, max, sum or avg] | string | `"min"` | no |
 | orphaned\_d2c\_telemetry\_egress\_timeframe | Monitor timeframe for IoT Hub orphaned d2c telemetry [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | status\_enabled | Flag to enable IoT Hub status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for IoT Hub status monitor | list | `[]` | no |
 | status\_message | Custom message for IoT Hub status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for IoT Hub status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for IoT Hub status [available values: min, max, sum or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for IoT Hub status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | too\_many\_d2c\_telemetry\_ingress\_nosent\_enabled | Flag to enable IoT Hub unsent d2c telemetry monitor | string | `"true"` | no |
 | too\_many\_d2c\_telemetry\_ingress\_nosent\_extra\_tags | Extra tags for IoT Hub unsent d2c telemetry monitor | list | `[]` | no |
 | too\_many\_d2c\_telemetry\_ingress\_nosent\_message | Custom message for IoT Hub unsent d2c telemetry monitor | string | `""` | no |
-| too\_many\_d2c\_telemetry\_ingress\_nosent\_silenced | Groups to mute for IoT Hub unsent d2c telemetry monitor | map | `{}` | no |
 | too\_many\_d2c\_telemetry\_ingress\_nosent\_timeframe | Monitor timeframe for IoT Hub unsent d2c telemetry [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | total\_devices\_enabled | Flag to enable IoT Hub total devices monitor | string | `"true"` | no |
 | total\_devices\_extra\_tags | Extra tags for IoT Hub total devices monitor | list | `[]` | no |
 | total\_devices\_message | Custom message for IoT Hub total devices monitor | string | `""` | no |
-| total\_devices\_silenced | Groups to mute for IoT Hub total devices monitor | map | `{}` | no |
 | total\_devices\_time\_aggregator | Monitor aggregator for IoT Hub total devices [available values: min, max, sum or avg] | string | `"min"` | no |
 | total\_devices\_timeframe | Monitor timeframe for IoT Hub total devices [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/iothubs/inputs.tf b/cloud/azure/iothubs/inputs.tf
index 72a2cc6..0ede25b 100644
--- a/cloud/azure/iothubs/inputs.tf
+++ b/cloud/azure/iothubs/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # IOT Hub specific variables
-variable "status_silenced" {
-  description = "Groups to mute for IoT Hub status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable IoT Hub status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "total_devices_silenced" {
-  description = "Groups to mute for IoT Hub total devices monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "total_devices_enabled" {
   description = "Flag to enable IoT Hub total devices monitor"
   type        = "string"
@@ -112,12 +101,6 @@ variable "total_devices_timeframe" {
   default     = "last_5m"
 }
 
-variable "too_many_d2c_telemetry_ingress_nosent_silenced" {
-  description = "Groups to mute for IoT Hub unsent d2c telemetry monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "too_many_d2c_telemetry_ingress_nosent_enabled" {
   description = "Flag to enable IoT Hub unsent d2c telemetry monitor"
   type        = "string"
@@ -142,12 +125,6 @@ variable "too_many_d2c_telemetry_ingress_nosent_timeframe" {
   default     = "last_5m"
 }
 
-variable "failed_jobs_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed jobs monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_jobs_rate_enabled" {
   description = "Flag to enable IoT Hub failed jobs monitor"
   type        = "string"
@@ -188,12 +165,6 @@ variable "failed_jobs_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_listjobs_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed list jobs monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_listjobs_rate_enabled" {
   description = "Flag to enable IoT Hub failed list jobs monitor"
   type        = "string"
@@ -234,12 +205,6 @@ variable "failed_listjobs_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_queryjobs_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed query jobs monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_queryjobs_rate_enabled" {
   description = "Flag to enable IoT Hub failed query jobs monitor"
   type        = "string"
@@ -280,12 +245,6 @@ variable "failed_queryjobs_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_c2d_methods_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed c2d methods monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_c2d_methods_rate_enabled" {
   description = "Flag to enable IoT Hub failed c2d methods monitor"
   type        = "string"
@@ -326,12 +285,6 @@ variable "failed_c2d_methods_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_c2d_twin_read_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed c2d twin read monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_c2d_twin_read_rate_enabled" {
   description = "Flag to enable IoT Hub failed c2d twin read monitor"
   type        = "string"
@@ -372,12 +325,6 @@ variable "failed_c2d_twin_read_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_c2d_twin_update_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed c2d twin update monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_c2d_twin_update_rate_enabled" {
   description = "Flag to enable IoT Hub failed c2d twin update monitor"
   type        = "string"
@@ -418,12 +365,6 @@ variable "failed_c2d_twin_update_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_d2c_twin_read_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed d2c twin read monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_d2c_twin_read_rate_enabled" {
   description = "Flag to enable IoT Hub failed d2c twin read monitor"
   type        = "string"
@@ -464,12 +405,6 @@ variable "failed_d2c_twin_read_rate_threshold_critical" {
   default     = 90
 }
 
-variable "failed_d2c_twin_update_rate_silenced" {
-  description = "Groups to mute for IoT Hub failed d2c twin update monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_d2c_twin_update_rate_enabled" {
   description = "Flag to enable IoT Hub failed d2c twin update monitor"
   type        = "string"
@@ -510,12 +445,6 @@ variable "failed_d2c_twin_update_rate_threshold_critical" {
   default     = 90
 }
 
-variable "dropped_d2c_telemetry_egress_silenced" {
-  description = "Groups to mute for IoT Hub dropped d2c telemetry monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "dropped_d2c_telemetry_egress_enabled" {
   description = "Flag to enable IoT Hub dropped d2c telemetry monitor"
   type        = "string"
@@ -556,12 +485,6 @@ variable "dropped_d2c_telemetry_egress_rate_threshold_critical" {
   default     = 90
 }
 
-variable "orphaned_d2c_telemetry_egress_silenced" {
-  description = "Groups to mute for IoT Hub orphaned d2c telemetry monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "orphaned_d2c_telemetry_egress_enabled" {
   description = "Flag to enable IoT Hub orphaned d2c telemetry monitor"
   type        = "string"
@@ -602,12 +525,6 @@ variable "orphaned_d2c_telemetry_egress_rate_threshold_critical" {
   default     = 90
 }
 
-variable "invalid_d2c_telemetry_egress_silenced" {
-  description = "Groups to mute for IoT Hub invalid d2c telemetry monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "invalid_d2c_telemetry_egress_enabled" {
   description = "Flag to enable IoT Hub invalid d2c telemetry monitor"
   type        = "string"
diff --git a/cloud/azure/iothubs/monitors-iothubs.tf b/cloud/azure/iothubs/monitors-iothubs.tf
index 78efcbf..7681534 100644
--- a/cloud/azure/iothubs/monitors-iothubs.tf
+++ b/cloud/azure/iothubs/monitors-iothubs.tf
@@ -12,15 +12,13 @@ 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}"
     critical = "${var.failed_jobs_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_jobs_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -48,15 +46,13 @@ 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}"
     critical = "${var.failed_listjobs_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_listjobs_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -84,15 +80,13 @@ 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}"
     critical = "${var.failed_queryjobs_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_queryjobs_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -117,9 +111,7 @@ resource "datadog_monitor" "status" {
     ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -145,9 +137,7 @@ resource "datadog_monitor" "total_devices" {
     ) == 0
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.total_devices_silenced}"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -176,15 +166,13 @@ 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}"
     critical = "${var.failed_c2d_methods_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_c2d_methods_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -212,15 +200,13 @@ 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}"
     critical = "${var.failed_c2d_twin_read_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_c2d_twin_read_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -248,15 +234,13 @@ 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}"
     critical = "${var.failed_c2d_twin_update_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_c2d_twin_update_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -284,15 +268,13 @@ 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}"
     critical = "${var.failed_d2c_twin_read_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_d2c_twin_read_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -320,15 +302,13 @@ 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}"
     critical = "${var.failed_d2c_twin_update_rate_threshold_critical}"
   }
 
-  silenced = "${var.failed_d2c_twin_update_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -358,15 +338,13 @@ 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}"
     critical = "${var.dropped_d2c_telemetry_egress_rate_threshold_critical}"
   }
 
-  silenced = "${var.dropped_d2c_telemetry_egress_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -396,15 +374,13 @@ 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}"
     critical = "${var.orphaned_d2c_telemetry_egress_rate_threshold_critical}"
   }
 
-  silenced = "${var.orphaned_d2c_telemetry_egress_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -434,15 +410,13 @@ 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}"
     critical = "${var.invalid_d2c_telemetry_egress_rate_threshold_critical}"
   }
 
-  silenced = "${var.invalid_d2c_telemetry_egress_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -469,9 +443,7 @@ resource "datadog_monitor" "too_many_d2c_telemetry_ingress_nosent" {
     , 0) > 0
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.too_many_d2c_telemetry_ingress_nosent_silenced}"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/keyvault/README.md b/cloud/azure/keyvault/README.md
index 5467e88..9aa83a0 100644
--- a/cloud/azure/keyvault/README.md
+++ b/cloud/azure/keyvault/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | api\_latency\_enabled | Flag to enable Key Vault API latency monitor | string | `"true"` | no |
 | api\_latency\_extra\_tags | Extra tags for Key Vault API latency monitor | list | `[]` | no |
 | api\_latency\_message | Custom message for Key Vault API latency monitor | string | `""` | no |
-| api\_latency\_silenced | Groups to mute for Key Vault API latency monitor | map | `{}` | no |
 | api\_latency\_threshold\_critical | Critical threshold for Key Vault API latency rate | string | `"100"` | no |
 | api\_latency\_threshold\_warning | Warning threshold for Key Vault API latency rate | string | `"80"` | no |
 | api\_latency\_time\_aggregator | Monitor aggregator for Key Vault API latency [available values: min, max or avg] | string | `"min"` | no |
@@ -35,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | api\_result\_enabled | Flag to enable Key Vault API result monitor | string | `"true"` | no |
 | api\_result\_extra\_tags | Extra tags for Key Vault API result monitor | list | `[]` | no |
 | api\_result\_message | Custom message for Key Vault API result monitor | string | `""` | no |
-| api\_result\_silenced | Groups to mute for Key Vault API result monitor | map | `{}` | no |
 | api\_result\_threshold\_critical | Critical threshold for Key Vault API result rate | string | `"10"` | no |
 | api\_result\_threshold\_warning | Warning threshold for Key Vault API result rate | string | `"30"` | no |
 | api\_result\_time\_aggregator | Monitor aggregator for Key Vault API result [available values: min, max or avg] | string | `"max"` | no |
@@ -51,7 +49,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Key Vault status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Key Vault status monitor | list | `[]` | no |
 | status\_message | Custom message for Key Vault status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Key Vault status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Key Vault status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Key Vault status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/keyvault/inputs.tf b/cloud/azure/keyvault/inputs.tf
index 758060b..86775cf 100644
--- a/cloud/azure/keyvault/inputs.tf
+++ b/cloud/azure/keyvault/inputs.tf
@@ -44,12 +44,6 @@ variable "status_enabled" {
   default     = "true"
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for Key Vault status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_message" {
   description = "Custom message for Key Vault status monitor"
   type        = "string"
@@ -79,12 +73,6 @@ variable "api_result_enabled" {
   default     = "true"
 }
 
-variable "api_result_silenced" {
-  description = "Groups to mute for Key Vault API result monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "api_result_message" {
   description = "Custom message for Key Vault API result monitor"
   type        = "string"
@@ -124,12 +112,6 @@ variable "api_latency_enabled" {
   default     = "true"
 }
 
-variable "api_latency_silenced" {
-  description = "Groups to mute for Key Vault API latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "api_latency_message" {
   description = "Custom message for Key Vault API latency monitor"
   type        = "string"
diff --git a/cloud/azure/keyvault/monitors-keyvault.tf b/cloud/azure/keyvault/monitors-keyvault.tf
index c39d88f..6005b71 100644
--- a/cloud/azure/keyvault/monitors-keyvault.tf
+++ b/cloud/azure/keyvault/monitors-keyvault.tf
@@ -10,9 +10,7 @@ resource "datadog_monitor" "keyvault_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -47,9 +45,7 @@ resource "datadog_monitor" "keyvault_api_result" {
     warning  = "${var.api_result_threshold_warning}"
   }
 
-  type = "metric alert"
-
-  silenced = "${var.api_result_silenced}"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -83,8 +79,6 @@ resource "datadog_monitor" "keyvault_api_latency" {
 
   type = "metric alert"
 
-  silenced = "${var.api_latency_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/load-balancer/README.md b/cloud/azure/load-balancer/README.md
index 860978a..27cd5a1 100644
--- a/cloud/azure/load-balancer/README.md
+++ b/cloud/azure/load-balancer/README.md
@@ -33,7 +33,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Load Balancer status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Load Balancer status monitor | list | `[]` | no |
 | status\_message | Custom message for Load Balancer status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Load Balancer status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Load Balancer status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Load Balancer status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/load-balancer/inputs.tf b/cloud/azure/load-balancer/inputs.tf
index a7476fc..8e99ec8 100644
--- a/cloud/azure/load-balancer/inputs.tf
+++ b/cloud/azure/load-balancer/inputs.tf
@@ -44,12 +44,6 @@ variable "status_enabled" {
   default     = "true"
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for Load Balancer status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_message" {
   description = "Custom message for Load Balancer status monitor"
   type        = "string"
diff --git a/cloud/azure/load-balancer/monitors-load-balancer.tf b/cloud/azure/load-balancer/monitors-load-balancer.tf
index 930b7ca..45ede58 100644
--- a/cloud/azure/load-balancer/monitors-load-balancer.tf
+++ b/cloud/azure/load-balancer/monitors-load-balancer.tf
@@ -10,9 +10,7 @@ resource "datadog_monitor" "loadbalancer_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md
index 83caccd..65193f1 100644
--- a/cloud/azure/mysql/README.md
+++ b/cloud/azure/mysql/README.md
@@ -28,7 +28,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_usage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no |
 | cpu\_usage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no |
 | cpu\_usage\_message | Custom message for Mysql CPU monitor | string | `""` | no |
-| cpu\_usage\_silenced | Groups to mute for Mysql CPU monitor | map | `{}` | no |
 | cpu\_usage\_threshold\_critical | Mysql CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_usage\_threshold\_warning | Mysql CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_usage\_time\_aggregator | Monitor aggregator for Mysql CPU [available values: min, max or avg] | string | `"min"` | no |
@@ -40,7 +39,6 @@ Creates DataDog monitors with the following checks:
 | free\_storage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no |
 | free\_storage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no |
 | free\_storage\_message | Custom message for Mysql Free Storage monitor | string | `""` | no |
-| free\_storage\_silenced | Groups to mute for Mysql Free Storage monitor | map | `{}` | no |
 | free\_storage\_threshold\_critical | Mysql Free Storage remaining in percent (critical threshold) | string | `"10"` | no |
 | free\_storage\_threshold\_warning | Mysql Free Storage remaining in percent (warning threshold) | string | `"20"` | no |
 | free\_storage\_time\_aggregator | Monitor aggregator for Mysql Free Storage [available values: min, max or avg] | string | `"min"` | no |
@@ -48,7 +46,6 @@ Creates DataDog monitors with the following checks:
 | io\_consumption\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no |
 | io\_consumption\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no |
 | io\_consumption\_message | Custom message for Mysql IO consumption monitor | string | `""` | no |
-| io\_consumption\_silenced | Groups to mute for Mysql IO consumption monitor | map | `{}` | no |
 | io\_consumption\_threshold\_critical | Mysql IO consumption in percent (critical threshold) | string | `"90"` | no |
 | io\_consumption\_threshold\_warning | Mysql IO consumption in percent (warning threshold) | string | `"80"` | no |
 | io\_consumption\_time\_aggregator | Monitor aggregator for Mysql IO consumption [available values: min, max or avg] | string | `"min"` | no |
@@ -56,7 +53,6 @@ Creates DataDog monitors with the following checks:
 | memory\_usage\_enabled | Flag to enable Mysql status monitor | string | `"true"` | no |
 | memory\_usage\_extra\_tags | Extra tags for Mysql status monitor | list | `[]` | no |
 | memory\_usage\_message | Custom message for Mysql memory monitor | string | `""` | no |
-| memory\_usage\_silenced | Groups to mute for Mysql memory monitor | map | `{}` | no |
 | memory\_usage\_threshold\_critical | Mysql memory usage in percent (critical threshold) | string | `"90"` | no |
 | memory\_usage\_threshold\_warning | Mysql memory usage in percent (warning threshold) | string | `"80"` | no |
 | memory\_usage\_time\_aggregator | Monitor aggregator for Mysql memory [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/mysql/inputs.tf b/cloud/azure/mysql/inputs.tf
index 9b07764..514c715 100644
--- a/cloud/azure/mysql/inputs.tf
+++ b/cloud/azure/mysql/inputs.tf
@@ -35,11 +35,6 @@ variable "filter_tags_custom" {
 }
 
 # Azure Databases for MySQL Servers specific variables
-variable "cpu_usage_silenced" {
-  description = "Groups to mute for Mysql CPU monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "cpu_usage_enabled" {
   description = "Flag to enable Mysql status monitor"
@@ -81,12 +76,6 @@ variable "cpu_usage_threshold_critical" {
   default     = "90"
 }
 
-variable "free_storage_silenced" {
-  description = "Groups to mute for Mysql Free Storage monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "free_storage_enabled" {
   description = "Flag to enable Mysql status monitor"
   type        = "string"
@@ -127,12 +116,6 @@ variable "free_storage_threshold_critical" {
   default     = "10"
 }
 
-variable "io_consumption_silenced" {
-  description = "Groups to mute for Mysql IO consumption monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "io_consumption_enabled" {
   description = "Flag to enable Mysql status monitor"
   type        = "string"
@@ -173,12 +156,6 @@ variable "io_consumption_threshold_critical" {
   default     = "90"
 }
 
-variable "memory_usage_silenced" {
-  description = "Groups to mute for Mysql memory monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_usage_enabled" {
   description = "Flag to enable Mysql status monitor"
   type        = "string"
diff --git a/cloud/azure/mysql/monitors-mysql.tf b/cloud/azure/mysql/monitors-mysql.tf
index 50f88cd..9dd0910 100644
--- a/cloud/azure/mysql/monitors-mysql.tf
+++ b/cloud/azure/mysql/monitors-mysql.tf
@@ -9,15 +9,13 @@ 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}"
     warning  = "${var.cpu_usage_threshold_warning}"
   }
 
-  silenced = "${var.cpu_usage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -42,15 +40,13 @@ 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}"
     warning  = "${var.free_storage_threshold_warning}"
   }
 
-  silenced = "${var.free_storage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -75,15 +71,13 @@ 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}"
     warning  = "${var.io_consumption_threshold_warning}"
   }
 
-  silenced = "${var.io_consumption_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -108,15 +102,13 @@ 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}"
     warning  = "${var.memory_usage_threshold_warning}"
   }
 
-  silenced = "${var.memory_usage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/postgresql/README.md b/cloud/azure/postgresql/README.md
index c5d8029..f52a20a 100644
--- a/cloud/azure/postgresql/README.md
+++ b/cloud/azure/postgresql/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_usage\_enabled | Flag to enable PostgreSQL status monitor | string | `"true"` | no |
 | cpu\_usage\_extra\_tags | Extra tags for PostgreSQL status monitor | list | `[]` | no |
 | cpu\_usage\_message | Custom message for PostgreSQL CPU monitor | string | `""` | no |
-| cpu\_usage\_silenced | Groups to mute for PostgreSQL CPU monitor | map | `{}` | no |
 | cpu\_usage\_threshold\_critical | PostgreSQL CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_usage\_threshold\_warning | PostgreSQL CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_usage\_time\_aggregator | Monitor aggregator for PostgreSQL CPU [available values: min, max or avg] | string | `"min"` | no |
@@ -41,7 +40,6 @@ Creates DataDog monitors with the following checks:
 | free\_storage\_enabled | Flag to enable PostgreSQL status monitor | string | `"true"` | no |
 | free\_storage\_extra\_tags | Extra tags for PostgreSQL status monitor | list | `[]` | no |
 | free\_storage\_message | Custom message for PostgreSQL Free Storage monitor | string | `""` | no |
-| free\_storage\_silenced | Groups to mute for PostgreSQL Free Storage monitor | map | `{}` | no |
 | free\_storage\_threshold\_critical | PostgreSQL Free Storage remaining in percent (critical threshold) | string | `"10"` | no |
 | free\_storage\_threshold\_warning | PostgreSQL Free Storage remaining in percent (warning threshold) | string | `"20"` | no |
 | free\_storage\_time\_aggregator | Monitor aggregator for PostgreSQL Free Storage [available values: min, max or avg] | string | `"min"` | no |
@@ -49,7 +47,6 @@ Creates DataDog monitors with the following checks:
 | io\_consumption\_enabled | Flag to enable PostgreSQL status monitor | string | `"true"` | no |
 | io\_consumption\_extra\_tags | Extra tags for PostgreSQL status monitor | list | `[]` | no |
 | io\_consumption\_message | Custom message for PostgreSQL IO consumption monitor | string | `""` | no |
-| io\_consumption\_silenced | Groups to mute for PostgreSQL IO consumption monitor | map | `{}` | no |
 | io\_consumption\_threshold\_critical | PostgreSQL IO consumption in percent (critical threshold) | string | `"90"` | no |
 | io\_consumption\_threshold\_warning | PostgreSQL IO consumption in percent (warning threshold) | string | `"80"` | no |
 | io\_consumption\_time\_aggregator | Monitor aggregator for PostgreSQL IO consumption [available values: min, max or avg] | string | `"min"` | no |
@@ -57,7 +54,6 @@ Creates DataDog monitors with the following checks:
 | memory\_usage\_enabled | Flag to enable PostgreSQL status monitor | string | `"true"` | no |
 | memory\_usage\_extra\_tags | Extra tags for PostgreSQL status monitor | list | `[]` | no |
 | memory\_usage\_message | Custom message for PostgreSQL memory monitor | string | `""` | no |
-| memory\_usage\_silenced | Groups to mute for PostgreSQL memory monitor | map | `{}` | no |
 | memory\_usage\_threshold\_critical | PostgreSQL memory usage in percent (critical threshold) | string | `"90"` | no |
 | memory\_usage\_threshold\_warning | PostgreSQL memory usage in percent (warning threshold) | string | `"80"` | no |
 | memory\_usage\_time\_aggregator | Monitor aggregator for PostgreSQL memory [available values: min, max or avg] | string | `"min"` | no |
@@ -67,7 +63,6 @@ Creates DataDog monitors with the following checks:
 | no\_connection\_enabled | Flag to enable PostgreSQL status monitor | string | `"true"` | no |
 | no\_connection\_extra\_tags | Extra tags for PostgreSQL status monitor | list | `[]` | no |
 | no\_connection\_message | Custom message for PostgreSQL no connection monitor | string | `""` | no |
-| no\_connection\_silenced | Groups to mute for PostgreSQL no connection monitor | map | `{}` | no |
 | no\_connection\_time\_aggregator | Monitor aggregator for PostgreSQL no connection [available values: min, max or avg] | string | `"min"` | no |
 | no\_connection\_timeframe | Monitor timeframe for PostgreSQL no connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
diff --git a/cloud/azure/postgresql/inputs.tf b/cloud/azure/postgresql/inputs.tf
index 2b530d5..137e1b2 100644
--- a/cloud/azure/postgresql/inputs.tf
+++ b/cloud/azure/postgresql/inputs.tf
@@ -35,11 +35,6 @@ variable "filter_tags_custom" {
 }
 
 # Azure Databases for PostgreSQL Servers specific variables
-variable "cpu_usage_silenced" {
-  description = "Groups to mute for PostgreSQL CPU monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "cpu_usage_enabled" {
   description = "Flag to enable PostgreSQL status monitor"
@@ -81,12 +76,6 @@ variable "cpu_usage_threshold_critical" {
   default     = "90"
 }
 
-variable "no_connection_silenced" {
-  description = "Groups to mute for PostgreSQL no connection monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "no_connection_enabled" {
   description = "Flag to enable PostgreSQL status monitor"
   type        = "string"
@@ -117,12 +106,6 @@ variable "no_connection_timeframe" {
   default     = "last_5m"
 }
 
-variable "free_storage_silenced" {
-  description = "Groups to mute for PostgreSQL Free Storage monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "free_storage_enabled" {
   description = "Flag to enable PostgreSQL status monitor"
   type        = "string"
@@ -163,12 +146,6 @@ variable "free_storage_threshold_critical" {
   default     = "10"
 }
 
-variable "io_consumption_silenced" {
-  description = "Groups to mute for PostgreSQL IO consumption monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "io_consumption_enabled" {
   description = "Flag to enable PostgreSQL status monitor"
   type        = "string"
@@ -209,12 +186,6 @@ variable "io_consumption_threshold_critical" {
   default     = "90"
 }
 
-variable "memory_usage_silenced" {
-  description = "Groups to mute for PostgreSQL memory monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_usage_enabled" {
   description = "Flag to enable PostgreSQL status monitor"
   type        = "string"
diff --git a/cloud/azure/postgresql/monitors-postegresql.tf b/cloud/azure/postgresql/monitors-postegresql.tf
index b5eb8a1..679278f 100644
--- a/cloud/azure/postgresql/monitors-postegresql.tf
+++ b/cloud/azure/postgresql/monitors-postegresql.tf
@@ -9,15 +9,13 @@ 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}"
     warning  = "${var.cpu_usage_threshold_warning}"
   }
 
-  silenced = "${var.cpu_usage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -42,9 +40,7 @@ resource "datadog_monitor" "postgresql_no_connection" {
     ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.no_connection_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -70,15 +66,13 @@ 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}"
     warning  = "${var.free_storage_threshold_warning}"
   }
 
-  silenced = "${var.free_storage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -103,15 +97,13 @@ 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}"
     warning  = "${var.io_consumption_threshold_warning}"
   }
 
-  silenced = "${var.io_consumption_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -136,15 +128,13 @@ 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}"
     warning  = "${var.memory_usage_threshold_warning}"
   }
 
-  silenced = "${var.memory_usage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/redis/README.md b/cloud/azure/redis/README.md
index bb8400d..a19fabe 100644
--- a/cloud/azure/redis/README.md
+++ b/cloud/azure/redis/README.md
@@ -30,7 +30,6 @@ Creates DataDog monitors with the following checks:
 | evictedkeys\_limit\_enabled | Flag to enable Redis evicted keys monitor | string | `"true"` | no |
 | evictedkeys\_limit\_extra\_tags | Extra tags for Redis evicted keys monitor | list | `[]` | no |
 | evictedkeys\_limit\_message | Custom message for Redis evicted keys monitor | string | `""` | no |
-| evictedkeys\_limit\_silenced | Groups to mute for Redis evicted keys monitor | map | `{}` | no |
 | evictedkeys\_limit\_threshold\_critical | Evicted keys limit (critical threshold) | string | `"100"` | no |
 | evictedkeys\_limit\_threshold\_warning | Evicted keys limit (warning threshold) | string | `"0"` | no |
 | evictedkeys\_limit\_time\_aggregator | Monitor aggregator for Redis evicted keys [available values: min, max or avg] | string | `"avg"` | no |
@@ -43,7 +42,6 @@ Creates DataDog monitors with the following checks:
 | percent\_processor\_time\_enabled | Flag to enable Redis processor monitor | string | `"true"` | no |
 | percent\_processor\_time\_extra\_tags | Extra tags for Redis processor monitor | list | `[]` | no |
 | percent\_processor\_time\_message | Custom message for Redis processor monitor | string | `""` | no |
-| percent\_processor\_time\_silenced | Groups to mute for Redis processor monitor | map | `{}` | no |
 | percent\_processor\_time\_threshold\_critical | Processor time percent (critical threshold) | string | `"80"` | no |
 | percent\_processor\_time\_threshold\_warning | Processor time percent (warning threshold) | string | `"60"` | no |
 | percent\_processor\_time\_time\_aggregator | Monitor aggregator for Redis processor [available values: min, max or avg] | string | `"min"` | no |
@@ -52,7 +50,6 @@ Creates DataDog monitors with the following checks:
 | server\_load\_rate\_enabled | Flag to enable Redis server load monitor | string | `"true"` | no |
 | server\_load\_rate\_extra\_tags | Extra tags for Redis server load monitor | list | `[]` | no |
 | server\_load\_rate\_message | Custom message for Redis server load monitor | string | `""` | no |
-| server\_load\_rate\_silenced | Groups to mute for Redis server load monitor | map | `{}` | no |
 | server\_load\_rate\_threshold\_critical | Server CPU load rate (critical threshold) | string | `"90"` | no |
 | server\_load\_rate\_threshold\_warning | Server CPU load rate (warning threshold) | string | `"70"` | no |
 | server\_load\_rate\_time\_aggregator | Monitor aggregator for Redis server load [available values: min, max or avg] | string | `"min"` | no |
@@ -60,7 +57,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Redis status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Redis status monitor | list | `[]` | no |
 | status\_message | Custom message for Redis status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Redis status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Redis status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Redis status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/redis/inputs.tf b/cloud/azure/redis/inputs.tf
index 473b815..7737430 100644
--- a/cloud/azure/redis/inputs.tf
+++ b/cloud/azure/redis/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Redis specific variables
-variable "status_silenced" {
-  description = "Groups to mute for Redis status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable Redis status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "evictedkeys_limit_silenced" {
-  description = "Groups to mute for Redis evicted keys monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "evictedkeys_limit_enabled" {
   description = "Flag to enable Redis evicted keys monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "evictedkeys_limit_threshold_critical" {
   default     = 100
 }
 
-variable "percent_processor_time_silenced" {
-  description = "Groups to mute for Redis processor monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "percent_processor_time_enabled" {
   description = "Flag to enable Redis processor monitor"
   type        = "string"
@@ -168,12 +151,6 @@ variable "percent_processor_time_threshold_warning" {
   default     = 60
 }
 
-variable "server_load_rate_silenced" {
-  description = "Groups to mute for Redis server load monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "server_load_rate_enabled" {
   description = "Flag to enable Redis server load monitor"
   type        = "string"
diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf
index 42d07f9..fd38fc2 100644
--- a/cloud/azure/redis/monitors-azure-redis.tf
+++ b/cloud/azure/redis/monitors-azure-redis.tf
@@ -9,9 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -37,15 +35,13 @@ resource "datadog_monitor" "evictedkeys" {
      ) > ${var.evictedkeys_limit_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.evictedkeys_limit_threshold_warning}"
     critical = "${var.evictedkeys_limit_threshold_critical}"
   }
 
-  silenced = "${var.evictedkeys_limit_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -70,15 +66,13 @@ 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}"
     critical = "${var.percent_processor_time_threshold_critical}"
   }
 
-  silenced = "${var.percent_processor_time_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -103,15 +97,13 @@ 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}"
     critical = "${var.server_load_rate_threshold_critical}"
   }
 
-  silenced = "${var.server_load_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/serverfarms/README.md b/cloud/azure/serverfarms/README.md
index 150d04e..0f68f6f 100644
--- a/cloud/azure/serverfarms/README.md
+++ b/cloud/azure/serverfarms/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_percentage\_enabled | Flag to enable the serverfarms cpu_percentage monitor | string | `"true"` | no |
 | cpu\_percentage\_extra\_tags | Extra tags for serverfarms cpu_percentage monitor | list | `[]` | no |
 | cpu\_percentage\_message | Custom message for serverfarm cpu_percentage monitor | string | `""` | no |
-| cpu\_percentage\_silenced | Groups to mute for serverfarm cpu_percentage monitor | map | `{}` | no |
 | cpu\_percentage\_threshold\_critical | CPU percentage (critical threshold) | string | `"95"` | no |
 | cpu\_percentage\_threshold\_warning | CPU percentage (warning threshold) | string | `"90"` | no |
 | cpu\_percentage\_time\_aggregator | Monitor aggregator for serverfarms cpu_percentage [available values: min, max or avg] | string | `"min"` | no |
@@ -39,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | memory\_percentage\_enabled | Flag to enable the serverfarms memory_percentage monitor | string | `"true"` | no |
 | memory\_percentage\_extra\_tags | Extra tags for serverfarms memory_percentage monitor | list | `[]` | no |
 | memory\_percentage\_message | Custom message for serverfarm memory_percentage monitor | string | `""` | no |
-| memory\_percentage\_silenced | Groups to mute for serverfarm memory_percentage monitor | map | `{}` | no |
 | memory\_percentage\_threshold\_critical | Memory percentage (critical threshold) | string | `"95"` | no |
 | memory\_percentage\_threshold\_warning | Memory percentage (warning threshold) | string | `"90"` | no |
 | memory\_percentage\_time\_aggregator | Monitor aggregator for serverfarms memory_percentage [available values: min, max or avg] | string | `"min"` | no |
@@ -50,7 +48,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable the serverfarms status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for serverfarms status monitor | list | `[]` | no |
 | status\_message | Custom message for serverfarm status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for serverfarm status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for serverfarms status [available values: min, max or avg] | string | `"min"` | no |
 | status\_timeframe | Monitor timeframe for serverfarms status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/serverfarms/inputs.tf b/cloud/azure/serverfarms/inputs.tf
index c9f6391..a3f5962 100644
--- a/cloud/azure/serverfarms/inputs.tf
+++ b/cloud/azure/serverfarms/inputs.tf
@@ -49,12 +49,6 @@ variable "status_message" {
   default     = ""
 }
 
-variable "status_silenced" {
-  type        = "map"
-  description = "Groups to mute for serverfarm status monitor"
-  default     = {}
-}
-
 variable "status_extra_tags" {
   description = "Extra tags for serverfarms status monitor"
   type        = "list"
@@ -86,12 +80,6 @@ variable "cpu_percentage_message" {
   default     = ""
 }
 
-variable "cpu_percentage_silenced" {
-  type        = "map"
-  description = "Groups to mute for serverfarm cpu_percentage monitor"
-  default     = {}
-}
-
 variable "cpu_percentage_extra_tags" {
   description = "Extra tags for serverfarms cpu_percentage monitor"
   type        = "list"
@@ -133,12 +121,6 @@ variable "memory_percentage_message" {
   default     = ""
 }
 
-variable "memory_percentage_silenced" {
-  type        = "map"
-  description = "Groups to mute for serverfarm memory_percentage monitor"
-  default     = {}
-}
-
 variable "memory_percentage_extra_tags" {
   description = "Extra tags for serverfarms memory_percentage monitor"
   type        = "list"
diff --git a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
index 99c477a..1dccf59 100644
--- a/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
+++ b/cloud/azure/serverfarms/monitors-azure-serverfarms.tf
@@ -9,9 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -37,15 +35,13 @@ resource "datadog_monitor" "cpu_percentage" {
     ) > ${var.cpu_percentage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.cpu_percentage_threshold_warning}"
     critical = "${var.cpu_percentage_threshold_critical}"
   }
 
-  silenced = "${var.cpu_percentage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -70,15 +66,13 @@ resource "datadog_monitor" "memory_percentage" {
     ) > ${var.memory_percentage_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.memory_percentage_threshold_warning}"
     critical = "${var.memory_percentage_threshold_critical}"
   }
 
-  silenced = "${var.memory_percentage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/servicebus/README.md b/cloud/azure/servicebus/README.md
index 9118036..7e754f0 100644
--- a/cloud/azure/servicebus/README.md
+++ b/cloud/azure/servicebus/README.md
@@ -34,13 +34,11 @@ Creates DataDog monitors with the following checks:
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | no\_active\_connections\_enabled | Flag to enable Service Bus status monitor | string | `"true"` | no |
 | no\_active\_connections\_message | Custom message for Service Bus status monitor | string | `""` | no |
-| no\_active\_connections\_silenced | Groups to mute for Service Bus status monitor | map | `{}` | no |
 | no\_active\_connections\_time\_aggregator | Monitor aggregator for Service Bus status [available values: min, max or avg] | string | `"max"` | no |
 | no\_active\_connections\_timeframe | Monitor timeframe for Service Bus status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | server\_errors\_enabled | Flag to enable Service Bus server errors monitor | string | `"true"` | no |
 | server\_errors\_message | Custom message for Service Bus server errors monitor | string | `""` | no |
-| server\_errors\_silenced | Groups to mute for Service Bus server errors monitor | map | `{}` | no |
 | server\_errors\_threshold\_critical | Critical threshold for Service Bus server errors monitor | string | `"90"` | no |
 | server\_errors\_threshold\_warning | Warning threshold for Service Bus server errors monitor | string | `"50"` | no |
 | server\_errors\_time\_aggregator | Monitor aggregator for Service Bus server errors [available values: min, max or avg] | string | `"min"` | no |
@@ -48,12 +46,10 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Service Bus status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Service Bus status monitor | list | `[]` | no |
 | status\_message | Custom message for Service Bus status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Service Bus status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Service Bus status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Service Bus status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | user\_errors\_enabled | Flag to enable Service Bus user errors monitor | string | `"true"` | no |
 | user\_errors\_message | Custom message for Service Bus user errors monitor | string | `""` | no |
-| user\_errors\_silenced | Groups to mute for Service Bus user errors monitor | map | `{}` | no |
 | user\_errors\_threshold\_critical | Critical threshold for Service Bus user errors monitor | string | `"90"` | no |
 | user\_errors\_threshold\_warning | Warning threshold for Service Bus user errors monitor | string | `"50"` | no |
 | user\_errors\_time\_aggregator | Monitor aggregator for Service Bus user errors [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/servicebus/inputs.tf b/cloud/azure/servicebus/inputs.tf
index 5aaf55c..6b69823 100644
--- a/cloud/azure/servicebus/inputs.tf
+++ b/cloud/azure/servicebus/inputs.tf
@@ -46,12 +46,6 @@ variable "status_enabled" {
   default     = "true"
 }
 
-variable "status_silenced" {
-  description = "Groups to mute for Service Bus status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "status_extra_tags" {
   description = "Extra tags for Service Bus status monitor"
   type        = "list"
@@ -81,12 +75,6 @@ variable "no_active_connections_enabled" {
   default     = "true"
 }
 
-variable "no_active_connections_silenced" {
-  description = "Groups to mute for Service Bus status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "no_active_connections_message" {
   description = "Custom message for Service Bus status monitor"
   type        = "string"
@@ -117,12 +105,6 @@ variable "server_errors_enabled" {
   default     = "true"
 }
 
-variable "server_errors_silenced" {
-  description = "Groups to mute for Service Bus server errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "server_errors_time_aggregator" {
   description = "Monitor aggregator for Service Bus server errors [available values: min, max or avg]"
   type        = "string"
@@ -157,12 +139,6 @@ variable "user_errors_enabled" {
   default     = "true"
 }
 
-variable "user_errors_silenced" {
-  description = "Groups to mute for Service Bus user errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "user_errors_time_aggregator" {
   description = "Monitor aggregator for Service Bus user errors [available values: min, max or avg]"
   type        = "string"
diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf
index e59cbce..ccad349 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -10,9 +10,7 @@ resource "datadog_monitor" "servicebus_status" {
       ) != 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -39,9 +37,7 @@ resource "datadog_monitor" "service_bus_no_active_connections" {
       ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.no_active_connections_silenced}"
+  type = "query alert"
 
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
@@ -69,15 +65,13 @@ 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}"
     warning  = "${var.user_errors_threshold_warning}"
   }
 
-  silenced = "${var.user_errors_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -104,15 +98,13 @@ 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}"
     warning  = "${var.server_errors_threshold_warning}"
   }
 
-  silenced = "${var.server_errors_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/sql-database/README.md b/cloud/azure/sql-database/README.md
index ad8edf1..ff2a933 100644
--- a/cloud/azure/sql-database/README.md
+++ b/cloud/azure/sql-database/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_enabled | Flag to enable SQL CPU monitor | string | `"true"` | no |
 | cpu\_extra\_tags | Extra tags for SQL CPU monitor | list | `[]` | no |
 | cpu\_message | Custom message for SQL CPU monitor | string | `""` | no |
-| cpu\_silenced | Groups to mute for SQL CPU monitor | map | `{}` | no |
 | cpu\_threshold\_critical | CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_threshold\_warning | CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_time\_aggregator | Monitor aggregator for SQL CPU [available values: min, max or avg] | string | `"min"` | no |
@@ -37,13 +36,11 @@ Creates DataDog monitors with the following checks:
 | deadlock\_enabled | Flag to enable SQL Deadlock monitor | string | `"true"` | no |
 | deadlock\_extra\_tags | Extra tags for SQL Deadlock monitor | list | `[]` | no |
 | deadlock\_message | Custom message for SQL Deadlock monitor | string | `""` | no |
-| deadlock\_silenced | Groups to mute for SQL Deadlock monitor | map | `{}` | no |
 | deadlock\_threshold\_critical | Amount of Deadlocks (critical threshold) | string | `"1"` | no |
 | deadlock\_timeframe | Monitor timeframe for SQL Deadlock [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | diskspace\_enabled | Flag to enable SQL disk space monitor | string | `"true"` | no |
 | diskspace\_extra\_tags | Extra tags for SQL disk space monitor | list | `[]` | no |
 | diskspace\_message | Custom message for SQL disk space monitor | string | `""` | no |
-| diskspace\_silenced | Groups to mute for SQL disk space monitor | map | `{}` | no |
 | diskspace\_threshold\_critical | Disk space used in percent (critical threshold) | string | `"90"` | no |
 | diskspace\_threshold\_warning | Disk space used in percent (warning threshold) | string | `"80"` | no |
 | diskspace\_time\_aggregator | Monitor aggregator for SQL disk space [available values: min, max or avg] | string | `"max"` | no |
@@ -51,7 +48,6 @@ Creates DataDog monitors with the following checks:
 | dtu\_enabled | Flag to enable SQL DTU monitor | string | `"true"` | no |
 | dtu\_extra\_tags | Extra tags for SQL DTU monitor | list | `[]` | no |
 | dtu\_message | Custom message for SQL DTU monitor | string | `""` | no |
-| dtu\_silenced | Groups to mute for SQL DTU monitor | map | `{}` | no |
 | dtu\_threshold\_critical | Amount of DTU used (critical threshold) | string | `"90"` | no |
 | dtu\_threshold\_warning | Amount of DTU used (warning threshold) | string | `"85"` | no |
 | dtu\_time\_aggregator | Monitor aggregator for SQL DTU [available values: min, max or avg] | string | `"avg"` | no |
@@ -67,7 +63,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Redis status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Redis status monitor | list | `[]` | no |
 | status\_message | Custom message for Redis status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Redis status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Redis status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Redis status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/sql-database/inputs.tf b/cloud/azure/sql-database/inputs.tf
index e9ab810..10190b5 100644
--- a/cloud/azure/sql-database/inputs.tf
+++ b/cloud/azure/sql-database/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure SQL Database specific variables
-variable "status_silenced" {
-  description = "Groups to mute for Redis status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable Redis status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "cpu_silenced" {
-  description = "Groups to mute for SQL CPU monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_enabled" {
   description = "Flag to enable SQL CPU monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "cpu_threshold_critical" {
   default     = "90"
 }
 
-variable "diskspace_silenced" {
-  description = "Groups to mute for SQL disk space monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "diskspace_enabled" {
   description = "Flag to enable SQL disk space monitor"
   type        = "string"
@@ -168,12 +151,6 @@ variable "diskspace_threshold_critical" {
   default     = "90"
 }
 
-variable "dtu_silenced" {
-  description = "Groups to mute for SQL DTU monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "dtu_enabled" {
   description = "Flag to enable SQL DTU monitor"
   type        = "string"
@@ -214,12 +191,6 @@ variable "dtu_threshold_critical" {
   default     = "90"
 }
 
-variable "deadlock_silenced" {
-  description = "Groups to mute for SQL Deadlock monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "deadlock_enabled" {
   description = "Flag to enable SQL Deadlock monitor"
   type        = "string"
diff --git a/cloud/azure/sql-database/monitors-sql-database.tf b/cloud/azure/sql-database/monitors-sql-database.tf
index e7e563d..6d8908c 100644
--- a/cloud/azure/sql-database/monitors-sql-database.tf
+++ b/cloud/azure/sql-database/monitors-sql-database.tf
@@ -9,9 +9,7 @@ resource "datadog_monitor" "status" {
     ) != 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -37,15 +35,13 @@ resource "datadog_monitor" "sql-database_cpu" {
     ) > ${var.cpu_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_threshold_critical}"
     warning  = "${var.cpu_threshold_warning}"
   }
 
-  silenced = "${var.cpu_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -64,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}): (
@@ -77,8 +73,6 @@ resource "datadog_monitor" "sql-database_free_space_low" {
     critical = "${var.diskspace_threshold_critical}"
   }
 
-  silenced = "${var.diskspace_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -97,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}): (
@@ -110,8 +104,6 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" {
     critical = "${var.dtu_threshold_critical}"
   }
 
-  silenced = "${var.dtu_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -130,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}): (
@@ -142,8 +134,6 @@ resource "datadog_monitor" "sql-database_deadlocks_count" {
     critical = "${var.deadlock_threshold_critical}"
   }
 
-  silenced = "${var.deadlock_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/sql-elasticpool/README.md b/cloud/azure/sql-elasticpool/README.md
index 39deae3..c51b049 100644
--- a/cloud/azure/sql-elasticpool/README.md
+++ b/cloud/azure/sql-elasticpool/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_enabled | Flag to enable SQL Elastic Pool CPU monitor | string | `"true"` | no |
 | cpu\_extra\_tags | Extra tags for SQL Elastic Pool CPU monitor | list | `[]` | no |
 | cpu\_message | Custom message for SQL Elastic Pool CPU monitor | string | `""` | no |
-| cpu\_silenced | Groups to mute for SQL Elastic Pool CPU monitor | map | `{}` | no |
 | cpu\_threshold\_critical | CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_threshold\_warning | CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_time\_aggregator | Monitor aggregator for SQL Elastic Pool CPU [available values: min, max or avg] | string | `"min"` | no |
@@ -35,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | diskspace\_enabled | Flag to enable SQL Elastic Pool disk space monitor | string | `"true"` | no |
 | diskspace\_extra\_tags | Extra tags for SQL Elastic Pool disk space monitor | list | `[]` | no |
 | diskspace\_message | Custom message for SQL Elastic Pool disk space monitor | string | `""` | no |
-| diskspace\_silenced | Groups to mute for SQL Elastic Pool disk space monitor | map | `{}` | no |
 | diskspace\_threshold\_critical | Disk space used in percent (critical threshold) | string | `"90"` | no |
 | diskspace\_threshold\_warning | Disk space used in percent (warning threshold) | string | `"80"` | no |
 | diskspace\_time\_aggregator | Monitor aggregator for SQL Elastic Pool disk space [available values: min, max or avg] | string | `"max"` | no |
@@ -43,7 +41,6 @@ Creates DataDog monitors with the following checks:
 | dtu\_enabled | Flag to enable SQL Elastic Pool DTU monitor | string | `"true"` | no |
 | dtu\_extra\_tags | Extra tags for SQL Elastic Pool DTU monitor | list | `[]` | no |
 | dtu\_message | Custom message for SQL Elastic Pool DTU monitor | string | `""` | no |
-| dtu\_silenced | Groups to mute for SQL Elastic Pool DTU monitor | map | `{}` | no |
 | dtu\_threshold\_critical | Amount of DTU used (critical threshold) | string | `"90"` | no |
 | dtu\_threshold\_warning | Amount of DTU used (warning threshold) | string | `"85"` | no |
 | dtu\_time\_aggregator | Monitor aggregator for SQL Elastic Pool DTU [available values: min, max or avg] | string | `"avg"` | no |
diff --git a/cloud/azure/sql-elasticpool/inputs.tf b/cloud/azure/sql-elasticpool/inputs.tf
index 5f1d37b..89f63ec 100644
--- a/cloud/azure/sql-elasticpool/inputs.tf
+++ b/cloud/azure/sql-elasticpool/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure SQL Elastic Pool specific variables
-variable "cpu_silenced" {
-  description = "Groups to mute for SQL Elastic Pool CPU monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "cpu_enabled" {
   description = "Flag to enable SQL Elastic Pool CPU monitor"
@@ -86,12 +81,6 @@ variable "cpu_threshold_critical" {
   default     = "90"
 }
 
-variable "diskspace_silenced" {
-  description = "Groups to mute for SQL Elastic Pool disk space monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "diskspace_enabled" {
   description = "Flag to enable SQL Elastic Pool disk space monitor"
   type        = "string"
@@ -132,12 +121,6 @@ variable "diskspace_threshold_critical" {
   default     = "90"
 }
 
-variable "dtu_silenced" {
-  description = "Groups to mute for SQL Elastic Pool DTU monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "dtu_enabled" {
   description = "Flag to enable SQL Elastic Pool DTU monitor"
   type        = "string"
diff --git a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
index 06e658b..3cea3cc 100644
--- a/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
+++ b/cloud/azure/sql-elasticpool/monitors-sql-elasticpool.tf
@@ -9,15 +9,13 @@ resource "datadog_monitor" "sql_elasticpool_cpu" {
     ) > ${var.cpu_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     critical = "${var.cpu_threshold_critical}"
     warning  = "${var.cpu_threshold_warning}"
   }
 
-  silenced = "${var.cpu_silenced}"
-
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -36,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}): (
@@ -49,8 +47,6 @@ resource "datadog_monitor" "sql_elasticpool_free_space_low" {
     critical = "${var.diskspace_threshold_critical}"
   }
 
-  silenced = "${var.diskspace_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -69,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}): (
@@ -82,8 +78,6 @@ resource "datadog_monitor" "sql_elasticpool_dtu_consumption_high" {
     critical = "${var.dtu_threshold_critical}"
   }
 
-  silenced = "${var.dtu_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md
index e1e393b..279dcfb 100644
--- a/cloud/azure/storage/README.md
+++ b/cloud/azure/storage/README.md
@@ -33,7 +33,6 @@ Creates DataDog monitors with the following checks:
 | authorization\_error\_requests\_enabled | Flag to enable Storage authorization errors monitor | string | `"true"` | no |
 | authorization\_error\_requests\_extra\_tags | Extra tags for Storage authorization errors monitor | list | `[]` | no |
 | authorization\_error\_requests\_message | Custom message for Storage authorization errors monitor | string | `""` | no |
-| authorization\_error\_requests\_silenced | Groups to mute for Storage authorization errors monitor | map | `{}` | no |
 | authorization\_error\_requests\_threshold\_critical | Maximum acceptable percent of authorization error requests for a storage | string | `"90"` | no |
 | authorization\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of authorization error requests for a storage | string | `"50"` | no |
 | authorization\_error\_requests\_time\_aggregator | Monitor aggregator for Storage authorization errors [available values: min, max or avg] | string | `"min"` | no |
@@ -41,7 +40,6 @@ Creates DataDog monitors with the following checks:
 | availability\_enabled | Flag to enable Storage availability monitor | string | `"true"` | no |
 | availability\_extra\_tags | Extra tags for Storage availability monitor | list | `[]` | no |
 | availability\_message | Custom message for Storage availability monitor | string | `""` | no |
-| availability\_silenced | Groups to mute for Storage availability monitor | map | `{}` | no |
 | availability\_threshold\_critical | Minimum acceptable percent of availability for a storage | string | `"50"` | no |
 | availability\_threshold\_warning | Warning regarding acceptable percent of availability for a storage | string | `"90"` | no |
 | availability\_time\_aggregator | Monitor aggregator for Storage availability [available values: min, max or avg] | string | `"max"` | no |
@@ -49,7 +47,6 @@ Creates DataDog monitors with the following checks:
 | client\_other\_error\_requests\_enabled | Flag to enable Storage other errors monitor | string | `"true"` | no |
 | client\_other\_error\_requests\_extra\_tags | Extra tags for Storage other errors monitor | list | `[]` | no |
 | client\_other\_error\_requests\_message | Custom message for Storage other errors monitor | string | `""` | no |
-| client\_other\_error\_requests\_silenced | Groups to mute for Storage other errors monitor | map | `{}` | no |
 | client\_other\_error\_requests\_threshold\_critical | Maximum acceptable percent of client other error requests for a storage | string | `"90"` | no |
 | client\_other\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of client other error requests for a storage | string | `"50"` | no |
 | client\_other\_error\_requests\_time\_aggregator | Monitor aggregator for Storage other errors [available values: min, max or avg] | string | `"min"` | no |
@@ -62,7 +59,6 @@ Creates DataDog monitors with the following checks:
 | latency\_enabled | Flag to enable Storage latency monitor | string | `"true"` | no |
 | latency\_extra\_tags | Extra tags for Storage latency monitor | list | `[]` | no |
 | latency\_message | Custom message for Storage latency monitor | string | `""` | no |
-| latency\_silenced | Groups to mute for Storage latency monitor | map | `{}` | no |
 | latency\_threshold\_critical | Maximum acceptable end to end latency (ms) for a storage | string | `"2000"` | no |
 | latency\_threshold\_warning | Warning regarding acceptable end to end latency (ms) for a storage | string | `"1000"` | no |
 | latency\_time\_aggregator | Monitor aggregator for Storage latency [available values: min, max or avg] | string | `"min"` | no |
@@ -71,7 +67,6 @@ Creates DataDog monitors with the following checks:
 | network\_error\_requests\_enabled | Flag to enable Storage network errors monitor | string | `"true"` | no |
 | network\_error\_requests\_extra\_tags | Extra tags for Storage network errors monitor | list | `[]` | no |
 | network\_error\_requests\_message | Custom message for Storage network errors monitor | string | `""` | no |
-| network\_error\_requests\_silenced | Groups to mute for Storage network errors monitor | map | `{}` | no |
 | network\_error\_requests\_threshold\_critical | Maximum acceptable percent of network error requests for a storage | string | `"90"` | no |
 | network\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of network error requests for a storage | string | `"50"` | no |
 | network\_error\_requests\_time\_aggregator | Monitor aggregator for Storage network errors [available values: min, max or avg] | string | `"min"` | no |
@@ -81,7 +76,6 @@ Creates DataDog monitors with the following checks:
 | server\_other\_error\_requests\_enabled | Flag to enable Storage server other errors monitor | string | `"true"` | no |
 | server\_other\_error\_requests\_extra\_tags | Extra tags for Storage server other errors monitor | list | `[]` | no |
 | server\_other\_error\_requests\_message | Custom message for Storage server other errors monitor | string | `""` | no |
-| server\_other\_error\_requests\_silenced | Groups to mute for Storage server other errors monitor | map | `{}` | no |
 | server\_other\_error\_requests\_threshold\_critical | Maximum acceptable percent of server other error requests for a storage | string | `"90"` | no |
 | server\_other\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of server other error requests for a storage | string | `"50"` | no |
 | server\_other\_error\_requests\_time\_aggregator | Monitor aggregator for Storage other errors [available values: min, max or avg] | string | `"min"` | no |
@@ -89,7 +83,6 @@ Creates DataDog monitors with the following checks:
 | successful\_requests\_enabled | Flag to enable Storage sucessful requests monitor | string | `"true"` | no |
 | successful\_requests\_extra\_tags | Extra tags for Storage sucessful requests monitor | list | `[]` | no |
 | successful\_requests\_message | Custom message for Storage sucessful requests monitor | string | `""` | no |
-| successful\_requests\_silenced | Groups to mute for Storage sucessful requests monitor | map | `{}` | no |
 | successful\_requests\_threshold\_critical | Minimum acceptable percent of successful requests for a storage | string | `"10"` | no |
 | successful\_requests\_threshold\_warning | Warning regarding acceptable percent of successful requests for a storage | string | `"30"` | no |
 | successful\_requests\_time\_aggregator | Monitor aggregator for Storage sucessful requests [available values: min, max or avg] | string | `"max"` | no |
@@ -97,7 +90,6 @@ Creates DataDog monitors with the following checks:
 | throttling\_error\_requests\_enabled | Flag to enable Storage throttling error monitor | string | `"true"` | no |
 | throttling\_error\_requests\_extra\_tags | Extra tags for Storage throttling error monitor | list | `[]` | no |
 | throttling\_error\_requests\_message | Custom message for Storage throttling error monitor | string | `""` | no |
-| throttling\_error\_requests\_silenced | Groups to mute for Storage throttling error monitor | map | `{}` | no |
 | throttling\_error\_requests\_threshold\_critical | Maximum acceptable percent of throttling error requests for a storage | string | `"90"` | no |
 | throttling\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of throttling error requests for a storage | string | `"50"` | no |
 | throttling\_error\_requests\_time\_aggregator | Monitor aggregator for Storage throttling errors [available values: min, max or avg] | string | `"min"` | no |
@@ -105,7 +97,6 @@ Creates DataDog monitors with the following checks:
 | timeout\_error\_requests\_enabled | Flag to enable Storage timeout monitor | string | `"true"` | no |
 | timeout\_error\_requests\_extra\_tags | Extra tags for Storage timeout monitor | list | `[]` | no |
 | timeout\_error\_requests\_message | Custom message for Storage timeout monitor | string | `""` | no |
-| timeout\_error\_requests\_silenced | Groups to mute for Storage timeout monitor | map | `{}` | no |
 | timeout\_error\_requests\_threshold\_critical | Maximum acceptable percent of timeout error requests for a storage | string | `"90"` | no |
 | timeout\_error\_requests\_threshold\_warning | Warning regarding acceptable percent of timeout error requests for a storage | string | `"50"` | no |
 | timeout\_error\_requests\_time\_aggregator | Monitor aggregator for Storage timeout [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf
index 40e0136..2214a8f 100644
--- a/cloud/azure/storage/inputs.tf
+++ b/cloud/azure/storage/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Storage specific variables
-variable "availability_silenced" {
-  description = "Groups to mute for Storage availability monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "availability_enabled" {
   description = "Flag to enable Storage availability monitor"
@@ -86,12 +81,6 @@ variable "availability_threshold_warning" {
   default     = 90
 }
 
-variable "successful_requests_silenced" {
-  description = "Groups to mute for Storage sucessful requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "successful_requests_enabled" {
   description = "Flag to enable Storage sucessful requests monitor"
   type        = "string"
@@ -132,12 +121,6 @@ variable "successful_requests_threshold_warning" {
   default     = 30
 }
 
-variable "latency_silenced" {
-  description = "Groups to mute for Storage latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "latency_enabled" {
   description = "Flag to enable Storage latency monitor"
   type        = "string"
@@ -178,12 +161,6 @@ variable "latency_threshold_warning" {
   default     = 1000
 }
 
-variable "timeout_error_requests_silenced" {
-  description = "Groups to mute for Storage timeout monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "timeout_error_requests_enabled" {
   description = "Flag to enable Storage timeout monitor"
   type        = "string"
@@ -224,12 +201,6 @@ variable "timeout_error_requests_threshold_warning" {
   default     = 50
 }
 
-variable "network_error_requests_silenced" {
-  description = "Groups to mute for Storage network errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "network_error_requests_enabled" {
   description = "Flag to enable Storage network errors monitor"
   type        = "string"
@@ -270,12 +241,6 @@ variable "network_error_requests_threshold_warning" {
   default     = 50
 }
 
-variable "throttling_error_requests_silenced" {
-  description = "Groups to mute for Storage throttling error monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "throttling_error_requests_enabled" {
   description = "Flag to enable Storage throttling error monitor"
   type        = "string"
@@ -316,12 +281,6 @@ variable "throttling_error_requests_threshold_warning" {
   default     = 50
 }
 
-variable "server_other_error_requests_silenced" {
-  description = "Groups to mute for Storage server other errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "server_other_error_requests_enabled" {
   description = "Flag to enable Storage server other errors monitor"
   type        = "string"
@@ -362,12 +321,6 @@ variable "server_other_error_requests_threshold_warning" {
   default     = 50
 }
 
-variable "client_other_error_requests_silenced" {
-  description = "Groups to mute for Storage other errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "client_other_error_requests_enabled" {
   description = "Flag to enable Storage other errors monitor"
   type        = "string"
@@ -408,12 +361,6 @@ variable "client_other_error_requests_threshold_warning" {
   default     = 50
 }
 
-variable "authorization_error_requests_silenced" {
-  description = "Groups to mute for Storage authorization errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "authorization_error_requests_enabled" {
   description = "Flag to enable Storage authorization errors monitor"
   type        = "string"
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index f78ba31..f5b6d92 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -14,9 +14,7 @@ resource "datadog_monitor" "availability" {
     warning  = "${var.availability_threshold_warning}"
   }
 
-  silenced = "${var.availability_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -46,9 +44,7 @@ resource "datadog_monitor" "successful_requests" {
     warning  = "${var.successful_requests_threshold_warning}"
   }
 
-  silenced = "${var.successful_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -78,9 +74,7 @@ resource "datadog_monitor" "latency" {
     warning  = "${var.latency_threshold_warning}"
   }
 
-  silenced = "${var.latency_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -110,9 +104,7 @@ resource "datadog_monitor" "timeout_error_requests" {
     warning  = "${var.timeout_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.timeout_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -142,9 +134,7 @@ resource "datadog_monitor" "network_error_requests" {
     warning  = "${var.network_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.network_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -174,9 +164,7 @@ resource "datadog_monitor" "throttling_error_requests" {
     warning  = "${var.throttling_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.throttling_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -206,9 +194,7 @@ resource "datadog_monitor" "server_other_error_requests" {
     warning  = "${var.server_other_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.server_other_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -238,9 +224,7 @@ resource "datadog_monitor" "client_other_error_requests" {
     warning  = "${var.client_other_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.client_other_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
@@ -270,9 +254,7 @@ resource "datadog_monitor" "authorization_error_requests" {
     warning  = "${var.authorization_error_requests_threshold_warning}"
   }
 
-  silenced = "${var.authorization_error_requests_silenced}"
-
-  type                = "metric alert"
+  type                = "query alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
diff --git a/cloud/azure/stream-analytics/README.md b/cloud/azure/stream-analytics/README.md
index 363106b..8ac4b81 100644
--- a/cloud/azure/stream-analytics/README.md
+++ b/cloud/azure/stream-analytics/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | conversion\_errors\_enabled | Flag to enable Stream Analytics conversion errors monitor | string | `"true"` | no |
 | conversion\_errors\_extra\_tags | Extra tags for Stream Analytics conversion errors monitor | list | `[]` | no |
 | conversion\_errors\_message | Custom message for Stream Analytics conversion errors monitor | string | `""` | no |
-| conversion\_errors\_silenced | Groups to mute for Stream Analytics conversion errors monitor | map | `{}` | no |
 | conversion\_errors\_threshold\_critical | Conversion errors limit (critical threshold) | string | `"10"` | no |
 | conversion\_errors\_threshold\_warning | Conversion errors limit (warning threshold) | string | `"0"` | no |
 | conversion\_errors\_time\_aggregator | Monitor aggregator for Stream Analytics conversion errors [available values: min, max or avg] | string | `"min"` | no |
@@ -39,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | failed\_function\_requests\_enabled | Flag to enable Stream Analytics failed requests monitor | string | `"true"` | no |
 | failed\_function\_requests\_extra\_tags | Extra tags for Stream Analytics failed requests monitor | list | `[]` | no |
 | failed\_function\_requests\_message | Custom message for Stream Analytics failed requests monitor | string | `""` | no |
-| failed\_function\_requests\_silenced | Groups to mute for Stream Analytics failed requests monitor | map | `{}` | no |
 | failed\_function\_requests\_threshold\_critical | Failed Function Request rate limit (critical threshold) | string | `"10"` | no |
 | failed\_function\_requests\_threshold\_warning | Failed Function Request rate limit (warning threshold) | string | `"0"` | no |
 | failed\_function\_requests\_time\_aggregator | Monitor aggregator for Stream Analytics failed requests [available values: min, max or avg] | string | `"min"` | no |
@@ -53,7 +51,6 @@ Creates DataDog monitors with the following checks:
 | runtime\_errors\_enabled | Flag to enable Stream Analytics runtime errors monitor | string | `"true"` | no |
 | runtime\_errors\_extra\_tags | Extra tags for Stream Analytics runtime errors monitor | list | `[]` | no |
 | runtime\_errors\_message | Custom message for Stream Analytics runtime errors monitor | string | `""` | no |
-| runtime\_errors\_silenced | Groups to mute for Stream Analytics runtime errors monitor | map | `{}` | no |
 | runtime\_errors\_threshold\_critical | Runtime errors limit (critical threshold) | string | `"10"` | no |
 | runtime\_errors\_threshold\_warning | Runtime errors limit (warning threshold) | string | `"0"` | no |
 | runtime\_errors\_time\_aggregator | Monitor aggregator for Stream Analytics runtime errors [available values: min, max or avg] | string | `"min"` | no |
@@ -61,13 +58,11 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Stream Analytics status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Stream Analytics status monitor | list | `[]` | no |
 | status\_message | Custom message for Stream Analytics status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Stream Analytics status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Stream Analytics status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Stream Analytics status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | su\_utilization\_enabled | Flag to enable Stream Analytics utilization monitor | string | `"true"` | no |
 | su\_utilization\_extra\_tags | Extra tags for Stream Analytics utilization monitor | list | `[]` | no |
 | su\_utilization\_message | Custom message for Stream Analytics utilization monitor | string | `""` | no |
-| su\_utilization\_silenced | Groups to mute for Stream Analytics utilization monitor | map | `{}` | no |
 | su\_utilization\_threshold\_critical | Streaming Unit utilization rate limit (critical threshold) | string | `"80"` | no |
 | su\_utilization\_threshold\_warning | Streaming Unit utilization rate limit (warning threshold) | string | `"60"` | no |
 | su\_utilization\_time\_aggregator | Monitor aggregator for Stream Analytics utilization [available values: min, max or avg] | string | `"min"` | no |
diff --git a/cloud/azure/stream-analytics/inputs.tf b/cloud/azure/stream-analytics/inputs.tf
index 8bb45d1..314bb1f 100644
--- a/cloud/azure/stream-analytics/inputs.tf
+++ b/cloud/azure/stream-analytics/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Stream Analytics specific variables
-variable "status_silenced" {
-  description = "Groups to mute for Stream Analytics status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable Stream Analytics status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "su_utilization_silenced" {
-  description = "Groups to mute for Stream Analytics utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "su_utilization_enabled" {
   description = "Flag to enable Stream Analytics utilization monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "su_utilization_threshold_critical" {
   default     = 80
 }
 
-variable "failed_function_requests_silenced" {
-  description = "Groups to mute for Stream Analytics failed requests monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failed_function_requests_enabled" {
   description = "Flag to enable Stream Analytics failed requests monitor"
   type        = "string"
@@ -168,12 +151,6 @@ variable "failed_function_requests_threshold_critical" {
   default     = 10
 }
 
-variable "conversion_errors_silenced" {
-  description = "Groups to mute for Stream Analytics conversion errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "conversion_errors_enabled" {
   description = "Flag to enable Stream Analytics conversion errors monitor"
   type        = "string"
@@ -214,12 +191,6 @@ variable "conversion_errors_threshold_critical" {
   default     = 10
 }
 
-variable "runtime_errors_silenced" {
-  description = "Groups to mute for Stream Analytics runtime errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "runtime_errors_enabled" {
   description = "Flag to enable Stream Analytics runtime errors monitor"
   type        = "string"
diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
index da634db..f9ab56a 100644
--- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf
+++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
@@ -9,9 +9,7 @@ resource "datadog_monitor" "status" {
     ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -37,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}"
@@ -54,8 +52,6 @@ resource "datadog_monitor" "su_utilization" {
     critical = "${var.su_utilization_threshold_critical}"
   }
 
-  silenced = "${var.su_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform", "${var.su_utilization_extra_tags}"]
 }
 
@@ -71,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}"
@@ -88,8 +84,6 @@ resource "datadog_monitor" "failed_function_requests" {
     critical = "${var.failed_function_requests_threshold_critical}"
   }
 
-  silenced = "${var.failed_function_requests_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform", "${var.failed_function_requests_extra_tags}"]
 }
 
@@ -104,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}"
@@ -121,8 +115,6 @@ resource "datadog_monitor" "conversion_errors" {
     critical = "${var.conversion_errors_threshold_critical}"
   }
 
-  silenced = "${var.conversion_errors_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform", "${var.conversion_errors_extra_tags}"]
 }
 
@@ -137,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}"
@@ -154,7 +146,5 @@ resource "datadog_monitor" "runtime_errors" {
     critical = "${var.runtime_errors_threshold_critical}"
   }
 
-  silenced = "${var.runtime_errors_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:stream-analytics", "team:claranet", "created-by:terraform", "${var.runtime_errors_extra_tags}"]
 }
diff --git a/cloud/azure/virtual-machine/README.md b/cloud/azure/virtual-machine/README.md
index 1c1548b..a4b4a6e 100644
--- a/cloud/azure/virtual-machine/README.md
+++ b/cloud/azure/virtual-machine/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_remaining\_rate\_enabled | Flag to enable Virtual Machine CPU remaining monitor | string | `"true"` | no |
 | cpu\_remaining\_rate\_extra\_tags | Extra tags for Virtual Machine CPU remaining monitor | list | `[]` | no |
 | cpu\_remaining\_rate\_message | Custom message for Virtual Machine CPU remaining monitor | string | `""` | no |
-| cpu\_remaining\_rate\_silenced | Groups to mute for Virtual Machine CPU remaining monitor | map | `{}` | no |
 | cpu\_remaining\_rate\_threshold\_critical | Virtual Machine CPU rate limit (critical threshold) | string | `"15"` | no |
 | cpu\_remaining\_rate\_threshold\_warning | Virtual Machine CPU rate limit (warning threshold) | string | `"30"` | no |
 | cpu\_remaining\_rate\_time\_aggregator | Monitor aggregator for Virtual Machine CPU remaining [available values: min, max, sum or avg] | string | `"min"` | no |
@@ -35,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_usage\_enabled | Flag to enable Virtual Machine status monitor | string | `"true"` | no |
 | cpu\_usage\_extra\_tags | Extra tags for Virtual Machine status monitor | list | `[]` | no |
 | cpu\_usage\_message | Custom message for Virtual Machine CPU monitor | string | `""` | no |
-| cpu\_usage\_silenced | Groups to mute for Virtual Machine CPU monitor | map | `{}` | no |
 | cpu\_usage\_threshold\_critical | Virtual Machine CPU usage in percent (critical threshold) | string | `"90"` | no |
 | cpu\_usage\_threshold\_warning | Virtual Machine CPU usage in percent (warning threshold) | string | `"80"` | no |
 | cpu\_usage\_time\_aggregator | Monitor aggregator for Virtual Machine CPU [available values: min, max or avg] | string | `"min"` | no |
@@ -51,7 +49,6 @@ Creates DataDog monitors with the following checks:
 | status\_enabled | Flag to enable Virtual Machine status monitor | string | `"true"` | no |
 | status\_extra\_tags | Extra tags for Virtual Machine status monitor | list | `[]` | no |
 | status\_message | Custom message for Virtual Machine status monitor | string | `""` | no |
-| status\_silenced | Groups to mute for Virtual Machine status monitor | map | `{}` | no |
 | status\_time\_aggregator | Monitor aggregator for Virtual Machine status [available values: min, max or avg] | string | `"max"` | no |
 | status\_timeframe | Monitor timeframe for Virtual Machine status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 
diff --git a/cloud/azure/virtual-machine/inputs.tf b/cloud/azure/virtual-machine/inputs.tf
index 4de4cad..485a86d 100644
--- a/cloud/azure/virtual-machine/inputs.tf
+++ b/cloud/azure/virtual-machine/inputs.tf
@@ -40,11 +40,6 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Virtual Machine specific variables
-variable "status_silenced" {
-  description = "Groups to mute for Virtual Machine status monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "status_enabled" {
   description = "Flag to enable Virtual Machine status monitor"
@@ -76,12 +71,6 @@ variable "status_timeframe" {
   default     = "last_5m"
 }
 
-variable "cpu_usage_silenced" {
-  description = "Groups to mute for Virtual Machine CPU monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_usage_enabled" {
   description = "Flag to enable Virtual Machine status monitor"
   type        = "string"
@@ -122,12 +111,6 @@ variable "cpu_usage_threshold_critical" {
   default     = "90"
 }
 
-variable "cpu_remaining_rate_silenced" {
-  description = "Groups to mute for Virtual Machine CPU remaining monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_remaining_rate_enabled" {
   description = "Flag to enable Virtual Machine CPU remaining monitor"
   type        = "string"
diff --git a/cloud/azure/virtual-machine/monitors-virtual-machine.tf b/cloud/azure/virtual-machine/monitors-virtual-machine.tf
index 49ecb0c..aaeddc7 100644
--- a/cloud/azure/virtual-machine/monitors-virtual-machine.tf
+++ b/cloud/azure/virtual-machine/monitors-virtual-machine.tf
@@ -10,9 +10,7 @@ resource "datadog_monitor" "virtualmachine_status" {
       ) < 1
   EOQ
 
-  type = "metric alert"
-
-  silenced = "${var.status_silenced}"
+  type = "query alert"
 
   notify_no_data      = true
   evaluation_delay    = "${var.evaluation_delay}"
@@ -38,15 +36,13 @@ 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}"
     warning  = "${var.cpu_usage_threshold_warning}"
   }
 
-  silenced = "${var.cpu_usage_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -74,15 +70,13 @@ 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}"
     critical = "${var.cpu_remaining_rate_threshold_critical}"
   }
 
-  silenced = "${var.cpu_remaining_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/cloud/gcp/big-query/README.md b/cloud/gcp/big-query/README.md
index fb29014..0331fca 100644
--- a/cloud/gcp/big-query/README.md
+++ b/cloud/gcp/big-query/README.md
@@ -33,14 +33,12 @@ Creates DataDog monitors with the following checks:
 | available\_slots\_enabled | Flag to enable GCP Big Query Available Slots monitor | string | `"true"` | no |
 | available\_slots\_extra\_tags | Extra tags for GCP Big Query Available Slots monitor | list | `[]` | no |
 | available\_slots\_message | Custom message for the Available Slots monitor | string | `""` | no |
-| available\_slots\_silenced | Groups to mute for GCP Big Query Available Slots monitor. | map | `{}` | no |
 | available\_slots\_threshold\_critical | Available Slots (critical threshold) | string | `"200"` | no |
 | available\_slots\_threshold\_warning | Available Slots (warning threshold) | string | `"300"` | no |
 | available\_slots\_timeframe | Timeframe for the Available Slots monitor | string | `"last_5m"` | no |
 | concurrent\_queries\_enabled | Flag to enable GCP Big Query Concurrent Queries monitor | string | `"true"` | no |
 | concurrent\_queries\_extra\_tags | Extra tags for GCP Big Query Concurrent Queries monitor | list | `[]` | no |
 | concurrent\_queries\_message | Custom message for the Concurrent Queries monitor | string | `""` | no |
-| concurrent\_queries\_silenced | Groups to mute for GCP Big Query Concurrent Queries monitor | map | `{}` | no |
 | concurrent\_queries\_threshold\_critical | Concurrent Queries (critical threshold) (hard limit 50) | string | `"45"` | no |
 | concurrent\_queries\_threshold\_warning | Concurrent Queries (warning threshold) (hard limit 50) | string | `"40"` | no |
 | concurrent\_queries\_timeframe | Timeframe for the Concurrent Queries monitor | string | `"last_5m"` | no |
@@ -49,7 +47,6 @@ Creates DataDog monitors with the following checks:
 | execution\_time\_enabled | Flag to enable GCP Big Query Execution Time monitor | string | `"true"` | no |
 | execution\_time\_extra\_tags | Extra tags for GCP Big Query Execution Time monitor | list | `[]` | no |
 | execution\_time\_message | Custom message for the Execution Time monitor | string | `""` | no |
-| execution\_time\_silenced | Groups to mute for GCP Big Query Execution Time monitor. | map | `{}` | no |
 | execution\_time\_threshold\_critical | Average Execution Time in seconds (critical threshold) | string | `"150"` | no |
 | execution\_time\_threshold\_warning | Average Execution Time in seconds (warning threshold) | string | `"100"` | no |
 | execution\_time\_timeframe | Timeframe for the Execution Time monitor | string | `"last_5m"` | no |
@@ -60,42 +57,36 @@ Creates DataDog monitors with the following checks:
 | scanned\_bytes\_billed\_enabled | Flag to enable GCP Big Query Scanned Bytes Billed monitor | string | `"true"` | no |
 | scanned\_bytes\_billed\_extra\_tags | Extra tags for GCP Big Query Scanned Bytes Billed monitor | list | `[]` | no |
 | scanned\_bytes\_billed\_message | Custom message for the Scanned Bytes Billed monitor | string | `""` | no |
-| scanned\_bytes\_billed\_silenced | Groups to mute for GCP Big Query Scanned Bytes Billed monitor. | map | `{}` | no |
 | scanned\_bytes\_billed\_threshold\_critical | Scanned Bytes Billed (critical threshold) | string | `"1"` | no |
 | scanned\_bytes\_billed\_threshold\_warning | Scanned Bytes Billed (warning threshold) | string | `"0"` | no |
 | scanned\_bytes\_billed\_timeframe | Timeframe for the Scanned Bytes Billed monitor | string | `"last_4h"` | no |
 | scanned\_bytes\_enabled | Flag to enable GCP Big Query Scanned Bytes monitor | string | `"true"` | no |
 | scanned\_bytes\_extra\_tags | Extra tags for GCP Big Query Scanned Bytes monitor | list | `[]` | no |
 | scanned\_bytes\_message | Custom message for the Scanned Bytes monitor | string | `""` | no |
-| scanned\_bytes\_silenced | Groups to mute for GCP Big Query Scanned Bytes monitor. | map | `{}` | no |
 | scanned\_bytes\_threshold\_critical | Scanned Bytes (critical threshold) | string | `"1"` | no |
 | scanned\_bytes\_threshold\_warning | Scanned Bytes (warning threshold) | string | `"0"` | no |
 | scanned\_bytes\_timeframe | Timeframe for the Scanned Bytes monitor | string | `"last_4h"` | no |
 | stored\_bytes\_enabled | Flag to enable GCP Big Query Stored Bytes monitor | string | `"true"` | no |
 | stored\_bytes\_extra\_tags | Extra tags for GCP Big Query Stored Bytes monitor | list | `[]` | no |
 | stored\_bytes\_message | Custom message for the Stored Bytes monitor | string | `""` | no |
-| stored\_bytes\_silenced | Groups to mute for GCP Big Query Stored Bytes monitor. | map | `{}` | no |
 | stored\_bytes\_threshold\_critical | Stored Bytes in fraction (critical threshold) | string | `"1"` | no |
 | stored\_bytes\_threshold\_warning | Stored Bytes in fraction (warning threshold) | string | `"0"` | no |
 | stored\_bytes\_timeframe | Timeframe for the Stored Bytes monitor | string | `"last_5m"` | no |
 | table\_count\_enabled | Flag to enable GCP Big Query Table Count monitor | string | `"true"` | no |
 | table\_count\_extra\_tags | Extra tags for GCP Big Query Table Count monitor | list | `[]` | no |
 | table\_count\_message | Custom message for the Table Count monitor | string | `""` | no |
-| table\_count\_silenced | Groups to mute for GCP Big Query Table Count monitor. | map | `{}` | no |
 | table\_count\_threshold\_critical | Table Count (critical threshold) | string | `"1"` | no |
 | table\_count\_threshold\_warning | Table Count (warning threshold) | string | `"0"` | no |
 | table\_count\_timeframe | Timeframe for the Table Count monitor | string | `"last_4h"` | no |
 | uploaded\_bytes\_billed\_enabled | Flag to enable GCP Big Query Uploaded Bytes Billed monitor | string | `"true"` | no |
 | uploaded\_bytes\_billed\_extra\_tags | Extra tags for GCP Big Query Scanned Bytes monitor | list | `[]` | no |
 | uploaded\_bytes\_billed\_message | Custom message for the Uploaded Bytes Billed monitor | string | `""` | no |
-| uploaded\_bytes\_billed\_silenced | Groups to mute for GCP Big Query Uploaded Bytes Billed monitor. | map | `{}` | no |
 | uploaded\_bytes\_billed\_threshold\_critical | Uploaded Bytes Billed (critical threshold) | string | `"1"` | no |
 | uploaded\_bytes\_billed\_threshold\_warning | Uploaded Bytes Billed (warning threshold) | string | `"0"` | no |
 | uploaded\_bytes\_billed\_timeframe | Timeframe for the Uploaded Bytes Billed monitor | string | `"last_4h"` | no |
 | uploaded\_bytes\_enabled | Flag to enable GCP Big Query Uploaded Bytes monitor | string | `"true"` | no |
 | uploaded\_bytes\_extra\_tags | Extra tags for GCP Big Query Uploaded Bytes monitor | list | `[]` | no |
 | uploaded\_bytes\_message | Custom message for the Uploaded Bytes monitor | string | `""` | no |
-| uploaded\_bytes\_silenced | Groups to mute for GCP Big Query Uploaded Bytes monitor. | map | `{}` | no |
 | uploaded\_bytes\_threshold\_critical | Uploaded Bytes (critical threshold) | string | `"1"` | no |
 | uploaded\_bytes\_threshold\_warning | Uploaded Bytes (warning threshold) | string | `"0"` | no |
 | uploaded\_bytes\_timeframe | Timeframe for the Uploaded Bytes monitor | string | `"last_4h"` | no |
diff --git a/cloud/gcp/big-query/inputs.tf b/cloud/gcp/big-query/inputs.tf
index 32e86e5..5bfe337 100644
--- a/cloud/gcp/big-query/inputs.tf
+++ b/cloud/gcp/big-query/inputs.tf
@@ -59,12 +59,6 @@ variable "concurrent_queries_threshold_critical" {
   default     = 45
 }
 
-variable "concurrent_queries_silenced" {
-  description = "Groups to mute for GCP Big Query Concurrent Queries monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "concurrent_queries_enabled" {
   description = "Flag to enable GCP Big Query Concurrent Queries monitor"
   type        = "string"
@@ -105,12 +99,6 @@ variable "execution_time_threshold_critical" {
   default     = 150
 }
 
-variable "execution_time_silenced" {
-  description = "Groups to mute for GCP Big Query Execution Time monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "execution_time_enabled" {
   description = "Flag to enable GCP Big Query Execution Time monitor"
   type        = "string"
@@ -151,12 +139,6 @@ variable "scanned_bytes_threshold_critical" {
   default     = 1
 }
 
-variable "scanned_bytes_silenced" {
-  description = "Groups to mute for GCP Big Query Scanned Bytes monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "scanned_bytes_enabled" {
   description = "Flag to enable GCP Big Query Scanned Bytes monitor"
   type        = "string"
@@ -197,12 +179,6 @@ variable "scanned_bytes_billed_threshold_critical" {
   default     = 1
 }
 
-variable "scanned_bytes_billed_silenced" {
-  description = "Groups to mute for GCP Big Query Scanned Bytes Billed monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "scanned_bytes_billed_enabled" {
   description = "Flag to enable GCP Big Query Scanned Bytes Billed monitor"
   type        = "string"
@@ -243,12 +219,6 @@ variable "available_slots_threshold_critical" {
   default     = 200
 }
 
-variable "available_slots_silenced" {
-  description = "Groups to mute for GCP Big Query Available Slots monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "available_slots_enabled" {
   description = "Flag to enable GCP Big Query Available Slots monitor"
   type        = "string"
@@ -289,12 +259,6 @@ variable "stored_bytes_threshold_critical" {
   default     = 1
 }
 
-variable "stored_bytes_silenced" {
-  description = "Groups to mute for GCP Big Query Stored Bytes monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "stored_bytes_enabled" {
   description = "Flag to enable GCP Big Query Stored Bytes monitor"
   type        = "string"
@@ -335,12 +299,6 @@ variable "table_count_threshold_critical" {
   default     = 1
 }
 
-variable "table_count_silenced" {
-  description = "Groups to mute for GCP Big Query Table Count monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "table_count_enabled" {
   description = "Flag to enable GCP Big Query Table Count monitor"
   type        = "string"
@@ -381,12 +339,6 @@ variable "uploaded_bytes_threshold_critical" {
   default     = 1
 }
 
-variable "uploaded_bytes_silenced" {
-  description = "Groups to mute for GCP Big Query Uploaded Bytes monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "uploaded_bytes_enabled" {
   description = "Flag to enable GCP Big Query Uploaded Bytes monitor"
   type        = "string"
@@ -427,12 +379,6 @@ variable "uploaded_bytes_billed_threshold_critical" {
   default     = 1
 }
 
-variable "uploaded_bytes_billed_silenced" {
-  description = "Groups to mute for GCP Big Query Uploaded Bytes Billed monitor."
-  type        = "map"
-  default     = {}
-}
-
 variable "uploaded_bytes_billed_enabled" {
   description = "Flag to enable GCP Big Query Uploaded Bytes Billed monitor"
   type        = "string"
diff --git a/cloud/gcp/big-query/monitors-big-query.tf b/cloud/gcp/big-query/monitors-big-query.tf
index 14b43dd..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)
@@ -29,8 +29,6 @@ resource "datadog_monitor" "concurrent_queries" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.concurrent_queries_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.concurrent_queries_extra_tags}"]
 }
 
@@ -42,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)
@@ -65,8 +63,6 @@ resource "datadog_monitor" "execution_time" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.execution_time_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.execution_time_extra_tags}"]
 }
 
@@ -78,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)
@@ -101,8 +97,6 @@ resource "datadog_monitor" "scanned_bytes" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.scanned_bytes_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.scanned_bytes_extra_tags}"]
 }
 
@@ -114,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)
@@ -137,8 +131,6 @@ resource "datadog_monitor" "scanned_bytes_billed" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.scanned_bytes_billed_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.scanned_bytes_billed_extra_tags}"]
 }
 
@@ -173,8 +165,6 @@ resource "datadog_monitor" "available_slots" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.available_slots_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.available_slots_extra_tags}"]
 }
 
@@ -186,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)
@@ -209,8 +199,6 @@ resource "datadog_monitor" "stored_bytes" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.stored_bytes_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.stored_bytes_extra_tags}"]
 }
 
@@ -245,8 +233,6 @@ resource "datadog_monitor" "table_count" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.table_count_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.table_count_extra_tags}"]
 }
 
@@ -258,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)
@@ -281,8 +267,6 @@ resource "datadog_monitor" "uploaded_bytes" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.uploaded_bytes_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.uploaded_bytes_extra_tags}"]
 }
 
@@ -294,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)
@@ -317,7 +301,5 @@ resource "datadog_monitor" "uploaded_bytes_billed" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.uploaded_bytes_billed_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:big-query", "team:claranet", "created-by:terraform", "${var.uploaded_bytes_billed_extra_tags}"]
 }
diff --git a/cloud/gcp/cloud-sql/common/README.md b/cloud/gcp/cloud-sql/common/README.md
index f85888a..eaff149 100644
--- a/cloud/gcp/cloud-sql/common/README.md
+++ b/cloud/gcp/cloud-sql/common/README.md
@@ -30,7 +30,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_utilization\_enabled | Flag to enable GCP Cloud SQL CPU Utilization monitor | string | `"true"` | no |
 | cpu\_utilization\_extra\_tags | Extra tags for GCP Cloud SQL CPU Utilization monitor | list | `[]` | no |
 | cpu\_utilization\_message | Custom message for the CPU Utilization monitor | string | `""` | no |
-| cpu\_utilization\_silenced | Groups to mute for GCP Cloud SQL CPU Utilization monitor | map | `{}` | no |
 | cpu\_utilization\_threshold\_critical | CPU Utilization in percentage (critical threshold) | string | `"90"` | no |
 | cpu\_utilization\_threshold\_warning | CPU Utilization in percentage (warning threshold) | string | `"80"` | no |
 | cpu\_utilization\_time\_aggregator | Time aggregator for the CPU Utilization monitor | string | `"avg"` | no |
@@ -46,13 +45,11 @@ Creates DataDog monitors with the following checks:
 | disk\_utilization\_forecast\_linear\_model | Model for the Disk Utilization Forecast monitor | string | `"default"` | no |
 | disk\_utilization\_forecast\_message | Custom message for the Disk Utilization Forecast monitor | string | `""` | no |
 | disk\_utilization\_forecast\_seasonal\_seasonality | Seasonality for the Disk Utilization Forecast monitor | string | `"weekly"` | no |
-| disk\_utilization\_forecast\_silenced | Groups to mute for GCP Cloud SQL Disk Utilization Forecast monitor | map | `{}` | no |
 | disk\_utilization\_forecast\_threshold\_critical | Disk Utilization Forecast in percentage (critical threshold) | string | `"80"` | no |
 | disk\_utilization\_forecast\_threshold\_critical\_recovery | Disk Utilization Forecast in percentage (recovery threshold) | string | `"72"` | no |
 | disk\_utilization\_forecast\_time\_aggregator | Time aggregator for the Disk Utilization Forecast monitor | string | `"max"` | no |
 | disk\_utilization\_forecast\_timeframe | Timeframe for the Disk Utilization Forecast monitor | string | `"next_1w"` | no |
 | disk\_utilization\_message | Custom message for the Disk Utilization monitor | string | `""` | no |
-| disk\_utilization\_silenced | Groups to mute for GCP Cloud SQL Disk Utilization monitor | map | `{}` | no |
 | disk\_utilization\_threshold\_critical | Disk Utilization in percentage (critical threshold) | string | `"90"` | no |
 | disk\_utilization\_threshold\_warning | Disk Utilization in percentage (warning threshold) | string | `"80"` | no |
 | disk\_utilization\_time\_aggregator | Time aggregator for the Disk Utilization monitor | string | `"avg"` | no |
@@ -62,7 +59,6 @@ Creates DataDog monitors with the following checks:
 | failover\_unavailable\_enabled | Flag to enable GCP Cloud SQL Failover Unavailable monitor | string | `"true"` | no |
 | failover\_unavailable\_extra\_tags | Extra tags for GCP Cloud SQL Failover Unavailable monitor | list | `[]` | no |
 | failover\_unavailable\_message | Custom message for the Failover Unavailable monitor | string | `""` | no |
-| failover\_unavailable\_silenced | Groups to mute for GCP Cloud SQL Failover Unavailable monitor | map | `{}` | no |
 | failover\_unavailable\_threshold\_critical | Failover Unavailable critical threshold | string | `"0"` | no |
 | failover\_unavailable\_time\_aggregator | Time aggreggator for the Failover Unavailable monitor | string | `"max"` | no |
 | failover\_unavailable\_timeframe | Timeframe for the Failover Unavailable monitor | string | `"last_10m"` | no |
@@ -78,13 +74,11 @@ Creates DataDog monitors with the following checks:
 | memory\_utilization\_forecast\_linear\_model | Model for the Memory Utilization Forecast monitor | string | `"default"` | no |
 | memory\_utilization\_forecast\_message | Custom message for the Memory Utilization Forecast monitor | string | `""` | no |
 | memory\_utilization\_forecast\_seasonal\_seasonality | Seasonality for the Memory Utilization Forecast monitor | string | `"weekly"` | no |
-| memory\_utilization\_forecast\_silenced | Groups to mute for GCP Cloud SQL Memory Utilization Forecast monitor | map | `{}` | no |
 | memory\_utilization\_forecast\_threshold\_critical | Memory Utilization Forecast in percentage (warning threshold) | string | `"90"` | no |
 | memory\_utilization\_forecast\_threshold\_critical\_recovery | Memory Utilization Forecast in percentage (recovery threshold) | string | `"81"` | no |
 | memory\_utilization\_forecast\_time\_aggregator | Time aggregator for the Memory Utilization Forecast monitor | string | `"max"` | no |
 | memory\_utilization\_forecast\_timeframe | Timeframe for the Memory Utilization Forecast monitor | string | `"next_3d"` | no |
 | memory\_utilization\_message | Custom message for the Memory Utilization monitor | string | `""` | no |
-| memory\_utilization\_silenced | Groups to mute for GCP Cloud SQL Memory Utilization monitor | map | `{}` | no |
 | memory\_utilization\_threshold\_critical | Memory Utilization in percentage (critical threshold) | string | `"90"` | no |
 | memory\_utilization\_threshold\_warning | Memory Utilization in percentage (warning threshold) | string | `"80"` | no |
 | memory\_utilization\_time\_aggregator | Time aggregator for the Memory Utilization monitor | string | `"avg"` | no |
diff --git a/cloud/gcp/cloud-sql/common/inputs.tf b/cloud/gcp/cloud-sql/common/inputs.tf
index 9f96df3..74743f8 100644
--- a/cloud/gcp/cloud-sql/common/inputs.tf
+++ b/cloud/gcp/cloud-sql/common/inputs.tf
@@ -64,12 +64,6 @@ variable "cpu_utilization_threshold_critical" {
   default     = 90
 }
 
-variable "cpu_utilization_silenced" {
-  description = "Groups to mute for GCP Cloud SQL CPU Utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_utilization_enabled" {
   description = "Flag to enable GCP Cloud SQL CPU Utilization monitor"
   type        = "string"
@@ -116,12 +110,6 @@ variable "disk_utilization_threshold_critical" {
   default     = 90
 }
 
-variable "disk_utilization_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Disk Utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_utilization_enabled" {
   description = "Flag to enable GCP Cloud SQL Disk Utilization monitor"
   type        = "string"
@@ -204,12 +192,6 @@ variable "disk_utilization_forecast_threshold_critical_recovery" {
   default     = 72
 }
 
-variable "disk_utilization_forecast_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Disk Utilization Forecast monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_utilization_forecast_enabled" {
   description = "Flag to enable GCP Cloud SQL Disk Utilization Forecast monitor"
   type        = "string"
@@ -251,12 +233,6 @@ variable "memory_utilization_threshold_critical" {
   default     = 90
 }
 
-variable "memory_utilization_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Memory Utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_utilization_enabled" {
   description = "Flag to enable GCP Cloud SQL Memory Utilization monitor"
   type        = "string"
@@ -334,12 +310,6 @@ variable "memory_utilization_forecast_threshold_critical_recovery" {
   default     = 81
 }
 
-variable "memory_utilization_forecast_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Memory Utilization Forecast monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_utilization_forecast_enabled" {
   description = "Flag to enable GCP Cloud SQL Memory Utilization Forecast monitor"
   type        = "string"
@@ -380,12 +350,6 @@ variable "failover_unavailable_threshold_critical" {
   default     = 0
 }
 
-variable "failover_unavailable_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Failover Unavailable monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "failover_unavailable_enabled" {
   description = "Flag to enable GCP Cloud SQL Failover Unavailable monitor"
   type        = "string"
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 83290f5..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}):
@@ -31,8 +31,6 @@ resource "datadog_monitor" "cpu_utilization" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.cpu_utilization_extra_tags}"]
 }
 
@@ -44,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}):
@@ -69,8 +67,6 @@ resource "datadog_monitor" "disk_utilization" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.disk_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.disk_utilization_extra_tags}"]
 }
 
@@ -82,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}):
@@ -113,8 +109,6 @@ resource "datadog_monitor" "disk_utilization_forecast" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.disk_utilization_forecast_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.disk_utilization_forecast_extra_tags}"]
 }
 
@@ -126,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}):
@@ -151,8 +145,6 @@ resource "datadog_monitor" "memory_utilization" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.memory_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.memory_utilization_extra_tags}"]
 }
 
@@ -195,8 +187,6 @@ resource "datadog_monitor" "memory_utilization_forecast" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.memory_utilization_forecast_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.memory_utilization_forecast_extra_tags}"]
 }
 
@@ -232,7 +222,5 @@ resource "datadog_monitor" "failover_unavailable" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.failover_unavailable_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "${var.failover_unavailable_extra_tags}"]
 }
diff --git a/cloud/gcp/cloud-sql/mysql/README.md b/cloud/gcp/cloud-sql/mysql/README.md
index f16b942..15f4e93 100644
--- a/cloud/gcp/cloud-sql/mysql/README.md
+++ b/cloud/gcp/cloud-sql/mysql/README.md
@@ -31,7 +31,6 @@ Creates DataDog monitors with the following checks:
 | replication\_lag\_enabled | Flag to enable GCP Cloud SQL Replication Lag monitor | string | `"true"` | no |
 | replication\_lag\_extra\_tags | Extra tags for GCP Cloud SQL SQL Replication monitor | list | `[]` | no |
 | replication\_lag\_message | Custom message for the Replication Lag monitor | string | `""` | no |
-| replication\_lag\_silenced | Groups to mute for GCP Cloud SQL Replication Lag monitor | map | `{}` | no |
 | replication\_lag\_threshold\_critical | Seconds behind the master (critical threshold) | string | `"180"` | no |
 | replication\_lag\_threshold\_warning | Seconds behind the master (warning threshold) | string | `"90"` | no |
 | replication\_lag\_time\_aggregator | Time aggregator for the Replication Lag monitor | string | `"min"` | no |
diff --git a/cloud/gcp/cloud-sql/mysql/inputs.tf b/cloud/gcp/cloud-sql/mysql/inputs.tf
index 8dae60e..c0a04fa 100644
--- a/cloud/gcp/cloud-sql/mysql/inputs.tf
+++ b/cloud/gcp/cloud-sql/mysql/inputs.tf
@@ -64,12 +64,6 @@ variable "replication_lag_threshold_critical" {
   default     = 180
 }
 
-variable "replication_lag_silenced" {
-  description = "Groups to mute for GCP Cloud SQL Replication Lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "replication_lag_enabled" {
   description = "Flag to enable GCP Cloud SQL Replication Lag monitor"
   type        = "string"
diff --git a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
index 42da1a3..e563a85 100644
--- a/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
+++ b/cloud/gcp/cloud-sql/mysql/monitors-cloudsql-mysql.tf
@@ -31,7 +31,5 @@ resource "datadog_monitor" "replication_lag" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.replication_lag_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform", "engine:mysql", "${var.replication_lag_extra_tags}"]
 }
diff --git a/cloud/gcp/gce/instance/README.md b/cloud/gcp/gce/instance/README.md
index 9a37613..e11abb2 100644
--- a/cloud/gcp/gce/instance/README.md
+++ b/cloud/gcp/gce/instance/README.md
@@ -27,7 +27,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_utilization\_enabled | Flag to enable CPU Utilization monitor | string | `"true"` | no |
 | cpu\_utilization\_extra\_tags | Extra tags for CPU Utilization monitor | list | `[]` | no |
 | cpu\_utilization\_message | Custom message for the CPU Utilization monitor | string | `""` | no |
-| cpu\_utilization\_silenced | Groups to mute for CPU Utilization monitor | map | `{}` | no |
 | cpu\_utilization\_threshold\_critical | CPU Utilization in percentage (critical threshold) | string | `"90"` | no |
 | cpu\_utilization\_threshold\_warning | CPU Utilization in percentage (warning threshold) | string | `"80"` | no |
 | cpu\_utilization\_time\_aggregator | Time aggregator for the CPU Utilization monitor | string | `"avg"` | no |
@@ -36,7 +35,6 @@ Creates DataDog monitors with the following checks:
 | disk\_throttled\_bps\_extra\_tags | Extra tags for Disk Throttled Bps monitor | list | `[]` | no |
 | disk\_throttled\_bps\_message | Custom message for the Disk Throttled Bps monitor | string | `""` | no |
 | disk\_throttled\_bps\_notify\_no\_data | Flag to enable notification for no data on Disk Throttled Bps monitor | string | `"false"` | no |
-| disk\_throttled\_bps\_silenced | Groups to mute for Disk Throttled Bps monitor | map | `{}` | no |
 | disk\_throttled\_bps\_threshold\_critical | Disk Throttled Bps in percentage (critical threshold) | string | `"50"` | no |
 | disk\_throttled\_bps\_threshold\_warning | Disk Throttled Bps in percentage (warning threshold) | string | `"30"` | no |
 | disk\_throttled\_bps\_time\_aggregator | Time aggregator for the Disk Throttled Bps monitor | string | `"min"` | no |
@@ -45,7 +43,6 @@ Creates DataDog monitors with the following checks:
 | disk\_throttled\_ops\_extra\_tags | Extra tags for Disk Throttled OPS monitor | list | `[]` | no |
 | disk\_throttled\_ops\_message | Custom message for the Disk Throttled OPS monitor | string | `""` | no |
 | disk\_throttled\_ops\_notify\_no\_data | Flag to enable notification for no data on Disk Throttled OPS monitor | string | `"false"` | no |
-| disk\_throttled\_ops\_silenced | Groups to mute for Disk Throttled OPS monitor | map | `{}` | no |
 | disk\_throttled\_ops\_threshold\_critical | Disk Throttled OPS in percentage (critical threshold) | string | `"50"` | no |
 | disk\_throttled\_ops\_threshold\_warning | Disk Throttled OPS in percentage (warning threshold) | string | `"30"` | no |
 | disk\_throttled\_ops\_time\_aggregator | Time aggregator for the Disk Throttled OPS monitor | string | `"min"` | no |
diff --git a/cloud/gcp/gce/instance/inputs.tf b/cloud/gcp/gce/instance/inputs.tf
index f4c2622..0277a47 100644
--- a/cloud/gcp/gce/instance/inputs.tf
+++ b/cloud/gcp/gce/instance/inputs.tf
@@ -64,12 +64,6 @@ variable "cpu_utilization_threshold_critical" {
   default     = 90
 }
 
-variable "cpu_utilization_silenced" {
-  description = "Groups to mute for CPU Utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_utilization_enabled" {
   description = "Flag to enable CPU Utilization monitor"
   type        = "string"
@@ -116,12 +110,6 @@ variable "disk_throttled_bps_threshold_critical" {
   default     = 50
 }
 
-variable "disk_throttled_bps_silenced" {
-  description = "Groups to mute for Disk Throttled Bps monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_throttled_bps_enabled" {
   description = "Flag to enable Disk Throttled Bps monitor"
   type        = "string"
@@ -174,12 +162,6 @@ variable "disk_throttled_ops_threshold_critical" {
   default     = 50
 }
 
-variable "disk_throttled_ops_silenced" {
-  description = "Groups to mute for Disk Throttled OPS monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_throttled_ops_enabled" {
   description = "Flag to enable Disk Throttled OPS monitor"
   type        = "string"
diff --git a/cloud/gcp/gce/instance/monitors-gce-instance.tf b/cloud/gcp/gce/instance/monitors-gce-instance.tf
index 32341f4..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}):
@@ -30,8 +30,6 @@ resource "datadog_monitor" "cpu_utilization" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.cpu_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform", "${var.cpu_utilization_extra_tags}"]
 }
 
@@ -43,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}):
@@ -73,8 +71,6 @@ resource "datadog_monitor" "disk_throttled_bps" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.disk_throttled_bps_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform", "${var.disk_throttled_bps_extra_tags}"]
 }
 
@@ -86,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}):
@@ -116,7 +112,5 @@ resource "datadog_monitor" "disk_throttled_ops" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.disk_throttled_ops_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:gce-instance", "team:claranet", "created-by:terraform", "${var.disk_throttled_ops_extra_tags}"]
 }
diff --git a/cloud/gcp/lb/README.md b/cloud/gcp/lb/README.md
index bbf8886..b5351ed 100644
--- a/cloud/gcp/lb/README.md
+++ b/cloud/gcp/lb/README.md
@@ -29,7 +29,6 @@ Creates DataDog monitors with the following checks:
 | backend\_latency\_bucket\_enabled | Flag to enable GCP LB Backend Latency monitor | string | `"true"` | no |
 | backend\_latency\_bucket\_extra\_tags | Extra tags for GCP LB Backend Latency monitor | list | `[]` | no |
 | backend\_latency\_bucket\_message | Custom message for the GCP LB Backend Latency monitor | string | `""` | no |
-| backend\_latency\_bucket\_silenced | Groups to mute for GCP LB Backend Latency monitor | map | `{}` | no |
 | backend\_latency\_bucket\_threshold\_critical | Latency in milliseconds (critical threshold) | string | `"8000"` | no |
 | backend\_latency\_bucket\_threshold\_warning | Latency in milliseconds (warning threshold) | string | `"4000"` | no |
 | backend\_latency\_bucket\_time\_aggregator | Timeframe for the GCP LB Backend Latency monitor | string | `"min"` | no |
@@ -37,7 +36,6 @@ Creates DataDog monitors with the following checks:
 | backend\_latency\_service\_enabled | Flag to enable GCP LB Backend Latency monitor | string | `"true"` | no |
 | backend\_latency\_service\_extra\_tags | Extra tags for GCP LB Backend Latency monitor | list | `[]` | no |
 | backend\_latency\_service\_message | Custom message for the GCP LB Backend Latency monitor | string | `""` | no |
-| backend\_latency\_service\_silenced | Groups to mute for GCP LB Backend Latency monitor | map | `{}` | no |
 | backend\_latency\_service\_threshold\_critical | Latency in milliseconds (critical threshold) | string | `"1500"` | no |
 | backend\_latency\_service\_threshold\_warning | Latency in milliseconds (warning threshold) | string | `"1000"` | no |
 | backend\_latency\_service\_time\_aggregator | Timeframe for the GCP LB Backend Latency monitor | string | `"min"` | no |
@@ -47,7 +45,6 @@ Creates DataDog monitors with the following checks:
 | error\_rate\_4xx\_enabled | Flag to enable GCP LB 4XX Errors monitor | string | `"true"` | no |
 | error\_rate\_4xx\_extra\_tags | Extra tags for GCP LB 4XX Errors monitor | list | `[]` | no |
 | error\_rate\_4xx\_message | Custom message for the GCP LB 4XX Errors monitor | string | `""` | no |
-| error\_rate\_4xx\_silenced | Groups to mute for GCP LB 4XX Errors monitor | map | `{}` | no |
 | error\_rate\_4xx\_threshold\_critical | Rate error in percentage (critical threshold) | string | `"60"` | no |
 | error\_rate\_4xx\_threshold\_warning | Rate error in percentage (warning threshold) | string | `"50"` | no |
 | error\_rate\_4xx\_time\_aggregator | Timeframe for the GCP LB 4XX Errors monitor | string | `"min"` | no |
@@ -56,7 +53,6 @@ Creates DataDog monitors with the following checks:
 | error\_rate\_5xx\_enabled | Flag to enable GCP LB 5XX Errors monitor | string | `"true"` | no |
 | error\_rate\_5xx\_extra\_tags | Extra tags for GCP LB 5XX Errors monitor | list | `[]` | no |
 | error\_rate\_5xx\_message | Custom message for the GCP LB 5XX Errors monitor | string | `""` | no |
-| error\_rate\_5xx\_silenced | Groups to mute for GCP LB 5XX Errors monitor | map | `{}` | no |
 | error\_rate\_5xx\_threshold\_critical | Rate error in percentage (critical threshold) | string | `"40"` | no |
 | error\_rate\_5xx\_threshold\_warning | Rate error in percentage (warning threshold) | string | `"30"` | no |
 | error\_rate\_5xx\_time\_aggregator | Timeframe for the GCP LB 5XX Errors monitor | string | `"min"` | no |
@@ -69,7 +65,6 @@ Creates DataDog monitors with the following checks:
 | request\_count\_enabled | Flag to enable GCP LB Request Count monitor | string | `"true"` | no |
 | request\_count\_extra\_tags | Extra tags for GCP LB Request Count monitor | list | `[]` | no |
 | request\_count\_message | Custom message for the GCP LB Request Count monitor | string | `""` | no |
-| request\_count\_silenced | Groups to mute for GCP LB Request Count monitor | map | `{}` | no |
 | request\_count\_threshold\_critical | Desviation in percentage (critical threshold) | string | `"500"` | no |
 | request\_count\_threshold\_warning | Desviation in percentage (warning threshold) | string | `"250"` | no |
 | request\_count\_time\_aggregator | Timeframe for the GCP LB Request Count monitor | string | `"sum"` | no |
diff --git a/cloud/gcp/lb/inputs.tf b/cloud/gcp/lb/inputs.tf
index 4cb7935..1bf467a 100644
--- a/cloud/gcp/lb/inputs.tf
+++ b/cloud/gcp/lb/inputs.tf
@@ -69,12 +69,6 @@ variable "error_rate_4xx_threshold_critical" {
   default     = 60
 }
 
-variable "error_rate_4xx_silenced" {
-  description = "Groups to mute for GCP LB 4XX Errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "error_rate_4xx_enabled" {
   description = "Flag to enable GCP LB 4XX Errors monitor"
   type        = "string"
@@ -126,12 +120,6 @@ variable "error_rate_5xx_threshold_critical" {
   default     = 40
 }
 
-variable "error_rate_5xx_silenced" {
-  description = "Groups to mute for GCP LB 5XX Errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "error_rate_5xx_enabled" {
   description = "Flag to enable GCP LB 5XX Errors monitor"
   type        = "string"
@@ -177,12 +165,6 @@ variable "backend_latency_service_threshold_critical" {
   default     = 1500
 }
 
-variable "backend_latency_service_silenced" {
-  description = "Groups to mute for GCP LB Backend Latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "backend_latency_service_enabled" {
   description = "Flag to enable GCP LB Backend Latency monitor"
   type        = "string"
@@ -228,12 +210,6 @@ variable "backend_latency_bucket_threshold_critical" {
   default     = 8000
 }
 
-variable "backend_latency_bucket_silenced" {
-  description = "Groups to mute for GCP LB Backend Latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "backend_latency_bucket_enabled" {
   description = "Flag to enable GCP LB Backend Latency monitor"
   type        = "string"
@@ -285,12 +261,6 @@ variable "request_count_threshold_critical" {
   default     = 500
 }
 
-variable "request_count_silenced" {
-  description = "Groups to mute for GCP LB Request Count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "request_count_enabled" {
   description = "Flag to enable GCP LB Request Count monitor"
   type        = "string"
diff --git a/cloud/gcp/lb/monitors-lb.tf b/cloud/gcp/lb/monitors-lb.tf
index b4c398d..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}):
@@ -31,8 +31,6 @@ resource "datadog_monitor" "error_rate_4xx" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.error_rate_4xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform", "${var.error_rate_4xx_extra_tags}"]
 }
 
@@ -44,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}):
@@ -69,8 +67,6 @@ resource "datadog_monitor" "error_rate_5xx" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.error_rate_5xx_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform", "${var.error_rate_5xx_extra_tags}"]
 }
 
@@ -82,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}):
@@ -106,8 +102,6 @@ resource "datadog_monitor" "backend_latency_service" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.backend_latency_service_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform", "${var.backend_latency_service_extra_tags}"]
 }
 
@@ -119,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}):
@@ -143,8 +137,6 @@ resource "datadog_monitor" "backend_latency_bucket" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.backend_latency_bucket_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform", "${var.backend_latency_bucket_extra_tags}"]
 }
 
@@ -180,7 +172,5 @@ resource "datadog_monitor" "request_count" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.request_count_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:lb", "team:claranet", "created-by:terraform", "${var.request_count_extra_tags}"]
 }
diff --git a/cloud/gcp/pubsub/README.md b/cloud/gcp/pubsub/README.md
index 41c8ff0..a7a04c0 100644
--- a/cloud/gcp/pubsub/README.md
+++ b/cloud/gcp/pubsub/README.md
@@ -32,14 +32,12 @@ Creates DataDog monitors with the following checks:
 | sending\_operations\_count\_enabled | Flag to enable GCP Pub/Sub Unavailable Sending Operations Count monitor | string | `"true"` | no |
 | sending\_operations\_count\_extra\_tags | Extra tags for GCP Pub/Sub Sending Operations Count monitor | list | `[]` | no |
 | sending\_operations\_count\_message | Custom message for the GCP Pub/Sub Sending Operations Count monitor | string | `""` | no |
-| sending\_operations\_count\_silenced | Groups to mute for GCP Pub/Sub Sending Operations Count monitor | map | `{}` | no |
 | sending\_operations\_count\_threshold\_critical | Critical threshold for the number of sending operations. | string | `"0"` | no |
 | sending\_operations\_count\_time\_aggregator | Timeframe for the GCP Pub/Sub Sending Operations Count monitor | string | `"sum"` | no |
 | sending\_operations\_count\_timeframe | Timeframe for the GCP Pub/Sub Sending Operations Count monitor | string | `"last_30m"` | no |
 | unavailable\_sending\_operations\_count\_enabled | Flag to enable GCP Pub/Sub Unavailable Sending Operations Count monitor | string | `"true"` | no |
 | unavailable\_sending\_operations\_count\_extra\_tags | Extra tags for GCP Pub/Sub Unavailable Sending Operations Count monitor | list | `[]` | no |
 | unavailable\_sending\_operations\_count\_message | Custom message for the GCP Pub/Sub Unavailable Sending Operations Count monitor | string | `""` | no |
-| unavailable\_sending\_operations\_count\_silenced | Groups to mute for GCP Pub/Sub Unavailable Sending Operations Count monitor | map | `{}` | no |
 | unavailable\_sending\_operations\_count\_threshold\_critical | Critical threshold for the number of unavailable sending operations | string | `"4"` | no |
 | unavailable\_sending\_operations\_count\_threshold\_warning | Warning threshold for the number of unavailable sending operations | string | `"2"` | no |
 | unavailable\_sending\_operations\_count\_time\_aggregator | Timeframe for the GCP Pub/Sub Unavailable Sending Operations Count monitor | string | `"sum"` | no |
diff --git a/cloud/gcp/pubsub/inputs.tf b/cloud/gcp/pubsub/inputs.tf
index 286df58..36325a1 100644
--- a/cloud/gcp/pubsub/inputs.tf
+++ b/cloud/gcp/pubsub/inputs.tf
@@ -57,12 +57,6 @@ variable "sending_operations_count_threshold_critical" {
   default     = 0
 }
 
-variable "sending_operations_count_silenced" {
-  description = "Groups to mute for GCP Pub/Sub Sending Operations Count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "sending_operations_count_enabled" {
   description = "Flag to enable GCP Pub/Sub Unavailable Sending Operations Count monitor"
   type        = "string"
@@ -108,12 +102,6 @@ variable "unavailable_sending_operations_count_threshold_critical" {
   default     = 4
 }
 
-variable "unavailable_sending_operations_count_silenced" {
-  description = "Groups to mute for GCP Pub/Sub Unavailable Sending Operations Count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "unavailable_sending_operations_count_enabled" {
   description = "Flag to enable GCP Pub/Sub Unavailable Sending Operations Count monitor"
   type        = "string"
diff --git a/cloud/gcp/pubsub/monitors-pubsub.tf b/cloud/gcp/pubsub/monitors-pubsub.tf
index 4fd7a5b..2826eae 100644
--- a/cloud/gcp/pubsub/monitors-pubsub.tf
+++ b/cloud/gcp/pubsub/monitors-pubsub.tf
@@ -29,8 +29,6 @@ resource "datadog_monitor" "sending_operations_count" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.sending_operations_count_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "team:claranet", "created-by:terraform", "${var.sending_operations_count_extra_tags}"]
 }
 
@@ -66,7 +64,5 @@ resource "datadog_monitor" "unavailable_sending_operations_count" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.unavailable_sending_operations_count_silenced}"
-
   tags = ["env:${var.environment}", "type:cloud", "provider:gcp", "resource:pubsub", "team:claranet", "created-by:terraform", "${var.unavailable_sending_operations_count_extra_tags}"]
 }
diff --git a/database/elasticsearch/README.md b/database/elasticsearch/README.md
index c818581..9c8ce1a 100644
--- a/database/elasticsearch/README.md
+++ b/database/elasticsearch/README.md
@@ -46,7 +46,6 @@ Creates DataDog monitors with the following checks:
 | cluster\_initializing\_shards\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | cluster\_initializing\_shards\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | cluster\_initializing\_shards\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| cluster\_initializing\_shards\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | cluster\_initializing\_shards\_threshold\_critical | Cluster Status  critical threshold | string | `"2"` | no |
 | cluster\_initializing\_shards\_threshold\_warning | Cluster Status warning threshold | string | `"1"` | no |
 | cluster\_initializing\_shards\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -54,7 +53,6 @@ Creates DataDog monitors with the following checks:
 | cluster\_relocating\_shards\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | cluster\_relocating\_shards\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | cluster\_relocating\_shards\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| cluster\_relocating\_shards\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | cluster\_relocating\_shards\_threshold\_critical | Cluster Status  critical threshold | string | `"2"` | no |
 | cluster\_relocating\_shards\_threshold\_warning | Cluster Status warning threshold | string | `"1"` | no |
 | cluster\_relocating\_shards\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -62,7 +60,6 @@ Creates DataDog monitors with the following checks:
 | cluster\_status\_not\_green\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | cluster\_status\_not\_green\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | cluster\_status\_not\_green\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| cluster\_status\_not\_green\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | cluster\_status\_not\_green\_threshold\_critical | Cluster Status  critical threshold | string | `"0"` | no |
 | cluster\_status\_not\_green\_threshold\_warning | Cluster Status warning threshold | string | `"1"` | no |
 | cluster\_status\_not\_green\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -70,7 +67,6 @@ Creates DataDog monitors with the following checks:
 | cluster\_unassigned\_shards\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | cluster\_unassigned\_shards\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | cluster\_unassigned\_shards\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| cluster\_unassigned\_shards\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | cluster\_unassigned\_shards\_threshold\_critical | Cluster Status  critical threshold | string | `"2"` | no |
 | cluster\_unassigned\_shards\_threshold\_warning | Cluster Status warning threshold | string | `"1"` | no |
 | cluster\_unassigned\_shards\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -80,7 +76,6 @@ Creates DataDog monitors with the following checks:
 | fetch\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | fetch\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | fetch\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| fetch\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | fetch\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"100"` | no |
 | fetch\_change\_threshold\_warning | Cluster Status warning threshold | string | `"75"` | no |
 | fetch\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -89,7 +84,6 @@ Creates DataDog monitors with the following checks:
 | fetch\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | fetch\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | fetch\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| fetch\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | fetch\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"4"` | no |
 | fetch\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"2"` | no |
 | fetch\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -97,7 +91,6 @@ Creates DataDog monitors with the following checks:
 | field\_data\_evictions\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | field\_data\_evictions\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | field\_data\_evictions\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| field\_data\_evictions\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | field\_data\_evictions\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"120"` | no |
 | field\_data\_evictions\_change\_threshold\_warning | Cluster Status warning threshold | string | `"60"` | no |
 | field\_data\_evictions\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -109,7 +102,6 @@ Creates DataDog monitors with the following checks:
 | flush\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | flush\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | flush\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| flush\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | flush\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"100"` | no |
 | flush\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"50"` | no |
 | flush\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -124,7 +116,6 @@ Creates DataDog monitors with the following checks:
 | http\_connections\_anomaly\_interval | Interval. | string | `"60"` | no |
 | http\_connections\_anomaly\_message | Custom message for the Cluster Status monitor | string | `""` | no |
 | http\_connections\_anomaly\_seasonality | Seasonality of the algorithm | string | `"hourly"` | no |
-| http\_connections\_anomaly\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | http\_connections\_anomaly\_threshold\_critical | Cluster Status  critical threshold | string | `"1"` | no |
 | http\_connections\_anomaly\_threshold\_warning | Cluster Status warning threshold | string | `"0.75"` | no |
 | http\_connections\_anomaly\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -132,7 +123,6 @@ Creates DataDog monitors with the following checks:
 | indexing\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | indexing\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | indexing\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| indexing\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | indexing\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"15"` | no |
 | indexing\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"10"` | no |
 | indexing\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -140,7 +130,6 @@ Creates DataDog monitors with the following checks:
 | jvm\_gc\_old\_collection\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | jvm\_gc\_old\_collection\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | jvm\_gc\_old\_collection\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| jvm\_gc\_old\_collection\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | jvm\_gc\_old\_collection\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"200"` | no |
 | jvm\_gc\_old\_collection\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"160"` | no |
 | jvm\_gc\_old\_collection\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -148,7 +137,6 @@ Creates DataDog monitors with the following checks:
 | jvm\_gc\_young\_collection\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | jvm\_gc\_young\_collection\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | jvm\_gc\_young\_collection\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| jvm\_gc\_young\_collection\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | jvm\_gc\_young\_collection\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"25"` | no |
 | jvm\_gc\_young\_collection\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"20"` | no |
 | jvm\_gc\_young\_collection\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -156,7 +144,6 @@ Creates DataDog monitors with the following checks:
 | jvm\_heap\_memory\_usage\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | jvm\_heap\_memory\_usage\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | jvm\_heap\_memory\_usage\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| jvm\_heap\_memory\_usage\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | jvm\_heap\_memory\_usage\_threshold\_critical | Cluster Status  critical threshold | string | `"90"` | no |
 | jvm\_heap\_memory\_usage\_threshold\_warning | Cluster Status warning threshold | string | `"80"` | no |
 | jvm\_heap\_memory\_usage\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -164,7 +151,6 @@ Creates DataDog monitors with the following checks:
 | jvm\_memory\_old\_usage\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | jvm\_memory\_old\_usage\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | jvm\_memory\_old\_usage\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| jvm\_memory\_old\_usage\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | jvm\_memory\_old\_usage\_threshold\_critical | Cluster Status  critical threshold | string | `"90"` | no |
 | jvm\_memory\_old\_usage\_threshold\_warning | Cluster Status warning threshold | string | `"80"` | no |
 | jvm\_memory\_old\_usage\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -172,7 +158,6 @@ Creates DataDog monitors with the following checks:
 | jvm\_memory\_young\_usage\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | jvm\_memory\_young\_usage\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | jvm\_memory\_young\_usage\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| jvm\_memory\_young\_usage\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | jvm\_memory\_young\_usage\_threshold\_critical | Cluster Status  critical threshold | string | `"90"` | no |
 | jvm\_memory\_young\_usage\_threshold\_warning | Cluster Status warning threshold | string | `"80"` | no |
 | jvm\_memory\_young\_usage\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -182,7 +167,6 @@ Creates DataDog monitors with the following checks:
 | node\_free\_space\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | node\_free\_space\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | node\_free\_space\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| node\_free\_space\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | node\_free\_space\_threshold\_critical | Cluster Status  critical threshold | string | `"10"` | no |
 | node\_free\_space\_threshold\_warning | Cluster Status warning threshold | string | `"20"` | no |
 | node\_free\_space\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"sum"` | no |
@@ -191,13 +175,11 @@ Creates DataDog monitors with the following checks:
 | not\_responding\_extra\_tags | Extra tags for Elasticsearch does not respond monitor | list | `[]` | no |
 | not\_responding\_message | Custom message for Elasticsearch does not respond monitor | string | `""` | no |
 | not\_responding\_no\_data\_timeframe | Elasticsearch not responding monitor no data timeframe | string | `"10"` | no |
-| not\_responding\_silenced | Groups to mute for Elasticsearch does not respond monitor | map | `{}` | no |
 | not\_responding\_threshold\_warning | Elasticsearch not responding limit (warning threshold) | string | `"3"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | query\_cache\_evictions\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | query\_cache\_evictions\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | query\_cache\_evictions\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| query\_cache\_evictions\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | query\_cache\_evictions\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"120"` | no |
 | query\_cache\_evictions\_change\_threshold\_warning | Cluster Status warning threshold | string | `"60"` | no |
 | query\_cache\_evictions\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -206,7 +188,6 @@ Creates DataDog monitors with the following checks:
 | request\_cache\_evictions\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | request\_cache\_evictions\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | request\_cache\_evictions\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| request\_cache\_evictions\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | request\_cache\_evictions\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"120"` | no |
 | request\_cache\_evictions\_change\_threshold\_warning | Cluster Status warning threshold | string | `"60"` | no |
 | request\_cache\_evictions\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -215,7 +196,6 @@ Creates DataDog monitors with the following checks:
 | search\_query\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | search\_query\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | search\_query\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| search\_query\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | search\_query\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"100"` | no |
 | search\_query\_change\_threshold\_warning | Cluster Status warning threshold | string | `"75"` | no |
 | search\_query\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -224,7 +204,6 @@ Creates DataDog monitors with the following checks:
 | search\_query\_latency\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | search\_query\_latency\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | search\_query\_latency\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| search\_query\_latency\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | search\_query\_latency\_threshold\_critical | Cluster Status  critical threshold | string | `"1"` | no |
 | search\_query\_latency\_threshold\_warning | Cluster Status warning threshold | string | `"0.5"` | no |
 | search\_query\_latency\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
@@ -232,7 +211,6 @@ Creates DataDog monitors with the following checks:
 | task\_time\_in\_queue\_change\_enabled | Flag to enable Cluster Status monitor | string | `"true"` | no |
 | task\_time\_in\_queue\_change\_extra\_tags | Extra tags for Cluster Status monitor | list | `[]` | no |
 | task\_time\_in\_queue\_change\_message | Custom message for the Cluster Status monitor | string | `""` | no |
-| task\_time\_in\_queue\_change\_silenced | Groups to mute for Cluster Status monitor | map | `{}` | no |
 | task\_time\_in\_queue\_change\_threshold\_critical | Cluster Status  critical threshold | string | `"200"` | no |
 | task\_time\_in\_queue\_change\_threshold\_warning | Cluster Status warning threshold | string | `"100"` | no |
 | task\_time\_in\_queue\_change\_time\_aggregator | Time aggregator for the Cluster Status monitor | string | `"avg"` | no |
diff --git a/database/elasticsearch/inputs.tf b/database/elasticsearch/inputs.tf
index eb43413..d31085a 100644
--- a/database/elasticsearch/inputs.tf
+++ b/database/elasticsearch/inputs.tf
@@ -73,12 +73,6 @@ variable "cluster_status_not_green_threshold_critical" {
   default     = 0
 }
 
-variable "cluster_status_not_green_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cluster_status_not_green_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -124,12 +118,6 @@ variable "cluster_initializing_shards_threshold_critical" {
   default     = 2
 }
 
-variable "cluster_initializing_shards_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cluster_initializing_shards_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -175,12 +163,6 @@ variable "cluster_relocating_shards_threshold_critical" {
   default     = 2
 }
 
-variable "cluster_relocating_shards_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cluster_relocating_shards_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -226,12 +208,6 @@ variable "cluster_unassigned_shards_threshold_critical" {
   default     = 2
 }
 
-variable "cluster_unassigned_shards_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cluster_unassigned_shards_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -277,12 +253,6 @@ variable "node_free_space_threshold_critical" {
   default     = 10
 }
 
-variable "node_free_space_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "node_free_space_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -328,12 +298,6 @@ variable "jvm_heap_memory_usage_threshold_critical" {
   default     = 90
 }
 
-variable "jvm_heap_memory_usage_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "jvm_heap_memory_usage_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -379,12 +343,6 @@ variable "jvm_memory_young_usage_threshold_critical" {
   default     = 90
 }
 
-variable "jvm_memory_young_usage_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "jvm_memory_young_usage_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -430,12 +388,6 @@ variable "jvm_memory_old_usage_threshold_critical" {
   default     = 90
 }
 
-variable "jvm_memory_old_usage_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "jvm_memory_old_usage_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -481,12 +433,6 @@ variable "jvm_gc_old_collection_latency_threshold_critical" {
   default     = 200
 }
 
-variable "jvm_gc_old_collection_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "jvm_gc_old_collection_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -532,12 +478,6 @@ variable "jvm_gc_young_collection_latency_threshold_critical" {
   default     = 25
 }
 
-variable "jvm_gc_young_collection_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "jvm_gc_young_collection_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -583,12 +523,6 @@ variable "indexing_latency_threshold_critical" {
   default     = 15
 }
 
-variable "indexing_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "indexing_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -634,12 +568,6 @@ variable "flush_latency_threshold_critical" {
   default     = 100
 }
 
-variable "flush_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "flush_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -727,12 +655,6 @@ variable "http_connections_anomaly_threshold_critical" {
   default     = 1
 }
 
-variable "http_connections_anomaly_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "http_connections_anomaly_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -778,12 +700,6 @@ variable "search_query_latency_threshold_critical" {
   default     = 1
 }
 
-variable "search_query_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "search_query_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -829,12 +745,6 @@ variable "fetch_latency_threshold_critical" {
   default     = 4
 }
 
-variable "fetch_latency_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "fetch_latency_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -886,12 +796,6 @@ variable "search_query_change_threshold_critical" {
   default     = 100
 }
 
-variable "search_query_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "search_query_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -943,12 +847,6 @@ variable "fetch_change_threshold_critical" {
   default     = 100
 }
 
-variable "fetch_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "fetch_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -1000,12 +898,6 @@ variable "field_data_evictions_change_threshold_critical" {
   default     = 120
 }
 
-variable "field_data_evictions_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "field_data_evictions_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -1057,12 +949,6 @@ variable "query_cache_evictions_change_threshold_critical" {
   default     = 120
 }
 
-variable "query_cache_evictions_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "query_cache_evictions_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -1114,12 +1000,6 @@ variable "request_cache_evictions_change_threshold_critical" {
   default     = 120
 }
 
-variable "request_cache_evictions_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "request_cache_evictions_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -1171,12 +1051,6 @@ variable "task_time_in_queue_change_threshold_critical" {
   default     = 200
 }
 
-variable "task_time_in_queue_change_silenced" {
-  description = "Groups to mute for Cluster Status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "task_time_in_queue_change_enabled" {
   description = "Flag to enable Cluster Status monitor"
   type        = "string"
@@ -1192,11 +1066,6 @@ variable "task_time_in_queue_change_extra_tags" {
 #
 # Service Check
 #
-variable "not_responding_silenced" {
-  description = "Groups to mute for Elasticsearch does not respond monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "not_responding_enabled" {
   description = "Flag to enable Elasticsearch does not respond monitor"
diff --git a/database/elasticsearch/monitors-elasticsearch.tf b/database/elasticsearch/monitors-elasticsearch.tf
index 571b657..af0328e 100644
--- a/database/elasticsearch/monitors-elasticsearch.tf
+++ b/database/elasticsearch/monitors-elasticsearch.tf
@@ -17,8 +17,6 @@ resource "datadog_monitor" "not_responding" {
     critical = 5
   }
 
-  silenced = "${var.not_responding_silenced}"
-
   no_data_timeframe   = "${var.not_responding_no_data_timeframe}"
   notify_no_data      = true
   notify_audit        = false
@@ -71,8 +69,6 @@ resource "datadog_monitor" "cluster_status_not_green" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.cluster_status_not_green_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -113,8 +109,6 @@ resource "datadog_monitor" "cluster_initializing_shards" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.cluster_initializing_shards_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -155,8 +149,6 @@ resource "datadog_monitor" "cluster_relocating_shards" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.cluster_relocating_shards_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -197,8 +189,6 @@ resource "datadog_monitor" "cluster_unassigned_shards" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.cluster_unassigned_shards_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -242,8 +232,6 @@ resource "datadog_monitor" "node_free_space" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.node_free_space_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -284,8 +272,6 @@ resource "datadog_monitor" "jvm_heap_memory_usage" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.jvm_heap_memory_usage_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -326,8 +312,6 @@ resource "datadog_monitor" "jvm_memory_young_usage" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.jvm_memory_young_usage_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -368,8 +352,6 @@ resource "datadog_monitor" "jvm_memory_old_usage" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.jvm_memory_old_usage_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -410,8 +392,6 @@ resource "datadog_monitor" "jvm_gc_old_collection_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.jvm_gc_old_collection_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -452,8 +432,6 @@ resource "datadog_monitor" "jvm_gc_young_collection_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.jvm_gc_young_collection_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -495,8 +473,6 @@ resource "datadog_monitor" "indexing_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.indexing_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -538,8 +514,6 @@ resource "datadog_monitor" "flush_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.flush_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -588,8 +562,6 @@ resource "datadog_monitor" "http_connections_anomaly" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.http_connections_anomaly_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -631,8 +603,6 @@ resource "datadog_monitor" "search_query_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.search_query_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -674,8 +644,6 @@ resource "datadog_monitor" "fetch_latency" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.fetch_latency_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -716,8 +684,6 @@ resource "datadog_monitor" "search_query_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.search_query_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -758,8 +724,6 @@ resource "datadog_monitor" "fetch_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.fetch_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -801,8 +765,6 @@ resource "datadog_monitor" "field_data_evictions_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.field_data_evictions_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -844,8 +806,6 @@ resource "datadog_monitor" "query_cache_evictions_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.query_cache_evictions_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -887,8 +847,6 @@ resource "datadog_monitor" "request_cache_evictions_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.request_cache_evictions_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
@@ -929,8 +887,6 @@ resource "datadog_monitor" "task_time_in_queue_change" {
 
   evaluation_delay = "${var.evaluation_delay}"
 
-  silenced = "${var.task_time_in_queue_change_silenced}"
-
   tags = [
     "resource:elasticsearch",
     "env:${var.environment}",
diff --git a/database/mongodb/README.md b/database/mongodb/README.md
index 1a6a60c..0fb9c78 100644
--- a/database/mongodb/README.md
+++ b/database/mongodb/README.md
@@ -38,24 +38,20 @@ Creates DataDog monitors with the following checks:
 | mongodb\_primary\_enabled | Flag to enable MongoDB primary state monitor | string | `"true"` | no |
 | mongodb\_primary\_extra\_tags | Extra tags for MongoDB primary state monitor | list | `[]` | no |
 | mongodb\_primary\_message | Custom message for MongoDB primary monitor | string | `""` | no |
-| mongodb\_primary\_silenced | Groups to mute for MongoDB primary state monitor | map | `{}` | no |
 | mongodb\_primary\_timeframe | Monitor timeframe for MongoDB wrong state for primary node [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1m"` | no |
 | mongodb\_replication\_aggregator | Monitor aggregator for MongoDB replication lag [available values: min, max, sum or avg] | string | `"avg"` | no |
 | mongodb\_replication\_enabled | Flag to enable MongoDB replication lag monitor | string | `"true"` | no |
 | mongodb\_replication\_extra\_tags | Extra tags for MongoDB replication lag monitor | list | `[]` | no |
 | mongodb\_replication\_message | Custom message for MongoDB replication monitor | string | `""` | no |
-| mongodb\_replication\_silenced | Groups to mute for MongoDB replication lag monitor | map | `{}` | no |
 | mongodb\_replication\_timeframe | Monitor timeframe for MongoDB replication lag  [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_1m"` | no |
 | mongodb\_secondary\_aggregator | Monitor aggregator for MongoDB secondary state [available values: min, max] | string | `"max"` | no |
 | mongodb\_secondary\_enabled | Flag to enable MongoDB secondary state monitor | string | `"true"` | no |
 | mongodb\_secondary\_extra\_tags | Extra tags for MongoDB secondary state monitor | list | `[]` | no |
 | mongodb\_secondary\_message | Custom message for MongoDB secondary monitor | string | `""` | no |
-| mongodb\_secondary\_silenced | Groups to mute for MongoDB secondary state monitor | map | `{}` | no |
 | mongodb\_secondary\_timeframe | Monitor timeframe for MongoDB wrong state for secondaries nodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | mongodb\_server\_count\_aggregator | Monitor aggregator for MongoDB server count [available values: min, max] | string | `"min"` | no |
 | mongodb\_server\_count\_enabled | Flag to enable MongoDB server count monitor | string | `"true"` | no |
 | mongodb\_server\_count\_message | Custom message for MongoDB server count | string | `""` | no |
-| mongodb\_server\_count\_silenced | Groups to mute for MongoDB server count monitor | map | `{}` | no |
 | mongodb\_server\_count\_timeframe | Monitor timeframe for MongoDB wrong server count [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
diff --git a/database/mongodb/inputs.tf b/database/mongodb/inputs.tf
index 845a41a..0752b84 100644
--- a/database/mongodb/inputs.tf
+++ b/database/mongodb/inputs.tf
@@ -78,12 +78,6 @@ variable "mongodb_lag_critical" {
   default     = 5
 }
 
-variable "mongodb_primary_silenced" {
-  description = "Groups to mute for MongoDB primary state monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mongodb_primary_enabled" {
   description = "Flag to enable MongoDB primary state monitor"
   type        = "string"
@@ -96,12 +90,6 @@ variable "mongodb_primary_extra_tags" {
   default     = []
 }
 
-variable "mongodb_secondary_silenced" {
-  description = "Groups to mute for MongoDB secondary state monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mongodb_secondary_enabled" {
   description = "Flag to enable MongoDB secondary state monitor"
   type        = "string"
@@ -114,24 +102,12 @@ variable "mongodb_secondary_extra_tags" {
   default     = []
 }
 
-variable "mongodb_server_count_silenced" {
-  description = "Groups to mute for MongoDB server count monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mongodb_server_count_enabled" {
   description = "Flag to enable MongoDB server count monitor"
   type        = "string"
   default     = "true"
 }
 
-variable "mongodb_replication_silenced" {
-  description = "Groups to mute for MongoDB replication lag monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mongodb_replication_enabled" {
   description = "Flag to enable MongoDB replication lag monitor"
   type        = "string"
diff --git a/database/mongodb/monitors-mongo.tf b/database/mongodb/monitors-mongo.tf
index 442e37d..f251bf6 100644
--- a/database/mongodb/monitors-mongo.tf
+++ b/database/mongodb/monitors-mongo.tf
@@ -19,8 +19,6 @@ resource "datadog_monitor" "mongodb_primary" {
   include_tags        = true
   require_full_window = true
 
-  silenced = "${var.mongodb_primary_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_primary_extra_tags}"]
 }
 
@@ -41,7 +39,7 @@ resource "datadog_monitor" "mongodb_secondary" {
     warning  = 0
   }
 
-  type = "metric alert"
+  type = "query alert"
 
   notify_no_data      = false
   renotify_interval   = 0
@@ -52,8 +50,6 @@ resource "datadog_monitor" "mongodb_secondary" {
   include_tags        = true
   require_full_window = true
 
-  silenced = "${var.mongodb_secondary_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
 }
 
@@ -84,8 +80,6 @@ resource "datadog_monitor" "mongodb_server_count" {
   include_tags        = true
   require_full_window = true
 
-  silenced = "${var.mongodb_secondary_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_secondary_extra_tags}"]
 }
 
@@ -115,7 +109,5 @@ resource "datadog_monitor" "mongodb_replication" {
   include_tags        = true
   require_full_window = true
 
-  silenced = "${var.mongodb_replication_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mongo", "resource:mongodb", "team:claranet", "created-by:terraform", "${var.mongodb_replication_extra_tags}"]
 }
diff --git a/database/mysql/README.md b/database/mysql/README.md
index c0cc927..f8cc345 100644
--- a/database/mysql/README.md
+++ b/database/mysql/README.md
@@ -38,7 +38,6 @@ Creates DataDog monitors with the following checks:
 | mysql\_aborted\_enabled | Flag to enable MySQL aborted connects monitor | string | `"true"` | no |
 | mysql\_aborted\_extra\_tags | Extra tags for MySQL aborted connects monitor | list | `[]` | no |
 | mysql\_aborted\_message | Custom message for MySQL aborted connects monitor | string | `""` | no |
-| mysql\_aborted\_silenced | Groups to mute for MySQL aborted connects monitor | map | `{}` | no |
 | mysql\_aborted\_threshold\_critical | Maximum critical acceptable percent of aborted connects | string | `"10"` | no |
 | mysql\_aborted\_threshold\_warning | Maximum warning acceptable percent of aborted connects | string | `"5"` | no |
 | mysql\_aborted\_time\_aggregator | Monitor time aggregator for MySQL aborted connects monitor [available values: min, max or avg] | string | `"avg"` | no |
@@ -47,12 +46,10 @@ Creates DataDog monitors with the following checks:
 | mysql\_availability\_extra\_tags | Extra tags for Mysql availability monitor | list | `[]` | no |
 | mysql\_availability\_message | Custom message for Mysql availability monitor | string | `""` | no |
 | mysql\_availability\_no\_data\_timeframe | Mysql availability monitor no data timeframe | string | `"10"` | no |
-| mysql\_availability\_silenced | Groups to mute for Mysql availability monitor | map | `{}` | no |
 | mysql\_availability\_threshold\_warning | Mysql availability monitor (warning threshold) | string | `"3"` | no |
 | mysql\_connection\_enabled | Flag to enable MySQL connection monitor | string | `"true"` | no |
 | mysql\_connection\_extra\_tags | Extra tags for MySQL connection monitor | list | `[]` | no |
 | mysql\_connection\_message | Custom message for MySQL connection monitor | string | `""` | no |
-| mysql\_connection\_silenced | Groups to mute for MySQL connection monitor | map | `{}` | no |
 | mysql\_connection\_threshold\_critical | Maximum critical acceptable percent of connections | string | `"80"` | no |
 | mysql\_connection\_threshold\_warning | Maximum warning acceptable percent of connections | string | `"70"` | no |
 | mysql\_connection\_time\_aggregator | Monitor time aggregator for MySQL connection monitor [available values: min, max or avg] | string | `"avg"` | no |
@@ -60,7 +57,6 @@ Creates DataDog monitors with the following checks:
 | mysql\_pool\_efficiency\_enabled | Flag to enable MySQL innodb buffer pool efficiency monitor | string | `"true"` | no |
 | mysql\_pool\_efficiency\_extra\_tags | Extra tags for MySQL innodb buffer pool efficiency monitor | list | `[]` | no |
 | mysql\_pool\_efficiency\_message | Custom message for MySQL innodb buffer pool efficiency monitor | string | `""` | no |
-| mysql\_pool\_efficiency\_silenced | Groups to mute for MySQL innodb buffer pool efficiency monitor | map | `{}` | no |
 | mysql\_pool\_efficiency\_threshold\_critical | Maximum critical acceptable percent of innodb buffer pool efficiency | string | `"30"` | no |
 | mysql\_pool\_efficiency\_threshold\_warning | Maximum warning acceptable percent of innodb buffer pool efficiency | string | `"20"` | no |
 | mysql\_pool\_efficiency\_time\_aggregator | Monitor time aggregator for MySQL innodb buffer pool efficiency monitor [available values: min, max or avg] | string | `"min"` | no |
@@ -68,7 +64,6 @@ Creates DataDog monitors with the following checks:
 | mysql\_pool\_utilization\_enabled | Flag to enable MySQL innodb buffer pool utilization monitor | string | `"true"` | no |
 | mysql\_pool\_utilization\_extra\_tags | Extra tags for MySQL innodb buffer pool utilization monitor | list | `[]` | no |
 | mysql\_pool\_utilization\_message | Custom message for MySQL innodb buffer pool utilization monitor | string | `""` | no |
-| mysql\_pool\_utilization\_silenced | Groups to mute for MySQL innodb buffer pool utilization monitor | map | `{}` | no |
 | mysql\_pool\_utilization\_threshold\_critical | Maximum critical acceptable percent of innodb buffer pool utilization | string | `"95"` | no |
 | mysql\_pool\_utilization\_threshold\_warning | Maximum warning acceptable percent of innodb buffer pool utilization | string | `"80"` | no |
 | mysql\_pool\_utilization\_time\_aggregator | Monitor time aggregator for MySQL innodb buffer pool utilization monitor [available values: min, max or avg] | string | `"min"` | no |
@@ -83,14 +78,12 @@ Creates DataDog monitors with the following checks:
 | mysql\_questions\_interval | Interval. | string | `"60"` | no |
 | mysql\_questions\_message | Custom message for MySQL queries monitor | string | `""` | no |
 | mysql\_questions\_seasonality | Seasonality of the algorithm | string | `"daily"` | no |
-| mysql\_questions\_silenced | Groups to mute for mysql queries monitor | map | `{}` | no |
 | mysql\_questions\_threshold\_critical | Maximum critical acceptable number of queries | string | `"1"` | no |
 | mysql\_questions\_time\_aggregator | Monitor time aggregator for MySQL queries monitor [available values: min, max or avg] | string | `"avg"` | no |
 | mysql\_questions\_timeframe | Monitor timeframe for MySQL queries monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_4h"` | no |
 | mysql\_slow\_enabled | Flag to enable MySQL slow queries monitor | string | `"true"` | no |
 | mysql\_slow\_extra\_tags | Extra tags for MySQL slow queries monitor | list | `[]` | no |
 | mysql\_slow\_message | Custom message for MySQL slow queries monitor | string | `""` | no |
-| mysql\_slow\_silenced | Groups to mute for MySQL slow queries monitor | map | `{}` | no |
 | mysql\_slow\_threshold\_critical | Maximum critical acceptable percent of slow queries | string | `"20"` | no |
 | mysql\_slow\_threshold\_warning | Maximum warning acceptable percent of slow queries | string | `"5"` | no |
 | mysql\_slow\_time\_aggregator | Monitor time aggregator for MySQL slow queries monitor [available values: min, max or avg] | string | `"avg"` | no |
@@ -105,7 +98,6 @@ Creates DataDog monitors with the following checks:
 | mysql\_threads\_interval | Interval. | string | `"60"` | no |
 | mysql\_threads\_message | Custom message for MySQL threads monitor | string | `""` | no |
 | mysql\_threads\_seasonality | Seasonality of the algorithm | string | `"daily"` | no |
-| mysql\_threads\_silenced | Groups to mute for mysql threads monitor | map | `{}` | no |
 | mysql\_threads\_threshold\_critical | Maximum critical acceptable number of threads | string | `"1"` | no |
 | mysql\_threads\_time\_aggregator | Monitor time aggregator for MySQL threads monitor [available values: min, max or avg] | string | `"avg"` | no |
 | mysql\_threads\_timeframe | Monitor timeframe for MySQL threads monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_4h"` | no |
diff --git a/database/mysql/inputs.tf b/database/mysql/inputs.tf
index 2cca1d5..fe36a33 100644
--- a/database/mysql/inputs.tf
+++ b/database/mysql/inputs.tf
@@ -43,12 +43,6 @@ variable "filter_tags_custom_excluded" {
 ###   MySQL availability      ###
 #################################
 
-variable "mysql_availability_silenced" {
-  description = "Groups to mute for Mysql availability monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_availability_enabled" {
   description = "Flag to enable Mysql availability monitor"
   type        = "string"
@@ -83,12 +77,6 @@ variable "mysql_availability_no_data_timeframe" {
 ###   MySQL connections       ###
 #################################
 
-variable "mysql_connection_silenced" {
-  description = "Groups to mute for MySQL connection monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_connection_enabled" {
   description = "Flag to enable MySQL connection monitor"
   type        = "string"
@@ -133,12 +121,6 @@ variable "mysql_connection_timeframe" {
 ###   MySQL aborted connects  ###
 #################################
 
-variable "mysql_aborted_silenced" {
-  description = "Groups to mute for MySQL aborted connects monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_aborted_enabled" {
   description = "Flag to enable MySQL aborted connects monitor"
   type        = "string"
@@ -183,12 +165,6 @@ variable "mysql_aborted_timeframe" {
 ###   MySQL slow queries      ###
 #################################
 
-variable "mysql_slow_silenced" {
-  description = "Groups to mute for MySQL slow queries monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_slow_enabled" {
   description = "Flag to enable MySQL slow queries monitor"
   type        = "string"
@@ -233,12 +209,6 @@ variable "mysql_slow_timeframe" {
 # MySQL innodb pool efficiency  #
 #################################
 
-variable "mysql_pool_efficiency_silenced" {
-  description = "Groups to mute for MySQL innodb buffer pool efficiency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_pool_efficiency_enabled" {
   description = "Flag to enable MySQL innodb buffer pool efficiency monitor"
   type        = "string"
@@ -283,12 +253,6 @@ variable "mysql_pool_efficiency_timeframe" {
 # MySQL innodb pool utilization #
 #################################
 
-variable "mysql_pool_utilization_silenced" {
-  description = "Groups to mute for MySQL innodb buffer pool utilization monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_pool_utilization_enabled" {
   description = "Flag to enable MySQL innodb buffer pool utilization monitor"
   type        = "string"
@@ -333,12 +297,6 @@ variable "mysql_pool_utilization_timeframe" {
 ###   MySQL threads           ###
 #################################
 
-variable "mysql_threads_silenced" {
-  description = "Groups to mute for mysql threads monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_threads_enabled" {
   description = "Flag to enable mysql threads monitor"
   type        = "string"
@@ -420,12 +378,6 @@ variable "mysql_threads_timeframe" {
 ###   MySQL queries           ###
 #################################
 
-variable "mysql_questions_silenced" {
-  description = "Groups to mute for mysql queries monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mysql_questions_enabled" {
   description = "Flag to enable mysql queries monitor"
   type        = "string"
diff --git a/database/mysql/monitors-mysql.tf b/database/mysql/monitors-mysql.tf
index a74a4c6..d599e88 100644
--- a/database/mysql/monitors-mysql.tf
+++ b/database/mysql/monitors-mysql.tf
@@ -24,8 +24,6 @@ resource "datadog_monitor" "mysql_availability" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.mysql_availability_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_availability_extra_tags}"]
 }
 
@@ -33,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}): (
@@ -56,8 +54,6 @@ resource "datadog_monitor" "mysql_connection" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_connection_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_connection_extra_tags}"]
 }
 
@@ -65,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}): (
@@ -88,8 +84,6 @@ resource "datadog_monitor" "mysql_aborted" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_aborted_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_aborted_extra_tags}"]
 }
 
@@ -97,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}): (
@@ -120,8 +114,6 @@ resource "datadog_monitor" "mysql_slow" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_slow_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_slow_extra_tags}"]
 }
 
@@ -129,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}): (
@@ -152,8 +144,6 @@ resource "datadog_monitor" "mysql_pool_efficiency" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_pool_efficiency_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_pool_efficiency_extra_tags}"]
 }
 
@@ -161,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}):
@@ -185,8 +175,6 @@ resource "datadog_monitor" "mysql_pool_utilization" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_pool_utilization_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_pool_utilization_extra_tags}"]
 }
 
@@ -225,8 +213,6 @@ resource "datadog_monitor" "mysql_threads_anomaly" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_threads_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_threads_extra_tags}"]
 }
 
@@ -265,7 +251,5 @@ resource "datadog_monitor" "mysql_questions_anomaly" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.mysql_questions_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:mysql", "resource:mysql", "team:claranet", "created-by:terraform", "${var.mysql_questions_extra_tags}"]
 }
diff --git a/database/postgresql/README.md b/database/postgresql/README.md
index ccc0071..3e64833 100644
--- a/database/postgresql/README.md
+++ b/database/postgresql/README.md
@@ -31,17 +31,14 @@ Creates DataDog monitors with the following checks:
 | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds for the metric evaluation | string | `"300"` | no |
-| posgresql\_lock\_silenced | Groups to mute for PostgreSQL lock monitor | map | `{}` | no |
 | postgresql\_availability\_enabled | Flag to enable PostgreSQL availability monitor | string | `"true"` | no |
 | postgresql\_availability\_extra\_tags | Extra tags for PostgreSQL availability monitor | list | `[]` | no |
 | postgresql\_availability\_message | Custom message for PostgreSQL availability monitor | string | `""` | no |
 | postgresql\_availability\_no\_data\_timeframe | PostgreSQL availability monitor no data timeframe | string | `"10"` | no |
-| postgresql\_availability\_silenced | Groups to mute for PostgreSQL availability monitor | map | `{}` | no |
 | postgresql\_availability\_threshold\_warning | PostgreSQL availability monitor (warning threshold) | string | `"3"` | no |
 | postgresql\_connection\_enabled | Flag to enable PostgreSQL connection monitor | string | `"true"` | no |
 | postgresql\_connection\_extra\_tags | Extra tags for PostgreSQL connection connects monitor | list | `[]` | no |
 | postgresql\_connection\_message | Custom message for PostgreSQL connection monitor | string | `""` | no |
-| postgresql\_connection\_silenced | Groups to mute for PostgreSQL connection monitor | map | `{}` | no |
 | postgresql\_connection\_threshold\_critical | Maximum critical acceptable percent of connections | string | `"80"` | no |
 | postgresql\_connection\_threshold\_warning | Maximum warning acceptable percent of connections | string | `"70"` | no |
 | postgresql\_connection\_time\_aggregator | Monitor time aggregator for PostgreSQL connection monitor [available values: min, max or avg] | string | `"avg"` | no |
diff --git a/database/postgresql/inputs.tf b/database/postgresql/inputs.tf
index 70317d8..e761e1e 100644
--- a/database/postgresql/inputs.tf
+++ b/database/postgresql/inputs.tf
@@ -43,12 +43,6 @@ variable "filter_tags_custom_excluded" {
 ###   PostgreSQL availability  ###
 ##################################
 
-variable "postgresql_availability_silenced" {
-  description = "Groups to mute for PostgreSQL availability monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "postgresql_availability_enabled" {
   description = "Flag to enable PostgreSQL availability monitor"
   type        = "string"
@@ -93,12 +87,6 @@ variable "postgresql_connection_threshold_warning" {
   description = "Maximum warning acceptable percent of connections"
 }
 
-variable "postgresql_connection_silenced" {
-  description = "Groups to mute for PostgreSQL connection monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "postgresql_connection_enabled" {
   description = "Flag to enable PostgreSQL connection monitor"
   type        = "string"
@@ -143,12 +131,6 @@ variable "postgresql_lock_threshold_warning" {
   description = "Maximum warning acceptable number of locks"
 }
 
-variable "posgresql_lock_silenced" {
-  description = "Groups to mute for PostgreSQL lock monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "postgresql_lock_enabled" {
   description = "Flag to enable PostgreSQL lock monitor"
   type        = "string"
diff --git a/database/postgresql/monitors-postgresql.tf b/database/postgresql/monitors-postgresql.tf
index e92cb4f..2612638 100644
--- a/database/postgresql/monitors-postgresql.tf
+++ b/database/postgresql/monitors-postgresql.tf
@@ -24,8 +24,6 @@ resource "datadog_monitor" "postgresql_availability" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.postgresql_availability_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform", "${var.postgresql_availability_extra_tags}"]
 }
 
@@ -33,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}):
@@ -55,8 +53,6 @@ resource "datadog_monitor" "postgresql_connection_too_high" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.postgresql_connection_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform", "${var.postgresql_connection_extra_tags}"]
 }
 
@@ -64,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}):
@@ -86,7 +82,5 @@ resource "datadog_monitor" "postgresql_too_many_locks" {
   timeout_h           = 0
   include_tags        = true
 
-  silenced = "${var.posgresql_lock_silenced}"
-
   tags = ["env:${var.environment}", "type:database", "provider:postgres", "resource:postgresql", "team:claranet", "created-by:terraform", "${var.postgresql_lock_extra_tags}"]
 }
diff --git a/database/redis/README.md b/database/redis/README.md
index 1a5e04a..713b84b 100644
--- a/database/redis/README.md
+++ b/database/redis/README.md
@@ -34,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | blocked\_clients\_enabled | Flag to enable Redis Blocked clients monitor | string | `"true"` | no |
 | blocked\_clients\_extra\_tags | Extra tags for Redis Blocked clients monitor | list | `[]` | no |
 | blocked\_clients\_message | Custom message for Redis Blocked clients monitor | string | `""` | no |
-| blocked\_clients\_silenced | Groups to mute for Redis Blocked clients monitor | map | `{}` | no |
 | blocked\_clients\_threshold\_critical | Blocked clients rate (critical threshold) | string | `"30"` | no |
 | blocked\_clients\_threshold\_warning | Blocked clients rate (warning threshold) | string | `"10"` | no |
 | blocked\_clients\_time\_aggregator | Monitor aggregator for Redis Blocked clients [available values: min, max or avg] | string | `"min"` | no |
@@ -44,7 +43,6 @@ Creates DataDog monitors with the following checks:
 | evictedkeys\_change\_enabled | Flag to enable Redis evicted keys monitor | string | `"true"` | no |
 | evictedkeys\_change\_extra\_tags | Extra tags for Redis evicted keys monitor | list | `[]` | no |
 | evictedkeys\_change\_message | Custom message for Redis evicted keys monitor | string | `""` | no |
-| evictedkeys\_change\_silenced | Groups to mute for Redis evicted keys monitor | map | `{}` | no |
 | evictedkeys\_change\_threshold\_critical | Evicted keys change (critical threshold) | string | `"100"` | no |
 | evictedkeys\_change\_threshold\_warning | Evicted keys change (warning threshold) | string | `"20"` | no |
 | evictedkeys\_change\_time\_aggregator | Monitor aggregator for Redis evicted keys [available values: min, max or avg] | string | `"avg"` | no |
@@ -52,7 +50,6 @@ Creates DataDog monitors with the following checks:
 | expirations\_rate\_enabled | Flag to enable Redis keys expirations monitor | string | `"true"` | no |
 | expirations\_rate\_extra\_tags | Extra tags for Redis keys expirations monitor | list | `[]` | no |
 | expirations\_rate\_message | Custom message for Redis keys expirations monitor | string | `""` | no |
-| expirations\_rate\_silenced | Groups to mute for Redis keys expirations monitor | map | `{}` | no |
 | expirations\_rate\_threshold\_critical | Expirations percent (critical threshold) | string | `"80"` | no |
 | expirations\_rate\_threshold\_warning | Expirations percent (warning threshold) | string | `"60"` | no |
 | expirations\_rate\_time\_aggregator | Monitor aggregator for Redis keys expirations [available values: min, max or avg] | string | `"min"` | no |
@@ -63,7 +60,6 @@ Creates DataDog monitors with the following checks:
 | hitrate\_enabled | Flag to enable Redis hitrate monitor | string | `"true"` | no |
 | hitrate\_extra\_tags | Extra tags for Redis hitrate monitor | list | `[]` | no |
 | hitrate\_message | Custom message for Redis hitrate monitor | string | `""` | no |
-| hitrate\_silenced | Groups to mute for Redis hitrate monitor | map | `{}` | no |
 | hitrate\_threshold\_critical | hitrate limit (critical threshold) | string | `"10"` | no |
 | hitrate\_threshold\_warning | hitrate limit (warning threshold) | string | `"30"` | no |
 | hitrate\_time\_aggregator | Monitor aggregator for Redis hitrate [available values: min, max or avg] | string | `"max"` | no |
@@ -71,7 +67,6 @@ Creates DataDog monitors with the following checks:
 | keyspace\_enabled | Flag to enable Redis keyspace monitor | string | `"true"` | no |
 | keyspace\_extra\_tags | Extra tags for Redis keyspace monitor | list | `[]` | no |
 | keyspace\_message | Custom message for Redis keyspace monitor | string | `""` | no |
-| keyspace\_silenced | Groups to mute for Redis keyspace monitor | map | `{ "*": 0 }` | no |
 | keyspace\_threshold\_critical | Keyspace no changement (critical threshold) | string | `"0"` | no |
 | keyspace\_threshold\_warning | Keyspace no changement (warning threshold) | string | `"1"` | no |
 | keyspace\_time\_aggregator | Monitor aggregator for Redis keyspace [available values: min, max or avg] | string | `"min"` | no |
@@ -79,7 +74,6 @@ Creates DataDog monitors with the following checks:
 | latency\_enabled | Flag to enable Redis latency monitor | string | `"true"` | no |
 | latency\_extra\_tags | Extra tags for Redis latency monitor | list | `[]` | no |
 | latency\_message | Custom message for Redis latency monitor | string | `""` | no |
-| latency\_silenced | Groups to mute for Redis latency monitor | map | `{}` | no |
 | latency\_threshold\_critical | latency limit (critical threshold) | string | `"100"` | no |
 | latency\_threshold\_warning | latency limit (warning threshold) | string | `"50"` | no |
 | latency\_time\_aggregator | Monitor aggregator for Redis latency [available values: min, max or avg] | string | `"min"` | no |
@@ -87,7 +81,6 @@ Creates DataDog monitors with the following checks:
 | mem\_frag\_enabled | Flag to enable Redis memory RAM fragmentation monitor | string | `"true"` | no |
 | mem\_frag\_extra\_tags | Extra tags for Redis memory RAM fragmentation monitor | list | `[]` | no |
 | mem\_frag\_message | Custom message for Redis memory RAM fragmentation monitor | string | `""` | no |
-| mem\_frag\_silenced | Groups to mute for Redis memory RAM fragmentation monitor | map | `{}` | no |
 | mem\_frag\_threshold\_critical | memory RAM fragmentation limit (critical threshold) | string | `"150"` | no |
 | mem\_frag\_threshold\_warning | memory RAM fragmentation limit (warning threshold) | string | `"130"` | no |
 | mem\_frag\_time\_aggregator | Monitor aggregator for Redis memory RAM fragmentation [available values: min, max or avg] | string | `"min"` | no |
@@ -95,7 +88,6 @@ Creates DataDog monitors with the following checks:
 | mem\_used\_enabled | Flag to enable Redis RAM memory used monitor | string | `"true"` | no |
 | mem\_used\_extra\_tags | Extra tags for Redis RAM memory used monitor | list | `[]` | no |
 | mem\_used\_message | Custom message for Redis RAM memory used monitor | string | `""` | no |
-| mem\_used\_silenced | Groups to mute for Redis RAM memory used monitor | map | `{}` | no |
 | mem\_used\_threshold\_critical | RAM memory used limit (critical threshold) | string | `"95"` | no |
 | mem\_used\_threshold\_warning | RAM memory used limit (warning threshold) | string | `"85"` | no |
 | mem\_used\_time\_aggregator | Monitor aggregator for Redis RAM memory used [available values: min, max or avg] | string | `"min"` | no |
@@ -106,13 +98,11 @@ Creates DataDog monitors with the following checks:
 | not\_responding\_extra\_tags | Extra tags for Redis does not respond monitor | list | `[]` | no |
 | not\_responding\_message | Custom message for Redis does not respond monitor | string | `""` | no |
 | not\_responding\_no\_data\_timeframe | Redis does not respond monitor no data timeframe | string | `"10"` | no |
-| not\_responding\_silenced | Groups to mute for Redis does not respond monitor | map | `{}` | no |
 | not\_responding\_threshold\_warning | Redis does not respond monitor (warning threshold) | string | `"3"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | rejected\_con\_enabled | Flag to enable Redis rejected connections errors monitor | string | `"true"` | no |
 | rejected\_con\_extra\_tags | Extra tags for Redis rejected connections errors monitor | list | `[]` | no |
 | rejected\_con\_message | Custom message for Redis rejected connections errors monitor | string | `""` | no |
-| rejected\_con\_silenced | Groups to mute for Redis rejected connections errors monitor | map | `{}` | no |
 | rejected\_con\_threshold\_critical | rejected connections errors limit (critical threshold) | string | `"50"` | no |
 | rejected\_con\_threshold\_warning | rejected connections errors limit (warning threshold) | string | `"10"` | no |
 | rejected\_con\_time\_aggregator | Monitor aggregator for Redis rejected connections errors [available values: min, max or avg] | string | `"min"` | no |
diff --git a/database/redis/inputs.tf b/database/redis/inputs.tf
index 78bb426..7866bec 100644
--- a/database/redis/inputs.tf
+++ b/database/redis/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # Redis specific variables
 
-variable "evictedkeys_change_silenced" {
-  description = "Groups to mute for Redis evicted keys monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "evictedkeys_change_enabled" {
   description = "Flag to enable Redis evicted keys monitor"
   type        = "string"
@@ -87,12 +81,6 @@ variable "evictedkeys_change_threshold_critical" {
   default     = 100
 }
 
-variable "expirations_rate_silenced" {
-  description = "Groups to mute for Redis keys expirations monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "expirations_rate_enabled" {
   description = "Flag to enable Redis keys expirations monitor"
   type        = "string"
@@ -133,12 +121,6 @@ variable "expirations_rate_threshold_warning" {
   default     = 60
 }
 
-variable "blocked_clients_silenced" {
-  description = "Groups to mute for Redis Blocked clients monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "blocked_clients_enabled" {
   description = "Flag to enable Redis Blocked clients monitor"
   type        = "string"
@@ -179,15 +161,6 @@ variable "blocked_clients_threshold_warning" {
   default     = 10
 }
 
-variable "keyspace_silenced" {
-  description = "Groups to mute for Redis keyspace monitor"
-  type        = "map"
-
-  default = {
-    "*" = 0 # Mute all for now by default
-  }
-}
-
 variable "keyspace_enabled" {
   description = "Flag to enable Redis keyspace monitor"
   type        = "string"
@@ -228,12 +201,6 @@ variable "keyspace_threshold_warning" {
   default     = 1
 }
 
-variable "mem_used_silenced" {
-  description = "Groups to mute for Redis RAM memory used monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mem_used_enabled" {
   description = "Flag to enable Redis RAM memory used monitor"
   type        = "string"
@@ -274,12 +241,6 @@ variable "mem_used_threshold_warning" {
   default     = 85
 }
 
-variable "mem_frag_silenced" {
-  description = "Groups to mute for Redis memory RAM fragmentation monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "mem_frag_enabled" {
   description = "Flag to enable Redis memory RAM fragmentation monitor"
   type        = "string"
@@ -320,12 +281,6 @@ variable "mem_frag_threshold_warning" {
   default     = 130
 }
 
-variable "rejected_con_silenced" {
-  description = "Groups to mute for Redis rejected connections errors monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "rejected_con_enabled" {
   description = "Flag to enable Redis rejected connections errors monitor"
   type        = "string"
@@ -366,12 +321,6 @@ variable "rejected_con_threshold_warning" {
   default     = 10
 }
 
-variable "latency_silenced" {
-  description = "Groups to mute for Redis latency monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "latency_enabled" {
   description = "Flag to enable Redis latency monitor"
   type        = "string"
@@ -412,12 +361,6 @@ variable "latency_threshold_warning" {
   default     = 50
 }
 
-variable "hitrate_silenced" {
-  description = "Groups to mute for Redis hitrate monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "hitrate_enabled" {
   description = "Flag to enable Redis hitrate monitor"
   type        = "string"
@@ -461,11 +404,6 @@ variable "hitrate_threshold_warning" {
 #
 # Connection Down
 #
-variable "not_responding_silenced" {
-  description = "Groups to mute for Redis does not respond monitor"
-  type        = "map"
-  default     = {}
-}
 
 variable "not_responding_enabled" {
   description = "Flag to enable Redis does not respond monitor"
diff --git a/database/redis/monitors-redis.tf b/database/redis/monitors-redis.tf
index 4dd9ee1..b2ce347 100644
--- a/database/redis/monitors-redis.tf
+++ b/database/redis/monitors-redis.tf
@@ -17,8 +17,6 @@ resource "datadog_monitor" "not_responding" {
     critical = 5
   }
 
-  silenced = "${var.not_responding_silenced}"
-
   notify_no_data      = true
   no_data_timeframe   = "${var.not_responding_no_data_timeframe}"
   notify_audit        = false
@@ -44,15 +42,13 @@ resource "datadog_monitor" "evicted_keys" {
      ) > ${var.evictedkeys_change_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.evictedkeys_change_threshold_warning}"
     critical = "${var.evictedkeys_change_threshold_critical}"
   }
 
-  silenced = "${var.evictedkeys_change_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -77,15 +73,13 @@ resource "datadog_monitor" "expirations" {
      ) > ${var.expirations_rate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.expirations_rate_threshold_warning}"
     critical = "${var.expirations_rate_threshold_critical}"
   }
 
-  silenced = "${var.expirations_rate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -111,15 +105,13 @@ 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}"
     critical = "${var.blocked_clients_threshold_critical}"
   }
 
-  silenced = "${var.blocked_clients_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -144,15 +136,13 @@ resource "datadog_monitor" "keyspace_full" {
      ) == ${var.keyspace_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.keyspace_threshold_warning}"
     critical = "${var.keyspace_threshold_critical}"
   }
 
-  silenced = "${var.keyspace_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -178,15 +168,13 @@ 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}"
     critical = "${var.mem_used_threshold_critical}"
   }
 
-  silenced = "${var.mem_used_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -211,15 +199,13 @@ 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}"
     critical = "${var.mem_frag_threshold_critical}"
   }
 
-  silenced = "${var.mem_frag_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -244,15 +230,13 @@ resource "datadog_monitor" "rejected_connections" {
      ) > ${var.rejected_con_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.rejected_con_threshold_warning}"
     critical = "${var.rejected_con_threshold_critical}"
   }
 
-  silenced = "${var.rejected_con_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -277,15 +261,13 @@ resource "datadog_monitor" "latency" {
      ) > ${var.latency_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.latency_threshold_warning}"
     critical = "${var.latency_threshold_critical}"
   }
 
-  silenced = "${var.latency_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
@@ -312,15 +294,13 @@ resource "datadog_monitor" "hitrate" {
      ) * 100 < ${var.hitrate_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.hitrate_threshold_warning}"
     critical = "${var.hitrate_threshold_critical}"
   }
 
-  silenced = "${var.hitrate_silenced}"
-
   notify_no_data      = false
   evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
diff --git a/middleware/apache/README.md b/middleware/apache/README.md
index 95005be..167ab3b 100644
--- a/middleware/apache/README.md
+++ b/middleware/apache/README.md
@@ -25,7 +25,6 @@ Creates DataDog monitors with the following checks:
 | apache\_connect\_enabled | Flag to enable Apache status monitor | string | `"true"` | no |
 | apache\_connect\_extra\_tags | Extra tags for Apache process monitor | list | `[]` | no |
 | apache\_connect\_message | Custom message for Apache status monitor | string | `""` | no |
-| apache\_connect\_silenced | Groups to mute for Apache status monitor | map | `{}` | no |
 | apache\_connect\_threshold\_warning | Apache status monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture Environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
diff --git a/middleware/apache/inputs.tf b/middleware/apache/inputs.tf
index c3178fc..ba9c421 100644
--- a/middleware/apache/inputs.tf
+++ b/middleware/apache/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # Apache Middleware specific
 
-variable "apache_connect_silenced" {
-  description = "Groups to mute for Apache status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "apache_connect_enabled" {
   description = "Flag to enable Apache status monitor"
   type        = "string"
diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index e1da39f..17c3371 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -23,7 +23,5 @@ resource "datadog_monitor" "datadog_apache_process" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.apache_connect_silenced}"
-
   tags = ["env:${var.environment}", "type:middleware", "provider:apache", "resource:apache", "team:claranet", "created-by:terraform", "${var.apache_connect_extra_tags}"]
 }
diff --git a/middleware/nginx/README.md b/middleware/nginx/README.md
index dcdd222..b1f1aa6 100644
--- a/middleware/nginx/README.md
+++ b/middleware/nginx/README.md
@@ -34,12 +34,10 @@ Creates DataDog monitors with the following checks:
 | nginx\_connect\_extra\_tags | Extra tags for Nginx process monitor | list | `[]` | no |
 | nginx\_connect\_message | Custom message for Nginx status monitor | string | `""` | no |
 | nginx\_connect\_no\_data\_timeframe | Nginx status monitor no data timeframe | string | `"10"` | no |
-| nginx\_connect\_silenced | Groups to mute for Nginx status monitor | map | `{}` | no |
 | nginx\_connect\_threshold\_warning | Nginx status monitor (warning threshold) | string | `"3"` | no |
 | nginx\_dropped\_enabled | Flag to enable Nginx dropped monitor | string | `"true"` | no |
 | nginx\_dropped\_extra\_tags | Extra tags for Nginx dropped connections monitor | list | `[]` | no |
 | nginx\_dropped\_message | Custom message for Nginx dropped connections monitor | string | `""` | no |
-| nginx\_dropped\_silenced | Groups to mute for Nginx dropped connections monitor | map | `{}` | no |
 | nginx\_dropped\_threshold\_critical | Nginx dropped connections critical threshold | string | `"0"` | no |
 | nginx\_dropped\_time\_aggregator | Monitor aggregator for Nginx dropped connections [available values: min, max or avg] | string | `"min"` | no |
 | nginx\_dropped\_timeframe | Monitor timeframe for Nginx dropped connections [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
diff --git a/middleware/nginx/inputs.tf b/middleware/nginx/inputs.tf
index 0cece43..efae379 100644
--- a/middleware/nginx/inputs.tf
+++ b/middleware/nginx/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # Nginx Middleware specific
 
-variable "nginx_connect_silenced" {
-  description = "Groups to mute for Nginx status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "nginx_connect_enabled" {
   description = "Flag to enable Nginx status monitor"
   type        = "string"
@@ -77,12 +71,6 @@ variable "nginx_connect_no_data_timeframe" {
   default     = 10
 }
 
-variable "nginx_dropped_silenced" {
-  description = "Groups to mute for Nginx dropped connections monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "nginx_dropped_enabled" {
   description = "Flag to enable Nginx dropped monitor"
   type        = "string"
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 90def82..115259b 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -24,8 +24,6 @@ resource "datadog_monitor" "datadog_nginx_process" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.nginx_connect_silenced}"
-
   tags = ["env:${var.environment}", "type:middleware", "provider:nginx", "resource:nginx", "team:claranet", "created-by:terraform", "${var.nginx_connect_extra_tags}"]
 }
 
@@ -55,7 +53,5 @@ resource "datadog_monitor" "datadog_nginx_dropped_connections" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.nginx_dropped_silenced}"
-
   tags = ["env:${var.environment}", "type:middleware", "provider:nginx", "resource:nginx", "team:claranet", "created-by:terraform", "${var.nginx_dropped_extra_tags}"]
 }
diff --git a/middleware/php-fpm/README.md b/middleware/php-fpm/README.md
index 55dcec6..45d1082 100644
--- a/middleware/php-fpm/README.md
+++ b/middleware/php-fpm/README.md
@@ -33,7 +33,6 @@ Creates DataDog monitors with the following checks:
 | php\_fpm\_busy\_enabled | Flag to enable PHP FPM busy worker monitor | string | `"true"` | no |
 | php\_fpm\_busy\_extra\_tags | Extra tags for PHP FPM busy worker monitor | list | `[]` | no |
 | php\_fpm\_busy\_message | Custom message for PHP FPM busy worker monitor | string | `""` | no |
-| php\_fpm\_busy\_silenced | Groups to mute for PHP FPM busy worker monitor | map | `{}` | no |
 | php\_fpm\_busy\_threshold\_critical | php fpm busy critical threshold | string | `"90"` | no |
 | php\_fpm\_busy\_threshold\_warning | php fpm busy warning threshold | string | `"80"` | no |
 | php\_fpm\_busy\_time\_aggregator | Monitor aggregator for PHP FPM busy worker [available values: min, max or avg] | string | `"avg"` | no |
@@ -42,7 +41,6 @@ Creates DataDog monitors with the following checks:
 | php\_fpm\_connect\_extra\_tags | Extra tags for PHP FPM status monitor | list | `[]` | no |
 | php\_fpm\_connect\_message | Custom message for PHP FPM status monitor | string | `""` | no |
 | php\_fpm\_connect\_no\_data\_timeframe | PHP FPM status monitor no data timeframe | string | `"10"` | no |
-| php\_fpm\_connect\_silenced | Groups to mute for PHP FPM status monitor | map | `{}` | no |
 | php\_fpm\_connect\_threshold\_warning | PHP FPM status monitor (warning threshold) | string | `"3"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 
diff --git a/middleware/php-fpm/inputs.tf b/middleware/php-fpm/inputs.tf
index a78f268..4887ecd 100644
--- a/middleware/php-fpm/inputs.tf
+++ b/middleware/php-fpm/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # PHP FPM Middleware specific
 
-variable "php_fpm_busy_silenced" {
-  description = "Groups to mute for PHP FPM busy worker monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "php_fpm_busy_enabled" {
   description = "Flag to enable PHP FPM busy worker monitor"
   type        = "string"
@@ -87,12 +81,6 @@ variable "php_fpm_busy_threshold_critical" {
   default     = 90
 }
 
-variable "php_fpm_connect_silenced" {
-  description = "Groups to mute for PHP FPM status monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "php_fpm_connect_enabled" {
   description = "Flag to enable PHP FPM status monitor"
   type        = "string"
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 74706f0..464cd5e 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -24,8 +24,6 @@ resource "datadog_monitor" "php_fpm_connect" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.php_fpm_connect_silenced}"
-
   tags = ["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform", "${var.php_fpm_connect_extra_tags}"]
 }
 
@@ -34,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}): (
@@ -58,7 +56,5 @@ resource "datadog_monitor" "php_fpm_connect_idle" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.php_fpm_busy_silenced}"
-
   tags = ["env:${var.environment}", "type:middleware", "provider:php-fpm", "resource:php-fpm", "team:claranet", "created-by:terraform", "${var.php_fpm_busy_extra_tags}"]
 }
diff --git a/system/generic/README.md b/system/generic/README.md
index a0234cf..0d60a39 100644
--- a/system/generic/README.md
+++ b/system/generic/README.md
@@ -32,7 +32,6 @@ Creates DataDog monitors with the following checks:
 | cpu\_enabled | Flag to enable CPU high monitor | string | `"true"` | no |
 | cpu\_extra\_tags | Extra tags for CPU high monitor | list | `[]` | no |
 | cpu\_message | Custom message for CPU high monitor | string | `""` | no |
-| cpu\_silenced | Groups to mute for CPU high monitor | map | `{}` | no |
 | cpu\_threshold\_critical | CPU high critical threshold | string | `"90"` | no |
 | cpu\_threshold\_warning | CPU high warning threshold | string | `"85"` | no |
 | cpu\_time\_aggregator | Monitor aggregator for CPU high [available values: min, max or avg] | string | `"min"` | no |
@@ -40,7 +39,6 @@ Creates DataDog monitors with the following checks:
 | disk\_inodes\_enabled | Flag to enable Free disk inodes monitor | string | `"true"` | no |
 | disk\_inodes\_extra\_tags | Extra tags for Free disk inodes monitor | list | `[]` | no |
 | disk\_inodes\_message | Custom message for Free disk inodes monitor | string | `""` | no |
-| disk\_inodes\_silenced | Groups to mute for Free disk inodes monitor | map | `{}` | no |
 | disk\_inodes\_threshold\_critical | Free disk space critical threshold | string | `"95"` | no |
 | disk\_inodes\_threshold\_warning | Free disk space warning threshold | string | `"90"` | no |
 | disk\_inodes\_time\_aggregator | Monitor aggregator for Free disk inodes [available values: min, max or avg] | string | `"min"` | no |
@@ -56,13 +54,11 @@ Creates DataDog monitors with the following checks:
 | disk\_space\_forecast\_linear\_model | Model for the Free diskspace Forecast monitor [available values: `default`, `simple` or `reactive`] | string | `"default"` | no |
 | disk\_space\_forecast\_message | Custom message for Free diskspace forecast monitor | string | `""` | no |
 | disk\_space\_forecast\_seasonal\_seasonality | Seasonality for the Free diskspace Forecast monitor | string | `"weekly"` | no |
-| disk\_space\_forecast\_silenced | Groups to mute for Free diskspace forecast monitor | map | `{}` | no |
 | disk\_space\_forecast\_threshold\_critical | Free disk space forecast critical threshold | string | `"80"` | no |
 | disk\_space\_forecast\_threshold\_critical\_recovery | Free disk space forecast recovery threshold | string | `"72"` | no |
 | disk\_space\_forecast\_time\_aggregator | Monitor aggregator for Free diskspace forecast [available values: min, max or avg] | string | `"max"` | no |
 | disk\_space\_forecast\_timeframe | Monitor timeframe for Free diskspace forecast [available values: `next_12h`, `next_#d` (1, 2, or 3), `next_#w` (1 or 2) or `next_#mo` (1, 2 or 3)] | string | `"next_1w"` | no |
 | disk\_space\_message | Custom message for Free diskspace monitor | string | `""` | no |
-| disk\_space\_silenced | Groups to mute for Free diskspace monitor | map | `{}` | no |
 | disk\_space\_threshold\_critical | Free disk space critical threshold | string | `"90"` | no |
 | disk\_space\_threshold\_warning | Free disk space warning threshold | string | `"80"` | no |
 | disk\_space\_time\_aggregator | Monitor aggregator for Free diskspace [available values: min, max or avg] | string | `"max"` | no |
@@ -75,7 +71,6 @@ Creates DataDog monitors with the following checks:
 | load\_enabled | Flag to enable CPU load ratio monitor | string | `"true"` | no |
 | load\_extra\_tags | Extra tags for CPU load ratio monitor | list | `[]` | no |
 | load\_message | Custom message for CPU load ratio monitor | string | `""` | no |
-| load\_silenced | Groups to mute for CPU load ratio monitor | map | `{}` | no |
 | load\_threshold\_critical | CPU load ratio critical threshold | string | `"2.5"` | no |
 | load\_threshold\_warning | CPU load ratio warning threshold | string | `"2"` | no |
 | load\_time\_aggregator | Monitor aggregator for CPU load ratio [available values: min, max or avg] | string | `"min"` | no |
@@ -83,7 +78,6 @@ Creates DataDog monitors with the following checks:
 | memory\_enabled | Flag to enable Free memory monitor | string | `"true"` | no |
 | memory\_extra\_tags | Extra tags for Free memory monitor | list | `[]` | no |
 | memory\_message | Mandatory message for Free memory monitor to avoid NBH alerting by default | string | n/a | yes |
-| memory\_silenced | Groups to mute for Free memory monitor | map | `{}` | no |
 | memory\_threshold\_critical | Free disk space critical threshold | string | `"5"` | no |
 | memory\_threshold\_warning | Free disk space warning threshold | string | `"10"` | no |
 | memory\_time\_aggregator | Monitor aggregator for Free memory [available values: min, max or avg] | string | `"max"` | no |
diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf
index 66eba7e..0b0b52a 100644
--- a/system/generic/inputs.tf
+++ b/system/generic/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # System generic specific
 
-variable "cpu_silenced" {
-  description = "Groups to mute for CPU high monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "cpu_enabled" {
   description = "Flag to enable CPU high monitor"
   type        = "string"
@@ -87,12 +81,6 @@ variable "cpu_threshold_critical" {
   default     = 90
 }
 
-variable "load_silenced" {
-  description = "Groups to mute for CPU load ratio monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "load_enabled" {
   description = "Flag to enable CPU load ratio monitor"
   type        = "string"
@@ -133,12 +121,6 @@ variable "load_threshold_critical" {
   default     = 2.5
 }
 
-variable "disk_space_silenced" {
-  description = "Groups to mute for Free diskspace monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_space_enabled" {
   description = "Flag to enable Free diskspace monitor"
   type        = "string"
@@ -179,12 +161,6 @@ variable "disk_space_threshold_critical" {
   default     = 90
 }
 
-variable "disk_space_forecast_silenced" {
-  description = "Groups to mute for Free diskspace forecast monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_space_forecast_enabled" {
   description = "Flag to enable Free diskspace forecast monitor"
   type        = "string"
@@ -261,12 +237,6 @@ variable "disk_space_forecast_threshold_critical" {
   default     = 80
 }
 
-variable "disk_inodes_silenced" {
-  description = "Groups to mute for Free disk inodes monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "disk_inodes_enabled" {
   description = "Flag to enable Free disk inodes monitor"
   type        = "string"
@@ -307,12 +277,6 @@ variable "disk_inodes_threshold_critical" {
   default     = 95
 }
 
-variable "memory_silenced" {
-  description = "Groups to mute for Free memory monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "memory_enabled" {
   description = "Flag to enable Free memory monitor"
   type        = "string"
diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index d40d0e5..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}"
@@ -25,8 +25,6 @@ resource "datadog_monitor" "cpu" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.cpu_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform", "${var.cpu_extra_tags}"]
 }
 
@@ -41,7 +39,7 @@ resource "datadog_monitor" "load" {
     ) > ${var.load_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.load_threshold_warning}"
@@ -57,8 +55,6 @@ resource "datadog_monitor" "load" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.load_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:system-core", "resource:generic", "team:claranet", "created-by:terraform", "${var.load_extra_tags}"]
 }
 
@@ -73,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}"
@@ -89,8 +85,6 @@ resource "datadog_monitor" "disk_space" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.disk_space_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform", "${var.disk_space_extra_tags}"]
 }
 
@@ -129,8 +123,6 @@ resource "datadog_monitor" "disk_space_forecast" {
   evaluation_delay = "${var.evaluation_delay}"
   new_host_delay   = "${var.new_host_delay}"
 
-  silenced = "${var.disk_space_forecast_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform", "${var.disk_space_forecast_extra_tags}"]
 }
 
@@ -145,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}"
@@ -161,8 +153,6 @@ resource "datadog_monitor" "disk_inodes" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.disk_inodes_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform", "${var.disk_inodes_extra_tags}"]
 }
 
@@ -178,7 +168,7 @@ resource "datadog_monitor" "memory" {
     < ${var.memory_threshold_critical}
   EOQ
 
-  type = "metric alert"
+  type = "query alert"
 
   thresholds {
     warning  = "${var.memory_threshold_warning}"
@@ -195,7 +185,5 @@ resource "datadog_monitor" "memory" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.memory_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:system-check", "resource:generic", "team:claranet", "created-by:terraform", "${var.memory_extra_tags}"]
 }
diff --git a/system/unreachable/README.md b/system/unreachable/README.md
index 66d9977..7ab8e19 100644
--- a/system/unreachable/README.md
+++ b/system/unreachable/README.md
@@ -34,7 +34,6 @@ Creates DataDog monitors with the following checks:
 | unreachable\_extra\_tags | Extra tags for Host unreachable monitor | list | `[]` | no |
 | unreachable\_message | Custom message for Host unreachable monitor | string | `""` | no |
 | unreachable\_no\_data\_timeframe | Timeframe for Host unreachable monitor to alert on no data | string | `"20"` | no |
-| unreachable\_silenced | Groups to mute for Host unreachable monitor | map | `{}` | no |
 
 ## Outputs
 
diff --git a/system/unreachable/inputs.tf b/system/unreachable/inputs.tf
index 5159bc6..5f34de0 100644
--- a/system/unreachable/inputs.tf
+++ b/system/unreachable/inputs.tf
@@ -41,12 +41,6 @@ variable "filter_tags_custom_excluded" {
 
 # Unreachable
 
-variable "unreachable_silenced" {
-  description = "Groups to mute for Host unreachable monitor"
-  type        = "map"
-  default     = {}
-}
-
 variable "unreachable_enabled" {
   description = "Flag to enable Host unreachable monitor"
   type        = "string"
diff --git a/system/unreachable/monitors-unreachable.tf b/system/unreachable/monitors-unreachable.tf
index 9f46b7f..5e7dbcf 100644
--- a/system/unreachable/monitors-unreachable.tf
+++ b/system/unreachable/monitors-unreachable.tf
@@ -24,7 +24,5 @@ resource "datadog_monitor" "host_unreachable" {
   locked              = false
   require_full_window = true
 
-  silenced = "${var.unreachable_silenced}"
-
   tags = ["env:${var.environment}", "type:system", "provider:host", "resource:unreachable", "team:claranet", "created-by:terraform", "${var.unreachable_extra_tags}"]
 }