fix labels, add master, fix spacing

cloud/awsprovider.go

@@ -714,6 +714,10 @@ func parseSpotData(bucket string, prefix string, projectID string, region string
 			return nil, err
 		}
 	}
+	s3Prefix := projectID
+	if len(prefix) != 0 {
+		s3Prefix = prefix + "/" + s3Prefix
+	}
 
 	c := aws.NewConfig().WithRegion(region)
 
@@ -725,7 +729,7 @@ func parseSpotData(bucket string, prefix string, projectID string, region string
 	tOneDayAgo := tNow.Add(time.Duration(-24) * time.Hour) // Also get files from one day ago to avoid boundary conditions
 	ls := &s3.ListObjectsInput{
 		Bucket: aws.String(bucket),
-		Prefix: aws.String(prefix + "/" + projectID + "." + tOneDayAgo.Format("2006-01-02")),
+		Prefix: aws.String(s3Prefix + "." + tOneDayAgo.Format("2006-01-02")),
 	}
 	ls2 := &s3.ListObjectsInput{
 		Bucket: aws.String(bucket),
@@ -735,12 +739,20 @@ func parseSpotData(bucket string, prefix string, projectID string, region string
 	if err != nil {
 		return nil, err
 	}
-	klog.V(2).Infof("Found %d spot data files from yesterday", len(lso.Contents))
+	lsoLen := len(lso.Contents)
+	klog.V(2).Infof("Found %d spot data files from yesterday", lsoLen)
+	if lsoLen == 0 {
+		klog.V(5).Infof("ListObjects \"s3://%s/%s\" produced no keys", ls.Bucket, ls.Prefix)
+	}
 	lso2, err := s3Svc.ListObjects(ls2)
 	if err != nil {
 		return nil, err
 	}
-	klog.V(2).Infof("Found %d spot data files from today", len(lso2.Contents))
+	lso2Len := len(lso2.Contents)
+	klog.V(2).Infof("Found %d spot data files from today", lso2Len)
+	if lso2Len == 0 {
+		klog.V(5).Infof("ListObjects \"s3://%s/%s\" produced no keys", ls2.Bucket, ls2.Prefix)
+	}
 
 	var keys []*string
 	for _, obj := range lso.Contents {

cloud/gcpprovider.go

@@ -78,14 +78,14 @@ func (gcp *GCP) ExternalAllocations(start string, end string) ([]*OutOfClusterAl
 					labels.key as aggregator,
 					labels.value as environment,
 					SUM(cost) as cost
-				FROM  (SELECT 
+					FROM  (SELECT 
 							service.description as service,
 							labels,
 							cost 
 						FROM %s
 						WHERE usage_start_time >= "%s" AND usage_start_time < "%s")
 						LEFT JOIN UNNEST(labels) as labels
-						ON labels.key = "namespace" OR labels.key = "container"
+						ON labels.key = "kubernetes_namespace" OR labels.key = "kubernetes_container" OR labels.key = "kubernetes_deployment" OR labels.key = "kubernetes_pod" OR labels.key = "kubernetes_daemonset"
 				GROUP BY aggregator, environment, service;`, gcp.BillingDataDataset, start, end) // For example, "billing_data.gcp_billing_export_v1_01AC9F_74CF1D_5565A2"
 	klog.V(3).Infof("HERE IS THE PROJECT ID: %s", gcp.ProjectID)
 	klog.V(3).Infof("HERE IS THE QUERY STRING: %s", queryString)