catch undefined and return default empty in normalizeMetrics

Signed-off-by: Sebastian Malton <smalton@mirantis.com>
lensapp · Jun 15, 2020 · 2b90d13 · 2b90d13
1 parent 8f0c785
commit 2b90d13
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/dashboard/client/api/endpoints/metrics.api.ts b/dashboard/client/api/endpoints/metrics.api.ts
@@ -56,7 +56,21 @@ export const metricsApi = {
 };
 
 export function normalizeMetrics(metrics: IMetrics, frames = 60): IMetrics {
+  if (!metrics?.data?.result) {
+    return {
+      data: {
+        resultType: "",
+        result: [{
+          metric: {},
+          values: []
+        } as IMetricsResult],
+      },
+      status: "",
+    }
+  }
+
   const { result } = metrics.data;
+
   if (result.length) {
     if (frames > 0) {
       // fill the gaps

diff --git a/dashboard/client/components/+cluster/cluster.store.ts b/dashboard/client/components/+cluster/cluster.store.ts
@@ -82,15 +82,16 @@ export class ClusterStore extends KubeObjectStore<Cluster> {
     this.liveMetrics = await this.loadMetrics({ start, end, step, range });
   }
 
-  getMetricsValues(source: Partial<IClusterMetrics>) {
-    const metrics =
-      this.metricType === MetricType.CPU ? source.cpuUsage :
-        this.metricType === MetricType.MEMORY ? source.memoryUsage
-          : null;
-    if (!metrics) {
+  getMetricsValues(source: Partial<IClusterMetrics>): [number, string][] {
+    console.log(source)
+    switch (this.metricType) {
+    case MetricType.CPU:
+      return normalizeMetrics(source.cpuUsage).data.result[0].values
+    case MetricType.MEMORY:
+      return normalizeMetrics(source.memoryUsage).data.result[0].values
+    default:
       return [];
     }
-    return normalizeMetrics(metrics).data.result[0].values;
   }
 
   resetMetrics() {

diff --git a/dashboard/client/components/+network-ingresses/ingress-charts.tsx b/dashboard/client/components/+network-ingresses/ingress-charts.tsx
@@ -18,9 +18,9 @@ export const IngressCharts = observer(() => {
   if (!metrics) return null;
   if (isMetricsEmpty(metrics)) return <NoMetrics/>;
 
-  const values = Object.values(metrics).map(metric =>
-    normalizeMetrics(metric).data.result[0].values
-  );
+  const values = Object.values(metrics)
+    .map(normalizeMetrics)
+    .map(({ data }) => data.result[0].values);
   const [
     bytesSentSuccess,
     bytesSentFailure,

diff --git a/dashboard/client/components/+workloads-pods/container-charts.tsx b/dashboard/client/components/+workloads-pods/container-charts.tsx
@@ -17,9 +17,9 @@ export const ContainerCharts = () => {
   if (!metrics) return null;
   if (isMetricsEmpty(metrics)) return <NoMetrics/>;
 
-  const values = Object.values(metrics).map(metric =>
-    normalizeMetrics(metric).data.result[0].values
-  );
+  const values = Object.values(metrics)
+    .map(normalizeMetrics)
+    .map(({ data }) => data.result[0].values);
   const [
     cpuUsage,
     cpuRequests,

diff --git a/dashboard/client/components/+workloads-pods/pod-charts.tsx b/dashboard/client/components/+workloads-pods/pod-charts.tsx
@@ -28,9 +28,9 @@ export const PodCharts = observer(() => {
   if (isMetricsEmpty(metrics)) return <NoMetrics/>;
 
   const options = tabId == 0 ? cpuOptions : memoryOptions;
-  const values = Object.values(metrics).map(metric =>
-    normalizeMetrics(metric).data.result[0].values
-  );
+  const values = Object.values(metrics)
+    .map(normalizeMetrics)
+    .map(({ data }) => data.result[0].values);
   const [
     cpuUsage,
     cpuRequests,