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

message template variable fix

Browse source 
Due to ansible/jinja2 templating, it is difficult to use the monitor message template variables as they need to be surrounded by `{{` and `}}`, this change addresses that issue by allowing the user to use `[[` and `]]` instead.
This commit is contained in:
Jordan Cohen 2016-04-27 12:32:27 -04:00 • committed by Matt Clay
parent 755535ed7f
commit 97d5d80983
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/extras/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:
@ -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']))