move metrics functions away from workload api classes

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/renderer/api/endpoints/cluster.api.ts

@@ -27,6 +27,26 @@ export class ClusterApi extends KubeApi<Cluster> {
   }
 }
 
+export function getMetricsForNodeNames(nodeNames: string[], params?: IMetricsReqParams): Promise<IClusterMetrics> {
+  const nodes = nodeNames.join("|");
+  const opts = { category: "cluster", nodes };
+
+  return metricsApi.getMetrics({
+    memoryUsage: opts,
+    memoryRequests: opts,
+    memoryLimits: opts,
+    memoryCapacity: opts,
+    cpuUsage: opts,
+    cpuRequests: opts,
+    cpuLimits: opts,
+    cpuCapacity: opts,
+    podUsage: opts,
+    podCapacity: opts,
+    fsSize: opts,
+    fsUsage: opts
+  }, params);
+}
+
 export enum ClusterStatus {
   ACTIVE = "Active",
   CREATING = "Creating",

src/renderer/api/endpoints/daemon-set.api.ts

@@ -74,7 +74,9 @@ export class DaemonSet extends WorkloadKubeObject {
 
 
 export class DaemonSetApi extends KubeApi<DaemonSet> {
-  getMetrics(daemonsets: DaemonSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
+}
+
+export function getMetricsForDaemonSets(daemonsets: DaemonSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
   const podSelector = daemonsets.map(daemonset => `${daemonset.getName()}-[[:alnum:]]{5}`).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -87,7 +89,6 @@ export class DaemonSetApi extends KubeApi<DaemonSet> {
   }, {
     namespace,
   });
-  }
 }
 
 export const daemonSetApi = new DaemonSetApi({

src/renderer/api/endpoints/deployment.api.ts

@@ -46,8 +46,9 @@ export class DeploymentApi extends KubeApi<Deployment> {
       }
     });
   }
+}
 
