From df866e4d4cc540d0dadca1c63e3956607aa3b24e Mon Sep 17 00:00:00 2001
From: Alex Lemaresquier <alexandre.lemaresquier@fr.clara.net>
Date: Mon, 16 Jul 2018 20:07:30 +0200
Subject: [PATCH 1/9] MON-247-monitors-for-ark-backups: Add
 ark_schedules_monitor

---
 README.md                    |  1 +
 caas/k8s/ark/README.md       | 83 ++++++++++++++++++++++++++++++++++++
 caas/k8s/ark/inputs.tf       | 55 ++++++++++++++++++++++++
 caas/k8s/ark/monitors-ark.tf | 39 +++++++++++++++++
 caas/k8s/ark/outputs.tf      |  4 ++
 5 files changed, 182 insertions(+)
 create mode 100644 caas/k8s/ark/README.md
 create mode 100644 caas/k8s/ark/inputs.tf
 create mode 100644 caas/k8s/ark/monitors-ark.tf
 create mode 100644 caas/k8s/ark/outputs.tf

diff --git a/README.md b/README.md
index e8767bc..2350d91 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ The `//` is very important, it's a terraform specific syntax used to separate gi
 - [caas](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/)
 	- [kubernetes](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/kubernetes/)
 		- [ingress](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/kubernetes/ingress/)
+		- [ark](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/k8s/ark/)
 - [cloud](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/)
 	- [aws](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/)
 		- [alb](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/alb/)
