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

MON-96 - Updated all monitors to follow recommendations

Browse Source
This commit is contained in:
Alexandre Gaillet 2018-02-22 12:13:05 +01:00
parent dd729b90e5
commit 8bf6f41543
11 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud/aws/elasticsearch/monitors-elasticsearch.tf
View File

@ -33,7 +33,7 @@ EOF
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
locked = false locked = false
require_full_window = true require_full_window = false
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
no_data_timeframe = 20 no_data_timeframe = 20
@ -66,7 +66,7 @@ EOF
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
locked = false locked = false
require_full_window = true require_full_window = false
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
no_data_timeframe = 20 no_data_timeframe = 20

4
cloud/aws/rds/monitors-rds.tf
View File

@ -30,7 +30,7 @@ EOF
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
locked = false locked = false
require_full_window = true require_full_window = false
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
no_data_timeframe = 20 no_data_timeframe = 20
@ -62,7 +62,7 @@ EOF
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
locked = false locked = false
require_full_window = true require_full_window = false
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
no_data_timeframe = 20 no_data_timeframe = 20

1
middleware/apache/README.md
View File

@ -24,7 +24,6 @@ Inputs
| Name | Description | Type | Default | Required | | Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:| |------|-------------|:----:|:-----:|:-----:|
| dd_apache | | string | `disabled` | no |
| environment | Architecture Environment | string | - | yes | | environment | Architecture Environment | string | - | yes |
| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no |
| message | Message sent when an alert is triggered | string | - | yes | | message | Message sent when an alert is triggered | string | - | yes |

4
middleware/apache/inputs.tf
View File

@ -15,7 +15,3 @@ variable "message" {
} }
# Apache Middleware specific # Apache Middleware specific
variable "dd_apache" {
default = "disabled"
}

8
middleware/apache/monitors-apache.tf
View File

@ -3,7 +3,7 @@ resource "datadog_monitor" "Apache_process" {
message = "${var.message}" message = "${var.message}"
type = "service check" type = "service check"
query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_apache:enabled\",\"process:apache\",\"env:${var.environment}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()" query = "\"apache.can_connect\".over(\"dd_monitoring:enabled\",\"dd_apache:enabled\",\"process:apache\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
thresholds = { thresholds = {
ok = 1 ok = 1
@ -11,10 +11,10 @@ resource "datadog_monitor" "Apache_process" {
critical = 4 critical = 4
} }
notify_no_data = false notify_no_data = true
evaluation_delay = "${var.evaluation_delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
renotify_interval = 60 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
@ -22,5 +22,5 @@ resource "datadog_monitor" "Apache_process" {
require_full_window = true require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
tags = ["env:${var.environment}", "type:apache"] tags = ["env:${var.environment}", "type:resource"]
} }

1
middleware/nginx/README.md
View File

@ -24,7 +24,6 @@ Inputs
| Name | Description | Type | Default | Required | | Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:| |------|-------------|:----:|:-----:|:-----:|
| dd_nginx | | string | `disabled` | no |
| environment | Architecture Environment | string | - | yes | | environment | Architecture Environment | string | - | yes |
| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no |
| message | Message sent when an alert is triggered | string | - | yes | | message | Message sent when an alert is triggered | string | - | yes |

4
middleware/nginx/inputs.tf
View File

@ -15,7 +15,3 @@ variable "message" {
} }
# Nginx Middleware specific # Nginx Middleware specific
variable "dd_nginx" {
default = "disabled"
}

8
middleware/nginx/monitors-nginx.tf
View File

