wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MON-486 fix forecast EOF bug for fmt

Browse Source
This commit is contained in:
Quentin Manfroi 2019-08-01 18:01:30 +02:00
parent 9d9f86f56d
commit b4b56108c3
2 changed files with 63 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
cloud/gcp/cloud-sql/common/monitors-cloud-sql-common.tf
View File

@ -88,39 +88,32 @@ resource "datadog_monitor" "disk_utilization_forecast" {
'${var.disk_utilization_forecast_algorithm}', '${var.disk_utilization_forecast_algorithm}',
${var.disk_utilization_forecast_deviations}, ${var.disk_utilization_forecast_deviations},
interval='${var.disk_utilization_forecast_interval}', interval='${var.disk_utilization_forecast_interval}',
${var.disk_utilization_forecast_algorithm == "linear" ? format( ${var.disk_utilization_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.disk_utilization_forecast_linear_history, var.disk_utilization_forecast_linear_model) : ""}
"history='%s',model='%s'", ${var.disk_utilization_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.disk_utilization_forecast_seasonal_seasonality) : ""}
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} >= ${var.disk_utilization_forecast_threshold_critical}
EOQ EOQ
thresholds = { thresholds = {
critical = var.disk_utilization_forecast_threshold_critical critical = var.disk_utilization_forecast_threshold_critical
critical_recovery = var.disk_utilization_forecast_threshold_critical_recovery critical_recovery = var.disk_utilization_forecast_threshold_critical_recovery
} }
evaluation_delay = var.evaluation_delay evaluation_delay = var.evaluation_delay
new_host_delay = var.new_host_delay new_host_delay = var.new_host_delay
notify_audit = false notify_audit = false
locked = false locked = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
require_full_window = false require_full_window = false
notify_no_data = false notify_no_data = false
renotify_interval = 0 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 { lifecycle {
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }
# #
@ -170,45 +163,38 @@ resource "datadog_monitor" "memory_utilization_forecast" {
type = "query alert" type = "query alert"
query = <<EOQ query = <<EOQ
${var.memory_utilization_forecast_time_aggregator}(${var.memory_utilization_forecast_timeframe}): ${var.memory_utilization_forecast_time_aggregator}(${var.memory_utilization_forecast_timeframe}):
forecast( 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_algorithm}',
${var.memory_utilization_forecast_deviations}, ${var.memory_utilization_forecast_deviations},
interval='${var.memory_utilization_forecast_interval}', interval='${var.memory_utilization_forecast_interval}',
${var.memory_utilization_forecast_algorithm == "linear" ? format( ${var.memory_utilization_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.memory_utilization_forecast_linear_history, var.memory_utilization_forecast_linear_model) : ""}
"history='%s',model='%s'", ${var.memory_utilization_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.memory_utilization_forecast_seasonal_seasonality) : ""}
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} >= ${var.memory_utilization_forecast_threshold_critical}
EOQ EOQ
thresholds = { thresholds = {
critical = var.memory_utilization_forecast_threshold_critical critical = var.memory_utilization_forecast_threshold_critical
critical_recovery = var.memory_utilization_forecast_threshold_critical_recovery critical_recovery = var.memory_utilization_forecast_threshold_critical_recovery
} }
evaluation_delay = var.evaluation_delay evaluation_delay = var.evaluation_delay
new_host_delay = var.new_host_delay new_host_delay = var.new_host_delay
notify_audit = false notify_audit = false
locked = false locked = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
require_full_window = false require_full_window = false
notify_no_data = false notify_no_data = false
renotify_interval = 0 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 { lifecycle {
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }
# #

45
system/generic/monitors-system.tf
View File

@ -109,39 +109,32 @@ resource "datadog_monitor" "disk_space_forecast" {
'${var.disk_space_forecast_algorithm}', '${var.disk_space_forecast_algorithm}',
${var.disk_space_forecast_deviations}, ${var.disk_space_forecast_deviations},
interval='${var.disk_space_forecast_interval}', interval='${var.disk_space_forecast_interval}',
${var.disk_space_forecast_algorithm == "linear" ? format( ${var.disk_space_forecast_algorithm == "linear" ? format("history='%s',model='%s'", var.disk_space_forecast_linear_history, var.disk_space_forecast_linear_model) : ""}
"history='%s',model='%s'", ${var.disk_space_forecast_algorithm == "seasonal" ? format("seasonality='%s'", var.disk_space_forecast_seasonal_seasonality) : ""}
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} >= ${var.disk_space_forecast_threshold_critical}
EOQ EOQ
thresholds = { thresholds = {
critical_recovery = var.disk_space_forecast_threshold_critical_recovery critical_recovery = var.disk_space_forecast_threshold_critical_recovery
critical = var.disk_space_forecast_threshold_critical critical = var.disk_space_forecast_threshold_critical
} }
evaluation_delay = var.evaluation_delay evaluation_delay = var.evaluation_delay
new_host_delay = var.new_host_delay new_host_delay = var.new_host_delay
notify_audit = false notify_audit = false
locked = false locked = false
timeout_h = 0 timeout_h = 0
include_tags = true include_tags = true
require_full_window = true require_full_window = true
notify_no_data = false notify_no_data = false
renotify_interval = 0 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 { lifecycle {
ignore_changes = ["silenced"] ignore_changes = ["silenced"]
} }
} }
resource "datadog_monitor" "disk_inodes" { resource "datadog_monitor" "disk_inodes" {