From 0766bce61eb4895743c2b8f8011da6f854d5fc52 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 30 Aug 2018 18:03:46 +0200
Subject: [PATCH] MON-248 use filter tags modules

---
 caas/k8s/ingress/modules.tf          | 19 +++++++++++++++++++
 caas/k8s/ingress/monitors-ingress.tf |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 caas/k8s/ingress/modules.tf

diff --git a/caas/k8s/ingress/modules.tf b/caas/k8s/ingress/modules.tf
new file mode 100644
index 0000000..8cf5cd7
--- /dev/null
+++ b/caas/k8s/ingress/modules.tf
@@ -0,0 +1,19 @@
+module "filter-tags" {
+  source = "../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "ingress"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+  extra_tags               = ["!upstream:upstream-default-backend"]
+}
+
+module "filter-tags-5xx" {
+  source = "../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "ingress"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+  extra_tags               = ["!upstream:upstream-default-backend,status_code:5xx"]
+}
diff --git a/caas/k8s/ingress/monitors-ingress.tf b/caas/k8s/ingress/monitors-ingress.tf
index fb4d64a..9b23ed3 100644
--- a/caas/k8s/ingress/monitors-ingress.tf
+++ b/caas/k8s/ingress/monitors-ingress.tf
@@ -13,8 +13,8 @@ resource "datadog_monitor" "Nginx_ingress_too_many_5xx" {
   query = <<EOF
     sum(${var.ingress_5xx_timeframe}): (
       default(
-        avg:nginx_ingress.nginx_upstream_responses_total{status_code:5xx,${data.template_file.filter.rendered},!upstream:upstream-default-backend} by {upstream,ingress_class} /
-        (avg:nginx_ingress.nginx_upstream_requests_total{${data.template_file.filter.rendered},!upstream:upstream-default-backend} by {upstream,ingress_class} + ${var.artificial_requests_count}),
+        avg:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-5xx.query_alert} by {upstream,ingress_class} /
+        (avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class} + ${var.artificial_requests_count}),
       0) * 100
     ) > ${var.ingress_5xx_threshold_critical}
   EOF