@daemonitor/plugins 1.1.19 → 1.1.21

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -92,7 +92,7 @@ function decodeSnmp(s) {
 }
 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 { stdout } = await pexec("snmpget", ["-v", t.version || "2c", "-c", t.community || "public", "-Oevq", "-t", "2", "-r", "1", t.ip, oid], { timeout });
         const raw = stdout.trim().replace(/^"|"$/g, "");
         if (!raw || /No Such|no response|Timeout/i.test(raw))
             return null;
@@ -104,7 +104,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 });
+        const { stdout } = await pexec("snmpwalk", ["-v", t.version || "2c", "-c", t.community || "public", "-Oeqv", "-t", "2", "-r", "1", t.ip, oid], { timeout });
         return stdout.split("\n").map((l) => decodeSnmp(l.trim().replace(/^"|"$/g, ""))).filter(Boolean);
     }
     catch {
@@ -168,20 +168,38 @@ async function collectDevice(t) {
         snmpGet(t, SYS.descr),
         snmpGet(t, SYS.name),
         snmpGet(t, SYS.uptime),
-        snmpWalk(t, SYS.ifOper),
-        snmpWalk(t, SYS.ifAdmin),
+        snmpWalkIndexed(t, SYS.ifOper),
+        snmpWalkIndexed(t, SYS.ifAdmin),
     ]);
     if (descr == null && name == null && !oper.length) {
         return { name: t.name, ip: t.ip, kind: t.kind || "device", reachable: false };
     }
+    // Index the link-state walks by ifIndex so each interface can carry its own
+    // up/down (positional zipping breaks whenever the two walks differ in length).
+    const byIndex = (rows) => {
+        const m = {};
+        for (const r of rows)
+            m[r.idx] = r.val;
+        return m;
+    };
+    const operByIdx = byIndex(oper);
+    const adminByIdx = byIndex(admin);
+    // Values arrive numeric (-Oe), but tolerate an enum rendering like "up(1)"
+    // from any agent/MIB combination that slips one through.
+    const enumNum = (v) => {
+        if (v == null)
+            return undefined;
+        const m = /\((\d+)\)\s*$/.exec(v) || /^\s*(-?\d+)\s*$/.exec(v);
+        return m ? Number(m[1]) : undefined;
+    };
     // Only count ADMIN-enabled ports; an enabled port that's operationally down is
     // a real link-down (ignore the many disabled ports on a big switch).
     let portsTotal = 0;
     let portsUp = 0;
-    for (let i = 0; i < oper.length; i++) {
-        if (Number(admin[i]) === 1) {
+    for (const idx of Object.keys(adminByIdx)) {
+        if (enumNum(adminByIdx[idx]) === 1) {
             portsTotal++;
-            if (Number(oper[i]) === 1)
+            if (enumNum(operByIdx[idx]) === 1)
                 portsUp++;
         }
     }
@@ -231,15 +249,9 @@ async function collectDevice(t) {
     // "internet traffic". Without one, the headline is left undefined rather than
     // reporting a number we know to be wrong.
     const PSEUDO = /^(lo|imq\d*|itf\d*|ifb\d*|sit\d*|gre\d*|teql\d*|tunl\d*)$/i;
-    const idxOf = (rows) => {
-        const m = {};
-        for (const r of rows)
-            m[r.idx] = r.val;
-        return m;
-    };
-    const nameByIdx = idxOf(ifNames);
-    const inByIdx = idxOf(hcInIdx);
-    const outByIdx = idxOf(hcOutIdx);
+    const nameByIdx = byIndex(ifNames);
+    const inByIdx = byIndex(hcInIdx);
+    const outByIdx = byIndex(hcOutIdx);
     const now = Date.now();
     const prevIf = netPrevIf[t.ip] || {};
     const nextIf = {};
@@ -261,7 +273,11 @@ async function collectDevice(t) {
                 outBps = Math.round((cout - p.out) / dt);
             }
         }
-        interfaces.push({ name, inBps, outBps });
+        // ifOperStatus 1=up, ifAdminStatus 1=enabled. A link that's admin-enabled but
+        // operationally down is a real fault; an admin-disabled port is just off.
+        const adminUp = adminByIdx[idx] != null ? enumNum(adminByIdx[idx]) === 1 : undefined;
+        const linkUp = operByIdx[idx] != null ? enumNum(operByIdx[idx]) === 1 : undefined;
+        interfaces.push({ name, inBps, outBps, up: linkUp, adminUp });
     }
     netPrevIf[t.ip] = nextIf;
     // Headline = the WAN link when the target names one.
@@ -298,7 +314,7 @@ async function collectDevice(t) {
 // 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 });
+        const { stdout } = await pexec("snmpwalk", ["-v", t.version || "2c", "-c", t.community || "public", "-Oen", "-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)

package/package.json

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