MON-293 fix for terraform validate

This commit is contained in:
Quentin Manfroi 2018-08-24 18:58:17 +02:00
parent c81cb05668
commit f42f43a894
15 changed files with 55 additions and 41 deletions

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "alb" resource = "alb"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "elasticsearch" resource = "elasticsearch"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "elb" resource = "elb"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "kinesis-firehose" resource = "kinesis-firehose"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "rds" resource = "rds"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "apimanagement" resource = "apimanagement"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "app-services" resource = "app-services"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "eventhub" resource = "eventhub"

View File

@ -8,11 +8,16 @@ variable "message" {
type = "string" type = "string"
} }
variable "delay" { variable "evaluation_delay" {
description = "Delay in seconds for the metric evaluation" description = "Delay in seconds for the metric evaluation"
default = 900 default = 900
} }
variable "new_host_delay" {
description = "Delay in seconds before begin to monitor"
default = 300
}
variable "filter_tags_use_defaults" { variable "filter_tags_use_defaults" {
description = "Use default filter tags convention" description = "Use default filter tags convention"
default = "true" default = "true"

View File

@ -3,7 +3,8 @@ module "apimanagement" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -39,7 +40,8 @@ module "appservices" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -78,7 +80,8 @@ module "eventhub" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -104,7 +107,8 @@ module "iothub" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
filter_tags = "${var.non_taggable_filter_tags}" filter_tags = "${var.non_taggable_filter_tags}"
@ -181,7 +185,8 @@ module "redis" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -215,7 +220,8 @@ module "servicebus" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -231,7 +237,8 @@ module "sqldatabase" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -265,7 +272,8 @@ module "storage" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"
@ -331,7 +339,8 @@ module "streamanalytics" {
environment = "${var.environment}" environment = "${var.environment}"
message = "${var.message}" message = "${var.message}"
delay = "${var.delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.new_host_delay}"
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}" filter_tags_custom = "${var.filter_tags_custom}"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "redis" resource = "redis"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "servicebus" resource = "servicebus"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "sql-database" resource = "sql-database"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "storage" resource = "storage"

View File

@ -1,5 +1,5 @@
module "filter-tags" { module "filter-tags" {
source = "../../common/filter-tags" source = "../../../common/filter-tags"
environment = "${var.environment}" environment = "${var.environment}"
resource = "stream-analytics" resource = "stream-analytics"