From 70894689a2b6b117f823948972f761fd40928959 Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Fri, 30 Aug 2019 12:26:20 +0100
Subject: [PATCH] MON-499 Service checks modified to use the standard structure
 and values.

---
 network/dns/README.md                      |  2 -
 network/dns/inputs.tf                      | 12 ------
 network/dns/monitors-dns.tf                |  4 +-
 network/http/ssl/README.md                 |  4 +-
 network/http/ssl/inputs.tf                 | 14 +------
 network/http/ssl/monitors-ssl.tf           |  4 +-
 network/http/webcheck/README.md            |  5 +--
 network/http/webcheck/inputs.tf            | 18 ---------
 network/http/webcheck/monitors-webcheck.tf |  5 +--
 network/tls/README.md                      | 11 +-----
 network/tls/inputs.tf                      | 44 +---------------------
 network/tls/monitors-tls.tf                | 13 +++----
 12 files changed, 18 insertions(+), 118 deletions(-)

diff --git a/network/dns/README.md b/network/dns/README.md
index e33a8bf..533d1de 100644
--- a/network/dns/README.md
+++ b/network/dns/README.md
@@ -24,10 +24,8 @@ Creates DataDog monitors with the following checks:
 |------|-------------|:----:|:-----:|:-----:|
 | cannot\_resolve\_enabled | Flag to enable DNS cannot resolve monitor | string | `"true"` | no |
 | cannot\_resolve\_extra\_tags | Extra tags for DNS cannot resolve monitor | list(string) | `[]` | no |
-| cannot\_resolve\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | cannot\_resolve\_message | Custom message for DNS cannot resolve monitor | string | `""` | no |
 | cannot\_resolve\_no\_data\_timeframe | DNS cannot resolve monitor no data timeframe | string | `"10"` | no |
-| cannot\_resolve\_threshold\_critical | DNS cannot resolve monitor (warning threshold) | string | `"5"` | no |
 | cannot\_resolve\_threshold\_warning | DNS cannot resolve monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture Environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
diff --git a/network/dns/inputs.tf b/network/dns/inputs.tf
index dfd4a03..83e766f 100644
--- a/network/dns/inputs.tf
+++ b/network/dns/inputs.tf
@@ -54,24 +54,12 @@ variable "cannot_resolve_message" {
   default     = ""
 }
 
-variable "cannot_resolve_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "cannot_resolve_threshold_warning" {
   description = "DNS cannot resolve monitor (warning threshold)"
   type        = string
   default     = 3
 }
 
