From 47bf31bc3ffaaa7082fbdeabdf484d11114240b1 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 16 Aug 2018 10:54:12 +0200
Subject: [PATCH] MON-287 update service check monitors configuration

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

diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index 72bd853..e884448 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -5,17 +5,15 @@ resource "datadog_monitor" "datadog_apache_process" {
   type = "service check"
 
   query = <<EOF
-    "apache.can_connect".over${module.filter-tags.service_check}.by("host","port").last(6).count_by_status()
+    "apache.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
   EOF
 
   thresholds = {
-    ok       = 1
-    warning  = 2
-    critical = 4
+    warning  = 0
+    critical = 1.1754943508222875e-38
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
   new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index fe7e6ba..0861736 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -5,17 +5,15 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   query = <<EOF
-    "nginx.can_connect".over${module.filter-tags.service_check}.by("host","port").last(6).count_by_status()
+    "nginx.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
   EOF
 
   thresholds = {
-    ok       = 1
-    warning  = 2
-    critical = 4
+    warning  = 0
+    critical = 1.1754943508222875e-38
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
   new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index fa40c32..1f57178 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -44,11 +44,10 @@ resource "datadog_monitor" "datadog_fpm_process" {
   thresholds = {
     ok       = 1
     warning  = 2
-    critical = 4
+    critical = 5
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
   new_host_delay      = "${var.delay}"
   renotify_interval   = 0
   notify_audit        = false