turnip

Merge ~barryprice/turnip:master into turnip:master

  1. Git
  2. lp:~barryprice/turnip
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Colin Watson
Approved revision: 0afd76d8de5e24befeb2dade992d13d55bf9146f
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~barryprice/turnip:master
Merge into: turnip:master
Diff against target: 12 lines (+1/-1)
1 file modified
charm/layer/turnip-base/lib/charms/turnip/base.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+399759@code.launchpad.net

Commit message

Reformat our E2E check hint to avoid using parentheses, which Nagios considers illegal

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/layer/turnip-base/lib/charms/turnip/base.py b/charm/layer/turnip-base/lib/charms/turnip/base.py
2index 4cd1f55..39e0fcc 100644
3--- a/charm/layer/turnip-base/lib/charms/turnip/base.py
4+++ b/charm/layer/turnip-base/lib/charms/turnip/base.py
5@@ -320,7 +320,7 @@ def add_nagios_e2e_checks(nagios):
6 nagios.add_check(
7 [os.path.join(nrpe_dir(), 'check_git_refs'), url],
8 name='check_turnip_git_refs_{}'.format(i),
9- description='Git E2E {} (hint: check nfs-ganesha status)'.format(
10+ description='Git E2E {} - hint: check nfs-ganesha status'.format(
11 url),
12 context=config['nagios_context'])
13

Subscribers

People subscribed via source and target branches