Merge pull request #947 from kubecost/master

v1.87.0 release prep: merge master to develop

pkg/env/costmodelenv.go

@@ -82,7 +82,7 @@ func GetPricingConfigmapName() string {
 // GetAWSAccessKeyID returns the environment variable value for AWSAccessKeyIDEnvVar which represents
 // the AWS access key for authentication
 func GetAppVersion() string {
-	return Get(AppVersionEnvVar, "1.86.0")
+	return Get(AppVersionEnvVar, "1.86.1")
 }
 
 // IsEmitNamespaceAnnotationsMetric returns true if cost-model is configured to emit the kube_namespace_annotations metric

pkg/prom/diagnostics.go

@@ -109,7 +109,7 @@ func GetPrometheusMetrics(client prometheus.Client, offset string) ([]*Prometheu
 		},
 		{
 			ID:          "cadvisorLabel",
-			Query:       fmt.Sprintf(`absent_over_time(container_cpu_usage_seconds_total{container_name!="",pod_name!="",instance!~"10.*|192.*|172.*"}[5m]  %s)`, offset),
+			Query:       fmt.Sprintf(`absent_over_time(container_cpu_usage_seconds_total{container!="",pod!=""}[5m]  %s)`, offset),
 			Label:       "Expected cAdvsior labels available",
 			Description: "Determine if expected cAdvisor labels are present during last 5 minutes.",
 			DocLink:     fmt.Sprintf("%s#cadvisor-metrics-available", docs),