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

Merged in MON-134_memory_should_not_alerts_nbh_by_default (pull request #73)

Browse Source 
MON-134 make the memory message specific only and mandatory

Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Kevin Pecquet <kevin.pecquet@fr.clara.net>
This commit is contained in:
Quentin Manfroi 2018-03-23 18:45:59 +00:00
commit e50ef46639
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/generic/README.md
View File

@ -41,7 +41,7 @@ Inputs
| free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no | | free_disk_space_silenced | Groups to mute for Free diskspace monitor | map | `<map>` | no |
| free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no | | free_disk_space_threshold_critical | Free disk space critical threshold | string | `5` | no |
| free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no | | free_disk_space_threshold_warning | Free disk space warning threshold | string | `10` | no |
| free_memory_message | Custom message for Free memory monitor | string | `` | no | | free_memory_message | Custom message for Free memory monitor | string | - | yes |
| free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no | | free_memory_silenced | Groups to mute for Free memory monitor | map | `<map>` | no |
| free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no | | free_memory_threshold_critical | Free disk space critical threshold | string | `5` | no |
| free_memory_threshold_warning | Free disk space warning threshold | string | `10` | no | | free_memory_threshold_warning | Free disk space warning threshold | string | `10` | no |

1
system/generic/inputs.tf
View File

@ -106,7 +106,6 @@ variable "free_memory_silenced" {
variable "free_memory_message" { variable "free_memory_message" {
description = "Custom message for Free memory monitor" description = "Custom message for Free memory monitor"
type = "string" type = "string"
default = ""
} }
variable "free_memory_threshold_warning" { variable "free_memory_threshold_warning" {

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

@ -106,7 +106,7 @@ resource "datadog_monitor" "datadog_free_disk_space_inodes_too_low" {
resource "datadog_monitor" "datadog_free_memory" { resource "datadog_monitor" "datadog_free_memory" {
name = "[${var.environment}] Free memory {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}" name = "[${var.environment}] Free memory {{#is_alert}}{{comparator}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{comparator}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
message = "${coalesce(var.free_memory_message, var.message)}" message = "${var.free_memory_message}"
query = <<EOF query = <<EOF
min(last_1m): ( min(last_1m): (