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

This commit is contained in:
Lauri Nevala committed 2020-11-19 22:37:29 +02:00
commit c1b7e94426
3 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -29,7 +29,7 @@ export type ClusterPrometheusMetadata = {
success?: boolean;
provider?: string;
autoDetected?: boolean;
}
};
export interface ClusterStoreModel {
activeCluster?: ClusterId; // last opened cluster
+1 -1
View File
@@ -55,7 +55,7 @@ export class ContextHandler {
const prometheusPromises: Promise<PrometheusService>[] = providers.map(async (provider: PrometheusProvider): Promise<PrometheusService> => {
const apiClient = this.cluster.getProxyKubeconfig().makeApiClient(CoreV1Api);
return await provider.getPrometheusService(apiClient);
})
});
const resolvedPrometheusServices = await Promise.all(prometheusPromises);
return resolvedPrometheusServices.filter(n => n)[0];
}
+2 -2
View File
@@ -1,5 +1,5 @@
import _ from "lodash"
import _ from "lodash";
import { LensApiRequest } from "../router";
import { LensApi } from "../lens-api";
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]]));
this.respondJson(response, data);
}
prometheusMetadata.success = true
prometheusMetadata.success = true;
} catch {
prometheusMetadata.success = false;
this.respondJson(response, {});