From ebb54facf907473672d052245ff3a38a30fdd0e2 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Tue, 13 Jul 2021 15:58:55 +0300
Subject: [PATCH] Removing limits and requests from Pod metrics (#3369)

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../+workloads-pods/container-charts.tsx      |  8 ++-
 .../components/+workloads-pods/pod-charts.tsx | 51 +++----------------
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/src/renderer/components/+workloads-pods/container-charts.tsx b/src/renderer/components/+workloads-pods/container-charts.tsx
index df55fc9b59..0c810b47de 100644
--- a/src/renderer/components/+workloads-pods/container-charts.tsx
+++ b/src/renderer/components/+workloads-pods/container-charts.tsx
@@ -27,6 +27,7 @@ import { isMetricsEmpty, normalizeMetrics } from "../../api/endpoints/metrics.ap
 import { NoMetrics } from "../resource-metrics/no-metrics";
 import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics";
 import { ThemeStore } from "../../theme.store";
+import { mapValues } from "lodash";
 
 type IContext = IResourceMetricsValue<any, { metrics: IPodMetrics }>;
 
@@ -37,10 +38,7 @@ export const ContainerCharts = observer(() => {
   if (!metrics) return null;
   if (isMetricsEmpty(metrics)) return <NoMetrics/>;
 
-  const values = Object.values(metrics)
-    .map(normalizeMetrics)
-    .map(({ data }) => data.result[0].values);
-  const [
+  const {
     cpuUsage,
     cpuRequests,
     cpuLimits,
@@ -48,7 +46,7 @@ export const ContainerCharts = observer(() => {
     memoryRequests,
     memoryLimits,
     fsUsage
-  ] = values;
+  } = mapValues(metrics, metric => normalizeMetrics(metric).data.result[0].values);
 
   const datasets = [
     // CPU
diff --git a/src/renderer/components/+workloads-pods/pod-charts.tsx b/src/renderer/components/+workloads-pods/pod-charts.tsx
index d3aafa0214..cc05aeec55 100644
--- a/src/renderer/components/+workloads-pods/pod-charts.tsx
+++ b/src/renderer/components/+workloads-pods/pod-charts.tsx
@@ -19,15 +19,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import React, { useContext } from "react";
+import { mapValues } from "lodash";
 import { observer } from "mobx-react";
-import type { IPodMetrics } from "../../api/endpoints";
-import { BarChart, cpuOptions, memoryOptions } from "../chart";
+import React, { useContext } from "react";
 import { isMetricsEmpty, normalizeMetrics } from "../../api/endpoints/metrics.api";
-import { NoMetrics } from "../resource-metrics/no-metrics";
+import { BarChart, cpuOptions, memoryOptions } from "../chart";
 import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics";
+import { NoMetrics } from "../resource-metrics/no-metrics";
+
 import type { WorkloadKubeObject } from "../../api/workload-kube-object";
-import { ThemeStore } from "../../theme.store";
+import type { IPodMetrics } from "../../api/endpoints";
 
 export const podMetricTabs = [
   "CPU",
@@ -40,27 +41,19 @@ type IContext = IResourceMetricsValue<WorkloadKubeObject, { metrics: IPodMetrics
 
 export const PodCharts = observer(() => {
   const { params: { metrics }, tabId, object } = useContext<IContext>(ResourceMetricsContext);
-  const { chartCapacityColor } = ThemeStore.getInstance().activeTheme.colors;
   const id = object.getId();
 
   if (!metrics) return null;
   if (isMetricsEmpty(metrics)) return <NoMetrics/>;
 
   const options = tabId == 0 ? cpuOptions : memoryOptions;
-  const values = Object.values(metrics)
-    .map(normalizeMetrics)
-    .map(({ data }) => data.result[0].values);
-  const [
+  const {
     cpuUsage,
-    cpuRequests,
-    cpuLimits,
     memoryUsage,
-    memoryRequests,
-    memoryLimits,
     fsUsage,
     networkReceive,
     networkTransmit
-  ] = values;
+  } = mapValues(metrics, metric => normalizeMetrics(metric).data.result[0].values);
 
   const datasets = [
     // CPU
@@ -71,20 +64,6 @@ export const PodCharts = observer(() => {
         tooltip: `Container CPU cores usage`,
         borderColor: "#3D90CE",
         data: cpuUsage.map(([x, y]) => ({ x, y }))
-      },
-      {
-        id: `${id}-cpuRequests`,
-        label: `Requests`,
-        tooltip: `Container CPU requests`,
-        borderColor: "#30b24d",
-        data: cpuRequests.map(([x, y]) => ({ x, y }))
-      },
-      {
-        id: `${id}-cpuLimits`,
-        label: `Limits`,
-        tooltip: `CPU limits`,
-        borderColor: chartCapacityColor,
-        data: cpuLimits.map(([x, y]) => ({ x, y }))
       }
     ],
     // Memory
@@ -96,20 +75,6 @@ export const PodCharts = observer(() => {
         borderColor: "#c93dce",
         data: memoryUsage.map(([x, y]) => ({ x, y }))
       },
-      {
-        id: `${id}-memoryRequests`,
-        label: `Requests`,
-        tooltip: `Container memory requests`,
-        borderColor: "#30b24d",
-        data: memoryRequests.map(([x, y]) => ({ x, y }))
-      },
-      {
-        id: `${id}-memoryLimits`,
-        label: `Limits`,
-        tooltip: `Container memory limits`,
-        borderColor: chartCapacityColor,
-        data: memoryLimits.map(([x, y]) => ({ x, y }))
-      }
     ],
     // Network
     [