Merge both SB6183 plugins

Add more error handling for bad status from modem

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>

plugins/router/arris-sb6183

@@ -27,6 +27,7 @@ This provides the following multigraphs:
 * upstream and downstream power levels
 * downstream signal to noise ratio
 * downstream error counts
+* uptime
 
 The values are retrieved from the cable modem's status web pages at
 192.168.100.1. So, this plugin must be installed on a munin node
@@ -74,7 +75,8 @@ import sys
 from urllib import request
 
 HOSTNAME = os.getenv("hostname", None)
-URL = "http://192.168.100.1/RgConnect.asp"
+STATUS_URL = "http://192.168.100.1/RgConnect.asp"
+INFO_URL = "http://192.168.100.1/RgSwInfo.asp"
 UPCOUNT = 4
 DOWNCOUNT = 16
 
@@ -83,6 +85,22 @@ if len(sys.argv) == 2:
         if HOSTNAME:
             print("host_name {0}\n".format(HOSTNAME))
 
+        # UPTIME
+        print(
+            """multigraph arris_uptime
+graph_title Modem Uptime
+graph_category system
+graph_args --base 1000 -l 0
+graph_vlabel uptime in days
+graph_scale no
+graph_category system
+graph_info This graph shows the number of days that the the host is up and running so far.
+uptime.label uptime
+uptime.info The system uptime itself in days.
+uptime.draw AREA
+"""
+        )
+
         # POWER
         print("multigraph arris_power")
         print("graph_title Arris Power (dBmV)")
@@ -170,7 +188,7 @@ if len(sys.argv) == 2:
         try:
             from lxml import html
 
-            resp = request.urlopen(URL)
+            resp = request.urlopen(STATUS_URL)
         except ImportError:
             print("no (missing lxml module)")
         except OSError:
@@ -188,26 +206,70 @@ rxblank = re.compile(r"[\x00\n\r\t ]+", re.MULTILINE)
 rxcomment = re.compile(r"<!--.*?-->")
 rxscript = re.compile(r"<script.*?</script>", re.MULTILINE)
 
-resp = request.urlopen(URL)
-data = rxscript.sub(
-    "",
-    rxcomment.sub(
+
+def process_url(url):
+    """
+    Extract simpleTables from page at URL
+    """
+    try:
+        resp = request.urlopen(url)
+    except OSError:
+        print("failed to contact router", file=sys.stderr)
+        return []
+    if resp.status != 200:
+        print(
+            "failed to get status page %d: %s" % (resp.status, resp.reason),
+            file=sys.stderr,
+        )
+        return []
+    data = rxscript.sub(
         "",
-        rxblank.sub(" ", "".join(map(lambda x: x.decode("utf-8"), resp.readlines()))),
-    ),
-)
-dom = html.fromstring(data)
+        rxcomment.sub(
+            "",
+            rxblank.sub(
+                " ", "".join(map(lambda x: x.decode("utf-8"), resp.readlines()))
+            ),
+        ),
+    )
+    dom = html.fromstring(data)
 
-arr = dom.xpath('//table[contains(@class, "simpleTable")]')
-downstream = arr[1]
-upstream = arr[2]
+    return dom.xpath('//table[contains(@class, "simpleTable")]')
 
-trs = downstream.findall("tr")
-# drop title
-trs.pop(0)
 
-headings = ["".join(x.itertext()).strip() for x in trs.pop(0).findall("td")]
-# ['Channel', 'Lock Status', 'Modulation', 'Channel ID', 'Frequency', 'Power', 'SNR', 'Corrected', 'Uncorrectables']
+print("multi_graph arris_uptime")
+arr = process_url(INFO_URL)
+if arr:
+    trs = arr[1].findall("tr")
+    # drop title
+    trs.pop(0)
+
+    date = "".join(trs[0].findall("td")[1].itertext()).strip()
+
+    arr = date.split(" ")
+    rx = re.compile(r"[hms]")
+    days = int(arr[0])
+    hms = rx.sub("", arr[2]).split(":")
+
+    seconds = ((days * 24 + int(hms[0])) * 60 + int(hms[1])) * 60 + int(hms[2])
+    print("uptime.value {0}".format(seconds / 86400.0))
+else:
+    print("uptime.value U")
+
+
+arr = process_url(STATUS_URL)
+if arr:
+    downstream = arr[1]
+    upstream = arr[2]
+
+    trs = downstream.findall("tr")
+    # drop title
+    trs.pop(0)
+
+    headings = ["".join(x.itertext()).strip() for x in trs.pop(0).findall("td")]
+    # ['Channel', 'Lock Status', 'Modulation', 'Channel ID', 'Frequency', 'Power', 'SNR', 'Corrected', 'Uncorrectables']
+else:
+    trs = []
+    headings = []
 
 # Summation Graphs
 correct = 0
@@ -223,7 +285,7 @@ for row in trs:
 
     channel = int(data["Channel"])
 
-    print("multigraph arris_power.down_{0}".format(channel))
+    print("\nmultigraph arris_power.down_{0}".format(channel))
     value = data["Power"].split(" ")[0]
     print("power.value {0}".format(value))
     power["down"][channel - 1] = value
@@ -239,7 +301,7 @@ for row in trs:
 
 # Fill missing
 for i in range(len(trs), DOWNCOUNT):
-    print("multigraph arris_power.down_{0}".format(i + 1))
+    print("\nmultigraph arris_power.down_{0}".format(i + 1))
     print("power.value U")
 
     print("multigraph arris_snr.down_{0}".format(i + 1))
@@ -250,19 +312,25 @@ for i in range(len(trs), DOWNCOUNT):
     print("uncr.value U")
 
 print("multigraph arris_error")
-print("corr.value {0}".format(correct))
-print("uncr.value {0}".format(uncorr))
+if arr:
+    print("corr.value {0}".format(correct))
+    print("uncr.value {0}".format(uncorr))
+else:
+    print("corr.value U")
+    print("uncr.value U")
 
 print("multigraph arris_snr")
 for i in range(0, DOWNCOUNT):
     print("down_{0}.value {1}".format(i + 1, snr[i]))
 
-trs = upstream.findall("tr")
-# drop title
-trs.pop(0)
+if arr:
+    trs = upstream.findall("tr")
+    # drop title
+    trs.pop(0)
+
+    headings = ["".join(x.itertext()).strip() for x in trs.pop(0).findall("td")]
+    # ['Channel', 'Lock Status', 'US Channel Type', 'Channel ID', 'Symbol Rate', 'Frequency', 'Power']
 
-headings = ["".join(x.itertext()).strip() for x in trs.pop(0).findall("td")]
-# ['Channel', 'Lock Status', 'US Channel Type', 'Channel ID', 'Symbol Rate', 'Frequency', 'Power']
 for row in trs:
     data = dict(
         zip(headings, ["".join(x.itertext()).strip() for x in row.findall("td")])