diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md
index 3a3993f..1f4c360 100644
--- a/cloud/azure/storage/README.md
+++ b/cloud/azure/storage/README.md
@@ -16,15 +16,39 @@ module "datadog-monitors-cloud-azure-storage" {
 
 Creates DataDog monitors with the following checks:
 
+- Azure Blob Storage too many authorization errors
+- Azure Blob Storage too many client_other errors
+- Azure Blob Storage too many network errors
+- Azure Blob Storage too many server_other errors
+- Azure Blob Storage too many throttling errors
+- Azure Blob Storage too many timeout errors
+- Azure File Storage too many authorization errors
+- Azure File Storage too many client_other errors
+- Azure File Storage too many network errors
+- Azure File Storage too many server_other errors
+- Azure File Storage too many timeout errors
+- Azure Queue Storage too many authorization errors
+- Azure Queue Storage too many client_other errors
+- Azure Queue Storage too many network errors
+- Azure Queue Storage too many server_other errors
+- Azure Queue Storage too many timeout errors
+- Azure Storage Blob service too few successful requests
+- Azure Storage Blob service too high end to end latency
+- Azure Storage File service too few successful requests
+- Azure Storage File service too high end to end latency
 - Azure Storage is down
-- Azure Storage too few successful requests
-- Azure Storage too high end to end latency
-- Azure Storage too many authorization errors
-- Azure Storage too many client_other errors
-- Azure Storage too many network errors
-- Azure Storage too many server_other errors
+- Azure Storage Queue service too few successful requests
+- Azure Storage Queue service too high end to end latency
+- Azure Storage Table service too few successful requests
+- Azure Storage Table service too high end to end latency
 - Azure Storage too many throttling errors
-- Azure Storage too many timeout errors
+- Azure Storage too many throttling errors
+- Azure Storage too many throttling errors
+- Azure Table Storage too many authorization errors
+- Azure Table Storage too many client_other errors
+- Azure Table Storage too many network errors
+- Azure Table Storage too many server_other errors
+- Azure Table Storage too many timeout errors
 
 ## Inputs
 
@@ -33,6 +57,7 @@ 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(string) | `[]` | 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(string) | `{}` | 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 |
@@ -40,6 +65,7 @@ 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(string) | `[]` | no |
 | availability\_message | Custom message for Storage availability monitor | string | `""` | no |
+| availability\_silenced | Groups to mute for Storage availability monitor | map(string) | `{}` | 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 |
@@ -47,6 +73,7 @@ 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(string) | `[]` | 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(string) | `{}` | 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 |
@@ -59,6 +86,7 @@ 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(string) | `[]` | no |
 | latency\_message | Custom message for Storage latency monitor | string | `""` | no |
+| latency\_silenced | Groups to mute for Storage latency monitor | map(string) | `{}` | 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 |
@@ -67,6 +95,7 @@ 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(string) | `[]` | 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(string) | `{}` | 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 |
@@ -76,20 +105,29 @@ 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(string) | `[]` | 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(string) | `{}` | 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 |
 | server\_other\_error\_requests\_timeframe | Monitor timeframe for Storage server other errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
+| status\_enabled | Flag to enable App Services status monitor | string | `"true"` | no |
+| status\_extra\_tags | Extra tags for App Services status monitor | list(string) | `[]` | no |
+| status\_message | Custom message for storage Services status monitor | string | `""` | no |
+| status\_silenced | Groups to mute for App Services status monitor | map(string) | `{}` | no |
+| status\_time\_aggregator | Monitor aggregator for Storage Services status [available values: min, max or avg] | string | `"max"` | no |
+| status\_timeframe | Monitor timeframe for Storage 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 |
 | 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(string) | `[]` | no |
 | successful\_requests\_message | Custom message for Storage sucessful requests monitor | string | `""` | 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\_silenced | Groups to mute for Storage sucessful requests monitor | map(string) | `{}` | no |
 | successful\_requests\_time\_aggregator | Monitor aggregator for Storage sucessful requests [available values: min, max or avg] | string | `"max"` | no |
 | successful\_requests\_timeframe | Monitor timeframe for Storage sucessful requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
+| successful\_storage\_requests\_threshold\_critical | Minimum acceptable percent of successful requests for a storage | string | `"90"` | no |
+| successful\_storage\_requests\_threshold\_warning | Warning regarding acceptable percent of successful requests for a storage | string | `"70"` | no |
 | 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(string) | `[]` | 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(string) | `{}` | 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 |
@@ -97,6 +135,7 @@ 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(string) | `[]` | 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(string) | `{}` | 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 |
@@ -106,15 +145,39 @@ Creates DataDog monitors with the following checks:
 
 | Name | Description |
 |------|-------------|
-| authorization\_error\_requests\_id | id for monitor authorization_error_requests |
-| availability\_id | id for monitor availability |
-| client\_other\_error\_requests\_id | id for monitor client_other_error_requests |
-| latency\_id | id for monitor latency |
-| network\_error\_requests\_id | id for monitor network_error_requests |
-| server\_other\_error\_requests\_id | id for monitor server_other_error_requests |
-| successful\_requests\_id | id for monitor successful_requests |
-| throttling\_error\_requests\_id | id for monitor throttling_error_requests |
-| timeout\_error\_requests\_id | id for monitor timeout_error_requests |
+| blob\_authorization\_error\_requests\_id | id for monitor blob_authorization_error_requests |
+| blob\_client\_other\_error\_requests\_id | id for monitor blob_client_other_error_requests |
+| blob\_network\_error\_requests\_id | id for monitor blob_network_error_requests |
+| blob\_server\_other\_error\_requests\_id | id for monitor blob_server_other_error_requests |
+| blob\_throttling\_error\_requests\_id | id for monitor blob_throttling_error_requests |
+| blob\_timeout\_error\_requests\_id | id for monitor blob_timeout_error_requests |
+| blobservices\_latency\_id | id for monitor blobservices_latency |
+| blobservices\_requests\_error\_id | id for monitor blobservices_requests_error |
+| file\_authorization\_error\_requests\_id | id for monitor file_authorization_error_requests |
+| file\_client\_other\_error\_requests\_id | id for monitor file_client_other_error_requests |
+| file\_network\_error\_requests\_id | id for monitor file_network_error_requests |
+| file\_server\_other\_error\_requests\_id | id for monitor file_server_other_error_requests |
+| file\_throttling\_error\_requests\_id | id for monitor file_throttling_error_requests |
+| file\_timeout\_error\_requests\_id | id for monitor file_timeout_error_requests |
+| fileservices\_latency\_id | id for monitor fileservices_latency |
+| fileservices\_requests\_error\_id | id for monitor fileservices_requests_error |
+| queue\_authorization\_error\_requests\_id | id for monitor queue_authorization_error_requests |
+| queue\_client\_other\_error\_requests\_id | id for monitor queue_client_other_error_requests |
+| queue\_network\_error\_requests\_id | id for monitor queue_network_error_requests |
+| queue\_server\_other\_error\_requests\_id | id for monitor queue_server_other_error_requests |
+| queue\_throttling\_error\_requests\_id | id for monitor queue_throttling_error_requests |
+| queue\_timeout\_error\_requests\_id | id for monitor queue_timeout_error_requests |
+| queueservices\_latency\_id | id for monitor queueservices_latency |
+| queueservices\_requests\_error\_id | id for monitor queueservices_requests_error |
+| storage\_status\_id | id for monitor storage_status |
+| table\_authorization\_error\_requests\_id | id for monitor table_authorization_error_requests |
+| table\_client\_other\_error\_requests\_id | id for monitor table_client_other_error_requests |
+| table\_network\_error\_requests\_id | id for monitor table_network_error_requests |
+| table\_server\_other\_error\_requests\_id | id for monitor table_server_other_error_requests |
+| table\_throttling\_error\_requests\_id | id for monitor table_throttling_error_requests |
+| table\_timeout\_error\_requests\_id | id for monitor table_timeout_error_requests |
+| tableservices\_latency\_id | id for monitor tableservices_latency |
+| tableservices\_requests\_error\_id | id for monitor tableservices_requests_error |
 
 ## Related documentation
 
diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf
index 9f9d73a..f95aee2 100644
--- a/cloud/azure/storage/inputs.tf
+++ b/cloud/azure/storage/inputs.tf
@@ -40,6 +40,11 @@ variable "filter_tags_custom_excluded" {
 }
 
 # Azure Storage specific variables
+variable "availability_silenced" {
+  description = "Groups to mute for Storage availability monitor"
+  type        = map(string)
+  default     = {}
+}
 
 variable "availability_enabled" {
   description = "Flag to enable Storage availability monitor"
@@ -81,6 +86,12 @@ variable "availability_threshold_warning" {
   default     = 90
 }
 
+variable "successful_requests_silenced" {
+  description = "Groups to mute for Storage sucessful requests monitor"
+  type        = map(string)
+  default     = {}
+}
+
 variable "successful_requests_enabled" {
   description = "Flag to enable Storage sucessful requests monitor"
   type        = string
@@ -111,14 +122,20 @@ variable "successful_requests_timeframe" {
   default     = "last_5m"
 }
 
-variable "successful_requests_threshold_critical" {
+variable "successful_storage_requests_threshold_critical" {
   description = "Minimum acceptable percent of successful requests for a storage"
-  default     = 10
+  default     = 90
 }
 
-variable "successful_requests_threshold_warning" {
+variable "successful_storage_requests_threshold_warning" {
   description = "Warning regarding acceptable percent of successful requests for a storage"
-  default     = 30
+  default     = 70
+}
+
+variable "latency_silenced" {
+  description = "Groups to mute for Storage latency monitor"
+  type        = map(string)
+  default     = {}
 }
 
 variable "latency_enabled" {
@@ -161,6 +178,12 @@ variable "latency_threshold_warning" {
   default     = 1000
 }
 
+variable "timeout_error_requests_silenced" {
+  description = "Groups to mute for Storage timeout monitor"
+  type        = map(string)
+  default     = {}
+}
+
 variable "timeout_error_requests_enabled" {
   description = "Flag to enable Storage timeout monitor"
   type        = string
@@ -201,6 +224,12 @@ variable "timeout_error_requests_threshold_warning" {
   default     = 50
 }
 
+variable "network_error_requests_silenced" {
+  description = "Groups to mute for Storage network errors monitor"
+  type        = map(string)
+  default     = {}
+}
+
 variable "network_error_requests_enabled" {
   description = "Flag to enable Storage network errors monitor"
   type        = string
@@ -241,6 +270,12 @@ variable "network_error_requests_threshold_warning" {
   default     = 50
 }
 
+variable "throttling_error_requests_silenced" {
+  description = "Groups to mute for Storage throttling error monitor"
+  type        = map(string)
+  default     = {}
+}
+
 variable "throttling_error_requests_enabled" {
   description = "Flag to enable Storage throttling error monitor"
   type        = string
@@ -281,6 +316,12 @@ 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(string)
+  default     = {}
+}
+
 variable "server_other_error_requests_enabled" {
   description = "Flag to enable Storage server other errors monitor"
   type        = string
@@ -321,6 +362,12 @@ 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(string)
+  default     = {}
+}
+
 variable "client_other_error_requests_enabled" {
   description = "Flag to enable Storage other errors monitor"
   type        = string
@@ -361,6 +408,12 @@ 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(string)
+  default     = {}
+}
+
 variable "authorization_error_requests_enabled" {
   description = "Flag to enable Storage authorization errors monitor"
   type        = string
@@ -401,3 +454,38 @@ variable "authorization_error_requests_threshold_warning" {
   default     = 50
 }
 
+variable "status_time_aggregator" {
+  description = "Monitor aggregator for Storage Services status [available values: min, max or avg]"
+  type        = string
+  default     = "max"
+}
+
+variable "status_timeframe" {
+  description = "Monitor timeframe for Storage Services status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = string
+  default     = "last_5m"
+}
+
+variable "status_enabled" {
+  description = "Flag to enable App Services status monitor"
+  type        = string
+  default     = "true"
+}
+
+variable "status_message" {
+  description = "Custom message for storage Services status monitor"
+  type        = string
+  default     = ""
+}
+
+variable "status_silenced" {
+  description = "Groups to mute for App Services status monitor"
+  type        = map(string)
+  default     = {}
+}
+
+variable "status_extra_tags" {
+  description = "Extra tags for App Services status monitor"
+  type        = list(string)
+  default     = []
+}
diff --git a/cloud/azure/storage/modules.tf b/cloud/azure/storage/modules.tf
index d60f90d..fd47013 100644
--- a/cloud/azure/storage/modules.tf
+++ b/cloud/azure/storage/modules.tf
@@ -6,6 +6,82 @@ module "filter-tags" {
   filter_tags_use_defaults    = var.filter_tags_use_defaults
   filter_tags_custom          = var.filter_tags_custom
   filter_tags_custom_excluded = var.filter_tags_custom_excluded
-  extra_tags                  = ["transaction_type:all"]
+  extra_tags                  = []
 }
 
+module "filter-tags-success" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:success"]
+}
+
+module "filter-tags-timeout-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:servertimeouterror"]
+}
+
+module "filter-tags-network-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:networkerror"]
+}
+
+module "filter-tags-throttling-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:serverbusyerror"]
+}
+
+module "filter-tags-server-other-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:serverothererror"]
+}
+
+module "filter-tags-client-other-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:clientothererror"]
+}
+
+module "filter-tags-authorization-error" {
+  source = "../../../common/filter-tags"
+
+  environment                 = var.environment
+  resource                    = "azure_storage"
+  filter_tags_use_defaults    = var.filter_tags_use_defaults
+  filter_tags_custom          = var.filter_tags_custom
+  filter_tags_custom_excluded = var.filter_tags_custom_excluded
+  extra_tags                  = ["responsetype:authorizationerror"]
+}
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index a3187cd..2e84dc0 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -1,62 +1,66 @@
-resource "datadog_monitor" "availability" {
-  count   = var.availability_enabled == "true" ? 1 : 0
+resource "datadog_monitor" "storage_status" {
+  count   = var.status_enabled == "true" ? 1 : 0
   name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage is down"
-  message = coalesce(var.availability_message, var.message)
-  type    = "query alert"
+  message = coalesce(var.status_message, var.message)
 
   query = <<EOQ
-    ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
-      avg:azure.storage.availability${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    100)) < ${var.availability_threshold_critical}
+    ${var.status_time_aggregator}(${var.status_timeframe}):avg:azure.storage.status${module.filter-tags.query_alert} by {region,name} < 1
 EOQ
 
+
   thresholds = {
-    critical = var.availability_threshold_critical
-    warning  = var.availability_threshold_warning
+    critical = 1
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
-  notify_no_data      = false
+  silenced            = var.status_silenced
+  type                = "metric alert"
+  notify_no_data      = true
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.availability_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.status_extra_tags)
 
   lifecycle {
     ignore_changes = ["silenced"]
   }
 }
 
