From 6ed22d6c651ad9c0fd2c9dc1bf878270a611adbb Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Mon, 27 Nov 2017 23:02:24 +0100
Subject: [PATCH] MON-75 add region to all group by

---
 cloud/azure/sql-database/monitors-sql-database-basics.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud/azure/sql-database/monitors-sql-database-basics.tf b/cloud/azure/sql-database/monitors-sql-database-basics.tf
index 1e75813..337b28f 100644
--- a/cloud/azure/sql-database/monitors-sql-database-basics.tf
+++ b/cloud/azure/sql-database/monitors-sql-database-basics.tf
@@ -12,7 +12,7 @@ resource "datadog_monitor" "sql-database_cpu_90_15min" {
 
   query = <<EOF
     avg(last_15m): (
-      avg:azure.sql_servers_databases.cpu_percent{${data.template_file.filter.rendered}} by {name,resource_group}
+      avg:azure.sql_servers_databases.cpu_percent{${data.template_file.filter.rendered}} by {resource_group,region,name}
     ) > ${var.cpu_threshold_critical}
   EOF
 
@@ -44,7 +44,7 @@ resource "datadog_monitor" "sql-database_free_space_low" {
 
   query = <<EOF
     avg(last_15m): (
-      avg:azure.sql_servers_databases.storage_percent{${data.template_file.filter.rendered}} by {name,resource_group}
+      avg:azure.sql_servers_databases.storage_percent{${data.template_file.filter.rendered}} by {resource_group,region,name}
     ) > ${var.diskspace_threshold_critical}
   EOF
 
@@ -75,7 +75,7 @@ resource "datadog_monitor" "sql-database_dtu_consumption_high" {
 
   query = <<EOF
     avg(last_15m): (
-      azure.sql_servers_databases.dtu_consumption_percent{${data.template_file.filter.rendered}} by {name,resource_group}
+      azure.sql_servers_databases.dtu_consumption_percent{${data.template_file.filter.rendered}} by {resource_group,region,name}
     ) > ${var.dtu_threshold_critical}
   EOF
 
@@ -106,7 +106,7 @@ resource "datadog_monitor" "sql-database_deadlocks_count" {
 
   query = <<EOF
     sum(last_5m): (
-      avg:azure.sql_servers_databases.deadlock{${data.template_file.filter.rendered}} by {name,resource_group}.as_count()
+      avg:azure.sql_servers_databases.deadlock{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count()
     ) > ${var.deadlock_threshold_critical}
   EOF