@daemonitor/plugins 1.1.4 → 1.1.7

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -29,14 +29,49 @@ const SYS = {
     ifOper: "1.3.6.1.2.1.2.2.1.8", // ifOperStatus (walk): 1=up 2=down
     ifAdmin: "1.3.6.1.2.1.2.2.1.7", // ifAdminStatus (walk): 1=up (enabled)
 };
+// QNAP enterprise MIB (NAS-MIB, 1.3.6.1.4.1.24681.1.2). A full walk of this
+// subtree times out on QTS, so everything here is fetched by exact OID.
+const QNAP = {
+    cpuUsage: "1.3.6.1.4.1.24681.1.2.1.0", // systemCPU-Usage e.g. "3.5 %"
+    cpuTemp: "1.3.6.1.4.1.24681.1.2.5.0", // cpu-Temperature e.g. "67 C/152 F"
+    sysTemp: "1.3.6.1.4.1.24681.1.2.6.0", // systemTemperature
+    model: "1.3.6.1.4.1.24681.1.2.12.0", // e.g. "TS-963X"
+    hdNumber: "1.3.6.1.4.1.24681.1.2.10.0", // installed disk count
+    hdDescr: "1.3.6.1.4.1.24681.1.2.11.1.2.", // + index
+    hdTemp: "1.3.6.1.4.1.24681.1.2.11.1.3.",
+    hdStatus: "1.3.6.1.4.1.24681.1.2.11.1.4.", // 0 = ready/ok
+    hdSmart: "1.3.6.1.4.1.24681.1.2.11.1.7.", // "GOOD" / "Warning"
+};
 function slug(s) {
     return s.replace(/[^a-zA-Z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "");
 }
+// QNAP reports temps as "67 C/152 F" and percentages as "3.5 %" — pull the number.
+function parseC(s) {
+    const m = /(-?\d+(?:\.\d+)?)\s*C/.exec(s || "");
+    return m ? Math.round(Number(m[1])) : undefined;
+}
+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;
@@ -45,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 [];
@@ -133,6 +168,85 @@ async function collectDevice(t) {
         portsTotal,
     };
 }
+// Walk that keeps each row's index (numeric OID suffix) — needed to resolve the
+// hrStorage table entries for the data volumes.
+async function snmpWalkIndexed(t, oid, timeout = 10000) {
+    try {
+        const { stdout } = await pexec("snmpwalk", ["-v", t.version || "2c", "-c", t.community || "public", "-On", "-t", "2", "-r", "1", t.ip, oid], { timeout });
+        return stdout.split("\n").map((l) => {
+            const m = /^(\S+)\s*=\s*[^:]+:\s*(.*)$/.exec(l.trim());
+            if (!m)
+                return null;
+            // 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);
+    }
+    catch {
+        return [];
+    }
+}
+// QNAP NAS: CPU load, cpu/system temps, per-disk health + temp, and data-volume
+// fullness. Uses the QNAP enterprise MIB by exact OID (walk times out) plus
+// HOST-RESOURCES for CPU load and volume sizes.
+async function collectQnap(t) {
+    const tempWarn = t.tempWarnC ?? 70;
+    const volWarn = t.volumeWarnPct ?? 90;
+    const [model, cpuTemp, sysTemp, hdNumRaw, cpuLoads, storDescrs] = await Promise.all([
+        snmpGet(t, QNAP.model),
+        snmpGet(t, QNAP.cpuTemp),
+        snmpGet(t, QNAP.sysTemp),
+        snmpGet(t, QNAP.hdNumber),
+        snmpWalk(t, "1.3.6.1.2.1.25.3.3.1.2"), // hrProcessorLoad (per core)
+        snmpWalkIndexed(t, "1.3.6.1.2.1.25.2.3.1.3"), // hrStorageDescr
+    ]);
+    if (model == null && cpuTemp == null && !cpuLoads.length) {
+        return { name: t.name, ip: t.ip, kind: "qnap", reachable: false };
+    }
+    // CPU: average per-core load.
+    const cores = cpuLoads.map(Number).filter((n) => !isNaN(n));
+    const cpuPct = cores.length ? Math.round(cores.reduce((a, b) => a + b, 0) / cores.length) : undefined;
+    // Disks — iterate 1..hdNumber (bounded).
+    const hdN = Math.min(Number(hdNumRaw) || 0, 24);
+    const disks = [];
+    for (let i = 1; i <= hdN; i++) {
+        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),
+        ]);
+        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, status, smart: sm && sm !== "--" ? sm : undefined });
+    }
+    // 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))) {
+        const [units, size, used] = await Promise.all([
+            snmpGet(t, `1.3.6.1.2.1.25.2.3.1.4.${row.idx}`), snmpGet(t, `1.3.6.1.2.1.25.2.3.1.5.${row.idx}`), snmpGet(t, `1.3.6.1.2.1.25.2.3.1.6.${row.idx}`),
+        ]);
+        const u = parseNum(units) || 1, sz = parseNum(size) || 0, us = parseNum(used) || 0;
+        if (sz > 0)
+            volumes.push({ mount: row.val, totalGB: Math.round((sz * u) / 1e9), usedGB: Math.round((us * u) / 1e9), pct: Math.round((us / sz) * 100) });
+    }
+    const fullVols = volumes.filter((v) => v.pct >= volWarn);
+    return {
+        name: t.name, ip: t.ip, kind: "qnap", reachable: true,
+        model: model || undefined,
+        cpuPct, cpuTempC: parseC(cpuTemp), sysTempC: parseC(sysTemp),
+        disks, badDisks: badDisks.map((d) => ({ slot: d.slot, status: d.status, smart: d.smart, tempC: d.tempC })),
+        volumes, fullVolumes: fullVols,
+        tempWarnC: tempWarn, volumeWarnPct: volWarn,
+    };
+}
 export function createSnmpPlugin() {
     let refreshTimer = null;
     const targetsOf = (plugin) => {
@@ -144,7 +258,9 @@ export function createSnmpPlugin() {
     const refreshFn = async (plugin) => {
         await Promise.all(targetsOf(plugin).map(async (t) => {
             try {
-                const data = t.kind === "printer" || !t.kind ? await collectPrinter(t) : await collectDevice(t);
+                const data = t.kind === "qnap" ? await collectQnap(t)
+                    : t.kind === "printer" || !t.kind ? await collectPrinter(t)
+                        : await collectDevice(t);
                 await plugin.send(data, `snmp-${slug(t.name || t.ip)}`);
             }
             catch (e) {

package/package.json

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