From 68806b8998fbd8237dffe7bb91ea4c9712a6f217 Mon Sep 17 00:00:00 2001 From: Artur Dobrogowski Date: Tue, 5 Oct 2021 12:13:06 +0200 Subject: [PATCH 1/3] Fixed annotations tags and userid params --- grafana_client/elements/annotations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana_client/elements/annotations.py b/grafana_client/elements/annotations.py index a01337e7..b22ea797 100644 --- a/grafana_client/elements/annotations.py +++ b/grafana_client/elements/annotations.py @@ -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: From 55145d328a46b88da1a52addd3436d937219d1f7 Mon Sep 17 00:00:00 2001 From: Artur Dobrogowski Date: Wed, 22 Dec 2021 16:21:29 +0100 Subject: [PATCH 2/3] fixing the uncaught exception when message is not json but has message word in it --- grafana_client/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana_client/client.py b/grafana_client/client.py index d295c5cc..3d34c4af 100644 --- a/grafana_client/client.py +++ b/grafana_client/client.py @@ -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 "message" in response and type(response) == dict else r.text if 500 <= r.status_code < 600: raise GrafanaServerError( From 43a225804e64d3e612f667402d20e4081977a018 Mon Sep 17 00:00:00 2001 From: Artur Dobrogowski Date: Fri, 11 Feb 2022 10:54:06 +0100 Subject: [PATCH 3/3] it makes sense to replace the conditions --- grafana_client/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana_client/client.py b/grafana_client/client.py index 3d34c4af..4a9b5979 100644 --- a/grafana_client/client.py +++ b/grafana_client/client.py @@ -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 and type(response) == dict 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(