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 1/4] 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

From ff67290d15cbf92d12df61f449cbb1f6f3d24dbf Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Apr 2018 16:03:28 +0200
Subject: [PATCH 2/4] MON-168 update service checks queries with EOF way

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

diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index d63bea3..07969d5 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -4,7 +4,9 @@ resource "datadog_monitor" "datadog_apache_process" {
 
   type = "service check"
 
-  query = "\"apache.can_connect\".over(\"dd_apache:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
+  query = <<EOF
+    "apache.can_connect".over("dd_apache:enabled","dd_monitoring:enabled","env:${var.environment}").by("host","port").last(6).count_by_status()
+  EOF
 
   thresholds = {
     ok       = 1
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 9818373..ab55977 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -4,7 +4,9 @@ resource "datadog_monitor" "datadog_nginx_process" {
 
   type = "service check"
 
-  query = "\"nginx.can_connect\".over(\"dd_nginx:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
+  query = <<EOF
+    "nginx.can_connect".over("dd_nginx:enabled","dd_monitoring:enabled","env:${var.environment}").by("host","port").last(6).count_by_status()
+  EOF
 
   thresholds = {
     ok       = 1
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index c34e018..efed182 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -46,7 +46,9 @@ resource "datadog_monitor" "datadog_fpm_process" {
 
   type = "service check"
 
-  query = "\"php_fpm.can_ping\".over(\"dd_php_fpm:enabled\",\"dd_monitoring:enabled\",\"env:${var.environment}\").by(\"host\",\"port\").last(6).count_by_status()"
+  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()
+  EOF
 
   thresholds = {
     ok       = 1

From 34ec13c11ac6ab2ccbe3ac9c8dc9e06fde265c81 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Apr 2018 18:39:48 +0200
Subject: [PATCH 3/4] MON-168 fix delay variables for php-fpm

---
 middleware/php-fpm/monitors-fpm.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index efed182..ef44e3b 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -26,8 +26,8 @@ resource "datadog_monitor" "datadog_php_fpm_connect_idle" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay_metric}"
-  new_host_delay      = "${var.delay_metric}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
@@ -57,8 +57,8 @@ resource "datadog_monitor" "datadog_fpm_process" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay_service}"
-  new_host_delay      = "${var.delay_service}"
+  evaluation_delay    = "${var.delay}"
+  new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0

From 79e86ccabd5eca9a938487d8664a794b235197d6 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 11 Apr 2018 19:25:40 +0200
Subject: [PATCH 4/4] 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 = <<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
 
   thresholds = {
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index ab55977..395a97a 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -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" {
   name    = "[${var.environment}] Can't connect to nginx vhost status"
   message = "${coalesce(var.nginx_connect_message, var.message)}"
@@ -5,7 +13,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   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
 
   thresholds = {
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index ef44e3b..5c94645 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -47,7 +47,7 @@ resource "datadog_monitor" "datadog_fpm_process" {
   type = "service check"
 
   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
 
   thresholds = {