From aea54196f61edf2a1df6ddd15a8f4746dbd51d57 Mon Sep 17 00:00:00 2001 From: Alexandre Gaillet Date: Tue, 27 Mar 2018 11:05:29 +0200 Subject: [PATCH] MON-82 - Nodata variable added and locals used to define it with oncall_alert value --- common/alerting-message/README.md | 6 ++++-- common/alerting-message/inputs.tf | 6 ++++++ common/alerting-message/main.tf | 8 +++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/common/alerting-message/README.md b/common/alerting-message/README.md index 3f9b8ec..a752715 100644 --- a/common/alerting-message/README.md +++ b/common/alerting-message/README.md @@ -8,8 +8,9 @@ How to use this module module "datadog-message-alerting" { source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//common/alerting-message?ref={revision}" - oncall_alert = "${var.oncall_alert}" - oncall_warning = "${var.oncall_warning}" + oncall_alert = "${var.message_alert}" + oncall_warning = "${var.message_warning}" + oncall_nodata = "${var.message_nodata}" } ``` @@ -30,6 +31,7 @@ Inputs |------|-------------|:----:|:-----:|:-----:| | append_text | Optional free text string to append to alert | string | `` | no | | oncall_alert | Define a broadcast channel for critical alerts | string | - | yes | +| oncall_nodata | Define a broadcast channel for nodata alerts | string | `` | no | | oncall_warning | Define a broadcast channel for warning alerts | string | - | yes | | prepend_text | Optional free text string to prepend to alert | string | `` | no | diff --git a/common/alerting-message/inputs.tf b/common/alerting-message/inputs.tf index e565f89..da4a755 100644 --- a/common/alerting-message/inputs.tf +++ b/common/alerting-message/inputs.tf @@ -8,6 +8,12 @@ variable "oncall_warning" { type = "string" } +variable "oncall_nodata" { + description = "Define a broadcast channel for nodata alerts" + type = "string" + default = "" +} + variable "prepend_text" { description = "Optional free text string to prepend to alert" type = "string" diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf index 7339c3f..9839765 100644 --- a/common/alerting-message/main.tf +++ b/common/alerting-message/main.tf @@ -1,3 +1,7 @@ +locals { + oncall_nodata = "${var.oncall_nodata == "" ? var.oncall_alert : var.oncall_nodata}" +} + data "template_file" "alerting-message" { template = <