From 8aab6d99b025ff3bf4375a8cc7310ac65edfe749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Respaut?= Date: Tue, 31 Oct 2017 10:38:20 +0100 Subject: [PATCH] MON-76: Multiple line queries for better readibility --- cloud/azure/redis/monitors-azure-redis.tf | 26 +++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/cloud/azure/redis/monitors-azure-redis.tf b/cloud/azure/redis/monitors-azure-redis.tf index 6931afe..b3ad63a 100644 --- a/cloud/azure/redis/monitors-azure-redis.tf +++ b/cloud/azure/redis/monitors-azure-redis.tf @@ -10,7 +10,9 @@ resource "datadog_monitor" "status" { name = "[${var.environment}] Redis {{name}} is down" message = "${var.message}" - query = "avg(last_5m):avg:azure.cache_redis.status{${data.template_file.filter.rendered}} by {name,resource_group} != 1" + query = < ${var.evictedkeys_limit_threshold_critical} +EOF type = "query alert" thresholds { @@ -53,7 +59,11 @@ resource "datadog_monitor" "percent_processor_time" { name = "[${var.environment}] Redis processor time {{value}}% on {{name}}" message = "${var.message}" - query = "avg(last_5m):avg:azure.cache_redis.percent_processor_time{${data.template_file.filter.rendered}} by {name,resource_group} > ${var.percent_processor_time_threshold_critical}" + query = < ${var.percent_processor_time_threshold_critical} +EOF type = "query alert" thresholds { @@ -77,12 +87,16 @@ resource "datadog_monitor" "server_load" { name = "[${var.environment}] Redis processor server load {{value}}% on {{name}}" message = "${var.message}" - query = "avg(last_5m):avg:azure.cache_redis.server_load{${data.template_file.filter.rendered}} by {name,resource_group} > ${var.server_load_rate_threshold_critical}" + query = < ${var.server_load_rate_threshold_critical} +EOF type = "query alert" thresholds { - warning = "${var.server_load_rate_threshold_critical}" - critical = "${var.server_load_rate_threshold_warning}" + warning = "${var.server_load_rate_threshold_warning}" + critical = "${var.server_load_rate_threshold_critical}" } notify_no_data = false