From 0433c7dabcf62f96b533462d77d4c5b77ce14732 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 30 Aug 2018 18:10:34 +0200
Subject: [PATCH] MON-248 new tag convention and extra tag and disable feature

---
 caas/k8s/ingress/inputs.tf           | 12 ++++++++++++
 caas/k8s/ingress/monitors-ingress.tf | 11 ++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/caas/k8s/ingress/inputs.tf b/caas/k8s/ingress/inputs.tf
index 5d94e11..b96012e 100644
--- a/caas/k8s/ingress/inputs.tf
+++ b/caas/k8s/ingress/inputs.tf
@@ -41,6 +41,18 @@ variable "ingress_5xx_silenced" {
   default     = {}
 }
 
+variable "ingress_5xx_enabled" {
+  description = "Flag to enable Ingress 5xx errors monitor"
+  type        = "string"
+  default     = "true"
+}
+
+variable "ingress_5xx_extra_tags" {
+  description = "Extra tags for Ingress 5xx errors monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "ingress_5xx_message" {
   description = "Message sent when an alert is triggered"
   default     = ""
diff --git a/caas/k8s/ingress/monitors-ingress.tf b/caas/k8s/ingress/monitors-ingress.tf
index 9327473..25c7977 100644
--- a/caas/k8s/ingress/monitors-ingress.tf
+++ b/caas/k8s/ingress/monitors-ingress.tf
@@ -1,12 +1,5 @@
-data "template_file" "filter" {
-  template = "$${filter}"
-
-  vars {
-    filter = "${var.filter_tags_use_defaults == "true" ? format("dd_monitoring:enabled,dd_k8s_ingress:enabled,env:%s", var.environment) : "${var.filter_tags_custom}"}"
-  }
-}
-
 resource "datadog_monitor" "Nginx_ingress_too_many_5xx" {
+  count   = "${var.ingress_5xx_enabled ? 1 : 0}"
   name    = "[${var.environment}] [${var.team}] Nginx Ingress 5xx errors too high for {{ingress_class.name}} on {{upstream.name}} {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
   message = "${coalesce(var.ingress_5xx_message, var.message)}"
 
@@ -38,5 +31,5 @@ resource "datadog_monitor" "Nginx_ingress_too_many_5xx" {
 
   silenced = "${var.ingress_5xx_silenced}"
 
-  tags = ["env:${var.environment}", "resource:ingress", "team:${var.team}", "provider:k8s"]
+  tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:nginx-ingress-controller", "team:claranet", "created-by:terraform", "${var.ingress_5xx_extra_tags}"]
 }