NRPE Charm

Merge ~xavpaice/charm-nrpe:revert-9edfedcf38d9507685097fb397986802193301ce into ~nrpe-charmers/charm-nrpe:master

  1. Git
  2. lp:~xavpaice/charm-nrpe
  3. revert-9edfedcf38d9507685097fb397986802193301ce
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: Celia Wang
Approved revision: 5d03594b4891c9e4dfad390d88720ae45a95af5f
Merged at revision: 8078948f4a5495ae1f02431dd3bbc99b57d34ead
Proposed branch: ~xavpaice/charm-nrpe:revert-9edfedcf38d9507685097fb397986802193301ce
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/nrpe_helpers.py (+1/-1)
Reviewer Review Type Date Requested Status
Celia Wang Approve
Canonical IS Reviewers Pending
Review via email: mp+379267@code.launchpad.net

Commit message

Revert "hooks/nrpe_helpers.py: fix yaml.load warning"

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
Celia Wang (ziyiwang) wrote :

LGTM.

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

Change successfully merged at revision 8078948f4a5495ae1f02431dd3bbc99b57d34ead

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 c22ec16..5900f4c 100644
3--- a/hooks/nrpe_helpers.py
4+++ b/hooks/nrpe_helpers.py
5@@ -234,7 +234,7 @@ class PrincipalRelation(helpers.RelationContext):
6 monitors = Monitors()
7 for rel in self[self.name]:
8 if rel.get('monitors'):
9- monitors.add_monitors(yaml.load(rel['monitors'], Loader=yaml.FullLoader), 'principal')
10+ monitors.add_monitors(yaml.load(rel['monitors']), 'principal')
11 return monitors
12
13 def provide_data(self):

Subscribers

People subscribed via source and target branches