@daemonitor/plugins 1.1.20 → 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 {
@@ -184,14 +184,22 @@ async function collectDevice(t) {
     };
     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 (const idx of Object.keys(adminByIdx)) {
-        if (Number(adminByIdx[idx]) === 1) {
+        if (enumNum(adminByIdx[idx]) === 1) {
             portsTotal++;
-            if (Number(operByIdx[idx]) === 1)
+            if (enumNum(operByIdx[idx]) === 1)
                 portsUp++;
         }
     }
@@ -267,8 +275,8 @@ async function collectDevice(t) {
         }
         // 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 ? Number(adminByIdx[idx]) === 1 : undefined;
-        const linkUp = operByIdx[idx] != null ? Number(operByIdx[idx]) === 1 : undefined;
+        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;
@@ -306,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.20",
+  "version": "1.1.21",
   "description": "daemonitor plugins",
   "types": "types/index.d.ts",
   "main": "dist/index.js",