-variable "cannot_resolve_threshold_critical" {
-  description = "DNS cannot resolve monitor (warning threshold)"
-  type        = string
-  default     = 5
-}
-
 variable "cannot_resolve_no_data_timeframe" {
   description = "DNS cannot resolve monitor no data timeframe"
   type        = string
diff --git a/network/dns/monitors-dns.tf b/network/dns/monitors-dns.tf
index 48f1c8c..8aee37b 100644
--- a/network/dns/monitors-dns.tf
+++ b/network/dns/monitors-dns.tf
@@ -8,12 +8,12 @@ resource "datadog_monitor" "cannot_resolve" {
   type    = "service check"
 
   query = <<EOQ
-    "dns.can_resolve"${module.filter-tags.service_check}.by("nameserver","resolved_hostname").last(${var.cannot_resolve_last}).count_by_status()
+    "dns.can_resolve"${module.filter-tags.service_check}.by("nameserver","resolved_hostname").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.cannot_resolve_threshold_warning
-    critical = var.cannot_resolve_threshold_critical
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay
diff --git a/network/http/ssl/README.md b/network/http/ssl/README.md
index aaa2377..b95bd17 100644
--- a/network/http/ssl/README.md
+++ b/network/http/ssl/README.md
@@ -37,11 +37,9 @@ Creates DataDog monitors with the following checks:
 | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
 | invalid\_ssl\_certificate\_enabled | Flag to enable SSL invalid certificate monitor | string | `"true"` | no |
 | invalid\_ssl\_certificate\_extra\_tags | Extra tags for SSL invalid certificate monitor | list(string) | `[]` | no |
-| invalid\_ssl\_certificate\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | invalid\_ssl\_certificate\_message | Custom message for SSL invalid certificate monitor | string | `""` | no |
 | invalid\_ssl\_certificate\_no\_data\_timeframe | SSL invalid certificate monitor no data timeframe | string | `"10"` | no |
-| invalid\_ssl\_certificate\_threshold\_critical | SSL invalid certificate monitor (warning threshold) | string | `"5"` | no |
-| invalid\_ssl\_certificate\_threshold\_warning | SSL invalid certificate monitor (warning threshold) | string | `"5"` | no |
+| invalid\_ssl\_certificate\_threshold\_warning | SSL invalid certificate monitor (warning threshold) | string | `"3"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
diff --git a/network/http/ssl/inputs.tf b/network/http/ssl/inputs.tf
index 5bbbfcf..16ab71e 100644
--- a/network/http/ssl/inputs.tf
+++ b/network/http/ssl/inputs.tf
@@ -54,22 +54,10 @@ variable "invalid_ssl_certificate_message" {
   default     = ""
 }
 
-variable "invalid_ssl_certificate_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "invalid_ssl_certificate_threshold_warning" {
   description = "SSL invalid certificate monitor (warning threshold)"
   type        = string
-  default     = 5
-}
-
-variable "invalid_ssl_certificate_threshold_critical" {
-  description = "SSL invalid certificate monitor (warning threshold)"
-  type        = string
-  default     = 5
+  default     = 3
 }
 
 variable "invalid_ssl_certificate_no_data_timeframe" {
diff --git a/network/http/ssl/monitors-ssl.tf b/network/http/ssl/monitors-ssl.tf
index 0a4034d..d7b7093 100644
--- a/network/http/ssl/monitors-ssl.tf
+++ b/network/http/ssl/monitors-ssl.tf
@@ -8,12 +8,12 @@ resource "datadog_monitor" "invalid_ssl_certificate" {
   type    = "service check"
 
   query = <<EOQ
-    "http.ssl_cert"${module.filter-tags.service_check}.by("instance","url").last(${var.invalid_ssl_certificate_last}).count_by_status()
+    "http.ssl_cert"${module.filter-tags.service_check}.by("instance","url").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.invalid_ssl_certificate_threshold_warning
-    critical = var.invalid_ssl_certificate_threshold_critical
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay
diff --git a/network/http/webcheck/README.md b/network/http/webcheck/README.md
index 99e4f8c..9ff278e 100644
--- a/network/http/webcheck/README.md
+++ b/network/http/webcheck/README.md
@@ -24,12 +24,9 @@ Creates DataDog monitors with the following checks:
 |------|-------------|:----:|:-----:|:-----:|
 | cannot\_connect\_enabled | Flag to enable HTTP cannot connect monitor | string | `"true"` | no |
 | cannot\_connect\_extra\_tags | Extra tags for HTTP cannot connect monitor | list(string) | `[]` | no |
-| cannot\_connect\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | cannot\_connect\_message | Custom message for HTTP cannot connect monitor | string | `""` | no |
 | cannot\_connect\_no\_data\_timeframe | HTTP cannot connect monitor no data timeframe | string | `"10"` | no |
-| cannot\_connect\_threshold\_critical | HTTP cannot connect monitor (warning threshold) | string | `"3"` | no |
-| cannot\_connect\_threshold\_ok | HTTP cannot connect monitor (ok threshold) | string | `"3"` | no |
-| cannot\_connect\_threshold\_warning | HTTP cannot connect monitor (warning threshold) | string | `"2"` | no |
+| cannot\_connect\_threshold\_warning | HTTP cannot connect monitor (warning threshold) | string | `"3"` | no |
 | environment | Architecture Environment | string | n/a | yes |
 | evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
 | filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no |
diff --git a/network/http/webcheck/inputs.tf b/network/http/webcheck/inputs.tf
index bbeb6f0..eb4a2c0 100644
--- a/network/http/webcheck/inputs.tf
+++ b/network/http/webcheck/inputs.tf
@@ -54,27 +54,9 @@ variable "cannot_connect_message" {
   default     = ""
 }
 
-variable "cannot_connect_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "cannot_connect_threshold_warning" {
   description = "HTTP cannot connect monitor (warning threshold)"
   type        = string
-  default     = 2
-}
-
-variable "cannot_connect_threshold_critical" {
-  description = "HTTP cannot connect monitor (warning threshold)"
-  type        = string
-  default     = 3
-}
-
-variable "cannot_connect_threshold_ok" {
-  description = "HTTP cannot connect monitor (ok threshold)"
-  type        = string
   default     = 3
 }
 
diff --git a/network/http/webcheck/monitors-webcheck.tf b/network/http/webcheck/monitors-webcheck.tf
index c9f2a4e..ba69cfb 100644
--- a/network/http/webcheck/monitors-webcheck.tf
+++ b/network/http/webcheck/monitors-webcheck.tf
@@ -8,13 +8,12 @@ resource "datadog_monitor" "cannot_connect" {
   type    = "service check"
 
   query = <<EOQ
-    "http.can_connect"${module.filter-tags.service_check}.by("instance","url").last(${var.cannot_connect_last}).count_by_status()
+    "http.can_connect"${module.filter-tags.service_check}.by("instance","url").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.cannot_connect_threshold_warning
-    critical = var.cannot_connect_threshold_critical
-    ok       = var.cannot_connect_threshold_ok
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay
diff --git a/network/tls/README.md b/network/tls/README.md
index e5b6422..17abf94 100644
--- a/network/tls/README.md
+++ b/network/tls/README.md
@@ -27,12 +27,9 @@ Creates DataDog monitors with the following checks:
 |------|-------------|:----:|:-----:|:-----:|
 | cannot\_connect\_enabled | Flag to enable TLS cannot connect monitor | string | `"true"` | no |
 | cannot\_connect\_extra\_tags | Extra tags for TLS cannot connect monitor | list(string) | `[]` | no |
-| cannot\_connect\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | cannot\_connect\_message | Custom message for TLS cannot connect monitor | string | `""` | no |
 | cannot\_connect\_no\_data\_timeframe | TLS cannot connect monitor no data timeframe | string | `"10"` | no |
-| cannot\_connect\_threshold\_critical | TLS cannot connect monitor (warning threshold) | string | `"3"` | no |
-| cannot\_connect\_threshold\_ok | TLS cannot connect monitor (ok threshold) | string | `"3"` | no |
-| cannot\_connect\_threshold\_warning | TLS cannot connect monitor (warning threshold) | string | `"2"` | no |
+| cannot\_connect\_threshold\_warning | TLS cannot connect monitor (warning threshold) | string | `"3"` | no |
 | certificate\_expiration\_date\_enabled | Flag to enable Certificate Expiration Date monitor | string | `"false"` | no |
 | certificate\_expiration\_date\_extra\_tags | Extra tags for Certificate Expiration Date monitor | list(string) | `[]` | no |
 | certificate\_expiration\_date\_message | Custom message for the Certificate Expiration Date monitor | string | `""` | no |
@@ -47,20 +44,16 @@ Creates DataDog monitors with the following checks:
 | filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no |
 | invalid\_tls\_certificate\_enabled | Flag to enable TLS certificate expiration monitor | string | `"true"` | no |
 | invalid\_tls\_certificate\_extra\_tags | Extra tags for TLS certificate expiration monitor | list(string) | `[]` | no |
-| invalid\_tls\_certificate\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | invalid\_tls\_certificate\_message | Custom message for TLS certificate expiration monitor | string | `""` | no |
 | invalid\_tls\_certificate\_no\_data\_timeframe | TLS certificate expiration monitor no data timeframe | string | `"10"` | no |
-| invalid\_tls\_certificate\_threshold\_critical | TLS certificate expiration monitor (warning threshold) | string | `"5"` | no |
-| invalid\_tls\_certificate\_threshold\_warning | TLS certificate expiration monitor (warning threshold) | string | `"5"` | no |
+| invalid\_tls\_certificate\_threshold\_warning | TLS certificate expiration monitor (warning threshold) | string | `"3"` | no |
 | message | Message sent when an alert is triggered | string | n/a | yes |
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | tls\_certificate\_expiration\_enabled | Flag to enable TLS certificate expiration monitor | string | `"true"` | no |
 | tls\_certificate\_expiration\_extra\_tags | Extra tags for TLS certificate expiration monitor | list(string) | `[]` | no |
-| tls\_certificate\_expiration\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | tls\_certificate\_expiration\_message | Custom message for TLS certificate expiration monitor | string | `""` | no |
 | tls\_certificate\_expiration\_no\_data\_timeframe | TLS certificate expiration monitor no data timeframe | string | `"10"` | no |
-| tls\_certificate\_expiration\_threshold\_critical | TLS certificate expiration monitor (warning threshold) | string | `"5"` | no |
 | tls\_certificate\_expiration\_threshold\_warning | TLS certificate expiration monitor (warning threshold) | string | `"5"` | no |
 
 ## Outputs
diff --git a/network/tls/inputs.tf b/network/tls/inputs.tf
index 31a051a..bb2dcc9 100644
--- a/network/tls/inputs.tf
+++ b/network/tls/inputs.tf
@@ -54,27 +54,9 @@ variable "cannot_connect_message" {
   default     = ""
 }
 
-variable "cannot_connect_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "cannot_connect_threshold_warning" {
   description = "TLS cannot connect monitor (warning threshold)"
   type        = string
-  default     = 2
-}
-
-variable "cannot_connect_threshold_critical" {
-  description = "TLS cannot connect monitor (warning threshold)"
-  type        = string
-  default     = 3
-}
-
-variable "cannot_connect_threshold_ok" {
-  description = "TLS cannot connect monitor (ok threshold)"
-  type        = string
   default     = 3
 }
 
@@ -105,22 +87,10 @@ variable "invalid_tls_certificate_message" {
   default     = ""
 }
 
-variable "invalid_tls_certificate_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "invalid_tls_certificate_threshold_warning" {
   description = "TLS certificate expiration monitor (warning threshold)"
   type        = string
-  default     = 5
-}
-
-variable "invalid_tls_certificate_threshold_critical" {
-  description = "TLS certificate expiration monitor (warning threshold)"
-  type        = string
-  default     = 5
+  default     = 3
 }
 
 variable "invalid_tls_certificate_no_data_timeframe" {
@@ -150,24 +120,12 @@ variable "tls_certificate_expiration_message" {
   default     = ""
 }
 
-variable "tls_certificate_expiration_last" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 6
-}
-
 variable "tls_certificate_expiration_threshold_warning" {
   description = "TLS certificate expiration monitor (warning threshold)"
   type        = string
   default     = 5
 }
 
-variable "tls_certificate_expiration_threshold_critical" {
-  description = "TLS certificate expiration monitor (warning threshold)"
-  type        = string
-  default     = 5
-}
-
 variable "tls_certificate_expiration_no_data_timeframe" {
   description = "TLS certificate expiration monitor no data timeframe"
   type        = string
diff --git a/network/tls/monitors-tls.tf b/network/tls/monitors-tls.tf
index 402caca..34b1992 100644
--- a/network/tls/monitors-tls.tf
+++ b/network/tls/monitors-tls.tf
@@ -8,13 +8,12 @@ resource "datadog_monitor" "cannot_connect" {
   type    = "service check"
 
   query = <<EOQ
-    "tls.can_connect"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(${var.cannot_connect_last}).count_by_status()
+    "tls.can_connect"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.cannot_connect_threshold_warning
-    critical = var.cannot_connect_threshold_critical
-    ok       = var.cannot_connect_threshold_ok
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay
@@ -44,12 +43,12 @@ resource "datadog_monitor" "invalid_tls_certificate" {
   type    = "service check"
 
   query = <<EOQ
-    "tls.cert_validation"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(${var.invalid_tls_certificate_last}).count_by_status()
+    "tls.cert_validation"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.invalid_tls_certificate_threshold_warning
-    critical = var.invalid_tls_certificate_threshold_critical
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay
@@ -79,12 +78,12 @@ resource "datadog_monitor" "tls_certificate_expiration" {
   type    = "service check"
 
   query = <<EOQ
-    "tls.cert_expiration"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(${var.tls_certificate_expiration_last}).count_by_status()
+    "tls.cert_expiration"${module.filter-tags.service_check}.by("name","server","port","server_hostname").last(6).count_by_status()
 EOQ
 
   thresholds = {
     warning  = var.tls_certificate_expiration_threshold_warning
-    critical = var.tls_certificate_expiration_threshold_critical
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay