Merge pull request #23 from oslabs-beta/alex/healthMetricsExpanded

Alex/health metrics expanded

Author: Fredwards

chronos_npm_package/controllers/healthHelpers.js

@@ -13,15 +13,57 @@ healthHelpers.collectHealthData = () => {
   // for use with every object
   const time = Date.now();
   // Fill the array of promises
+  promises.push(
+    si
+      .cpu()
+      .then(data => ({
+        speed_in_GHz: data.speed,
+        speedMax_in_GHz: data.speedMax,
+        num_of_cores: data.cores,
+        num_of_processors: data.processors,
+        'cache.l1d in bytes': data.cache.l1d,
+        'cache.l1i in bytes': data.cache.l1i,
+        'cache.l2 in bytes': data.cache.l2,
+        'cache.l3 in bytes': data.cache.l3,
+      }))
+      .then(data => {
+        const cpuMetrics = [];
+        for (const metric in data) {
+          cpuMetrics.push({
+            metric,
+            value: data[metric],
+            category: 'CPU',
+            time,
+          });
+        }
+        return cpuMetrics;
+      })
+      .catch(err => {
+        if (err) {
+          throw err;
+        }
+      })
+  );
   promises.push(
     si
       .cpuCurrentspeed()
       .then(data => ({
-        metric: 'cpuspeed',
-        value: data.avg,
-        category: 'CPU',
-        time,
+        average_CPU_speed_in_GHz: data.avg,
+        minimum_CPU_speed_in_GHz: data.min,
+        maximum_CPU_speed_in_GHz: data.max,
       }))
+      .then(data => {
+        const cpuSpeedMetrics = [];
+        for (const metric in data) {
+          cpuSpeedMetrics.push({
+            metric,
+            value: data[metric],
+            category: 'CPU',
+            time,
+          });
+        }
+        return cpuSpeedMetrics;
+      })
       .catch(err => {
         if (err) {
           throw err;
@@ -33,11 +75,21 @@ healthHelpers.collectHealthData = () => {
     si
       .cpuTemperature()
       .then(data => ({
-        metric: 'cputemp',
-        value: data.main,
-        category: 'CPU',
-        time,
+        average_temperature: data.main,
+        max_temperature: data.max,
       }))
+      .then(data => {
+        const cpuTemperatureMetrics = [];
+        for (const metric in data) {
+          cpuTemperatureMetrics.push({
+            metric,
+            value: data[metric],
+            category: 'CPU',
+            time,
+          });
+        }
+        return cpuTemperatureMetrics;
+      })
       .catch(err => {
         if (err) {
           throw err;
@@ -49,11 +101,26 @@ healthHelpers.collectHealthData = () => {
     si
       .currentLoad()
       .then(data => ({
-        metric: 'cpuloadpercent',
-        value: data.currentload,
-        category: 'CPU',
-        time,
+        average_CPU_load_percent: data.avg,
+        current_CPU_load_percent: data.currentLoad,
+        current_CPU_load_user_percent: data.currentLoadUser,
+        current_CPU_load__system_percent: data.currentLoadSystem,
+        current_CPU_load_nice_percent: data.currentLoadNice,
+        current_CPU_load_idle_percent: data.currentLoadIdle,
+        current_CPU_load_raw_ticks: data.rawCurrentLoad,
       }))
+      .then(data => {
+        const cpuLoadMetrics = [];
+        for (const metric in data) {
+          cpuLoadMetrics.push({
+            metric,
+            value: data[metric],
+            category: 'CPU',
+            time,
+          });
+        }
+        return cpuLoadMetrics;
+      })
       .catch(err => {
         throw err;
       })
@@ -63,10 +130,12 @@ healthHelpers.collectHealthData = () => {
     si
       .mem()
       .then(data => ({
-        totalmemory: data.total,
-        freememory: data.free,
-        usedmemory: data.used,
-        activememory: data.active,
+        totalmemory_in_bytes: data.total,
+        freememory_in_bytes: data.free,
+        usedmemory_in_bytes: data.used,
+        activememory_in_bytes: data.active,
+        buffers_plus_cache_in_bytes: data.buffcache,
+        available_memory: data.available,
       }))
       .then(data => {
         const memMetrics = [];
@@ -87,6 +156,8 @@ healthHelpers.collectHealthData = () => {
       })
   );
 
+  
+
   promises.push(
     si
       .processes()

chronos_npm_package/controllers/mongo.js

@@ -110,6 +110,7 @@ chronos.health = ({ microservice, interval }) => {
   setInterval(() => {
     collectHealthData()
       .then(healthMetrics => {
+        console.log('HEALTH METRICS: ', healthMetrics);
         const HealthModel = HealthModelFunc(`${microservice}`);
         return HealthModel.insertMany(healthMetrics);
       })