From 9112ce02a390dc783a85ee6a92b65239b6f35d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Respaut?= Date: Mon, 30 Oct 2017 16:37:03 +0100 Subject: [PATCH] MON-76: Uses the generic message --- cloud/azure/redis/inputs.tf | 5 +---- cloud/azure/redis/monitors-azure-redis.tf | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cloud/azure/redis/inputs.tf b/cloud/azure/redis/inputs.tf index 70eba23..3f9460f 100644 --- a/cloud/azure/redis/inputs.tf +++ b/cloud/azure/redis/inputs.tf @@ -12,10 +12,7 @@ variable "stack" { } # Global DataDog -variable "critical_escalation_group" { -} - -variable "warning_escalation_group" { +variable "message" { } variable "delay" { diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf index ec562b9..8b47249 100644 --- a/cloud/azure/redis/monitors-azure-redis.tf +++ b/cloud/azure/redis/monitors-azure-redis.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "status" { name = "[${var.environment}] Redis {{name}} is down" - message = "{{#is_alert}}\n${var.critical_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.critical_escalation_group}\n{{/is_recovery}}" + message = "${var.message}" query = "avg(last_5m):avg:azure.cache_redis.status{*} by {name,resource_group} != 1" type = "query alert" @@ -19,7 +19,7 @@ resource "datadog_monitor" "status" { resource "datadog_monitor" "evictedkeys" { name = "[${var.environment}] Redis {{value}} evictedkeys on {{name}}" - message = "{{#is_alert}}\n${var.critical_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.critical_escalation_group}\n{{/is_recovery}}" + message = "${var.message}" query = "avg(last_5m):avg:azure.cache_redis.evictedkeys{*} by {name,resource_group} > ${var.evictedkeys_threshold_critical}" type = "query alert"