From 4f3816ddfda0bffd7b9950d3a2535a7451a1d13c Mon Sep 17 00:00:00 2001 From: Laurent Piroelle Date: Thu, 23 May 2019 14:38:42 +0200 Subject: [PATCH 1/2] MON-460 Fix Azure KeyVault monitors filter tags --- cloud/azure/keyvault/modules.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud/azure/keyvault/modules.tf b/cloud/azure/keyvault/modules.tf index 81f4ef8..6e6f876 100644 --- a/cloud/azure/keyvault/modules.tf +++ b/cloud/azure/keyvault/modules.tf @@ -14,10 +14,9 @@ module "filter-tags-statuscode" { environment = "${var.environment}" resource = "azure_keyvault" 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}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - - extra_tags = ["statuscode:%s"] + extra_tags = ["statuscode:%s"] } module "filter-tags-activity" { @@ -26,6 +25,7 @@ module "filter-tags-activity" { environment = "${var.environment}" resource = "azure_keyvault" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" - filter_tags_custom = "${var.filter_tags_custom},!activityname:secretlist" + filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" + extra_tags_excluded = ["activityname:secretlist"] } From 0801acc92494376fe81b88c4e1a0d9e3e5c8ecd5 Mon Sep 17 00:00:00 2001 From: Laurent Piroelle Date: Tue, 4 Jun 2019 17:49:56 +0200 Subject: [PATCH 2/2] MON-460 Fix Azure CosmosDB monitors filter tags --- cloud/azure/cosmosdb/modules.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud/azure/cosmosdb/modules.tf b/cloud/azure/cosmosdb/modules.tf index 8af90d2..8ad7f82 100644 --- a/cloud/azure/cosmosdb/modules.tf +++ b/cloud/azure/cosmosdb/modules.tf @@ -14,8 +14,7 @@ module "filter-tags-statuscode" { environment = "${var.environment}" resource = "azure_cosmosdb" 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}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - - extra_tags = ["statuscode:%s"] + extra_tags = ["statuscode:%s"] }