Merge pull request #9 from oslabs-beta/mergedev

Tested everything, this is final merge into dev with all functioning features

Author: GP3-RS

app/components/About.tsx

@@ -21,37 +21,34 @@ const About: React.FC = React.memo(() => {
           to use and expensive to operate, Chronos was born. Chronos is an all-in-one network and
           health monitoring tool for your application or microservice, containerized or not!
         </p>
+        <br>
+        </br>
         <h3 style={currentMode} className="title">
           Fantastic Four
         </h3>
         <div>
           <span style={currentMode} className="text">
-            Nachiket
+            <p>Josh</p>
           </span>
-          <br />
           <span style={currentMode} className="text">
-            Tiffany
+            <p>Elisa</p>
           </span>
-          <br />
           <span style={currentMode} className="text">
-            Bruno
+            <p>Troy</p>
           </span>
-          <br />
           <span style={currentMode} className="text">
-            Danny
+            <p>Gahl</p>
           </span>
           <br />
-          <br />
         </div>
         <h3 style={currentMode} className="title">
           Contributors
         </h3>
         <p style={currentMode} className="text">
-          Vince, Matt, Derek, Kit, Grace, Jen, Patty, Stella, Michael, Ronelle, Todd, Greg, Brianna,
+          Nachiket, Tiffany, Bruno, Danny, Vince, Matt, Derek, Kit, Grace, Jen, Patty, Stella, Michael, Ronelle, Todd, Greg, Brianna,
           Brian, Alon, Alan, Ousman, Ben, Chris, Jenae, Tim, Kirk, Jess, William, Alexander
         </p>
         <br />
-        <p style={currentMode}>Copyright © Team Chronos 2021.</p>
       </div>
     </div>
   );

app/components/TransferColumns.tsx

@@ -129,6 +129,7 @@ const TransferColumns = React.memo(() => {
     // setSelectedMetrics
     const temp: any[] = [];
     const categorySet = new Set();
+    console.log('targetKeys is: ', targetKeys)
     for (let i = 0; i < targetKeys.length; i++) {
       const str: string = targetKeys[i];
       const strArr: string[] = str.split(' | ');
@@ -148,6 +149,7 @@ const TransferColumns = React.memo(() => {
         temp.push(newCategory);
       }
     }
+    console.log('temp is: ', temp);
     setSelectedMetrics(temp);
   };
 

app/stylesheets/About.scss

@@ -69,3 +69,7 @@
     animation: none;
   }
 }
+
+p {
+  padding-left: 10px;
+}

app/stylesheets/Contact.scss

@@ -22,7 +22,6 @@
   flex-direction: column;
   justify-content: center;
   font-size: 18px;
-
   border-radius: 10px;
   border: none;
   box-shadow: $boxshadow2;
@@ -65,6 +64,8 @@
       flex-direction: column;
       width: 100%;
       input {
+        border: 1px solid transparent;
+        border-radius: 5px;
         width: 100%;
         color: $header;
         font-size: 16px;
@@ -75,6 +76,7 @@
         }
       }
       textarea {
+        border-radius: 5px;
         font-size: 16px;
         width: 100%;
         min-width: 100%;
@@ -109,6 +111,7 @@
 
   &:hover {
     border: none;
+    cursor: pointer;
   }
 
   &:focus {
@@ -122,6 +125,7 @@
 
 input[type='file'] {
   border: none;
+  border-radius: 5px;
 
   &:hover {
     border: none;

chronos_npm_package/controllers/mongo.js

@@ -108,10 +108,18 @@ mongo.communications = ({ microservice, slack, email }) => {
  * @param {string} microservice Microservice name
  * @param {number} interval Interval for continuous data collection
  */
-mongo.health = ({ microservice, interval }) => {
+mongo.health = async ({ microservice, interval, mode }) => {
+  let l = 0;
+  const currentMetricNames = {};
+
+  l = await mongo.getSavedMetricsLength(mode, currentMetricNames);
+
   setInterval(() => {
     collectHealthData()
-      .then(healthMetrics => {
+      .then(async (healthMetrics) => {
+        if (l !== healthMetrics.length) {
+          l = await mongo.addMetrics(healthMetrics, mode, currentMetricNames);
+        }
         const HealthModel = HealthModelFunc(`${microservice}`);
         return HealthModel.insertMany(healthMetrics);
       })
@@ -126,7 +134,8 @@ mongo.health = ({ microservice, interval }) => {
  * Runs instead of health if dockerized is true
  * Collects information on the docker container
  */
-mongo.docker = ({ microservice, interval }) => {
+mongo.docker = ({ microservice, interval, mode }) => {
+
   // Create collection using name of microservice
   const containerInfo = ContainerInfoFunc(`${microservice}-containerinfo`);
   dockerHelper.getDockerContainer(microservice)
@@ -182,7 +191,7 @@ mongo.saveService = (config) => {
 mongo.setQueryOnInterval = async (config) => {
   let model;
   let metricsQuery;
-  let currentMetrics;
+
   let l = 0;
   const currentMetricNames = {};
 
@@ -198,39 +207,18 @@ mongo.setQueryOnInterval = async (config) => {
   // When querying for currentMetrics, we narrow down the result to only include metrics for the current service being used.
   // This way, when we go to compare parsedArray to currentMetricNames, the length of the arrays should match up unless there are new metrics available to view
 
-  currentMetrics = await MetricsModel.find({mode: config.mode});
-  if (currentMetrics.length > 0) {
-    currentMetrics.forEach(el => {
-    const { metric, selected } = el;
-    currentMetricNames[metric] = selected;
-    l = currentMetrics.length;
-    })
-  }
+  l = await mongo.getSavedMetricsLength(config.mode, currentMetricNames);
+
+  console.log('currentMetricNames is: ', Object.keys(currentMetricNames).length)
   // Use setInterval to send queries to metrics server and then pipe responses to database
   setInterval(() => {
     metricsQuery(config)
       // This updates the Metrics Model with all chosen metrics. If there are no chosen metrics it sets all available metrics as chosen metrics within the metrics model.
       .then(async (parsedArray) => {
         // This conditional would be used if new metrics are available to be tracked.
         if (l !== parsedArray.length) {
-          console.log('currentMetricNames is less than parsedArray length, new metrics available to track');
-          console.log('currentMetricNames has a length of: ', l, ' and parsedArray.length is: ', parsedArray.length);
-          const newMets = [];
-          parsedArray.forEach(el => {
-            if (!(el.metric in currentMetricNames)) {
-              const { metric } = el;
-              newMets.push(MetricsModel({metric: metric, mode: config.mode}))
-              currentMetricNames[el.metric] = true;
-            }
-          })
-          await MetricsModel.insertMany(newMets, (err) => {
-            if (err) console.error(err)
-          })
-          l = parsedArray.length;
+          l = await mongo.addMetrics(parsedArray, config.mode, currentMetricNames);
         }
-        return parsedArray;
-      })
-      .then(parsedArray => {
         const documents = [];
         for (const metric of parsedArray) {
           // This will check if the current metric in the parsed array evaluates to true within the currentMetricNames object.
@@ -247,8 +235,33 @@ mongo.setQueryOnInterval = async (config) => {
   }, config.interval);
 }
 
+mongo.getSavedMetricsLength = async (mode, currentMetricNames) => {
+  let currentMetrics = await MetricsModel.find({mode: mode});
+  if (currentMetrics.length > 0) {
+    currentMetrics.forEach(el => {
+    const { metric, selected } = el;
+    currentMetricNames[metric] = selected;
+    })
+  }
+  return currentMetrics.length ? currentMetrics.length : 0;
+}
 
-// This middleware could be used if the user would like to update their chronos data, but they would have to expose a URL/port to be queried for the Electron front end.
+mongo.addMetrics = async (arr, mode, obj) => {
+    const newMets = [];
+    arr.forEach(el => {
+      if (!(el.metric in obj)) {
+        const { metric } = el;
+        newMets.push({metric: metric, mode: mode})
+        obj[el.metric] = true;
+      }
+    })
+    await MetricsModel.insertMany(newMets, (err) => {
+      if (err) console.error(err)
+    })
+    return arr.length;
+}
+
+// This middleware could be used if the user would like to update their chronos data in real time (immediately after updating saved metrics on the Chronos desktop app), but they would have to expose a URL/port to be queried for the Electron front end.
 //
 // mongo.modifyMetrics = (config) => {
 //   return function (req, res, next) {
@@ -262,5 +275,4 @@ mongo.setQueryOnInterval = async (config) => {
 //   };
 // }
 
-
 module.exports = mongo;

chronos_npm_package/controllers/postgres.js

@@ -35,7 +35,7 @@ postgres.connect = async ({ database }) => {
 postgres.services = ({ microservice, interval }) => {
   // Create services table if does not exist
   client.query(
-    `CREATE TABLE IF NOT EXISTS services (
+      `CREATE TABLE IF NOT EXISTS services (
       _id SERIAL PRIMARY KEY NOT NULL,
       microservice VARCHAR(248) NOT NULL UNIQUE,
       interval INTEGER NOT NULL)`,
@@ -46,8 +46,8 @@ postgres.services = ({ microservice, interval }) => {
     }
   );
 
-  client.query(`
-      CREATE TABLE IF NOT EXISTS metrics (
+  client.query(
+      `CREATE TABLE IF NOT EXISTS metrics (
       _id SERIAL PRIMARY KEY NOT NULL,
       metric TEXT NOT NULL UNIQUE,
       selected BOOLEAN,
@@ -163,13 +163,14 @@ function createQueryString(numRows, serviceName) {
 
 // Places the values being inserted into postgres into an array that will eventually
 // hydrate the parameterized query
-function createQueryArray(dataPointsArray) {
+function createQueryArray(dataPointsArray, currentMetricNames) {
   const queryArray = [];
   for (const element of dataPointsArray) {
-    queryArray.push(element.metric);
-    queryArray.push(element.value);
-    queryArray.push(element.category);
-    queryArray.push(element.time / 1000); // Converts milliseconds to seconds to work with postgres
+      queryArray.push(element.metric);
+      queryArray.push(element.value);
+      queryArray.push(element.category);
+      queryArray.push(element.time / 1000);
+       // Converts milliseconds to seconds to work with postgres
   }
   return queryArray;
 }
@@ -179,7 +180,12 @@ function createQueryArray(dataPointsArray) {
  * @param {string} microservice Microservice name
  * @param {number} interval Interval for continuous data collection
  */
-postgres.health = ({ microservice, interval }) => {
+postgres.health = async ({ microservice, interval, mode }) => {
+  let l = 0;
+  const currentMetricNames = {};
+
+  l = await postgres.getSavedMetricsLength(mode, currentMetricNames);
+
   // Create table for the microservice if it doesn't exist yet
   const createTableQuery = `
     CREATE TABLE IF NOT EXISTS ${microservice} (
@@ -197,10 +203,14 @@ postgres.health = ({ microservice, interval }) => {
   // Save data point at every interval (ms)
   setInterval(() => {
     collectHealthData()
-      .then(data => {
-        const numRows = data.length;
+      .then(async (data) => {
+        if (l !== data.length) {
+          l = await postgres.addMetrics(data, mode, currentMetricNames);
+        }
+        const documents = data.filter(el => (el.metric in currentMetricNames));
+        const numRows = documents.length;
         const queryString = createQueryString(numRows, microservice);
-        const queryArray = createQueryArray(data);
+        const queryArray = createQueryArray(documents);
         // console.log('POSTGRES QUERY STRING: ', queryString);
         // console.log('POSTGRES QUERY ARRAY', queryArray);
         return client.query(queryString, queryArray);
@@ -357,22 +367,8 @@ postgres.setQueryOnInterval = async (config) => {
     metricsQuery(config)
       .then(async (parsedArray) => {
         if (l !== parsedArray.length) {
-          console.log('currentMetricNames is less than parsedArray length, new metrics available to track');
-          console.log('currentMetricNames has a length of: ', l, ' and parsedArray.length is: ', parsedArray.length);
-          let metricsQueryString = 'INSERT INTO metrics (metric, selected, mode) VALUES ';
-          parsedArray.forEach(el => {
-            if (!(el.metric in currentMetricNames)) {
-              currentMetricNames[el.metric] = true;
-              metricsQueryString = metricsQueryString.concat(`('${el.metric}', true, '${config.mode}'), `);
-            }
-          })
-          metricsQueryString = metricsQueryString.slice(0, metricsQueryString.lastIndexOf(', ')).concat(';');
-          await client.query(metricsQueryString);
-          l = parsedArray.length;
+          l = await postgres.addMetrics(parsedArray, config.mode, currentMetricNames);
         }
-        return parsedArray;
-      })
-      .then(parsedArray => {
         const documents = [];
         for (const metric of parsedArray) {
           if (currentMetricNames[metric.metric]) documents.push(metric)
@@ -387,4 +383,28 @@ postgres.setQueryOnInterval = async (config) => {
   }, config.interval);
 }
 
+postgres.getSavedMetricsLength = async (mode, currentMetricNames) => {
+  let currentMetrics = await client.query(`SELECT * FROM metrics WHERE mode='${mode}';`);
+  if (currentMetrics.rows.length > 0) {
+    currentMetrics.rows.forEach(el => {
+    const { metric, selected } = el;
+    currentMetricNames[metric] = selected;
+    })
+  }
+  return currentMetrics.rows.length ? currentMetrics.rows.length : 0;
+}
+
+postgres.addMetrics = async (arr, mode, currentMetricNames) => {
+  let metricsQueryString = 'INSERT INTO metrics (metric, selected, mode) VALUES ';
+  arr.forEach(el => {
+    if (!(el.metric in currentMetricNames)) {
+      currentMetricNames[el.metric] = true;
+      metricsQueryString = metricsQueryString.concat(`('${el.metric}', true, '${mode}'), `);
+    }
+  })
+  metricsQueryString = metricsQueryString.slice(0, metricsQueryString.lastIndexOf(', ')).concat(';');
+  await client.query(metricsQueryString);
+  return arr.length;
+}
+
 module.exports = postgres;

electron/routes/data.ts

@@ -229,6 +229,11 @@ ipcMain.on('updateSavedMetrics', async (message: Electron.IpcMainEvent, args: Ob
       })
       // let result = await MetricsModel.update();
     }
+    if (currentDatabaseType === 'SQL' && args.length) {
+      args.forEach(async (el: any) => {
+        await pool.query(`UPDATE metrics SET selected=${el.selected} WHERE metric='${el.metric}'`)
+      })
+    }
   }
 
   catch (err) {