Add memory stats (#3)

Author: Serkan ÖZAL

dist/post/index.js

@@ -10,6 +10,13 @@ export interface CPUStats {
     readonly systemLoad: number
 }
 
+export interface MemoryStats {
+    readonly time: number
+    readonly totalMemoryMb: number
+    readonly activeMemoryMb: number
+    readonly availableMemoryMb: number
+}
+
 export interface NetworkStats {
     readonly time: number
     readonly rxMb: number
@@ -32,6 +39,11 @@ export interface ProcessedCPUStats {
     readonly systemLoadX: ProcessedStats[],
 }
 
+export interface ProcessedMemoryStats {
+    readonly activeMemoryX: ProcessedStats[],
+    readonly availableMemoryX: ProcessedStats[],
+}
+
 export interface ProcessedNetworkStats {
     readonly networkReadX: ProcessedStats[],
     readonly networkWriteX: ProcessedStats[],

dist/post/index.js.map

@@ -10,10 +10,14 @@ import {
   StackedAreaGraphOptions,
   GraphResponse,
   ProcessedStats,
+  CPUStats,
+  MemoryStats,
+  NetworkStats,
   DiskStats,
+  ProcessedCPUStats,
+  ProcessedMemoryStats,
+  ProcessedNetworkStats,
   ProcessedDiskStats,
-  NetworkStats,
-  ProcessedNetworkStats, ProcessedCPUStats, CPUStats
 } from './interfaces'
 
 const STAT_SERVER_PORT: number = 7777
@@ -30,6 +34,7 @@ async function run(): Promise<void> {
     await triggerStatCollect()
 
     const { userLoadX, systemLoadX } = await getCPUStats()
+    const { activeMemoryX, availableMemoryX } = await getMemoryStats()
     const { networkReadX, networkWriteX } = await getNetworkStats()
     const { diskReadX, diskWriteX } = await getDiskStats()
 
@@ -38,17 +43,33 @@ async function run(): Promise<void> {
       areas: [
         {
           label: 'User Load',
-          color: '#e41a1c',
+          color: '#e41a1c99',
           points: userLoadX
         },
         {
           label: 'System Load',
-          color: '#ff7f00',
+          color: '#ff7f0099',
           points: systemLoadX
         }
       ]
     })
 
+    const memoryUsage = await getStackedAreaGraph({
+      label: 'Memory Usage (MB)',
+      areas: [
+        {
+          label: 'Used',
+          color: '#377eb899',
+          points: activeMemoryX
+        },
+        {
+          label: 'Free',
+          color: '#4daf4a99',
+          points: availableMemoryX
+        }
+      ]
+    })
+
     const networkIORead = await getLineGraph({
       label: 'Network I/O Read (MB)',
       line: {
@@ -123,6 +144,9 @@ async function run(): Promise<void> {
           '### CPU Metrics',
           `![${cpuLoad.id}](${cpuLoad.url})`,
           '',
+          '### Memory Metrics',
+          `![${memoryUsage.id}](${memoryUsage.url})`,
+          '',
           '### IO Metrics',
           '|               | Read      | Write     |',
           '|---            |---        |---        |',
@@ -173,6 +197,31 @@ async function getCPUStats(): Promise<ProcessedCPUStats> {
   return { userLoadX, systemLoadX }
 }
 
+async function getMemoryStats(): Promise<ProcessedMemoryStats> {
+  let activeMemoryX: ProcessedStats[] = []
+  let availableMemoryX: ProcessedStats[] = []
+
+  logger.debug('Getting memory stats ...')
+  const response = await axios.get(
+      `http://localhost:${STAT_SERVER_PORT}/memory`
+  )
+  logger.debug(`Got memory stats: ${JSON.stringify(response.data)}`)
+
+  response.data.forEach((element: MemoryStats) => {
+    activeMemoryX.push({
+      x: element.time,
+      y: element.activeMemoryMb
+    })
+
+    availableMemoryX.push({
+      x: element.time,
+      y: element.availableMemoryMb
+    })
+  })
+
+  return { activeMemoryX, availableMemoryX }
+}
+
 async function getNetworkStats(): Promise<ProcessedNetworkStats> {
   let networkReadX: ProcessedStats[] = []
   let networkWriteX: ProcessedStats[] = []

dist/sc/index.js

@@ -2,7 +2,7 @@ import si from 'systeminformation'
 import { createServer, IncomingMessage, Server, ServerResponse } from 'http'
 import * as logger from './logger'
 
-import { CPUStats, DiskStats, NetworkStats } from './interfaces'
+import { CPUStats, MemoryStats, DiskStats, NetworkStats } from './interfaces'
 
 const STATS_FREQ: number =
   parseInt(process.env.WORKFLOW_TELEMETRY_STAT_FREQ || '') || 5000
@@ -18,7 +18,7 @@ let statCollectTime: number = 0
 
 ///////////////////////////
 
-// CPU Stats            //
+// CPU Stats             //
 ///////////////////////////
 
 const cpuStatsHistogram: CPUStats[] = []
@@ -45,6 +45,33 @@ function collectCPUStats(
 
 ///////////////////////////
 
+// Memory Stats          //
+///////////////////////////
+
+const memoryStatsHistogram: MemoryStats[] = []
+
+function collectMemoryStats(
+    statTime: number,
+    timeInterval: number
+): Promise<any> {
+  return si
+      .mem()
+      .then((data: si.Systeminformation.MemData) => {
+        const memoryStats: MemoryStats = {
+          time: statTime,
+          totalMemoryMb: data.total / 1024 / 1024,
+          activeMemoryMb: data.active / 1024 / 1024,
+          availableMemoryMb: data.available / 1024 / 1024
+        }
+        memoryStatsHistogram.push(memoryStats)
+      })
+      .catch((error: any) => {
+        logger.error(error)
+      })
+}
+
+///////////////////////////
+
 // Network Stats         //
 ///////////////////////////
 
@@ -117,6 +144,7 @@ async function collectStats(triggeredFromScheduler: boolean = true) {
     const promises: Promise<any>[] = []
 
     promises.push(collectCPUStats(statCollectTime, timeInterval))
+    promises.push(collectMemoryStats(statCollectTime, timeInterval))
     promises.push(collectNetworkStats(statCollectTime, timeInterval))
     promises.push(collectDiskStats(statCollectTime, timeInterval))
 
@@ -143,6 +171,15 @@ function startHttpServer() {
             }
             break
           }
+          case '/memory': {
+            if (request.method === 'GET') {
+              response.end(JSON.stringify(memoryStatsHistogram))
+            } else {
+              response.statusCode = 405
+              response.end()
+            }
+            break
+          }
           case '/network': {
             if (request.method === 'GET') {
               response.end(JSON.stringify(networkStatsHistogram))