Merged in MON-66_fmt (pull request #6)

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

Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Laurent Piroelle <laurent.piroelle@fr.clara.net>
Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
This commit is contained in:
Jérôme Respaut 2017-11-06 09:40:17 +00:00 committed by Quentin Manfroi
commit 3a1ba3323e
13 changed files with 96 additions and 103 deletions

View File

@ -122,5 +122,3 @@ resource "datadog_monitor" "ELB_backend_latency" {
tags = ["*"]
}

View File

@ -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 {region,name} > 90"
type = "query alert"
@ -38,7 +34,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 {region,name} / avg:aws.rds.total_storage_space{dd_monitoring:enabled,dd_aws_rds:enabled,env:${var.env}} by {region,name} * 100 < 10"
count = "${var.dd_aws_rds == "enabled" ? 1 : 0 }"
thresholds {
warning = "${var.rds_mem_threshold["warning"]}"
critical = "${var.rds_mem_threshold["critical"]}"
@ -56,6 +51,4 @@ resource "datadog_monitor" "mysql_rds_free_space_low" {
require_full_window = true
new_host_delay = "${var.rds_config["delay"]}"
no_data_timeframe = 20
}

View File

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

View File

@ -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
}

View File

@ -4,20 +4,23 @@ 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"
}
@ -37,20 +40,25 @@ variable "cpu_15_critical" {
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
@ -58,30 +66,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
@ -93,6 +105,7 @@ variable "elb_backend_latency" {
variable "dd_nginx" {
default = "disabled"
}
variable "dd_php_fpm" {
default = "disabled"
}
@ -100,15 +113,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

View File

@ -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 }"

View File

@ -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 }"

View File

@ -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} / ( avg:php_fpm.processes.idle{dd_monitoring:enabled,dd_php_fpm:enabled,env:${var.env}} by {host,region} + avg:php_fpm.processes.active{dd_monitoring:enabled,dd_php_fpm:enabled,env:${var.env}} by {host,region} ) > 0.9"
count = "${var.dd_php_fpm == "enabled" ? 1 : 0 }"
@ -27,12 +26,10 @@ resource "datadog_monitor" "php-fpm_process_idle" {
tags = ["*"]
}
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 }"

View File

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

View File

@ -164,7 +164,6 @@ 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"]}"
# evaluation_delay = "${var.linux_basics_config["delay"]}"
# new_host_delay = "${var.linux_basics_config["delay"]}"
@ -177,7 +176,6 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_10" {
# no_data_timeframe = 20
# }
resource "datadog_monitor" "datadog_free_memory" {
name = "[${var.env}] Free memory < 5% on {{host.name}}"
message = "Debugging alert - no escalation"
@ -208,10 +206,12 @@ 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"]}"
# new_host_delay = "${var.linux_basics_config["delay"]}"
@ -223,3 +223,4 @@ resource "datadog_monitor" "datadog_free_memory" {
# require_full_window = true
# no_data_timeframe = 20
# }

View File

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

View File

@ -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"
}

View File

@ -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}"
}