Dzahn has submitted this change and it was merged.
Change subject: account for hosts where every disk is raid 0 (e.g. the ms-be
hosts)
......................................................................
account for hosts where every disk is raid 0 (e.g. the ms-be hosts)
Change-Id: I3e18053cc4e895bfd3a8ed2241b549d7cc124e0c
---
M modules/base/files/monitoring/check-raid.py
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/files/monitoring/check-raid.py
b/modules/base/files/monitoring/check-raid.py
index ad36a83..4d816c2 100755
--- a/modules/base/files/monitoring/check-raid.py
+++ b/modules/base/files/monitoring/check-raid.py
@@ -234,8 +234,10 @@
stateRegex = re.compile('^State\s*:\s*([^\n]*)')
drivesRegex = re.compile('^Number Of Drives( per span)?\s*:\s*([^\n]*)')
+ configuredRegex = re.compile('^Adapter \d+: No Virtual Drive Configured')
state = None
numDrives = None
+ configured = True
for line in proc.stdout:
m = stateRegex.match(line)
if m is not None:
@@ -247,14 +249,23 @@
numDrives = int(m.group(2))
continue
+ c = configuredRegex.match(line)
+ if c is not None:
+ configured = False
+ continue
+
ret = proc.wait()
if ret != 0:
print 'WARNING: MegaCli64 returned exit status %d' % (ret)
return 1
if numDrives is None:
- print 'WARNING: Parse error processing MegaCli64 output'
- return 1
+ if configured:
+ print 'WARNING: Parse error processing MegaCli64 output'
+ return 1
+ else:
+ print 'OK: No disks configured for RAID'
+ return 0
if state != 'Optimal':
print 'CRITICAL: %s' % (state)
--
To view, visit https://gerrit.wikimedia.org/r/80055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e18053cc4e895bfd3a8ed2241b549d7cc124e0c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
