Merge ~raychan96/charm-grafana:bug/2007846 into charm-grafana:master

[Chi Wai CHAN]

Use `json` instead of `data` when performing `requests.post()` since it will set the correct content type automatically.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:dd95e23fe6d6572c142eae20da0ab32b9b4d4338
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/107/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/36/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/1//rebuild

review: Needs Fixing (continuous-integration)

[Nobuto Murata (nobuto)]

My only question is; is the change compatible with older releases of Grafana too?

[Chi Wai CHAN (raychan96)]

> My only question is; is the change compatible with older releases of Grafana
> too?

I've manually tried on 20.04/stable, 7/stable, 6/stable, 5/stable, replacing `data` with `json` is compatible.

[Nobuto Murata (nobuto)]

> I've manually tried on 20.04/stable, 7/stable, 6/stable, 5/stable, replacing `data` with `json` is compatible.

💯

Thanks for checking!

[Eric Chen (eric-chen)]

LGTM, wait for jenkins pass the CI.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:9631e9f7a2112a6ce910135b4d4c3cc381bfec2d
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/108/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/37/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/2//rebuild

review: Approve (continuous-integration)

[Ramesh Sattaru (rameshcan)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 2d085466a066577172866fb973953e9dea158548

diff --git a/src/lib/charms/layer/grafana.py b/src/lib/charms/layer/grafana.py
index 170a125..c88b176 100644
--- a/src/lib/charms/layer/grafana.py
+++ b/src/lib/charms/layer/grafana.py
@@ -2,7 +2,6 @@
 """Grafana layer module."""
 import base64
 import enum
-import json
 import os
 import re
 import subprocess
@@ -136,7 +135,7 @@ def create_folder(folder_name):
         "{}://localhost:{}/api/folders".format(get_protocol(), config("port")),
         auth=("admin", get_admin_password()),
         headers={"Accept": "application/json"},
-        data={"title": folder_name},
+        json={"title": folder_name},
         verify=False,
     )
     r.raise_for_status()
@@ -169,7 +168,6 @@ def ensure_and_get_dash_folder(remote_model):
 
 def post_dashboard(name, dashboard):
     """Upload a dashboard to Grafana."""
-    headers = {"Content-Type": "application/json"}
     import_url = "{}://localhost:{}/api/dashboards/db".format(
         get_protocol(), config("port")
     )
@@ -180,8 +178,8 @@ def post_dashboard(name, dashboard):
     r = requests.post(
         import_url,
         auth=api_auth,
-        headers=headers,
-        data=json.dumps(dashboard),
+        headers={"Accept": "application/json"},
+        json=dashboard,
         verify=False,
     )
     if r.status_code == 200: