Skip to content

deprecation: remove labels marked as to be deprecated #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hami-robot merged 3 commits into from
Jul 8, 2026
Merged

deprecation: remove labels marked as to be deprecated #2021

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34b60c0
cheanup: remove deprecating labels
FouoF Jul 7, 2026
43ab747
resolve comment
FouoF Jul 7, 2026
d0fccfa
update
FouoF Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/vGPUmonitor/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ var (
)
ctrDeviceMemorydesc = prometheus.NewDesc(
"hami_container_device_memory_bytes",
`Container device memory usage breakdown in bytes (The label "context_size", "module_size", "buffer_size" and "offset" will be deprecated in v2.10.0, use hami_vgpu_memory_context_bytes, hami_vgpu_memory_module_bytes and hami_vgpu_memory_buffer_bytes instead)`,
[]string{"namespace", "pod", "container", "vdevice_index", "device_uuid", "context_size", "module_size", "buffer_size", "offset"}, nil,
`Container device memory usage in bytes`,
[]string{"namespace", "pod", "container", "vdevice_index", "device_uuid"}, nil,
)
Comment thread
FouoF marked this conversation as resolved.
ctrDeviceUtilizationdesc = prometheus.NewDesc(
"hami_container_device_utilization_ratio",
Expand Down Expand Up @@ -529,12 +529,12 @@ func (cc ClusterManagerCollector) collectContainerMetrics(ch chan<- prometheus.M
}
sendLegacyMetric(ch, legacyCtrvGPUlimitdesc, prometheus.GaugeValue, float64(memoryLimit), labels...)

memoryOffset := memoryTotal - memoryContextSize - memoryModuleSize - memoryBufferSize
memoryLabels := append(labels, fmt.Sprint(memoryContextSize), fmt.Sprint(memoryModuleSize), fmt.Sprint(memoryBufferSize), fmt.Sprint(memoryOffset))
if err := sendMetric(ch, ctrDeviceMemorydesc, prometheus.GaugeValue, float64(memoryTotal), memoryLabels...); err != nil {
if err := sendMetric(ch, ctrDeviceMemorydesc, prometheus.GaugeValue, float64(memoryTotal), labels...); err != nil {
klog.Errorf("Failed to send device memory desc: %v", err)
return err
}
memoryOffset := memoryTotal - memoryContextSize - memoryModuleSize - memoryBufferSize
memoryLabels := append(labels, fmt.Sprint(memoryContextSize), fmt.Sprint(memoryModuleSize), fmt.Sprint(memoryBufferSize), fmt.Sprint(memoryOffset))
sendLegacyMetric(ch, legacyCtrDeviceMemorydesc, prometheus.GaugeValue, float64(memoryTotal), memoryLabels...)

if err := sendMetric(ch, ctrDeviceUtilizationdesc, prometheus.GaugeValue, float64(smUtil), labels...); err != nil {
Expand Down
Loading