-  getMetrics(deployments: Deployment[], namespace: string, selector = ""): Promise<IPodMetrics> {
+export function getMetricsForDeployments(deployments: Deployment[], namespace: string, selector = ""): Promise<IPodMetrics> {
   const podSelector = deployments.map(deployment => `${deployment.getName()}-[[:alnum:]]{9,}-[[:alnum:]]{5}`).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -60,7 +61,6 @@ export class DeploymentApi extends KubeApi<Deployment> {
   }, {
     namespace,
   });
-  }
 }
 
 interface IContainerProbe {

src/renderer/api/endpoints/ingress.api.ts

@@ -4,7 +4,9 @@ import { IMetrics, metricsApi } from "./metrics.api";
 import { KubeApi } from "../kube-api";
 
 export class IngressApi extends KubeApi<Ingress> {
-  getMetrics(ingress: string, namespace: string): Promise<IIngressMetrics> {
+}
+
+export function getMetricsForIngress(ingress: string, namespace: string): Promise<IIngressMetrics> {
   const opts = { category: "ingress", ingress };
 
   return metricsApi.getMetrics({
@@ -15,7 +17,6 @@ export class IngressApi extends KubeApi<Ingress> {
   }, {
     namespace,
   });
-  }
 }
 
 export interface IIngressMetrics<T = IMetrics> {

src/renderer/api/endpoints/job.api.ts

@@ -110,7 +110,9 @@ export class Job extends WorkloadKubeObject {
 
 
 export class JobApi extends KubeApi<Job> {
-  getMetrics(jobs: Job[], namespace: string, selector = ""): Promise<IPodMetrics> {
+}
+
+export function getMetricsForJobs(jobs: Job[], namespace: string, selector = ""): Promise<IPodMetrics> {
   const podSelector = jobs.map(job => `${job.getName()}-[[:alnum:]]{5}`).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -123,7 +125,6 @@ export class JobApi extends KubeApi<Job> {
   }, {
     namespace,
   });
-  }
 }
 
 export const jobApi = new JobApi({

src/renderer/api/endpoints/namespaces.api.ts

@@ -25,7 +25,9 @@ export class Namespace extends KubeObject {
 }
 
 export class NamespaceApi extends KubeApi<Namespace> {
-  getMetrics(namespace: string, selector = ""): Promise<IPodMetrics> {
+}
+
+export function getMetricsForNamespace(namespace: string, selector = ""): Promise<IPodMetrics> {
   const opts = { category: "pods", pods: ".*", namespace, selector };
 
   return metricsApi.getMetrics({
@@ -37,7 +39,6 @@ export class NamespaceApi extends KubeApi<Namespace> {
   }, {
     namespace,
   });
-  }
 }
 
 export const namespacesApi = new NamespaceApi({

src/renderer/api/endpoints/nodes.api.ts

@@ -4,7 +4,9 @@ import { IMetrics, metricsApi } from "./metrics.api";
 import { KubeApi } from "../kube-api";
 
 export class NodesApi extends KubeApi<Node> {
-  getMetrics(): Promise<INodeMetrics> {
+}
+
+export function getMetricsForAllNodes(): Promise<INodeMetrics> {
   const opts = { category: "nodes"};
 
   return metricsApi.getMetrics({
@@ -15,7 +17,6 @@ export class NodesApi extends KubeApi<Node> {
     fsSize: opts,
     fsUsage: opts
   });
-  }
 }
 
 export interface INodeMetrics<T = IMetrics> {

src/renderer/api/endpoints/persistent-volume-claims.api.ts

@@ -5,14 +5,15 @@ import { Pod } from "./pods.api";
 import { KubeApi } from "../kube-api";
 
 export class PersistentVolumeClaimsApi extends KubeApi<PersistentVolumeClaim> {
-  getMetrics(pvcName: string, namespace: string): Promise<IPvcMetrics> {
+}
+
+export function getMetricsForPvc(pvc: PersistentVolumeClaim): Promise<IPvcMetrics> {
   return metricsApi.getMetrics({
-      diskUsage: { category: "pvc", pvc: pvcName },
+    diskUsage: { category: "pvc", pvc: pvc.getName() },
-      diskCapacity: { category: "pvc", pvc: pvcName }
+    diskCapacity: { category: "pvc", pvc: pvc.getName() }
   }, {
-      namespace
+    namespace: pvc.getNs()
   });
-  }
 }
 
 export interface IPvcMetrics<T = IMetrics> {

src/renderer/api/endpoints/pods.api.ts

@@ -9,8 +9,9 @@ export class PodsApi extends KubeApi<Pod> {
 
     return this.request.get(path, { query });
   }
+}
 
-  getMetrics(pods: Pod[], namespace: string, selector = "pod, namespace"): Promise<IPodMetrics> {
+export function getMetricsForPods(pods: Pod[], namespace: string, selector = "pod, namespace"): Promise<IPodMetrics> {
   const podSelector = pods.map(pod => pod.getName()).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -27,7 +28,6 @@ export class PodsApi extends KubeApi<Pod> {
   }, {
     namespace,
   });
-  }
 }
 
 export interface IPodMetrics<T = IMetrics> {

src/renderer/api/endpoints/replica-set.api.ts

@@ -26,8 +26,9 @@ export class ReplicaSetApi extends KubeApi<ReplicaSet> {
       }
     });
   }
+}
 
-  getMetrics(replicasets: ReplicaSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
+export function getMetricsForReplicaSets(replicasets: ReplicaSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
   const podSelector = replicasets.map(replicaset => `${replicaset.getName()}-[[:alnum:]]{5}`).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -40,7 +41,6 @@ export class ReplicaSetApi extends KubeApi<ReplicaSet> {
   }, {
     namespace,
   });
-  }
 }
 
 @autobind()

src/renderer/api/endpoints/stateful-set.api.ts

@@ -26,8 +26,9 @@ export class StatefulSetApi extends KubeApi<StatefulSet> {
       }
     });
   }
+}
 
-  getMetrics(statefulSets: StatefulSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
+export function getMetricsForStatefulSets(statefulSets: StatefulSet[], namespace: string, selector = ""): Promise<IPodMetrics> {
   const podSelector = statefulSets.map(statefulset => `${statefulset.getName()}-[[:digit:]]+`).join("|");
   const opts = { category: "pods", pods: podSelector, namespace, selector };
 
@@ -40,7 +41,6 @@ export class StatefulSetApi extends KubeApi<StatefulSet> {
   }, {
     namespace,
   });
-  }
 }
 
 @autobind()

