merge

Merge branch 'dev' into front_test_with_chronos_tranck

Author: curiousyang

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);
       })
@@ -217,6 +218,14 @@ It then takes the returned array of metrics, turns them into documents based on
 KafkaModel.js, and inserts them into the db at the provided uri with insertMany()
 */
 chronos.kafka = function (userConfig) {
+  // ensure that kafkametrics exists in the services table
+  const service = new ServicesModel({ service: 'kafkametrics', interval: userConfig.interval });
+
+  service
+    .save()
+    .then(() => console.log(`Adding "kafkametrics" to the services table`))
+    .catch(err => console.log(`Error saving "kafkametrics" to the services table: `, err.message));
+
   // fetch the data from Kafka with kafkaFetch()
   // then take turn each result in the returned array into a kafkaModel doc
   // insertMany into the the KafkaModel

chronos_npm_package/controllers/postgres.js

@@ -298,6 +298,8 @@ chronos.docker = function ({ microservice, interval }) {
 };
 
 chronos.kafka = function (userConfig) {
+  // Ensure that kafkametrics are a part of the services table
+  chronos.services({ microservice: 'kafkametrics', interval: userConfig.interval });
   // create kafkametrics table if it does not exist
   const createTableQuery = `
     CREATE TABLE IF NOT EXISTS kafkametrics (

electron/routes/data.ts

@@ -12,10 +12,11 @@ import DockerModelFunc from '../models/DockerModel';
 import KafkaModel from '../models/KafkaModel';
 import fetch, { FetchError } from 'electron-fetch';
 import { lightWhite } from 'material-ui/styles/colors';
-import {fetchData}  from './dataHelpers';
+//import { postgresFetch, mongoFetch }  from './dataHelpers';
+import { fetchData } from './dataHelpers';
 
-const postgresFetch = fetchData.postgresFetch;
 const mongoFetch = fetchData.mongoFetch;
+const postgresFetch = fetchData.postgresFetch;
 
 require('dotenv').config();
 console.log('test console log work');
@@ -133,48 +134,12 @@ ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: stri
 
     // Mongo Database
     if (currentDatabaseType === 'MongoDB') {
-      // // Get document count
-      let num = await HealthModelFunc(service).countDocuments({});
-      // Get last 50 documents. If less than 50 documents, get all
-      num = Math.max(num, 10);
-      result = await HealthModelFunc(service)
-        .find(
-          {},
-          {
-            cpuspeed: 1,
-            cputemp: 1,
-            cpuloadpercent: 1,
-            totalmemory: 1,
-            freememory: 1,
-            usedmemory: 1,
-            activememory: 1,
-            totalprocesses: 1,
-            runningprocesses: 1,
-            blockedprocesses: 1,
-            sleepingprocesses: 1,
-            latency: 1,
-            time: 1,
-            __v: 1,
-            service,
-          }
-        )
-        .skip(num - 50);
-
+      result = await mongoFetch(service);
     }
 
-    /**
-     * `
-          SELECT *, 'customers' as service FROM customers
-          ORDER BY _id DESC
-          LIMIT 50
-          `;
-     * 
-     */
-
     // SQL Database
     if (currentDatabaseType === 'SQL') {
       // Get last 50 documents. If less than 50 get all
- 
       result = await postgresFetch(service, pool);
       console.log("result-health in data.ts:", JSON.stringify(result));
     }

electron/routes/dataHelpers.js

@@ -26,8 +26,11 @@ const aggregator = [
 // TCreate a model based on the serviceName
 // Create an aggregator based on the aggregator variable
 // return the result
-fetchData.mongoFetch = function (serviceName) {
-  
+fetchData.mongoFetch = async function (serviceName) {
+  const testModel = HealthModelFunc(serviceName);
+  let result = await testModel.aggregate(aggregator);
+  result = [{ [serviceName]: result }];
+  return result;
 };
 
 fetchData.postgresFetch = async function (serviceName, pool) {
@@ -57,4 +60,5 @@ fetchData.postgresFetch = async function (serviceName, pool) {
   return result;
 };
 
-export {fetchData};
+export { fetchData };
+