From 4904f08d04b2299de375391a76be1ee0295a6853 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Tue, 2 Oct 2018 15:57:55 +0200 Subject: [PATCH] MON-301 auto update --- caas/kubernetes/ark/README.md | 1 + caas/kubernetes/ark/modules.tf | 10 +++--- caas/kubernetes/ingress/README.md | 1 + caas/kubernetes/ingress/modules.tf | 36 +++++++++++----------- cloud/aws/alb/README.md | 1 + cloud/aws/alb/modules.tf | 10 +++--- cloud/aws/elasticache/common/README.md | 1 + cloud/aws/elasticache/common/modules.tf | 10 +++--- cloud/aws/elasticache/memcached/README.md | 1 + cloud/aws/elasticache/memcached/modules.tf | 10 +++--- cloud/aws/elasticache/redis/README.md | 1 + cloud/aws/elasticache/redis/modules.tf | 10 +++--- cloud/aws/elasticsearch/README.md | 1 + cloud/aws/elasticsearch/modules.tf | 10 +++--- cloud/aws/elb/README.md | 1 + cloud/aws/elb/modules.tf | 10 +++--- cloud/aws/kinesis-firehose/README.md | 1 + cloud/aws/kinesis-firehose/modules.tf | 10 +++--- cloud/aws/rds/aurora/mysql/README.md | 1 + cloud/aws/rds/aurora/mysql/modules.tf | 10 +++--- cloud/aws/rds/aurora/postgresql/README.md | 1 + cloud/aws/rds/aurora/postgresql/modules.tf | 10 +++--- cloud/aws/rds/common/README.md | 1 + cloud/aws/rds/common/modules.tf | 10 +++--- cloud/azure/apimanagement/README.md | 1 + cloud/azure/apimanagement/modules.tf | 10 +++--- cloud/azure/app-services/README.md | 1 + cloud/azure/app-services/modules.tf | 10 +++--- cloud/azure/cosmosdb/README.md | 1 + cloud/azure/cosmosdb/modules.tf | 20 ++++++------ cloud/azure/datalakestore/README.md | 1 + cloud/azure/datalakestore/modules.tf | 10 +++--- cloud/azure/eventhub/README.md | 1 + cloud/azure/eventhub/modules.tf | 10 +++--- cloud/azure/keyvault/README.md | 1 + cloud/azure/keyvault/modules.tf | 20 ++++++------ cloud/azure/redis/README.md | 1 + cloud/azure/redis/modules.tf | 10 +++--- cloud/azure/servicebus/README.md | 1 + cloud/azure/servicebus/modules.tf | 10 +++--- cloud/azure/sql-database/README.md | 1 + cloud/azure/sql-database/modules.tf | 10 +++--- cloud/azure/storage/README.md | 1 + cloud/azure/storage/modules.tf | 12 ++++---- cloud/azure/stream-analytics/README.md | 1 + cloud/azure/stream-analytics/modules.tf | 10 +++--- database/elasticsearch/README.md | 1 + database/elasticsearch/modules.tf | 10 +++--- database/mongodb/README.md | 1 + database/mongodb/modules.tf | 22 ++++++------- database/mysql/README.md | 1 + database/mysql/modules.tf | 10 +++--- database/postgresql/README.md | 1 + database/postgresql/modules.tf | 10 +++--- database/redis/README.md | 1 + database/redis/modules.tf | 10 +++--- middleware/apache/README.md | 1 + middleware/apache/modules.tf | 10 +++--- middleware/nginx/README.md | 1 + middleware/nginx/modules.tf | 10 +++--- middleware/php-fpm/README.md | 1 + middleware/php-fpm/modules.tf | 10 +++--- system/generic/README.md | 1 + system/generic/modules.tf | 22 ++++++------- system/unreachable/README.md | 1 + system/unreachable/inputs.tf | 10 ------ system/unreachable/modules.tf | 2 +- 67 files changed, 230 insertions(+), 207 deletions(-) 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/modules.tf b/caas/kubernetes/ark/modules.tf index cd76216..1271818 100644 --- a/caas/kubernetes/ark/modules.tf +++ b/caas/kubernetes/ark/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/caas/kubernetes/ingress/modules.tf index c0019f7..fcdceb0 100644 --- a/caas/kubernetes/ingress/modules.tf +++ b/caas/kubernetes/ingress/modules.tf @@ -1,32 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - 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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - 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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - 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/modules.tf b/cloud/aws/alb/modules.tf index 66e0a6b..7cf24dc 100644 --- a/cloud/aws/alb/modules.tf +++ b/cloud/aws/alb/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/elasticache/common/modules.tf index 1b4b593..081ad25 100644 --- a/cloud/aws/elasticache/common/modules.tf +++ b/cloud/aws/elasticache/common/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/elasticache/memcached/modules.tf index 1b4b593..081ad25 100644 --- a/cloud/aws/elasticache/memcached/modules.tf +++ b/cloud/aws/elasticache/memcached/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/elasticache/redis/modules.tf index 1b4b593..081ad25 100644 --- a/cloud/aws/elasticache/redis/modules.tf +++ b/cloud/aws/elasticache/redis/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/elasticsearch/modules.tf index 4f7376c..6c78779 100644 --- a/cloud/aws/elasticsearch/modules.tf +++ b/cloud/aws/elasticsearch/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/elb/modules.tf index 69a64e2..b6ad8ae 100644 --- a/cloud/aws/elb/modules.tf +++ b/cloud/aws/elb/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/kinesis-firehose/modules.tf index 7e0ccc0..f3a1d71 100644 --- a/cloud/aws/kinesis-firehose/modules.tf +++ b/cloud/aws/kinesis-firehose/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/rds/aurora/mysql/modules.tf index 529d5e7..e40637d 100644 --- a/cloud/aws/rds/aurora/mysql/modules.tf +++ b/cloud/aws/rds/aurora/mysql/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/rds/aurora/postgresql/modules.tf index 529d5e7..e40637d 100644 --- a/cloud/aws/rds/aurora/postgresql/modules.tf +++ b/cloud/aws/rds/aurora/postgresql/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/aws/rds/common/modules.tf index 5f27612..20f58c5 100644 --- a/cloud/aws/rds/common/modules.tf +++ b/cloud/aws/rds/common/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/apimanagement/modules.tf index 7b067ff..3f30208 100644 --- a/cloud/azure/apimanagement/modules.tf +++ b/cloud/azure/apimanagement/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/app-services/modules.tf index 5600128..a4a3f94 100644 --- a/cloud/azure/app-services/modules.tf +++ b/cloud/azure/app-services/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/cosmosdb/modules.tf index 06a8d02..e3bd32c 100644 --- a/cloud/azure/cosmosdb/modules.tf +++ b/cloud/azure/cosmosdb/modules.tf @@ -1,21 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/datalakestore/modules.tf index f264bf1..746082d 100644 --- a/cloud/azure/datalakestore/modules.tf +++ b/cloud/azure/datalakestore/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/eventhub/modules.tf index fd2de1a..6e7d4eb 100644 --- a/cloud/azure/eventhub/modules.tf +++ b/cloud/azure/eventhub/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/keyvault/modules.tf index a0f45a7..ce922a9 100644 --- a/cloud/azure/keyvault/modules.tf +++ b/cloud/azure/keyvault/modules.tf @@ -1,21 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/redis/modules.tf index ffa7a9c..c43b0a6 100644 --- a/cloud/azure/redis/modules.tf +++ b/cloud/azure/redis/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/servicebus/modules.tf index b174219..bddaa5f 100644 --- a/cloud/azure/servicebus/modules.tf +++ b/cloud/azure/servicebus/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/sql-database/modules.tf index c336fe4..82a3f39 100644 --- a/cloud/azure/sql-database/modules.tf +++ b/cloud/azure/sql-database/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/cloud/azure/storage/modules.tf index ec1f28a..56d91ab 100644 --- a/cloud/azure/storage/modules.tf +++ b/cloud/azure/storage/modules.tf @@ -1,10 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - 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/modules.tf b/cloud/azure/stream-analytics/modules.tf index c5945cd..cfff698 100644 --- a/cloud/azure/stream-analytics/modules.tf +++ b/cloud/azure/stream-analytics/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/modules.tf b/database/elasticsearch/modules.tf index d57ec49..49a9551 100644 --- a/database/elasticsearch/modules.tf +++ b/database/elasticsearch/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/mongodb/README.md b/database/mongodb/README.md index c5c350e..58192d1 100644 --- a/database/mongodb/README.md +++ b/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 | diff --git a/database/mongodb/modules.tf b/database/mongodb/modules.tf index 996ac6e..65fdce3 100644 --- a/database/mongodb/modules.tf +++ b/database/mongodb/modules.tf @@ -1,20 +1,20 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "mongodb" - 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}" + environment = "${var.environment}" + resource = "mongodb" + 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-secondary" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "mongodb" - 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 = ["replset_state:secondary"] + environment = "${var.environment}" + resource = "mongodb" + 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 = ["replset_state:secondary"] } diff --git a/database/mysql/README.md b/database/mysql/README.md index 9940049..725ceb0 100644 --- a/database/mysql/README.md +++ b/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 | diff --git a/database/mysql/modules.tf b/database/mysql/modules.tf index 25ecbcd..90ef22e 100644 --- a/database/mysql/modules.tf +++ b/database/mysql/modules.tf @@ -1,9 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "mysql" - 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}" + environment = "${var.environment}" + resource = "mysql" + 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/postgresql/README.md b/database/postgresql/README.md index 322e910..17aa903 100644 --- a/database/postgresql/README.md +++ b/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 | diff --git a/database/postgresql/modules.tf b/database/postgresql/modules.tf index 922f435..b18547d 100644 --- a/database/postgresql/modules.tf +++ b/database/postgresql/modules.tf @@ -1,9 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "postgres" - 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}" + environment = "${var.environment}" + resource = "postgres" + 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/redis/README.md b/database/redis/README.md index 973e507..26b05ab 100644 --- a/database/redis/README.md +++ b/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 | diff --git a/database/redis/modules.tf b/database/redis/modules.tf index ce028e3..5223605 100644 --- a/database/redis/modules.tf +++ b/database/redis/modules.tf @@ -1,9 +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}" -filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + 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/middleware/apache/README.md b/middleware/apache/README.md index 50c8794..188c0f9 100644 --- a/middleware/apache/README.md +++ b/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 | diff --git a/middleware/apache/modules.tf b/middleware/apache/modules.tf index 511f90a..7411bb4 100644 --- a/middleware/apache/modules.tf +++ b/middleware/apache/modules.tf @@ -1,9 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "apache" - 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}" + environment = "${var.environment}" + resource = "apache" + 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/middleware/nginx/README.md b/middleware/nginx/README.md index 3e14dfc..d526c30 100644 --- a/middleware/nginx/README.md +++ b/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 | diff --git a/middleware/nginx/modules.tf b/middleware/nginx/modules.tf index 417d3b0..3ecf833 100644 --- a/middleware/nginx/modules.tf +++ b/middleware/nginx/modules.tf @@ -1,9 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "nginx" - 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}" + environment = "${var.environment}" + resource = "nginx" + 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/middleware/php-fpm/README.md b/middleware/php-fpm/README.md index bfe0109..e8c53f3 100644 --- a/middleware/php-fpm/README.md +++ b/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 | diff --git a/middleware/php-fpm/modules.tf b/middleware/php-fpm/modules.tf index 0c9b506..3f2f324 100644 --- a/middleware/php-fpm/modules.tf +++ b/middleware/php-fpm/modules.tf @@ -1,9 +1,9 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "php-fpm" - 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}" + environment = "${var.environment}" + resource = "php-fpm" + 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/system/generic/README.md b/system/generic/README.md index d4a2914..f469d5b 100644 --- a/system/generic/README.md +++ b/system/generic/README.md @@ -46,6 +46,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 | | free_disk_inodes_enabled | Flag to enable Free disk inodes monitor | string | `true` | no | | free_disk_inodes_extra_tags | Extra tags for Free disk inodes monitor | list | `[]` | no | diff --git a/system/generic/modules.tf b/system/generic/modules.tf index 5300f5b..fe7a5d1 100644 --- a/system/generic/modules.tf +++ b/system/generic/modules.tf @@ -1,20 +1,20 @@ module "filter-tags" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "system" - 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}" + environment = "${var.environment}" + resource = "system" + 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-disk" { source = "../../common/filter-tags" - environment = "${var.environment}" - resource = "system" - 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 = ["dd_disk:enabled"] + environment = "${var.environment}" + resource = "system" + 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 = ["dd_disk:enabled"] } diff --git a/system/unreachable/README.md b/system/unreachable/README.md index 1ab3aa6..c06f8c9 100644 --- a/system/unreachable/README.md +++ b/system/unreachable/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 | `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 | diff --git a/system/unreachable/inputs.tf b/system/unreachable/inputs.tf index a86ce64..fc5aae1 100644 --- a/system/unreachable/inputs.tf +++ b/system/unreachable/inputs.tf @@ -34,16 +34,6 @@ variable "filter_tags_custom_excluded" { default = "" } -variable "filter_tags_custom_excluded" { - description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" - default = "" -} - -variable "filter_tags_custom_excluded" { - description = "Tags excluded for custom filtering when filter_tags_use_defaults is false" - default = "" -} - # Unreachable variable "unreachable_silenced" { diff --git a/system/unreachable/modules.tf b/system/unreachable/modules.tf index 6bf4179..3c8f2f2 100644 --- a/system/unreachable/modules.tf +++ b/system/unreachable/modules.tf @@ -5,5 +5,5 @@ module "filter-tags" { resource = "system" 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}" + filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" }