MON-486 fix forecast EOF bug for fmt

claranet · Aug 1, 2019 · b4b5610 · b4b5610
1 parent 9d9f86f
commit b4b5610
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 84 deletions.
diff --git a/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf b/cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf
@@ -88,39 +88,32 @@ resource "datadog_monitor" "disk_utilization_forecast" {
       '${var.disk_utilization_forecast_algorithm}',
       ${var.disk_utilization_forecast_deviations},
       interval='${var.disk_utilization_forecast_interval}',
-      ${var.disk_utilization_forecast_algorithm == "linear" ? format(
-  "history='%s',model='%s'",
-  var.disk_utilization_forecast_linear_history,
-  var.disk_utilization_forecast_linear_model,
-  ) : ""}
-      ${var.disk_utilization_forecast_algorithm == "seasonal" ? format(
-  "seasonality='%s'",
-  var.disk_utilization_forecast_seasonal_seasonality,
-) : ""}
+      ${var.disk_utilization_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.disk_utilization_forecast_linear_history, var.disk_utilization_forecast_linear_model) : ""}
+      ${var.disk_utilization_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.disk_utilization_forecast_seasonal_seasonality) : ""}
     )
   >= ${var.disk_utilization_forecast_threshold_critical}
 EOQ
 
-thresholds = {
-  critical          = var.disk_utilization_forecast_threshold_critical
-  critical_recovery = var.disk_utilization_forecast_threshold_critical_recovery
-}
+  thresholds = {
+    critical          = var.disk_utilization_forecast_threshold_critical
+    critical_recovery = var.disk_utilization_forecast_threshold_critical_recovery
+  }
 
-evaluation_delay    = var.evaluation_delay
-new_host_delay      = var.new_host_delay
-notify_audit        = false
-locked              = false
-timeout_h           = 0
-include_tags        = true
-require_full_window = false
-notify_no_data      = false
-renotify_interval   = 0
+  evaluation_delay    = var.evaluation_delay
+  new_host_delay      = var.new_host_delay
+  notify_audit        = false
+  locked              = false
+  timeout_h           = 0
+  include_tags        = true
+  require_full_window = false
+  notify_no_data      = false
+  renotify_interval   = 0
 
-tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.disk_utilization_forecast_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.disk_utilization_forecast_extra_tags)
 
-lifecycle {
-  ignore_changes = ["silenced"]
-}
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
 }
 
 #
@@ -170,45 +163,38 @@ resource "datadog_monitor" "memory_utilization_forecast" {
   type    = "query alert"
 
   query = <<EOQ
-    ${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,
-        '${var.memory_utilization_forecast_algorithm}',
-        ${var.memory_utilization_forecast_deviations},
-        interval='${var.memory_utilization_forecast_interval}',
-        ${var.memory_utilization_forecast_algorithm == "linear" ? format(
-  "history='%s',model='%s'",
-  var.memory_utilization_forecast_linear_history,
-  var.memory_utilization_forecast_linear_model,
-  ) : ""}
-      ${var.memory_utilization_forecast_algorithm == "seasonal" ? format(
-  "seasonality='%s'",
-  var.memory_utilization_forecast_seasonal_seasonality,
-) : ""}
+  ${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,
+      '${var.memory_utilization_forecast_algorithm}',
+      ${var.memory_utilization_forecast_deviations},
+      interval='${var.memory_utilization_forecast_interval}',
+      ${var.memory_utilization_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.memory_utilization_forecast_linear_history, var.memory_utilization_forecast_linear_model) : ""}
+      ${var.memory_utilization_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.memory_utilization_forecast_seasonal_seasonality) : ""}
       )
     >= ${var.memory_utilization_forecast_threshold_critical}
 EOQ
 
-thresholds = {
-  critical          = var.memory_utilization_forecast_threshold_critical
-  critical_recovery = var.memory_utilization_forecast_threshold_critical_recovery
-}
+  thresholds = {
+    critical          = var.memory_utilization_forecast_threshold_critical
+    critical_recovery = var.memory_utilization_forecast_threshold_critical_recovery
+  }
 
-evaluation_delay    = var.evaluation_delay
-new_host_delay      = var.new_host_delay
-notify_audit        = false
-locked              = false
-timeout_h           = 0
-include_tags        = true
-require_full_window = false
-notify_no_data      = false
-renotify_interval   = 0
+  evaluation_delay    = var.evaluation_delay
+  new_host_delay      = var.new_host_delay
+  notify_audit        = false
+  locked              = false
+  timeout_h           = 0
+  include_tags        = true
+  require_full_window = false
+  notify_no_data      = false
+  renotify_interval   = 0
 
-tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.memory_utilization_forecast_extra_tags)
+  tags = concat(["env:${var.environment}", "type:cloud", "provider:gcp", "resource:cloud-sql", "team:claranet", "created-by:terraform"], var.memory_utilization_forecast_extra_tags)
 
-lifecycle {
-  ignore_changes = ["silenced"]
-}
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
 }
 
 #

diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
@@ -109,39 +109,32 @@ resource "datadog_monitor" "disk_space_forecast" {
               '${var.disk_space_forecast_algorithm}',
                ${var.disk_space_forecast_deviations},
                interval='${var.disk_space_forecast_interval}',
-               ${var.disk_space_forecast_algorithm == "linear" ? format(
-  "history='%s',model='%s'",
-  var.disk_space_forecast_linear_history,
-  var.disk_space_forecast_linear_model,
-  ) : ""}
-               ${var.disk_space_forecast_algorithm == "seasonal" ? format(
-  "seasonality='%s'",
-  var.disk_space_forecast_seasonal_seasonality,
-) : ""}
+               ${var.disk_space_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.disk_space_forecast_linear_history, var.disk_space_forecast_linear_model) : ""}
+               ${var.disk_space_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.disk_space_forecast_seasonal_seasonality) : ""}
               )
     >= ${var.disk_space_forecast_threshold_critical}
 EOQ
 
-thresholds = {
-  critical_recovery = var.disk_space_forecast_threshold_critical_recovery
-  critical          = var.disk_space_forecast_threshold_critical
-}
+  thresholds = {
+    critical_recovery = var.disk_space_forecast_threshold_critical_recovery
+    critical          = var.disk_space_forecast_threshold_critical
+  }
 
-evaluation_delay    = var.evaluation_delay
-new_host_delay      = var.new_host_delay
-notify_audit        = false
-locked              = false
-timeout_h           = 0
-include_tags        = true
-require_full_window = true
-notify_no_data      = false
-renotify_interval   = 0
+  evaluation_delay    = var.evaluation_delay
+  new_host_delay      = var.new_host_delay
+  notify_audit        = false
+  locked              = false
+  timeout_h           = 0
+  include_tags        = true
+  require_full_window = true
+  notify_no_data      = false
+  renotify_interval   = 0
 
-tags = concat(["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"], var.disk_space_forecast_extra_tags)
+  tags = concat(["env:${var.environment}", "type:system", "provider:disk", "resource:generic", "team:claranet", "created-by:terraform"], var.disk_space_forecast_extra_tags)
 
-lifecycle {
-  ignore_changes = ["silenced"]
-}
+  lifecycle {
+    ignore_changes = ["silenced"]
+  }
 }
 
 resource "datadog_monitor" "disk_inodes" {