From 7fa7a42b09b3279328a4c4f708c87faddfd209c4 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:58:26 +0200
Subject: [PATCH] MON-247 update name and agent tags

---
 caas/kubernetes/ark/README.md       | 2 +-
 caas/kubernetes/ark/modules.tf      | 8 ++++++++
 caas/kubernetes/ark/monitors-ark.tf | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 caas/kubernetes/ark/modules.tf

diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md
index a3a8c35..cff18e6 100644
--- a/caas/kubernetes/ark/README.md
+++ b/caas/kubernetes/ark/README.md
@@ -77,7 +77,7 @@ spec:
               "prometheus_url": "http://%%host%%:8085/metrics",
               "namespace": "ark",
               "metrics": ["ark_backup_*"],
-              "tags": ["dd_monitoring:enabled","dd_k8s:enabled","env:prod"]
+              "tags": ["dd_monitoring:enabled","dd_ark:enabled","env:prod"]
             }
           ]
 ```
diff --git a/caas/kubernetes/ark/modules.tf b/caas/kubernetes/ark/modules.tf
new file mode 100644
index 0000000..7908587
--- /dev/null
+++ b/caas/kubernetes/ark/modules.tf
@@ -0,0 +1,8 @@
+module "filter-tags" {
+  source = "../../../common/filter-tags"
+
+  environment              = "${var.environment}"
+  resource                 = "ark"
+  filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
+  filter_tags_custom       = "${var.filter_tags_custom}"
+}
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 4f6aa38..6b588c4 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -1,6 +1,6 @@
 resource "datadog_monitor" "ark_schedules_monitor" {
   count   = "${var.ark_schedules_enabled ? 1 : 0}"
-  name    = "[${var.environment}] Ark backup failed on {{schedule.name}}"
+  name    = "[${var.environment}] Ark backup failed"
   type    = "metric alert"
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
 
@@ -26,5 +26,5 @@ resource "datadog_monitor" "ark_schedules_monitor" {
   require_full_window = false
 
   silenced = "${var.ark_schedules_monitor_silenced}"
-  tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform", "${var.ark_schedules_extra_tags}"]
+  tags     = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform", "${var.ark_schedules_extra_tags}"]
 }