Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grafana_datasource: use the Ansible helpers to get basic auth header #54183

Merged
merged 2 commits into from
Mar 25, 2019
Merged

grafana_datasource: use the Ansible helpers to get basic auth header #54183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eda0117
grafana_datasource: use the Ansible helpers to get basic auth header
Mar 21, 2019
7b018c5
Update grafana_datasource_fix_basic_auth_python3_issue.yaml
rrey Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/grafana_datasource_fix_basic_auth_python3_issue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- grafana_datasource - Fixed an issue when running Python3 and using basic auth
(https://github.com/ansible/ansible/issues/49147)
8 changes: 3 additions & 5 deletions lib/ansible/modules/monitoring/grafana_datasource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
import base64

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.urls import fetch_url
from ansible.module_utils.urls import fetch_url, basic_auth_header
from ansible.module_utils._text import to_bytes

__metaclass__ = type
Expand Down Expand Up @@ -373,8 +373,7 @@ def grafana_create_datasource(module, data):
if 'grafana_api_key' in data and data['grafana_api_key'] is not None:
headers['Authorization'] = "Bearer %s" % data['grafana_api_key']
else:
auth = base64.b64encode(to_bytes('%s:%s' % (data['grafana_user'], data['grafana_password'])).replace('\n', ''))
headers['Authorization'] = 'Basic %s' % auth
headers['Authorization'] = basic_auth_header(data['grafana_user'], data['grafana_password'])
grafana_switch_organisation(module, data['grafana_url'], data['org_id'], headers)

# test if datasource already exists
Expand Down Expand Up @@ -433,8 +432,7 @@ def grafana_delete_datasource(module, data):
if 'grafana_api_key' in data and data['grafana_api_key']:
headers['Authorization'] = "Bearer %s" % data['grafana_api_key']
else:
auth = base64.b64encode(to_bytes('%s:%s' % (data['grafana_user'], data['grafana_password'])).replace('\n', ''))
headers['Authorization'] = 'Basic %s' % auth
headers['Authorization'] = basic_auth_header(data['grafana_user'], data['grafana_password'])
grafana_switch_organisation(module, data['grafana_url'], data['org_id'], headers)

# test if datasource already exists
Expand Down