mirror of
https://git.freebsd.org/ports.git
synced 2025-05-25 07:26:29 -04:00
7bc876ee2e
After upgrading to version 20100318_4, users reported ValueError for
some disks [1]
Also fix Python 3.x compatibility [2]
While I'm here:
- Pet portlint, NO_* in USE{S} section
- Make concurrent-safe, installs executables in libexec
PR: 236873
Reported by: Thomas Eckhardt <freebsd eckieck de> [1]
Submitted by: Thomas Eckhardt <freebsd eckieck de> [1]
Submitted by: Krzysztof <ports bsdserwis com> (maintainer) [2]
Approved by: Krzysztof <ports bsdserwis com> (maintainer)
MFH: 2019Q2 (bugfixes)
143 lines
6.2 KiB
Text
143 lines
6.2 KiB
Text
--- check_smartmon.orig 2019-04-16 21:26:22 UTC
|
|
+++ check_smartmon
|
|
@@ -52,8 +52,8 @@ def parseCmdLine(args):
|
|
version = "%%prog %s" % (__version__)
|
|
|
|
parser = OptionParser(usage=usage, version=version)
|
|
- parser.add_option("-d", "--device", action="store", dest="device", default="", metavar="DEVICE",
|
|
- help="device to check")
|
|
+ parser.add_option("-d", "--device", action="store", dest="device", default="", metavar="DEVICE",
|
|
+ help="device to check")
|
|
parser.add_option("-v", "--verbosity", action="store",
|
|
dest="verbosity", type="int", default=0,
|
|
metavar="LEVEL", help="set verbosity level to LEVEL; defaults to 0 (quiet), \
|
|
@@ -123,7 +123,7 @@ def callSmartMonTools(path, device):
|
|
"")
|
|
healthStatusOutput = ""
|
|
for line in child_stdout:
|
|
- healthStatusOutput = healthStatusOutput + line
|
|
+ healthStatusOutput = healthStatusOutput + line.decode('utf-8')
|
|
# done
|
|
|
|
# get temperature
|
|
@@ -138,7 +138,7 @@ def callSmartMonTools(path, device):
|
|
|
|
temperatureOutput = ""
|
|
for line in child_stdout:
|
|
- temperatureOutput = temperatureOutput + line
|
|
+ temperatureOutput = temperatureOutput + line.decode('utf-8')
|
|
# done
|
|
|
|
return (0 ,"", healthStatusOutput, temperatureOutput)
|
|
@@ -153,6 +153,7 @@ def parseOutput(healthMessage, temperatu
|
|
|
|
vprint(3, "parseOutput: Device type is %s" % devType)
|
|
|
|
+ healthStatus = ""
|
|
if devType == "ata":
|
|
# parse health status
|
|
#
|
|
@@ -162,13 +163,16 @@ def parseOutput(healthMessage, temperatu
|
|
getNext = 0
|
|
for line in lines:
|
|
if getNext:
|
|
- statusLine = line
|
|
- break
|
|
+ if line != "SMART STATUS RETURN: incomplete response, ATA output registers missing" and \
|
|
+ line != "SMART Status not supported: Incomplete response, ATA output registers missing" :
|
|
+ statusLine = line
|
|
+ break
|
|
elif line == "=== START OF READ SMART DATA SECTION ===":
|
|
getNext = 1
|
|
# fi
|
|
# done
|
|
|
|
+ vprint(3, "parseOutput: statusLine is: '%s'" % statusLine )
|
|
if getNext:
|
|
parts = statusLine.split()
|
|
healthStatus = parts[-1]
|
|
@@ -181,7 +185,7 @@ def parseOutput(healthMessage, temperatu
|
|
parts = line.split()
|
|
if len(parts):
|
|
# 194 is the temperature value id
|
|
- if parts[0] == "194":
|
|
+ if parts[0] == "194" or parts[0] == "190":
|
|
temperature = int(parts[9])
|
|
break
|
|
# fi
|
|
@@ -190,9 +194,11 @@ def parseOutput(healthMessage, temperatu
|
|
# if devType == ata
|
|
|
|
if devType == "scsi":
|
|
- stat_re = re.compile( r'SMART Health Status:' )
|
|
+ vprint(3, "parseOutput: searching for 'SMART Health Status' section")
|
|
+ stat_re = re.compile( r'SMART Health Status:|SMART overall-health self-assessment test result:' )
|
|
lines = healthMessage.split("\n")
|
|
for line in lines:
|
|
+ vprint(3, "parseOutput: line is: '%s'" % line)
|
|
if stat_re.search( line ):
|
|
parts = line.split()
|
|
healthStatus = parts[-1]
|
|
@@ -201,19 +207,25 @@ def parseOutput(healthMessage, temperatu
|
|
# done
|
|
|
|
# get temperature from temperatureMessage
|
|
- stat_re = re.compile( r'Current Drive Temperature:' )
|
|
+ temperature = 0
|
|
+ vprint(3, "parseOutput: searching for temperature line section")
|
|
+ stat_re = re.compile( r'Current Drive Temperature:|Temperature_Celsius' )
|
|
lines = temperatureMessage.split("\n")
|
|
for line in lines:
|
|
+ vprint(3, "parseOutput: line is: '%s'" % line)
|
|
if stat_re.search( line ):
|
|
parts = line.split()
|
|
- temperature = int(parts[-2])
|
|
+ vprint(3, "parseOutput: we are very keen on this line: '%s'" % line)
|
|
+ temperature = int(parts[-3])
|
|
+ vprint(3, "parseOutput: Is this the temperature? '%s'" % temperature)
|
|
break
|
|
# fi
|
|
+
|
|
# done
|
|
|
|
# if devType == scsi
|
|
|
|
- vprint(3, "Health status: %s" % healthStatus)
|
|
+ vprint(3, "Health status: %s" % healthStatus)
|
|
vprint(3, "Temperature: %d" %temperature)
|
|
|
|
return (healthStatus, temperature)
|
|
@@ -225,6 +237,7 @@ def createReturnInfo(healthStatus, tempe
|
|
|
|
# this is absolutely critical!
|
|
if healthStatus not in [ "PASSED", "OK" ]:
|
|
+ vprint(2, "Health status: %s" % healthStatus)
|
|
return (2, "CRITICAL: device does not pass health status")
|
|
# fi
|
|
|
|
@@ -241,7 +254,7 @@ def createReturnInfo(healthStatus, tempe
|
|
def exitWithMessage(value, message):
|
|
"""Exit with given value and status message."""
|
|
|
|
- print message
|
|
+ print( message )
|
|
sys.exit(value)
|
|
# end
|
|
|
|
@@ -254,7 +267,7 @@ def vprint(level, message):
|
|
"""
|
|
|
|
if level <= verbosity:
|
|
- print message
|
|
+ print( message )
|
|
# fi
|
|
# end
|
|
|
|
@@ -287,6 +300,7 @@ if __name__ == "__main__":
|
|
# check device type, ATA is default
|
|
vprint(2, "Get device type")
|
|
devtype = options.devtype
|
|
+ vprint(2, "command line supplied device type is: %s" % devtype)
|
|
if not devtype:
|
|
devtype = "ATA"
|
|
|