mark deprecated metric label and add replacement

Signed-off-by: Jifei Wang <[email protected]>

Author: FouoF

cmd/scheduler/metrics.go

@@ -75,7 +75,7 @@ func (cc ClusterManagerCollector) Collect(ch chan<- prometheus.Metric) {
 	)
 	nodevGPUMemoryAllocatedDesc := prometheus.NewDesc(
 		"GPUDeviceMemoryAllocated",
-		"Device memory allocated for a certain GPU",
+		"Device memory allocated for a certain GPU. The label devicecores will be deprecated in 2.8.0",
 		[]string{"nodeid", "deviceuuid", "deviceidx", "devicecores"}, nil,
 	)
 	nodevGPUSharedNumDesc := prometheus.NewDesc(
@@ -91,7 +91,7 @@ func (cc ClusterManagerCollector) Collect(ch chan<- prometheus.Metric) {
 	)
 	nodeGPUOverview := prometheus.NewDesc(
 		"nodeGPUOverview",
-		"GPU overview on a certain node",
+		"GPU overview on a certain node. The label devicecores will be deprecated in 2.8.0",
 		[]string{"nodeid", "deviceuuid", "deviceidx", "devicecores", "sharedcontainers", "devicememorylimit", "devicetype"}, nil,
 	)
 	nodeGPUMemoryPercentage := prometheus.NewDesc(

cmd/vGPUmonitor/metrics.go

@@ -105,14 +105,34 @@ var (
 	)
 	ctrDeviceMemorydesc = prometheus.NewDesc(
 		"Device_memory_desc_of_container",
-		"Container device meory description",
+		"Container device meory description. The label context, module, data and offset will be deprecated in 2.8.0.",
 		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid", "context", "module", "data", "offset"}, nil,
 	)
 	ctrDeviceUtilizationdesc = prometheus.NewDesc(
 		"Device_utilization_desc_of_container",
 		"Container device utilization description",
 		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid"}, nil,
 	)
+	ctrDeviceMemoryContext = prometheus.NewDesc(
+		"Device_memory_context_of_container",
+		"Container device memory context description",
+		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid"}, nil,
+	)
+	ctrDeviceMemoryModule = prometheus.NewDesc(
+		"Device_memory_module_of_container",
+		"Container device memory module description",
+		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid"}, nil,
+	)
+	ctrDeviceMemoryData = prometheus.NewDesc(
+		"Device_memory_data_of_container",
+		"Container device memory data description",
+		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid"}, nil,
+	)
+	ctrDeviceMemoryOffset = prometheus.NewDesc(
+		"Device_memory_data_of_container",
+		"Container device memory data description",
+		[]string{"podnamespace", "podname", "ctrname", "vdeviceid", "deviceuuid"}, nil,
+	)
 	ctrDeviceLastKernelDesc = prometheus.NewDesc(
 		"Device_last_kernel_of_container",
 		"Container device last kernel description",
@@ -400,11 +420,31 @@ func (cc ClusterManagerCollector) collectContainerMetrics(ch chan<- prometheus.M
 
 		// Send memory-related metrics with additional labels
 		memoryLabels := append(labels, fmt.Sprint(memoryContextSize), fmt.Sprint(memoryModuleSize), fmt.Sprint(memoryBufferSize), fmt.Sprint(memoryOffset))
-		if err := sendMetric(ch, ctrDeviceMemorydesc, prometheus.CounterValue, float64(memoryTotal), memoryLabels...); err != nil {
+		if err := sendMetric(ch, ctrDeviceMemorydesc, prometheus.GaugeValue, float64(memoryTotal), memoryLabels...); err != nil {
 			klog.Errorf("Failed to send memory-related metrics for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
 			return err
 		}
 
+		if err := sendMetric(ch, ctrDeviceMemoryContext, prometheus.GaugeValue, float64(memoryContextSize), labels...); err != nil {
+			klog.Errorf("Failed to send memory context metrics for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
+			return err
+		}
+
+		if err := sendMetric(ch, ctrDeviceMemoryModule, prometheus.GaugeValue, float64(memoryModuleSize), labels...); err != nil {
+			klog.Errorf("Failed to send memory module metrics for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
+			return err
+		}
+
+		if err := sendMetric(ch, ctrDeviceMemoryData, prometheus.GaugeValue, float64(memoryBufferSize), labels...); err != nil {
+			klog.Errorf("Failed to send memory buffer metrics for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
+			return err
+		}
+
+		if err := sendMetric(ch, ctrDeviceMemoryOffset, prometheus.GaugeValue, float64(memoryOffset), labels...); err != nil {
+			klog.Errorf("Failed to send memory offset metrics for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
+			return err
+		}
+
 		if err := sendMetric(ch, ctrDeviceUtilizationdesc, prometheus.GaugeValue, float64(smUtil), labels...); err != nil {
 			klog.Errorf("Failed to send SM utilization metric for device %d in Pod %s/%s, Container %s: %v", i, pod.Namespace, pod.Name, ctr.Name, err)
 			return err