src/renderer/components/+cluster/cluster-overview.store.ts

@@ -1,6 +1,6 @@
 import { action, observable, reaction, when } from "mobx";
 import { KubeObjectStore } from "../../kube-object.store";
-import { Cluster, clusterApi, IClusterMetrics } from "../../api/endpoints";
+import { Cluster, clusterApi, getMetricsForNodeNames, IClusterMetrics } from "../../api/endpoints";
 import { autobind, createStorage } from "../../utils";
 import { IMetricsReqParams, normalizeMetrics } from "../../api/endpoints/metrics.api";
 import { nodesStore } from "../+nodes/nodes.store";
@@ -78,7 +78,7 @@ export class ClusterOverviewStore extends KubeObjectStore<Cluster> implements Cl
     const { masterNodes, workerNodes } = nodesStore;
     const nodes = this.metricNodeRole === MetricNodeRole.MASTER && masterNodes.length ? masterNodes : workerNodes;
 
-    this.metrics = await clusterApi.getMetrics(nodes.map(node => node.getName()), params);
+    this.metrics = await getMetricsForNodeNames(nodes.map(node => node.getName()), params);
     this.metricsLoaded = true;
   }
 

src/renderer/components/+namespaces/namespace.store.ts

@@ -1,6 +1,6 @@
 import { action, comparer, computed, IReactionDisposer, IReactionOptions, observable, reaction } from "mobx";
 import { autobind, createStorage } from "../../utils";
-import { IPodMetrics, Namespace, namespacesApi } from "../../api/endpoints";
+import { IPodMetrics, Namespace, namespacesApi, getMetricsForNamespace } from "../../api/endpoints";
 import { KubeObjectStore, KubeObjectStoreLoadingParams } from "../../kube-object.store";
 import { createPageParam } from "../../navigation";
 import { apiManager } from "../../api/api-manager";
@@ -40,7 +40,7 @@ export class NamespaceStore extends KubeObjectStore<Namespace> {
   }
 
   async loadMetrics(namespace: Namespace) {
-    this.metrics = await namespacesApi.getMetrics(namespace.getName(), "");
+    this.metrics = await getMetricsForNamespace(namespace.getName(), "");
   }
 
   private async init() {

src/renderer/components/+network-ingresses/ingress.store.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind } from "../../utils";
-import { IIngressMetrics, Ingress, ingressApi } from "../../api/endpoints";
+import { IIngressMetrics, Ingress, ingressApi, getMetricsForIngress } from "../../api/endpoints";
 import { apiManager } from "../../api/api-manager";
 
 @autobind()
