Преглед изворни кода

Warnings are already logged in query

Matt Bolt пре 5 година
родитељ
комит
d843ba0369
2 измењених фајлова са 2 додато и 9 уклоњено
  1. 1 5
      pkg/costmodel/clusters/clustermap.go
  2. 1 4
      pkg/costmodel/costmodel.go

+ 1 - 5
pkg/costmodel/clusters/clustermap.go

@@ -126,16 +126,12 @@ func (pcm *PrometheusClusterMap) loadClusters() (map[string]*ClusterInfo, error)
 	}
 
 	var qr []*prom.QueryResult
-	var warnings prometheus.Warnings
 	var err error
 
 	// Retry on failure
 	delay := LoadRetryDelay
 	for r := LoadRetries; r > 0; r-- {
-		qr, warnings, err = tryQuery()
-		for _, warning := range warnings {
-			log.Warningf("ClusterInfoMap: %s", warning)
-		}
+		qr, _, err = tryQuery()
 
 		// non-error breaks out of loop
 		if err == nil {

+ 1 - 4
pkg/costmodel/costmodel.go

@@ -680,10 +680,7 @@ func findDeletedPodInfo(cli prometheusClient.Client, missingContainers map[strin
 	if len(missingContainers) > 0 {
 		queryHistoricalPodLabels := fmt.Sprintf(`kube_pod_labels{}[%s]`, window)
 
-		podLabelsResult, warnings, err := prom.NewContext(cli).QuerySync(queryHistoricalPodLabels)
-		for _, w := range warnings {
-			log.Warningf("prometheus warning: %s", w)
-		}
+		podLabelsResult, _, err := prom.NewContext(cli).QuerySync(queryHistoricalPodLabels)
 		if err != nil {
 			log.Errorf("failed to parse historical pod labels: %s", err.Error())
 		}