From 8a67a2bde7ac72753251e75cb689366e5a1998a6 Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Wed, 4 Jul 2018 12:33:41 +0200
Subject: [PATCH] MON-224 Fixed format and removed duplicate attributes for
 instance monitors

---
 .../gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf | 8 ++------
 1 file changed, 2 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 5ffa534..33f2a40 100644
--- a/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
+++ b/cloud/gcp/cloud-sql/instance/monitors-cloud-sql-instance.tf
@@ -21,7 +21,8 @@ resource "datadog_monitor" "cpu_utilization" {
   type = "metric alert"
 
   query = <<EOF
-  avg(${var.cpu_timeframe}): avg:gcp.cloudsql.database.cpu.utilization{${data.template_file.filter.rendered}}
+  avg(${var.cpu_timeframe}):
+  avg:gcp.cloudsql.database.cpu.utilization{${data.template_file.filter.rendered}}
   by {database_id}
   > ${var.cpu_threshold_critical}
 EOF
@@ -31,7 +32,6 @@ EOF
     critical = "${var.cpu_threshold_critical}"
   }
 
-  include_tags        = true
   notify_no_data      = true
   require_full_window = false
   renotify_interval   = 0
@@ -72,7 +72,6 @@ EOF
     critical = "${var.disk_threshold_critical}"
   }
 
-  include_tags        = true
   notify_no_data      = true
   require_full_window = false
   renotify_interval   = 0
@@ -113,7 +112,6 @@ EOF
     critical = "${var.memory_threshold_critical}"
   }
 
-  include_tags        = true
   notify_no_data      = true
   require_full_window = false
   renotify_interval   = 0
@@ -160,7 +158,6 @@ EOF
     critical = "${var.memory_forecast_threshold_critical}"
   }
 
-  include_tags        = true
   notify_no_data      = true
   require_full_window = false
   renotify_interval   = 0
@@ -200,7 +197,6 @@ EOF
     critical = "${var.failover_unavailable_threshold_critical}"
   }
 
-  include_tags        = true
   notify_no_data      = true
   require_full_window = false
   renotify_interval   = 0