From 70ce8e68bcc62b990c0c0982e583c881ddef6803 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Mon, 3 Sep 2018 09:39:14 +0200 Subject: [PATCH] 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"] }