Canonical Livepatch Charm

Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

  1. Git
  2. lp:~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Haw Loeung
Approved revision: 155bdf5d60e9147afdc544f6ef7903f5b3f9aa33
Merged at revision: 3685dc481025de1ebb47c83947e27080c5fa00f1
Proposed branch: ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into: ~livepatch-charmers/charm-canonical-livepatch:master
Diff against target: 20 lines (+6/-1)
1 file modified
reactive/canonical_livepatch.py (+6/-1)
Reviewer Review Type Date Requested Status
Haw Loeung Approve
Review via email: mp+317814@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
2index c667ee7..c467bec 100644
3--- a/reactive/canonical_livepatch.py
4+++ b/reactive/canonical_livepatch.py
5@@ -262,9 +262,14 @@ def init_nagios_checks(nagios):
6 '/var/lib/nagios/canonical-livepatch-status.txt',
7 )
8
9+ # remove check from previous release with poorly formed name
10+ nrpe_setup.remove_check(
11+ shortname = 'check_canonical-livepatch'
12+ )
13+
14 # use charmhelpers to create the check
15 nrpe_setup.add_check(
16- 'check_canonical-livepatch',
17+ 'canonical-livepatch',
18 'Verify canonical-livepatch is working',
19 '/usr/lib/nagios/plugins/check_canonical-livepatch.py'
20 )

Subscribers

People subscribed via source and target branches