@gazzehamine/armada-watch-agent 1.3.0 → 1.3.1

package/dist/collector.js

@@ -149,28 +149,38 @@ async function collectProcesses() {
 }
 async function collectDockerContainers() {
     try {
+        // Get basic container info and stats
         const dockerContainers = await systeminformation_1.default.dockerContainers();
-        return dockerContainers.map((container) => ({
-            id: container.id || '',
-            name: container.name || '',
-            image: container.image || '',
-            state: container.state || 'unknown',
-            status: container.state || 'unknown',
-            created: container.created || 0,
-            started: container.started || 0,
-            cpuPercent: container.cpuPercent || 0,
-            memoryPercent: container.memPercent || 0,
-            memoryUsage: container.memUsage || 0,
-            memoryLimit: container.memLimit || 0,
-            netIO: {
-                rx: container.netIO?.rx || 0,
-                wx: container.netIO?.wx || 0,
-            },
-            blockIO: {
-                r: container.blockIO?.r || 0,
-                w: container.blockIO?.w || 0,
-            },
-        }));
+        const dockerStats = await systeminformation_1.default.dockerContainerStats('*');
+        // Create a map of stats by container ID
+        const statsMap = new Map();
+        dockerStats.forEach((stat) => {
+            statsMap.set(stat.id, stat);
+        });
+        return dockerContainers.map((container) => {
+            const stats = statsMap.get(container.id) || {};
+            return {
+                id: container.id || '',
+                name: container.name || '',
+                image: container.image || '',
+                state: container.state || 'unknown',
+                status: container.state || 'unknown',
+                created: container.created || 0,
+                started: container.started || 0,
+                cpuPercent: stats.cpuPercent || 0,
+                memoryPercent: stats.memPercent || 0,
+                memoryUsage: stats.memUsage || 0,
+                memoryLimit: stats.memLimit || 0,
+                netIO: {
+                    rx: stats.netIO?.rx || 0,
+                    wx: stats.netIO?.wx || 0,
+                },
+                blockIO: {
+                    r: stats.blockIO?.r || 0,
+                    w: stats.blockIO?.w || 0,
+                },
+            };
+        });
     }
     catch (error) {
         // Docker not available or not running

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gazzehamine/armada-watch-agent",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Monitoring agent for Armada Watch - EC2 instance monitoring",
   "main": "dist/index.js",
   "bin": {