Merge ~peter-sabaini/charm-hw-health:sas2ircu-allow-optimal-state into ~nagios-charmers/charm-hw-health:master

Proposed by Peter Sabaini
Status: Merged
Approved by: Aurelien Lourot
Approved revision: 465e3d23eaa5f14c746986341edd5a150d9ea9e3
Merged at revision: 4ec4549fd5cb205b9d31a81ca55d49203ac8de25
Proposed branch: ~peter-sabaini/charm-hw-health:sas2ircu-allow-optimal-state
Merge into: ~nagios-charmers/charm-hw-health:master
Diff against target: 12 lines (+1/-1)
1 file modified
src/files/sas2ircu/check_sas2ircu.py (+1/-1)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers Pending
Nagios Charm developers Pending
Review via email: mp+377999@code.launchpad.net

Commit message

Fix: sas2ircu "Optimal" state should be ok too

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
Aurelien Lourot (aurelien-lourot) wrote :

+1, looks good to me

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

Change cannot be self approved, setting status to needs review.

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

Change successfully merged at revision 4ec4549fd5cb205b9d31a81ca55d49203ac8de25

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/files/sas2ircu/check_sas2ircu.py b/src/files/sas2ircu/check_sas2ircu.py
2index b22c380..7a4c861 100755
3--- a/src/files/sas2ircu/check_sas2ircu.py
4+++ b/src/files/sas2ircu/check_sas2ircu.py
5@@ -34,7 +34,7 @@ def parse_output():
6 tmpdev = devices.get(device[2], [])
7 tmpdev.append('{}:{}'.format(device[0], device[1]))
8 devices[device[2]] = tmpdev
9- if 'Ready' not in device:
10+ if not ('Ready' in device or 'Optimal' in device):
11 critical = True
12 device = []
13

Subscribers

People subscribed via source and target branches