frontend docker metric processing

Author: Eisha Kaushal

app/context/helpers.ts

@@ -36,61 +36,49 @@ interface HealthDataObject {
   [key: string]: MetricObject[]
 }
 
-// Transforms health data into a nested object based on service name
 export function healthTransformer(healthData: HealthDataObject[]) {
   // make an object for storing different services' metrics data
-  const serviceMetricsObject = {}; //books:..., customers:..., orders:..., frontend:...
+  const serviceMetricsObject = {};
   // loop through the services in the healthData array
-  healthData.forEach(serviceObj => { //books
+  healthData.forEach(serviceObj => {
     // grab the key string from the current service object
-    const serviceName = Object.keys(serviceObj)[0]; //books-containerinfos
-    // add the serviceName as a key on the serviceMetricsObject and assign it an empty object
-    serviceMetricsObject[serviceName] = {}; //add key service Name to object
-    const serviceElements = serviceObj[serviceName]; //array of metric objects IN heatlhdataObj @ serviceName
+    const serviceName = Object.keys(serviceObj)[0];
+    const serviceElements = serviceObj[serviceName];
     console.log('serviceElements: ', serviceElements);
+    // add the serviceName as a key on the serviceMetricsObject and assign it an empty object
+    serviceMetricsObject[serviceName] = {};
     // loop through the elements of the current service
-    serviceElements.forEach((dataObject: any) => { //--v12 --make it an object typscript?
-      console.log('raw dataOBJ LN 53', dataObject);
-      // !containerName exist, generate a key for that object that matches the category value of the current dataObject
-      let containerName = dataObject.containername;
-      if (!serviceMetricsObject[serviceName][containerName]) {
-        serviceMetricsObject[serviceName][containerName] = {};
-        console.log('line 58  if category ', [containerName])
+    serviceElements.forEach(dataObject => {
+      // if it doesn't exist, generate a key for that object that matches the category value of the current dataObject
+      if (!serviceMetricsObject[serviceName][dataObject.category]) {
+        serviceMetricsObject[serviceName][dataObject.category] = {};
       }
-
-      for (let metric in dataObject) { //loop the data object for metric names and values
-        // in containerName nested object, assign a key using the current dataObject's metric value and assign its value an empty object
-        if (!serviceMetricsObject[serviceName][containerName][metric]) {
-          serviceMetricsObject[serviceName][containerName][metric] = {};
-          console.log('line 60  if metric ', metric)
-        }
-        // if the 'value' key doesn't exist in the previous object assign a key of 'value' with the value of an array that includes the value of value
-        if (!serviceMetricsObject[serviceName][containerName][metric].value) {
-          serviceMetricsObject[serviceName][containerName][metric].value = [dataObject[metric]];
-          console.log('line 65  if value ', dataObject[metric])
-        } else { // if it does exist, push the value of the current dataObject's time key onto the array
-          serviceMetricsObject[serviceName][containerName][metric].value.push(
-            dataObject[metric]
-          );
-          console.log('line 68  else value ', dataObject[metric])
-        }
-        // in that same object, if the key 'time' doesn't exist yet, assign a key of 'time' with the value as an array that includes the time value
-        if (!serviceMetricsObject[serviceName][containerName][metric].time) {
-          serviceMetricsObject[serviceName][containerName][metric].time = [dataObject.time];
-          console.log('line 75  if time ', [dataObject.time])
-        } else { // if it does exist aready, push the current time value into the time array
-          serviceMetricsObject[serviceName][containerName][metric].time.push(
-            dataObject.time
-          );
-          console.log('line 78  else time ', [dataObject.time])
-        }
-        console.log('serviceMetricsOBJ LN83: ', serviceMetricsObject)
+      // in that nested object, assign a key using the current dataObject's metric value and assign its value an empty object
+      if (!serviceMetricsObject[serviceName][dataObject.category][dataObject.metric]) {
+        serviceMetricsObject[serviceName][dataObject.category][dataObject.metric] = {};
+      }
+      // if the 'value' key doesn't exist in the previous object assign a key of 'value' with the value of an array that includes the value of value
+      if (!serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].value) {
+        serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].value = [dataObject.value];
+      } else { // if it does exist, push the value of the current dataObject's time key onto the array
+        serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].value.push(
+          dataObject.value
+        );
+      }
+      // in that same object, if the key 'time' doesn't exist yet, assign a key of 'time' with the value as an array that includes the time value
+      if (!serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].time) {
+        serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].time = [dataObject.time];
+      } else { // if it does exist aready, push the current time value into the time array
+        serviceMetricsObject[serviceName][dataObject.category][dataObject.metric].time.push(
+          dataObject.time
+        );
       }
     });
   })
   return serviceMetricsObject;
 };
 
+
 export function eventTransformer(eventData: MetricObject[]) {
   // make an object for storing the metrics data
   const eventMetricsObject = {};

app/modals/EnvModal.tsx

@@ -27,7 +27,7 @@ const EnvModal: React.FC<EnvModalProps> = React.memo(
             <Typography>Cloud-Based</Typography>
           </button>
           <button
-            className="env-button"
+            className="env-button2"
             onClick={() => {
               setOpen(false);
               setAddModalOpen(true);

app/stylesheets/EnvModal.scss

@@ -19,6 +19,21 @@
   }
 }
 
+.env-button2 {
+  background-color: transparent;
+  border: 0;
+  outline: none;
+  white-space: nowrap;
+  margin: 10px;
+  // padding: 0px;
+  color: $gblue !important;
+  box-shadow: $boxshadow;
+  padding: 2rem;
+  &:hover {
+    background-color: $lightpurple;
+  }
+}
+
 p {
   padding: 0 !important;
 }

electron/models/DockerModel.ts

@@ -3,57 +3,23 @@ import mongoose from 'mongoose';
 const { Schema } = mongoose;
 
 const DockerSchema = new Schema({
-  containername: {
-    type: String,
-    required: true,
-  },
-  containerid: {
-    type: String,
-    required: true,
-  },
-  platform: {
-    type: String,
-    required: true,
+  time: {
+    type: Date,
+    default: Date.now(),
   },
-  starttime: {
+  metric: {
     type: String,
-    required: true,
   },
-  memoryusage: {
+  value: {
     type: Number,
-    required: true,
   },
-  memorylimit: {
-    type: Number,
-    required: true,
-  },
-  memorypercent: {
-    type: Number,
-    required: true,
-  },
-  cpupercent: {
-    type: Number,
-    required: true,
-  },
-  networkreceived: {
-    type: Number,
-    required: true,
-  },
-  networksent: {
-    type: Number,
-    required: true,
-  },
-  processcount: {
-    type: Number,
-    required: true,
-  },
-  restartcount: {
-    type: Number,
-    required: true,
+  category: {
+    type: String,
+    default: '',
   },
 });
 
 const DockerModelFunc = (serviceName: any) =>
   mongoose.model<any>(`${serviceName}`, DockerSchema);
 
-export default DockerModelFunc;
+export default DockerModelFunc;