-resource "datadog_monitor" "successful_requests" {
+
+resource "datadog_monitor" "blobservices_requests_error" {
   count   = var.successful_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too few successful requests {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Blob service too few successful requests {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = coalesce(var.successful_requests_message, var.message)
-  type    = "query alert"
 
   query = <<EOQ
-    ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}): (default(
-      avg:azure.storage.percent_success${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    100)) < ${var.successful_requests_threshold_critical}
+      ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
+        default(100-(default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.successful_requests_threshold_critical
-    warning  = var.successful_requests_threshold_warning
+    critical = var.successful_storage_requests_threshold_critical
+    warning  = var.successful_storage_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.successful_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
@@ -66,31 +70,147 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "latency" {
-  count   = var.latency_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too high end to end latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
-  message = coalesce(var.latency_message, var.message)
-  type    = "query alert"
-
-query = <<EOQ
-    ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
-      avg:azure.storage.average_e2_e_latency${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.latency_threshold_critical}
+resource "datadog_monitor" "fileservices_requests_error" {
+  count   = var.successful_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage File service too few successful requests {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.successful_requests_message, var.message)
+  query = <<EOQ
+      ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
+        default(100-(default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.latency_threshold_critical
-    warning  = var.latency_threshold_warning
+    critical = var.successful_storage_requests_threshold_critical
+    warning  = var.successful_storage_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.successful_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "queueservices_requests_error" {
+  count   = var.successful_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Queue service too few successful requests {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.successful_requests_message, var.message)
+
+  query = <<EOQ
+      ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
+        default(100-(default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.successful_storage_requests_threshold_critical
+    warning  = var.successful_storage_requests_threshold_warning
+  }
+
+  silenced = var.successful_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "tableservices_requests_error" {
+  count   = var.successful_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Table service too few successful requests {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.successful_requests_message, var.message)
+
+  query = <<EOQ
+      ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
+        default(100-(default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.successful_storage_requests_threshold_critical
+    warning  = var.successful_storage_requests_threshold_warning
+  }
+
+  silenced = var.successful_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "blobservices_latency" {
+  count   = var.latency_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Blob service too high end to end latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  message = coalesce(var.latency_message, var.message)
+
+  query = <<EOQ
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
+      avg:azure.storage_storageaccounts_blobservices.success_e2_e_latency${module.filter-tags.query_alert} by {name},
+    0)) > ${var.latency_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning  = var.latency_threshold_warning
+  }
+
+  silenced = var.latency_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags)
@@ -100,16 +220,127 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "timeout_error_requests" {
-  count   = var.timeout_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many timeout errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.timeout_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "fileservices_latency" {
+  count   = var.latency_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage File service too high end to end latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  message = coalesce(var.latency_message, var.message)
 
-query = <<EOQ
-    ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_timeout_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.timeout_error_requests_threshold_critical}
+  query = <<EOQ
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
+      avg:azure.storage_storageaccounts_fileservices.success_e2_e_latency${module.filter-tags.query_alert} by {name},
+    0)) > ${var.latency_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning  = var.latency_threshold_warning
+  }
+
+  silenced = var.latency_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags)
+}
+
+resource "datadog_monitor" "queueservices_latency" {
+  count   = var.latency_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Queue service too high end to end latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  message = coalesce(var.latency_message, var.message)
+
+  query = <<EOQ
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
+      avg:azure.storage_storageaccounts_queueservices.success_e2_e_latency${module.filter-tags.query_alert} by {name},
+    0)) > ${var.latency_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning  = var.latency_threshold_warning
+  }
+
+  silenced = var.latency_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags)
+}
+
+resource "datadog_monitor" "tableservices_latency" {
+  count   = var.latency_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Table service too high end to end latency {{#is_alert}}{{{comparator}}} {{threshold}}ms ({{value}}ms){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}ms ({{value}}ms){{/is_warning}}"
+  message = coalesce(var.latency_message, var.message)
+
+  query = <<EOQ
+    ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
+      avg:azure.storage_storageaccounts_tableservices.success_e2_elatency${module.filter-tags.query_alert} by {name},
+    0)) > ${var.latency_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning  = var.latency_threshold_warning
+  }
+
+  silenced = var.latency_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags)
+}
+
+resource "datadog_monitor" "blob_timeout_error_requests" {
+  count   = var.timeout_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many timeout errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.timeout_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-timeout-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
   thresholds = {
@@ -117,14 +348,17 @@ EOQ
     warning  = var.timeout_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.timeout_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
@@ -134,31 +368,148 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "network_error_requests" {
-  count   = var.network_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many network errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.network_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "file_timeout_error_requests" {
+  count   = var.timeout_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure File Storage too many timeout errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.timeout_error_requests_message, var.message)
 
   query = <<EOQ
-    ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_network_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.network_error_requests_threshold_critical}
+    ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-timeout-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
   thresholds = {
-    critical = var.network_error_requests_threshold_critical
-    warning  = var.network_error_requests_threshold_warning
+    critical = var.timeout_error_requests_threshold_critical
+    warning  = var.timeout_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.timeout_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "queue_timeout_error_requests" {
+  count   = var.timeout_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Queue Storage too many timeout errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.timeout_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-timeout-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.timeout_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.timeout_error_requests_threshold_critical
+    warning  = var.timeout_error_requests_threshold_warning
+  }
+
+  silenced = var.timeout_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "table_timeout_error_requests" {
+  count   = var.timeout_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Table Storage too many timeout errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.timeout_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-timeout-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.timeout_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.timeout_error_requests_threshold_critical
+    warning  = var.timeout_error_requests_threshold_warning
+  }
+
+  silenced = var.timeout_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "blob_network_error_requests" {
+  count   = var.network_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many network errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.network_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-network-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.network_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.network_error_requests_threshold_critical
+    warning  = var.network_error_requests_threshold_warning
+  }
+
+  silenced = var.network_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags)
@@ -168,31 +519,221 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "throttling_error_requests" {
-  count   = var.throttling_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.throttling_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "file_network_error_requests" {
+  count   = var.network_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure File Storage too many network errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.network_error_requests_message, var.message)
 
   query = <<EOQ
-    ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_throttling_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.throttling_error_requests_threshold_critical}
+    ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-network-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.network_error_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.throttling_error_requests_threshold_critical
-    warning  = var.throttling_error_requests_threshold_warning
+    critical = var.network_error_requests_threshold_critical
+    warning  = var.network_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.network_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "queue_network_error_requests" {
+  count   = var.network_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Queue Storage too many network errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.network_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-network-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.network_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.network_error_requests_threshold_critical
+    warning  = var.network_error_requests_threshold_warning
+  }
+
+  silenced = var.network_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "table_network_error_requests" {
+  count   = var.network_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Table Storage too many network errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.network_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-network-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.network_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.network_error_requests_threshold_critical
+    warning  = var.network_error_requests_threshold_warning
+  }
+
+  silenced = var.network_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.network_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "blob_throttling_error_requests" {
+  count   = var.throttling_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many throttling errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.throttling_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-throttling-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.throttling_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.throttling_error_requests_threshold_critical
+    warning  = var.throttling_error_requests_threshold_warning
+  }
+
+  silenced = var.throttling_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "file_throttling_error_requests" {
+  count   = var.throttling_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.throttling_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-throttling-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.throttling_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.throttling_error_requests_threshold_critical
+    warning  = var.throttling_error_requests_threshold_warning
+  }
+
+  silenced = var.throttling_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "queue_throttling_error_requests" {
+  count   = var.throttling_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.throttling_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-throttling-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.throttling_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.throttling_error_requests_threshold_critical
+    warning  = var.throttling_error_requests_threshold_warning
+  }
+
+  silenced = var.throttling_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags)
@@ -202,31 +743,75 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "server_other_error_requests" {
-  count   = var.server_other_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many server_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.server_other_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "table_throttling_error_requests" {
+  count   = var.throttling_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many throttling errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.throttling_error_requests_message, var.message)
 
-query = <<EOQ
-    ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_server_other_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.server_other_error_requests_threshold_critical}
+  query = <<EOQ
+    ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-throttling-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.throttling_error_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.server_other_error_requests_threshold_critical
-    warning  = var.server_other_error_requests_threshold_warning
+    critical = var.throttling_error_requests_threshold_critical
+    warning  = var.throttling_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.throttling_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.throttling_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+
+
+resource "datadog_monitor" "blob_server_other_error_requests" {
+  count   = var.server_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many server_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.server_other_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-server-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.server_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.server_other_error_requests_threshold_critical
+    warning  = var.server_other_error_requests_threshold_warning
+  }
+
+  silenced = var.server_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags)
@@ -236,31 +821,148 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "client_other_error_requests" {
-  count   = var.client_other_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many client_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.client_other_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "file_server_other_error_requests" {
+  count   = var.server_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure File Storage too many server_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.server_other_error_requests_message, var.message)
 
-query = <<EOQ
-    ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_client_other_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.client_other_error_requests_threshold_critical}
+  query = <<EOQ
+    ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-server-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.server_other_error_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.client_other_error_requests_threshold_critical
-    warning  = var.client_other_error_requests_threshold_warning
+    critical = var.server_other_error_requests_threshold_critical
+    warning  = var.server_other_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.server_other_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "queue_server_other_error_requests" {
+  count   = var.server_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Queue Storage too many server_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.server_other_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-server-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.server_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.server_other_error_requests_threshold_critical
+    warning  = var.server_other_error_requests_threshold_warning
+  }
+
+  silenced = var.server_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "table_server_other_error_requests" {
+  count   = var.server_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Table Storage too many server_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.server_other_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-server-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.server_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.server_other_error_requests_threshold_critical
+    warning  = var.server_other_error_requests_threshold_warning
+  }
+
+  silenced = var.server_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.server_other_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "blob_client_other_error_requests" {
+  count   = var.client_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many client_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.client_other_error_requests_message, var.message)
+query = <<EOQ
+  ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}):
+  default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-client-other-error.query_alert} by {name}.as_rate(),0) /
+  default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+  * 100),0) > ${var.client_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.client_other_error_requests_threshold_critical
+    warning  = var.client_other_error_requests_threshold_warning
+  }
+
+  silenced = var.client_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags)
@@ -270,31 +972,149 @@ EOQ
   }
 }
 