@@ -10,7 +10,7 @@ export class IngressStore extends KubeObjectStore<Ingress> {
   @observable metrics: IIngressMetrics = null;
 
   async loadMetrics(ingress: Ingress) {
-    this.metrics = await this.api.getMetrics(ingress.getName(), ingress.getNs());
+    this.metrics = await getMetricsForIngress(ingress.getName(), ingress.getNs());
   }
 
   reset() {

src/renderer/components/+nodes/nodes.store.ts

@@ -1,6 +1,6 @@
 import { sum } from "lodash";
 import { action, computed, observable } from "mobx";
-import { clusterApi, IClusterMetrics, INodeMetrics, Node, nodesApi } from "../../api/endpoints";
+import { IClusterMetrics, INodeMetrics, Node, nodesApi, getMetricsForAllNodes, getMetricsForNodeNames } from "../../api/endpoints";
 import { autobind } from "../../utils";
 import { KubeObjectStore } from "../../kube-object.store";
 import { apiManager } from "../../api/api-manager";
@@ -19,7 +19,7 @@ export class NodesStore extends KubeObjectStore<Node> {
     this.metricsLoading = true;
 
     try {
-      this.metrics = await nodesApi.getMetrics();
+      this.metrics = await getMetricsForAllNodes();
       this.metricsLoaded = true;
     } finally {
       this.metricsLoading = false;
@@ -28,7 +28,7 @@ export class NodesStore extends KubeObjectStore<Node> {
 
   @action
   async loadMetrics(nodeName: string) {
-    this.nodeMetrics = await clusterApi.getMetrics([nodeName]);
+    this.nodeMetrics = await getMetricsForNodeNames([nodeName]);
   }
 
   @computed get masterNodes() {

src/renderer/components/+storage-volume-claims/volume-claim.store.ts

@@ -1,7 +1,7 @@
 import { action, observable } from "mobx";
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind } from "../../utils";
-import { IPvcMetrics, PersistentVolumeClaim, pvcApi } from "../../api/endpoints";
+import { getMetricsForPvc, IPvcMetrics, PersistentVolumeClaim, pvcApi } from "../../api/endpoints";
 import { apiManager } from "../../api/api-manager";
 
 @autobind()
@@ -11,7 +11,7 @@ export class VolumeClaimStore extends KubeObjectStore<PersistentVolumeClaim> {
 
   @action
   async loadMetrics(pvc: PersistentVolumeClaim) {
-    this.metrics = await pvcApi.getMetrics(pvc.getName(), pvc.getNs());
+    this.metrics = await getMetricsForPvc(pvc);
   }
 
   reset() {

src/renderer/components/+workloads-daemonsets/daemonsets.store.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind } from "../../utils";
-import { DaemonSet, daemonSetApi, IPodMetrics, Pod, PodStatus } from "../../api/endpoints";
+import { DaemonSet, daemonSetApi, IPodMetrics, Pod, PodStatus, getMetricsForDaemonSets } from "../../api/endpoints";
 import { podsStore } from "../+workloads-pods/pods.store";
 import { apiManager } from "../../api/api-manager";
 
@@ -12,7 +12,7 @@ export class DaemonSetStore extends KubeObjectStore<DaemonSet> {
   @observable metrics: IPodMetrics = null;
 
   async loadMetrics(daemonSet: DaemonSet) {
-    this.metrics = await daemonSetApi.getMetrics([daemonSet], daemonSet.getNs(), "");
+    this.metrics = await getMetricsForDaemonSets([daemonSet], daemonSet.getNs(), "");
   }
 
   getChildPods(daemonSet: DaemonSet): Pod[] {

src/renderer/components/+workloads-deployments/deployments.store.ts

@@ -1,5 +1,5 @@
 import { observable } from "mobx";
-import { Deployment, deploymentApi, IPodMetrics, PodStatus } from "../../api/endpoints";
+import { Deployment, deploymentApi, IPodMetrics, PodStatus, getMetricsForDeployments } from "../../api/endpoints";
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind } from "../../utils";
 import { podsStore } from "../+workloads-pods/pods.store";
@@ -17,7 +17,7 @@ export class DeploymentStore extends KubeObjectStore<Deployment> {
   }
 
   async loadMetrics(deployment: Deployment) {
-    this.metrics = await deploymentApi.getMetrics([deployment], deployment.getNs(), "");
+    this.metrics = await getMetricsForDeployments([deployment], deployment.getNs(), "");
   }
 
   getStatuses(deployments?: Deployment[]) {

src/renderer/components/+workloads-jobs/job.store.ts

@@ -1,6 +1,6 @@
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind } from "../../utils";
-import { Job, jobApi } from "../../api/endpoints/job.api";
+import { Job, jobApi, getMetricsForJobs } from "../../api/endpoints/job.api";
 import { CronJob, IPodMetrics, Pod, PodStatus } from "../../api/endpoints";
 import { podsStore } from "../+workloads-pods/pods.store";
 import { apiManager } from "../../api/api-manager";
@@ -13,7 +13,7 @@ export class JobStore extends KubeObjectStore<Job> {
   @observable metrics: IPodMetrics = null;
 
   async loadMetrics(job: Job) {
-    this.metrics = await jobApi.getMetrics([job], job.getNs(), "");
+    this.metrics = await getMetricsForJobs([job], job.getNs(), "");
   }
 
   getChildPods(job: Job): Pod[] {

src/renderer/components/+workloads-pods/pods.store.ts

@@ -2,7 +2,7 @@ import countBy from "lodash/countBy";
 import { action, observable } from "mobx";
 import { KubeObjectStore } from "../../kube-object.store";
 import { autobind, cpuUnitsToNumber, unitsToBytes } from "../../utils";
-import { IPodMetrics, Pod, PodMetrics, podMetricsApi, podsApi } from "../../api/endpoints";
+import { getMetricsForPods, IPodMetrics, Pod, PodMetrics, podMetricsApi, podsApi } from "../../api/endpoints";
 import { apiManager } from "../../api/api-manager";
 import { WorkloadKubeObject } from "../../api/workload-kube-object";
 
@@ -15,11 +15,11 @@ export class PodsStore extends KubeObjectStore<Pod> {
 
   @action
   async loadMetrics(pod: Pod) {
-    this.metrics = await podsApi.getMetrics([pod], pod.getNs());
+    this.metrics = await getMetricsForPods([pod], pod.getNs());
   }
 
   loadContainerMetrics(pod: Pod) {
-    return podsApi.getMetrics([pod], pod.getNs(), "container, namespace");
+    return getMetricsForPods([pod], pod.getNs(), "container, namespace");
   }
 
   async loadKubeMetrics(namespace?: string) {

src/renderer/components/+workloads-replicasets/replicasets.store.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 import { autobind } from "../../utils";
 import { KubeObjectStore } from "../../kube-object.store";
-import { Deployment, ReplicaSet, replicaSetApi } from "../../api/endpoints";
+import { Deployment, ReplicaSet, replicaSetApi, getMetricsForReplicaSets } from "../../api/endpoints";
 import { podsStore } from "../+workloads-pods/pods.store";
 import { apiManager } from "../../api/api-manager";
 import { IPodMetrics, PodStatus } from "../../api/endpoints/pods.api";
@@ -12,7 +12,7 @@ export class ReplicaSetStore extends KubeObjectStore<ReplicaSet> {
   @observable metrics: IPodMetrics = null;
 
   async loadMetrics(replicaSet: ReplicaSet) {
-    this.metrics = await replicaSetApi.getMetrics([replicaSet], replicaSet.getNs(), "");
+    this.metrics = await getMetricsForReplicaSets([replicaSet], replicaSet.getNs(), "");
   }
 
   getChildPods(replicaSet: ReplicaSet) {

src/renderer/components/+workloads-statefulsets/statefulset.store.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 import { autobind } from "../../utils";
 import { KubeObjectStore } from "../../kube-object.store";
-import { IPodMetrics, PodStatus, StatefulSet, statefulSetApi } from "../../api/endpoints";
+import { IPodMetrics, PodStatus, StatefulSet, statefulSetApi, getMetricsForStatefulSets } from "../../api/endpoints";
 import { podsStore } from "../+workloads-pods/pods.store";
 import { apiManager } from "../../api/api-manager";
 
@@ -11,7 +11,7 @@ export class StatefulSetStore extends KubeObjectStore<StatefulSet> {
   @observable metrics: IPodMetrics = null;
 
   async loadMetrics(statefulSet: StatefulSet) {
-    this.metrics = await statefulSetApi.getMetrics([statefulSet], statefulSet.getNs(), "");
+    this.metrics = await getMetricsForStatefulSets([statefulSet], statefulSet.getNs(), "");
   }
 
   getChildPods(statefulSet: StatefulSet) {