Merged in MON-82-update-with-new-variable-name (pull request #77)

MON-82 - alerting-message variables updated

Approved-by: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Approved-by: Kevin Pecquet <kevin.pecquet@fr.clara.net>
Approved-by: Patrick Decat <patrick.decat@fr.clara.net>
Approved-by: Adrien Broyere <adrien.broyere@fr.clara.net>
Approved-by: Jérôme Respaut <shr3ps@gmail.com>
Approved-by: Quentin Manfroi <quentin.manfroi@yahoo.fr>
This commit is contained in:
Alexandre Gaillet 2018-03-29 10:00:31 +00:00 committed by Quentin Manfroi
commit 938b71e0c5
3 changed files with 31 additions and 20 deletions

View File

@ -6,10 +6,11 @@ How to use this module
``` ```
module "datadog-message-alerting" { module "datadog-message-alerting" {
source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//common/alerting-message?ref={revision}" source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//common/alerting-message?ref={revision}"
oncall_24x7 = "${var.oncall_24x7}" message_alert = "${var.oncall_24x7}"
oncall_office_hours = "${var.oncall_office_hours}" message_warning = "${var.oncall_business_hours}"
message_nodata = "${var.oncall_nodata}"
} }
``` ```
@ -18,8 +19,9 @@ Purpose
Creates a DataDog monitor alert message with the following inputs : Creates a DataDog monitor alert message with the following inputs :
* PagerDuty NBH service name * A broadcast channel for critical alerts
* PagerDuty BH service name * A broadcast channel for nodata alerts
* A broadcast channel for warning alerts
* Prepend test free string * Prepend test free string
* Append text free string * Append text free string
@ -29,8 +31,9 @@ Inputs
| Name | Description | Type | Default | Required | | Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:| |------|-------------|:----:|:-----:|:-----:|
| append_text | Optional free text string to append to alert | string | `` | no | | append_text | Optional free text string to append to alert | string | `` | no |
| oncall_24x7 | Define PagerDuty NBH service name for alerts and nodata | string | - | yes | | message_alert | Define a broadcast channel for critical alerts | string | - | yes |
| oncall_office_hours | Define PagerDuty BH service name for warning alerts | string | - | yes | | message_nodata | Define a broadcast channel for nodata alerts | string | `` | no |
| message_warning | Define a broadcast channel for warning alerts | string | - | yes |
| prepend_text | Optional free text string to prepend to alert | string | `` | no | | prepend_text | Optional free text string to prepend to alert | string | `` | no |
Related documentation Related documentation

View File

@ -1,13 +1,19 @@
variable "oncall_24x7" { variable "message_alert" {
description = "Define PagerDuty NBH service name for alerts and nodata" description = "Define a broadcast channel for critical alerts"
type = "string" type = "string"
} }
variable "oncall_office_hours" { variable "message_warning" {
description = "Define PagerDuty BH service name for warning alerts" description = "Define a broadcast channel for warning alerts"
type = "string" type = "string"
} }
variable "message_nodata" {
description = "Define a broadcast channel for nodata alerts"
type = "string"
default = ""
}
variable "prepend_text" { variable "prepend_text" {
description = "Optional free text string to prepend to alert" description = "Optional free text string to prepend to alert"
type = "string" type = "string"

View File

@ -1,18 +1,20 @@
data "template_file" "alerting-message" { data "template_file" "alerting-message" {
template = <<EOF template = <<EOF
$${prepend_text} $${prepend_text}
{{#is_alert}}$${oncall_24x7}{{/is_alert}} {{#is_alert}}$${message_alert}{{/is_alert}}
{{#is_recovery}}$${oncall_24x7}{{/is_recovery}} {{#is_recovery}}$${message_alert}{{/is_recovery}}
{{#is_warning}}$${oncall_office_hours}{{/is_warning}} {{#is_warning}}$${message_warning}{{/is_warning}}
{{#is_warning_recovery}}$${oncall_office_hours}{{/is_warning_recovery}} {{#is_warning_recovery}}$${message_warning}{{/is_warning_recovery}}
{{#is_no_data}}$${oncall_24x7}{{/is_no_data}} {{#is_no_data}}$${message_nodata}{{/is_no_data}}
{{#is_no_data_recovery}}$${message_nodata}{{/is_no_data_recovery}}
$${append_text} $${append_text}
EOF EOF
vars { vars {
oncall_24x7 = "${var.oncall_24x7}" message_alert = "${var.message_alert}"
oncall_office_hours = "${var.oncall_office_hours}" message_warning = "${var.message_warning}"
prepend_text = "${var.prepend_text}" message_nodata = "${coalesce(var.message_nodata,var.message_alert)}"
append_text = "${var.append_text}" prepend_text = "${var.prepend_text}"
append_text = "${var.append_text}"
} }
} }