Merge branch 'develop' into logyball/make-ui-base-url-dynamic

pkg/kubecost/asset.go

@@ -2168,9 +2168,9 @@ func (n *Node) MonitoringKey() string {
 		if len(aliProviderID) != 2 {
 			return ""
 		}
-		return nodeProps.Provider + "/" + nodeProps.Account + "/" + aliProviderID[1]
+		return nodeProps.Provider + "/" + aliProviderID[1]
 	}
-	return nodeProps.Provider + "/" + nodeProps.Account + "/" + nodeProps.ProviderID
+	return nodeProps.Provider + "/" + nodeProps.ProviderID
 }
 
 // LoadBalancer is an Asset representing a single load balancer in a cluster

pkg/kubecost/cloudcostitem.go

@@ -81,7 +81,7 @@ func (ccip CloudCostItemProperties) Key() string {
 }
 
 func (ccip CloudCostItemProperties) MonitoringKey() string {
-	return fmt.Sprintf("%s/%s/%s", ccip.Provider, ccip.WorkGroupID, ccip.ProviderID)
+	return fmt.Sprintf("%s/%s", ccip.Provider, ccip.ProviderID)
 }
 
 // CloudCostItem represents a CUR line item, identifying a cloud resource and