@ -3,7 +3,7 @@ resource "datadog_monitor" "Nginx_process" {
message = "${var.message}" message = "${var.message}"
type = "service check" type = "service check"
query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_nginx:enabled\",\"process:nginx\",\"env:${var.environment}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()" query = "\"nginx.can_connect\".over(\"dd_monitoring:enabled\",\"dd_nginx:enabled\",\"process:nginx\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
thresholds = { thresholds = {
ok = 1 ok = 1
@ -11,10 +11,10 @@ resource "datadog_monitor" "Nginx_process" {
critical = 4 critical = 4
} }
notify_no_data = false notify_no_data = true
evaluation_delay = "${var.evaluation_delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
renotify_interval = 60 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
@ -22,5 +22,5 @@ resource "datadog_monitor" "Nginx_process" {
require_full_window = true require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
tags = ["env:${var.environment}", "type:nginx"] tags = ["env:${var.environment}", "type:resource"]
} }

12
middleware/php-fpm/monitors-fpm.tf
View File

@ -2,7 +2,7 @@ data "template_file" "filter" {
template = "$${filter}" template = "$${filter}"
vars { vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_rds:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}" filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_php_fpm:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
} }
} }
@ -25,7 +25,7 @@ resource "datadog_monitor" "php-fpm_process_idle" {
critical = "${var.php_fpm_busy_threshold_critical}" critical = "${var.php_fpm_busy_threshold_critical}"
} }
notify_no_data = false notify_no_data = true
evaluation_delay = "${var.evaluation_delay_metric}" evaluation_delay = "${var.evaluation_delay_metric}"
new_host_delay = "${var.evaluation_delay_metric}" new_host_delay = "${var.evaluation_delay_metric}"
notify_audit = false notify_audit = false
@ -35,7 +35,7 @@ resource "datadog_monitor" "php-fpm_process_idle" {
require_full_window = true require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
tags = ["env:${var.environment}", "type:php-fpm"] tags = ["env:${var.environment}", "type:resource"]
} }
resource "datadog_monitor" "FPM_process" { resource "datadog_monitor" "FPM_process" {
@ -43,7 +43,7 @@ resource "datadog_monitor" "FPM_process" {
message = "${var.message}" message = "${var.message}"
type = "service check" type = "service check"
query = "\"process.up\".over(\"dd_monitoring:enabled\",\"dd_php_fpm:enabled\",\"process:php_fpm\",\"env:${var.environment}\").by(\"host\",\"process\", \"app\").last(4).count_by_status()" query = "\"php_fpm.can_ping\".over(\"dd_monitoring:enabled\",\"dd_php_fpm:enabled\",\"process:php_fpm\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
thresholds = { thresholds = {
ok = 1 ok = 1
@ -54,7 +54,7 @@ resource "datadog_monitor" "FPM_process" {
notify_no_data = true notify_no_data = true
evaluation_delay = "${var.evaluation_delay_service}" evaluation_delay = "${var.evaluation_delay_service}"
new_host_delay = "${var.evaluation_delay_service}" new_host_delay = "${var.evaluation_delay_service}"
renotify_interval = 60 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
@ -62,5 +62,5 @@ resource "datadog_monitor" "FPM_process" {
require_full_window = true require_full_window = true
no_data_timeframe = 20 no_data_timeframe = 20
tags = ["env:${var.environment}", "type:php-fpm"] tags = ["env:${var.environment}", "type:resource"]
} }

8
system/generic/monitors-custom-cpu.tf
View File

@ -2,7 +2,7 @@ data "template_file" "filter" {
template = "$${filter}" template = "$${filter}"
vars { vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_rds:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}" filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_system:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
} }
} }
@ -12,8 +12,8 @@ resource "datadog_monitor" "cpu_custom" {
query = <<EOF query = <<EOF
min(${var.custom_cpu_period}): ( min(${var.custom_cpu_period}): (
avg:system.cpu.system{${data.template_file.filter.rendered}} by {region,host} + avg:system.cpu.system{${data.template_file.filter.rendered}} by {region,host.name,host.ip} +
avg:system.cpu.user{${data.template_file.filter.rendered}} by {region,host} avg:system.cpu.user{${data.template_file.filter.rendered}} by {region,host.name,host.ip}
) > ${var.custom_cpu_threshold_critical}" ) > ${var.custom_cpu_threshold_critical}"
EOF EOF
@ -27,7 +27,7 @@ resource "datadog_monitor" "cpu_custom" {
notify_no_data = true notify_no_data = true
evaluation_delay = "${var.evaluation_delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
renotify_interval = 60 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true

4
system/linux/monitors-linux-basics.tf
View File

@ -2,7 +2,7 @@ data "template_file" "filter" {
template = "$${filter}" template = "$${filter}"
vars { vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_rds:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}" filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_aws_linux:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
} }
} }
@ -122,7 +122,7 @@ resource "datadog_monitor" "datadog_free_memory" {
notify_no_data = true notify_no_data = true
evaluation_delay = "${var.evaluation_delay}" evaluation_delay = "${var.evaluation_delay}"
new_host_delay = "${var.evaluation_delay}" new_host_delay = "${var.evaluation_delay}"
renotify_interval = 60 renotify_interval = 0
notify_audit = false notify_audit = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true