@gazzehamine/armada-watch-agent 1.3.1 → 1.3.3

package/dist/collector.js

@@ -136,9 +136,16 @@ async function collectMetrics() {
 }
 async function collectProcesses() {
     const processes = await systeminformation_1.default.processes();
+    // Sort by CPU first, then by memory as tiebreaker
+    // Don't filter by cpu > 0 since CPU usage fluctuates rapidly
     return processes.list
-        .filter((p) => p.cpu > 0 || p.mem > 0)
-        .sort((a, b) => b.cpu - a.cpu)
+        .sort((a, b) => {
+        // Sort by CPU descending, then by memory descending
+        if (b.cpu !== a.cpu) {
+            return b.cpu - a.cpu;
+        }
+        return b.mem - a.mem;
+    })
         .slice(0, 20)
         .map((p) => ({
         pid: p.pid,
@@ -157,7 +164,8 @@ async function collectDockerContainers() {
         dockerStats.forEach((stat) => {
             statsMap.set(stat.id, stat);
         });
-        return dockerContainers.map((container) => {
+        // Map containers with their stats
+        const containersWithStats = dockerContainers.map((container) => {
             const stats = statsMap.get(container.id) || {};
             return {
                 id: container.id || '',
@@ -181,6 +189,25 @@ async function collectDockerContainers() {
                 },
             };
         });
+        // Deduplicate containers by name, keeping the most recently started one
+        const uniqueContainers = new Map();
+        containersWithStats.forEach((container) => {
+            const existing = uniqueContainers.get(container.name);
+            if (!existing) {
+                // First occurrence of this container name
+                uniqueContainers.set(container.name, container);
+            }
+            else {
+                // Keep the one that's running, or the most recently started
+                const shouldReplace = (container.state === 'running' && existing.state !== 'running') ||
+                    (container.state === existing.state && container.started > existing.started);
+                if (shouldReplace) {
+                    uniqueContainers.set(container.name, container);
+                }
+            }
+        });
+        // Return deduplicated containers as array
+        return Array.from(uniqueContainers.values());
     }
     catch (error) {
         // Docker not available or not running

package/package.json

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