ansible-collection/grafana-ansible-collection
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs in Modules as part of inclusion discussion (#20)

Browse Source 
* Remove hosted instance limited reached

* Updated bug fixes for stack and contactPoint

* indentation fixes

* indetation fixes

* Fix contactPoint out of scope issue

* Fix stack_found usecase

* Update cloud_stack.py

* Update cloud_stack.py

* Fix for sanity check

* fixes

* fix

* fix sanity

Co-authored-by: Ishan Jain <ishan.jain@gmail.com>
This commit is contained in:
Ishan Jain 2022-11-01 12:38:33 +05:30 committed by GitHub
parent 993776a3a8
commit e103856767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/modules/alert_contact_point.py
View File

@ -148,8 +148,7 @@ def present_alert_contact_point(module):
if result.status_code == 202: if result.status_code == 202:
return False, True, result.json() return False, True, result.json()
elif result.status_code == 500: elif result.status_code == 500:
api_url = 'https://' + module.params['stack_slug'] + '.grafana.net/api/v1/provisioning/contact-points/' + \ api_url = 'https://' + module.params['stack_slug'] + '.grafana.net/api/v1/provisioning/contact-points/' + module.params['uid']
module.params['uid']
result = requests.put(api_url, json=body, headers={"Authorization": 'Bearer ' + module.params['grafana_api_key']}) result = requests.put(api_url, json=body, headers={"Authorization": 'Bearer ' + module.params['grafana_api_key']})
@ -158,9 +157,17 @@ def present_alert_contact_point(module):
result = requests.get(api_url, headers={"Authorization": 'Bearer ' + module.params['grafana_api_key']}) result = requests.get(api_url, headers={"Authorization": 'Bearer ' + module.params['grafana_api_key']})
contactPointFound = False
contactPointInfo = {}
for contact_points in result.json(): for contact_points in result.json():
if contact_points['uid'] == module.params['uid']: if contact_points['uid'] == module.params['uid']:
return False, True, contact_points contactPointFound = True
contactPointInfo = contact_points
if contactPointFound:
return False, True, contactPointInfo
else:
return True, False, "Contact Point not found"
else: else:
return True, False, {"status": result.status_code, 'response': result.json()['message']} return True, False, {"status": result.status_code, 'response': result.json()['message']}

16
plugins/modules/cloud_stack.py
View File

@ -148,18 +148,24 @@ def present_cloud_stack(module):
api_url = 'https://grafana.com/api/instances' api_url = 'https://grafana.com/api/instances'
result = requests.post(api_url, json=body, headers={"Authorization": 'Bearer ' + module.params['cloud_api_key']}) result = requests.post(api_url, json=body, headers={"Authorization": 'Bearer ' + module.params['cloud_api_key']})
if result.status_code == 200: if result.status_code == 200:
return False, True, result.json() return False, True, result.json()
elif result.status_code in [409, 403] and result.json()['message'] in ["That url is not available", "Hosted instance limit reached"]: elif result.status_code in [409, 403] and result.json()['message'] in ["That url is not available", "Hosted instance limit reached"]:
stack_found = False
if result.json['message'] == "That url is not available":
api_url = 'https://grafana.com/api/orgs/' + module.params['org_slug'] + '/instances' api_url = 'https://grafana.com/api/orgs/' + module.params['org_slug'] + '/instances'
result = requests.get(api_url, headers={"Authorization": 'Bearer ' + module.params['cloud_api_key']}) result = requests.get(api_url, headers={"Authorization": 'Bearer ' + module.params['cloud_api_key']})
stackInfo = {}
for stack in result.json()['items']: for stack in result.json()['items']:
if stack['slug'] == module.params['stack_slug']: if stack['slug'] == module.params['stack_slug']:
return False, False, stack stack_found = True
stackInfo = stack
if stack_found:
return False, False, stackInfo
else:
return True, False, "Stack is not found under your org"
elif result.json['message'] == "Hosted instance limit reached":
return True, False, "You have reached Maximum number of Cloud Stacks in your Org."
else: else:
return True, False, {"status": result.status_code, 'response': result.json()['message']} return True, False, {"status": result.status_code, 'response': result.json()['message']}