diff --git a/caas/k8s/ark/README.md b/caas/k8s/ark/README.md
new file mode 100644
index 0000000..a3a8c35
--- /dev/null
+++ b/caas/k8s/ark/README.md
@@ -0,0 +1,83 @@
+Ark schedules monitor
+==========================================
+
+How to use this module
+----------------------
+
+```
+module "ark_schedules_monitor" {
+  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//caas/k8s/ark?ref={revision}"
+
+  environment = "${var.environment}"
+  message = "${module.datadog-message-alerting.alerting-message}"
+}
+
+```
+
+Purpose
+-------
+Creates DataDog monitor with the following checks :
+
+* Ark schedules monitors
+
+Inputs
+------
+
+| Name | Description | Type | Default | Required |
+|------|-------------|:----:|:-----:|:-----:|
+| ark_schedules_monitor_message | Custom message for Ark schedules monitor | string | `` | no |
+| ark_schedules_monitor_no_data_timeframe | No data timeframe | string | `1440` | no |
+| ark_schedules_monitor_silenced | Groups to mute for Ark schedules monitor | map | `<map>` | no |
+| ark_schedules_monitor_timeframe | Monitor timeframe for Ark schedules monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1d` | no |
+| delay | Delay in seconds for the metric evaluation | string | `60` | no |
+| environment | Architecture environment | string | - | yes |
+| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
+| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
+| message | Message sent when a monitor is triggered | string | - | yes |
+| team |  | string | `k8s` | no |
+
+Outputs
+-------
+
+| Name | Description |
+|------|-------------|
+| ark_schedules_monitor_id | id for monitor ark_schedules_monitor |
+
+Related documentation
+---------------------
+
+DataDog blog: https://www.datadoghq.com/blog/monitor-prometheus-metrics
+Heptio Ark minimum release: https://github.com/heptio/ark/releases/tag/v0.9.0
+
+Ark annotations for Datadog
+---------------------------
+```
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  namespace: heptio-ark
+  name: ark
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        component: ark
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8085"
+        prometheus.io/path: "/metrics"
+        ad.datadoghq.com/ark.check_names: |-
+          ["prometheus"]
+        ad.datadoghq.com/ark.init_configs: |-
+          [{}]
+        ad.datadoghq.com/ark.instances: |-
+          [
+            {
+              "prometheus_url": "http://%%host%%:8085/metrics",
+              "namespace": "ark",
+              "metrics": ["ark_backup_*"],
+              "tags": ["dd_monitoring:enabled","dd_k8s:enabled","env:prod"]
+            }
+          ]
+```
diff --git a/caas/k8s/ark/inputs.tf b/caas/k8s/ark/inputs.tf
new file mode 100644
index 0000000..b3c0b3a
--- /dev/null
+++ b/caas/k8s/ark/inputs.tf
@@ -0,0 +1,55 @@
+# Datadog global variables
+
+variable "team" {
+  type    = "string"
+  default = "k8s"
+}
+
+variable "environment" {
+  description = "Architecture environment"
+}
+
+variable "filter_tags_use_defaults" {
+  description = "Use default filter tags convention"
+  default     = "true"
+}
+
+variable "filter_tags_custom" {
+  description = "Tags used for custom filtering when filter_tags_use_defaults is false"
+  default     = "*"
+}
+
+variable "message" {
+  description = "Message sent when a monitor is triggered"
+}
+
+variable "delay" {
+  description = "Delay in seconds for the metric evaluation"
+  default     = 60
+}
+
+# Datadog monitors variables
+# N/A
+
+variable "ark_schedules_monitor_message" {
+  description = "Custom message for Ark schedules monitor"
+  type        = "string"
+  default     = ""
+}
+
+variable "ark_schedules_monitor_timeframe" {
+  description = "Monitor timeframe for Ark schedules monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
+  type        = "string"
+  default     = "last_1d"
+}
+
+variable "ark_schedules_monitor_silenced" {
+  description = "Groups to mute for Ark schedules monitor"
+  type        = "map"
+  default     = {}
+}
+
+variable "ark_schedules_monitor_no_data_timeframe" {
+  description = "No data timeframe"
+  default     = 1440
+}
diff --git a/caas/k8s/ark/monitors-ark.tf b/caas/k8s/ark/monitors-ark.tf
new file mode 100644
index 0000000..48c1b97
--- /dev/null
+++ b/caas/k8s/ark/monitors-ark.tf
@@ -0,0 +1,39 @@
+data "template_file" "filter" {
+  template = "$${filter}"
+
+  vars {
+    filter = "${var.filter_tags_use_defaults == "true" ?
+             format("dd_monitoring:enabled,dd_k8s:enabled,env:%s", var.environment) :
+             "${var.filter_tags_custom}"}"
+  }
+}
+
+resource "datadog_monitor" "ark_schedules_monitor" {
+  name    = "[${var.environment}] [${var.team}] Ark backup failed on {{schedule.name}}"
+  type    = "metric alert"
+  message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
+
+  query = <<EOF
+    sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total{${data.template_file.filter.rendered}} by {schedule}.as_count() > 1
+  EOF
+
+  thresholds {
+    critical = 1
+    warning  = 0
+  }
+
+  evaluation_delay  = "${var.delay}"
+  new_host_delay    = "${var.delay}"
+  no_data_timeframe = "${var.ark_schedules_monitor_no_data_timeframe}"
+
+  notify_no_data      = true
+  renotify_interval   = 0
+  notify_audit        = false
+  timeout_h           = 0
+  include_tags        = true
+  locked              = false
+  require_full_window = false
+
+  silenced = "${var.ark_schedules_monitor_silenced}"
+  tags     = ["team:${var.team}", "env:${var.environment}", "resource:ark", "provider:prometheus"]
+}
diff --git a/caas/k8s/ark/outputs.tf b/caas/k8s/ark/outputs.tf
new file mode 100644
index 0000000..f368f44
--- /dev/null
+++ b/caas/k8s/ark/outputs.tf
@@ -0,0 +1,4 @@
+output "ark_schedules_monitor_id" {
+  description = "id for monitor ark_schedules_monitor"
+  value       = "${datadog_monitor.ark_schedules_monitor.id}"
+}

From abd749fbc75b77a5e1b01829d8d4460079a1a9a4 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:36:36 +0200
Subject: [PATCH 2/9] MON-247 rename directory from k8s to kubernetes

---
 caas/{k8s => kubernetes}/ark/README.md       | 0
 caas/{k8s => kubernetes}/ark/inputs.tf       | 0
 caas/{k8s => kubernetes}/ark/monitors-ark.tf | 0
 caas/{k8s => kubernetes}/ark/outputs.tf      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename caas/{k8s => kubernetes}/ark/README.md (100%)
 rename caas/{k8s => kubernetes}/ark/inputs.tf (100%)
 rename caas/{k8s => kubernetes}/ark/monitors-ark.tf (100%)
 rename caas/{k8s => kubernetes}/ark/outputs.tf (100%)

diff --git a/caas/k8s/ark/README.md b/caas/kubernetes/ark/README.md
similarity index 100%
rename from caas/k8s/ark/README.md
rename to caas/kubernetes/ark/README.md
diff --git a/caas/k8s/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
similarity index 100%
rename from caas/k8s/ark/inputs.tf
rename to caas/kubernetes/ark/inputs.tf
diff --git a/caas/k8s/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
similarity index 100%
rename from caas/k8s/ark/monitors-ark.tf
rename to caas/kubernetes/ark/monitors-ark.tf
diff --git a/caas/k8s/ark/outputs.tf b/caas/kubernetes/ark/outputs.tf
similarity index 100%
rename from caas/k8s/ark/outputs.tf
rename to caas/kubernetes/ark/outputs.tf

From 70ce8e68bcc62b990c0c0982e583c881ddef6803 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:39:14 +0200
Subject: [PATCH 3/9] MON-247 remove team variable

---
 caas/kubernetes/ark/inputs.tf       | 6 ------
 caas/kubernetes/ark/monitors-ark.tf | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
index b3c0b3a..83d0fb4 100644
--- a/caas/kubernetes/ark/inputs.tf
+++ b/caas/kubernetes/ark/inputs.tf
@@ -1,10 +1,5 @@
 # Datadog global variables
 
-variable "team" {
-  type    = "string"
-  default = "k8s"
-}
-
 variable "environment" {
   description = "Architecture environment"
 }
@@ -29,7 +24,6 @@ variable "delay" {
 }
 
 # Datadog monitors variables
-# N/A
 
 variable "ark_schedules_monitor_message" {
   description = "Custom message for Ark schedules monitor"
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 48c1b97..5d1c426 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -9,7 +9,7 @@ data "template_file" "filter" {
 }
 
 resource "datadog_monitor" "ark_schedules_monitor" {
-  name    = "[${var.environment}] [${var.team}] Ark backup failed on {{schedule.name}}"
+  name    = "[${var.environment}] Ark backup failed on {{schedule.name}}"
   type    = "metric alert"
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
 
@@ -35,5 +35,5 @@ resource "datadog_monitor" "ark_schedules_monitor" {
   require_full_window = false
 
   silenced = "${var.ark_schedules_monitor_silenced}"
-  tags     = ["team:${var.team}", "env:${var.environment}", "resource:ark", "provider:prometheus"]
+  tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform"]
 }

From 20aea24943322f65e602a00e2d1a0079ff364840 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:43:17 +0200
Subject: [PATCH 4/9] MON-247 use filter tags module

---
 caas/kubernetes/ark/monitors-ark.tf | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 5d1c426..5807801 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -1,20 +1,10 @@
-data "template_file" "filter" {
-  template = "$${filter}"
-
-  vars {
-    filter = "${var.filter_tags_use_defaults == "true" ?
-             format("dd_monitoring:enabled,dd_k8s:enabled,env:%s", var.environment) :
-             "${var.filter_tags_custom}"}"
-  }
-}
-
 resource "datadog_monitor" "ark_schedules_monitor" {
   name    = "[${var.environment}] Ark backup failed on {{schedule.name}}"
   type    = "metric alert"
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
 
   query = <<EOF
-    sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total{${data.template_file.filter.rendered}} by {schedule}.as_count() > 1
+    sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total${module.filter-tags-5xx.query_alert} by {schedule}.as_count() > 1
   EOF
 
   thresholds {

From d8709927e1fdbfa986c2da360a415e2fa9523919 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:48:23 +0200
Subject: [PATCH 5/9] MON-247 split delay

---
 caas/kubernetes/ark/inputs.tf       | 9 +++++++--
 caas/kubernetes/ark/monitors-ark.tf | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
index 83d0fb4..e9b391b 100644
--- a/caas/kubernetes/ark/inputs.tf
+++ b/caas/kubernetes/ark/inputs.tf
@@ -18,9 +18,14 @@ variable "message" {
   description = "Message sent when a monitor is triggered"
 }
 
-variable "delay" {
+variable "evaluation_delay" {
   description = "Delay in seconds for the metric evaluation"
-  default     = 60
+  default     = 15
+}
+
+variable "new_host_delay" {
+  description = "Delay in seconds before monitor new resource"
+  default     = 300
 }
 
 # Datadog monitors variables
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 5807801..49ca827 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -12,8 +12,8 @@ resource "datadog_monitor" "ark_schedules_monitor" {
     warning  = 0
   }
 
-  evaluation_delay  = "${var.delay}"
-  new_host_delay    = "${var.delay}"
+  evaluation_delay  = "${var.evaluation_delay}"
+  new_host_delay    = "${var.new_host_delay}"
   no_data_timeframe = "${var.ark_schedules_monitor_no_data_timeframe}"
 
   notify_no_data      = true

From 3ee6fcd2e7245fb8632ed6853024c16fa44787dd Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 09:51:23 +0200
Subject: [PATCH 6/9] MON-247 add extra tags and enabled feature

---
 caas/kubernetes/ark/inputs.tf       | 12 ++++++++++++
 caas/kubernetes/ark/monitors-ark.tf |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
index e9b391b..089d214 100644
--- a/caas/kubernetes/ark/inputs.tf
+++ b/caas/kubernetes/ark/inputs.tf
@@ -48,6 +48,18 @@ variable "ark_schedules_monitor_silenced" {
   default     = {}
 }
 
+variable "ark_schedules_enabled" {
+  description = "Flag to enable Ark schedules monitor"
+  type        = "string"
+  default     = "true"
+}
+
+variable "ark_schedules_extra_tags" {
+  description = "Extra tags for Ark schedules monitor"
+  type        = "list"
+  default     = []
+}
+
 variable "ark_schedules_monitor_no_data_timeframe" {
   description = "No data timeframe"
   default     = 1440
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 49ca827..4f6aa38 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -1,4 +1,5 @@
 resource "datadog_monitor" "ark_schedules_monitor" {
+  count   = "${var.ark_schedules_enabled ? 1 : 0}"
   name    = "[${var.environment}] Ark backup failed on {{schedule.name}}"
   type    = "metric alert"
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
@@ -25,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"]
+  tags = ["env:${var.environment}", "type:caas", "provider:prometheus", "resource:ark", "team:claranet", "created-by:terraform", "${var.ark_schedules_extra_tags}"]
 }

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 7/9] 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}"]
 }

From fdd86f34d0c20606a981b9582880e6ced5532033 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 10:02:42 +0200
Subject: [PATCH 8/9] MON-247 auto update

---
 README.md                           |  2 +-
 caas/kubernetes/ark/README.md       | 32 ++++++++++++++---------------
 caas/kubernetes/ark/monitors-ark.tf |  2 +-
 caas/kubernetes/ark/outputs.tf      |  2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 2350d91..92714a9 100644
--- a/README.md
+++ b/README.md
@@ -74,8 +74,8 @@ The `//` is very important, it's a terraform specific syntax used to separate gi
 
 - [caas](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/)
 	- [kubernetes](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/kubernetes/)
