Merge ~aluria/charm-nrpe:blacken-20.10 into charm-nrpe:master

Proposed by Alvaro Uria
Status: Merged
Approved by: Drew Freiberger
Approved revision: 28e9f560e8a913cb326787383bbc9217b590341d
Merged at revision: bdaf268faeaa4019cc5fffe952f080d9c53c1c97
Proposed branch: ~aluria/charm-nrpe:blacken-20.10
Merge into: charm-nrpe:master
Diff against target: 50 lines (+11/-4)
2 files modified
hooks/nrpe_helpers.py (+5/-2)
hooks/nrpe_utils.py (+6/-2)
Reviewer Review Type Date Requested Status
Drew Freiberger (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+392305@code.launchpad.net

This proposal supersedes a proposal from 2020-10-15.

Commit message

Fix linting by running black

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

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

Revision history for this message
Drew Freiberger (afreiberger) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
2index dcc7c38..c230fa9 100644
3--- a/hooks/nrpe_helpers.py
4+++ b/hooks/nrpe_helpers.py
5@@ -39,7 +39,8 @@ class Monitors(dict):
6
7 for checktype in mdict["monitors"].get("local", []):
8 check_details = self.convert_local_checks(
9- mdict["monitors"]["local"], monitor_label,
10+ mdict["monitors"]["local"],
11+ monitor_label,
12 )
13 self["monitors"]["remote"]["nrpe"].update(check_details)
14
15@@ -58,7 +59,9 @@ class Monitors(dict):
16 for checkname in monitors[checktype]:
17 try:
18 check_def = NRPECheckCtxt(
19- checktype, monitors[checktype][checkname], monitor_src,
20+ checktype,
21+ monitors[checktype][checkname],
22+ monitor_src,
23 )
24 mons[check_def["cmd_name"]] = {"command": check_def["cmd_name"]}
25 except InvalidCustomCheckException as e:
26diff --git a/hooks/nrpe_utils.py b/hooks/nrpe_utils.py
27index d20bb37..d59276e 100644
28--- a/hooks/nrpe_utils.py
29+++ b/hooks/nrpe_utils.py
30@@ -151,7 +151,9 @@ def process_local_monitors():
31 for check in monitors[checktype]:
32 render_nrpe_check_config(
33 nrpe_helpers.NRPECheckCtxt(
34- checktype, monitors[checktype][check], monitor_src,
35+ checktype,
36+ monitors[checktype][check],
37+ monitor_src,
38 )
39 )
40
41@@ -248,7 +250,9 @@ class ExportManagerCallback(ManagerCallback):
42 nag_hostname = nrpe_helpers.PrincipalRelation().nagios_hostname()
43 target = "/var/lib/nagios/export/host__{}.cfg".format(nag_hostname)
44 renderer = helpers.render_template(
45- source="export_host.cfg.tmpl", target=target, perms=0o644,
46+ source="export_host.cfg.tmpl",
47+ target=target,
48+ perms=0o644,
49 )
50 renderer(manager, service_name, event_name)
51

Subscribers

People subscribed via source and target branches

to all changes: