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

Fix consistency issue in grafana_dashboard module. #47459

Merged
merged 3 commits into from
Nov 9, 2018
Merged

Fix consistency issue in grafana_dashboard module. #47459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
436b22b
Fix issue in grafana_dashboard module.
ematysek Oct 23, 2018
909334d
Move 'dashboard' key check up to avoid key error on line 243.
ematysek Oct 29, 2018
f3531bd
Add changelog fragment for PR #47459
ematysek Nov 7, 2018
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
2 changes: 2 additions & 0 deletions changelogs/fragments/47459_grafana_dashboard_consistency_fix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- Fix consistency issue in grafana_dashboard module where the module would detect absence of 'dashboard' key on dashboard create but not dashboard update.
6 changes: 4 additions & 2 deletions lib/ansible/modules/monitoring/grafana_dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ def grafana_create_dashboard(module, data):
except Exception as e:
raise GrafanaAPIException("Can't load json file %s" % to_native(e))

# Check that the dashboard JSON is nested under the 'dashboard' key
if 'dashboard' not in payload:
payload = {'dashboard': payload}

# define http header
headers = grafana_headers(module, data)

Expand Down Expand Up @@ -278,8 +282,6 @@ def grafana_create_dashboard(module, data):
raise GrafanaAPIException('Unable to update the dashboard %s : %s' % (uid, body['message']))
else:
# create
if 'dashboard' not in payload:
payload = {'dashboard': payload}
r, info = fetch_url(module, '%s/api/dashboards/db' % data['grafana_url'], data=json.dumps(payload), headers=headers, method='POST')
if info['status'] == 200:
result['msg'] = "Dashboard %s created" % uid
Expand Down