From f42f43a89416e4c64c4a0254af0b433336a9f759 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Fri, 24 Aug 2018 18:58:17 +0200 Subject: [PATCH] MON-293 fix for terraform validate --- cloud/aws/alb/modules.tf | 2 +- cloud/aws/elasticsearch/modules.tf | 2 +- cloud/aws/elb/modules.tf | 2 +- cloud/aws/kinesis-firehose/modules.tf | 2 +- cloud/aws/rds/modules.tf | 2 +- cloud/azure/apimanagement/modules.tf | 2 +- cloud/azure/app-services/modules.tf | 2 +- cloud/azure/eventhub/modules.tf | 2 +- cloud/azure/inputs.tf | 7 ++- cloud/azure/monitors.tf | 63 ++++++++++++++----------- cloud/azure/redis/modules.tf | 2 +- cloud/azure/servicebus/modules.tf | 2 +- cloud/azure/sql-database/modules.tf | 2 +- cloud/azure/storage/modules.tf | 2 +- cloud/azure/stream-analytics/modules.tf | 2 +- 15 files changed, 55 insertions(+), 41 deletions(-) diff --git a/cloud/aws/alb/modules.tf b/cloud/aws/alb/modules.tf index 4b2a21f..94be5f4 100644 --- a/cloud/aws/alb/modules.tf +++ b/cloud/aws/alb/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "alb" diff --git a/cloud/aws/elasticsearch/modules.tf b/cloud/aws/elasticsearch/modules.tf index 9b9328e..88ddb32 100644 --- a/cloud/aws/elasticsearch/modules.tf +++ b/cloud/aws/elasticsearch/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "elasticsearch" diff --git a/cloud/aws/elb/modules.tf b/cloud/aws/elb/modules.tf index d1063bc..017032e 100644 --- a/cloud/aws/elb/modules.tf +++ b/cloud/aws/elb/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "elb" diff --git a/cloud/aws/kinesis-firehose/modules.tf b/cloud/aws/kinesis-firehose/modules.tf index f9bedb9..c2d691d 100644 --- a/cloud/aws/kinesis-firehose/modules.tf +++ b/cloud/aws/kinesis-firehose/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "kinesis-firehose" diff --git a/cloud/aws/rds/modules.tf b/cloud/aws/rds/modules.tf index 0f449e0..1e7e2d4 100644 --- a/cloud/aws/rds/modules.tf +++ b/cloud/aws/rds/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "rds" diff --git a/cloud/azure/apimanagement/modules.tf b/cloud/azure/apimanagement/modules.tf index 065b75c..a8f0343 100644 --- a/cloud/azure/apimanagement/modules.tf +++ b/cloud/azure/apimanagement/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "apimanagement" diff --git a/cloud/azure/app-services/modules.tf b/cloud/azure/app-services/modules.tf index 00ba38c..5c5af8f 100644 --- a/cloud/azure/app-services/modules.tf +++ b/cloud/azure/app-services/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "app-services" diff --git a/cloud/azure/eventhub/modules.tf b/cloud/azure/eventhub/modules.tf index eba1d52..8c588ef 100644 --- a/cloud/azure/eventhub/modules.tf +++ b/cloud/azure/eventhub/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "eventhub" diff --git a/cloud/azure/inputs.tf b/cloud/azure/inputs.tf index 35acc9d..2a8be00 100644 --- a/cloud/azure/inputs.tf +++ b/cloud/azure/inputs.tf @@ -8,11 +8,16 @@ variable "message" { type = "string" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" default = 900 } +variable "new_host_delay" { + description = "Delay in seconds before begin to monitor" + default = 300 +} + variable "filter_tags_use_defaults" { description = "Use default filter tags convention" default = "true" diff --git a/cloud/azure/monitors.tf b/cloud/azure/monitors.tf index 09be0af..4f0733a 100644 --- a/cloud/azure/monitors.tf +++ b/cloud/azure/monitors.tf @@ -1,9 +1,10 @@ module "apimanagement" { source = "./apimanagement" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -37,9 +38,10 @@ module "apimanagement" { module "appservices" { source = "./app-services" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -76,9 +78,10 @@ module "appservices" { module "eventhub" { source = "./eventhub" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -102,9 +105,10 @@ module "eventhub" { module "iothub" { source = "./iothubs" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags = "${var.non_taggable_filter_tags}" @@ -179,9 +183,10 @@ module "iothub" { module "redis" { source = "./redis" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -213,9 +218,10 @@ module "redis" { module "servicebus" { source = "./servicebus" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -229,9 +235,10 @@ module "servicebus" { module "sqldatabase" { source = "./sql-database" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -263,9 +270,10 @@ module "sqldatabase" { module "storage" { source = "./storage" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" @@ -329,9 +337,10 @@ module "storage" { module "streamanalytics" { source = "./stream-analytics" - environment = "${var.environment}" - message = "${var.message}" - delay = "${var.delay}" + environment = "${var.environment}" + message = "${var.message}" + evaluation_delay = "${var.evaluation_delay}" + new_host_delay = "${var.new_host_delay}" filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" diff --git a/cloud/azure/redis/modules.tf b/cloud/azure/redis/modules.tf index 48011c6..3817b54 100644 --- a/cloud/azure/redis/modules.tf +++ b/cloud/azure/redis/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "redis" diff --git a/cloud/azure/servicebus/modules.tf b/cloud/azure/servicebus/modules.tf index 9b5776c..80886a1 100644 --- a/cloud/azure/servicebus/modules.tf +++ b/cloud/azure/servicebus/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "servicebus" diff --git a/cloud/azure/sql-database/modules.tf b/cloud/azure/sql-database/modules.tf index 6858ef1..c5b2124 100644 --- a/cloud/azure/sql-database/modules.tf +++ b/cloud/azure/sql-database/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "sql-database" diff --git a/cloud/azure/storage/modules.tf b/cloud/azure/storage/modules.tf index 40d2680..68180cd 100644 --- a/cloud/azure/storage/modules.tf +++ b/cloud/azure/storage/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "storage" diff --git a/cloud/azure/stream-analytics/modules.tf b/cloud/azure/stream-analytics/modules.tf index 1690b4a..549df4a 100644 --- a/cloud/azure/stream-analytics/modules.tf +++ b/cloud/azure/stream-analytics/modules.tf @@ -1,5 +1,5 @@ module "filter-tags" { - source = "../../common/filter-tags" + source = "../../../common/filter-tags" environment = "${var.environment}" resource = "stream-analytics"