From 5aa679b6ce052bf7039c6d687a80490d9fb5c990 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Apr 2018 15:39:11 +0200
Subject: [PATCH] MON-168 fix service checks query syntax

---
 middleware/apache/monitors-apache.tf | 12 +-----------
 middleware/nginx/monitors-nginx.tf   | 12 +-----------
 middleware/php-fpm/monitors-fpm.tf   |  4 +---
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index 445a6b2..d63bea3 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -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" {
   name    = "[${var.environment}] Can't connect to apache vhost status"
   message = "${coalesce(var.apache_connect_message, var.message)}"
 
   type = "service check"
 
-  query = <<EOF
-    "apache.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
-  EOF
+  query = "\"apache.can_connect\".over(\"dd_apache:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
 
   thresholds = {
     ok       = 1
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 033bd87..9818373 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -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" {
   name    = "[${var.environment}] Can't connect to nginx vhost status"
   message = "${coalesce(var.nginx_connect_message, var.message)}"
 
   type = "service check"
 
-  query = <<EOF
-    "nginx.can_connect".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
-  EOF
+  query = "\"nginx.can_connect\".over(\"dd_nginx:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
 
   thresholds = {
     ok       = 1
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 558bd7f..c34e018 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -46,9 +46,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
 
   type = "service check"
 
-  query = <<EOF
-    "php_fpm.can_ping".over(${data.template_file.filter.rendered}).by("host","port").last(6).count_by_status()
-  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()"
 
   thresholds = {
     ok       = 1