Merged in MON-301_update_monitors_using_new_filter_tags_with_exclude (pull request #171)

MON-301 update monitors using new filter tags module

Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Patrick Decat <patrick.decat@fr.clara.net>
Approved-by: Laurent Piroelle <laurent.piroelle@fr.clara.net>
Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>

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 |

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"
 }

caas/kubernetes/ark/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "ark"
+  resource                    = "ark"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

caas/kubernetes/ingress/modules.tf

@@ -1,29 +1,32 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "ingress"
+  resource                    = "ingress"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
-  extra_tags               = ["!upstream:upstream-default-backend"]
+  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}"
+  environment                 = "${var.environment}"
-  resource                 = "ingress"
+  resource                    = "ingress"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
-  extra_tags               = ["!upstream:upstream-default-backend,status_code:5xx"]
+  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}"
+  environment                 = "${var.environment}"
-  resource                 = "ingress"
+  resource                    = "ingress"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
-  extra_tags               = ["!upstream:upstream-default-backend,status_code:4xx"]
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
+  extra_tags                  = ["!upstream:upstream-default-backend,status_code:4xx"]
 }

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 |

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"
 }

cloud/aws/alb/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_alb"
+  resource                    = "aws_alb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/aws/elasticache/common/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_elasticache"
+  resource                    = "aws_elasticache"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/aws/elasticache/memcached/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_elasticache"
+  resource                    = "aws_elasticache"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/aws/elasticache/redis/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_elasticache"
+  resource                    = "aws_elasticache"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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" {

cloud/aws/elasticsearch/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_elasticsearch"
+  resource                    = "aws_elasticsearch"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/aws/elb/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_elb"
+  resource                    = "aws_elb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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" {

cloud/aws/kinesis-firehose/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_kinesis-firehose"
+  resource                    = "aws_kinesis-firehose"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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" {

cloud/aws/rds/aurora/mysql/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_rds"
+  resource                    = "aws_rds"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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" {

cloud/aws/rds/aurora/postgresql/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_rds"
+  resource                    = "aws_rds"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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" {

cloud/aws/rds/common/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "aws_rds"
+  resource                    = "aws_rds"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/azure/apimanagement/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "apimanagement"
+  resource                    = "apimanagement"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"
 }

cloud/azure/app-services/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "app-services"
+  resource                    = "app-services"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"
 }

cloud/azure/cosmosdb/modules.tf

@@ -1,19 +1,21 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "cosmosdb"
+  resource                    = "cosmosdb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  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}"
+  environment                 = "${var.environment}"
-  resource                 = "cosmosdb"
+  resource                    = "cosmosdb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom          = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 
   extra_tags = ["statuscode:%s"]
 }

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 |

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"
 }

cloud/azure/datalakestore/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "datalakestore"
+  resource                    = "datalakestore"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/azure/eventhub/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "eventhub"
+  resource                    = "eventhub"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"
 }

cloud/azure/keyvault/modules.tf

@@ -1,19 +1,21 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "keyvault"
+  resource                    = "keyvault"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  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}"
+  environment                 = "${var.environment}"
-  resource                 = "cosmosdb"
+  resource                    = "cosmosdb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom          = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 
   extra_tags = ["statuscode:%s"]
 }

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 |

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"

cloud/azure/redis/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "redis"
+  resource                    = "redis"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/azure/servicebus/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "servicebus"
+  resource                    = "servicebus"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/azure/sql-database/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "sql-database"
+  resource                    = "sql-database"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"

cloud/azure/storage/modules.tf

@@ -1,9 +1,10 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "storage"
+  resource                    = "storage"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
-  extra_tags               = ["transaction_type:all"]
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
+  extra_tags                  = ["transaction_type:all"]
 }

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 |

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"

cloud/azure/stream-analytics/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "stream-analytics"
+  resource                    = "stream-analytics"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

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 |

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"
 }

database/elasticsearch/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "elasticsearch"
+  resource                    = "elasticsearch"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

database/elasticsearch/monitors-elasticsearch.tf

