Attachment 201703 Details for Bug 235475 – patch check_smartmon

[patch] patch check_smartmon

patch-check_smartmon (text/plain), 3.02 KB, created by Dan Langille on 2019-02-04 03:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2019-02-04 03:00:05 UTC

Size: 3.02 KB

patch

obsolete

>--- check_smartmon.orig	2019-02-04 02:54:55 UTC
>+++ check_smartmon
>@@ -59,7 +59,7 @@ def parseCmdLine(args):
>                         metavar="LEVEL", help="set verbosity level to LEVEL; defaults to 0 (quiet), \
>                                         possible values go up to 3")
>         parser.add_option("-t", "--type", action="store", dest="devtype", default="ata", metavar="DEVTYPE",
>-                        help="type of device (ATA|SCSI)")
>+                        help="type of device (ata|scsi)")
>         parser.add_option("-w", "--warning-threshold", metavar="TEMP", action="store",
>                         type="int", dest="warningThreshold", default=55,
>                         help="set temperature warning threshold to given temperature (defaults to 55)")
>@@ -161,9 +161,12 @@ def parseOutput(healthMessage, temperatureMessage, dev
>                 lines = healthMessage.split("\n")
>                 getNext = 0
>                 for line in lines:
>+                        vprint(3, "parseOutput: line is: '%s'" % line)
>                         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
>@@ -181,7 +184,7 @@ def parseOutput(healthMessage, temperatureMessage, dev
>                         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
>@@ -225,6 +228,7 @@ def createReturnInfo(healthStatus, temperature, warnin
> 
>         # 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
> 
>@@ -287,11 +291,12 @@ 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"
>-
>-        if device_re.search( device ):
>-                devtype = "scsi"
>+                if device_re.search( device ):
>+                        devtype = "scsi"
>+                else:
>+                        devtype = "ata"
> 
>         vprint(1, "Device type: %s" % devtype)
>

Actions: View | Diff

Attachments on bug 235475: 201703 | 201732