added shared cost column (#222)

mathis-marcotte · Mathis Marcotte · web-flow · commit 4c2a325ce194 · 2023-04-28T10:52:36.000-04:00
* added shared cost column

---------

Co-authored-by: Mathis Marcotte &lt;mathis.marcotte@statcan.gc.ca&gt;
diff --git a/frontend/common/kubeflow-common-lib/angular.json b/frontend/common/kubeflow-common-lib/angular.json
@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
diff --git a/frontend/jupyter/angular.json b/frontend/jupyter/angular.json
@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
diff --git a/frontend/jupyter/i18n/fr/messages.fr.xlf b/frontend/jupyter/i18n/fr/messages.fr.xlf
@@ -1154,12 +1154,20 @@
           <context context-type="linenumber">245</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5739581984228459958" datatype="html">
+        <source>Shared</source>
+        <target>Partagés</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pages/index/index-default/config.ts</context>
+          <context context-type="linenumber">250</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3448462145758383019" datatype="html">
         <source>Total</source>
         <target>Total</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pages/index/index-default/config.ts</context>
-          <context context-type="linenumber">250</context>
+          <context context-type="linenumber">255</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fbc6d8bbd465eba779b7c1aa7017cc0b47125097" datatype="html">
diff --git a/frontend/jupyter/i18n/messages.xlf b/frontend/jupyter/i18n/messages.xlf
@@ -1028,11 +1028,18 @@
           <context context-type="linenumber">245</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5739581984228459958" datatype="html">
+        <source>Shared</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pages/index/index-default/config.ts</context>
+          <context context-type="linenumber">250</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3448462145758383019" datatype="html">
         <source>Total</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pages/index/index-default/config.ts</context>
-          <context context-type="linenumber">250</context>
+          <context context-type="linenumber">255</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fbc6d8bbd465eba779b7c1aa7017cc0b47125097" datatype="html">
diff --git a/frontend/jupyter/src/app/pages/index/index-default/config.ts b/frontend/jupyter/src/app/pages/index/index-default/config.ts
@@ -246,6 +246,11 @@ export const defaultCostConfig = {
       matColumnDef: 'storage',
       value: new PropertyValue({ field: 'pvCost' }),
     },
+    {
+      matHeaderCellDef: $localize`Shared`,
+      matColumnDef: 'shared',
+      value: new PropertyValue({ field: 'sharedCost' }),
+    },
     {
       matHeaderCellDef: $localize`Total`,
       matColumnDef: 'total',
diff --git a/frontend/jupyter/src/app/pages/index/index-default/index-default.component.ts b/frontend/jupyter/src/app/pages/index/index-default/index-default.component.ts
@@ -136,7 +136,7 @@ export class IndexDefaultComponent implements OnInit, OnDestroy {
             if (!isEqual(this.rawCostData, aggCost)) {
               this.rawCostData = aggCost;
               
-              this.processedCostData = [this.processIncomingCostData(aggCost)];
+              this.processedCostData = this.processIncomingCostData(aggCost);
               }
             },
           err => {
@@ -470,7 +470,7 @@ export class IndexDefaultComponent implements OnInit, OnDestroy {
   }
 
   public costTrackByFn(index: number, cost: AllocationCostObject) {
-    return `${cost.cpuCost}/${cost.gpuCost}/${cost.pvCost}/${cost.totalCost}`;
+    return `${cost.cpuCost}/${cost.gpuCost}/${cost.ramCost}/${cost.pvCost}/${cost.sharedCost}/${cost.totalCost}`;
   }
 
   public getCostStatus() {
@@ -493,20 +493,31 @@ export class IndexDefaultComponent implements OnInit, OnDestroy {
       gpuCost: this.formatCost(0),
       ramCost: this.formatCost(0),
       pvCost: this.formatCost(0),
+      sharedCost: this.formatCost(0),
       totalCost: this.formatCost(0)
     };
-    if (resp.data[0][this.currNamespace]) {
-      costCopy.cpuCost = this.formatCost(resp.data[0][this.currNamespace].cpuCost);
-      costCopy.gpuCost = this.formatCost(resp.data[0][this.currNamespace].gpuCost);
-      costCopy.ramCost = this.formatCost(resp.data[0][this.currNamespace].ramCost);
-      costCopy.pvCost = this.formatCost(resp.data[0][this.currNamespace].pvCost);
-      costCopy.totalCost = this.formatCost(resp.data[0][this.currNamespace].totalCost);
+
+    const alloc = resp.data.sets[0].allocations[this.currNamespace];
+    if (alloc) {
+      costCopy.cpuCost = this.formatCost(alloc.cpuCost);
+      costCopy.gpuCost = this.formatCost(alloc.gpuCost);
+      costCopy.ramCost = this.formatCost(alloc.ramCost);
+      costCopy.pvCost = this.formatCost(alloc.pvCost);
+      costCopy.sharedCost = this.formatCost(alloc.sharedCost);
+      costCopy.totalCost = Number.parseInt(costCopy.sharedCost).toString();
+      costCopy.totalCost = this.formatCost(alloc.cpuCost
+        +alloc.gpuCost
+        +alloc.ramCost
+        +alloc.pvCost
+        +alloc.sharedCost
+      );
     }
-    return costCopy;
+    
+    return [costCopy];
   }
 
   public formatCost(value: number): string {
-    return "$" + (value > 0 ? Math.max(value, 0.01) : 0).toFixed(2)
+    return "$" + value.toFixed(2)
   }
 
 }
diff --git a/frontend/jupyter/src/app/services/kubecost.service.ts b/frontend/jupyter/src/app/services/kubecost.service.ts
@@ -9,51 +9,38 @@ import {
 interface AllocationCostData {
   [namespace: string]: {
     "name": string,
-    "properties": object,
-    "window": object,
     "start": string,
     "end": string,
-    "minutes": number,
-    "cpuCores": number,
-    "cpuCoreRequestAverage": number,
+    "cpuCoreRequestAverage": number, 
     "cpuCoreUsageAverage": number,
-    "cpuCoreHours": number,
     "cpuCost": number,
-    "cpuCostAdjustment": number,
-    "cpuEfficiency": number,
-    "gpuCount": number,
-    "gpuHours": number,
     "gpuCost": number,
-    "gpuCostAdjustment": number,
-    "networkTransferBytes": number,
-    "networkReceiveBytes": number,
     "networkCost": number,
-    "networkCostAdjustment": number,
     "loadBalancerCost": number,
-    "loadBalancerCostAdjustment": number,
-    "pvBytes": number,
-    "pvByteHours": number,
     "pvCost": number,
-    "pvs": object,
-    "pvCostAdjustment": number,
-    "ramBytes": number,
     "ramByteRequestAverage": number,
     "ramByteUsageAverage": number,
-    "ramByteHours": number,
     "ramCost": number,
-    "ramCostAdjustment": number,
-    "ramEfficiency": number,
     "sharedCost": number,
     "externalCost": number,
-    "totalCost": number,
-    "totalEfficiency": number,
-    "rawAllocationOnly": object
   }
 };
 
 export type AllocationCostResponse = {
     code: number;
-    data: Array<AllocationCostData>;
+    data: {
+      sets: Array<{
+        allocations: AllocationCostData,
+        window: {
+          start: string,
+          end: string
+        }
+      }>
+      window: {
+        start: string,
+        end: string
+      }
+    };
     message: string;
   };
 
diff --git a/frontend/jupyter/src/app/types/allocationcost.ts b/frontend/jupyter/src/app/types/allocationcost.ts
@@ -3,5 +3,6 @@ export interface AllocationCostObject {
   "gpuCost"?: string,
   "ramCost"?: string,
   "pvCost"?: string,
+  "sharedCost"?: string,
   "totalCost"?: string
 };
diff --git a/frontend/jupyter/yarn.lock b/frontend/jupyter/yarn.lock
@@ -5698,6 +5698,12 @@
   "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"
   "version" "2.0.5"
 
+"kubeflow@file:../common/kubeflow-common-lib/dist/kubeflow":
+  "resolved" "file:../common/kubeflow-common-lib/dist/kubeflow"
+  "version" "0.0.4"
+  dependencies:
+    "tslib" "^2.0.0"
+
 "lazy-ass@^1.6.0":
   "integrity" "sha1-eZllXoZGwX8In90YfRUNMyTVRRM="
   "resolved" "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"
diff --git a/namespacecost.go b/namespacecost.go
@@ -15,12 +15,13 @@ func (s *server) GetCost(w http.ResponseWriter, r *http.Request) {
 	window := r.URL.Query().Get("window")
 	log.Printf("loading namespace costs for %q", namespace)
 
-	u, _ := s.kubecostURL.Parse("model/allocation")
+	u, _ := s.kubecostURL.Parse("model/allocation/summary")
 
 	params := url.Values{}
 	params.Add("filterNamespaces", namespace)
 	params.Add("window", window)
 	params.Add("aggregate", "namespace")
+	params.Add("shareNamespaces", "aad-pod-identity-system,argocd-operator-system,azure-blob-csi-system,boathouse-system,cert-manager-system,cloud-main-system,daaas-system,default,eck-operator-system,fdi-gateway-protected-b-system,fdi-gateway-system,fdi-gateway-unclassified-system,fluentd-system,gatekeeper-system,gitea-default,goofys-injector-system,hive-system,ingress-general-system,istio-operator-system,istio-system,kiali-system,knative-eventing,knative-serving,jfrog-system,kube-public,kube-system,kubeflow,kubecost-system,minio-gateway-premium-oidc-system,minio-gateway-premium-ro-system,minio-gateway-premium-system,minio-gateway-protected-b-system,minio-gateway-standard-oidc-system,minio-gateway-standard-ro-system,minio-gateway-standard-system,monitoring-system,notebook-cleanup-system,nvidia-system,oauth2-proxy-system,profiles-argocd-system,prometheus-system,s3proxy-default,shared-daaas-system,solr-operator-system,statcan-system,trino-protb-system,trino-system,vault-agent-system,vault-system,velero-system")
 	params.Add("idle", "false")
 	params.Add("accumulate", "true")
 	u.RawQuery = params.Encode()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "./node_modules/@angular/cli/lib/config/schema.json",`
	`3`	`+ "cli": {`
	`4`	`+ "analytics": false`
	`5`	`+ },`
`3`	`6`	`"version": 1,`
`4`	`7`	`"newProjectRoot": "projects",`
`5`	`8`	`"projects": {`