@@ -7,7 +7,7 @@ resource "datadog_monitor" "not_responding" {
   message = "${coalesce(var.not_responding_message, var.message)}"
 
   query = <<EOL
-    "elasticsearch.can_connect".over${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
+    "elasticsearch.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
 EOL
 
   type = "service check"

database/mongodb/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 | `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 an alert is triggered | string | - | yes |
 | mongodb_desired_servers_count | Number of servers that should be instanciated for this cluster | string | `3` | no |

database/mongodb/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     = ""
+}
+
 variable "mongodb_desired_servers_count" {
   description = "Number of servers that should be instanciated for this cluster"
   default     = 3

database/mongodb/modules.tf

@@ -1,18 +1,20 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "mongodb"
+  resource                    = "mongodb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }
 
 module "filter-tags-secondary" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "mongodb"
+  resource                    = "mongodb"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
-  extra_tags               = ["replset_state:secondary"]
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
+  extra_tags                  = ["replset_state:secondary"]
 }

database/mysql/README.md

@@ -32,6 +32,7 @@ Creates DataDog monitors with the following checks:
 | environment | 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 an alert is triggered | string | - | yes |
 | mysql_aborted_enabled | Flag to enable MySQL aborted connects monitor | string | `true` | no |

database/mysql/inputs.tf

@@ -27,6 +27,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     = ""
+}
+
 # MySQL specific
 
 #################################

database/mysql/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "mysql"
+  resource                    = "mysql"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

database/mysql/monitors-mysql.tf

@@ -6,7 +6,7 @@ resource "datadog_monitor" "mysql_availability" {
   type = "service check"
 
   query = <<EOF
-    "mysql.can_connect".over${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
+    "mysql.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {

database/postgresql/README.md

@@ -27,6 +27,7 @@ Creates DataDog monitors with the following checks:
 | environment | 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 an alert is triggered | string | - | yes |
 | new_host_delay | Delay in seconds for the metric evaluation | string | `300` | no |

database/postgresql/inputs.tf

@@ -28,6 +28,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     = ""
+}
+
 # PostgreSQL specific
 ##################################
 ###   PostgreSQL availability  ###

database/postgresql/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "postgres"
+  resource                    = "postgres"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

database/postgresql/monitors-postgresql.tf

@@ -6,7 +6,7 @@ resource "datadog_monitor" "postgresql_availability" {
   type = "service check"
 
   query = <<EOF
-    "postgres.can_connect".over${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
+    "postgres.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {

database/redis/README.md

@@ -58,6 +58,7 @@ Creates DataDog monitors with the following checks:
 | expirations_rate_time_aggregator | Monitor aggregator for Redis keys expirations [available values: min, max or avg] | string | `min` | no |
 | expirations_rate_timeframe | Monitor timeframe for Redis keys expirations [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 |
 | hitrate_enabled | Flag to enable Redis hitrate monitor | string | `true` | no |
 | hitrate_extra_tags | Extra tags for Redis hitrate monitor | list | `[]` | no |

database/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 variables
 
 variable "evictedkeys_change_silenced" {

database/redis/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "redis"
+  resource                    = "redis"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

database/redis/monitors-redis.tf

@@ -9,7 +9,7 @@ resource "datadog_monitor" "not_responding" {
   type = "service check"
 
   query = <<EOF
-    "redis.can_connect".over${module.filter-tags.service_check}.by("redis_host","redis_port").last(6).count_by_status()
+    "redis.can_connect"${module.filter-tags.service_check}.by("redis_host","redis_port").last(6).count_by_status()
   EOF
 
   thresholds {

middleware/apache/README.md

@@ -30,6 +30,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 an alert is triggered | string | - | yes |
 | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no |

middleware/apache/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     = ""
+}
+
 # Apache Middleware specific
 
 variable "apache_connect_silenced" {

middleware/apache/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "apache"
+  resource                    = "apache"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

middleware/apache/monitors-apache.tf

@@ -6,7 +6,7 @@ resource "datadog_monitor" "datadog_apache_process" {
   type = "service check"
 
   query = <<EOF
-    "apache.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
+    "apache.can_connect"${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
   EOF
 
   thresholds = {

middleware/nginx/README.md

@@ -26,6 +26,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 an alert is triggered | string | - | yes |
 | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no |

middleware/nginx/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     = ""
+}
+
 # Nginx Middleware specific
 
 variable "nginx_connect_silenced" {

middleware/nginx/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "nginx"
+  resource                    = "nginx"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

middleware/nginx/monitors-nginx.tf

@@ -6,7 +6,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   query = <<EOF
-    "nginx.can_connect".over${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
+    "nginx.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
   EOF
 
   thresholds = {

middleware/php-fpm/README.md

@@ -26,6 +26,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 an alert is triggered | string | - | yes |
 | new_host_delay | Delay in seconds before monitor new resource | string | `300` | no |

middleware/php-fpm/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     = ""
+}
+
 # PHP FPM Middleware specific
 
 variable "php_fpm_busy_silenced" {

middleware/php-fpm/modules.tf

@@ -1,8 +1,9 @@
 module "filter-tags" {
   source = "../../common/filter-tags"
 
-  environment              = "${var.environment}"
+  environment                 = "${var.environment}"
-  resource                 = "php-fpm"
+  resource                    = "php-fpm"
-  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom          = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
 }

middleware/php-fpm/monitors-fpm.tf

@@ -6,7 +6,7 @@ resource "datadog_monitor" "php_fpm_connect" {
   type = "service check"
 
   query = <<EOF
-    "php_fpm.can_ping".over${module.filter-tags.service_check}.by("ping_url").last(6).count_by_status()
+    "php_fpm.can_ping"${module.filter-tags.service_check}.by("ping_url").last(6).count_by_status()
   EOF
 
   thresholds = {