From 6f291a8e67937cb7b9b8a9251f6c39d950ad5567 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 25 Apr 2019 19:08:40 +0200 Subject: [PATCH] MON-441 update filter tags readme --- common/filter-tags/README.md | 4 +++- common/filter-tags/locals.tf | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/filter-tags/README.md b/common/filter-tags/README.md index f79e8c4..41fc271 100644 --- a/common/filter-tags/README.md +++ b/common/filter-tags/README.md @@ -29,7 +29,8 @@ Creates all kinds of filters tags patterns depending of the monitor type and dir | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| | environment | Architecture Environment | string | - | yes | -| extra_tags | Extra optional tags added for default filtering when filter_tags_use_defaults is true (i.e. ["tag1:val1", "tag2:val2"]) | list | `[]` | no | +| extra_tags | Extra optional tags added to include filtering in any case (i.e. [\"tag1:val1\", \"tag2:val2\"]) | list | `[]` | no | +| extra_tags_excluded | Extra optional tags added to exclude filtering in any case (i.e. [\"tag1:val1\", \"tag2:val2\"]) | list | `[]` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false (i.e. "tag1:val1,tag2:val2") | string | `*` | no | | filter_tags_custom_excluded | Tags excluded for custom filtering when filter_tags_use_defaults is false (i.e. "tag1:val1,tag2:val2") | string | `` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | @@ -46,4 +47,5 @@ Creates all kinds of filters tags patterns depending of the monitor type and dir ## Related documentation Datadog API type of monitor: [https://docs.datadoghq.com/api/?lang=python#create-a-monitor](https://docs.datadoghq.com/api/?lang=python#create-a-monitor) +Terraform guide: [https://www.terraform.io/docs/configuration-0-11/interpolation.html](https://www.terraform.io/docs/configuration-0-11/interpolation.html) diff --git a/common/filter-tags/locals.tf b/common/filter-tags/locals.tf index f8447ac..1a3d95e 100644 --- a/common/filter-tags/locals.tf +++ b/common/filter-tags/locals.tf @@ -1,7 +1,7 @@ locals { including_default_list = "${compact(concat(split(",", format("dd_monitoring:enabled,dd_%s:enabled,env:%s", var.resource, var.environment)), compact(var.extra_tags)))}" including_custom_list = "${compact(concat(split(",", var.filter_tags_custom), compact(var.extra_tags)))}" - excluding_list = "${compact(split(",", var.filter_tags_use_defaults == "true" ? join(",", compact(var.extra_tags_excluded)) : join(",", concat(split(",", var.filter_tags_custom_excluded), compact(var.extra_tags_excluded)))))}" + excluding_list = "${compact(split(",", var.filter_tags_use_defaults == "true" ? join(",", compact(var.extra_tags_excluded)) : join(",", concat(split(",", var.filter_tags_custom_excluded), compact(var.extra_tags_excluded)))))}" including_string = "${var.filter_tags_use_defaults == "true" ? join(",", local.including_default_list) : join(",", local.including_custom_list)}" excluding_string = "${join(",", local.excluding_list)}"