From e02cf797ab28bb3ce309889865bb6304634db23e Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 23 Nov 2017 12:21:58 +0100 Subject: [PATCH] MON-79 change default tag variable for more explicit name --- cloud/azure/storage/README.md | 4 ++-- cloud/azure/storage/inputs.tf | 4 ++-- cloud/azure/storage/monitors-azure-storage.tf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cloud/azure/storage/README.md b/cloud/azure/storage/README.md index 166a21c..0849152 100644 --- a/cloud/azure/storage/README.md +++ b/cloud/azure/storage/README.md @@ -35,8 +35,8 @@ Inputs | delay | Delay in seconds for the metric evaluation | string | `600` | no | | environment | Architecture environment | string | - | yes | | message | Message sent when a monitor is triggered | string | - | yes | -| filter_tags_default | Use default tagging convention | string | `true` | no | -| filter_tags_custom | Tags used for custom filtering when filter_tags_default is false | string | `*` | no | +| filter_tags_use_defaults | Use default tagging convention | string | `true` | no | +| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | availability_threshold_critical | Minimum threshold of availability | string | `90` | no | | successful_requests_threshold_critical | Minimum threshold of successful requests | string | `90` | no | | latency_threshold_critical | Maximum threshold of latency in ms | string | `1000` | no | diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf index 9b36cc9..5c512b5 100644 --- a/cloud/azure/storage/inputs.tf +++ b/cloud/azure/storage/inputs.tf @@ -14,13 +14,13 @@ variable "delay" { default = 600 } -variable "filter_tags_default" { +variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" } variable "filter_tags_custom" { - description = "Tags used for custom filtering when filter_tags_default is false" + description = "Tags used for custom filtering when filter_tags_use_defaults is false" default = "*" } diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf index 28a35ad..7466798 100644 --- a/cloud/azure/storage/monitors-azure-storage.tf +++ b/cloud/azure/storage/monitors-azure-storage.tf @@ -2,7 +2,7 @@ data "template_file" "filter" { template = "$${filter}" vars { - filter = "${var.filter_tags_default == "true" ? format("dd_monitoring:enabled,dd_azure_storage:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}" + filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_azure_storage:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}" } }