@daemonitor/plugins 1.1.13 → 1.1.15

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -28,7 +28,26 @@ const SYS = {
     name: "1.3.6.1.2.1.1.5.0", // sysName
     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)
+    ifHCIn: "1.3.6.1.2.1.31.1.1.1.6", // ifHCInOctets (walk, Counter64)
+    ifHCOut: "1.3.6.1.2.1.31.1.1.1.10", // ifHCOutOctets (walk, Counter64)
 };
+// UCD-SNMP-MIB + HOST-RESOURCES — CPU/RAM/load on net-snmp devices (EdgeOS
+// routers, Linux hosts). All best-effort: absent on gear that doesn't ship the
+// UCD MIB (many switches), so every read is null-tolerant.
+const UCD = {
+    cpuIdle: "1.3.6.1.4.1.2021.11.11.0", // ssCpuIdle (%) → cpu% = 100 - idle
+    load1: "1.3.6.1.4.1.2021.10.1.3.1", // laLoad 1-min
+    load5: "1.3.6.1.4.1.2021.10.1.3.2",
+    load15: "1.3.6.1.4.1.2021.10.1.3.3",
+    memTotal: "1.3.6.1.4.1.2021.4.5.0", // memTotalReal (KB)
+    memAvail: "1.3.6.1.4.1.2021.4.6.0", // memAvailReal (KB, free excl. cache)
+    memBuffer: "1.3.6.1.4.1.2021.4.14.0", // memBuffer (KB)
+    memCached: "1.3.6.1.4.1.2021.4.15.0", // memCached (KB)
+    hrProcLoad: "1.3.6.1.2.1.25.3.3.1.2", // hrProcessorLoad (walk, per-core %) — CPU fallback
+};
+// Per-target previous interface-octet sample, for throughput (bps) rate calc
+// across polls. Module-level: one collectDevice call per target per cycle.
+const netPrev = {};
 // 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 = {
@@ -167,6 +186,54 @@ async function collectDevice(t) {
     }
     // sysUpTime timeticks → seconds
     const upSecs = uptimeRaw != null ? Math.round((Number(String(uptimeRaw).replace(/[^0-9]/g, "")) || 0) / 100) : undefined;
+    // CPU / RAM / load / network — best-effort UCD-SNMP + IF-MIB counters. Absent
+    // on gear without the UCD MIB (returns "No Such Object" fast → null), so every
+    // field is optional and simply omitted when unsupported.
+    const [cpuIdle, load1, load5, load15, memTotal, memAvail, memBuffer, memCached, procLoads, hcIn, hcOut] = await Promise.all([
+        snmpGet(t, UCD.cpuIdle), snmpGet(t, UCD.load1), snmpGet(t, UCD.load5), snmpGet(t, UCD.load15),
+        snmpGet(t, UCD.memTotal), snmpGet(t, UCD.memAvail), snmpGet(t, UCD.memBuffer), snmpGet(t, UCD.memCached),
+        snmpWalk(t, UCD.hrProcLoad), snmpWalk(t, SYS.ifHCIn), snmpWalk(t, SYS.ifHCOut),
+    ]);
+    // CPU %: prefer ssCpuIdle (100 - idle); fall back to avg per-core hrProcessorLoad.
+    let cpuPct;
+    if (cpuIdle != null && !isNaN(Number(cpuIdle))) {
+        cpuPct = Math.max(0, Math.min(100, 100 - Math.round(Number(cpuIdle))));
+    }
+    else {
+        const cores = procLoads.map(Number).filter((n) => !isNaN(n));
+        if (cores.length)
+            cpuPct = Math.round(cores.reduce((a, b) => a + b, 0) / cores.length);
+    }
+    const load1n = parseNum(load1);
+    const loadavg = [parseNum(load1), parseNum(load5), parseNum(load15)].filter((n) => n != null);
+    // RAM used %: (total - free - buffers - cache) / total. memAvailReal excludes
+    // cache already on some agents; subtracting buffer+cache is safe (they default 0).
+    let memPct, memTotalMB;
+    const mTot = parseNum(memTotal), mAvail = parseNum(memAvail);
+    const mBuf = parseNum(memBuffer) || 0, mCache = parseNum(memCached) || 0;
+    if (mTot && mTot > 0 && mAvail != null) {
+        const usedKb = Math.max(0, mTot - mAvail - mBuf - mCache);
+        memPct = Math.round((usedKb / mTot) * 100);
+        memTotalMB = Math.round(mTot / 1024);
+    }
+    // Network throughput (aggregate bytes/sec, to match the OS plugin's NET
+    // metric): delta of summed HC octets vs the prior poll. First poll (or a
+    // counter reset) yields no rate.
+    let netIn, netOut;
+    const sumIn = hcIn.map(Number).filter((n) => !isNaN(n)).reduce((a, b) => a + b, 0);
+    const sumOut = hcOut.map(Number).filter((n) => !isNaN(n)).reduce((a, b) => a + b, 0);
+    if (hcIn.length || hcOut.length) {
+        const now = Date.now();
+        const prev = netPrev[t.ip];
+        if (prev && sumIn >= prev.in && sumOut >= prev.out && now > prev.ts) {
+            const dt = (now - prev.ts) / 1000;
+            if (dt > 0) {
+                netIn = Math.round((sumIn - prev.in) / dt);
+                netOut = Math.round((sumOut - prev.out) / dt);
+            }
+        }
+        netPrev[t.ip] = { in: sumIn, out: sumOut, ts: now };
+    }
     return {
         name: t.name,
         ip: t.ip,
@@ -177,6 +244,14 @@ async function collectDevice(t) {
         uptimeSecs: upSecs,
         portsUp,
         portsTotal,
+        cpuPct,
+        cpuCores: procLoads.length || undefined, // for load-per-core normalization
+        load1: load1n,
+        loadavg: loadavg.length ? loadavg : undefined,
+        memPct,
+        memTotalMB,
+        netIn,
+        netOut,
     };
 }
 // Walk that keeps each row's index (numeric OID suffix) — needed to resolve the

package/dist/plugins/monitoring/WebsitePlugin.js

@@ -89,6 +89,25 @@ export function createWebsitePlugin() {
         const start = Date.now();
         const label = ep.name || ep.url;
         const uid = `web-${(ep.name || ep.url).replace(/[^a-zA-Z0-9_.-]+/g, "-")}`;
+        // Origin-only monitor: skip the public tier (unreachable behind a CDN bot
+        // challenge) and report the direct origin check as the endpoint's health.
+        if (ep.originOnly && ep.origin?.url) {
+            const o = await checkOrigin(ep);
+            await plugin.send({
+                name: label,
+                url: ep.url || o.url,
+                status: o.status,
+                duration: o.duration,
+                ok: o.ok,
+                originOnly: true,
+                hasAllExpectedStrings: o.hasAllExpectedStrings,
+                hasAnyUnexpectedStrings: o.hasAnyUnexpectedStrings,
+                missingExpected: o.missingExpected,
+                matchedUnexpected: o.matchedUnexpected,
+                error: o.error,
+            }, uid);
+            return;
+        }
         let publicResult;
         try {
             const ctrl = new AbortController();

package/package.json

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