wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MON-460-azure-keyvault-filter-fix' into 'master'

Browse Source 
MON-460 Fix Azure KeyVault & CosmosDB monitors filter tags

Closes MON-460

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!62
This commit is contained in:
Quentin Manfroi 2019-06-11 18:22:20 +02:00
commit 4ffe84c21c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud/azure/cosmosdb/modules.tf
View File

@ -14,8 +14,7 @@ module "filter-tags-statuscode" {
environment = "${var.environment}" environment = "${var.environment}"
resource = "azure_cosmosdb" resource = "azure_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}"
filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
extra_tags = ["statuscode:%s"] extra_tags = ["statuscode:%s"]
} }

6
cloud/azure/keyvault/modules.tf
View File

@ -14,9 +14,8 @@ module "filter-tags-statuscode" {
environment = "${var.environment}" environment = "${var.environment}"
resource = "azure_keyvault" resource = "azure_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},statuscode:%s" 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}"
extra_tags = ["statuscode:%s"] extra_tags = ["statuscode:%s"]
} }
@ -26,6 +25,7 @@ module "filter-tags-activity" {
environment = "${var.environment}" environment = "${var.environment}"
resource = "azure_keyvault" resource = "azure_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},!activityname:secretlist" 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}"
extra_tags_excluded = ["activityname:secretlist"]
} }