MON-417 Fix inputs & monitors names

This commit is contained in:
Alexandre Gaillet 2019-04-05 09:59:40 +02:00 committed by Quentin Manfroi
parent 25c5e8f285
commit 02f155b8ec
3 changed files with 9 additions and 9 deletions

View File

@ -17,8 +17,8 @@ module "datadog-monitors-cloud-azure-virtual-machine" {
Creates DataDog monitors with the following checks:
- Virtual Machine CPU usage
- Virtual Machine credit CPU too low
- Virtual Machine is down
- Virtual Machine credit CPU
- Virtual Machine is unreachable
## Inputs
@ -28,8 +28,8 @@ Creates DataDog monitors with the following checks:
| cpu\_remaining\_rate\_extra\_tags | Extra tags for Virtual Machine CPU remaining monitor | list | `[]` | no |
| cpu\_remaining\_rate\_message | Custom message for Virtual Machine CPU remaining monitor | string | `""` | no |
| cpu\_remaining\_rate\_silenced | Groups to mute for Virtual Machine CPU remaining monitor | map | `{}` | no |
| cpu\_remaining\_rate\_threshold\_critical | Jobs Failed rate limit (critical threshold) | string | `"15"` | no |
| cpu\_remaining\_rate\_threshold\_warning | Jobs Failed rate limit (warning threshold) | string | `"30"` | no |
| cpu\_remaining\_rate\_threshold\_critical | Virtual Machine CPU rate limit (critical threshold) | string | `"15"` | no |
| cpu\_remaining\_rate\_threshold\_warning | Virtual Machine CPU rate limit (warning threshold) | string | `"30"` | no |
| cpu\_remaining\_rate\_time\_aggregator | Monitor aggregator for Virtual Machine CPU remaining [available values: min, max, sum or avg] | string | `"min"` | no |
| cpu\_remaining\_rate\_timeframe | Monitor timeframe for Virtual Machine CPU remaining [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_5m"` | no |
| cpu\_usage\_enabled | Flag to enable Virtual Machine status monitor | string | `"true"` | no |

View File

@ -154,11 +154,11 @@ variable "cpu_remaining_rate_timeframe" {
}
variable "cpu_remaining_rate_threshold_warning" {
description = "Jobs Failed rate limit (warning threshold)"
description = "Virtual Machine CPU rate limit (warning threshold)"
default = 30
}
variable "cpu_remaining_rate_threshold_critical" {
description = "Jobs Failed rate limit (critical threshold)"
description = "Virtual Machine CPU rate limit (critical threshold)"
default = 15
}

View File

@ -1,7 +1,7 @@
resource "datadog_monitor" "virtualmachine_status" {
count = "${var.status_enabled ? 1 : 0}"
name = "[${var.environment}] Virtual Machine is down"
name = "[${var.environment}] Virtual Machine is unreachable"
message = "${coalesce(var.status_message, var.message)}"
query = <<EOF
@ -62,7 +62,7 @@ resource "datadog_monitor" "virtualmachine_cpu_usage" {
resource "datadog_monitor" "virtualmachine_credit_cpu_remaining_too_low" {
count = "${var.cpu_remaining_rate_enabled ? 1 : 0}"
name = "[${var.environment}] Virtual Machine credit CPU too low {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
name = "[${var.environment}] Virtual Machine credit CPU {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
message = "${coalesce(var.cpu_remaining_rate_message, var.message)}"
query = <<EOF
@ -83,7 +83,7 @@ resource "datadog_monitor" "virtualmachine_credit_cpu_remaining_too_low" {
silenced = "${var.cpu_remaining_rate_silenced}"
notify_no_data = true
notify_no_data = false
evaluation_delay = "${var.evaluation_delay}"
renotify_interval = 0
notify_audit = false