lensapp/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2024-09-11 09:25:26 +03:00
Code Issues Projects Releases Wiki Activity

Updating PodDetailsContainerMetrics to support fetching metrics for Pods that have multiple containers

Browse Source 
Signed-off-by: John Daly <john.daly2@gmail.com>
This commit is contained in:
John Daly 2023-07-09 20:19:14 -07:00 committed by Sebastian Malton
parent 4ab97d2372
commit 6e8e58eaf9
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts
View File

@ -4,7 +4,7 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import type { MetricData } from "../metrics.api"; import type { MetricData } from "../metrics.api";
import type { Pod } from "@k8slens/kube-object"; import type { Pod, Container } from "@k8slens/kube-object";
import requestMetricsInjectable from "./request-metrics.injectable"; import requestMetricsInjectable from "./request-metrics.injectable";
export interface PodMetricData { export interface PodMetricData {
@ -21,16 +21,16 @@ export interface PodMetricData {
memoryLimits: MetricData; memoryLimits: MetricData;
} }
export type RequestPodMetrics = (pods: Pod[], namespace: string, selector?: string) => Promise<PodMetricData>; export type RequestPodMetrics = (pods: Pod[], namespace: string, container?: Container, selector?: string) => Promise<PodMetricData>;
const requestPodMetricsInjectable = getInjectable({ const requestPodMetricsInjectable = getInjectable({
id: "request-pod-metrics", id: "request-pod-metrics",
instantiate: (di): RequestPodMetrics => { instantiate: (di): RequestPodMetrics => {
const requestMetrics = di.inject(requestMetricsInjectable); const requestMetrics = di.inject(requestMetricsInjectable);
return (pods, namespace, selector = "pod, namespace") => { return (pods, namespace, container, selector = "pod, namespace") => {
const podSelector = pods.map(pod => pod.getName()).join("|"); const podSelector = pods.map(pod => pod.getName()).join("|");
const opts = { category: "pods", pods: podSelector, namespace, selector }; const opts = { category: "pods", pods: podSelector, container: container?.name, namespace, selector };
return requestMetrics({ return requestMetrics({
cpuUsage: opts, cpuUsage: opts,

13
packages/core/src/renderer/components/workloads-pods/container-metrics.injectable.ts
View File

@ -5,9 +5,14 @@
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import { asyncComputed } from "@ogre-tools/injectable-react"; import { asyncComputed } from "@ogre-tools/injectable-react";
import { now } from "mobx-utils"; import { now } from "mobx-utils";
import type { Pod } from "@k8slens/kube-object"; import type { Pod, Container } from "@k8slens/kube-object";
import requestPodMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable"; import requestPodMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable";
interface PodContainerParams {
pod: Pod;
container: Container;
}
const podContainerMetricsInjectable = getInjectable({ const podContainerMetricsInjectable = getInjectable({
id: "pod-container-metrics", id: "pod-container-metrics",
instantiate: (di, pod) => { instantiate: (di, pod) => {
@ -17,12 +22,14 @@ const podContainerMetricsInjectable = getInjectable({
getValueFromObservedPromise: () => { getValueFromObservedPromise: () => {
now(60 * 1000); now(60 * 1000);
return requestPodMetrics([pod], pod.getNs(), "container, namespace"); return requestPodMetrics([pod], pod.getNs(), container, "pod, container, namespace");
}, },
}); });
}, },
lifecycle: lifecycleEnum.keyedSingleton({ lifecycle: lifecycleEnum.keyedSingleton({
getInstanceKey: (di, pod: Pod) => pod.getId(), getInstanceKey: (di, { pod, container }: PodContainerParams) => {
return `${pod.getId()}-${container.name}`;
},
}), }),
}); });

2
packages/core/src/renderer/components/workloads-pods/pod-details-container-metrics.tsx
View File

@ -48,6 +48,6 @@ const NonInjectedPodDetailsContainerMetrics = observer(({ pod, container, podCon
export const PodDetailsContainerMetrics = withInjectables<Dependencies, ContainerMetricsProps>(NonInjectedPodDetailsContainerMetrics, { export const PodDetailsContainerMetrics = withInjectables<Dependencies, ContainerMetricsProps>(NonInjectedPodDetailsContainerMetrics, {
getProps: (di, props) => ({ getProps: (di, props) => ({
...props, ...props,
podContainerMetrics: di.inject(podContainerMetricsInjectable, props.pod), podContainerMetrics: di.inject(podContainerMetricsInjectable, { pod: props.pod, container: props.container }),
}), }),
}); });