diff --git a/packages/core/src/common/k8s-api/endpoints/metrics.api/prometheus-details.channel.ts b/packages/core/src/common/k8s-api/endpoints/metrics.api/prometheus-details.channel.ts index 9a00196d03..dce97ffe36 100644 --- a/packages/core/src/common/k8s-api/endpoints/metrics.api/prometheus-details.channel.ts +++ b/packages/core/src/common/k8s-api/endpoints/metrics.api/prometheus-details.channel.ts @@ -5,8 +5,8 @@ import { getRequestChannel } from "@k8slens/messaging"; import type { PrometheusDetails } from "../../../../main/cluster/prometheus-handler/prometheus-handler"; -import type { ClusterId } from "../../../cluster-types"; import type { PrometheusProvider } from "../../../../main/prometheus/provider"; +import type { Cluster } from "../../../cluster/cluster"; type PrometheusProviderData = Pick; @@ -14,4 +14,4 @@ export type PrometheusDetailsData = Pick & provider: PrometheusProviderData; }; -export const prometheusDetailsChannel = getRequestChannel("prometheus-details"); +export const prometheusDetailsChannel = getRequestChannel("prometheus-details"); diff --git a/packages/core/src/main/cluster/prometheus-handler/prometheus-details-channel-listener.injectable.ts b/packages/core/src/main/cluster/prometheus-handler/prometheus-details-channel-listener.injectable.ts index dc32875667..45aa4d31e0 100644 --- a/packages/core/src/main/cluster/prometheus-handler/prometheus-details-channel-listener.injectable.ts +++ b/packages/core/src/main/cluster/prometheus-handler/prometheus-details-channel-listener.injectable.ts @@ -5,25 +5,16 @@ import { getRequestChannelListenerInjectable } from "@k8slens/messaging"; import { prometheusDetailsChannel } from "../../../common/k8s-api/endpoints/metrics.api/prometheus-details.channel"; import prometheusHandlerInjectable from "./prometheus-handler.injectable"; -import clustersInjectable from "../../../features/cluster/storage/common/clusters.injectable"; const prometheusDetailsChannelListener = getRequestChannelListenerInjectable({ id: "add-helm-repository-channel-listener", channel: prometheusDetailsChannel, getHandler: (di) => { - return async (clusterId) => { - const clusters = di.inject(clustersInjectable); - const cluster = clusters.get().find((c) => c.id === clusterId); - - if (!cluster) { - throw new Error(`Cluster with id "${clusterId}" not found`); - } + return async (cluster) => { const prometheusHandler = di.inject(prometheusHandlerInjectable, cluster); const details = await prometheusHandler.getPrometheusDetails(); - console.log(details); - return { prometheusPath: details.prometheusPath, provider: { diff --git a/packages/core/src/renderer/components/cluster-settings/get-prometheus-details.injectable.ts b/packages/core/src/renderer/components/cluster-settings/get-prometheus-details.injectable.ts index 601ed11f12..e405187d4c 100644 --- a/packages/core/src/renderer/components/cluster-settings/get-prometheus-details.injectable.ts +++ b/packages/core/src/renderer/components/cluster-settings/get-prometheus-details.injectable.ts @@ -3,21 +3,19 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { logInfoInjectionToken } from "@k8slens/logger"; import { requestFromChannelInjectionToken } from "@k8slens/messaging"; import { prometheusDetailsChannel } from "../../../common/k8s-api/endpoints/metrics.api/prometheus-details.channel"; +import type { Cluster } from "../../../common/cluster/cluster"; const getPrometheusDetailsRouteInjectable = getInjectable({ id: "get-prometheus-details-route", instantiate: (di) => { - const logger = di.inject(logInfoInjectionToken); const requestFromChannel = di.inject(requestFromChannelInjectionToken); - return (async (clusterId: string) => { - logger("requestFromChannel"); - const prometheusDetails = await requestFromChannel(prometheusDetailsChannel, clusterId); + return (async (cluster: Cluster) => { + const prometheusDetails = await requestFromChannel(prometheusDetailsChannel, cluster); return prometheusDetails; }); diff --git a/packages/core/src/renderer/components/cluster-settings/no-prometheus-provider-detectec.tsx b/packages/core/src/renderer/components/cluster-settings/no-prometheus-provider-detectec.tsx index 55fd5fac09..0728592bbf 100644 --- a/packages/core/src/renderer/components/cluster-settings/no-prometheus-provider-detectec.tsx +++ b/packages/core/src/renderer/components/cluster-settings/no-prometheus-provider-detectec.tsx @@ -4,8 +4,7 @@ */ import React from "react"; import { SubTitle } from "../layout/sub-title"; -import { Icon } from "../icon"; - +import { Icon } from "@k8slens/icon"; export const NoPrometheusProviderDetected = () => (
diff --git a/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx b/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx index 32e0b9be69..0c2dcbee0a 100644 --- a/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx +++ b/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx @@ -18,8 +18,6 @@ import requestMetricsProvidersInjectable from "../../../common/k8s-api/endpoints import productNameInjectable from "../../../common/vars/product-name.injectable"; import getPrometheusDetailsRouteInjectable from "./get-prometheus-details.injectable"; import type { PrometheusDetailsData } from "../../../common/k8s-api/endpoints/metrics.api/prometheus-details.channel"; -import { loggerInjectionToken } from "@k8slens/logger"; -import type { Logger } from "@k8slens/logger"; import { PrometheusDetails } from "./prometheus-details"; import { NoPrometheusProviderDetected } from "./no-prometheus-provider-detectec"; @@ -34,8 +32,7 @@ type ProviderValue = typeof autoDetectPrometheus | string; interface Dependencies { productName: string; requestMetricsProviders: RequestMetricsProviders; - requestPrometheusDetails: (clusterId: string) => Promise; - logger: Logger; + requestPrometheusDetails: (cluster: Cluster) => Promise; } interface PrometheusDetailsDataResult { @@ -136,15 +133,13 @@ class NonInjectedClusterPrometheusSetting extends React.Component { try { - const details = await this.props.requestPrometheusDetails(this.props.cluster.id); + const details = await this.props.requestPrometheusDetails(this.props.cluster); this.prometheusDetails = { type: "success", details, }; - this.props.logger.info(`[CLUSTER-SETTINGS]: Prometheus details loaded: ${JSON.stringify(this.prometheusDetails)}`); } catch (error) { - this.props.logger.error(`[CLUSTER-SETTINGS]: Failed to load prometheus details: ${error}`); this.prometheusDetails = { type: "error", details: undefined, @@ -233,6 +228,5 @@ export const ClusterPrometheusSetting = withInjectables