mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Check if api_key and app_key before proceeding (#24336)
Fix adds check if app_key and api_key provided by user is correct or not. If this combination is wrong then fail with appropriate error message given by Datadog server Fixes https://github.com/ansible/ansible/issues/24325 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
parent
d999d613cb
commit
e342b281d8
2 changed files with 13 additions and 4 deletions
|
@ -210,6 +210,14 @@ def main():
|
|||
|
||||
initialize(**options)
|
||||
|
||||
# Check if api_key and app_key is correct or not
|
||||
# if not, then fail here.
|
||||
response = api.Monitor.get_all()
|
||||
if isinstance(response, dict):
|
||||
msg = response.get('errors', None)
|
||||
if msg:
|
||||
module.fail_json(msg="Failed to connect Datadog server using given app_key and api_key : {0}".format(msg[0]))
|
||||
|
||||
if module.params['state'] == 'present':
|
||||
install_monitor(module)
|
||||
elif module.params['state'] == 'absent':
|
||||
|
@ -219,6 +227,7 @@ def main():
|
|||
elif module.params['state'] == 'unmute':
|
||||
unmute_monitor(module)
|
||||
|
||||
|
||||
def _fix_template_vars(message):
|
||||
if message:
|
||||
return message.replace('[[', '{{').replace(']]', '}}')
|
||||
|
@ -255,11 +264,13 @@ def _post_monitor(module, options):
|
|||
e = get_exception()
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
|
||||
def _equal_dicts(a, b, ignore_keys):
|
||||
ka = set(a).difference(ignore_keys)
|
||||
kb = set(b).difference(ignore_keys)
|
||||
return ka == kb and all(a[k] == b[k] for k in ka)
|
||||
|
||||
|
||||
def _update_monitor(module, monitor, options):
|
||||
try:
|
||||
kwargs = dict(id=monitor['id'], query=module.params['query'],
|
||||
|
@ -323,8 +334,7 @@ def mute_monitor(module):
|
|||
module.fail_json(msg="Monitor %s not found!" % module.params['name'])
|
||||
elif monitor['options']['silenced']:
|
||||
module.fail_json(msg="Monitor is already muted. Datadog does not allow to modify muted alerts, consider unmuting it first.")
|
||||
elif (module.params['silenced'] is not None
|
||||
and len(set(monitor['options']['silenced']) - set(module.params['silenced'])) == 0):
|
||||
elif (module.params['silenced'] is not None and len(set(monitor['options']['silenced']) - set(module.params['silenced'])) == 0):
|
||||
module.exit_json(changed=False)
|
||||
try:
|
||||
if module.params['silenced'] is None or module.params['silenced'] == "":
|
||||
|
|
|
@ -422,7 +422,6 @@ lib/ansible/modules/monitoring/bigpanda.py
|
|||
lib/ansible/modules/monitoring/boundary_meter.py
|
||||
lib/ansible/modules/monitoring/circonus_annotation.py
|
||||
lib/ansible/modules/monitoring/datadog_event.py
|
||||
lib/ansible/modules/monitoring/datadog_monitor.py
|
||||
lib/ansible/modules/monitoring/honeybadger_deployment.py
|
||||
lib/ansible/modules/monitoring/icinga2_feature.py
|
||||
lib/ansible/modules/monitoring/librato_annotation.py
|
||||
|
|
Loading…
Reference in a new issue