diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md index bf645f4..e500898 100644 --- a/caas/kubernetes/ark/README.md +++ b/caas/kubernetes/ark/README.md @@ -31,6 +31,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf index 8ef9a79..c3c0af8 100644 --- a/caas/kubernetes/ark/inputs.tf +++ b/caas/kubernetes/ark/inputs.tf @@ -14,6 +14,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/caas/kubernetes/ark/modules.tf b/caas/kubernetes/ark/modules.tf index 7908587..1271818 100644 --- a/caas/kubernetes/ark/modules.tf +++ b/caas/kubernetes/ark/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "ark" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "ark" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/caas/kubernetes/ingress/README.md b/caas/kubernetes/ingress/README.md index 5a3260f..06eb6d5 100644 --- a/caas/kubernetes/ingress/README.md +++ b/caas/kubernetes/ingress/README.md @@ -27,6 +27,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | ingress_4xx_enabled | Flag to enable Ingress 4xx errors monitor | string | `true` | no | | ingress_4xx_extra_tags | Extra tags for Ingress 4xx errors monitor | list | `[]` | no | diff --git a/caas/kubernetes/ingress/inputs.tf b/caas/kubernetes/ingress/inputs.tf index 35c39b6..3953a7a 100644 --- a/caas/kubernetes/ingress/inputs.tf +++ b/caas/kubernetes/ingress/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + #Ingress variable "ingress_5xx_silenced" { description = "Groups to mute for Ingress 5xx errors monitor" diff --git a/caas/kubernetes/ingress/modules.tf b/caas/kubernetes/ingress/modules.tf index ee1e148..fcdceb0 100644 --- a/caas/kubernetes/ingress/modules.tf +++ b/caas/kubernetes/ingress/modules.tf @@ -1,29 +1,32 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "ingress" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" - extra_tags = ["!upstream:upstream-default-backend"] + environment = "${var.environment}" + resource = "ingress" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + extra_tags = ["!upstream:upstream-default-backend"] } module "filter-tags-5xx" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "ingress" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" - extra_tags = ["!upstream:upstream-default-backend,status_code:5xx"] + environment = "${var.environment}" + resource = "ingress" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + extra_tags = ["!upstream:upstream-default-backend,status_code:5xx"] } module "filter-tags-4xx" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "ingress" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" - extra_tags = ["!upstream:upstream-default-backend,status_code:4xx"] + environment = "${var.environment}" + resource = "ingress" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + extra_tags = ["!upstream:upstream-default-backend,status_code:4xx"] } diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md index 9aa2189..1ca20b3 100644 --- a/cloud/aws/alb/README.md +++ b/cloud/aws/alb/README.md @@ -37,6 +37,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | httpcode_alb_4xx_enabled | Flag to enable ALB httpcode 4xx monitor | string | `true` | no | | httpcode_alb_4xx_extra_tags | Extra tags for ALB httpcode 4xx monitor | list | `[]` | no | diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf index 721274a..6e68876 100644 --- a/cloud/aws/alb/inputs.tf +++ b/cloud/aws/alb/inputs.tf @@ -15,6 +15,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/cloud/aws/alb/modules.tf b/cloud/aws/alb/modules.tf index 1aae9bf..7cf24dc 100644 --- a/cloud/aws/alb/modules.tf +++ b/cloud/aws/alb/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_alb" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_alb" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/elasticache/common/README.md b/cloud/aws/elasticache/common/README.md index 6ada4a7..e723c97 100644 --- a/cloud/aws/elasticache/common/README.md +++ b/cloud/aws/elasticache/common/README.md @@ -45,6 +45,7 @@ Creates DataDog monitors with the following checks: | eviction_threshold_warning | Elasticache free memory warning threshold in percentage | string | `0` | no | | eviction_timeframe | Monitor timeframe for Elasticache eviction [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | free_memory_condition_timeframe | Monitor condition timeframe for Elasticache free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | free_memory_enabled | Flag to enable Elasticache free memory monitor | string | `true` | no | diff --git a/cloud/aws/elasticache/common/inputs.tf b/cloud/aws/elasticache/common/inputs.tf index 9575148..a1d8a73 100644 --- a/cloud/aws/elasticache/common/inputs.tf +++ b/cloud/aws/elasticache/common/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Elasticache specific variable "eviction_silenced" { description = "Groups to mute for Elasticache eviction monitor" diff --git a/cloud/aws/elasticache/common/modules.tf b/cloud/aws/elasticache/common/modules.tf index 987c046..081ad25 100644 --- a/cloud/aws/elasticache/common/modules.tf +++ b/cloud/aws/elasticache/common/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_elasticache" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_elasticache" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/elasticache/memcached/README.md b/cloud/aws/elasticache/memcached/README.md index 982eb38..db840b4 100644 --- a/cloud/aws/elasticache/memcached/README.md +++ b/cloud/aws/elasticache/memcached/README.md @@ -34,6 +34,7 @@ Creates DataDog monitors with the following checks: | environment | Infrastructure Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | get_hits_enabled | Flag to enable Elasticache memcached get hits monitor | string | `true` | no | | get_hits_extra_tags | Extra tags for Elasticache memcached get hits monitor | list | `[]` | no | diff --git a/cloud/aws/elasticache/memcached/inputs.tf b/cloud/aws/elasticache/memcached/inputs.tf index a07c61a..c18dded 100644 --- a/cloud/aws/elasticache/memcached/inputs.tf +++ b/cloud/aws/elasticache/memcached/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Memcached specific variable "get_hits_silenced" { description = "Groups to mute for Elasticache memcached get hits monitor" diff --git a/cloud/aws/elasticache/memcached/modules.tf b/cloud/aws/elasticache/memcached/modules.tf index 987c046..081ad25 100644 --- a/cloud/aws/elasticache/memcached/modules.tf +++ b/cloud/aws/elasticache/memcached/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_elasticache" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_elasticache" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/elasticache/redis/README.md b/cloud/aws/elasticache/redis/README.md index 9b58a05..14ec090 100644 --- a/cloud/aws/elasticache/redis/README.md +++ b/cloud/aws/elasticache/redis/README.md @@ -48,6 +48,7 @@ Creates DataDog monitors with the following checks: | environment | Infrastructure Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/elasticache/redis/inputs.tf b/cloud/aws/elasticache/redis/inputs.tf index 69e2024..d5cc49b 100644 --- a/cloud/aws/elasticache/redis/inputs.tf +++ b/cloud/aws/elasticache/redis/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # redis specific variable "cache_hits_silenced" { description = "Groups to mute for Elasticache redis cache hits monitor" diff --git a/cloud/aws/elasticache/redis/modules.tf b/cloud/aws/elasticache/redis/modules.tf index 987c046..081ad25 100644 --- a/cloud/aws/elasticache/redis/modules.tf +++ b/cloud/aws/elasticache/redis/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_elasticache" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_elasticache" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md index fc9e908..2bab49d 100644 --- a/cloud/aws/elasticsearch/README.md +++ b/cloud/aws/elasticsearch/README.md @@ -49,6 +49,7 @@ Creates DataDog monitors with the following checks: | es_cluster_volume_size | ElasticSearch Domain volume size (in GB) | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf index 8080198..9aca5d6 100644 --- a/cloud/aws/elasticsearch/inputs.tf +++ b/cloud/aws/elasticsearch/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # AWS ElasticSearch Service specific variable "es_cluster_status_silenced" { diff --git a/cloud/aws/elasticsearch/modules.tf b/cloud/aws/elasticsearch/modules.tf index 0abfe32..6c78779 100644 --- a/cloud/aws/elasticsearch/modules.tf +++ b/cloud/aws/elasticsearch/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_elasticsearch" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_elasticsearch" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md index b4a8ee9..de52864 100644 --- a/cloud/aws/elb/README.md +++ b/cloud/aws/elb/README.md @@ -73,6 +73,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf index 44085f3..5b8a181 100644 --- a/cloud/aws/elb/inputs.tf +++ b/cloud/aws/elb/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + ## ELB variable "elb_no_healthy_instance_silenced" { description = "Groups to mute for ELB no healty instance monitor" diff --git a/cloud/aws/elb/modules.tf b/cloud/aws/elb/modules.tf index b64c814..b6ad8ae 100644 --- a/cloud/aws/elb/modules.tf +++ b/cloud/aws/elb/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_elb" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_elb" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/kinesis-firehose/README.md b/cloud/aws/kinesis-firehose/README.md index d8a4b3b..e0c4d90 100644 --- a/cloud/aws/kinesis-firehose/README.md +++ b/cloud/aws/kinesis-firehose/README.md @@ -25,6 +25,7 @@ Creates DataDog monitors with the following checks: | environment | Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | incoming_records_enabled | Flag to enable Kinesis Firehorse incoming records monitor | string | `true` | no | | incoming_records_extra_tags | Extra tags for Kinesis Firehorse incoming records monitor | list | `[]` | no | diff --git a/cloud/aws/kinesis-firehose/inputs.tf b/cloud/aws/kinesis-firehose/inputs.tf index f8aa2a9..b729db8 100644 --- a/cloud/aws/kinesis-firehose/inputs.tf +++ b/cloud/aws/kinesis-firehose/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Kinesis-Firehose variable "incoming_records_silenced" { diff --git a/cloud/aws/kinesis-firehose/modules.tf b/cloud/aws/kinesis-firehose/modules.tf index b7b2e72..f3a1d71 100644 --- a/cloud/aws/kinesis-firehose/modules.tf +++ b/cloud/aws/kinesis-firehose/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_kinesis-firehose" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_kinesis-firehose" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/rds/aurora/mysql/README.md b/cloud/aws/rds/aurora/mysql/README.md index fa2808d..f47eccf 100644 --- a/cloud/aws/rds/aurora/mysql/README.md +++ b/cloud/aws/rds/aurora/mysql/README.md @@ -32,6 +32,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/rds/aurora/mysql/inputs.tf b/cloud/aws/rds/aurora/mysql/inputs.tf index 30629ad..a6fca71 100644 --- a/cloud/aws/rds/aurora/mysql/inputs.tf +++ b/cloud/aws/rds/aurora/mysql/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # AWS RDS Aurora instance specific variable "aurora_replicalag_silenced" { diff --git a/cloud/aws/rds/aurora/mysql/modules.tf b/cloud/aws/rds/aurora/mysql/modules.tf index 9f52fb1..e40637d 100644 --- a/cloud/aws/rds/aurora/mysql/modules.tf +++ b/cloud/aws/rds/aurora/mysql/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_rds" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_rds" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/rds/aurora/postgresql/README.md b/cloud/aws/rds/aurora/postgresql/README.md index a6a8f52..14ef005 100644 --- a/cloud/aws/rds/aurora/postgresql/README.md +++ b/cloud/aws/rds/aurora/postgresql/README.md @@ -32,6 +32,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/rds/aurora/postgresql/inputs.tf b/cloud/aws/rds/aurora/postgresql/inputs.tf index 30629ad..a6fca71 100644 --- a/cloud/aws/rds/aurora/postgresql/inputs.tf +++ b/cloud/aws/rds/aurora/postgresql/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # AWS RDS Aurora instance specific variable "aurora_replicalag_silenced" { diff --git a/cloud/aws/rds/aurora/postgresql/modules.tf b/cloud/aws/rds/aurora/postgresql/modules.tf index 9f52fb1..e40637d 100644 --- a/cloud/aws/rds/aurora/postgresql/modules.tf +++ b/cloud/aws/rds/aurora/postgresql/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_rds" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_rds" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/aws/rds/common/README.md b/cloud/aws/rds/common/README.md index 6ca6b40..2b06659 100644 --- a/cloud/aws/rds/common/README.md +++ b/cloud/aws/rds/common/README.md @@ -43,6 +43,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/aws/rds/common/inputs.tf b/cloud/aws/rds/common/inputs.tf index c046875..0ec62d2 100644 --- a/cloud/aws/rds/common/inputs.tf +++ b/cloud/aws/rds/common/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # AWS RDS instance specific variable "cpu_silenced" { diff --git a/cloud/aws/rds/common/modules.tf b/cloud/aws/rds/common/modules.tf index dcbe336..20f58c5 100644 --- a/cloud/aws/rds/common/modules.tf +++ b/cloud/aws/rds/common/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../../common/filter-tags" - environment = "${var.environment}" - resource = "aws_rds" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "aws_rds" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/apimanagement/README.md b/cloud/azure/apimanagement/README.md index d8313e8..0748ecb 100644 --- a/cloud/azure/apimanagement/README.md +++ b/cloud/azure/apimanagement/README.md @@ -36,6 +36,7 @@ Creates DataDog monitors with the following checks: | failed_requests_threshold_warning | Warning regarding acceptable percent of failed requests | string | `50` | no | | failed_requests_timeframe | Monitor timeframe for API Management failed requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a Redis monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/apimanagement/inputs.tf b/cloud/azure/apimanagement/inputs.tf index 7651f80..a8810c6 100644 --- a/cloud/azure/apimanagement/inputs.tf +++ b/cloud/azure/apimanagement/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure API Management specific variable "status_silenced" { description = "Groups to mute for API Management status monitor" diff --git a/cloud/azure/apimanagement/modules.tf b/cloud/azure/apimanagement/modules.tf index a8f0343..3f30208 100644 --- a/cloud/azure/apimanagement/modules.tf +++ b/cloud/azure/apimanagement/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "apimanagement" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "apimanagement" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/app-services/README.md b/cloud/azure/app-services/README.md index 2fe7298..63fd6d4 100644 --- a/cloud/azure/app-services/README.md +++ b/cloud/azure/app-services/README.md @@ -29,6 +29,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | http_4xx_requests_enabled | Flag to enable App Services 4xx requests monitor | string | `true` | no | | http_4xx_requests_extra_tags | Extra tags for App Services 4xx requests monitor | list | `[]` | no | diff --git a/cloud/azure/app-services/inputs.tf b/cloud/azure/app-services/inputs.tf index 30ff56a..a5e3752 100644 --- a/cloud/azure/app-services/inputs.tf +++ b/cloud/azure/app-services/inputs.tf @@ -13,6 +13,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/cloud/azure/app-services/modules.tf b/cloud/azure/app-services/modules.tf index 5c5af8f..a4a3f94 100644 --- a/cloud/azure/app-services/modules.tf +++ b/cloud/azure/app-services/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "app-services" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "app-services" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/cosmosdb/README.md b/cloud/azure/cosmosdb/README.md index cd82e5e..b24eeea 100644 --- a/cloud/azure/cosmosdb/README.md +++ b/cloud/azure/cosmosdb/README.md @@ -52,6 +52,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/cosmosdb/inputs.tf b/cloud/azure/cosmosdb/inputs.tf index beaaad9..a60bcbd 100644 --- a/cloud/azure/cosmosdb/inputs.tf +++ b/cloud/azure/cosmosdb/inputs.tf @@ -13,6 +13,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/cloud/azure/cosmosdb/modules.tf b/cloud/azure/cosmosdb/modules.tf index 889e29a..e3bd32c 100644 --- a/cloud/azure/cosmosdb/modules.tf +++ b/cloud/azure/cosmosdb/modules.tf @@ -1,19 +1,21 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "cosmosdb" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "cosmosdb" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } module "filter-tags-statuscode" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "cosmosdb" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom},statuscode:%s" + environment = "${var.environment}" + resource = "cosmosdb" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom},statuscode:%s" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" extra_tags = ["statuscode:%s"] } diff --git a/cloud/azure/datalakestore/README.md b/cloud/azure/datalakestore/README.md index c0d7df8..32e35c9 100644 --- a/cloud/azure/datalakestore/README.md +++ b/cloud/azure/datalakestore/README.md @@ -25,6 +25,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/datalakestore/inputs.tf b/cloud/azure/datalakestore/inputs.tf index 7a0183c..a411812 100644 --- a/cloud/azure/datalakestore/inputs.tf +++ b/cloud/azure/datalakestore/inputs.tf @@ -13,6 +13,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/cloud/azure/datalakestore/modules.tf b/cloud/azure/datalakestore/modules.tf index 2a526b2..746082d 100644 --- a/cloud/azure/datalakestore/modules.tf +++ b/cloud/azure/datalakestore/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "datalakestore" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "datalakestore" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/eventhub/README.md b/cloud/azure/eventhub/README.md index 5a5b743..219b173 100644 --- a/cloud/azure/eventhub/README.md +++ b/cloud/azure/eventhub/README.md @@ -41,6 +41,7 @@ Creates DataDog monitors with the following checks: | failed_requests_rate_thresold_warning | Failed requests ratio (percentage) to trigger a warning alert | string | `50` | no | | failed_requests_rate_timeframe | Monitor timeframe for Event Hub failed requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/eventhub/inputs.tf b/cloud/azure/eventhub/inputs.tf index 83608d5..cca0930 100644 --- a/cloud/azure/eventhub/inputs.tf +++ b/cloud/azure/eventhub/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure Event Hub specific variables variable "status_silenced" { description = "Groups to mute for Event Hub status monitor" diff --git a/cloud/azure/eventhub/modules.tf b/cloud/azure/eventhub/modules.tf index 8c588ef..6e7d4eb 100644 --- a/cloud/azure/eventhub/modules.tf +++ b/cloud/azure/eventhub/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "eventhub" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "eventhub" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/keyvault/README.md b/cloud/azure/keyvault/README.md index 28b5d8c..14dfaa1 100644 --- a/cloud/azure/keyvault/README.md +++ b/cloud/azure/keyvault/README.md @@ -43,6 +43,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/keyvault/inputs.tf b/cloud/azure/keyvault/inputs.tf index fa03318..c6f2a55 100644 --- a/cloud/azure/keyvault/inputs.tf +++ b/cloud/azure/keyvault/inputs.tf @@ -13,6 +13,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/cloud/azure/keyvault/modules.tf b/cloud/azure/keyvault/modules.tf index 0c21a6a..ce922a9 100644 --- a/cloud/azure/keyvault/modules.tf +++ b/cloud/azure/keyvault/modules.tf @@ -1,19 +1,21 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "keyvault" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "keyvault" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } module "filter-tags-statuscode" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "cosmosdb" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom},statuscode:%s" + environment = "${var.environment}" + resource = "cosmosdb" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom},statuscode:%s" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" extra_tags = ["statuscode:%s"] } diff --git a/cloud/azure/redis/README.md b/cloud/azure/redis/README.md index 9d9ec12..0d3db02 100644 --- a/cloud/azure/redis/README.md +++ b/cloud/azure/redis/README.md @@ -36,6 +36,7 @@ Creates DataDog monitors with the following checks: | evictedkeys_limit_time_aggregator | Monitor aggregator for Redis evicted keys [available values: min, max or avg] | string | `avg` | no | | evictedkeys_limit_timeframe | Monitor timeframe for Redis evicted keys [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a Redis monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/redis/inputs.tf b/cloud/azure/redis/inputs.tf index 59caf85..e93098f 100644 --- a/cloud/azure/redis/inputs.tf +++ b/cloud/azure/redis/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure Redis specific variables variable "status_silenced" { description = "Groups to mute for Redis status monitor" diff --git a/cloud/azure/redis/modules.tf b/cloud/azure/redis/modules.tf index 3817b54..c43b0a6 100644 --- a/cloud/azure/redis/modules.tf +++ b/cloud/azure/redis/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "redis" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "redis" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/servicebus/README.md b/cloud/azure/servicebus/README.md index e001ca5..17e2581 100644 --- a/cloud/azure/servicebus/README.md +++ b/cloud/azure/servicebus/README.md @@ -28,6 +28,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/servicebus/inputs.tf b/cloud/azure/servicebus/inputs.tf index eccabf5..b557a4f 100644 --- a/cloud/azure/servicebus/inputs.tf +++ b/cloud/azure/servicebus/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure Service Bus specific variables variable "status_enabled" { description = "Flag to enable Service Bus status monitor" diff --git a/cloud/azure/servicebus/modules.tf b/cloud/azure/servicebus/modules.tf index 80886a1..bddaa5f 100644 --- a/cloud/azure/servicebus/modules.tf +++ b/cloud/azure/servicebus/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "servicebus" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "servicebus" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/sql-database/README.md b/cloud/azure/sql-database/README.md index 61c84c8..40458c2 100644 --- a/cloud/azure/sql-database/README.md +++ b/cloud/azure/sql-database/README.md @@ -58,6 +58,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture Environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when an alert is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/sql-database/inputs.tf b/cloud/azure/sql-database/inputs.tf index 27993a4..ed18d7b 100644 --- a/cloud/azure/sql-database/inputs.tf +++ b/cloud/azure/sql-database/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure SQL Database specific variables variable "cpu_silenced" { description = "Groups to mute for SQL CPU monitor" diff --git a/cloud/azure/sql-database/modules.tf b/cloud/azure/sql-database/modules.tf index c5b2124..82a3f39 100644 --- a/cloud/azure/sql-database/modules.tf +++ b/cloud/azure/sql-database/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "sql-database" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "sql-database" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md index e63ed69..2a3b86d 100644 --- a/cloud/azure/storage/README.md +++ b/cloud/azure/storage/README.md @@ -57,6 +57,7 @@ Creates DataDog monitors with the following checks: | environment | Architecture environment | string | - | yes | | evaluation_delay | Delay in seconds for the metric evaluation | string | `900` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf index be04e5e..ba917ea 100644 --- a/cloud/azure/storage/inputs.tf +++ b/cloud/azure/storage/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure Storage specific variables variable "availability_silenced" { description = "Groups to mute for Storage availability monitor" diff --git a/cloud/azure/storage/modules.tf b/cloud/azure/storage/modules.tf index 68180cd..56d91ab 100644 --- a/cloud/azure/storage/modules.tf +++ b/cloud/azure/storage/modules.tf @@ -1,9 +1,10 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "storage" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" - extra_tags = ["transaction_type:all"] + environment = "${var.environment}" + resource = "storage" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + extra_tags = ["transaction_type:all"] } diff --git a/cloud/azure/stream-analytics/README.md b/cloud/azure/stream-analytics/README.md index 94c95cb..78064a4 100644 --- a/cloud/azure/stream-analytics/README.md +++ b/cloud/azure/stream-analytics/README.md @@ -44,6 +44,7 @@ Creates DataDog monitors with the following checks: | failed_function_requests_threshold_warning | Failed Function Request rate limit (warning threshold) | string | `0` | no | | failed_function_requests_timeframe | Monitor timeframe for Stream Analytics failed requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | message | Message sent when a Redis monitor is triggered | string | - | yes | | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no | diff --git a/cloud/azure/stream-analytics/inputs.tf b/cloud/azure/stream-analytics/inputs.tf index 677d0a3..b7da546 100644 --- a/cloud/azure/stream-analytics/inputs.tf +++ b/cloud/azure/stream-analytics/inputs.tf @@ -29,6 +29,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + # Azure Stream Analytics specific variables variable "status_silenced" { description = "Groups to mute for Stream Analytics status monitor" diff --git a/cloud/azure/stream-analytics/modules.tf b/cloud/azure/stream-analytics/modules.tf index 549df4a..cfff698 100644 --- a/cloud/azure/stream-analytics/modules.tf +++ b/cloud/azure/stream-analytics/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../../common/filter-tags" - environment = "${var.environment}" - resource = "stream-analytics" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "stream-analytics" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/database/elasticsearch/README.md b/database/elasticsearch/README.md index bbfd7a6..7c6897e 100644 --- a/database/elasticsearch/README.md +++ b/database/elasticsearch/README.md @@ -104,6 +104,7 @@ Creates DataDog monitors with the following checks: | field_data_evictions_change_timeframe | Timeframe for the Cluster Status monitor | string | `last_15m` | no | | field_data_evictions_change_timeshift | Timeframe for the Cluster Status monitor | string | `last_15m` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | +| 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 | | flush_latency_enabled | Flag to enable Cluster Status monitor | string | `true` | no | | flush_latency_extra_tags | Extra tags for Cluster Status monitor | list | `[]` | no | diff --git a/database/elasticsearch/inputs.tf b/database/elasticsearch/inputs.tf index af8ec00..70da2a2 100644 --- a/database/elasticsearch/inputs.tf +++ b/database/elasticsearch/inputs.tf @@ -16,6 +16,11 @@ variable "filter_tags_custom" { default = "*" } +variable "filter_tags_custom_excluded" { + description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" + default = "" +} + variable "message" { description = "Message sent when a monitor is triggered" } diff --git a/database/elasticsearch/modules.tf b/database/elasticsearch/modules.tf index 9b9328e..49a9551 100644 --- a/database/elasticsearch/modules.tf +++ b/database/elasticsearch/modules.tf @@ -1,8 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "elasticsearch" - filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom}" + environment = "${var.environment}" + resource = "elasticsearch" + filter_tags_use_defaults = "${var.filter_tags_use_defaults}" + filter_tags_custom = "${var.filter_tags_custom}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" } diff --git a/database/elasticsearch/monitors-elasticsearch.tf b/database/elasticsearch/monitors-elasticsearch.tf index 6be7dae..947d44e 100644 --- a/database/elasticsearch/monitors-elasticsearch.tf +++ b/database/elasticsearch/monitors-elasticsearch.tf @@ -7,7 +7,7 @@ resource "datadog_monitor" "not_responding" { message = "${coalesce(var.not_responding_message, var.message)}" query = <