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

Fix grafana_datasource fails when name with spaces (#63987)

Browse source
This commit is contained in:
Rémi REY 2019-10-30 08:15:26 +01:00 committed by John R Barker
parent 9c17c7ad19
commit df6b7bf77f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/monitoring/grafana_datasource.py
View file

@ -360,6 +360,7 @@ import json
import base64
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six.moves.urllib.parse import quote
from ansible.module_utils.urls import fetch_url, url_argument_spec
from ansible.module_utils._text import to_text
@ -390,7 +391,7 @@ def grafana_headers(module, data):
def grafana_datasource_exists(module, grafana_url, name, headers):
datasource_exists = False
ds = {}
r, info = fetch_url(module, '%s/api/datasources/name/%s' % (grafana_url, name), headers=headers, method='GET')
r, info = fetch_url(module, '%s/api/datasources/name/%s' % (grafana_url, quote(name)), headers=headers, method='GET')
if info['status'] == 200:
datasource_exists = True
ds = json.loads(to_text(r.read(), errors='surrogate_or_strict'))
@ -562,7 +563,7 @@ def grafana_delete_datasource(module, data):
result = {}
if datasource_exists is True:
# delete
r, info = fetch_url(module, '%s/api/datasources/name/%s' % (data['grafana_url'], data['name']), headers=headers, method='DELETE')
r, info = fetch_url(module, '%s/api/datasources/name/%s' % (data['grafana_url'], quote(data['name'])), headers=headers, method='DELETE')
if info['status'] == 200:
res = json.loads(to_text(r.read(), errors='surrogate_or_strict'))
result['msg'] = "Datasource %s deleted : %s" % (data['name'], res['message'])