From 79e86ccabd5eca9a938487d8664a794b235197d6 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Wed, 11 Apr 2018 19:25:40 +0200 Subject: [PATCH] MON-168 support filter tags for service checks --- middleware/apache/monitors-apache.tf | 10 +++++++++- middleware/nginx/monitors-nginx.tf | 10 +++++++++- middleware/php-fpm/monitors-fpm.tf | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf index 07969d5..30b78b1 100644 --- a/middleware/apache/monitors-apache.tf +++ b/middleware/apache/monitors-apache.tf @@ -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" { name = "[${var.environment}] Can't connect to apache vhost status" message = "${coalesce(var.apache_connect_message, var.message)}" @@ -5,7 +13,7 @@ resource "datadog_monitor" "datadog_apache_process" { type = "service check" query = <