merge

Merge branch 'dev' into jeff

Author: Jeffrey Na

app/charts/HealthChart.tsx

@@ -2,26 +2,20 @@ import moment from 'moment';
 import React, { useState } from 'react';
 import Plot from 'react-plotly.js';
 import { all, solo as soloStyle } from './sizeSwitch';
-import { getTime } from '../context/helpers';
 
 interface HealthChartProps {
   key: string;
-  serviceName: string;
-  // metric: string;
+  dataType: string;
+  chartData: object;
   categoryName: string;
-  metrics: any[];
-  timeList: any[];
-  // valueList: any;
   sizing: string;
   colourGenerator: Function;
 }
-
 interface SoloStyles {
   height: number;
   width: number;
 }
-
-type plotlyData = {
+type PlotlyData = {
   name: string;
   x: string[];
   y: string[];
@@ -31,40 +25,61 @@ type plotlyData = {
 };
 
 const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
-  // 'metrics' is an array of the user-specified metrics as objects
-  const { serviceName, categoryName, metrics, timeList, sizing, colourGenerator } = props;
+  const { dataType, chartData, categoryName, sizing, colourGenerator } = props;
   const [solo, setSolo] = useState<SoloStyles | null>(null);
-  const timeArr = timeList.map((el: any) => moment(el).format('kk:mm:ss'));
-  const reverseTimeArr = timeArr.reverse();
-  const re = /_/g;
-  const plotlyDataObjectArray: plotlyData[] = [];
 
-  // generates an array plotly data objects to add to be passed into our plotly chart's data prop
-  const generatePlotlyDataObjects = (metricsArray, timeArray) => {
-    console.log('metricsArray: ', metricsArray);
-    console.log('timeArray: ', timeArray);
-    // initalize an array of objects for output
-    // iterate through the metricsArray
-    // each element is an array of num data (y-axis)
-    metricsArray.forEach(el => {
-      const originalMetricName = Object.keys(el)[0];
-      const prettyMetricName = originalMetricName.replace(re, ' ');
-      const newColor = colourGenerator(serviceName);
-      console.log('prettyMetricName ', prettyMetricName);
-      // plotly's data prop takes an array of objects that each have x, y, type, mode, marker
-      const dataObject: plotlyData = {
-        name: prettyMetricName,
-        x: timeArray,
-        y: el[originalMetricName],
-        type: 'scattergl',
-        mode: 'lines',
-        marker: {
-          colors: ['#fc4039', '#4b54ea', '#32b44f', '#3788fc', '#9c27b0', '#febc2c'],
-        },
-      };
-      plotlyDataObjectArray.push(dataObject);
-    });
-    console.log('plotlydataObjectarray: ', plotlyDataObjectArray);
+  // makes time data human-readable, and reverses it so it shows up correctly in the graph
+  const prettyTimeInReverse = (timeArray: string[]): string[] => {
+    return timeArray.map((el: any) => moment(el).format('kk:mm:ss')).reverse();
+  };
+
+  // removes underscores from metric names to improve their look in the graph
+  const prettyMetricName = metricName => {
+    return metricName.replaceAll('_', ' ');
+  };
+
+  // pulls the current service names to be shown in the graph title from chartData
+  const serviceNamesAsString = (chartData: object): string => {
+    let serviceNameString = '';
+    for (const serviceName in chartData) {
+      serviceNameString += `${serviceName} | `;
+    }
+    return serviceNameString;
+  };
+
+  // generates an array of plotly data objects to be passed into our plotly chart's data prop
+  const generatePlotlyDataObjects = (chartData: object): object[] => {
+    const arrayOfPlotlyDataObjects: PlotlyData[] = [];
+    // iterate through the chartData
+    for (const serviceName in chartData) {
+      // define the metrics for this service
+      const metrics = chartData[serviceName];
+      // loop through the list of metrics for the current service
+      for (const metricName in metrics) {
+        // define the value and time arrays; allow data to be reassignable in case we need to convert the bytes data into megabytes
+        let dataArray = metrics[metricName].value;
+        const timeArray = metrics[metricName].time;
+        // specifically for `Megabyte` types, convert the original data of bytes into a value of megabytes before graphing
+        if (dataType === 'Memory in Megabytes' || 'Cache in Megabytes') {
+          dataArray = dataArray.map(value => (value / 1000000).toFixed(2));
+        }
+        // create the plotly object
+        const plotlyDataObject: PlotlyData = {
+          name: prettyMetricName(metricName),
+          x: prettyTimeInReverse(timeArray),
+          y: dataArray,
+          type: 'scattergl',
+          mode: 'lines',
+          marker: {
+            colors: ['#fc4039', '#4b54ea', '#32b44f', '#3788fc', '#9c27b0', '#febc2c'],
+          },
+        };
+        // push the dataObject into the arrayOfPlotlyDataObjects
+        arrayOfPlotlyDataObjects.push(plotlyDataObject);
+      }
+    }
+    // return the array of plotlyDataObject
+    return arrayOfPlotlyDataObjects;
   };
 
   setInterval(() => {
@@ -74,15 +89,16 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
   }, 20);
 
   const createChart = () => {
-    generatePlotlyDataObjects(metrics, reverseTimeArr);
+    const dataArray = generatePlotlyDataObjects(chartData);
+    const serviceNames = serviceNamesAsString(chartData);
     const sizeSwitch = sizing === 'all' ? all : solo;
 
     return (
       <Plot
-        data={plotlyDataObjectArray}
+        data={dataArray}
         config={{ displayModeBar: true }}
         layout={{
-          title: `${serviceName} | ${categoryName}`,
+          title: `${serviceNames}| ${categoryName}`,
           ...sizeSwitch,
           font: {
             color: '#444d56',
@@ -93,10 +109,7 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
           plot_bgcolor: 'white',
           showlegend: true,
           legend: {
-            orientation: 'h',
-            xanchor: 'center',
-            x: 0.5,
-            y: 5,
+            orientation: 'v',
           },
           xaxis: {
             title: 'Time',
@@ -110,8 +123,7 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
           },
           yaxis: {
             rangemode: 'nonnegative',
-            //! change this later :^)
-            title: 'Value',
+            title: `${dataType}`,
           },
         }}
       />

app/components/TransferColumns.tsx

@@ -28,15 +28,21 @@ const TransferColumns = React.memo(() => {
   const { mode } = useContext(DashboardContext.DashboardContext);
 
   const eventDataList = eventData.eventDataList;
-  const healthDataList = healthData.healthDataList;
+  const healthDataObject = healthData;
 
   const currentMode = mode === 'light' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
 
+  // console.log('healthMetrics: ', healthMetrics);
+  // console.log('metricsPool: ', metricsPool);
+  // console.log('targetKeys: ', targetKeys);
+  // console.log('eventData: ', eventData);
+  // console.log('eventDataList: ', eventDataList);
+
   useEffect(() => {
-    if (healthDataList && healthDataList.length > 0) {
+    if (healthDataObject) {
       setHealthMetricsReady(true);
     }
-  }, [healthDataList]);
+  }, [healthDataObject]);
 
   useEffect(() => {
     if (eventDataList && eventDataList.length > 0) {
@@ -45,7 +51,7 @@ const TransferColumns = React.memo(() => {
   }, [eventDataList]);
 
   useEffect(() => {
-    setHealthMetrics(getMetrics('health', healthDataList));
+    setHealthMetrics(getMetrics('health', healthDataObject));
   }, [healthMetricsReady]);
 
   useEffect(() => {
@@ -65,33 +71,29 @@ const TransferColumns = React.memo(() => {
     }
     // JJ-ADDITION (CAN ALSO JUST ADD OR OPERATOR TO ABOVE CONDITIONAL)
     else if (service === 'kubernetesmetrics') {
-      if (healthDataList && healthDataList.length > 0) {
-        setMetricsPool(getMetrics('health', healthDataList));
+      if (healthDataObject) {
+        setMetricsPool(getMetrics('health', healthDataObject));
       } else if (healthMetricsReady) {
         setMetricsPool(healthMetrics);
       }
     } else if (!service.includes('kafkametrics')) {
-      if (healthDataList && healthDataList.length > 0) {
-        setMetricsPool(getMetrics('health', healthDataList));
+      if (healthDataObject) {
+        setMetricsPool(getMetrics('health', healthDataObject));
       } else if (healthMetricsReady) {
         setMetricsPool(healthMetrics);
       }
     } else {
-      if (
-        healthDataList &&
-        healthDataList.length > 0 &&
-        eventDataList &&
-        eventDataList.length > 0
-      ) {
+      if (healthDataObject && eventDataList && eventDataList.length > 0) {
         setMetricsPool(
-          getMetrics('event', eventDataList).concat(getMetrics('health', healthDataList))
+          getMetrics('event', eventDataList).concat(getMetrics('health', healthDataObject))
         );
       } else if (healthMetricsReady && eventMetricsReady) {
         setMetricsPool(eventMetrics.concat(healthMetrics));
       }
     }
   }, [service, eventData, healthData]);
 
+  // responsible for parsing data and updating state via setMetricsPool
   const getMetrics = (type, datalist) => {
     let pool: any[] = [];
     if (type === 'event') {
@@ -105,25 +107,33 @@ const TransferColumns = React.memo(() => {
         pool.push(temp);
       });
     } else {
-      datalist.forEach(category => {
-        const tag: string = Object.keys(category)[0];
-        const serviceObj: {} = category[tag][0];
-        const valuesOfServiceObj: any[] = Object.values(serviceObj);
-        const metricsArr: any[] = valuesOfServiceObj[0];
-        metricsArr.forEach(element => {
-          const temp = {};
-          const metricName: string = Object.keys(element)[0];
-          const key = tag + ' | ' + metricName;
-          temp['key'] = key;
-          temp['title'] = key;
-          temp['tag'] = tag;
-          pool.push(temp);
-        });
-      });
+      // iterate throught the healthData object to populate the `Metrics Query` tab with metrics options
+      // The pool array wants an object with a specific format in order to populate the selection table
+      for (const service in healthData) {
+        const categoryObjects = healthData[service];
+        for (const category in categoryObjects) {
+          const metricsObjects = categoryObjects[category];
+          for (const metric in metricsObjects) {
+            const key = category + ' | ' + metric;
+            pool.push({
+              key: key,
+              title: key,
+              tag: category,
+            });
+          }
+        }
+      }
     }
     return pool;
   };
 
+  // Justin's alternative to  getCharts (b/c getCharts is just saving the user-selected metrics into QueryContext)
+  // getCharts takes data that already exists in state as an array of strings, and makes it into an array of objects, just to save it to QueryContext state
+  // the selectedMetrics from QueryContext is used in TransferColumns, EventContainer, GraphsContainer, and HealthContainer
+  // const saveSelectedMetrics = () => {
+  //   // iterate over the targetKeys array
+  // }
+
   const getCharts = () => {
     const temp: any[] = [];
     const categorySet = new Set();
@@ -151,6 +161,7 @@ const TransferColumns = React.memo(() => {
     setSelectedMetrics(temp);
   };
 
+  // makes the column titles for the selection grid
   const columns = [
     { field: 'id', headerName: 'ID', width: 100 },
     {
@@ -167,8 +178,8 @@ const TransferColumns = React.memo(() => {
     },
   ];
 
+  // makes the rows needed for the selection grid
   const rows: any[] = [];
-
   metricsPool.forEach((el, index) => {
     const row = {};
     row['id'] = index;
@@ -177,8 +188,8 @@ const TransferColumns = React.memo(() => {
     rows.push(row);
   });
 
+  // makes the Printed list of 'currently selected rows' on the page using targetKeys array
   const selectedRows: any[] = [];
-
   targetKeys.forEach(el => {
     selectedRows.push(
       <li style={{ marginLeft: '30px', marginTop: '5px', color: currentMode.color }}>{el}</li>

app/containers/GraphsContainer.tsx

@@ -91,7 +91,7 @@ const GraphsContainer: React.FC = React.memo(props => {
 
     return () => {
       if (intervalID) clearInterval(intervalID);
-      setHealthData({ healthDataList: [], healthTimeList: [] });
+      setHealthData({});
       setDockerData({});
       setEventData({ eventDataList: [], eventTimeList: [] });
     };
@@ -156,9 +156,9 @@ const GraphsContainer: React.FC = React.memo(props => {
   };
 
   const HealthAndEventButtons: JSX.Element[] = getHealthAndEventComponents();
-  console.log('selected metrics: ', {GraphsContainer: selectedMetrics})
-  console.log('chart: ', { GraphsContainer: chart });
-  
+  console.log('selected metrics: ', selectedMetrics);
+  console.log('chart: ', chart);
+
   return (
     <>
       <nav id="navigationBar">