diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md
index 8ef8f37..ae40173 100644
--- a/cloud/azure/storage/README.md
+++ b/cloud/azure/storage/README.md
@@ -6,8 +6,8 @@
 module "datadog-monitors-cloud-azure-storage" {
   source = "git::ssh://git@git.fr.clara.net/claranet/pt-monitoring/projects/datadog/terraform/monitors.git//cloud/azure/storage?ref={revision}"
 
-  environment = "${var.environment}"
-  message     = "${module.datadog-message-alerting.alerting-message}"
+  environment = var.environment
+  message     = module.datadog-message-alerting.alerting-message
 }
 
 ```
@@ -16,68 +16,50 @@ 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 Blob services is down
-- Azure Storage File service too few successful requests
-- Azure Storage File service too high end to end latency
-- Azure Storage File services is down
 - Azure Storage is down
-- Azure Storage Queue service is down
-- Azure Storage Queue service too few successful requests
-- Azure Storage Queue service too high end to end latency
 - Azure Storage Table service is down
 - 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 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
+- 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 Storage Blob service too few successful requests
+- Azure Storage Blob service too high end to end latency
+- Azure Storage Blob services is down
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | authorization\_error\_requests\_enabled | Flag to enable Storage authorization errors monitor | string | `"true"` | no |
-| authorization\_error\_requests\_extra\_tags | Extra tags for Storage authorization errors monitor | list | `[]` | no |
+| authorization\_error\_requests\_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 | `{}` | 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 |
 | authorization\_error\_requests\_timeframe | Monitor timeframe for Storage authorization errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | availability\_enabled | Flag to enable Storage availability monitor | string | `"true"` | no |
-| availability\_extra\_tags | Extra tags for Storage availability monitor | list | `[]` | 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 | `{}` | 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 |
 | availability\_timeframe | Monitor timeframe for Storage availability [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | client\_other\_error\_requests\_enabled | Flag to enable Storage other errors monitor | string | `"true"` | no |
-| client\_other\_error\_requests\_extra\_tags | Extra tags for Storage other errors monitor | list | `[]` | no |
+| client\_other\_error\_requests\_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 | `{}` | 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 |
@@ -88,18 +70,18 @@ Creates DataDog monitors with the following checks:
 | filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter_tags_use_defaults is false | string | `""` | no |
 | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
 | latency\_enabled | Flag to enable Storage latency monitor | string | `"true"` | no |
-| latency\_extra\_tags | Extra tags for Storage latency monitor | list | `[]` | 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 | `{}` | 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 |
 | latency\_timeframe | Monitor timeframe for Storage latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | message | Message sent when a Redis monitor is triggered | string | n/a | yes |
 | network\_error\_requests\_enabled | Flag to enable Storage network errors monitor | string | `"true"` | no |
-| network\_error\_requests\_extra\_tags | Extra tags for Storage network errors monitor | list | `[]` | no |
+| network\_error\_requests\_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 | `{}` | 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 |
@@ -107,39 +89,39 @@ Creates DataDog monitors with the following checks:
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | server\_other\_error\_requests\_enabled | Flag to enable Storage server other errors monitor | string | `"true"` | no |
-| server\_other\_error\_requests\_extra\_tags | Extra tags for Storage server other errors monitor | list | `[]` | no |
+| server\_other\_error\_requests\_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 | `{}` | 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 | `[]` | 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 | `{}` | 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 | `[]` | 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\_silenced | Groups to mute for Storage sucessful requests monitor | map | `{}` | 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 | `[]` | 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 | `{}` | 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 |
 | throttling\_error\_requests\_timeframe | Monitor timeframe for Storage throttling errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
 | timeout\_error\_requests\_enabled | Flag to enable Storage timeout monitor | string | `"true"` | no |
-| timeout\_error\_requests\_extra\_tags | Extra tags for Storage timeout monitor | list | `[]` | no |
+| timeout\_error\_requests\_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 | `{}` | 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 |
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index c083dc8..90c6457 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -24,7 +24,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.status_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.status_extra_tags)
 }
 
 resource "datadog_monitor" "blobservices_availability" {
@@ -39,31 +39,31 @@ resource "datadog_monitor" "blobservices_availability" {
 EOQ
 
 
-thresholds = {
-critical = var.availability_threshold_critical
-warning  = var.availability_threshold_warning
-}
+  thresholds = {
+    critical = var.availability_threshold_critical
+    warning  = var.availability_threshold_warning
+  }
 
-silenced = var.availability_silenced
+  silenced = var.availability_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
+  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 = ["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.availability_extra_tags)
 }
 
 resource "datadog_monitor" "fileservices_availability" {
-count   = var.availability_enabled == "true" ? 1 : 0
-name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage File services is down"
-message = coalesce(var.availability_message, var.message)
+  count   = var.availability_enabled == "true" ? 1 : 0
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage File services is down"
+  message = coalesce(var.availability_message, var.message)
 
 query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
@@ -72,31 +72,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.availability_threshold_critical
-warning = var.availability_threshold_warning
-}
+  thresholds = {
+    critical = var.availability_threshold_critical
+    warning = var.availability_threshold_warning
+  }
 
-silenced = var.availability_silenced
+  silenced = var.availability_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
+  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 = ["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.availability_extra_tags)
 }
 
 resource "datadog_monitor" "queueservices_availability" {
-count = var.availability_enabled == "true" ? 1 : 0
-name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Queue service is down"
-message = coalesce(var.availability_message, var.message)
+  count = var.availability_enabled == "true" ? 1 : 0
+  name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Azure Storage Queue service is down"
+  message = coalesce(var.availability_message, var.message)
 
 query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
@@ -123,7 +123,7 @@ EOQ
   evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = ["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.availability_extra_tags)
 }
 
 resource "datadog_monitor" "table_availability" {
@@ -156,7 +156,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["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.availability_extra_tags)
 }
 
 resource "datadog_monitor" "blobservices_requests_error" {
@@ -172,31 +172,31 @@ resource "datadog_monitor" "blobservices_requests_error" {
 EOQ
 
 
-thresholds = {
-critical = var.successful_storage_requests_threshold_critical
-warning  = var.successful_storage_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.successful_storage_requests_threshold_critical
+    warning  = var.successful_storage_requests_threshold_warning
+  }
 
-silenced = var.successful_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.successful_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
 }
 
 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)
+  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}):
@@ -206,31 +206,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.successful_storage_requests_threshold_critical
-warning = var.successful_storage_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.successful_storage_requests_threshold_critical
+    warning = var.successful_storage_requests_threshold_warning
+  }
 
-silenced = var.successful_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.successful_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
 }
 
 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)
+  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}):
@@ -258,7 +258,7 @@ EOQ
   evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.successful_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
 }
 
 resource "datadog_monitor" "tableservices_requests_error" {
@@ -292,7 +292,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.successful_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.successful_requests_extra_tags)
 }
 
 resource "datadog_monitor" "blobservices_latency" {
@@ -307,31 +307,31 @@ resource "datadog_monitor" "blobservices_latency" {
 EOQ
 
 
-thresholds = {
-critical = var.latency_threshold_critical
-warning  = var.latency_threshold_warning
-}
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning  = var.latency_threshold_warning
+  }
 
-silenced = var.latency_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.latency_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.latency_extra_tags)
 }
 
 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)
+  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.latency_time_aggregator}(${var.latency_timeframe}): (default(
@@ -340,35 +340,35 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.latency_threshold_critical
-warning = var.latency_threshold_warning
-}
+  thresholds = {
+    critical = var.latency_threshold_critical
+    warning = var.latency_threshold_warning
+  }
 
-silenced = var.latency_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.latency_extra_tags]
+  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)
+  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(
@@ -399,7 +399,7 @@ EOQ
     ignore_changes = ["silenced"]
   }
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.latency_extra_tags]
+  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" {
@@ -436,7 +436,7 @@ EOQ
     ignore_changes = ["silenced"]
   }
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.latency_extra_tags]
+  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" {
@@ -451,31 +451,31 @@ resource "datadog_monitor" "blob_timeout_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.timeout_error_requests_threshold_critical
-warning  = var.timeout_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.timeout_error_requests_threshold_critical
+    warning  = var.timeout_error_requests_threshold_warning
+  }
 
-silenced = var.timeout_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.timeout_error_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
 }
 
 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)
+  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.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
@@ -484,31 +484,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.timeout_error_requests_threshold_critical
-warning = var.timeout_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.timeout_error_requests_threshold_critical
+    warning = var.timeout_error_requests_threshold_warning
+  }
 
-silenced = var.timeout_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.timeout_error_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
 }
 
 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)
+  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(
@@ -535,7 +535,7 @@ EOQ
   evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.timeout_error_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
 }
 
 resource "datadog_monitor" "table_timeout_error_requests" {
@@ -568,7 +568,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.timeout_error_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.timeout_error_requests_extra_tags)
 }
 
 resource "datadog_monitor" "blob_network_error_requests" {
@@ -583,31 +583,31 @@ resource "datadog_monitor" "blob_network_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.network_error_requests_threshold_critical
-warning  = var.network_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.network_error_requests_threshold_critical
+    warning  = var.network_error_requests_threshold_warning
+  }
 
-silenced = var.network_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.network_error_requests_extra_tags]
+  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" "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)
+  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.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
@@ -616,31 +616,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.network_error_requests_threshold_critical
-warning = var.network_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.network_error_requests_threshold_critical
+    warning = var.network_error_requests_threshold_warning
+  }
 
-silenced = var.network_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.network_error_requests_extra_tags]
+  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" "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)
+  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(
@@ -671,7 +671,7 @@ EOQ
     ignore_changes = ["silenced"]
   }
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.network_error_requests_extra_tags]
+  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" {
@@ -704,7 +704,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.network_error_requests_extra_tags]
+  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" "blob_throttling_error_requests" {
@@ -719,35 +719,35 @@ resource "datadog_monitor" "blob_throttling_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.throttling_error_requests_threshold_critical
-warning  = var.throttling_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.throttling_error_requests_threshold_critical
+    warning  = var.throttling_error_requests_threshold_warning
+  }
 
-silenced = var.throttling_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.throttling_error_requests_extra_tags]
+  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)
+  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(
@@ -756,31 +756,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.throttling_error_requests_threshold_critical
-warning = var.throttling_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.throttling_error_requests_threshold_critical
+    warning = var.throttling_error_requests_threshold_warning
+  }
 
-silenced = var.throttling_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.throttling_error_requests_extra_tags]
+  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)
+  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(
@@ -807,7 +807,7 @@ EOQ
   evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.throttling_error_requests_extra_tags]
+  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" "table_throttling_error_requests" {
@@ -840,7 +840,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.throttling_error_requests_extra_tags]
+  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" "blob_server_other_error_requests" {
@@ -855,31 +855,31 @@ resource "datadog_monitor" "blob_server_other_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.server_other_error_requests_threshold_critical
-warning  = var.server_other_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.server_other_error_requests_threshold_critical
+    warning  = var.server_other_error_requests_threshold_warning
+  }
 
-silenced = var.server_other_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.server_other_error_requests_extra_tags]
+  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" "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)
+  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.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
@@ -888,31 +888,31 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.server_other_error_requests_threshold_critical
-warning = var.server_other_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.server_other_error_requests_threshold_critical
+    warning = var.server_other_error_requests_threshold_warning
+  }
 
-silenced = var.server_other_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.server_other_error_requests_extra_tags]
+  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" "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)
+  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(
@@ -943,7 +943,7 @@ EOQ
     ignore_changes = ["silenced"]
   }
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.server_other_error_requests_extra_tags]
+  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" {
@@ -976,7 +976,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.server_other_error_requests_extra_tags]
+  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" "blob_client_other_error_requests" {
@@ -991,31 +991,31 @@ resource "datadog_monitor" "blob_client_other_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.client_other_error_requests_threshold_critical
-warning  = var.client_other_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.client_other_error_requests_threshold_critical
+    warning  = var.client_other_error_requests_threshold_warning
+  }
 
-silenced = var.client_other_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.client_other_error_requests_extra_tags]
+  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" "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)
+  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.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
@@ -1024,35 +1024,35 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.client_other_error_requests_threshold_critical
-warning = var.client_other_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.client_other_error_requests_threshold_critical
+    warning = var.client_other_error_requests_threshold_warning
+  }
 
-silenced = var.client_other_error_requests_silenced
+  silenced = var.client_other_error_requests_silenced
 
   lifecycle {
     ignore_changes = ["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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.client_other_error_requests_extra_tags]
+  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" "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)
+  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(
@@ -1083,7 +1083,7 @@ EOQ
     ignore_changes = ["silenced"]
   }
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.client_other_error_requests_extra_tags]
+  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" {
@@ -1116,7 +1116,7 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.client_other_error_requests_extra_tags]
+  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" "blob_authorization_error_requests" {
@@ -1131,31 +1131,31 @@ resource "datadog_monitor" "blob_authorization_error_requests" {
 EOQ
 
 
-thresholds = {
-critical = var.authorization_error_requests_threshold_critical
-warning  = var.authorization_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning  = var.authorization_error_requests_threshold_warning
+  }
 
-silenced = var.authorization_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.authorization_error_requests_extra_tags]
+  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" "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)
+  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(
@@ -1164,35 +1164,35 @@ query = <<EOQ
 EOQ
 
 
-thresholds = {
-critical = var.authorization_error_requests_threshold_critical
-warning = var.authorization_error_requests_threshold_warning
-}
+  thresholds = {
+    critical = var.authorization_error_requests_threshold_critical
+    warning = var.authorization_error_requests_threshold_warning
+  }
 
-silenced = var.authorization_error_requests_silenced
+  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
+  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 = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.authorization_error_requests_extra_tags]
+  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)
+  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(
@@ -1219,7 +1219,7 @@ EOQ
   evaluation_delay    = var.evaluation_delay
   renotify_interval   = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.authorization_error_requests_extra_tags]
+  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" "table_authorization_error_requests" {
@@ -1252,5 +1252,5 @@ EOQ
   evaluation_delay = var.evaluation_delay
   renotify_interval = 0
 
-  tags = ["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform", var.authorization_error_requests_extra_tags]
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:azure", "resource:storage", "team:claranet", "created-by:terraform"], var.authorization_error_requests_extra_tags)
 }