@gazzehamine/armada-watch-agent 1.4.0 → 1.4.2

package/dist/collector.js

@@ -7,6 +7,7 @@ exports.getSystemInfo = getSystemInfo;
 exports.collectMetrics = collectMetrics;
 exports.collectProcesses = collectProcesses;
 exports.collectDockerContainers = collectDockerContainers;
+exports.collectPM2Processes = collectPM2Processes;
 exports.collectSSLCertificates = collectSSLCertificates;
 const systeminformation_1 = __importDefault(require("systeminformation"));
 const os_1 = __importDefault(require("os"));
@@ -262,6 +263,33 @@ async function getCertificateInfo(certPath, domain) {
         return null;
     }
 }
+/**
+ * Collect PM2 process information
+ */
+async function collectPM2Processes() {
+    try {
+        // Execute pm2 jlist command to get JSON output
+        const { stdout } = await execAsync('pm2 jlist');
+        const pm2Processes = JSON.parse(stdout);
+        return pm2Processes.map((proc) => ({
+            pmId: proc.pm_id || 0,
+            name: proc.name || 'unknown',
+            version: proc.pm2_env?.version || 'unknown',
+            mode: proc.pm2_env?.exec_mode || 'unknown',
+            pid: proc.pid || 0,
+            uptime: proc.pm2_env?.pm_uptime || 0,
+            restarts: proc.pm2_env?.restart_time || 0,
+            status: proc.pm2_env?.status || 'unknown',
+            cpu: proc.monit?.cpu || 0,
+            memory: proc.monit?.memory || 0,
+            user: proc.pm2_env?.username || 'unknown',
+        }));
+    }
+    catch (error) {
+        // PM2 not installed or no processes running
+        return [];
+    }
+}
 /**
  * Collect SSL certificate information from Certbot certificates
  */

package/dist/index.js

@@ -27,8 +27,9 @@ const REGION = process.env.REGION || "unknown";
 const INSTANCE_ID = process.env.INSTANCE_ID || os_1.default.hostname();
 const COLLECTION_INTERVAL = parseInt(process.env.COLLECTION_INTERVAL || "10") * 1000;
 let instanceInfo = null;
-let sslCheckCounter = 0;
-const SSL_CHECK_FREQUENCY = 30; // Check SSL every 30 metric collections (e.g., every 5 minutes if collection is 10s)
+let lastSSLCertificates = [];
+let lastSSLCheckTime = 0;
+const SSL_CHECK_INTERVAL = 5 * 60 * 1000; // Check SSL every 5 minutes
 async function initializeAgent() {
     try {
         console.log("🔄 Initializing Armada Watch Agent...");
@@ -53,6 +54,16 @@ async function initializeAgent() {
         console.log("✅ Agent initialized successfully");
         console.log(`📦 Agent version: ${AGENT_VERSION}`);
         console.log(`🔁 Collection interval: ${COLLECTION_INTERVAL / 1000}s`);
+        // Collect SSL certificates on startup
+        console.log("🔐 Checking SSL certificates on startup...");
+        lastSSLCertificates = await (0, collector_1.collectSSLCertificates)();
+        lastSSLCheckTime = Date.now();
+        if (lastSSLCertificates.length > 0) {
+            console.log(`✅ Found ${lastSSLCertificates.length} SSL certificate(s)`);
+        }
+        else {
+            console.log("ℹ️  No SSL certificates found");
+        }
     }
     catch (error) {
         console.error("❌ Failed to initialize agent:", error);
@@ -64,14 +75,15 @@ async function sendMetrics() {
         const metrics = await (0, collector_1.collectMetrics)();
         const processes = await (0, collector_1.collectProcesses)();
         const dockerContainers = await (0, collector_1.collectDockerContainers)();
-        // Check SSL certificates less frequently (every 5 minutes by default)
-        let sslCertificates = [];
-        sslCheckCounter++;
-        if (sslCheckCounter >= SSL_CHECK_FREQUENCY) {
-            sslCertificates = await (0, collector_1.collectSSLCertificates)();
-            sslCheckCounter = 0;
-            if (sslCertificates.length > 0) {
-                console.log(`🔐 SSL Certificates checked: ${sslCertificates.length} domain(s)`);
+        const pm2Processes = await (0, collector_1.collectPM2Processes)();
+        // Check if it's time to refresh SSL certificates (every 5 minutes)
+        const now = Date.now();
+        const shouldCheckSSL = (now - lastSSLCheckTime) >= SSL_CHECK_INTERVAL;
+        if (shouldCheckSSL) {
+            lastSSLCertificates = await (0, collector_1.collectSSLCertificates)();
+            lastSSLCheckTime = now;
+            if (lastSSLCertificates.length > 0) {
+                console.log(`🔐 SSL Certificates refreshed: ${lastSSLCertificates.length} domain(s)`);
             }
         }
         const payload = {
@@ -82,12 +94,15 @@ async function sendMetrics() {
             },
             processes,
             dockerContainers,
-            sslCertificates: sslCertificates.length > 0 ? sslCertificates : undefined,
+            pm2Processes: pm2Processes.length > 0 ? pm2Processes : undefined,
+            // Always send SSL certificates if we have them (from startup or last check)
+            sslCertificates: lastSSLCertificates.length > 0 ? lastSSLCertificates : undefined,
         };
         await axios_1.default.post(`${SERVER_URL}/api/metrics`, payload, {
             timeout: 5000,
         });
-        console.log(`✓ Metrics sent successfully - CPU: ${metrics.cpuUsage.toFixed(1)}% | Memory: ${metrics.memoryUsage.toFixed(1)}%`);
+        const pm2Info = pm2Processes.length > 0 ? ` | PM2: ${pm2Processes.length} processes` : '';
+        console.log(`✓ Metrics sent successfully - CPU: ${metrics.cpuUsage.toFixed(1)}% | Memory: ${metrics.memoryUsage.toFixed(1)}%${pm2Info}`);
     }
     catch (error) {
         if (axios_1.default.isAxiosError(error)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gazzehamine/armada-watch-agent",
-  "version": "1.4.0",
-  "description": "Monitoring agent for Armada Watch - EC2 instance monitoring with SSL certificate tracking",
+  "version": "1.4.2",
+  "description": "Monitoring agent for Armada Watch - EC2 instance monitoring with SSL certificate tracking and PM2 process monitoring",
   "main": "dist/index.js",
   "bin": {
     "armada-watch-agent": "dist/index.js"