pm2-perfmonitor 2.5.2 → 2.6.1

package/lib/app.js

@@ -6,6 +6,7 @@ const {
   parseParamToArray,
   parseParamToNumber,
   parseBool,
+  safeToFixed,
   sleepAsync,
   getSysCpuUsageByPid,
 } = require('./utils')
@@ -79,6 +80,15 @@ const cpuOverloadHistory = new Map()
 const cpuOverloadRestartHistory = new Map()
 const cpuOverloadRestartFailedHistory = new Map()
 
+/**
+ * @type { Map<number, number> }
+ */
+const cpuUsageFromPM2 = new Map()
+/**
+ * @type { Map<number, number> }
+ */
+const cpuUsageFromSys = new Map()
+
 let isProcessCheckerRunning = false
 
 /**
@@ -248,6 +258,28 @@ const processChecker = async () => {
 
     const apps = await listAppsAsync()
 
+    cpuUsageFromPM2.clear()
+    cpuUsageFromSys.clear()
+
+    const cpus = apps.map((v) => v.monit?.cpu)
+
+    const hasAbnormalMonitoringData = cpus.every((v) => typeof v !== 'number')
+
+    if (hasAbnormalMonitoringData) {
+      const details = apps.map((v) => {
+        const { name, pid, pm_id, monit } = v
+
+        return {
+          name,
+          pid,
+          pm_id,
+          monit,
+        }
+      })
+
+      logger('warn', 'Abnormal monitoring data exists: ', details)
+    }
+
     for (const app of apps) {
       const { name, pid, pm_id, monit, pm2_env } = app
 
@@ -276,6 +308,9 @@ const processChecker = async () => {
       const appCpuUsage =
         typeof sysCpuUsage === 'number' ? sysCpuUsage : pm2CpuUsage
 
+      cpuUsageFromPM2.set(pm_id, pm2CpuUsage)
+      cpuUsageFromSys.set(pm_id, sysCpuUsage)
+
       const cpuHistory = setZombieCpuHistory(pm_id, appCpuUsage)
       const cpuHistory2 = setCpuOverloadHistory(pm_id, appCpuUsage)
 
@@ -511,6 +546,36 @@ const runModule = () => {
       return res.join(', ')
     },
   })
+
+  Probe.metric({
+    name: 'CPU (pm2)',
+    value: () => {
+      const res = []
+
+      for (const [k, v] of cpuUsageFromPM2) {
+        res.push([k, v])
+      }
+
+      if (!res.length) return 'N/A'
+
+      return res.map((v) => `[${v[0]}]:${v[1]}%`).join(';')
+    },
+  })
+
+  Probe.metric({
+    name: 'CPU (sys)',
+    value: () => {
+      const res = []
+
+      for (const [k, v] of cpuUsageFromSys) {
+        res.push([k, v])
+      }
+
+      if (!res.length) return 'N/A'
+
+      return res.map((v) => `[${v[0]}]:${v[1]}%`).join(';')
+    },
+  })
 }
 
 runModule()

package/lib/utils.js

@@ -30,6 +30,20 @@ const parseBool = (value, defaultVal = false) => {
   return defaultVal
 }
 
+/**
+ * 保留小数
+ * @param { number } value
+ * @param { number} [fractionDigits]
+ * @returns { number }
+ */
+const safeToFixed = (value, fractionDigits = 2) => {
+  if (typeof value === 'number') {
+    return Number(value.toFixed(fractionDigits))
+  }
+
+  return value
+}
+
 /**
  * @param { number} duration - sleep duration (ms)
  */
@@ -47,7 +61,7 @@ const sleepAsync = (duration = 0) => {
 const getSysCpuUsageByPid = async (pid) => {
   try {
     const stats = await pidusage(pid)
-    return stats.cpu
+    return safeToFixed(stats.cpu, 2)
   } catch (err) {
     console.error('Call pidusage error:', err)
   }
@@ -57,6 +71,7 @@ module.exports = {
   parseParamToArray,
   parseParamToNumber,
   parseBool,
+  safeToFixed,
   sleepAsync,
   getSysCpuUsageByPid,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm2-perfmonitor",
-  "version": "2.5.2",
+  "version": "2.6.1",
   "description": "A pm2 module for zombie process and CPU overload detection.",
   "author": {
     "name": "elenh",