Grafana Charm

Merge charm-grafana:blacken into charm-grafana:master

  1. Git
  2. lp:charm-grafana
  3. blacken
  4. Merge into master
Proposed by Adam Dyess
Status: Merged
Approved by: James Troup
Approved revision: e2bb680b1d5013f9f0914aa11a2a2d637da99cce
Merged at revision: dc55051892d868b066caad0a712f4b53cdf8bd77
Proposed branch: charm-grafana:blacken
Merge into: charm-grafana:master
Diff against target: 164 lines (+36/-14)
4 files modified
src/lib/charms/layer/grafana.py (+4/-1)
src/reactive/grafana.py (+20/-9)
src/tests/functional/tests/test_grafana.py (+9/-3)
src/tests/unit/test_grafana.py (+3/-1)
Reviewer Review Type Date Requested Status
BootStack Reviewers Pending
Review via email: mp+391696@code.launchpad.net

Commit message

run make black against master

Description of the change

I've run `make black` against the master branch

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Adam Dyess (addyess) wrote :

➜ make lint
Running lint checks
lint installed: appdirs==1.4.3,black==20.8b1,CacheControl==0.12.6,certifi==2019.11.28,chardet==3.0.4,click==7.1.2,colorama==0.4.3,contextlib2==0.6.0,distlib==0.3.0,distro==1.4.0,flake8==3.8.3,flake8-colors==0.1.6,flake8-docstrings==1.5.0,flake8-import-order==0.18.1,flake8-polyfill==1.0.2,html5lib==1.0.1,idna==2.8,ipaddr==2.2.0,lockfile==0.12.2,mccabe==0.6.1,msgpack==0.6.2,mypy-extensions==0.4.3,packaging==20.3,pathspec==0.8.0,pep517==0.8.2,pep8-naming==0.11.1,progress==1.5,pycodestyle==2.6.0,pydocstyle==5.1.1,pyflakes==2.2.0,pyparsing==2.4.6,pytoml==0.1.21,regex==2020.9.27,requests==2.22.0,retrying==1.3.3,six==1.14.0,snowballstemmer==2.0.0,toml==0.10.1,typed-ast==1.4.1,typing-extensions==3.7.4.3,urllib3==1.25.8,webencodings==0.5.1
lint run-test-pre: PYTHONHASHSEED='1582272002'
lint run-test: commands[0] | flake8
lint run-test: commands[1] | black --check --exclude '/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/' .
All done! ✨ 🍰 ✨
5 files would be left unchanged.
_________________________________________________________________________________________________________________________________________ summary _________________________________________________________________________________________________________________________________________
  lint: commands succeeded
  congratulations :)

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision dc55051892d868b066caad0a712f4b53cdf8bd77

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/lib/charms/layer/grafana.py b/src/lib/charms/layer/grafana.py
2index d48c5bd..ecd8c69 100644
3--- a/src/lib/charms/layer/grafana.py
4+++ b/src/lib/charms/layer/grafana.py
5@@ -118,7 +118,10 @@ def post_dashboard(name, dashboard):
6 return (False, "Unable to retrieve grafana password.")
7 api_auth = ("admin", passwd)
8 r = requests.post(
9- import_url, auth=api_auth, headers=headers, data=json.dumps(dashboard),
10+ import_url,
11+ auth=api_auth,
12+ headers=headers,
13+ data=json.dumps(dashboard),
14 )
15 if r.status_code == 200:
16 return (True, None)
17diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
18index ff26b3e..4d3f1fa 100644
19--- a/src/reactive/grafana.py
20+++ b/src/reactive/grafana.py
21@@ -188,7 +188,8 @@ def install_packages():
22
23 if config.changed("install_file") and config.get("install_file"):
24 hookenv.status_set(
25- "maintenance", "Installing deb pkgs since install_file changed",
26+ "maintenance",
27+ "Installing deb pkgs since install_file changed",
28 )
29
30 url = config.get("install_file")
31@@ -286,7 +287,8 @@ def install_plugins():
32 def upgrade_charm():
33 """Run upgrade charm hook."""
34 hookenv.status_set(
35- "maintenance", "Forcing package update and reconfiguration on upgrade-charm",
36+ "maintenance",
37+ "Forcing package update and reconfiguration on upgrade-charm",
38 )
39 remove_state("grafana.installed")
40 remove_state("grafana.backup.configured")
41@@ -318,7 +320,9 @@ def config_changed():
42 else:
43 # Install from requested channel
44 snap.install(
45- SNAP_NAME, channel=config["snap_channel"], force_dangerous=False,
46+ SNAP_NAME,
47+ channel=config["snap_channel"],
48+ force_dangerous=False,
49 )
50 remove_state("grafana.configured")
51 if config.changed("dashboards_backup_schedule") or config.changed(
52@@ -401,7 +405,8 @@ def add_backup_api_keys():
53 for i in select_query("SELECT id FROM org"):
54 org_id = i[0]
55 if select_query(
56- "SELECT id FROM api_key WHERE org_id=? AND name=?", [org_id, name],
57+ "SELECT id FROM api_key WHERE org_id=? AND name=?",
58+ [org_id, name],
59 ):
60 hookenv.log(
61 "API key {} in org {} already exists, skipping".format(name, org_id)
62@@ -475,7 +480,8 @@ def setup_backup_shedule():
63 hookenv.status_set("maintenance", "Configuring grafana dashboard backup")
64 hookenv.log("Setting up dashboards backup job...")
65 host.rsync(
66- "files/dashboards_backup", "/usr/local/bin/dashboards_backup",
67+ "files/dashboards_backup",
68+ "/usr/local/bin/dashboards_backup",
69 )
70 host.mkdir(config.get("dashboards_backup_dir"))
71 settings = {
72@@ -604,7 +610,8 @@ def sources_gone(relation):
73 conn = sqlite3.connect("{}/grafana.db".format(data_dir), timeout=30)
74 cur = conn.cursor()
75 cur.execute(
76- "DELETE FROM DATA_SOURCE WHERE type=? AND url=?", (ds["type"], ds["url"]),
77+ "DELETE FROM DATA_SOURCE WHERE type=? AND url=?",
78+ (ds["type"], ds["url"]),
79 )
80 conn.commit()
81 cur.close()
82@@ -784,7 +791,9 @@ def check_and_add_dashboard(
83 hookenv.log(
84 "Skipping Dashboard Template: {} missing {} metrics."
85 "Missing: {}".format(
86- filename, len(missing_metrics), ", ".join(missing_metrics),
87+ filename,
88+ len(missing_metrics),
89+ ", ".join(missing_metrics),
90 ),
91 hookenv.DEBUG,
92 )
93@@ -820,7 +829,8 @@ def check_and_add_dashboard(
94
95 hookenv.log(
96 "dashboard differences[{}], dashboard title[{}]".format(
97- dashboard_changed, dashboard_json["dashboard"]["title"],
98+ dashboard_changed,
99+ dashboard_json["dashboard"]["title"],
100 ),
101 hookenv.DEBUG,
102 )
103@@ -1020,7 +1030,8 @@ def get_orgs(port, passwd):
104 https://grafana.com/docs/grafana/latest/http_api/org/
105 """
106 req = requests.get(
107- "http://127.0.0.1:{}/api/orgs".format(port), auth=("admin", passwd),
108+ "http://127.0.0.1:{}/api/orgs".format(port),
109+ auth=("admin", passwd),
110 )
111 return req.json() if req.status_code == 200 else []
112
113diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
114index f848077..beeddd2 100644
115--- a/src/tests/functional/tests/test_grafana.py
116+++ b/src/tests/functional/tests/test_grafana.py
117@@ -41,7 +41,9 @@ class BaseGrafanaTest(unittest.TestCase):
118 """Get grafana admin password."""
119 if self._admin_pass is None:
120 action = model.run_action(
121- self.lead_unit_name, "get-admin-password", raise_on_failure=True,
122+ self.lead_unit_name,
123+ "get-admin-password",
124+ raise_on_failure=True,
125 )
126 self._admin_pass = action.data["results"]["password"]
127 return self._admin_pass
128@@ -84,7 +86,9 @@ class CharmOperationTest(BaseGrafanaTest):
129 We'll retry until the TEST_TIMEOUT.
130 """
131 test_command = "{} -I 127.0.0.1 -p {} -u {}".format(
132- "/usr/lib/nagios/plugins/check_http", DEFAULT_API_PORT, DEFAULT_API_URL,
133+ "/usr/lib/nagios/plugins/check_http",
134+ DEFAULT_API_PORT,
135+ DEFAULT_API_URL,
136 )
137 timeout = time.time() + TEST_TIMEOUT
138 while time.time() < timeout:
139@@ -174,7 +178,9 @@ class CharmOperationTest(BaseGrafanaTest):
140 "role": "Viewer",
141 }
142 action = model.run_action(
143- self.lead_unit_name, "create-user", action_params=params,
144+ self.lead_unit_name,
145+ "create-user",
146+ action_params=params,
147 )
148 self.assertTrue(action.data["results"]["Code"] == "0")
149 time.sleep(30) # Dirty hack to overcome race condition
150diff --git a/src/tests/unit/test_grafana.py b/src/tests/unit/test_grafana.py
151index b9c75a9..c2386e4 100644
152--- a/src/tests/unit/test_grafana.py
153+++ b/src/tests/unit/test_grafana.py
154@@ -109,7 +109,9 @@ class GrafanaTestCase(unittest.TestCase):
155
156 @mock.patch.object(grafana, "model_name")
157 @mock.patch.object(
158- grafana, "get_folders", return_value=[{"id": 7, "title": "[juju-foo-model]"}],
159+ grafana,
160+ "get_folders",
161+ return_value=[{"id": 7, "title": "[juju-foo-model]"}],
162 )
163 @mock.patch.object(grafana, "create_folder")
164 def test_ensure_and_get_dash_folder_folder_exists(

Subscribers

No one subscribed via source and target branches