Merge ~woutervb/charm-nrpe:network into ~nrpe-charmers/charm-nrpe:master

Proposed by Wouter van Bommel
Status: Merged
Approved by: Xav Paice
Approved revision: a220d1ffa44773f0167424cc937017f35b63f681
Merged at revision: 3e7db367f05f842b2fe14fd3cdf19749eaba0fd8
Proposed branch: ~woutervb/charm-nrpe:network
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 19 lines (+3/-2)
1 file modified
files/plugins/check_lacp_bond.py (+3/-2)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+367444@code.launchpad.net

Commit message

Bond mismatch should not be critical

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
Xav Paice (xavpaice) wrote :

LGTM

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

Change successfully merged at revision 3e7db367f05f842b2fe14fd3cdf19749eaba0fd8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/plugins/check_lacp_bond.py b/files/plugins/check_lacp_bond.py
2index b28f369..3e39986 100755
3--- a/files/plugins/check_lacp_bond.py
4+++ b/files/plugins/check_lacp_bond.py
5@@ -52,11 +52,12 @@ def check_lacp_bond(iface):
6 d_bond[slave] = slave_aggr_value
7
8 if slave_aggr_value != bond_aggr_value:
9- msg = 'CRITICAL: aggregator_id mismatch '
10+ # If we can report then only 1/2 the bond is down
11+ msg = 'WARNING: aggregator_id mismatch '
12 msg += '({0}:{1} - {2}:{3})'
13 msg = msg.format(iface, bond_aggr_value,
14 slave, slave_aggr_value)
15- raise CriticalError(msg)
16+ raise WarnError(msg)
17
18 else:
19 msg = 'CRITICAL: {} is not a bonding interface'.format(iface)

Subscribers

People subscribed via source and target branches