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

MON-168 fix service checks query syntax

Browse Source
This commit is contained in:
Quentin Manfroi 2018-04-11 15:39:11 +02:00
parent 36d3e41114
commit 5aa679b6ce
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,10 @@
data "template_file" "filter" {
template = "$${filter}"
vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_apache:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
}
}
resource "datadog_monitor" "datadog_apache_process" { resource "datadog_monitor" "datadog_apache_process" {
name = "[${var.environment}] Can't connect to apache vhost status" name = "[${var.environment}] Can't connect to apache vhost status"
message = "${coalesce(var.apache_connect_message, var.message)}" message = "${coalesce(var.apache_connect_message, var.message)}"
type = "service check" type = "service check"
query = <<EOF query = "\"apache.can_connect\".over(\"dd_apache:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
"apache.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
EOF
thresholds = { thresholds = {
ok = 1 ok = 1

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

@ -1,20 +1,10 @@
data "template_file" "filter" {
template = "$${filter}"
vars {
filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_nginx:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
}
}
resource "datadog_monitor" "datadog_nginx_process" { resource "datadog_monitor" "datadog_nginx_process" {
name = "[${var.environment}] Can't connect to nginx vhost status" name = "[${var.environment}] Can't connect to nginx vhost status"
message = "${coalesce(var.nginx_connect_message, var.message)}" message = "${coalesce(var.nginx_connect_message, var.message)}"
type = "service check" type = "service check"
query = <<EOF query = "\"nginx.can_connect\".over(\"dd_nginx:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
"nginx.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
EOF
thresholds = { thresholds = {
ok = 1 ok = 1

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

@ -46,9 +46,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
type = "service check" type = "service check"
query = <<EOF query = "\"php_fpm.can_ping\".over(\"dd_php_fpm:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
"php_fpm.can_ping".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
EOF
thresholds = { thresholds = {
ok = 1 ok = 1