@gazzehamine/armada-watch-agent 1.0.0 → 1.2.0

package/README.md

@@ -133,6 +133,3 @@ The agent needs permission to read system metrics. Run with appropriate user per
 
 MIT
 
-## Repository
-
-https://github.com/gazzehamine/armada-watch

package/dist/collector.js

@@ -9,6 +9,7 @@ exports.collectProcesses = collectProcesses;
 const systeminformation_1 = __importDefault(require("systeminformation"));
 const os_1 = __importDefault(require("os"));
 let lastNetworkStats = null;
+let lastDiskStats = null;
 async function getSystemInfo() {
     const cpu = await systeminformation_1.default.cpu();
     return {
@@ -23,11 +24,11 @@ async function collectMetrics() {
     // CPU Usage
     const cpuLoad = await systeminformation_1.default.currentLoad();
     const cpuUsage = cpuLoad.currentLoad;
-    // Memory Usage
+    // Memory Usage (excluding buffers/cache)
     const mem = await systeminformation_1.default.mem();
-    const memoryUsage = (mem.used / mem.total) * 100;
+    const memoryUsage = ((mem.total - mem.available) / mem.total) * 100;
     const memoryTotal = mem.total;
-    const memoryUsed = mem.used;
+    const memoryUsed = mem.total - mem.available;
     // Disk Usage
     const fsSize = await systeminformation_1.default.fsSize();
     const mainDisk = fsSize[0];
@@ -53,6 +54,57 @@ async function collectMetrics() {
     }
     // Uptime
     const uptime = os_1.default.uptime();
+    // Load Average (1, 5, 15 minutes)
+    const loadAvg = os_1.default.loadavg();
+    const loadAverage = [loadAvg[0], loadAvg[1], loadAvg[2]];
+    // Swap Usage
+    const swapTotal = mem.swaptotal;
+    const swapUsed = mem.swapused;
+    const swapUsage = swapTotal > 0 ? (swapUsed / swapTotal) * 100 : 0;
+    // Process Count
+    const processes = await systeminformation_1.default.processes();
+    const processCount = processes.all;
+    // Disk I/O (reads/writes per second)
+    const diskIO = await systeminformation_1.default.disksIO();
+    let diskReadPs = 0;
+    let diskWritePs = 0;
+    if (lastDiskStats) {
+        const timeDiff = (Date.now() - lastDiskStats.timestamp) / 1000; // seconds
+        diskReadPs = (diskIO.rIO - lastDiskStats.rIO) / timeDiff;
+        diskWritePs = (diskIO.wIO - lastDiskStats.wIO) / timeDiff;
+    }
+    lastDiskStats = {
+        rIO: diskIO.rIO,
+        wIO: diskIO.wIO,
+        timestamp: Date.now(),
+    };
+    // Phase 2: TCP Connections
+    const networkConnections = await systeminformation_1.default.networkConnections();
+    const tcpConnections = networkConnections.filter(c => c.protocol === 'tcp').length;
+    const tcpEstablished = networkConnections.filter(c => c.protocol === 'tcp' && c.state === 'ESTABLISHED').length;
+    const tcpTimeWait = networkConnections.filter(c => c.protocol === 'tcp' && c.state === 'TIME_WAIT').length;
+    // Phase 2: Network Errors and Drops
+    const networkErrorsRaw = mainInterface ? (mainInterface.rx_errors + mainInterface.tx_errors) : 0;
+    const networkDroppedRaw = mainInterface ? (mainInterface.rx_dropped + mainInterface.tx_dropped) : 0;
+    // Return totals (can be used to calculate rates if needed)
+    const networkErrors = networkErrorsRaw;
+    const networkDropped = networkDroppedRaw;
+    // Phase 2: Docker Containers (if Docker is available)
+    let dockerContainersRunning = 0;
+    let dockerContainersStopped = 0;
+    let dockerContainersTotal = 0;
+    try {
+        const dockerContainers = await systeminformation_1.default.dockerContainers();
+        dockerContainersTotal = dockerContainers.length;
+        dockerContainersRunning = dockerContainers.filter(c => c.state === 'running').length;
+        dockerContainersStopped = dockerContainers.filter(c => c.state !== 'running').length;
+    }
+    catch (error) {
+        // Docker not available or not running
+        dockerContainersTotal = 0;
+        dockerContainersRunning = 0;
+        dockerContainersStopped = 0;
+    }
     return {
         cpuUsage,
         memoryUsage,
@@ -64,6 +116,21 @@ async function collectMetrics() {
         networkRx,
         networkTx,
         uptime,
+        loadAverage,
+        swapUsage,
+        swapTotal,
+        swapUsed,
+        processCount,
+        diskReadPs,
+        diskWritePs,
+        tcpConnections,
+        tcpEstablished,
+        tcpTimeWait,
+        networkErrors,
+        networkDropped,
+        dockerContainersRunning,
+        dockerContainersStopped,
+        dockerContainersTotal,
     };
 }
 async function collectProcesses() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gazzehamine/armada-watch-agent",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Monitoring agent for Armada Watch - EC2 instance monitoring",
   "main": "dist/index.js",
   "bin": {
@@ -24,7 +24,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/gazzehamine/armada-watch.git",
+    "url": "https://github.com/armadadelivery/armada-watch.git",
     "directory": "agent"
   },
   "files": [