From 275a9f7f554f411b5f58b9298e1c2c66e847f613 Mon Sep 17 00:00:00 2001 From: Juho Heikka Date: Wed, 5 Apr 2023 14:28:35 +0300 Subject: [PATCH] Add stateful set details metrics injection token. Signed-off-by: Juho Heikka --- .../src/features/metrics/metrics-feature.ts | 13 +++++++++- ...able.tsx => metrics-details-component.tsx} | 18 +------------- ...tateful-set-details-metrics.injectable.tsx | 24 +++++++++++++++++++ packages/metrics/index.ts | 4 ++++ 4 files changed, 41 insertions(+), 18 deletions(-) rename packages/core/src/renderer/components/+workloads-statefulsets/{metrics-details-component.injectable.tsx => metrics-details-component.tsx} (54%) create mode 100644 packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/stateful-set-details-metrics.injectable.tsx diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index 0cec9a218a..e9bbbfbdbc 100644 --- a/packages/core/src/features/metrics/metrics-feature.ts +++ b/packages/core/src/features/metrics/metrics-feature.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getFeature } from "@k8slens/feature-core"; -import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics"; import { getInjectable } from "@ogre-tools/injectable"; import { ClusterMetrics } from "../../renderer/components/+cluster/cluster-metrics"; import { ClusterPieCharts } from "../../renderer/components/+cluster/cluster-pie-charts"; @@ -13,6 +13,7 @@ import { DeploymentMetricsDetailsComponent } from "../../renderer/components/+wo import { PodDetailsContainerMetrics } from "../../renderer/components/+workloads-pods/pod-details-container-metrics"; import PodMetricsDetailsComponent from "../../renderer/components/+workloads-pods/pod-metrics-details-component"; import { ReplicaSetMetricsDetailsComponent } from "../../renderer/components/+workloads-replicasets/metrics-details-component"; +import { StatefulSetMetricsDetailsComponent } from "../../renderer/components/+workloads-statefulsets/metrics-details-component"; const clusterPieChartsClusterOverviewInjectable = getInjectable({ id: "cluster-pie-charts-cluster-overview", @@ -92,6 +93,15 @@ const persistentVolumeClaimDetailsMetricsInjectable = getInjectable({ injectionToken: persistentVolumeClaimDetailsMetricsInjectionToken, }); +const statefulSetDetailsMetricsInjectable = getInjectable({ + id: "stateful-set-details-metrics-injectable", + instantiate: () => ({ + id: "stateful-set-details-metrics", + Component: StatefulSetMetricsDetailsComponent, + }), + injectionToken: statefulSetDetailsMetricsInjectionToken, +}); + export const metricsFeature = getFeature({ id: "core-metrics-feature", @@ -105,5 +115,6 @@ export const metricsFeature = getFeature({ di.register(nodeDetailsMetricsInjectable); di.register(replicaSetDetailsMetricsInjectable); di.register(persistentVolumeClaimDetailsMetricsInjectable); + di.register(statefulSetDetailsMetricsInjectable); }, }); diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.tsx similarity index 54% rename from packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.tsx index ad4bb6d677..3b104ca8c3 100644 --- a/packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.injectable.tsx +++ b/packages/core/src/renderer/components/+workloads-statefulsets/metrics-details-component.tsx @@ -2,16 +2,12 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable } from "@ogre-tools/injectable"; import { type IAsyncComputed, withInjectables } from "@ogre-tools/injectable-react"; import React from "react"; import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; -import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import type { StatefulSet } from "../../../common/k8s-api/endpoints"; import type { StatefulSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable"; -import metricsDetailsComponentEnabledInjectable from "../../api/catalog/entity/metrics-details-component-enabled.injectable"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { kubeObjectDetailItemInjectionToken } from "../kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token"; import { ResourceMetrics } from "../resource-metrics"; import statefulSetMetricsInjectable from "./metrics.injectable"; @@ -32,21 +28,9 @@ const NonInjectedStatefulSetMetricsDetailsComponent = ({ ); -const StatefulSetMetricsDetailsComponent = withInjectables>(NonInjectedStatefulSetMetricsDetailsComponent, { +export const StatefulSetMetricsDetailsComponent = withInjectables>(NonInjectedStatefulSetMetricsDetailsComponent, { getProps: (di, props) => ({ metrics: di.inject(statefulSetMetricsInjectable, props.object), ...props, }), }); - -const statefulSetMetricsDetailsComponentInjectable = getInjectable({ - id: "stateful-set-metrics-details-component", - instantiate: (di) => ({ - Component: StatefulSetMetricsDetailsComponent, - enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.StatefulSet), - orderNumber: -1, - }), - injectionToken: kubeObjectDetailItemInjectionToken, -}); - -export default statefulSetMetricsDetailsComponentInjectable; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/stateful-set-details-metrics.injectable.tsx b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/stateful-set-details-metrics.injectable.tsx new file mode 100644 index 0000000000..f665eff0f0 --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/stateful-set-details-metrics.injectable.tsx @@ -0,0 +1,24 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { ClusterMetricsResourceType } from "../../../../../common/cluster-types"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { getMetricsKubeObjectDetailItemInjectable } from "./getMetricsKubeObjectDetailItem.injectable"; + +const statefulSetMetricsInjectable = getInjectable({ + id: "stateful-set-details-metrics", + instantiate: (di) => { + const getMetricsKubeObjectDetailItem = di.inject(getMetricsKubeObjectDetailItemInjectable); + + return getMetricsKubeObjectDetailItem( + statefulSetDetailsMetricsInjectionToken, + ClusterMetricsResourceType.StatefulSet, + ); + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default statefulSetMetricsInjectable; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index 8486a74ba1..4593623a0c 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -46,6 +46,10 @@ export const persistentVolumeClaimDetailsMetricsInjectionToken = id: "persistent-volume-claim-details-metrics-injection-token", }); +export const statefulSetDetailsMetricsInjectionToken = getInjectionToken({ + id: "stateful-set-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;