+		- [ark](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/kubernetes/ark/)
 		- [ingress](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/kubernetes/ingress/)
-		- [ark](https://bitbucket.org/morea/terraform.feature.datadog/src/master/caas/k8s/ark/)
 - [cloud](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/)
 	- [aws](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/)
 		- [alb](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/alb/)
diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md
index cff18e6..6100aa4 100644
--- a/caas/kubernetes/ark/README.md
+++ b/caas/kubernetes/ark/README.md
@@ -1,43 +1,41 @@
-Ark schedules monitor
-==========================================
+# CAAS KUBERNETES ARK DataDog monitors
 
-How to use this module
-----------------------
+## How to use this module
 
 ```
-module "ark_schedules_monitor" {
-  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//caas/k8s/ark?ref={revision}"
+module "datadog-monitors-caas-kubernetes-ark" {
+  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//caas/kubernetes/ark?ref={revision}"
 
   environment = "${var.environment}"
-  message = "${module.datadog-message-alerting.alerting-message}"
+  message     = "${module.datadog-message-alerting.alerting-message}"
 }
 
 ```
 
-Purpose
--------
-Creates DataDog monitor with the following checks :
+## Purpose
 
-* Ark schedules monitors
+Creates DataDog monitors with the following checks:
 
-Inputs
-------
+- Ark backup failed
+
+## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| ark_schedules_enabled | Flag to enable Ark schedules monitor | string | `true` | no |
+| ark_schedules_extra_tags | Extra tags for Ark schedules monitor | list | `<list>` | no |
 | ark_schedules_monitor_message | Custom message for Ark schedules monitor | string | `` | no |
 | ark_schedules_monitor_no_data_timeframe | No data timeframe | string | `1440` | no |
 | ark_schedules_monitor_silenced | Groups to mute for Ark schedules monitor | map | `<map>` | no |
 | ark_schedules_monitor_timeframe | Monitor timeframe for Ark schedules monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1d` | no |
-| delay | Delay in seconds for the metric evaluation | string | `60` | no |
 | environment | Architecture environment | string | - | 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 |
 | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
 | message | Message sent when a monitor is triggered | string | - | yes |
-| team |  | string | `k8s` | no |
+| new_host_delay | Delay in seconds before monitor new resource | string | `300` | no |
 
-Outputs
--------
+## Outputs
 
 | Name | Description |
 |------|-------------|
diff --git a/caas/kubernetes/ark/monitors-ark.tf b/caas/kubernetes/ark/monitors-ark.tf
index 6b588c4..c69d74f 100644
--- a/caas/kubernetes/ark/monitors-ark.tf
+++ b/caas/kubernetes/ark/monitors-ark.tf
@@ -5,7 +5,7 @@ resource "datadog_monitor" "ark_schedules_monitor" {
   message = "${coalesce(var.ark_schedules_monitor_message, var.message)}"
 
   query = <<EOF
-    sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total${module.filter-tags-5xx.query_alert} by {schedule}.as_count() > 1
+    sum(${var.ark_schedules_monitor_timeframe}):min:ark.ark_backup_failure_total${module.filter-tags.query_alert} by {schedule}.as_count() > 1
   EOF
 
   thresholds {
diff --git a/caas/kubernetes/ark/outputs.tf b/caas/kubernetes/ark/outputs.tf
index f368f44..5ff741d 100644
--- a/caas/kubernetes/ark/outputs.tf
+++ b/caas/kubernetes/ark/outputs.tf
@@ -1,4 +1,4 @@
 output "ark_schedules_monitor_id" {
   description = "id for monitor ark_schedules_monitor"
-  value       = "${datadog_monitor.ark_schedules_monitor.id}"
+  value       = "${datadog_monitor.ark_schedules_monitor.*.id}"
 }

From 5fee7d90c9faaf91f8e5ecd14b37fbc1dc35c4f9 Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 3 Sep 2018 10:06:28 +0200
Subject: [PATCH 9/9] MON-247 improve description for no data timeframe
 variable

---
 caas/kubernetes/ark/README.md | 2 +-
 caas/kubernetes/ark/inputs.tf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/caas/kubernetes/ark/README.md b/caas/kubernetes/ark/README.md
index 6100aa4..7bae78c 100644
--- a/caas/kubernetes/ark/README.md
+++ b/caas/kubernetes/ark/README.md
@@ -25,7 +25,7 @@ Creates DataDog monitors with the following checks:
 | ark_schedules_enabled | Flag to enable Ark schedules monitor | string | `true` | no |
 | ark_schedules_extra_tags | Extra tags for Ark schedules monitor | list | `<list>` | no |
 | ark_schedules_monitor_message | Custom message for Ark schedules monitor | string | `` | no |
-| ark_schedules_monitor_no_data_timeframe | No data timeframe | string | `1440` | no |
+| ark_schedules_monitor_no_data_timeframe | No data timeframe in minutes | string | `1440` | no |
 | ark_schedules_monitor_silenced | Groups to mute for Ark schedules monitor | map | `<map>` | no |
 | ark_schedules_monitor_timeframe | Monitor timeframe for Ark schedules monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1d` | no |
 | environment | Architecture environment | string | - | yes |
diff --git a/caas/kubernetes/ark/inputs.tf b/caas/kubernetes/ark/inputs.tf
index 089d214..8ef9a79 100644
--- a/caas/kubernetes/ark/inputs.tf
+++ b/caas/kubernetes/ark/inputs.tf
@@ -61,6 +61,6 @@ variable "ark_schedules_extra_tags" {
 }
 
 variable "ark_schedules_monitor_no_data_timeframe" {
-  description = "No data timeframe"
+  description = "No data timeframe in minutes"
   default     = 1440
 }