diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf
index 5c8a964..8dc3808 100644
--- a/cloud/aws/alb/inputs.tf
+++ b/cloud/aws/alb/inputs.tf
@@ -37,6 +37,12 @@ variable "alb_no_healthy_instances_silenced" {
   default     = {}
 }
 
+variable "alb_no_healthy_instances_extra_tags" {
+  description = "Extra tags for ALB no healthy instances monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "alb_no_healthy_instances_message" {
   description = "Custom message for ALB no healthy instances monitor"
   type        = "string"
@@ -61,6 +67,12 @@ variable "latency_silenced" {
   default     = {}
 }
 
+variable "latency_extra_tags" {
+  description = "Extra tags for ALB latency monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "latency_message" {
   description = "Custom message for ALB latency monitor"
   type        = "string"
@@ -95,6 +107,12 @@ variable "httpcode_alb_4xx_silenced" {
   default     = {}
 }
 
+variable "httpcode_alb_4xx_extra_tags" {
+  description = "Extra tags for ALB httpcode 4xx monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "httpcode_alb_4xx_message" {
   description = "Custom message for ALB httpcode 4xx monitor"
   type        = "string"
@@ -123,6 +141,12 @@ variable "httpcode_target_4xx_silenced" {
   default     = {}
 }
 
+variable "httpcode_target_4xx_extra_tags" {
+  description = "Extra tags for ALB target httpcode 4xx monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "httpcode_target_4xx_message" {
   description = "Custom message for ALB target httpcode 4xx monitor"
   type        = "string"
@@ -151,6 +175,12 @@ variable "httpcode_alb_5xx_silenced" {
   default     = {}
 }
 
+variable "httpcode_alb_5xx_extra_tags" {
+  description = "Extra tags for ALB httpcode 5xx monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "httpcode_alb_5xx_message" {
   description = "Custom message for ALB httpcode 5xx monitor"
   type        = "string"
@@ -179,6 +209,12 @@ variable "httpcode_target_5xx_silenced" {
   default     = {}
 }
 
+variable "httpcode_target_5xx_extra_tags" {
+  description = "Extra tags for ALB target httpcode 5xx monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "httpcode_target_5xx_message" {
   description = "Custom message for ALB target httpcode 5xx monitor"
   type        = "string"
diff --git a/cloud/aws/apigateway/inputs.tf b/cloud/aws/apigateway/inputs.tf
index 917490c..5fb3744 100644
--- a/cloud/aws/apigateway/inputs.tf
+++ b/cloud/aws/apigateway/inputs.tf
@@ -32,6 +32,12 @@ variable "latency_silenced" {
   default     = {}
 }
 
+variable "latency_extra_tags" {
+  description = "Extra tags for API Gateway latency monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "latency_message" {
   description = "Custom message for API Gateway latency monitor"
   type        = "string"
@@ -70,6 +76,12 @@ variable "http_5xx_requests_silenced" {
   default     = {}
 }
 
+variable "http_5xx_requests_extra_tags" {
+  description = "Extra tags for API Gateway HTTP 5xx requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "http_5xx_requests_message" {
   description = "Custom message for API Gateway HTTP 5xx requests monitor"
   type        = "string"
@@ -102,6 +114,12 @@ variable "http_4xx_requests_silenced" {
   default     = {}
 }
 
+variable "http_4xx_requests_extra_tags" {
+  description = "Extra tags for API Gateway HTTP 4xx requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "http_4xx_requests_message" {
   description = "Custom message for API Gateway HTTP 4xx requests monitor"
   type        = "string"
diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf
index 822ad14..29c0974 100644
--- a/cloud/aws/elasticsearch/inputs.tf
+++ b/cloud/aws/elasticsearch/inputs.tf
@@ -37,6 +37,12 @@ variable "es_cluster_status_silenced" {
   default     = {}
 }
 
+variable "es_cluster_status_extra_tags" {
+  description = "Extra tags for ES cluster status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "es_cluster_status_message" {
   description = "Custom message for ES cluster status monitor"
   type        = "string"
@@ -59,6 +65,12 @@ variable "diskspace_silenced" {
   default     = {}
 }
 
+variable "diskspace_extra_tags" {
+  description = "Extra tags for ES cluster diskspace monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "diskspace_message" {
   description = "Custom message for ES cluster diskspace monitor"
   type        = "string"
@@ -93,6 +105,12 @@ variable "cpu_silenced" {
   default     = {}
 }
 
+variable "cpu_extra_tags" {
+  description = "Extra tags for ES cluster cpu monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "cpu_message" {
   description = "Custom message for ES cluster cpu monitor"
   type        = "string"
diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf
index fa13136..7654cbc 100644
--- a/cloud/aws/elb/inputs.tf
+++ b/cloud/aws/elb/inputs.tf
@@ -36,6 +36,12 @@ variable "elb_no_healthy_instance_silenced" {
   default     = {}
 }
 
+variable "elb_no_healthy_instance_extra_tags" {
+  description = "Extra tags for ELB no healty instance monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_no_healthy_instance_message" {
   description = "Custom message for ELB no healty instance monitor"
   type        = "string"
@@ -60,6 +66,12 @@ variable "elb_4xx_silenced" {
   default     = {}
 }
 
+variable "elb_4xx_extra_tags" {
+  description = "Extra tags for ELB 4xx errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_4xx_message" {
   description = "Custom message for ELB 4xx errors monitor"
   type        = "string"
@@ -88,6 +100,12 @@ variable "elb_5xx_silenced" {
   default     = {}
 }
 
+variable "elb_5xx_extra_tags" {
+  description = "Extra tags for ELB 5xx errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_5xx_message" {
   description = "Custom message for ELB 5xx errors monitor"
   type        = "string"
@@ -116,6 +134,12 @@ variable "elb_backend_4xx_silenced" {
   default     = {}
 }
 
+variable "elb_backend_4xx_extra_tags" {
+  description = "Extra tags for ELB backend 4xx errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_backend_4xx_message" {
   description = "Custom message for ELB backend 4xx errors monitor"
   type        = "string"
@@ -144,6 +168,12 @@ variable "elb_backend_5xx_silenced" {
   default     = {}
 }
 
+variable "elb_backend_5xx_extra_tags" {
+  description = "Extra tags for ELB backend 5xx errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_backend_5xx_message" {
   description = "Custom message for ELB backend 5xx errors monitor"
   type        = "string"
@@ -172,6 +202,12 @@ variable "elb_backend_latency_silenced" {
   default     = {}
 }
 
+variable "elb_backend_latency_extra_tags" {
+  description = "Extra tags for ELB backend latency monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "elb_backend_latency_message" {
   description = "Custom message for ELB backend latency monitor"
   type        = "string"
diff --git a/cloud/aws/kinesis-firehose/inputs.tf b/cloud/aws/kinesis-firehose/inputs.tf
index 95e7a06..b229e6b 100644
--- a/cloud/aws/kinesis-firehose/inputs.tf
+++ b/cloud/aws/kinesis-firehose/inputs.tf
@@ -37,6 +37,12 @@ variable "incoming_records_silenced" {
   default     = {}
 }
 
+variable "incoming_records_extra_tags" {
+  description = "Extra tags for Kinesis Firehorse incoming records monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "incoming_records_message" {
   description = "Custom message for Kinesis Firehorse incoming records monitor"
   type        = "string"
diff --git a/cloud/aws/rds/inputs.tf b/cloud/aws/rds/inputs.tf
index a179a49..4c8d05b 100644
--- a/cloud/aws/rds/inputs.tf
+++ b/cloud/aws/rds/inputs.tf
@@ -37,6 +37,12 @@ variable "cpu_silenced" {
   default     = {}
 }
 
+variable "cpu_extra_tags" {
+  description = "Extra tags for RDS CPU usage monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "cpu_message" {
   description = "Custom message for RDS CPU usage monitor"
   type        = "string"
@@ -71,6 +77,12 @@ variable "diskspace_silenced" {
   default     = {}
 }
 
+variable "diskspace_extra_tags" {
+  description = "Extra tags for RDS free diskspace monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "diskspace_message" {
   description = "Custom message for RDS free diskspace monitor"
   type        = "string"
diff --git a/cloud/aws/vpn/inputs.tf b/cloud/aws/vpn/inputs.tf
index 8afd124..6424ca3 100644
--- a/cloud/aws/vpn/inputs.tf
+++ b/cloud/aws/vpn/inputs.tf
@@ -30,6 +30,12 @@ variable "vpn_status_silenced" {
   default     = {}
 }
 
+variable "vpn_status_extra_tags" {
+  description = "Extra tags for VPN status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "vpn_status_message" {
   description = "Custom message for VPN status monitor"
   type        = "string"
diff --git a/cloud/azure/apimanagement/inputs.tf b/cloud/azure/apimanagement/inputs.tf
index 2effcaa..4a012fa 100644
--- a/cloud/azure/apimanagement/inputs.tf
+++ b/cloud/azure/apimanagement/inputs.tf
@@ -36,6 +36,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for API Management status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for API Management status monitor"
   type        = "string"
@@ -60,6 +66,12 @@ variable "failed_requests_silenced" {
   default     = {}
 }
 
+variable "failed_requests_extra_tags" {
+  description = "Extra tags for API Management failed requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_requests_message" {
   description = "Custom message for API Management failed requests monitor"
   type        = "string"
@@ -88,6 +100,12 @@ variable "other_requests_silenced" {
   default     = {}
 }
 
+variable "other_requests_extra_tags" {
+  description = "Extra tags for API Management other requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "other_requests_message" {
   description = "Custom message for API Management other requests monitor"
   type        = "string"
@@ -116,6 +134,12 @@ variable "unauthorized_requests_silenced" {
   default     = {}
 }
 
+variable "unauthorized_requests_extra_tags" {
+  description = "Extra tags for API Management unauthorized requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "unauthorized_requests_message" {
   description = "Custom message for API Management unauthorized requests monitor"
   type        = "string"
@@ -144,6 +168,12 @@ variable "successful_requests_silenced" {
   default     = {}
 }
 
+variable "successful_requests_extra_tags" {
+  description = "Extra tags for API Management successful requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "successful_requests_message" {
   description = "Custom message for API Management successful requests monitor"
   type        = "string"
diff --git a/cloud/azure/app-services/inputs.tf b/cloud/azure/app-services/inputs.tf
index 62870c6..04df4e3 100644
--- a/cloud/azure/app-services/inputs.tf
+++ b/cloud/azure/app-services/inputs.tf
@@ -34,6 +34,12 @@ variable "response_time_silenced" {
   default     = {}
 }
 
+variable "response_time_extra_tags" {
+  description = "Extra tags for App Services response time monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "response_time_message" {
   description = "Custom message for App Services response time monitor"
   type        = "string"
@@ -68,6 +74,12 @@ variable "memory_usage_silenced" {
   default     = {}
 }
 
+variable "memory_usage_extra_tags" {
+  description = "Extra tags for App Services memory usage monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "memory_usage_message" {
   description = "Custom message for App Services memory usage monitor"
   type        = "string"
@@ -102,6 +114,12 @@ variable "http_4xx_requests_silenced" {
   default     = {}
 }
 
+variable "http_4xx_requests_extra_tags" {
+  description = "Extra tags for App Services 4xx requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "http_4xx_requests_message" {
   description = "Custom message for App Services 4xx requests monitor"
   type        = "string"
@@ -130,6 +148,12 @@ variable "http_5xx_requests_silenced" {
   default     = {}
 }
 
+variable "http_5xx_requests_extra_tags" {
+  description = "Extra tags for App Services 5xx requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "http_5xx_requests_message" {
   description = "Custom message for App Services 5xx requests monitor"
   type        = "string"
@@ -158,6 +182,12 @@ variable "http_successful_requests_silenced" {
   default     = {}
 }
 
+variable "http_successful_requests_extra_tags" {
+  description = "Extra tags for App Services successful requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "http_successful_requests_message" {
   description = "Custom message for App Services successful requests monitor"
   type        = "string"
diff --git a/cloud/azure/eventhub/inputs.tf b/cloud/azure/eventhub/inputs.tf
index 1fccb08..95757ae 100644
--- a/cloud/azure/eventhub/inputs.tf
+++ b/cloud/azure/eventhub/inputs.tf
@@ -36,6 +36,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for Event Hub status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for Event Hub status monitor"
   type        = "string"
@@ -60,6 +66,12 @@ variable "failed_requests_rate_silenced" {
   default     = {}
 }
 
+variable "failed_requests_rate_extra_tags" {
+  description = "Extra tags for Event Hub failed requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_requests_rate_message" {
   description = "Custom message for Event Hub failed requests monitor"
   type        = "string"
@@ -88,6 +100,12 @@ variable "errors_rate_silenced" {
   default     = {}
 }
 
+variable "errors_rate_extra_tags" {
+  description = "Extra tags for Event Hub errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "errors_rate_message" {
   description = "Custom message for Event Hub errors monitor"
   type        = "string"
diff --git a/cloud/azure/iothubs/inputs.tf b/cloud/azure/iothubs/inputs.tf
index 84335e8..54196a1 100644
--- a/cloud/azure/iothubs/inputs.tf
+++ b/cloud/azure/iothubs/inputs.tf
@@ -31,6 +31,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for IoT Hub status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for IoT Hub status monitor"
   type        = "string"
@@ -55,6 +61,12 @@ variable "total_devices_silenced" {
   default     = {}
 }
 
+variable "total_devices_extra_tags" {
+  description = "Extra tags for IoT Hub total devices monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "total_devices_message" {
   description = "Custom message for IoT Hub total devices monitor"
   type        = "string"
@@ -79,6 +91,12 @@ variable "too_many_d2c_telemetry_ingress_nosent_silenced" {
   default     = {}
 }
 
+variable "too_many_d2c_telemetry_ingress_nosent_extra_tags" {
+  description = "Extra tags for IoT Hub unsent d2c telemetry monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "too_many_d2c_telemetry_ingress_nosent_message" {
   description = "Custom message for IoT Hub unsent d2c telemetry monitor"
   type        = "string"
@@ -97,6 +115,12 @@ variable "failed_jobs_rate_silenced" {
   default     = {}
 }
 
+variable "failed_jobs_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed jobs monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_jobs_rate_message" {
   description = "Custom message for IoT Hub failed jobs monitor"
   type        = "string"
@@ -125,6 +149,12 @@ variable "failed_listjobs_rate_silenced" {
   default     = {}
 }
 
+variable "failed_listjobs_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed list jobs monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_listjobs_rate_message" {
   description = "Custom message for IoT Hub failed list jobs monitor"
   type        = "string"
@@ -153,6 +183,12 @@ variable "failed_queryjobs_rate_silenced" {
   default     = {}
 }
 
+variable "failed_queryjobs_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed query jobs monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_queryjobs_rate_message" {
   description = "Custom message for IoT Hub failed query jobs monitor"
   type        = "string"
@@ -181,6 +217,12 @@ variable "failed_c2d_methods_rate_silenced" {
   default     = {}
 }
 
+variable "failed_c2d_methods_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed c2d methods monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_c2d_methods_rate_message" {
   description = "Custom message for IoT Hub failed c2d method monitor"
   type        = "string"
@@ -209,6 +251,12 @@ variable "failed_c2d_twin_read_rate_silenced" {
   default     = {}
 }
 
+variable "failed_c2d_twin_read_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed c2d twin read monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_c2d_twin_read_rate_message" {
   description = "Custom message for IoT Hub failed c2d twin read monitor"
   type        = "string"
@@ -237,6 +285,12 @@ variable "failed_c2d_twin_update_rate_silenced" {
   default     = {}
 }
 
+variable "failed_c2d_twin_update_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed c2d twin update monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_c2d_twin_update_rate_message" {
   description = "Custom message for IoT Hub failed c2d twin update monitor"
   type        = "string"
@@ -265,6 +319,12 @@ variable "failed_d2c_twin_read_rate_silenced" {
   default     = {}
 }
 
+variable "failed_d2c_twin_read_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed d2c twin read monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_d2c_twin_read_rate_message" {
   description = "Custom message for IoT Hub failed d2c twin read monitor"
   type        = "string"
@@ -293,6 +353,12 @@ variable "failed_d2c_twin_update_rate_silenced" {
   default     = {}
 }
 
+variable "failed_d2c_twin_update_rate_extra_tags" {
+  description = "Extra tags for IoT Hub failed d2c twin update monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_d2c_twin_update_rate_message" {
   description = "Custom message for IoT Hub failed d2c twin update monitor"
   type        = "string"
@@ -321,6 +387,12 @@ variable "dropped_d2c_telemetry_egress_silenced" {
   default     = {}
 }
 
+variable "dropped_d2c_telemetry_egress_extra_tags" {
+  description = "Extra tags for IoT Hub dropped d2c telemetry monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "dropped_d2c_telemetry_egress_message" {
   description = "Custom message for IoT Hub dropped d2c telemetry monitor"
   type        = "string"
@@ -349,6 +421,12 @@ variable "orphaned_d2c_telemetry_egress_silenced" {
   default     = {}
 }
 
+variable "orphaned_d2c_telemetry_egress_extra_tags" {
+  description = "Extra tags for IoT Hub orphaned d2c telemetry monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "orphaned_d2c_telemetry_egress_message" {
   description = "Custom message for IoT Hub orphaned d2c telemetry monitor"
   type        = "string"
@@ -377,6 +455,12 @@ variable "invalid_d2c_telemetry_egress_silenced" {
   default     = {}
 }
 
+variable "invalid_d2c_telemetry_egress_extra_tags" {
+  description = "Extra tags for IoT Hub invalid d2c telemetry monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "invalid_d2c_telemetry_egress_message" {
   description = "Custom message for IoT Hub invalid d2c telemetry monitor"
   type        = "string"
diff --git a/cloud/azure/redis/inputs.tf b/cloud/azure/redis/inputs.tf
index 136496f..6f4465e 100644
--- a/cloud/azure/redis/inputs.tf
+++ b/cloud/azure/redis/inputs.tf
@@ -36,6 +36,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for Redis status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for Redis status monitor"
   type        = "string"
@@ -60,6 +66,12 @@ variable "evictedkeys_limit_silenced" {
   default     = {}
 }
 
+variable "evictedkeys_limit_extra_tags" {
+  description = "Extra tags for Redis evicted keys monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "evictedkeys_limit_message" {
   description = "Custom message for Redis evicted keys monitor"
   type        = "string"
@@ -94,6 +106,12 @@ variable "percent_processor_time_silenced" {
   default     = {}
 }
 
+variable "percent_processor_time_extra_tags" {
+  description = "Extra tags for Redis processor monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "percent_processor_time_message" {
   description = "Custom message for Redis processor monitor"
   type        = "string"
@@ -128,6 +146,12 @@ variable "server_load_rate_silenced" {
   default     = {}
 }
 
+variable "server_load_rate_extra_tags" {
+  description = "Extra tags for Redis server load monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "server_load_rate_message" {
   description = "Custom message for Redis server load monitor"
   type        = "string"
diff --git a/cloud/azure/servicebus/inputs.tf b/cloud/azure/servicebus/inputs.tf
index 472a7ab..680b606 100644
--- a/cloud/azure/servicebus/inputs.tf
+++ b/cloud/azure/servicebus/inputs.tf
@@ -36,6 +36,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for Service Bus status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for Service Bus status monitor"
   type        = "string"
diff --git a/cloud/azure/sql-database/inputs.tf b/cloud/azure/sql-database/inputs.tf
index 40b84d2..7e161f6 100644
--- a/cloud/azure/sql-database/inputs.tf
+++ b/cloud/azure/sql-database/inputs.tf
@@ -36,6 +36,12 @@ variable "cpu_silenced" {
   default     = {}
 }
 
+variable "cpu_extra_tags" {
+  description = "Extra tags for SQL CPU monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "cpu_message" {
   description = "Custom message for SQL CPU monitor"
   type        = "string"
@@ -70,6 +76,12 @@ variable "diskspace_silenced" {
   default     = {}
 }
 
+variable "diskspace_extra_tags" {
+  description = "Extra tags for SQL disk space monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "diskspace_message" {
   description = "Custom message for SQL disk space monitor"
   type        = "string"
@@ -104,6 +116,12 @@ variable "dtu_silenced" {
   default     = {}
 }
 
+variable "dtu_extra_tags" {
+  description = "Extra tags for SQL DTU monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "dtu_message" {
   description = "Custom message for SQL DTU monitor"
   type        = "string"
@@ -138,6 +156,12 @@ variable "deadlock_silenced" {
   default     = {}
 }
 
+variable "deadlock_extra_tags" {
+  description = "Extra tags for SQL Deadlock monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "deadlock_message" {
   description = "Custom message for SQL Deadlock monitor"
   type        = "string"
diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf
index 581618b..5c0e460 100644
--- a/cloud/azure/storage/inputs.tf
+++ b/cloud/azure/storage/inputs.tf
@@ -36,6 +36,12 @@ variable "availability_silenced" {
   default     = {}
 }
 
+variable "availability_extra_tags" {
+  description = "Extra tags for Storage availability monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "availability_message" {
   description = "Custom message for Storage availability monitor"
   type        = "string"
@@ -70,6 +76,12 @@ variable "successful_requests_silenced" {
   default     = {}
 }
 
+variable "successful_requests_extra_tags" {
+  description = "Extra tags for Storage sucessful requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "successful_requests_message" {
   description = "Custom message for Storage sucessful requests monitor"
   type        = "string"
@@ -104,6 +116,12 @@ variable "latency_silenced" {
   default     = {}
 }
 
+variable "latency_extra_tags" {
+  description = "Extra tags for Storage latency monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "latency_message" {
   description = "Custom message for Storage latency monitor"
   type        = "string"
@@ -138,6 +156,12 @@ variable "timeout_error_requests_silenced" {
   default     = {}
 }
 
+variable "timeout_error_requests_extra_tags" {
+  description = "Extra tags for Storage timeout monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "timeout_error_requests_message" {
   description = "Custom message for Storage timeout monitor"
   type        = "string"
@@ -172,6 +196,12 @@ variable "network_error_requests_silenced" {
   default     = {}
 }
 
+variable "network_error_requests_extra_tags" {
+  description = "Extra tags for Storage network errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "network_error_requests_message" {
   description = "Custom message for Storage network errors monitor"
   type        = "string"
@@ -206,6 +236,12 @@ variable "throttling_error_requests_silenced" {
   default     = {}
 }
 
+variable "throttling_error_requests_extra_tags" {
+  description = "Extra tags for Storage throttling error monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "throttling_error_requests_message" {
   description = "Custom message for Storage throttling error monitor"
   type        = "string"
@@ -240,6 +276,12 @@ variable "server_other_error_requests_silenced" {
   default     = {}
 }
 
+variable "server_other_error_requests_extra_tags" {
+  description = "Extra tags for Storage server other errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "server_other_error_requests_message" {
   description = "Custom message for Storage server other errors monitor"
   type        = "string"
@@ -274,6 +316,12 @@ variable "client_other_error_requests_silenced" {
   default     = {}
 }
 
+variable "client_other_error_requests_extra_tags" {
+  description = "Extra tags for Storage other errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "client_other_error_requests_message" {
   description = "Custom message for Storage other errors monitor"
   type        = "string"
@@ -308,6 +356,12 @@ variable "authorization_error_requests_silenced" {
   default     = {}
 }
 
+variable "authorization_error_requests_extra_tags" {
+  description = "Extra tags for Storage authorization errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "authorization_error_requests_message" {
   description = "Custom message for Storage authorization errors monitor"
   type        = "string"
diff --git a/cloud/azure/stream-analytics/inputs.tf b/cloud/azure/stream-analytics/inputs.tf
index afec7f0..d11a34d 100644
--- a/cloud/azure/stream-analytics/inputs.tf
+++ b/cloud/azure/stream-analytics/inputs.tf
@@ -36,6 +36,12 @@ variable "status_silenced" {
   default     = {}
 }
 
+variable "status_extra_tags" {
+  description = "Extra tags for Stream Analytics status monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "status_message" {
   description = "Custom message for Stream Analytics status monitor"
   type        = "string"
@@ -60,6 +66,12 @@ variable "su_utilization_silenced" {
   default     = {}
 }
 
+variable "su_utilization_extra_tags" {
+  description = "Extra tags for Stream Analytics utilization monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "su_utilization_message" {
   description = "Custom message for Stream Analytics utilization monitor"
   type        = "string"
@@ -94,6 +106,12 @@ variable "failed_function_requests_silenced" {
   default     = {}
 }
 
+variable "failed_function_requests_extra_tags" {
+  description = "Extra tags for Stream Analytics failed requests monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "failed_function_requests_message" {
   description = "Custom message for Stream Analytics failed requests monitor"
   type        = "string"
@@ -122,6 +140,12 @@ variable "conversion_errors_silenced" {
   default     = {}
 }
 
+variable "conversion_errors_extra_tags" {
+  description = "Extra tags for Stream Analytics conversion errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "conversion_errors_message" {
   description = "Custom message for Stream Analytics conversion errors monitor"
   type        = "string"
@@ -156,6 +180,12 @@ variable "runtime_errors_silenced" {
   default     = {}
 }
 
+variable "runtime_errors_extra_tags" {
+  description = "Extra tags for Stream Analytics runtime errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "runtime_errors_message" {
   description = "Custom message for Stream Analytics runtime errors monitor"
   type        = "string"
diff --git a/database/mongodb/inputs.tf b/database/mongodb/inputs.tf
index d85a967..e8d45e4 100644
--- a/database/mongodb/inputs.tf
+++ b/database/mongodb/inputs.tf
@@ -74,12 +74,24 @@ variable "mongodb_primary_silenced" {
   default     = {}
 }
 
+variable "mongodb_primary_extra_tags" {
+  description = "Extra tags for MongoDB primary state monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "mongodb_secondary_silenced" {
   description = "Groups to mute for MongoDB secondary state monitor"
   type        = "map"
   default     = {}
 }
 
+variable "mongodb_secondary_extra_tags" {
+  description = "Extra tags for MongoDB secondary state monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "mongodb_server_count_silenced" {
   description = "Groups to mute for MongoDB server count monitor"
   type        = "map"
@@ -92,6 +104,12 @@ variable "mongodb_replication_silenced" {
   default     = {}
 }
 
+variable "mongodb_replication_extra_tags" {
+  description = "Extra tags for MongoDB replication lag monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "mongodb_primary_message" {
   description = "Custom message for MongoDB primary monitor"
   type        = "string"
diff --git a/middleware/apache/inputs.tf b/middleware/apache/inputs.tf
index 176a509..7a158d5 100644
--- a/middleware/apache/inputs.tf
+++ b/middleware/apache/inputs.tf
@@ -37,6 +37,12 @@ variable "apache_connect_silenced" {
   default     = {}
 }
 
+variable "apache_connect_extra_tags" {
+  description = "Extra tags for Apache process monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "apache_connect_message" {
   description = "Custom message for Apache status monitor"
   type        = "string"
diff --git a/middleware/nginx/inputs.tf b/middleware/nginx/inputs.tf
index 53ef9ce..9b900f8 100644
--- a/middleware/nginx/inputs.tf
+++ b/middleware/nginx/inputs.tf
@@ -37,6 +37,12 @@ variable "nginx_connect_silenced" {
   default     = {}
 }
 
+variable "nginx_connect_extra_tags" {
+  description = "Extra tags for Nginx process monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "nginx_connect_message" {
   description = "Custom message for Nginx status monitor"
   type        = "string"
diff --git a/middleware/php-fpm/inputs.tf b/middleware/php-fpm/inputs.tf
index b198243..2c0d8e6 100644
--- a/middleware/php-fpm/inputs.tf
+++ b/middleware/php-fpm/inputs.tf
@@ -37,6 +37,12 @@ variable "php_fpm_busy_silenced" {
   default     = {}
 }
 
+variable "php_fpm_busy_extra_tags" {
+  description = "Extra tags for PHP FPM busy worker monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "php_fpm_busy_message" {
   description = "Custom message for PHP FPM busy worker monitor"
   type        = "string"
@@ -71,6 +77,12 @@ variable "php_fpm_connect_silenced" {
   default     = {}
 }
 
+variable "php_fpm_connect_extra_tags" {
+  description = "Extra tags for PHP FPM process monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "php_fpm_connect_message" {
   description = "Custom message for PHP FPM process monitor"
   type        = "string"
diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf
index 4a90e06..7405b07 100644
--- a/system/generic/inputs.tf
+++ b/system/generic/inputs.tf
@@ -37,6 +37,12 @@ variable "cpu_high_silenced" {
   default     = {}
 }
 
+variable "cpu_high_extra_tags" {
+  description = "Extra tags for CPU high monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "cpu_high_message" {
   description = "Custom message for CPU high monitor"
   type        = "string"
@@ -71,6 +77,12 @@ variable "cpu_load_silenced" {
   default     = {}
 }
 
+variable "cpu_load_extra_tags" {
+  description = "Extra tags for CPU load ratio monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "cpu_load_message" {
   description = "Custom message for CPU load ratio monitor"
   type        = "string"
@@ -105,6 +117,12 @@ variable "free_disk_space_silenced" {
   default     = {}
 }
 
+variable "free_disk_space_extra_tags" {
+  description = "Extra tags for Free diskspace monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "free_disk_space_message" {
   description = "Custom message for Free diskspace monitor"
   type        = "string"
@@ -139,6 +157,12 @@ variable "free_disk_inodes_silenced" {
   default     = {}
 }
 
+variable "free_disk_inodes_extra_tags" {
+  description = "Extra tags for Free disk inodes monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "free_disk_inodes_message" {
   description = "Custom message for Free disk inodes monitor"
   type        = "string"
@@ -173,6 +197,12 @@ variable "free_memory_silenced" {
   default     = {}
 }
 
+variable "free_memory_extra_tags" {
+  description = "Extra tags for Free memory monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "free_memory_message" {
   description = "Custom message for Free memory monitor"
   type        = "string"