hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'prometheus-cluster-metadata' into track-prometheus

Browse Source
This commit is contained in:
Lauri Nevala 2020-11-19 22:37:29 +02:00
commit c1b7e94426
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cluster-store.ts
View File

@ -29,7 +29,7 @@ export type ClusterPrometheusMetadata = {
success?: boolean; success?: boolean;
provider?: string; provider?: string;
autoDetected?: boolean; autoDetected?: boolean;
} };
export interface ClusterStoreModel { export interface ClusterStoreModel {
activeCluster?: ClusterId; // last opened cluster activeCluster?: ClusterId; // last opened cluster

2
src/main/context-handler.ts
View File

@ -55,7 +55,7 @@ export class ContextHandler {
const prometheusPromises: Promise<PrometheusService>[] = providers.map(async (provider: PrometheusProvider): Promise<PrometheusService> => { const prometheusPromises: Promise<PrometheusService>[] = providers.map(async (provider: PrometheusProvider): Promise<PrometheusService> => {
const apiClient = this.cluster.getProxyKubeconfig().makeApiClient(CoreV1Api); const apiClient = this.cluster.getProxyKubeconfig().makeApiClient(CoreV1Api);
return await provider.getPrometheusService(apiClient); return await provider.getPrometheusService(apiClient);
}) });
const resolvedPrometheusServices = await Promise.all(prometheusPromises); const resolvedPrometheusServices = await Promise.all(prometheusPromises);
return resolvedPrometheusServices.filter(n => n)[0]; return resolvedPrometheusServices.filter(n => n)[0];
} }

4
src/main/routes/metrics-route.ts
View File

@ -1,5 +1,5 @@
import _ from "lodash" import _ from "lodash";
import { LensApiRequest } from "../router"; import { LensApiRequest } from "../router";
import { LensApi } from "../lens-api"; import { LensApi } from "../lens-api";
import { Cluster, ClusterMetadataKey } from "../cluster"; import { Cluster, ClusterMetadataKey } from "../cluster";
@ -71,7 +71,7 @@ class MetricsRoute extends LensApi {
const data = Object.fromEntries(Object.keys(payload).map((metricName, i) => [metricName, result[i]])); const data = Object.fromEntries(Object.keys(payload).map((metricName, i) => [metricName, result[i]]));
this.respondJson(response, data); this.respondJson(response, data);
} }
prometheusMetadata.success = true prometheusMetadata.success = true;
} catch { } catch {
prometheusMetadata.success = false; prometheusMetadata.success = false;
this.respondJson(response, {}); this.respondJson(response, {});