add(metrics): add controller_name and controller_kind to metrics label (

#130)
mercari · Oct 3, 2023 · a17e19f · a17e19f
1 parent 885061e
commit a17e19f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -24,12 +24,12 @@ var (
 	ProposedCPURequest = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "proposed_cpu_request",
 		Help: "recommended cpu request (millicore) that tortoises propose",
-	}, []string{"tortoise_name", "namespace", "container_name"})
+	}, []string{"tortoise_name", "namespace", "container_name", "controller_name", "controller_kind"})
 
 	ProposedMemoryRequest = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "proposed_memory_request",
 		Help: "recommended memory request (millibyte) that tortoises propose",
-	}, []string{"tortoise_name", "namespace", "container_name"})
+	}, []string{"tortoise_name", "namespace", "container_name", "controller_name", "controller_kind"})
 )
 
 func init() {

diff --git a/pkg/vpa/service.go b/pkg/vpa/service.go
@@ -209,10 +209,10 @@ func (c *Service) UpdateVPAFromTortoiseRecommendation(ctx context.Context, torto
 			if !metricsRecorded {
 				for resourcename, value := range r.RecommendedResource {
 					if resourcename == corev1.ResourceCPU {
-						metrics.ProposedCPURequest.WithLabelValues(tortoise.Name, tortoise.Namespace, r.ContainerName).Set(float64(value.MilliValue()))
+						metrics.ProposedCPURequest.WithLabelValues(tortoise.Name, tortoise.Namespace, r.ContainerName, tortoise.Spec.TargetRefs.DeploymentName, "Deployment").Set(float64(value.MilliValue()))
 					}
 					if resourcename == corev1.ResourceMemory {
-						metrics.ProposedMemoryRequest.WithLabelValues(tortoise.Name, tortoise.Namespace, r.ContainerName).Set(float64(value.MilliValue()))
+						metrics.ProposedMemoryRequest.WithLabelValues(tortoise.Name, tortoise.Namespace, r.ContainerName, tortoise.Spec.TargetRefs.DeploymentName, "Deployment").Set(float64(value.MilliValue()))
 					}
 				}
 				metricsRecorded = true