From ca7f9a32d073fd7658d0bb1f6bef072bd9b89cff Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Mon, 13 Aug 2018 16:33:13 +0200
Subject: [PATCH] MON-224 Fix queries removing }

---
 .../instance/monitors-cloud-sql-instance.tf          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf b/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
index 6764dae..8a003cf 100644
--- a/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
+++ b/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "cpu_utilization" {
 
   query = <<EOF
   ${var.cpu_utilization_time_aggregator}(${var.cpu_utilization_timeframe}):
-    avg:gcp.cloudsql.database.cpu.utilization{${var.filter_tags}}}
+    avg:gcp.cloudsql.database.cpu.utilization{${var.filter_tags}}
     by {database_id} * 100
   > ${var.cpu_utilization_threshold_critical}
 EOF
@@ -53,7 +53,7 @@ resource "datadog_monitor" "disk_utilization" {
 
   query = <<EOF
   ${var.disk_utilization_time_aggregator}(${var.disk_utilization_timeframe}):
-    avg:gcp.cloudsql.database.disk.utilization{${var.filter_tags}}}
+    avg:gcp.cloudsql.database.disk.utilization{${var.filter_tags}}
     by {database_id} * 100
     > ${var.disk_utilization_threshold_critical}
 EOF
@@ -98,7 +98,7 @@ resource "datadog_monitor" "disk_utilization_forecast" {
   query = <<EOF
   ${var.disk_utilization_forecast_time_aggregator}(${var.disk_utilization_forecast_timeframe}):
     forecast(
-      avg:gcp.cloudsql.database.disk.utilization{${var.filter_tags}}} by {database_id} * 100,
+      avg:gcp.cloudsql.database.disk.utilization{${var.filter_tags}} by {database_id} * 100,
       '${var.disk_utilization_forecast_algorithm}',
       ${var.disk_utilization_forecast_deviations},
       interval='${var.disk_utilization_forecast_interval}',
@@ -147,7 +147,7 @@ resource "datadog_monitor" "memory_utilization" {
 
   query = <<EOF
   ${var.memory_utilization_time_aggregator}(${var.memory_utilization_timeframe}):
-    avg:gcp.cloudsql.database.memory.utilization{${var.filter_tags}}}
+    avg:gcp.cloudsql.database.memory.utilization{${var.filter_tags}}
     by {database_id} * 100
   > ${var.memory_utilization_threshold_critical}
 EOF
@@ -192,7 +192,7 @@ resource "datadog_monitor" "memory_utilization_forecast" {
   query = <<EOF
   ${var.memory_utilization_forecast_time_aggregator}(${var.memory_utilization_forecast_timeframe}):
     forecast(
-      avg:gcp.cloudsql.database.memory.utilization{${var.filter_tags}}} by {database_id} * 100,
+      avg:gcp.cloudsql.database.memory.utilization{${var.filter_tags}} by {database_id} * 100,
       '${var.memory_utilization_forecast_algorithm}',
       ${var.memory_utilization_forecast_deviations},
       interval='${var.memory_utilization_forecast_interval}',
@@ -241,7 +241,7 @@ resource "datadog_monitor" "failover_unavailable" {
 
   query = <<EOF
   ${var.failover_unavailable_time_aggregator}(${var.failover_unavailable_timeframe}):
-    avg:gcp.cloudsql.database.available_for_failover{${var.filter_tags}}}
+    avg:gcp.cloudsql.database.available_for_failover{${var.filter_tags}}
     by {database_id}
   <= ${var.failover_unavailable_threshold_critical}
 EOF