From 4ec5bbab0df2ad12a328e2110f679aa6e91fee7d Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Thu, 29 Aug 2019 13:27:44 +0100
Subject: [PATCH] MON-498 Parameters last and critical threshold removed for
 the service check. Warning threshold added as parameter.

---
 middleware/kong/README.md        |  3 +--
 middleware/kong/inputs.tf        | 14 ++++----------
 middleware/kong/monitors-kong.tf |  5 +++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/middleware/kong/README.md b/middleware/kong/README.md
index ecc7e99..8667d9a 100644
--- a/middleware/kong/README.md
+++ b/middleware/kong/README.md
@@ -32,10 +32,9 @@ Creates DataDog monitors with the following checks:
 | new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no |
 | not\_responding\_enabled | Flag to enable Kong does not respond monitor | string | `"true"` | no |
 | not\_responding\_extra\_tags | Extra tags for Kong does not respond monitor | list(string) | `[]` | no |
-| not\_responding\_last | Parameter 'last' for the service check | string | `"6"` | no |
 | not\_responding\_message | Custom message for Kong does not respond monitor | string | `""` | no |
 | not\_responding\_no\_data\_timeframe | Kong does not respond monitor no data timeframe | string | `"10"` | no |
-| not\_responding\_threshold\_critical | Parameter 'last' for the service check | string | `"5"` | no |
+| not\_responding\_threshold\_warning | Warning threshold for the service check | string | `"3"` | no |
 | prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no |
 | treatment\_limit\_enabled | Flag to enable Kong Treatment Limit monitor | string | `"true"` | no |
 | treatment\_limit\_extra\_tags | Extra tags for Kong Treatment Limit monitor | list(string) | `[]` | no |
diff --git a/middleware/kong/inputs.tf b/middleware/kong/inputs.tf
index 524983a..a36d026 100644
--- a/middleware/kong/inputs.tf
+++ b/middleware/kong/inputs.tf
@@ -55,16 +55,10 @@ variable "not_responding_message" {
   default     = ""
 }
 
-variable "not_responding_last" {
-  description = "Parameter 'last' for the service check"
+variable "not_responding_threshold_warning" {
+  description = "Warning threshold for the service check"
   type        = string
-  default     = 6
-}
-
-variable "not_responding_threshold_critical" {
-  description = "Parameter 'last' for the service check"
-  type        = string
-  default     = 5
+  default     = 3
 }
 
 variable "not_responding_no_data_timeframe" {
@@ -80,7 +74,7 @@ variable "not_responding_extra_tags" {
 }
 
 #
-# treatment Limit
+# Treatment Limit
 #
 variable "treatment_limit_enabled" {
   description = "Flag to enable Kong Treatment Limit monitor"
diff --git a/middleware/kong/monitors-kong.tf b/middleware/kong/monitors-kong.tf
index 99676f6..5052294 100644
--- a/middleware/kong/monitors-kong.tf
+++ b/middleware/kong/monitors-kong.tf
@@ -8,11 +8,12 @@ resource "datadog_monitor" "not_responding" {
   type    = "service check"
 
   query = <<EOQ
-    "kong.can_connect"${module.filter-tags.service_check}.by("kong_host","kong_port").last(${var.not_responding_last}).count_by_status()
+    "kong.can_connect"${module.filter-tags.service_check}.by("kong_host","kong_port").last(6).count_by_status()
 EOQ
 
   thresholds = {
-    critical = var.not_responding_threshold_critical
+    warning  = var.not_responding_threshold_warning
+    critical = 5
   }
 
   new_host_delay      = var.new_host_delay