-resource "datadog_monitor" "authorization_error_requests" {
-  count   = var.authorization_error_requests_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage too many authorization errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
-  message = coalesce(var.authorization_error_requests_message, var.message)
-  type    = "query alert"
+resource "datadog_monitor" "file_client_other_error_requests" {
+  count   = var.client_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure File Storage too many client_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.client_other_error_requests_message, var.message)
 
   query = <<EOQ
-    ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}): (default(
-      avg:azure.storage.percent_authorization_error${module.filter-tags.query_alert} by {resource_group,storage_type,name},
-    0)) > ${var.authorization_error_requests_threshold_critical}
+    ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-client-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.client_other_error_requests_threshold_critical}
 EOQ
 
+
   thresholds = {
-    critical = var.authorization_error_requests_threshold_critical
-    warning  = var.authorization_error_requests_threshold_warning
+    critical = var.client_other_error_requests_threshold_critical
+    warning  = var.client_other_error_requests_threshold_warning
   }
 
-  new_host_delay      = var.new_host_delay
-  evaluation_delay    = var.evaluation_delay
+  silenced = var.client_other_error_requests_silenced
+
+  type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "queue_client_other_error_requests" {
+  count   = var.client_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Queue Storage too many client_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.client_other_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-client-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.client_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.client_other_error_requests_threshold_critical
+    warning  = var.client_other_error_requests_threshold_warning
+  }
+
+  silenced = var.client_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "table_client_other_error_requests" {
+  count   = var.client_other_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Table Storage too many client_other errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.client_other_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-client-other-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.client_other_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.client_other_error_requests_threshold_critical
+    warning  = var.client_other_error_requests_threshold_warning
+  }
+
+  silenced = var.client_other_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.client_other_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "blob_authorization_error_requests" {
+  count   = var.authorization_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Blob Storage too many authorization errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.authorization_error_requests_message, var.message)
+
+  query = <<EOQ
+  ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}):
+  default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-authorization-error.query_alert} by {name}.as_rate(),0) /
+  default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+  * 100),0) > ${var.authorization_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning  = var.authorization_error_requests_threshold_warning
+  }
+
+  silenced = var.authorization_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
   tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags)
@@ -304,3 +1124,116 @@ EOQ
   }
 }
 
+resource "datadog_monitor" "file_authorization_error_requests" {
+  count   = var.authorization_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure File Storage too many authorization errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.authorization_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-authorization-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.authorization_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning  = var.authorization_error_requests_threshold_warning
+  }
+
+  silenced = var.authorization_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags)
+}
+
+resource "datadog_monitor" "queue_authorization_error_requests" {
+  count   = var.authorization_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Queue Storage too many authorization errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.authorization_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-authorization-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.authorization_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning  = var.authorization_error_requests_threshold_warning
+  }
+
+  silenced = var.authorization_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
+
+resource "datadog_monitor" "table_authorization_error_requests" {
+  count   = var.authorization_error_requests_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Table Storage too many authorization errors {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  message = coalesce(var.authorization_error_requests_message, var.message)
+
+  query = <<EOQ
+    ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}):
+    default((default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-authorization-error.query_alert} by {name}.as_rate(),0) /
+    default(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+    * 100),0) > ${var.authorization_error_requests_threshold_critical}
+EOQ
+
+
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning  = var.authorization_error_requests_threshold_warning
+  }
+
+  silenced = var.authorization_error_requests_silenced
+
+  type                = "metric alert"
+  notify_no_data      = false
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+  new_host_delay      = var.new_host_delay
+  evaluation_delay    = var.evaluation_delay
+  renotify_interval   = 0
+
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags)
+
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
+}
diff --git a/cloud/azure/storage/outputs.tf b/cloud/azure/storage/outputs.tf
index bc3bb1a..98895de 100644
--- a/cloud/azure/storage/outputs.tf
+++ b/cloud/azure/storage/outputs.tf
@@ -1,45 +1,165 @@
-output "availability_id" {
-  description = "id for monitor availability"
-  value       = datadog_monitor.availability.*.id
+output "storage_status_id" {
+  description = "id for monitor storage_status"
+  value       = datadog_monitor.storage_status.*.id
 }
 
-output "successful_requests_id" {
-  description = "id for monitor successful_requests"
-  value       = datadog_monitor.successful_requests.*.id
+output "blobservices_requests_error_id" {
+  description = "id for monitor blobservices_requests_error"
+  value       = datadog_monitor.blobservices_requests_error.*.id
 }
 
-output "latency_id" {
-  description = "id for monitor latency"
-  value       = datadog_monitor.latency.*.id
+output "fileservices_requests_error_id" {
+  description = "id for monitor fileservices_requests_error"
+  value       = datadog_monitor.fileservices_requests_error.*.id
 }
 
-output "timeout_error_requests_id" {
-  description = "id for monitor timeout_error_requests"
-  value       = datadog_monitor.timeout_error_requests.*.id
+output "queueservices_requests_error_id" {
+  description = "id for monitor queueservices_requests_error"
+  value       = datadog_monitor.queueservices_requests_error.*.id
 }
 
-output "network_error_requests_id" {
-  description = "id for monitor network_error_requests"
-  value       = datadog_monitor.network_error_requests.*.id
+output "tableservices_requests_error_id" {
+  description = "id for monitor tableservices_requests_error"
+  value       = datadog_monitor.tableservices_requests_error.*.id
 }
 
-output "throttling_error_requests_id" {
-  description = "id for monitor throttling_error_requests"
-  value       = datadog_monitor.throttling_error_requests.*.id
+output "blobservices_latency_id" {
+  description = "id for monitor blobservices_latency"
+  value       = datadog_monitor.blobservices_latency.*.id
 }
 
-output "server_other_error_requests_id" {
-  description = "id for monitor server_other_error_requests"
-  value       = datadog_monitor.server_other_error_requests.*.id
+output "fileservices_latency_id" {
+  description = "id for monitor fileservices_latency"
+  value       = datadog_monitor.fileservices_latency.*.id
 }
 
-output "client_other_error_requests_id" {
-  description = "id for monitor client_other_error_requests"
-  value       = datadog_monitor.client_other_error_requests.*.id
+output "queueservices_latency_id" {
+  description = "id for monitor queueservices_latency"
+  value       = datadog_monitor.queueservices_latency.*.id
 }
 
-output "authorization_error_requests_id" {
-  description = "id for monitor authorization_error_requests"
-  value       = datadog_monitor.authorization_error_requests.*.id
+output "tableservices_latency_id" {
+  description = "id for monitor tableservices_latency"
+  value       = datadog_monitor.tableservices_latency.*.id
+}
+
+output "blob_timeout_error_requests_id" {
+  description = "id for monitor blob_timeout_error_requests"
+  value       = datadog_monitor.blob_timeout_error_requests.*.id
+}
+
+output "file_timeout_error_requests_id" {
+  description = "id for monitor file_timeout_error_requests"
+  value       = datadog_monitor.file_timeout_error_requests.*.id
+}
+
+output "queue_timeout_error_requests_id" {
+  description = "id for monitor queue_timeout_error_requests"
+  value       = datadog_monitor.queue_timeout_error_requests.*.id
+}
+
+output "table_timeout_error_requests_id" {
+  description = "id for monitor table_timeout_error_requests"
+  value       = datadog_monitor.table_timeout_error_requests.*.id
+}
+
+output "blob_network_error_requests_id" {
+  description = "id for monitor blob_network_error_requests"
+  value       = datadog_monitor.blob_network_error_requests.*.id
+}
+
+output "file_network_error_requests_id" {
+  description = "id for monitor file_network_error_requests"
+  value       = datadog_monitor.file_network_error_requests.*.id
+}
+
+output "queue_network_error_requests_id" {
+  description = "id for monitor queue_network_error_requests"
+  value       = datadog_monitor.queue_network_error_requests.*.id
+}
+
+output "table_network_error_requests_id" {
+  description = "id for monitor table_network_error_requests"
+  value       = datadog_monitor.table_network_error_requests.*.id
+}
+
+output "blob_throttling_error_requests_id" {
+  description = "id for monitor blob_throttling_error_requests"
+  value       = datadog_monitor.blob_throttling_error_requests.*.id
+}
+
+output "file_throttling_error_requests_id" {
+  description = "id for monitor file_throttling_error_requests"
+  value       = datadog_monitor.file_throttling_error_requests.*.id
+}
+
+output "queue_throttling_error_requests_id" {
+  description = "id for monitor queue_throttling_error_requests"
+  value       = datadog_monitor.queue_throttling_error_requests.*.id
+}
+
+output "table_throttling_error_requests_id" {
+  description = "id for monitor table_throttling_error_requests"
+  value       = datadog_monitor.table_throttling_error_requests.*.id
+}
+
+output "blob_server_other_error_requests_id" {
+  description = "id for monitor blob_server_other_error_requests"
+  value       = datadog_monitor.blob_server_other_error_requests.*.id
+}
+
+output "file_server_other_error_requests_id" {
+  description = "id for monitor file_server_other_error_requests"
+  value       = datadog_monitor.file_server_other_error_requests.*.id
+}
+
+output "queue_server_other_error_requests_id" {
+  description = "id for monitor queue_server_other_error_requests"
+  value       = datadog_monitor.queue_server_other_error_requests.*.id
+}
+
+output "table_server_other_error_requests_id" {
+  description = "id for monitor table_server_other_error_requests"
+  value       = datadog_monitor.table_server_other_error_requests.*.id
+}
+
+output "blob_client_other_error_requests_id" {
+  description = "id for monitor blob_client_other_error_requests"
+  value       = datadog_monitor.blob_client_other_error_requests.*.id
+}
+
+output "file_client_other_error_requests_id" {
+  description = "id for monitor file_client_other_error_requests"
+  value       = datadog_monitor.file_client_other_error_requests.*.id
+}
+
+output "queue_client_other_error_requests_id" {
+  description = "id for monitor queue_client_other_error_requests"
+  value       = datadog_monitor.queue_client_other_error_requests.*.id
+}
+
+output "table_client_other_error_requests_id" {
+  description = "id for monitor table_client_other_error_requests"
+  value       = datadog_monitor.table_client_other_error_requests.*.id
+}
+
+output "blob_authorization_error_requests_id" {
+  description = "id for monitor blob_authorization_error_requests"
+  value       = datadog_monitor.blob_authorization_error_requests.*.id
+}
+
+output "file_authorization_error_requests_id" {
+  description = "id for monitor file_authorization_error_requests"
+  value       = datadog_monitor.file_authorization_error_requests.*.id
+}
+
+output "queue_authorization_error_requests_id" {
+  description = "id for monitor queue_authorization_error_requests"
+  value       = datadog_monitor.queue_authorization_error_requests.*.id
+}
+
+output "table_authorization_error_requests_id" {
+  description = "id for monitor table_authorization_error_requests"
+  value       = datadog_monitor.table_authorization_error_requests.*.id
 }