Content Cache Charm

Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. cleanup
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 8ccc08425eb2fa0238ebbd8955dd53da8f46bec2
Merged at revision: 4e9738a32e1bde3a82c4489575e5205c3aadb8bd
Proposed branch: ~hloeung/content-cache-charm:cleanup
Merge into: content-cache-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/content_cache.py (+1/-1)
Reviewer Review Type Date Requested Status
Stephen Muss (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+382980@code.launchpad.net

Commit message

Fixed name of haproxy procs check, check_check_haproxy_procs.cfg, no no no!

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
Stephen Muss (stephenmuss) wrote :

lgtm

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

Change successfully merged at revision 4e9738a32e1bde3a82c4489575e5205c3aadb8bd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/content_cache.py b/reactive/content_cache.py
2index 758a171..ca03482 100644
3--- a/reactive/content_cache.py
4+++ b/reactive/content_cache.py
5@@ -429,7 +429,7 @@ def configure_nagios():
6 )
7
8 # Ensure we only have two HAProxy processes around - LP:1828496
9- check_name = 'check_haproxy_procs'
10+ check_name = 'haproxy_procs'
11 description = 'HAProxy process count'
12 cmd = '/usr/lib/nagios/plugins/check_procs -c2 -w2 -C haproxy'
13 nrpe_setup.add_check(shortname=check_name, description=description, check_cmd=cmd)

Subscribers

People subscribed via source and target branches