فهرست منبع

Merge pull request #436 from kubecost/AjayTripathy-suppress-logs

Ajay tripathy suppress logs
Ajay Tripathy 6 سال پیش
والد
کامیت
c7f2b5d0cb
2فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 2 2
      pkg/cloud/awsprovider.go
  2. 4 2
      pkg/cloud/gcpprovider.go

+ 2 - 2
pkg/cloud/awsprovider.go

@@ -1171,7 +1171,7 @@ func (a *AWS) GetAddresses() ([]byte, error) {
 
 
 	errors := []error{}
 	errors := []error{}
 	for err := range errorCh {
 	for err := range errorCh {
-		log.Printf("error getting addresses: %s", err)
+		log.Printf("[Warning]: unable to get addresses: %s", err)
 		errors = append(errors, err)
 		errors = append(errors, err)
 	}
 	}
 
 
@@ -1277,7 +1277,7 @@ func (a *AWS) GetDisks() ([]byte, error) {
 
 
 	errors := []error{}
 	errors := []error{}
 	for err := range errorCh {
 	for err := range errorCh {
-		log.Printf("error getting disks: %s", err)
+		log.Printf("[Warning]: unable to get disks: %s", err)
 		errors = append(errors, err)
 		errors = append(errors, err)
 	}
 	}
 
 

+ 4 - 2
pkg/cloud/gcpprovider.go

@@ -52,6 +52,7 @@ type GCP struct {
 	DownloadPricingDataLock sync.RWMutex
 	DownloadPricingDataLock sync.RWMutex
 	ReservedInstances       []*GCPReservedInstance
 	ReservedInstances       []*GCPReservedInstance
 	Config                  *ProviderConfig
 	Config                  *ProviderConfig
+	serviceKeyProvided      bool
 	*CustomProvider
 	*CustomProvider
 }
 }
 
 
@@ -250,6 +251,7 @@ func (gcp *GCP) UpdateConfig(r io.Reader, updateType string) (*CustomPricing, er
 				if err != nil {
 				if err != nil {
 					return err
 					return err
 				}
 				}
+				gcp.serviceKeyProvided = true
 			}
 			}
 		} else if updateType == AthenaInfoUpdateType {
 		} else if updateType == AthenaInfoUpdateType {
 			a := AwsAthenaInfo{}
 			a := AwsAthenaInfo{}
@@ -390,12 +392,12 @@ func (gcp *GCP) ExternalAllocations(start string, end string, aggregators []stri
 			AND usage_start_time >= "%s" AND usage_start_time < "%s"
 			AND usage_start_time >= "%s" AND usage_start_time < "%s"
 			GROUP BY service, keys
 			GROUP BY service, keys
 		)`, c.BillingDataDataset, aggregator, filterType, filterValue, start, end)
 		)`, c.BillingDataDataset, aggregator, filterType, filterValue, start, end)
-		klog.V(3).Infof("Querying \"%s\" with : %s", c.ProjectID, queryString)
+		klog.V(4).Infof("Querying \"%s\" with : %s", c.ProjectID, queryString)
 		gcpOOC, err := gcp.multiLabelQuery(queryString, aggregators)
 		gcpOOC, err := gcp.multiLabelQuery(queryString, aggregators)
 		s = append(s, gcpOOC...)
 		s = append(s, gcpOOC...)
 		qerr = err
 		qerr = err
 	}
 	}
-	if qerr != nil {
+	if qerr != nil && gcp.serviceKeyProvided {
 		klog.Infof("Error querying gcp: %s", qerr)
 		klog.Infof("Error querying gcp: %s", qerr)
 	}
 	}
 	return s, qerr
 	return s, qerr