@daemonitor/plugins 1.1.8 → 1.1.10

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -39,8 +39,13 @@ const QNAP = {
     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
+    hdStatus: "1.3.6.1.4.1.24681.1.2.11.1.4.", // 0 = ready/ok, negative = fault/empty
+    hdModel: "1.3.6.1.4.1.24681.1.2.11.1.5.", // "--" only when the bay is empty
+    hdCapacity: "1.3.6.1.4.1.24681.1.2.11.1.6.", // "7.28 TB" / "--"
     hdSmart: "1.3.6.1.4.1.24681.1.2.11.1.7.", // "GOOD" / "Warning"
+    memTotal: "1.3.6.1.4.1.24681.1.2.2.0", // "16013.4 MB"
+    memFree: "1.3.6.1.4.1.24681.1.2.3.0", // "11984.9 MB"
+    fanSpeed: "1.3.6.1.4.1.24681.1.2.15.1.3.", // + index, "1835 RPM"
 };
 function slug(s) {
     return s.replace(/[^a-zA-Z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "");
@@ -199,13 +204,15 @@ async function snmpWalkIndexed(t, oid, timeout = 10000) {
 async function collectQnap(t) {
     const tempWarn = t.tempWarnC ?? 70;
     const volWarn = t.volumeWarnPct ?? 90;
-    const [model, cpuTemp, sysTemp, hdNumRaw, cpuLoads, storDescrs] = await Promise.all([
+    const [model, cpuTemp, sysTemp, cpuLoads, storDescrs, memTotal, memFree, fanSpeeds] = 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
+        snmpGet(t, QNAP.memTotal),
+        snmpGet(t, QNAP.memFree),
+        snmpWalk(t, "1.3.6.1.4.1.24681.1.2.15.1.3"), // SystemFanSpeed table
     ]);
     if (model == null && cpuTemp == null && !cpuLoads.length) {
         return { name: t.name, ip: t.ip, kind: "qnap", reachable: false };
@@ -213,20 +220,42 @@ async function collectQnap(t) {
     // 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);
+    // RAM used %.  Values look like "16013.4 MB".
+    const memTotalMB = parseNum(memTotal), memFreeMB = parseNum(memFree);
+    const memPct = memTotalMB && memTotalMB > 0 && memFreeMB != null
+        ? Math.round(((memTotalMB - memFreeMB) / memTotalMB) * 100) : undefined;
+    // Fans — each entry looks like "1835 RPM".
+    const fans = fanSpeeds.map((f) => parseNum(f)).filter((n) => n != null && n > 0);
+    // Disks — walk each column of the disk table ONCE (6 small walks) rather than
+    // 6 gets × N bays. QNAP's SNMP agent is flaky under concurrent-get bursts and
+    // silently drops rows (partial reads that hid disks); a per-column walk is a
+    // single session each — far gentler and returns every populated row atomically.
+    // Presence keys on MODEL/CAPACITY ("--" = empty bay), so a FAILING disk
+    // (unreadable temp, negative status) is still reported, not mistaken for empty.
+    const DT = "1.3.6.1.4.1.24681.1.2.11.1."; // disk table columns: 2=descr 3=temp 4=status 5=model 6=capacity 7=smart
+    const [wStatus, wTemp, wSmart, wDescr, wModel, wCap] = await Promise.all([
+        snmpWalkIndexed(t, DT + "4"), snmpWalkIndexed(t, DT + "3"), snmpWalkIndexed(t, DT + "7"),
+        snmpWalkIndexed(t, DT + "2"), snmpWalkIndexed(t, DT + "5"), snmpWalkIndexed(t, DT + "6"),
+    ]);
+    const col = (rows) => {
+        const m = {};
+        for (const r of rows)
+            m[r.idx] = r.val;
+        return m;
+    };
+    const cSt = col(wStatus), cTp = col(wTemp), cSm = col(wSmart), cDs = col(wDescr), cMd = col(wModel), cCap = col(wCap);
+    const slots = (Object.keys(cMd).length ? Object.keys(cMd) : Object.keys(cDs))
+        .sort((a, b) => Number(a) - Number(b));
     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))
+    for (const i of slots) {
+        const model = cMd[i] && cMd[i] !== "--" ? cMd[i] : undefined;
+        const capacity = cCap[i] && cCap[i] !== "--" ? cCap[i] : undefined;
+        // Only a truly empty bay (no model AND no capacity) is skipped.
+        if (!model && !capacity)
             continue;
-        disks.push({ slot: i, descr: ds || undefined, tempC, status, smart: sm && sm !== "--" ? sm : undefined });
+        const status = cSt[i] != null ? Number(cSt[i]) : undefined;
+        const tempC = parseC(cTp[i] || null);
+        disks.push({ slot: Number(i), descr: cDs[i] || undefined, model, capacity, tempC, status, smart: cSm[i] && cSm[i] !== "--" ? cSm[i] : 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.
@@ -248,7 +277,10 @@ async function collectQnap(t) {
         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 })),
+        memPct, memTotalMB: memTotalMB || undefined,
+        fans, fanRpm: fans.length ? Math.min(...fans) : undefined,
+        disks, diskCount: disks.length,
+        badDisks: badDisks.map((d) => ({ slot: d.slot, descr: d.descr, model: d.model, status: d.status, smart: d.smart, tempC: d.tempC })),
         volumes, fullVolumes: fullVols,
         tempWarnC: tempWarn, volumeWarnPct: volWarn,
     };

package/package.json

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