Merge ~brettmilford/charm-grafana:lp-1893320 into charm-grafana:master

[Brett Milford]

Fix LP #1893320

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Paul Goins (vultaire)]

Hi,

It looks like there are merge issues; reactive/grafana.py is showing diff markers, which I'm guessing are coming from Launchpad. Can you ensure you have the latest sources for the master branch, then re-base this change on top of that?

review: Needs Fixing

[Brett Milford (brettmilford)]

Hi Paul,
Thanks for your review.
I have now rebased the change off of master and that appears to have fixed the diff markers.

[Chris Johnston (cjohnston)]

review: Approve

[Celia Wang (ziyiwang)]

LGTM

review: Approve

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

Change successfully merged at revision 247b88d3f2a0f1735f5091f560c4c61843778daa

[Joe Guo (guoqiao)]

I confirmed this patch fixed this grafana issue: "Exception reaching prometheus API whilst updating dashboards"

diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index 31c364b..b1869df 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -890,9 +890,8 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
             "Exception while trying to reach prometheus API: {}".format(e),
             "ERROR",
         )
-        hookenv.status_set(
-            "blocked", "Exception reaching prometheus API whilst updating dashboards"
-        )
+        hookenv.status_set("blocked", "Exception reaching prometheus API whilst "
+                                      "updating dashboards")
         return
 
     if response.status_code != 200:
@@ -1052,17 +1051,23 @@ def generate_query(ds, is_default, id=None, org_id=1):
 
     else:
         if "username" in ds and "password" in ds:
-            stmt = (
-                "UPDATE DATA_SOURCE SET basic_auth_user = ?, "
-                "basic_auth_password = ?, basic_auth = 1"
-            )
-            values = (ds["username"], ds["password"])
+            username = ds["username"]
+            password = ds["password"]
+            basic_auth = 1
         else:
-            stmt = (
-                "UPDATE DATA_SOURCE SET basic_auth_user = ?, "
-                "basic_auth_password = ?, basic_auth = 0"
-            )
-            values = ("", "")
+            username = ""
+            password = ""
+            basic_auth = 0
+
+        stmt = (
+            "UPDATE DATA_SOURCE SET "
+            "basic_auth_user = ?, "
+            "basic_auth_password = ?, "
+            "basic_auth = ?,"
+            "url = ? "
+            "WHERE id = ?"
+        )
+        values = (username, password, basic_auth, ds["url"], id)
     return (stmt, values)