MON-66: Terraform HCL re-format (fmt)

cloud/aws/elb/monitors-elb.tf

@@ -112,5 +112,3 @@ resource "datadog_monitor" "ELB_backend_latency" {
   new_host_delay      = "${var.elb_config["delay"]}"
   no_data_timeframe   = 20
 }
-
-

cloud/aws/rds-mysql/monitors-rds_mysql-basics.tf

@@ -1,13 +1,9 @@
-
-
-
 resource "datadog_monitor" "rds-mysql_cpu_80_15min" {
   name    = "[${var.env}] rds Cpu high > 90% for 15 min on {{host.identifier}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
 
   count = "${var.dd_aws_rds == "enabled" ? 1 : 0 }"
 
-
   query = "avg(last_15m):avg:aws.rds.cpuutilization{dd_monitoring:enabled,dd_aws_rds:enabled,env:${var.env}} by {name,region} > 90"
   type  = "query alert"
 
@@ -36,7 +32,6 @@ resource "datadog_monitor" "mysql_rds_free_space_low" {
   query = "avg(last_15m): avg:aws.rds.free_storage_space{dd_monitoring:enabled,dd_aws_rds:enabled,env:${var.env}} by {name,region} /  avg:aws.rds.total_storage_space{dd_monitoring:enabled,dd_rds-mysql_basics:enabled,env:${var.env},!dd_custom_rds-mysql:enabled} by {identifier,region}  * 100 < 10"
   count = "${var.dd_aws_rds == "enabled" ? 1 : 0 }"
 
-
   thresholds {
     warning  = "${var.rds_mem_threshold["warning"]}"
     critical = "${var.rds_mem_threshold["critical"]}"
@@ -52,6 +47,4 @@ resource "datadog_monitor" "mysql_rds_free_space_low" {
   require_full_window = true
   new_host_delay      = "${var.rds_config["delay"]}"
   no_data_timeframe   = 20
-
-
 }

incubator/monitors-cassandra.tf

@@ -36,3 +36,4 @@ renotify_interval   = 0
 no_data_timeframe   = 20
 
 }*/
+

incubator/monitors-gcp-cloud-sql.tf

@@ -42,10 +42,10 @@ resource "datadog_monitor" "cloud_sql_disk_space" {
 }
 
 resource "datadog_monitor" "cloud_sql_connection_80" {
-name   = "Cloud SQL MySQL connection > 80% of max connections"
+  name    = "Cloud SQL MySQL connection > 80% of max connections"
-message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
+  message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
-query   = "avg(last_5m):avg:gcp.cloudsql.database.network.connections{*} > 3500"
+  query   = "avg(last_5m):avg:gcp.cloudsql.database.network.connections{*} > 3500"
-type  = "metric alert"
+  type    = "metric alert"
 
   notify_no_data      = false
   renotify_interval   = 60
@@ -61,10 +61,10 @@ type  = "metric alert"
 }
 
 resource "datadog_monitor" "cloud_sql_lag" {
-name   = "Cloud SQL MySQL lag > 45min"
+  name    = "Cloud SQL MySQL lag > 45min"
-message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
+  message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
-query   = "min(last_10m):avg:gcp.cloudsql.database.mysql.replication.seconds_behind_master{*} by {database_id} > 2700"
+  query   = "min(last_10m):avg:gcp.cloudsql.database.mysql.replication.seconds_behind_master{*} by {database_id} > 2700"
-type  = "metric alert"
+  type    = "metric alert"
 
   notify_no_data      = false
   renotify_interval   = 60
@@ -77,14 +77,13 @@ type  = "metric alert"
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }
 
 resource "datadog_monitor" "cloud_sql_replication" {
-name   = "Cloud SQL Failover not ready to replication"
+  name    = "Cloud SQL Failover not ready to replication"
-message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
+  message = "{{#is_alert}}\n${var.alert_HNO} \n{{/is_alert}} \n{{#is_recovery}}\n${var.alert_HNO}\n{{/is_recovery}}"
-query   = "max(last_5m):avg:gcp.cloudsql.database.mysql.replication.available_for_failover{*} <= 0"
+  query   = "max(last_5m):avg:gcp.cloudsql.database.mysql.replication.available_for_failover{*} <= 0"
-type  = "metric alert"
+  type    = "metric alert"
 
   notify_no_data      = false
   renotify_interval   = 60
@@ -97,5 +96,4 @@ type  = "metric alert"
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }

incubator/monitors-gcp-lb.tf

@@ -15,10 +15,8 @@ resource "datadog_monitor" "datadog_gcp_lb_request_count" {
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }
 
-
 resource "datadog_monitor" "datadog_gcp_lb_500" {
   name    = "GCP LoadBalancer 500 ratio > 5%"
   message = ""
@@ -36,10 +34,8 @@ resource "datadog_monitor" "datadog_gcp_lb_500" {
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }
 
-
 resource "datadog_monitor" "datadog_gcp_lb_backend_latency" {
   name    = "GCP LB backend latency > 2s"
   message = ""
@@ -57,10 +53,8 @@ resource "datadog_monitor" "datadog_gcp_lb_backend_latency" {
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }
 
-
 resource "datadog_monitor" "datadog_gcp_lb_latency" {
   name    = "GCP LB latency > 5s"
   message = ""
@@ -83,5 +77,4 @@ resource "datadog_monitor" "datadog_gcp_lb_latency" {
   notify_no_data      = false
   renotify_interval   = 0
   no_data_timeframe   = 20
-
 }

inputs.tf

@@ -4,44 +4,51 @@ variable "ho_escalation_group" {}
 variable env {}
 variable region {}
 
-
 ##linux
 variable "dd_linux_basics" {
   default = "disabled"
 }
+
 variable "linux_basics_config" {
   type = "map"
+
   default = {
     notify_no_data = false
     delay          = 900
   }
 }
+
 variable "dd_custom_cpu" {
   type = "map"
+
   default = {
     status = "disabled"
   }
 }
 
-
 ## RDS
 variable "dd_aws_rds" {
   default = "disabled"
 }
+
 variable "rds_config" {
   type = "map"
+
   default = {
     notify_no_data = false
     delay          = 900
   }
 }
+
 variable "rds_cpu_threshold" {
   type = "map"
+
   default = {
     warning  = 80
     critical = 90
   }
 }
+
 variable "rds_mem_threshold" {
   default = {
     warning  = 20
@@ -49,30 +56,34 @@ variable "rds_mem_threshold" {
   }
 }
 
-
 ## ELB
 variable "dd_aws_elb" {
   default = "disable"
 }
+
 variable "elb_config" {
   type = "map"
+
   default = {
     notify_no_data = false
     delay          = 900
   }
 }
+
 variable "elb_5xx_threshold" {
   default = {
     warning  = 5
     critical = 10
   }
 }
+
 variable "elb_4xx_threshold" {
   default = {
     warning  = 5
     critical = 10
   }
 }
+
 variable "elb_backend_latency" {
   default = {
     warning  = 1000
@@ -84,6 +95,7 @@ variable "elb_backend_latency" {
 variable "dd_nginx" {
   default = "disabled"
 }
+
 variable "dd_php_fpm" {
   default = "disabled"
 }
@@ -91,15 +103,19 @@ variable "dd_php_fpm" {
 variable "dd_apache" {
   default = "disabled"
 }
+
 variable "apache_nginx_fpm_config" {
   type = "map"
+
   default = {
     notify_no_data = false
     delay          = 900
   }
 }
+
 variable "php_fpm_busy_threshold" {
   type = "map"
+
   default = {
     warning  = 0.8
     critical = 0.9

middleware/apache/monitors-apache.tf

@@ -2,7 +2,6 @@ resource "datadog_monitor" "Apache_process" {
   name    = "[${var.env}] Nginx process is down on {{host.name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
 
-
   type  = "service check"
   query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_apache:enabled\",\"process:apache\",\"env:${var.env}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()"
   count = "${var.dd_apache == "enabled" ? 1 : 0 }"

middleware/nginx/monitors-nginx.tf

@@ -2,7 +2,6 @@ resource "datadog_monitor" "Nginx_process" {
   name    = "[${var.env}] Nginx process is down on {{host.name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
 
-
   type  = "service check"
   query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_nginx:enabled\",\"process:nginx\",\"env:${var.env}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()"
   count = "${var.dd_nginx == "enabled" ? 1 : 0 }"

middleware/php-fpm/monitors-fpm.tf

@@ -2,7 +2,6 @@ resource "datadog_monitor" "php-fpm_process_idle" {
   name    = "[${var.env}] php_fpm busy worker > 90% on {{host.name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
 
-
   type  = "query alert"
   query = "avg(last_10m):avg:php_fpm.processes.active{dd_monitoring:enabled,dd_php_fpm:enabled,env:${var.env}} by {host,region,app} / ( avg:php_fpm.processes.idle{dd_monitoring:enabled,dd_php_fpm:enabled,env:${var.env}} by {host,region,app} + avg:php_fpm.processes.active{dd_monitoring:enabled,dd_php_fpm:enabled,env:${var.env}} by {host,region,stack} ) > 0.90"
   count = "${var.dd_php_fpm == "enabled" ? 1 : 0 }"
@@ -25,12 +24,10 @@ resource "datadog_monitor" "php-fpm_process_idle" {
   no_data_timeframe   = 20
 }
 
-
 resource "datadog_monitor" "FPM_process" {
   name    = "[${var.env}] FPM process is down on {{host.name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}\n{{#is_warning}}\n${var.ho_escalation_group} \n{{/is_warning}} \n{{#is_warning_recovery}}\n${var.ho_escalation_group}\n{{/is_warning_recovery}}"
 
-
   type  = "service check"
   query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_php_fpm:enabled\",\"process:php_fpm\",\"env:${var.env}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()"
   count = "${var.dd_nginx == "enabled" ? 1 : 0 }"

system/generic/monitors-custom-cpu.tf

@@ -22,4 +22,3 @@ resource "datadog_monitor" "cpu_custom" {
   require_full_window = true
   no_data_timeframe   = 20
 }
-

system/linux/monitors-linux-basics.tf

@@ -136,20 +136,18 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_10" {
 #   type  = "query alert"
 #   count = "${var.dd_linux_basics == "enabled" ? 1 : 0}"
 
-
+# notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
-  # notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
+# evaluation_delay    = "${var.linux_basics_config["delay"]}"
-  # evaluation_delay    = "${var.linux_basics_config["delay"]}"
+# new_host_delay      = "${var.linux_basics_config["delay"]}"
-  # new_host_delay      = "${var.linux_basics_config["delay"]}"
+# renotify_interval   = 60
-  # renotify_interval   = 60
+# notify_audit        = false
-  # notify_audit        = false
+# timeout_h           = 0
-  # timeout_h           = 0
+# include_tags        = true
-  # include_tags        = true
+# locked              = false
-  # locked              = false
+# require_full_window = true
-  # require_full_window = true
+# no_data_timeframe   = 20
-  # no_data_timeframe   = 20
 # }
 
-
 resource "datadog_monitor" "datadog_free_memory" {
   name    = "[${var.env}] Free memory < 5% on {{host.name}}"
   message = "Debugging alert - no escalation"
@@ -174,18 +172,21 @@ resource "datadog_monitor" "datadog_free_memory" {
 #   name    = "Host unreachable"
 #   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group} \n{{/is_recovery}}"
 
+
 #   query = "datadog.agent.up.over(dd_monitoring:enabled,dd_linux_basics:enabled,env:${var.env},!dd_custom_cpu:enabled).last(1).count_by_status()"
 #   type  = "service check"
 #   count = "${var.dd_linux_basics == "enabled" ? 1 : 0}"
 
-  # notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
+
-  # evaluation_delay    = "${var.linux_basics_config["delay"]}"
+# notify_no_data      = "${var.linux_basics_config["notify_no_data"]}"
-  # new_host_delay      = "${var.linux_basics_config["delay"]}"
+# evaluation_delay    = "${var.linux_basics_config["delay"]}"
-  # renotify_interval   = 60
+# new_host_delay      = "${var.linux_basics_config["delay"]}"
-  # notify_audit        = false
+# renotify_interval   = 60
-  # timeout_h           = 0
+# notify_audit        = false
-  # include_tags        = true
+# timeout_h           = 0
-  # locked              = false
+# include_tags        = true
-  # require_full_window = true
+# locked              = false
-  # no_data_timeframe   = 20
+# require_full_window = true
+# no_data_timeframe   = 20
 # }
+

testing/dummy/dummy.tf

@@ -1,3 +1 @@
-
-
 resource "null_resource" "test-migration" {}

testing/inputs.tf

@@ -5,6 +5,7 @@ variable region {}
 variable "critical_escalation_group" {
   default = "@pagerduty_HODummy"
 }
+
 variable "warning_escalation_group" {
   default = "@pagerduty_HNODummy"
 }
@@ -19,4 +20,3 @@ variable "dd_linux_basics" {
 variable "dd_aws_rds" {
   default = "enabled"
 }
-

testing/modules.tf

@@ -7,8 +7,6 @@ module "datadog-monitors" {
   critical_escalation_group = "${var.critical_escalation_group}"
   warning_escalation_group  = "${var.warning_escalation_group}"
 
-
   dd_aws_rds      = "${var.dd_aws_rds}"
   dd_linux_basics = "${var.dd_linux_basics}"
-
 }