@gazzehamine/armada-watch-agent 1.4.1 → 1.4.3

package/dist/collector.js

@@ -7,6 +7,8 @@ exports.getSystemInfo = getSystemInfo;
 exports.collectMetrics = collectMetrics;
 exports.collectProcesses = collectProcesses;
 exports.collectDockerContainers = collectDockerContainers;
+exports.collectNginxMetrics = collectNginxMetrics;
+exports.collectPM2Processes = collectPM2Processes;
 exports.collectSSLCertificates = collectSSLCertificates;
 const systeminformation_1 = __importDefault(require("systeminformation"));
 const os_1 = __importDefault(require("os"));
@@ -262,6 +264,89 @@ async function getCertificateInfo(certPath, domain) {
         return null;
     }
 }
+/**
+ * Collect Nginx metrics from stub_status
+ */
+async function collectNginxMetrics() {
+    try {
+        // Try common nginx stub_status URLs
+        const urls = [
+            'http://localhost/nginx_status',
+            'http://localhost:80/nginx_status',
+            'http://127.0.0.1/nginx_status',
+            'http://localhost/status',
+        ];
+        for (const url of urls) {
+            try {
+                const { stdout } = await execAsync(`curl -s ${url} --max-time 2`, { timeout: 3000 });
+                if (stdout && stdout.includes('Active connections')) {
+                    // Parse nginx stub_status output
+                    // Example:
+                    // Active connections: 2
+                    // server accepts handled requests
+                    //  123 123 456
+                    // Reading: 0 Writing: 1 Waiting: 1
+                    const activeMatch = stdout.match(/Active connections:\s+(\d+)/);
+                    const serverMatch = stdout.match(/\s+(\d+)\s+(\d+)\s+(\d+)/);
+                    const rwwMatch = stdout.match(/Reading:\s+(\d+)\s+Writing:\s+(\d+)\s+Waiting:\s+(\d+)/);
+                    if (activeMatch && serverMatch && rwwMatch) {
+                        const accepts = parseInt(serverMatch[1]);
+                        const handled = parseInt(serverMatch[2]);
+                        const requests = parseInt(serverMatch[3]);
+                        // Calculate per-second rates (will be calculated from deltas in the backend)
+                        return {
+                            activeConnections: parseInt(activeMatch[1]),
+                            accepts,
+                            handled,
+                            requests,
+                            reading: parseInt(rwwMatch[1]),
+                            writing: parseInt(rwwMatch[2]),
+                            waiting: parseInt(rwwMatch[3]),
+                            requestsPerSecond: 0, // Will be calculated from deltas
+                            connectionsPerSecond: 0, // Will be calculated from deltas
+                        };
+                    }
+                }
+            }
+            catch (error) {
+                // Try next URL
+                continue;
+            }
+        }
+        // Nginx not available or stub_status not configured
+        return null;
+    }
+    catch (error) {
+        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

@@ -75,6 +75,8 @@ async function sendMetrics() {
         const metrics = await (0, collector_1.collectMetrics)();
         const processes = await (0, collector_1.collectProcesses)();
         const dockerContainers = await (0, collector_1.collectDockerContainers)();
+        const pm2Processes = await (0, collector_1.collectPM2Processes)();
+        const nginxMetrics = await (0, collector_1.collectNginxMetrics)();
         // Check if it's time to refresh SSL certificates (every 5 minutes)
         const now = Date.now();
         const shouldCheckSSL = (now - lastSSLCheckTime) >= SSL_CHECK_INTERVAL;
@@ -93,13 +95,17 @@ async function sendMetrics() {
             },
             processes,
             dockerContainers,
+            pm2Processes: pm2Processes.length > 0 ? pm2Processes : undefined,
+            nginxMetrics: nginxMetrics || 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}` : '';
+        const nginxInfo = nginxMetrics ? ` | Nginx: ${nginxMetrics.activeConnections} conn` : '';
+        console.log(`✓ Metrics sent successfully - CPU: ${metrics.cpuUsage.toFixed(1)}% | Memory: ${metrics.memoryUsage.toFixed(1)}%${pm2Info}${nginxInfo}`);
     }
     catch (error) {
         if (axios_1.default.isAxiosError(error)) {

package/package.json

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