@daemonitor/plugins 1.1.5 → 1.1.8

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -54,11 +54,24 @@ function parseNum(s) {
     const m = /(-?\d+(?:\.\d+)?)/.exec(s || "");
     return m ? Number(m[1]) : undefined;
 }
+// net-snmp renders octet strings that contain a NUL/non-printable byte (e.g. HP's
+// NUL-terminated "Black Cartridge 81A HP CF281A\0") as space-separated hex.
+// Decode that back to text, and strip control chars from any value.
+function decodeSnmp(s) {
+    const t = s.trim();
+    if (/^([0-9A-Fa-f]{2})(\s+[0-9A-Fa-f]{2})+\s*$/.test(t)) {
+        const bytes = t.split(/\s+/).map((h) => parseInt(h, 16));
+        return Buffer.from(bytes).toString("latin1").replace(/[\x00-\x1f\x7f]+/g, "").trim();
+    }
+    return t.replace(/[\x00-\x1f\x7f]+/g, "").trim();
+}
 async function snmpGet(t, oid, timeout = 8000) {
     try {
         const { stdout } = await pexec("snmpget", ["-v", t.version || "2c", "-c", t.community || "public", "-Ovq", "-t", "2", "-r", "1", t.ip, oid], { timeout });
-        const v = stdout.trim().replace(/^"|"$/g, "");
-        return v && !/No Such|no response|Timeout/i.test(v) ? v : null;
+        const raw = stdout.trim().replace(/^"|"$/g, "");
+        if (!raw || /No Such|no response|Timeout/i.test(raw))
+            return null;
+        return decodeSnmp(raw);
     }
     catch {
         return null;
@@ -67,7 +80,7 @@ async function snmpGet(t, oid, timeout = 8000) {
 async function snmpWalk(t, oid, timeout = 10000) {
     try {
         const { stdout } = await pexec("snmpwalk", ["-v", t.version || "2c", "-c", t.community || "public", "-Oqv", "-t", "2", "-r", "1", t.ip, oid], { timeout });
-        return stdout.split("\n").map((l) => l.trim().replace(/^"|"$/g, "")).filter(Boolean);
+        return stdout.split("\n").map((l) => decodeSnmp(l.trim().replace(/^"|"$/g, ""))).filter(Boolean);
     }
     catch {
         return [];
@@ -75,32 +88,38 @@ async function snmpWalk(t, oid, timeout = 10000) {
 }
 async function collectPrinter(t) {
     const warnPct = t.tonerWarnPct ?? 10;
-    const [model, serial, pagesRaw, statusRaw, descs, maxes, levels] = await Promise.all([
+    // Walk LEVELS (clean numeric values, one per row) to get the supply indices,
+    // then fetch each supply's description/max by that index — a single get whose
+    // (possibly multi-line hex) value decodeSnmp handles, so a long description
+    // can't be split into phantom supplies and misalign the levels.
+    const [model, serial, pagesRaw, statusRaw, levelRows] = await Promise.all([
         snmpGet(t, OID.model),
         snmpGet(t, OID.serial),
         snmpGet(t, OID.pages),
         snmpGet(t, OID.status),
-        snmpWalk(t, OID.supplyDesc),
-        snmpWalk(t, OID.supplyMax),
-        snmpWalk(t, OID.supplyLevel),
+        snmpWalkIndexed(t, OID.supplyLevel),
     ]);
     // No response at all → the printer is unreachable / SNMP off.
-    if (model == null && serial == null && pagesRaw == null && !descs.length) {
+    if (model == null && serial == null && pagesRaw == null && !levelRows.length) {
         return { name: t.name, ip: t.ip, kind: "printer", reachable: false };
     }
-    // Pair descriptions with levels. prtMarkerSuppliesLevel semantics: -2 =
-    // unknown, -3 = "some remaining" (a level the device won't quantify); else a
-    // count out of MaxCapacity (which can itself be -2 = unknown).
-    const supplies = descs.map((desc, i) => {
-        const max = Number(maxes[i]);
-        const lvl = Number(levels[i]);
+    // prtMarkerSuppliesLevel semantics: -2 = unknown, -3 = "some remaining" (a
+    // level the device won't quantify); else a count out of MaxCapacity (which can
+    // itself be -2 = unknown).
+    const supplies = await Promise.all(levelRows.map(async (row) => {
+        const [descRaw, maxRaw] = await Promise.all([
+            snmpGet(t, `${OID.supplyDesc}.${row.idx}`),
+            snmpGet(t, `${OID.supplyMax}.${row.idx}`),
+        ]);
+        const lvl = Number(row.val);
+        const max = Number(maxRaw);
         let pct = null;
         if (lvl === -3)
-            pct = 100; // "ok / some remaining"
+            pct = 100;
         else if (lvl >= 0 && max > 0)
             pct = Math.round((lvl / max) * 100);
-        return { name: desc, level: lvl, max, pct };
-    });
+        return { name: descRaw || "supply", level: lvl, max, pct };
+    }));
     const low = supplies.filter((s) => s.pct != null && s.pct <= warnPct);
     return {
         name: t.name,
@@ -164,7 +183,9 @@ async function snmpWalkIndexed(t, oid, timeout = 10000) {
             const m = /^(\S+)\s*=\s*[^:]+:\s*(.*)$/.exec(l.trim());
             if (!m)
                 return null;
-            const idx = m[1].startsWith(oid) ? m[1].slice(oid.length).replace(/^\./, "") : m[1];
+            // snmpwalk -On emits a leading dot (".1.3.6…") the bare OID lacks.
+            const clean = m[1].replace(/^\./, "");
+            const idx = clean.startsWith(oid) ? clean.slice(oid.length).replace(/^\./, "") : clean;
             return { idx, val: m[2].trim().replace(/^"|"$/g, "") };
         }).filter(Boolean);
     }
@@ -199,11 +220,19 @@ async function collectQnap(t) {
         const [st, tp, sm, ds] = await Promise.all([
             snmpGet(t, QNAP.hdStatus + i), snmpGet(t, QNAP.hdTemp + i), snmpGet(t, QNAP.hdSmart + i), snmpGet(t, QNAP.hdDescr + i),
         ]);
-        if (st == null && tp == null)
+        const status = st != null ? Number(st) : undefined;
+        const tempC = parseC(tp);
+        // Empty bay: no readable temp and a non-ready (negative/absent, e.g. -5)
+        // status. Skip it — an empty slot isn't a failed disk.
+        if (tempC == null && (status == null || status < 0))
             continue;
-        disks.push({ slot: i, descr: ds || undefined, tempC: parseC(tp), status: st != null ? Number(st) : undefined, smart: sm || undefined });
+        disks.push({ slot: i, descr: ds || undefined, tempC, status, smart: sm && sm !== "--" ? sm : undefined });
     }
-    const badDisks = disks.filter((d) => (d.status != null && d.status !== 0) || (d.smart && !/good|normal/i.test(d.smart)) || (d.tempC != null && d.tempC >= tempWarn));
+    // A present disk is bad only on a real error status, an explicitly-bad SMART
+    // verdict, or overheating — not a blank "--" or an empty bay.
+    const badDisks = disks.filter((d) => (d.status != null && d.status !== 0) ||
+        (typeof d.smart === "string" && /warn|abnormal|fail|error|bad|caution/i.test(d.smart)) ||
+        (d.tempC != null && d.tempC >= tempWarn));
     // Volumes — the CACHEDEVn_DATA mounts from hrStorage.
     const volumes = [];
     for (const row of storDescrs.filter((r) => /CACHEDEV\d+_DATA$/.test(r.val))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daemonitor/plugins",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "daemonitor plugins",
   "types": "types/index.d.ts",
   "main": "dist/index.js",