Просмотр исходного кода

Merge pull request #548 from kubecost/AjayTripathy-dedupe-logs

dedupe RI/spot logs
Ajay Tripathy 5 лет назад
Родитель
Сommit
916f7f1d57
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      pkg/cloud/awsprovider.go
  2. 1 1
      pkg/costmodel/cluster.go

+ 3 - 3
pkg/cloud/awsprovider.go

@@ -884,7 +884,7 @@ func (aws *AWS) createNode(terms *AWSProductTerms, usageType string, k Key) (*No
 
 
 	if spotInfo, ok := aws.spotPricing(k.ID()); ok {
 	if spotInfo, ok := aws.spotPricing(k.ID()); ok {
 		var spotcost string
 		var spotcost string
-		klog.V(3).Infof("Looking up spot data from feed for node %s", k.ID())
+		log.DedupedInfof(5, "Looking up spot data from feed for node %s", k.ID())
 		arr := strings.Split(spotInfo.Charge, " ")
 		arr := strings.Split(spotInfo.Charge, " ")
 		if len(arr) == 2 {
 		if len(arr) == 2 {
 			spotcost = arr[0]
 			spotcost = arr[0]
@@ -1623,7 +1623,7 @@ func (a *AWS) GetSavingsPlanDataFromAthena() error {
 		}
 		}
 		klog.V(1).Infof("Found %d savings plan applied instances", len(a.SavingsPlanDataByInstanceID))
 		klog.V(1).Infof("Found %d savings plan applied instances", len(a.SavingsPlanDataByInstanceID))
 		for k, r := range a.SavingsPlanDataByInstanceID {
 		for k, r := range a.SavingsPlanDataByInstanceID {
-			klog.V(1).Infof("Reserved Instance Data found for node %s : %f at time %s", k, r.EffectiveCost, r.MostRecentDate)
+			log.DedupedInfof(5, "Savings Plan Instance Data found for node %s : %f at time %s", k, r.EffectiveCost, r.MostRecentDate)
 		}
 		}
 		a.SavingsPlanDataLock.Unlock()
 		a.SavingsPlanDataLock.Unlock()
 	} else {
 	} else {
@@ -1693,7 +1693,7 @@ func (a *AWS) GetReservationDataFromAthena() error {
 		}
 		}
 		klog.V(1).Infof("Found %d reserved instances", len(a.RIPricingByInstanceID))
 		klog.V(1).Infof("Found %d reserved instances", len(a.RIPricingByInstanceID))
 		for k, r := range a.RIPricingByInstanceID {
 		for k, r := range a.RIPricingByInstanceID {
-			klog.V(1).Infof("Reserved Instance Data found for node %s : %f at time %s", k, r.EffectiveCost, r.MostRecentDate)
+			log.DedupedInfof(5, "Reserved Instance Data found for node %s : %f at time %s", k, r.EffectiveCost, r.MostRecentDate)
 		}
 		}
 		a.RIDataLock.Unlock()
 		a.RIDataLock.Unlock()
 	} else {
 	} else {

+ 1 - 1
pkg/costmodel/cluster.go

@@ -624,7 +624,7 @@ func ClusterNodes(cp cloud.Provider, client prometheus.Client, duration, offset
 
 
 		name, err := result.GetString("kubernetes_node")
 		name, err := result.GetString("kubernetes_node")
 		if err != nil {
 		if err != nil {
-			log.Warningf("ClusterNodes: CPU mode data missing node")
+			log.DedupedWarningf(5, "ClusterNodes: CPU mode data missing node")
 			continue
 			continue
 		}
 		}