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

Merged in MON-293_add_validate_to_pipeline (pull request #138)

Browse Source 
MON-293 add terraform validate to pipeline

Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Laurent Piroelle <laurent.piroelle@fr.clara.net>
Approved-by: Patrick Decat <patrick.decat@fr.clara.net>
This commit is contained in:
Quentin Manfroi 2018-08-27 11:48:50 +00:00
commit 9fbd4efdf1
16 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud/aws/alb/modules.tf
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"

2
cloud/aws/elasticsearch/modules.tf
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"

2
cloud/aws/elb/modules.tf
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"

2
cloud/aws/kinesis-firehose/modules.tf
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"

2
cloud/aws/rds/modules.tf
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"

2
cloud/azure/apimanagement/modules.tf
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"

2
cloud/azure/app-services/modules.tf
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"

2
cloud/azure/eventhub/modules.tf
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"

7
cloud/azure/inputs.tf
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"

27
cloud/azure/monitors.tf
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}"

2
cloud/azure/redis/modules.tf
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"

2
cloud/azure/servicebus/modules.tf
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"

2
cloud/azure/sql-database/modules.tf
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"

2
cloud/azure/storage/modules.tf
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"

2
cloud/azure/stream-analytics/modules.tf
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"

6
scripts/99_terraform.sh
View File

@ -4,4 +4,10 @@ set -xueo pipefail
source "$(dirname $0)/utils.sh" source "$(dirname $0)/utils.sh"
goto_root goto_root
for path in $(find "$(get_scope $1)" -path ./testing -prune -o -path ./incubator -prune -o -name 'inputs.tf' -print); do
dir=$(dirname ${path})
terraform init ${dir}
terraform validate --check-variables=false ${dir}
done
terraform fmt terraform fmt