Merge remote-tracking branch 'upstream/develop' into avr/support-memory-opti-instances

pkg/cloud/azureprovider.go

@@ -3,6 +3,7 @@ package cloud
 import (
 	"context"
 	"fmt"
+	"github.com/opencost/opencost/pkg/kubecost"
 	"io"
 	"net/http"
 	"net/url"
@@ -1318,7 +1319,7 @@ func (az *Azure) ClusterInfo() (map[string]string, error) {
 	if c.ClusterName != "" {
 		m["name"] = c.ClusterName
 	}
-	m["provider"] = "Azure"
+	m["provider"] = kubecost.AzureProvider
 	m["account"] = az.clusterAccountId
 	m["region"] = az.clusterRegion
 	m["remoteReadEnabled"] = strconv.FormatBool(remoteEnabled)

pkg/cloud/customprovider.go

@@ -3,6 +3,7 @@ package cloud
 import (
 	"errors"
 	"fmt"
+	"github.com/opencost/opencost/pkg/kubecost"
 	"io"
 	"strconv"
 	"strings"
@@ -108,7 +109,7 @@ func (cp *CustomProvider) ClusterInfo() (map[string]string, error) {
 	if conf.ClusterName != "" {
 		m["name"] = conf.ClusterName
 	}
-	m["provider"] = "custom"
+	m["provider"] = kubecost.CustomProvider
 	m["id"] = env.GetClusterID()
 	return m, nil
 }

pkg/cloud/scalewayprovider.go

@@ -3,6 +3,7 @@ package cloud
 import (
 	"errors"
 	"fmt"
+	"github.com/opencost/opencost/pkg/kubecost"
 	"io"
 	"strconv"
 	"strings"
@@ -267,7 +268,7 @@ func (scw *Scaleway) ClusterInfo() (map[string]string, error) {
 	if c.ClusterName != "" {
 		m["name"] = c.ClusterName
 	}
-	m["provider"] = "Scaleway"
+	m["provider"] = kubecost.ScalewayProvider
 	m["remoteReadEnabled"] = strconv.FormatBool(remoteEnabled)
 	m["id"] = env.GetClusterID()
 	return m, nil

pkg/costmodel/cluster.go

@@ -227,17 +227,17 @@ func ClusterDisks(client prometheus.Client, provider cloud.Provider, start, end
 
 		volumeName, err := result.GetString("volumename")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv claim data missing volumename")
+			log.Debugf("ClusterDisks: pv claim data missing volumename")
 			continue
 		}
 		claimName, err := result.GetString("persistentvolumeclaim")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv claim data missing persistentvolumeclaim")
+			log.Debugf("ClusterDisks: pv claim data missing persistentvolumeclaim")
 			continue
 		}
 		claimNamespace, err := result.GetString("namespace")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv claim data missing namespace")
+			log.Debugf("ClusterDisks: pv claim data missing namespace")
 			continue
 		}
 
@@ -1417,12 +1417,12 @@ func pvCosts(diskMap map[DiskIdentifier]*Disk, resolution time.Duration, resActi
 
 		claimName, err := result.GetString("persistentvolumeclaim")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv usage data missing persistentvolumeclaim")
+			log.Debugf("ClusterDisks: pv usage data missing persistentvolumeclaim")
 			continue
 		}
 		claimNamespace, err := result.GetString("namespace")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv usage data missing namespace")
+			log.Debugf("ClusterDisks: pv usage data missing namespace")
 			continue
 		}
 
@@ -1437,17 +1437,17 @@ func pvCosts(diskMap map[DiskIdentifier]*Disk, resolution time.Duration, resActi
 
 			thatVolumeName, err := thatRes.GetString("volumename")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing volumename")
+				log.Debugf("ClusterDisks: pv claim data missing volumename")
 				continue
 			}
 			thatClaimName, err := thatRes.GetString("persistentvolumeclaim")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing persistentvolumeclaim")
+				log.Debugf("ClusterDisks: pv claim data missing persistentvolumeclaim")
 				continue
 			}
 			thatClaimNamespace, err := thatRes.GetString("namespace")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing namespace")
+				log.Debugf("ClusterDisks: pv claim data missing namespace")
 				continue
 			}
 
@@ -1478,12 +1478,12 @@ func pvCosts(diskMap map[DiskIdentifier]*Disk, resolution time.Duration, resActi
 
 		claimName, err := result.GetString("persistentvolumeclaim")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv usage data missing persistentvolumeclaim")
+			log.Debugf("ClusterDisks: pv usage data missing persistentvolumeclaim")
 			continue
 		}
 		claimNamespace, err := result.GetString("namespace")
 		if err != nil {
-			log.Warnf("ClusterDisks: pv usage data missing namespace")
+			log.Debugf("ClusterDisks: pv usage data missing namespace")
 			continue
 		}
 
@@ -1498,17 +1498,17 @@ func pvCosts(diskMap map[DiskIdentifier]*Disk, resolution time.Duration, resActi
 
 			thatVolumeName, err := thatRes.GetString("volumename")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing volumename")
+				log.Debugf("ClusterDisks: pv claim data missing volumename")
 				continue
 			}
 			thatClaimName, err := thatRes.GetString("persistentvolumeclaim")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing persistentvolumeclaim")
+				log.Debugf("ClusterDisks: pv claim data missing persistentvolumeclaim")
 				continue
 			}
 			thatClaimNamespace, err := thatRes.GetString("namespace")
 			if err != nil {
-				log.Warnf("ClusterDisks: pv claim data missing namespace")
+				log.Debugf("ClusterDisks: pv claim data missing namespace")
 				continue
 			}
 

pkg/kubecost/assetprops.go

@@ -130,6 +130,9 @@ const AlibabaProvider = "Alibaba"
 // CSVProvider describes the provider a CSV
 const CSVProvider = "CSV"
 
+// CustomProvider describes a custom provider
+const CustomProvider = "custom"
+
 // ScalewayProvider describes the provider Scaleway
 const ScalewayProvider = "Scaleway"