cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2119 from hypergig/patch-2

Browse source 
message template variable fix
This commit is contained in:
Adrian Likins 2016-05-16 10:43:51 -04:00
commit e880bc8f75
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
monitoring/datadog_monitor.py
View file

@ -63,7 +63,7 @@ options:
description: ["The name of the alert."] description: ["The name of the alert."]
required: true required: true
message: message:
description: ["A message to include with notifications for this monitor. Email notifications can be sent to specific users by using the same '@username' notation as events."] description: ["A message to include with notifications for this monitor. Email notifications can be sent to specific users by using the same '@username' notation as events. Monitor message template variables can be accessed by using double square brackets, i.e '[[' and ']]'."]
required: false required: false
default: null default: null
silenced: silenced:
@ -107,7 +107,7 @@ datadog_monitor:
name: "Test monitor" name: "Test monitor"
state: "present" state: "present"
query: "datadog.agent.up".over("host:host1").last(2).count_by_status()" query: "datadog.agent.up".over("host:host1").last(2).count_by_status()"
message: "Some message." message: "Host [[host.name]] with IP [[host.ip]] is failing to report to datadog."
api_key: "9775a026f1ca7d1c6c5af9d94d9595a4" api_key: "9775a026f1ca7d1c6c5af9d94d9595a4"
app_key: "87ce4a24b5553d2e482ea8a8500e71b8ad4554ff" app_key: "87ce4a24b5553d2e482ea8a8500e71b8ad4554ff"
@ -176,6 +176,9 @@ def main():
elif module.params['state'] == 'unmute': elif module.params['state'] == 'unmute':
unmute_monitor(module) unmute_monitor(module)
def _fix_template_vars(message):
return message.replace('[[', '{{').replace(']]', '}}')
def _get_monitor(module): def _get_monitor(module):
for monitor in api.Monitor.get_all(): for monitor in api.Monitor.get_all():
@ -187,7 +190,7 @@ def _get_monitor(module):
def _post_monitor(module, options): def _post_monitor(module, options):
try: try:
msg = api.Monitor.create(type=module.params['type'], query=module.params['query'], msg = api.Monitor.create(type=module.params['type'], query=module.params['query'],
name=module.params['name'], message=module.params['message'], name=module.params['name'], message=_fix_template_vars(module.params['message']),
options=options) options=options)
if 'errors' in msg: if 'errors' in msg:
module.fail_json(msg=str(msg['errors'])) module.fail_json(msg=str(msg['errors']))
@ -204,7 +207,7 @@ def _equal_dicts(a, b, ignore_keys):
def _update_monitor(module, monitor, options): def _update_monitor(module, monitor, options):
try: try:
msg = api.Monitor.update(id=monitor['id'], query=module.params['query'], msg = api.Monitor.update(id=monitor['id'], query=module.params['query'],
name=module.params['name'], message=module.params['message'], name=module.params['name'], message=_fix_template_vars(module.params['message']),
options=options) options=options)
if 'errors' in msg: if 'errors' in msg:
module.fail_json(msg=str(msg['errors'])) module.fail_json(msg=str(msg['errors']))