MON-168 support filter tags for service checks

This commit is contained in:
Quentin Manfroi 2018-04-11 19:25:40 +02:00
parent 34ec13c11a
commit 79e86ccabd
3 changed files with 19 additions and 3 deletions

View File

@ -1,3 +1,11 @@
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)}"
@ -5,7 +13,7 @@ resource "datadog_monitor" "datadog_apache_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"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 EOF
thresholds = { thresholds = {

View File

@ -1,3 +1,11 @@
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)}"
@ -5,7 +13,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"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 EOF
thresholds = { thresholds = {

View File

@ -47,7 +47,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
type = "service check" type = "service check"
query = <<EOF query = <<EOF
"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 EOF
thresholds = { thresholds = {