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

Allow Datadog monitors to be retrieved by id instead of name. (#3456)

Browse source
This commit is contained in:
Fabian Krämer 2016-12-06 09:31:52 +11:00 committed by Matt Clay
parent 5454c562e9
commit 320ae068ed
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/modules/extras/monitoring/datadog_monitor.py
View file

@ -105,6 +105,11 @@ options:
required: false required: false
default: null default: null
version_added: "2.3" version_added: "2.3"
id:
description: ["The id of the alert. If set, will be used instead of the name to locate the alert."]
required: false
default: null
version_added: "2.3"
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -172,7 +177,8 @@ def main():
thresholds=dict(required=False, type='dict', default=None), thresholds=dict(required=False, type='dict', default=None),
tags=dict(required=False, type='list', default=None), tags=dict(required=False, type='list', default=None),
locked=dict(required=False, default=False, type='bool'), locked=dict(required=False, default=False, type='bool'),
require_full_window=dict(required=False, default=None, type='bool') require_full_window=dict(required=False, default=None, type='bool'),
id=dict(required=False)
) )
) )
@ -203,9 +209,16 @@ def _fix_template_vars(message):
def _get_monitor(module): def _get_monitor(module):
for monitor in api.Monitor.get_all(): if module.params['id'] is not None:
if monitor['name'] == module.params['name']: monitor = api.Monitor.get(module.params['id'])
return monitor if 'errors' in monitor:
module.fail_json(msg="Failed to retrieve monitor with id %s, errors are %s" % (module.params['id'], str(monitor['errors'])))
return monitor
else:
monitors = api.Monitor.get_all()
for monitor in monitors:
if monitor['name'] == module.params['name']:
return monitor
return {} return {}