From 63e6fe59dd4dd55004ccf4c817b10de4162e9bab Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Tue, 2 Oct 2018 15:52:57 +0200 Subject: [PATCH] MON-301 add excluded tags variable assignation for all modules.tf --- caas/kubernetes/ark/modules.tf | 1 + caas/kubernetes/ingress/modules.tf | 3 +++ cloud/aws/alb/modules.tf | 1 + cloud/aws/elasticache/common/modules.tf | 1 + cloud/aws/elasticache/memcached/modules.tf | 1 + cloud/aws/elasticache/redis/modules.tf | 1 + cloud/aws/elasticsearch/modules.tf | 1 + cloud/aws/elb/modules.tf | 1 + cloud/aws/kinesis-firehose/modules.tf | 1 + cloud/aws/rds/aurora/mysql/modules.tf | 1 + cloud/aws/rds/aurora/postgresql/modules.tf | 1 + cloud/aws/rds/common/modules.tf | 1 + cloud/azure/apimanagement/modules.tf | 1 + cloud/azure/app-services/modules.tf | 1 + cloud/azure/cosmosdb/modules.tf | 2 ++ cloud/azure/datalakestore/modules.tf | 1 + cloud/azure/eventhub/modules.tf | 1 + cloud/azure/keyvault/modules.tf | 2 ++ cloud/azure/redis/modules.tf | 1 + cloud/azure/servicebus/modules.tf | 1 + cloud/azure/sql-database/modules.tf | 1 + cloud/azure/storage/modules.tf | 1 + cloud/azure/stream-analytics/modules.tf | 1 + database/elasticsearch/modules.tf | 1 + database/mongodb/modules.tf | 2 ++ database/mysql/modules.tf | 1 + database/postgresql/modules.tf | 1 + database/redis/modules.tf | 1 + middleware/apache/modules.tf | 1 + middleware/nginx/modules.tf | 1 + middleware/php-fpm/modules.tf | 1 + system/generic/modules.tf | 2 ++ system/unreachable/modules.tf | 2 +- 33 files changed, 39 insertions(+), 1 deletion(-) diff --git a/caas/kubernetes/ark/modules.tf b/caas/kubernetes/ark/modules.tf index 7908587..cd76216 100644 --- a/caas/kubernetes/ark/modules.tf +++ b/caas/kubernetes/ark/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/caas/kubernetes/ingress/modules.tf index ee1e148..c0019f7 100644 --- a/caas/kubernetes/ingress/modules.tf +++ b/caas/kubernetes/ingress/modules.tf @@ -5,6 +5,7 @@ module "filter-tags" { 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"] } @@ -15,6 +16,7 @@ module "filter-tags-5xx" { 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"] } @@ -25,5 +27,6 @@ module "filter-tags-4xx" { 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/modules.tf b/cloud/aws/alb/modules.tf index 1aae9bf..66e0a6b 100644 --- a/cloud/aws/alb/modules.tf +++ b/cloud/aws/alb/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/elasticache/common/modules.tf index 987c046..1b4b593 100644 --- a/cloud/aws/elasticache/common/modules.tf +++ b/cloud/aws/elasticache/common/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/elasticache/memcached/modules.tf index 987c046..1b4b593 100644 --- a/cloud/aws/elasticache/memcached/modules.tf +++ b/cloud/aws/elasticache/memcached/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/elasticache/redis/modules.tf index 987c046..1b4b593 100644 --- a/cloud/aws/elasticache/redis/modules.tf +++ b/cloud/aws/elasticache/redis/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/elasticsearch/modules.tf index 0abfe32..4f7376c 100644 --- a/cloud/aws/elasticsearch/modules.tf +++ b/cloud/aws/elasticsearch/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/elb/modules.tf index b64c814..69a64e2 100644 --- a/cloud/aws/elb/modules.tf +++ b/cloud/aws/elb/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/kinesis-firehose/modules.tf index b7b2e72..7e0ccc0 100644 --- a/cloud/aws/kinesis-firehose/modules.tf +++ b/cloud/aws/kinesis-firehose/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/rds/aurora/mysql/modules.tf index 9f52fb1..529d5e7 100644 --- a/cloud/aws/rds/aurora/mysql/modules.tf +++ b/cloud/aws/rds/aurora/mysql/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/rds/aurora/postgresql/modules.tf index 9f52fb1..529d5e7 100644 --- a/cloud/aws/rds/aurora/postgresql/modules.tf +++ b/cloud/aws/rds/aurora/postgresql/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/aws/rds/common/modules.tf index dcbe336..5f27612 100644 --- a/cloud/aws/rds/common/modules.tf +++ b/cloud/aws/rds/common/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/apimanagement/modules.tf index a8f0343..7b067ff 100644 --- a/cloud/azure/apimanagement/modules.tf +++ b/cloud/azure/apimanagement/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/app-services/modules.tf index 5c5af8f..5600128 100644 --- a/cloud/azure/app-services/modules.tf +++ b/cloud/azure/app-services/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/cosmosdb/modules.tf index 889e29a..06a8d02 100644 --- a/cloud/azure/cosmosdb/modules.tf +++ b/cloud/azure/cosmosdb/modules.tf @@ -5,6 +5,7 @@ module "filter-tags" { 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" { @@ -14,6 +15,7 @@ module "filter-tags-statuscode" { 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/modules.tf b/cloud/azure/datalakestore/modules.tf index 2a526b2..f264bf1 100644 --- a/cloud/azure/datalakestore/modules.tf +++ b/cloud/azure/datalakestore/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/eventhub/modules.tf index 8c588ef..fd2de1a 100644 --- a/cloud/azure/eventhub/modules.tf +++ b/cloud/azure/eventhub/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/keyvault/modules.tf index 0c21a6a..a0f45a7 100644 --- a/cloud/azure/keyvault/modules.tf +++ b/cloud/azure/keyvault/modules.tf @@ -5,6 +5,7 @@ module "filter-tags" { 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" { @@ -14,6 +15,7 @@ module "filter-tags-statuscode" { 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/modules.tf b/cloud/azure/redis/modules.tf index 3817b54..ffa7a9c 100644 --- a/cloud/azure/redis/modules.tf +++ b/cloud/azure/redis/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/servicebus/modules.tf index 80886a1..b174219 100644 --- a/cloud/azure/servicebus/modules.tf +++ b/cloud/azure/servicebus/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/sql-database/modules.tf index c5b2124..c336fe4 100644 --- a/cloud/azure/sql-database/modules.tf +++ b/cloud/azure/sql-database/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/storage/modules.tf index 68180cd..ec1f28a 100644 --- a/cloud/azure/storage/modules.tf +++ b/cloud/azure/storage/modules.tf @@ -5,5 +5,6 @@ module "filter-tags" { 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/modules.tf b/cloud/azure/stream-analytics/modules.tf index 549df4a..c5945cd 100644 --- a/cloud/azure/stream-analytics/modules.tf +++ b/cloud/azure/stream-analytics/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/database/elasticsearch/modules.tf index 9b9328e..d57ec49 100644 --- a/database/elasticsearch/modules.tf +++ b/database/elasticsearch/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/database/mongodb/modules.tf index 9412ed4..996ac6e 100644 --- a/database/mongodb/modules.tf +++ b/database/mongodb/modules.tf @@ -5,6 +5,7 @@ module "filter-tags" { 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" { @@ -14,5 +15,6 @@ module "filter-tags-secondary" { 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/modules.tf b/database/mysql/modules.tf index a494121..25ecbcd 100644 --- a/database/mysql/modules.tf +++ b/database/mysql/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/database/postgresql/modules.tf index 19fcbdb..922f435 100644 --- a/database/postgresql/modules.tf +++ b/database/postgresql/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/database/redis/modules.tf index 48011c6..ce028e3 100644 --- a/database/redis/modules.tf +++ b/database/redis/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/middleware/apache/modules.tf index 3f22051..511f90a 100644 --- a/middleware/apache/modules.tf +++ b/middleware/apache/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/middleware/nginx/modules.tf index 47d57dc..417d3b0 100644 --- a/middleware/nginx/modules.tf +++ b/middleware/nginx/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/middleware/php-fpm/modules.tf index efd313a..0c9b506 100644 --- a/middleware/php-fpm/modules.tf +++ b/middleware/php-fpm/modules.tf @@ -5,4 +5,5 @@ module "filter-tags" { 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/modules.tf b/system/generic/modules.tf index 0bc98e5..5300f5b 100644 --- a/system/generic/modules.tf +++ b/system/generic/modules.tf @@ -5,6 +5,7 @@ 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}" } module "filter-tags-disk" { @@ -14,5 +15,6 @@ module "filter-tags-disk" { 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/modules.tf b/system/unreachable/modules.tf index 3c8f2f2..6bf4179 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}" }