Skip to content

Bug fixes #10

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

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Bug fixes #10

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
68806b8
Fixed annotations tags and userid params
Oct 5, 2021
55145d3
fixing the uncaught exception when message is not json but has messag…
Dec 22, 2021
43a2258
it makes sense to replace the conditions
Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grafana_client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def __request_runnner(url, json=None, headers=None):
response = r.json()
except ValueError:
response = r.text
message = response["message"] if "message" in response else r.text
message = response["message"] if type(response) == dict and "message" in response else r.text

if 500 <= r.status_code < 600:
raise GrafanaServerError(
Expand Down
4 changes: 2 additions & 2 deletions grafana_client/elements/annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ def get_annotation(
params.append("panelId=%s" % panel_id)

if user_id:
params.append("userId=%s", user_id)
params.append("userId=%s" % user_id)

if ann_type:
params.append("type=%s", ann_type)
params.append("type=%s" % ann_type)

if tags:
for tag in tags:
Expand Down