Nagios Charm

Merge ~aluria/charm-nagios:bug/1836122-fixmp into ~nagios-charmers/charm-nagios:master

  1. Git
  2. lp:~aluria/charm-nagios
  3. bug/1836122-fixmp
  4. Merge into master
Proposed by Alvaro Uria
Status: Merged
Approved by: Peter Sabaini
Approved revision: 67109a956a93469641982b6b0a414803fb1bd988
Merged at revision: 7f3b310512f9e4b128a6872776057967d230f37a
Proposed branch: ~aluria/charm-nagios:bug/1836122-fixmp
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/templates/localhost_nagios2.cfg.tmpl (+1/-1)
Reviewer Review Type Date Requested Status
Peter Sabaini Approve
Canonical IS Reviewers Pending
Review via email: mp+374424@code.launchpad.net

Commit message

Previous commit missed service redefinition

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
Peter Sabaini (peter-sabaini) wrote :

lgtm

review: Approve
Revision history for this message
Peter Sabaini (peter-sabaini) wrote :

Merging as change seems trivial

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

Change successfully merged at revision 7f3b310512f9e4b128a6872776057967d230f37a

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/templates/localhost_nagios2.cfg.tmpl b/hooks/templates/localhost_nagios2.cfg.tmpl
2index e778357..ea2bcb0 100644
3--- a/hooks/templates/localhost_nagios2.cfg.tmpl
4+++ b/hooks/templates/localhost_nagios2.cfg.tmpl
5@@ -39,7 +39,7 @@ define service{
6 {%- if is_container %}
7 check_command check_disk!20%!10%!/
8 {%- else %}
9- check_command check_all_disks_no_squashfs!20%!10%
10+ check_command check_all_disks_no_virtual_fs!20%!10%
11 {%- endif %}
12 }
13

Subscribers

People subscribed via source and target branches